[evolution] Updated Slovenian translation



commit e40fb3fbc5a3f07667574ce17b2f638ca98beae0
Author: Matej UrbanÄiÄ <mateju svn gnome org>
Date:   Sat Sep 17 17:50:04 2011 +0200

    Updated Slovenian translation

 po/sl.po | 7100 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 3606 insertions(+), 3494 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 7e65468..29e5f6e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N\n";
-"POT-Creation-Date: 2011-07-02 06:05+0000\n"
-"PO-Revision-Date: 2011-07-02 12:49+0100\n"
+"POT-Creation-Date: 2011-09-17 03:26+0000\n"
+"PO-Revision-Date: 2011-09-17 17:39+0100\n"
 "Last-Translator: Matej UrbanÄiÄ <mateju svn gnome org>\n"
 "Language-Team: SlovenÅÄina <gnome-si googlegroups com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
@@ -91,7 +91,7 @@ msgid "Failed to authenticate with LDAP server."
 msgstr "Overitev na streÅniku LDAP ni uspela."
 
 #: ../addressbook/addressbook.error.xml.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "Izbris stika ni uspel"
 
@@ -193,7 +193,7 @@ msgid "Your contacts for {0} will not be available until Evolution is restarted.
 msgstr "VaÅi stiki za {0} ne bodo na voljo, dokler Evolutiona ne zaÅenete ponovno."
 
 #: ../addressbook/addressbook.error.xml.h:44
-#: ../mail/em-vfolder-rule.c:604
+#: ../mail/em-vfolder-rule.c:618
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Dodaj"
@@ -215,8 +215,8 @@ msgid "_Use as it is"
 msgstr "_Uporabi kot je"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:706
-#: ../calendar/gui/e-calendar-view.c:2078
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2104
 msgid "Anniversary"
 msgstr "Obletnica"
 
@@ -226,8 +226,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:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:705
-#: ../calendar/gui/e-calendar-view.c:2077
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../calendar/gui/e-calendar-view.c:2103
 #: ../capplet/anjal-settings-main.c:79
 #: ../shell/main.c:140
 msgid "Birthday"
@@ -239,7 +239,7 @@ msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije ..."
@@ -249,24 +249,24 @@ msgid "Calendar:"
 msgstr "Koledar:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:979
+#: ../addressbook/importers/evolution-vcard-importer.c:991
 msgid "Contact"
 msgstr "Stik"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:646
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2865
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:358
+#: ../addressbook/gui/merging/eab-contact-merging.c:386
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
-#: ../addressbook/gui/widgets/eab-contact-display.c:1000
-#: ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../smime/lib/e-cert.c:837
 msgid "Email"
 msgstr "Elektronska poÅta"
 
@@ -281,7 +281,7 @@ msgstr "_Polno ime ..."
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:198
 #: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1302
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
 #: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "Doma"
@@ -316,15 +316,14 @@ msgid "Nic_kname:"
 msgstr "_Vzdevek:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:265
 msgid "Notes"
 msgstr "Opombe"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
 #: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:403
-#: ../calendar/gui/e-calendar-view.c:1783
+#: ../addressbook/gui/widgets/eab-contact-display.c:409
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Other"
 msgstr "Drugo"
 
@@ -351,8 +350,8 @@ msgstr "Spletni naslovi"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
-#: ../addressbook/gui/widgets/eab-contact-display.c:1299
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:1320
 #: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Delo"
@@ -378,9 +377,9 @@ msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:708
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../plugins/itip-formatter/itip-view.c:1963
 msgid "_Calendar:"
 msgstr "_Koledar:"
 
@@ -459,47 +458,47 @@ msgid "_Zip/Postal Code:"
 msgstr "_PoÅtna Åtevilka: "
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:447
+#: ../addressbook/gui/widgets/eab-gui-util.c:469
 msgid "Error adding contact"
 msgstr "Napaka med dodajanjem stika"
 
@@ -511,21 +510,21 @@ msgstr "Napaka med spreminjanjem stika"
 msgid "Error removing contact"
 msgstr "Napaka med odstranjevanjem stika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:661
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2859
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Urejevalnik stikov - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
 msgid "Please select an image for this contact"
 msgstr "Izberite sliko za ta stik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3302
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
 msgid "_No image"
 msgstr "_Brez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -533,43 +532,43 @@ msgstr ""
 "Podatki o stiku so neveljavni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ima neveljavno obliko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3626
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ima neveljavno obliko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3649
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' je prazen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3664
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
 msgid "Invalid contact."
 msgstr "Neveljaven stik."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
 msgid "_Edit Full"
 msgstr "_Uredi celoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
 msgid "_Full name"
 msgstr "_Polno ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
 msgid "E_mail"
 msgstr "Elektronska _poÅta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Select Address Book"
 msgstr "_Izbor imenika"
 
@@ -639,7 +638,7 @@ msgid "_Suffix:"
 msgstr "P_ripona:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:729
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
 msgid "Contact List Editor"
 msgstr "Urejevalnik seznama stikov"
 
@@ -656,7 +655,7 @@ msgid "_List name:"
 msgstr "_Ime seznama:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "Izb_eri ..."
 
@@ -664,23 +663,23 @@ msgstr "Izb_eri ..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Vnesite naslov elektronske poÅte ali potegnite stik na spodnji seznam:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:852
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
 msgid "Contact List Members"
 msgstr "Älani seznama stikov"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1422
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
 msgid "Error adding list"
 msgstr "Napaka med dodajanjem seznama"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1437
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
 msgid "Error modifying list"
 msgstr "Napaka med spreminjanjem seznama"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1452
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
 msgid "Error removing list"
 msgstr "Napaka med odstranjevanjem seznama"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1583
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
 msgid "_Members"
 msgstr "_Älani"
 
@@ -719,11 +718,11 @@ msgstr ""
 "Ali Åelite podatke vseeno dodati?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:304
+#: ../addressbook/gui/merging/eab-contact-merging.c:332
 msgid "_Merge"
 msgstr "_ZdruÅi"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:287
+#: ../addressbook/gui/merging/eab-contact-merging.c:315
 msgid "Merge Contact"
 msgstr "ZdruÅi stik"
 
@@ -732,9 +731,9 @@ msgstr "ZdruÅi stik"
 #: ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
@@ -748,11 +747,11 @@ msgstr "Elektronska poÅta se zaÄne z"
 msgid "Name contains"
 msgstr "Ime vsebuje"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:155
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "Ni stikov"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:159
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -762,15 +761,15 @@ msgstr[2] "%d stika"
 msgstr[3] "%d stiki"
 
 # book je v 99% primerov address book=imenik
-#: ../addressbook/gui/widgets/e-addressbook-model.c:340
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
 msgid "Error getting book view"
 msgstr "Napaka med dobivanju pogleda imenika"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:751
+#: ../addressbook/gui/widgets/e-addressbook-model.c:771
 msgid "Search Interrupted"
 msgstr "Iskanje je prekinjeno"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
 msgid "Error modifying card"
 msgstr "Napaka med spreminjanjem vizitke"
 
@@ -795,34 +794,34 @@ msgstr "IzbriÅi izbrane stike"
 msgid "Select all visible contacts"
 msgstr "Izberi vse vidne stike"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati sezname stikov?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati seznam stikov?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati seznam stikov (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati te stike?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
 msgid "Are you sure you want to delete this contact?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati ta stik?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati stik (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -843,16 +842,16 @@ msgstr[3] ""
 "Odpiranje %d stikov bo odprlo %d nova okna.\n"
 "Ali zares Åelite prikazati vse te stike?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
 msgid "_Don't Display"
 msgstr "_Ne pokaÅi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1497
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 msgid "Display _All Contacts"
 msgstr "PokaÅi _vse stike"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:677
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
 msgid "Assistant"
 msgstr "PomoÄnik"
 
@@ -881,7 +880,7 @@ msgid "Car Phone"
 msgstr "Telefon v avtu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -889,7 +888,7 @@ msgid "Categories"
 msgstr "Kategorije"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:672
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Company"
 msgstr "Podjetje"
 
@@ -938,22 +937,22 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 msgid "Manager"
 msgstr "Upravljalnik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:703
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Nickname"
 msgstr "Vzdevek"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
 msgid "Note"
 msgstr "Opomba"
 
@@ -982,13 +981,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:585
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Vloga"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:707
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
 msgid "Spouse"
 msgstr "Partner(ka)"
 
@@ -1085,7 +1084,7 @@ msgid "Home Email"
 msgstr "DomaÄa elektronska poÅta"
 
 #: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:819
 msgid "Other Email"
 msgstr "Druga elektronska poÅta"
 
@@ -1133,82 +1132,82 @@ msgid "Copy _Email Address"
 msgstr "Kopiraj _elektronski naslov"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:184
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "Kopira elektronski naslov v odloÅiÅÄe"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:189
-#: ../widgets/misc/e-web-view.c:435
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "PoÅlji novo _sporoÄilo osebi ..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:191
-#: ../widgets/misc/e-web-view.c:437
+#: ../widgets/misc/e-web-view.c:439
 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:213
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
 msgid "Open map"
 msgstr "Odpri zemljevid"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "List Members:"
 msgstr "Älani seznama:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:673
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Department"
 msgstr "Oddelek"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:674
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Profession"
 msgstr "Poklic"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:675
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
 msgid "Position"
 msgstr "PoloÅaj"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:678
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Video Chat"
 msgstr "Video klepet"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:679
-#: ../calendar/gui/dialogs/calendar-setup.c:396
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
-#: ../modules/calendar/e-cal-shell-view.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:513
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "Koledar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Zasedenost"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
-#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
 msgid "Address"
 msgstr "Naslov"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Home Page"
 msgstr "DomaÄa stran"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 msgid "Web Log"
 msgstr "Spletni dnevnik"
 
@@ -1216,63 +1215,63 @@ msgstr "Spletni dnevnik"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
-#: ../capplet/settings/mail-capplet-shell.c:376
-#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../capplet/settings/mail-capplet-shell.c:385
+#: ../modules/addressbook/e-book-shell-backend.c:120
 #: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:138
 #: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:118
+#: ../modules/calendar/e-memo-shell-backend.c:122
 #: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:118
+#: ../modules/calendar/e-task-shell-backend.c:122
 #: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "Osebno"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:967
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
 msgid "List Members"
 msgstr "Älani seznama"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:985
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 msgid "Job Title"
 msgstr "SluÅbeni naziv"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
 msgid "Home page"
 msgstr "DomaÄa stran"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1229
-#: ../widgets/misc/e-web-view.c:954
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite za poÅiljanje poÅte osebi %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 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
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 #, 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
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 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
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 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:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid "Detailed error message:"
 msgstr "Podrobno sporoÄilo o napaki:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1284,7 +1283,7 @@ msgstr ""
 "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:207
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
 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"
@@ -1297,50 +1296,50 @@ msgstr ""
 "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:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 #, 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:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 #, 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:226
-#: ../addressbook/gui/widgets/eab-gui-util.c:232
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:241
 #, 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:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "vizitka.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:294
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Select Address Book"
 msgstr "Izbor imenika"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:357
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "list"
 msgstr "seznam"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:525
+#: ../addressbook/gui/widgets/eab-gui-util.c:552
 msgid "Move contact to"
 msgstr "Premakni stik v"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:527
+#: ../addressbook/gui/widgets/eab-gui-util.c:554
 msgid "Copy contact to"
 msgstr "Kopiraj stik v"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:530
+#: ../addressbook/gui/widgets/eab-gui-util.c:557
 msgid "Move contacts to"
 msgstr "Premakni stike v"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:532
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
 msgid "Copy contacts to"
 msgstr "Kopiraj stike v"
 
@@ -1348,65 +1347,65 @@ msgstr "Kopiraj stike v"
 msgid "Card View"
 msgstr "Pogled vizitke"
 
-#: ../addressbook/importers/evolution-csv-importer.c:740
-#: ../addressbook/importers/evolution-ldif-importer.c:539
-#: ../addressbook/importers/evolution-vcard-importer.c:282
-#: ../calendar/importers/icalendar-importer.c:380
-#: ../calendar/importers/icalendar-importer.c:847
-#: ../calendar/importers/icalendar-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:546
+#: ../addressbook/importers/evolution-vcard-importer.c:280
+#: ../calendar/importers/icalendar-importer.c:413
+#: ../calendar/importers/icalendar-importer.c:902
+#: ../calendar/importers/icalendar-importer.c:941
 #: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "UvaÅanje ..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1041
+#: ../addressbook/importers/evolution-csv-importer.c:1072
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ali Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1042
+#: ../addressbook/importers/evolution-csv-importer.c:1073
 msgid "Outlook CSV and Tab Importer"
 msgstr "Uvoznik Outlook CSV in Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1050
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ali Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1051
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Uvoznik Mozilla CSV in Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1059
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ali Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1060
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Evolution CSV and Tab Importer"
 msgstr "Uvoznik Evolution CSV in Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:779
+#: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Zapis za izmenjavo podatkov LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:780
+#: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
 msgstr "Uvoznik Evolution LDIF"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:648
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:649
+#: ../addressbook/importers/evolution-vcard-importer.c:659
 msgid "Evolution vCard Importer"
 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:714
+#: ../addressbook/printing/e-contact-print.c:719
 #, c-format
 msgid "Page %d"
 msgstr "Stran %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "Ni mogoÄe odpreti datoteke"
@@ -1418,16 +1417,16 @@ msgstr "Ni mogoÄe pridobiti seznama imenikov: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/event-page.c:2893
-#: ../calendar/gui/dialogs/memo-page.c:926
-#: ../calendar/gui/dialogs/task-page.c:1810
-#: ../em-format/em-format.c:2313
+#: ../calendar/gui/dialogs/event-page.c:2923
+#: ../calendar/gui/dialogs/memo-page.c:938
+#: ../calendar/gui/dialogs/task-page.c:1759
+#: ../em-format/em-format.c:2324
 #: ../mail/em-folder-tree.c:678
-#: ../mail/mail-ops.c:657
-#: ../plugins/caldav/caldav-browse-server.c:209
-#: ../plugins/caldav/caldav-browse-server.c:1406
-#: ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:313
+#: ../mail/mail-ops.c:658
+#: ../plugins/caldav/caldav-browse-server.c:220
+#: ../plugins/caldav/caldav-browse-server.c:1469
+#: ../plugins/face/face.c:174
+#: ../smime/gui/certificate-manager.c:314
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -1468,23 +1467,23 @@ msgstr "Åtevilo vizitk v eni izhodni datoteki v asinhronem naÄinu. Privzeta ve
 msgid "NUMBER"
 msgstr "ÅTEVILKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:138
+#: ../addressbook/tools/evolution-addressbook-export.c:139
 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:152
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Only support csv or vcard format."
 msgstr "Podpira le zapisa csv ali vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:162
 msgid "In async mode, output must be file."
 msgstr "V asinhronem naÄinu mora biti izhod datoteka."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:169
+#: ../addressbook/tools/evolution-addressbook-export.c:170
 msgid "In normal mode, there is no need for the size option."
 msgstr "V obiÄajnem naÄinu ni treba doloÄiti velikosti."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:200
+#: ../addressbook/tools/evolution-addressbook-export.c:201
 msgid "Unhandled error"
 msgstr "Neobravnavana napaka"
 
@@ -1571,19 +1570,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati ta sestanek?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:187
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati to sreÄanje?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati ta opomnik?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:190
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Ali ste prepriÄani, da Åelite izbrisati to nalogo?"
@@ -1822,7 +1821,7 @@ msgstr "_Shrani spremembe"
 
 #: ../calendar/calendar.error.xml.h:86
 #: ../composer/mail-composer.error.xml.h:34
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_PoÅlji"
@@ -1831,7 +1830,7 @@ msgstr "_PoÅlji"
 msgid "_Send Notice"
 msgstr "_PoÅlji obvestilo"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -1839,7 +1838,7 @@ msgstr[1] "minuta"
 msgstr[2] "minuti"
 msgstr[3] "minute"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ur"
@@ -1848,10 +1847,10 @@ msgstr[2] "uri"
 msgstr[3] "ure"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:133
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dni"
@@ -1859,7 +1858,7 @@ msgstr[1] "dan"
 msgstr[2] "dneva"
 msgstr[3] "dnevi"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
 msgid "Start time"
 msgstr "ZaÄetni Äas"
 
@@ -1873,9 +1872,9 @@ msgstr "Opusti _vse"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "Mesto:"
 
@@ -1884,7 +1883,7 @@ msgid "Snooze _time:"
 msgstr "Äas _dremeÅa:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
-#: ../e-util/e-alert.c:916
+#: ../e-util/e-alert.c:919
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Opusti"
@@ -1897,10 +1896,10 @@ msgstr "_DremeÅ"
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-#: ../e-util/e-plugin-util.c:428
+#: ../e-util/e-plugin-util.c:454
 #: ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:340
-#: ../plugins/google-account-setup/google-contacts-source.c:379
+#: ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
 msgstr "dni"
@@ -1908,9 +1907,9 @@ msgstr "dni"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 #: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../e-util/e-plugin-util.c:427
+#: ../e-util/e-plugin-util.c:453
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:378
+#: ../plugins/google-account-setup/google-contacts-source.c:386
 msgid "hours"
 msgstr "ur"
 
@@ -1922,42 +1921,42 @@ msgstr "mesto sestanka"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
 #: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../e-util/e-plugin-util.c:426
+#: ../e-util/e-plugin-util.c:452
 #: ../filter/filter.ui.h:17
 #: ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/google-account-setup/google-contacts-source.c:385
 msgid "minutes"
 msgstr "minut"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
 msgid "No summary available."
 msgstr "Povzetek ni na voljo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
 msgid "No location information available."
 msgstr "Podatki o mestu niso na voljo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
-#, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "DoloÄenih je %d alarmov"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#, fuzzy, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "PokaÅi o_pomnik"
 msgstr[1] "DoloÄen je %d alarm"
 msgstr[2] "DoloÄena sta %d alarma"
 msgstr[3] "DoloÄeni so %d alarmi"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1969,7 +1968,7 @@ msgstr ""
 "bil nastavljen, da poÅlje elektronsko poÅto. Evolution bo\n"
 "prikazal obiÄajno pogovorno okno opomnika."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -1984,18 +1983,18 @@ msgstr ""
 "\n"
 "Ali ste prepriÄani, da Åelite zagnati ta program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
 msgid "Do not ask me about this program again."
 msgstr "O tem programu me ne spraÅuj veÄ."
 
-#: ../calendar/gui/alarm-notify/util.c:44
+#: ../calendar/gui/alarm-notify/util.c:45
 msgid "invalid time"
 msgstr "neveljaven Äas"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69
-#: ../calendar/gui/e-alarm-list.c:396
-#: ../calendar/gui/misc.c:116
+#: ../calendar/gui/alarm-notify/util.c:71
+#: ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:118
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2005,9 +2004,9 @@ msgstr[2] "%d uri"
 msgstr[3] "%d ure"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75
-#: ../calendar/gui/e-alarm-list.c:402
-#: ../calendar/gui/misc.c:122
+#: ../calendar/gui/alarm-notify/util.c:77
+#: ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:124
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2019,9 +2018,9 @@ msgstr[3] "%d minute"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:81
+#: ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -2077,9 +2076,9 @@ msgid "Classification"
 msgstr "Razvrstitev"
 
 #: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:769
-#: ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:774
+#: ../calendar/gui/e-task-table.c:504
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
@@ -2118,9 +2117,9 @@ msgstr "Obstaja"
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
 #: ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:835
+#: ../plugins/publish-calendar/publish-calendar.c:863
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Mesto"
 
@@ -2131,18 +2130,18 @@ msgid "Organizer"
 msgstr "Organizator"
 
 #: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:767
-#: ../calendar/gui/e-task-table.c:491
+#: ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:772
+#: ../calendar/gui/e-task-table.c:503
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Zasebno"
 
 #: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:758
-#: ../calendar/gui/e-cal-model.c:765
-#: ../calendar/gui/e-task-table.c:490
+#: ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:763
+#: ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:502
 #: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Javno"
@@ -2160,7 +2159,7 @@ msgstr "Ponovitev"
 #: ../calendar/gui/e-memo-table.etspec.h:6
 #: ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Summary"
 msgstr "Povzetek"
 
@@ -2198,56 +2197,57 @@ msgstr "je"
 msgid "is not"
 msgstr "ni"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Uredi alarm"
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+msgid "Edit Reminder"
+msgstr "Uredi o_pomnik"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:438
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Pojavi okno opozorila"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:434
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "ZaÅeni program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "PoÅlji elektronsko poÅto"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "Dodaj alarm"
+msgid "Add Reminder"
+msgstr "_Dodaj opomnik"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "Alarm"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "SporoÄilo _po meri"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+#, fuzzy
+msgid "Custom reminder sound"
 msgstr "Zvok alarma po meri"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "_SporoÄilo:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 #: ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "MoÅnosti"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Opomnik"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "Ponavljanje"
@@ -2269,8 +2269,9 @@ msgid "_Program:"
 msgstr "_Program:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "_Ponovi alarm"
+#, fuzzy
+msgid "_Repeat the reminder"
+msgstr "PokaÅi o_pomnik"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2292,7 +2293,7 @@ msgstr "dan/dni"
 msgid "end of appointment"
 msgstr "konec sestanka"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "dodatnih ponovitev vsakih"
@@ -2309,7 +2310,7 @@ msgstr "minut(a)"
 msgid "start of appointment"
 msgstr "zaÄetek sestanka"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
 msgid "Action/Trigger"
 msgstr "Dejanje/SproÅilec"
 
@@ -2318,471 +2319,480 @@ msgid "A_dd"
 msgstr "_Dodaj"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "Alarmi"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Reminders"
+msgstr "Opomniki"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:164
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:180
-#: ../modules/addressbook/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
 msgid "_Type:"
 msgstr "Vrs_ta:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:242
-#: ../mail/mail-config.ui.h:156
+#: ../calendar/gui/dialogs/calendar-setup.c:248
+#: ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:291
+#: ../calendar/gui/dialogs/calendar-setup.c:300
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Kopira_j vsebino koledarja krajevno za delo brez povezave"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:293
+#: ../calendar/gui/dialogs/calendar-setup.c:302
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Kopira_j vsebino seznama nalog krajevno za delo brez povezave"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:295
+#: ../calendar/gui/dialogs/calendar-setup.c:304
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopira_j vsebino opomnikov krajevno za delo brez povezave"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:372
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+#, fuzzy
+msgid "Sh_ow reminder notifications"
+msgstr "PokaÅi _stolpec odmikov"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
 msgid "Colo_r:"
 msgstr "_Barva:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:395
-#: ../calendar/gui/dialogs/calendar-setup.c:406
-#: ../calendar/gui/dialogs/calendar-setup.c:417
-#: ../mail/em-folder-properties.c:233
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:471
+#: ../mail/em-folder-properties.c:235
 #: ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1052
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2955
+#: ../modules/addressbook/addressbook-config.c:1080
+#: ../modules/addressbook/autocompletion-config.c:228
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "SploÅno"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:407
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "Seznam nalog"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:418
+#: ../calendar/gui/dialogs/calendar-setup.c:472
 msgid "Memo List"
 msgstr "Seznam opomnikov"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Calendar Properties"
 msgstr "Lastnosti koledarja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "New Calendar"
 msgstr "Nov koledar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Task List Properties"
 msgstr "Lastnosti seznama nalog"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Task List"
 msgstr "Nov seznam nalog"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "Memo List Properties"
 msgstr "Lastnosti seznama opomnikov"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "New Memo List"
 msgstr "Nov seznam opomnikov"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This event has been deleted."
 msgstr "Ta dogodek je bil izbrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This task has been deleted."
 msgstr "Ta naloga je bila izbrisana."
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
+#: ../calendar/gui/dialogs/changed-comp.c:70
 msgid "This memo has been deleted."
 msgstr "Ta opomnik je bil izbrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:76
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Narejene so bile spremembe. Ali naj se urejevalnik zapre brez shranjevanja?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:81
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Narejenih ni nobenih sprememb. Ali naj se urejevalnik zapre?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:83
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This event has been changed."
 msgstr "Ta dogodek je bil spremenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:87
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This task has been changed."
 msgstr "Ta naloga je bil spremenjena."
 
-#: ../calendar/gui/dialogs/changed-comp.c:91
+#: ../calendar/gui/dialogs/changed-comp.c:94
 msgid "This memo has been changed."
 msgstr "Ta opomnik je bil spremenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:100
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Narejene so bile spremembe. Ali naj se prekliÄejo in naj se urejevalnik posodobi?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Narejenih ni nobenih sprememb. Ali naj se urejevalnik posodobi?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:458
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
 #, c-format
 msgid "Validation error: %s"
 msgstr "Napaka med potrjevanjem veljavnosti: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:267
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "Ni mogoÄe shraniti prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:613
 msgid "Could not update object"
 msgstr "Ni mogoÄe posodobiti predmeta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:715
+#: ../calendar/gui/dialogs/comp-editor.c:741
 msgid "Edit Appointment"
 msgstr "Uredi sestanek"
 
-#: ../calendar/gui/dialogs/comp-editor.c:722
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Meeting - %s"
 msgstr "SreÄanje - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:724
+#: ../calendar/gui/dialogs/comp-editor.c:750
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:730
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodeljena naloga - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:732
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:737
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Memo - %s"
 msgstr "Opomnik -%s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:753
+#: ../calendar/gui/dialogs/comp-editor.c:779
 msgid "No Summary"
 msgstr "Brez povzetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:874
+#: ../calendar/gui/dialogs/comp-editor.c:900
 msgid "Keep original item?"
 msgstr "Ali naj se ohrani izvirni predmet?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
-msgid "Click here to close the current window"
-msgstr "Kliknite tukaj za zaprtje trenutnega okna"
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+#, fuzzy
+msgid "Close the current window"
+msgstr "Zapri trenutno okno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1108
 #: ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1455
 #: ../widgets/misc/e-focus-tracker.c:117
 #: ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:457
-#: ../widgets/misc/e-web-view.c:1280
+#: ../widgets/misc/e-web-view.c:459
+#: ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Kopiraj izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 #: ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1462
 #: ../widgets/misc/e-focus-tracker.c:110
 #: ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1274
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "IzreÅi izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
-#: ../shell/e-shell-window-actions.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../shell/e-shell-window-actions.c:1469
 #: ../widgets/misc/e-focus-tracker.c:131
 #: ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "IzbriÅi izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-msgid "Click here to view help available"
-msgstr "Kliknite tukaj za ogled razpoloÅljive pomoÄi"
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+msgid "View help"
+msgstr "Poglejte pomoÄ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 #: ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1497
 #: ../widgets/misc/e-focus-tracker.c:124
 #: ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1286
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odloÅiÅÄa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-msgid "Click here to save the current window"
-msgstr "Kliknite tukaj za shranjevanje trenutnega okna"
+#: ../calendar/gui/dialogs/comp-editor.c:1157
+msgid "Save current changes"
+msgstr "Shrani trenutne spremembe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1164
 #: ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1574
 #: ../widgets/misc/e-focus-tracker.c:138
 #: ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Izberi vse besedilo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Classification"
 msgstr "_Razvrstitev"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6
 #: ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155
+#: ../calendar/gui/dialogs/comp-editor.c:1185
 #: ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
-#: ../shell/e-shell-window-actions.c:1642
+#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "Pomo_Ä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1169
+#: ../calendar/gui/dialogs/comp-editor.c:1199
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1206
 #: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "M_oÅnosti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1183
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 #: ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1651
 #: ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "Po_gled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1193
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 #: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_Priloga ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
-msgid "Click here to attach a file"
-msgstr "Kliknite tukaj za dodajanje prilog"
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "PriloÅi datoteko"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1203
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "_Categories"
 msgstr "_Kategorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1205
+#: ../calendar/gui/dialogs/comp-editor.c:1235
 msgid "Toggles whether to display categories"
 msgstr "Preklopi prikaz kategorij"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Time _Zone"
 msgstr "Äasovni _pas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 msgid "Toggles whether the time zone is displayed"
 msgstr "Preklopi prikaz Äasovnega pasu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "Classify as public"
 msgstr "Razvrsti kot javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1229
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "_Private"
 msgstr "Z_asebno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Classify as private"
 msgstr "Razvrsti kot zasebno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1236
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "_Confidential"
 msgstr "_Zaupno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238
+#: ../calendar/gui/dialogs/comp-editor.c:1268
 msgid "Classify as confidential"
 msgstr "Razvrsti kot zaupno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1246
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "R_ole Field"
 msgstr "Polje Vl_oga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1248
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Toggles whether the Role field is displayed"
 msgstr "Preklopi prikaz polja Vloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Preklopi prikaz polja RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "_Status Field"
 msgstr "Polje _Stanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Toggles whether the Status field is displayed"
 msgstr "Preklopi prikaz polja Stanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "_Type Field"
 msgstr "Polje _Vrsta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1272
+#: ../calendar/gui/dialogs/comp-editor.c:1302
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Preklopi prikaz polja Vrsta udeleÅenca"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "_Nedavni dokumenti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2018
+#: ../calendar/gui/dialogs/comp-editor.c:2059
 #: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "PriloÅi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2354
-#: ../calendar/gui/dialogs/comp-editor.c:2517
-#: ../calendar/gui/dialogs/comp-editor.c:3495
+#: ../calendar/gui/dialogs/comp-editor.c:2397
+#: ../calendar/gui/dialogs/comp-editor.c:2560
+#: ../calendar/gui/dialogs/comp-editor.c:3549
 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:3459
-#: ../plugins/prefer-plain/prefer-plain.c:64
+#: ../calendar/gui/dialogs/comp-editor.c:3513
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "priloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3527
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 msgid "Unable to use current version!"
 msgstr "Ni mogoÄe uporabiti trenutne razliÄice!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
 msgid "Could not open destination"
 msgstr "Ni mogoÄe odpreti cilja"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:123
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "Cilj je mogoÄe le brati"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:157
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
 msgid "Cannot create object"
 msgstr "Ni mogoÄe ustvariti predmeta"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
 msgid "Could not open source"
 msgstr "Ni mogoÄe odpreti vira"
 
-#: ../calendar/gui/dialogs/delete-comp.c:210
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Ali naj bo ta predmet izbrisan iz poÅtnih predalov vseh ostalih prejemnikov?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:213
+#: ../calendar/gui/dialogs/delete-comp.c:217
 msgid "_Retract comment"
 msgstr "_Umakni opombo"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:57
 #, 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:60
+#: ../calendar/gui/dialogs/delete-error.c:61
 #, 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:64
+#: ../calendar/gui/dialogs/delete-error.c:65
 #, 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:68
+#: ../calendar/gui/dialogs/delete-error.c:69
 #, 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:75
+#: ../calendar/gui/dialogs/delete-error.c:76
 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:78
+#: ../calendar/gui/dialogs/delete-error.c:79
 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:81
+#: ../calendar/gui/dialogs/delete-error.c:82
 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:84
+#: ../calendar/gui/dialogs/delete-error.c:85
 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:92
+#: ../calendar/gui/dialogs/delete-error.c:93
 #, 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:96
+#: ../calendar/gui/dialogs/delete-error.c:97
 #, 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:100
+#: ../calendar/gui/dialogs/delete-error.c:101
 #, 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:104
+#: ../calendar/gui/dialogs/delete-error.c:105
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "Predmeta ni mogoÄe izbrisati zaradi napake: %s"
@@ -2800,11 +2810,12 @@ msgid "Enter Delegate"
 msgstr "Vnesite pooblaÅÄenca"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "_Alarmi"
+msgid "_Reminders"
+msgstr "_Opomniki"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
+#, fuzzy
+msgid "Set or unset reminders for this event"
 msgstr "Kliknite tukaj za nastavljanje alarmov za ta dogodek"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
@@ -2850,13 +2861,13 @@ msgid "Query free / busy information for the attendees"
 msgstr "Poizvedi o stanju zasedenosti udeleÅencev"
 
 #: ../calendar/gui/dialogs/event-editor.c:314
-#: ../calendar/gui/print.c:3185
+#: ../calendar/gui/print.c:3310
 msgid "Appointment"
 msgstr "Sestanek"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
 msgid "Attendees"
 msgstr "UdeleÅenci"
 
@@ -2864,93 +2875,94 @@ msgstr "UdeleÅenci"
 msgid "Print this event"
 msgstr "Natisni ta dogodek"
 
-#: ../calendar/gui/dialogs/event-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:558
 msgid "Event's start time is in the past"
 msgstr "ZaÄetni Äas dogodka je v preteklosti"
 
-#: ../calendar/gui/dialogs/event-page.c:633
+#: ../calendar/gui/dialogs/event-page.c:635
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Dogodka ni mogoÄe urejati, ker je izbrani koledar na voljo le za branje"
 
-#: ../calendar/gui/dialogs/event-page.c:637
+#: ../calendar/gui/dialogs/event-page.c:639
 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:649
-#: ../calendar/gui/dialogs/event-page.c:3021
-msgid "This event has alarms"
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3080
+#, fuzzy
+msgid "This event has reminders"
 msgstr "Dogodek ima alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:716
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
+#: ../calendar/gui/dialogs/event-page.c:1263
 msgid "Event with no start date"
 msgstr "Dogodek brez zaÄetnega datuma"
 
-#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/event-page.c:1266
 msgid "Event with no end date"
 msgstr "Dogodek brez konÄnega datuma"
 
-#: ../calendar/gui/dialogs/event-page.c:1430
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:1439
+#: ../calendar/gui/dialogs/memo-page.c:708
+#: ../calendar/gui/dialogs/task-page.c:819
 msgid "Start date is wrong"
 msgstr "ZaÄetni datum je napaÄen"
 
-#: ../calendar/gui/dialogs/event-page.c:1440
+#: ../calendar/gui/dialogs/event-page.c:1449
 msgid "End date is wrong"
 msgstr "KonÄni datum je napaÄen"
 
-#: ../calendar/gui/dialogs/event-page.c:1463
+#: ../calendar/gui/dialogs/event-page.c:1472
 msgid "Start time is wrong"
 msgstr "ZaÄetni Äas je napaÄen"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1479
 msgid "End time is wrong"
 msgstr "KonÄni Äas je napaÄen"
 
-#: ../calendar/gui/dialogs/event-page.c:1635
-#: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1644
+#: ../calendar/gui/dialogs/memo-page.c:749
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "An organizer is required."
 msgstr "Zahtevan je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1669
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "At least one attendee is required."
 msgstr "Zahtevan je vsaj en udeleÅenec."
 
-#: ../calendar/gui/dialogs/event-page.c:1869
+#: ../calendar/gui/dialogs/event-page.c:1885
 msgid "_Delegatees"
 msgstr "_PooblaÅÄenci"
 
-#: ../calendar/gui/dialogs/event-page.c:1871
+#: ../calendar/gui/dialogs/event-page.c:1887
 msgid "Atte_ndees"
 msgstr "UdeleÅe_nci"
 
-#: ../calendar/gui/dialogs/event-page.c:2891
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Ni mogoÄe odpreti koledarja '%s': %s"
 
 #. Translators: This string is used when we are creating an Event
-#. (meeting or appointment)  on behalf of some other user
+#. * (meeting or appointment)  on behalf of some other user
 #. Translators: This string is used when we are creating a Memo
-#. on behalf of some other user
+#. * on behalf of some other user
 #. Translators: This string is used when we are creating a Task
-#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2939
-#: ../calendar/gui/dialogs/memo-page.c:967
-#: ../calendar/gui/dialogs/task-page.c:1855
+#. * on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2998
+#: ../calendar/gui/dialogs/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1838
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Trenutno opravljate naloge v imenu %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3250
+#: ../calendar/gui/dialogs/event-page.c:3325
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -2959,7 +2971,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:3256
+#: ../calendar/gui/dialogs/event-page.c:3331
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -2968,7 +2980,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:3262
+#: ../calendar/gui/dialogs/event-page.c:3337
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -2977,51 +2989,53 @@ msgstr[1] "%d minuto pred sestankom"
 msgstr[2] "%d minuti pred sestankom"
 msgstr[3] "%d minute pred sestankom"
 
-#: ../calendar/gui/dialogs/event-page.c:3281
+#: ../calendar/gui/dialogs/event-page.c:3356
 msgid "Customize"
 msgstr "Prilagodi"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3287
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3362
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "Brez"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "Atte_ndees..."
 msgstr "UdeleÅe_nci ..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "Alarm po meri:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#, fuzzy
+msgid "Custom Reminder:"
+msgstr "PokaÅi o_pomnik"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "Opis dogodka:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "Äasovni _pas:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_Alarm"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:366
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_Mesto:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#, fuzzy
+msgid "_Reminder"
+msgstr "Opomnik!"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "Pov_zetek:"
@@ -3030,19 +3044,19 @@ msgstr "Pov_zetek:"
 msgid "_Time:"
 msgstr "_Äas:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 dan pred sestankom"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 uro pred sestankom"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3109,7 +3123,7 @@ msgid "Select Date"
 msgstr "Izbor datuma"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Select _Today"
 msgstr "Izberi _danes"
 
@@ -3118,7 +3132,7 @@ msgid "September"
 msgstr "september"
 
 #: ../calendar/gui/dialogs/memo-editor.c:105
-#: ../calendar/gui/print.c:3189
+#: ../calendar/gui/print.c:3314
 msgid "Memo"
 msgstr "Opomnik"
 
@@ -3126,31 +3140,31 @@ msgstr "Opomnik"
 msgid "Print this memo"
 msgstr "Natisni ta opomnik"
 
-#: ../calendar/gui/dialogs/memo-page.c:393
+#: ../calendar/gui/dialogs/memo-page.c:405
 msgid "Memo's start date is in the past"
 msgstr "ZaÄetni Äas opomnika je v preteklosti"
 
-#: ../calendar/gui/dialogs/memo-page.c:430
+#: ../calendar/gui/dialogs/memo-page.c:442
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Opomnika ni mogoÄe polno urejati, ker je izbrani seznam opomnikov na voljo le za branje"
 
-#: ../calendar/gui/dialogs/memo-page.c:434
+#: ../calendar/gui/dialogs/memo-page.c:446
 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:924
+#: ../calendar/gui/dialogs/memo-page.c:936
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Ni mogoÄe odpreti opomnikov v '%s': %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1099
-#: ../em-format/em-format-quote.c:284
-#: ../em-format/em-format.c:1056
-#: ../mail/em-format-html.c:2487
-#: ../mail/em-format-html.c:2552
-#: ../mail/em-format-html.c:2576
+#: ../calendar/gui/dialogs/memo-page.c:1144
+#: ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1062
+#: ../mail/em-format-html.c:2592
+#: ../mail/em-format-html.c:2657
+#: ../mail/em-format-html.c:2681
 #: ../mail/message-list.etspec.h:20
-#: ../modules/mail/em-mailer-prefs.c:72
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Za"
 
@@ -3169,62 +3183,63 @@ msgid "T_o:"
 msgstr "_Za:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:331
+#: ../calendar/gui/dialogs/task-page.c:333
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_Skupina:"
+#, fuzzy
+msgid "_List:"
+msgstr "seznam"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Spreminjate ponavljajoÄ dogodek. Kaj Åelite spremeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:57
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Pooblastiti Åelite zastopanje ponavljajoÄega se dogodka. Kaj Åelite zastopati?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:61
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Spreminjate ponavljajoÄo nalogo. Kaj Åelite spremeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:65
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Spreminjate ponavljajoÄi opomnik. Kaj Åelite spremeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This Instance Only"
 msgstr "Samo ta primerek"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Prior Instances"
 msgstr "Ta in pretekli primerki"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:101
 msgid "This and Future Instances"
 msgstr "Ta in prihodnji primerki"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:106
 msgid "All Instances"
 msgstr "Vsi primerki"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:575
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ta sestanek vsebuje ponovitve, ki jih Evolution ne more urejati."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "Recurrence date is invalid"
 msgstr "Datum ponovitve ni veljaven"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
 msgid "End time of the recurrence was before event's start"
 msgstr "KonÄni Äas ponavljanja je pred zaÄetkom dogodka"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "on"
 msgstr "v"
 
@@ -3232,7 +3247,7 @@ msgstr "v"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 msgid "first"
 msgstr "prvi"
 
@@ -3241,7 +3256,7 @@ msgstr "prvi"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
 msgid "second"
 msgstr "drugi"
 
@@ -3249,7 +3264,7 @@ msgstr "drugi"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "third"
 msgstr "tretji"
 
@@ -3257,7 +3272,7 @@ msgstr "tretji"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "fourth"
 msgstr "Äetrti"
 
@@ -3265,7 +3280,7 @@ msgstr "Äetrti"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fifth"
 msgstr "peti"
 
@@ -3273,13 +3288,13 @@ msgstr "peti"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "last"
 msgstr "zadnji"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1147
 msgid "Other Date"
 msgstr "Drugi datum"
 
@@ -3287,7 +3302,7 @@ msgstr "Drugi datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
 msgid "1st to 10th"
 msgstr "1. do 10."
 
@@ -3295,7 +3310,7 @@ msgstr "1. do 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "11th to 20th"
 msgstr "11. do 20."
 
@@ -3303,41 +3318,41 @@ msgstr "11. do 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "21st to 31st"
 msgstr "21. do 31."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "torek"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "sreda"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Äetrtek"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "petek"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "sobota"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "nedelja"
@@ -3345,31 +3360,31 @@ msgstr "nedelja"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1321
 msgid "on the"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
 msgid "occurrences"
 msgstr "pojavitve"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Add exception"
 msgstr "Dodaj izjemo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
 msgid "Could not get a selection to modify."
 msgstr "Ni mogoÄe dobiti izbire za spreminjanje."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2175
+#: ../calendar/gui/dialogs/recurrence-page.c:2261
 msgid "Modify exception"
 msgstr "Spremeni izjemo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2219
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
 msgid "Could not get a selection to delete."
 msgstr "Ni mogoÄe dobiti izbire za brisanje."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2353
+#: ../calendar/gui/dialogs/recurrence-page.c:2439
 msgid "Date/Time"
 msgstr "Datum/Äas"
 
@@ -3432,11 +3447,12 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "let"
 
-#: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
+#: ../calendar/gui/dialogs/send-comp.c:198
+#, fuzzy
+msgid "Send my reminders with this event"
 msgstr "PoÅlji moje alarme skupaj z dogodkom"
 
-#: ../calendar/gui/dialogs/send-comp.c:194
+#: ../calendar/gui/dialogs/send-comp.c:200
 msgid "Notify new attendees _only"
 msgstr "Obvesti _samo nove udeleÅence"
 
@@ -3451,13 +3467,13 @@ msgstr "Spletna stran"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225
-#: ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3275
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:725
+#: ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234
+#: ../calendar/gui/e-task-table.c:606
+#: ../calendar/gui/print.c:3400
 #: ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180
 #: ../mail/em-sync-stream.c:202
@@ -3467,73 +3483,73 @@ msgstr "Preklicano"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:723
 #: ../calendar/gui/e-meeting-store.c:206
 #: ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3272
+#: ../calendar/gui/e-task-table.c:217
+#: ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605
+#: ../calendar/gui/print.c:3397
 #: ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "KonÄano"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:514
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:526
 #: ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1274
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Visoka"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:435
-#: ../calendar/gui/e-cal-model-tasks.c:709
-#: ../calendar/gui/e-cal-model-tasks.c:786
-#: ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221
-#: ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:799
+#: ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230
+#: ../calendar/gui/e-task-table.c:604
+#: ../calendar/gui/print.c:3394
 msgid "In Progress"
 msgstr "V teku"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-task-table.c:516
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:528
 #: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1222
+#: ../mail/message-list.c:1272
 #: ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "nizka"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1528
-#: ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1578
+#: ../calendar/gui/e-task-table.c:527
 #: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/message-list.c:1223
+#: ../mail/message-list.c:1273
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "ObiÄajno"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:302
-#: ../calendar/gui/e-cal-model-tasks.c:433
-#: ../calendar/gui/e-cal-model-tasks.c:707
-#: ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3266
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-model-tasks.c:434
+#: ../calendar/gui/e-cal-model-tasks.c:719
+#: ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228
+#: ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/print.c:3391
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Ni zaÄeto"
@@ -3547,11 +3563,11 @@ msgid "Stat_us:"
 msgstr "S_tanje:"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
+#. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1831
-#: ../calendar/gui/e-meeting-list-view.c:610
+#: ../calendar/gui/e-calendar-view.c:1854
+#: ../calendar/gui/e-meeting-list-view.c:635
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21
 #: ../mail/em-filter-i18n.h:72
@@ -3561,7 +3577,7 @@ msgstr "Stanje"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/e-task-table.c:529
 #: ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
@@ -3592,46 +3608,46 @@ msgstr "Kliknite za spremembo ali ogled podrobnosti stanja naloge"
 msgid "_Send Options"
 msgstr "MoÅnosti _poÅiljanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:319
-#: ../calendar/gui/print.c:3187
-#: ../widgets/misc/e-send-options.c:526
+#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Naloga"
 
-#: ../calendar/gui/dialogs/task-editor.c:322
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Podrobnosti naloge"
 
-#: ../calendar/gui/dialogs/task-editor.c:364
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "Natisni to nalogo"
 
-#: ../calendar/gui/dialogs/task-page.c:249
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's start date is in the past"
 msgstr "ZaÄetni Äas opravila je v preteklosti"
 
-#: ../calendar/gui/dialogs/task-page.c:250
+#: ../calendar/gui/dialogs/task-page.c:252
 msgid "Task's due date is in the past"
 msgstr "Datum zapadlosti opravila je v preteklosti"
 
-#: ../calendar/gui/dialogs/task-page.c:284
+#: ../calendar/gui/dialogs/task-page.c:286
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Naloge ni mogoÄe urejati, ker je izbran seznam nalog dostopen le za branje"
 
-#: ../calendar/gui/dialogs/task-page.c:288
+#: ../calendar/gui/dialogs/task-page.c:290
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Naloge ni mogoÄe v polno urejati, saj niste organizator"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:341
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zator:"
 
-#: ../calendar/gui/dialogs/task-page.c:816
+#: ../calendar/gui/dialogs/task-page.c:801
 msgid "Due date is wrong"
 msgstr "Datum zapadlosti je napaÄen"
 
-#: ../calendar/gui/dialogs/task-page.c:1808
+#: ../calendar/gui/dialogs/task-page.c:1757
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Ni mogoÄe odpreti nalog v '%s': %s"
@@ -3649,7 +3665,7 @@ msgid "Time zone:"
 msgstr "Äasovni pas:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:384
+#: ../calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3659,7 +3675,7 @@ msgstr[2] "%d dneva"
 msgstr[3] "%d dni"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:390
+#: ../calendar/gui/e-alarm-list.c:399
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3668,111 +3684,111 @@ msgstr[1] "%d teden"
 msgstr[2] "%d tedna"
 msgstr[3] "%d tedne"
 
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:461
 msgid "Unknown action to be performed"
 msgstr "Izvedeno bo neznano dejanje"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pred zaÄetkom sestanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:471
+#: ../calendar/gui/e-alarm-list.c:480
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po zaÄetku sestanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ob zaÄetku sestanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:489
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pred koncem sestanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po koncu sestanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na koncu sestanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:525
+#: ../calendar/gui/e-alarm-list.c:534
 #, c-format
 msgid "%s at %s"
 msgstr "%s ob %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:533
+#: ../calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za neznano vrsto sproÅilca"
 
-#: ../calendar/gui/e-cal-component-preview.c:192
-#: ../filter/e-filter-rule.c:669
+#: ../calendar/gui/e-cal-component-preview.c:194
+#: ../filter/e-filter-rule.c:671
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "Kategorije:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "Povzetek:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "ZaÄetni datum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "Datum zapadlosti:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
-#: ../plugins/itip-formatter/itip-view.c:1076
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "Prednost:"
 
-#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-cal-component-preview.c:342
 #: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "Spletna stran:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Created"
 msgstr "Ustvarjeno"
 
@@ -3791,18 +3807,18 @@ msgstr "ZadnjiÄ spremenjeno"
 msgid "Start Date"
 msgstr "ZaÄetni daum"
 
-#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
 msgid "Free"
 msgstr "Prosto"
 
-#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546
-#: ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-cal-model-calendar.c:191
+#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-task-table.c:581
 msgid "Busy"
 msgstr "Zasedeno"
 
-#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-cal-model-tasks.c:665
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3813,51 +3829,51 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:705
+#: ../calendar/gui/e-cal-model-tasks.c:717
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Brez"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061
-#: ../calendar/gui/e-cal-model.c:1534
-#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-cal-model-tasks.c:1090
+#: ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:1028
+#: ../calendar/gui/e-meeting-store.c:1053
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061
-#: ../calendar/gui/e-cal-model.c:1534
-#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-cal-model-tasks.c:1090
+#: ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Ne"
 
-#: ../calendar/gui/e-cal-model.c:771
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-cal-model.c:776
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:136
 #: ../calendar/gui/e-meeting-store.c:171
 #: ../calendar/gui/e-meeting-store.c:234
-#: ../calendar/gui/print.c:1098
-#: ../calendar/gui/print.c:1115
+#: ../calendar/gui/print.c:1151
+#: ../calendar/gui/print.c:1168
 #: ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../modules/plugin-manager/evolution-plugin-manager.c:102
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model.c:1580
 msgid "Recurring"
 msgstr "PonavljajoÄe"
 
-#: ../calendar/gui/e-cal-model.c:1532
+#: ../calendar/gui/e-cal-model.c:1582
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-model.c:2714
+#: ../calendar/gui/e-cal-model.c:2937
 #, c-format
 msgid "Opening %s"
 msgstr "Odpiranje %s"
@@ -3885,7 +3901,7 @@ msgstr "Datum zapadlosti"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Prednost"
 
@@ -3894,7 +3910,7 @@ msgid "Start date"
 msgstr "Datum zaÄetka"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:573
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:584
@@ -3919,58 +3935,58 @@ msgstr "IzbriÅi izbrane dogodke"
 
 #: ../calendar/gui/e-calendar-view.c:457
 #: ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:260
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "Brisanje izbranih predmetov"
 
-#: ../calendar/gui/e-calendar-view.c:648
-#: ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/e-task-table.c:1082
+#: ../calendar/gui/e-calendar-view.c:650
+#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1104
 msgid "Updating objects"
 msgstr "Posodabljanje predmetov"
 
-#: ../calendar/gui/e-calendar-view.c:1778
-#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-calendar-view.c:1801
+#: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2605
+#: ../plugins/itip-formatter/itip-formatter.c:2685
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: ../calendar/gui/e-calendar-view.c:1779
-#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-calendar-view.c:1802
+#: ../calendar/gui/e-meeting-list-view.c:215
 #: ../calendar/gui/e-meeting-store.c:200
 #: ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2611
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "Declined"
 msgstr "Odklonjeno"
 
-#: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-calendar-view.c:1803
+#: ../calendar/gui/e-meeting-list-view.c:216
 #: ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "Tentative"
 msgstr "Poskusno"
 
-#: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-calendar-view.c:1804
+#: ../calendar/gui/e-meeting-list-view.c:217
 #: ../calendar/gui/e-meeting-store.c:204
 #: ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2614
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "Delegated"
 msgstr "PooblaÅÄeno zastopanje "
 
-#: ../calendar/gui/e-calendar-view.c:1782
+#: ../calendar/gui/e-calendar-view.c:1805
 msgid "Needs action"
 msgstr "Zahteva dejanje"
 
 #. 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:1926
-#: ../calendar/gui/e-memo-table.c:537
-#: ../calendar/gui/e-task-table.c:758
+#: ../calendar/gui/e-calendar-view.c:1949
+#: ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:770
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
@@ -3978,22 +3994,22 @@ 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:1930
-#: ../calendar/gui/e-memo-table.c:542
-#: ../calendar/gui/e-task-table.c:762
+#: ../calendar/gui/e-calendar-view.c:1953
+#: ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:774
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946
-#: ../calendar/gui/print.c:3221
+#: ../calendar/gui/e-calendar-view.c:1969
+#: ../calendar/gui/print.c:3346
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1977
+#: ../calendar/gui/e-calendar-view.c:2000
 #, c-format
 msgid "Time: %s %s"
 msgstr "Äas: %s %s"
@@ -4021,92 +4037,92 @@ msgstr ""
 #. * to change the length of the time division in the calendar 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:806
+#: ../calendar/gui/e-day-view-time-item.c:809
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i delitev minute"
 
-#: ../calendar/gui/e-day-view-time-item.c:827
+#: ../calendar/gui/e-day-view-time-item.c:830
 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:844
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../calendar/gui/e-day-view-time-item.c:847
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:228
+#: ../modules/calendar/e-calendar-preferences.c:231
 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:879
 #: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:255
+#: ../modules/calendar/e-calendar-preferences.c:258
 msgid "Select..."
 msgstr "Izb_eri ..."
 
 #. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
+#. * %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
+#. * month, %B = full month name. You can change the
+#. * order but don't change the specifiers or add
+#. * anything.
 #: ../calendar/gui/e-day-view-top-item.c:848
-#: ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-day-view.c:1819
 #: ../calendar/gui/e-week-view-main-item.c:215
-#: ../calendar/gui/print.c:1875
+#: ../calendar/gui/print.c:1968
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
+#. * %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.
+#. * %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-day-view-top-item.c:852
-#: ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-day-view.c:1836
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1015
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
+#. * 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.
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:856
-#: ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-day-view.c:1852
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1051
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002
-#: ../calendar/gui/e-week-view.c:756
-#: ../calendar/gui/print.c:926
-#: ../calendar/gui/print.c:945
-#: ../calendar/gui/print.c:2372
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/e-day-view.c:1019
+#: ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:977
+#: ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2484
+#: ../calendar/gui/print.c:2504
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005
-#: ../calendar/gui/e-week-view.c:759
-#: ../calendar/gui/print.c:931
-#: ../calendar/gui/print.c:947
-#: ../calendar/gui/print.c:2377
-#: ../calendar/gui/print.c:2394
+#: ../calendar/gui/e-day-view.c:1022
+#: ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:2489
+#: ../calendar/gui/print.c:2506
 msgid "pm"
 msgstr "pop"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2606
+#: ../calendar/gui/e-day-view.c:2636
 #, c-format
 msgid "Week %d"
 msgstr "Teden %d"
@@ -4127,79 +4143,79 @@ msgstr "Neobvezni udeleÅenci"
 msgid "Resources"
 msgstr "Sredstva"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:111
 #: ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1022
-#: ../calendar/gui/print.c:1094
+#: ../calendar/gui/e-meeting-store.c:1047
+#: ../calendar/gui/print.c:1147
 msgid "Individual"
 msgstr "Individualno"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:113
 #: ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:1148
 #: ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Skupina"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:115
 #: ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1096
+#: ../calendar/gui/print.c:1149
 msgid "Resource"
 msgstr "Sredstvo"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:117
 #: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1097
+#: ../calendar/gui/print.c:1150
 msgid "Room"
 msgstr "Soba"
 
-#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:146
 #: ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1111
+#: ../calendar/gui/print.c:1164
 msgid "Chair"
 msgstr "PredsedujoÄi"
 
-#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-list-view.c:189
 #: ../calendar/gui/e-meeting-store.c:148
 #: ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1025
-#: ../calendar/gui/print.c:1112
+#: ../calendar/gui/e-meeting-store.c:1050
+#: ../calendar/gui/print.c:1165
 msgid "Required Participant"
 msgstr "Zahtevani udeleÅenci"
 
-#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:150
 #: ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1113
+#: ../calendar/gui/print.c:1166
 msgid "Optional Participant"
 msgstr "Neobvezni udeleÅenci"
 
-#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:152
 #: ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1114
+#: ../calendar/gui/print.c:1167
 msgid "Non-Participant"
 msgstr "Ne-sodelujoÄi"
 
-#: ../calendar/gui/e-meeting-list-view.c:212
+#: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/e-meeting-store.c:1035
+#: ../calendar/gui/e-meeting-store.c:1060
 msgid "Needs Action"
 msgstr "Zahteva dejanje"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:553
+#: ../calendar/gui/e-meeting-list-view.c:578
 msgid "Attendee                          "
 msgstr "UdeleÅenec"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:598
+#: ../calendar/gui/e-meeting-list-view.c:623
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Povratnica"
@@ -4209,103 +4225,103 @@ msgstr "Povratnica"
 msgid "In Process"
 msgstr "V obdelavi"
 
-#: ../calendar/gui/e-meeting-store.c:1834
+#: ../calendar/gui/e-meeting-store.c:1876
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Vnesite geslo za dostop do podatkov prostosti/zasedenosti na streÅniku %s kot uporabnik %s"
 
-#: ../calendar/gui/e-meeting-store.c:1844
+#: ../calendar/gui/e-meeting-store.c:1886
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Vzrok napake: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1849
-#: ../plugins/caldav/caldav-browse-server.c:920
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
+#: ../calendar/gui/e-meeting-store.c:1891
+#: ../plugins/caldav/caldav-browse-server.c:957
+#: ../plugins/google-account-setup/google-source.c:460
+#: ../plugins/publish-calendar/publish-calendar.c:345
+#: ../smime/gui/component.c:53
 msgid "Enter password"
 msgstr "Vnesite geslo"
 
 #. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:431
-#: ../calendar/gui/e-meeting-time-sel.c:2380
+#. * %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:2379
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d.%m.%Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
+#. * name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:435
-#: ../calendar/gui/e-meeting-time-sel.c:2411
+#. * %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:439
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Out of Office"
 msgstr "Izven pisarne"
 
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "No Information"
 msgstr "Ni podatkov"
 
-#: ../calendar/gui/e-meeting-time-sel.c:584
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "O_ptions"
 msgstr "_MoÅnosti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "PokaÅi le del_ovne ure"
 
-#: ../calendar/gui/e-meeting-time-sel.c:613
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "Show _zoomed out"
 msgstr "PokaÅi _oddaljeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:629
+#: ../calendar/gui/e-meeting-time-sel.c:630
 msgid "_Update free/busy"
 msgstr "_Posodobi zasedenost"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:645
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "_Samodejno izberi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:695
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "Vsi ljudje in vs_a sredstva"
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "All _people and one resource"
 msgstr "Vsi _ljudje in eno sredstvo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:715
+#: ../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:725
 msgid "Required people and _one resource"
 msgstr "Zahtevani ljudje in _eno sredstvo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:773
+#: ../calendar/gui/e-meeting-time-sel.c:774
 msgid "_Start time:"
 msgstr "_ZaÄetni Äas:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:813
+#: ../calendar/gui/e-meeting-time-sel.c:814
 msgid "_End time:"
 msgstr "_KonÄni Äas:"
 
@@ -4333,50 +4349,50 @@ msgstr "Jezik"
 msgid "Member"
 msgstr "Älan"
 
-#: ../calendar/gui/e-memo-table.c:418
-#: ../modules/calendar/e-cal-shell-content.c:472
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../calendar/gui/e-memo-table.c:420
+#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 #: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:437
+#: ../plugins/caldav/caldav-browse-server.c:458
 msgid "Memos"
 msgstr "Opomniki"
 
-#: ../calendar/gui/e-memo-table.c:499
-#: ../calendar/gui/e-task-table.c:721
+#: ../calendar/gui/e-memo-table.c:501
+#: ../calendar/gui/e-task-table.c:733
 msgid "* No Summary *"
 msgstr "* Ni povzetka *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:584
-#: ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:588
+#: ../calendar/gui/e-task-table.c:817
 msgid "Start: "
 msgstr "ZaÄetek:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:603
-#: ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:607
+#: ../calendar/gui/e-task-table.c:835
 msgid "Due: "
 msgstr "Datum zapadlosti:"
 
-#: ../calendar/gui/e-memo-table.c:717
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Cut selected memos to the clipboard"
 msgstr "IzreÅi izbrane opomnike v odloÅiÅÄe"
 
-#: ../calendar/gui/e-memo-table.c:723
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopiraj izbrane opomnike v odloÅiÅÄe"
 
-#: ../calendar/gui/e-memo-table.c:729
+#: ../calendar/gui/e-memo-table.c:738
 msgid "Paste memos from the clipboard"
 msgstr "Prilepi opomnike iz odloÅiÅÄa"
 
-#: ../calendar/gui/e-memo-table.c:735
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete selected memos"
 msgstr "IzbriÅi izbrane opomnike"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:750
 msgid "Select all visible memos"
 msgstr "Izberi vse vidne opomnike"
 
@@ -4385,44 +4401,45 @@ msgid "Click to add a memo"
 msgstr "Kliknite za dodajanje opomnika"
 
 #. Translators: "%d%%" is the percentage of a task done.
-#. %d is the actual value, %% is replaced with a percent sign.
-#. Result values will be 0%, 10%, 20%, ... 100%
+#. * %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:543
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:640
-#: ../calendar/gui/print.c:2168
+#: ../calendar/gui/e-task-table.c:652
+#: ../calendar/gui/print.c:2273
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:971
-#: ../modules/calendar/e-cal-shell-content.c:433
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../calendar/importers/icalendar-importer.c:1043
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 #: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:435
+#: ../plugins/caldav/caldav-browse-server.c:456
 msgid "Tasks"
 msgstr "Naloge"
 
-#: ../calendar/gui/e-task-table.c:947
+#: ../calendar/gui/e-task-table.c:968
 msgid "Cut selected tasks to the clipboard"
 msgstr "IzreÅi izbrane naloge v odloÅiÅÄe"
 
-#: ../calendar/gui/e-task-table.c:953
+#: ../calendar/gui/e-task-table.c:974
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopiraj izbrane naloge v odloÅiÅÄe"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:980
 msgid "Paste tasks from the clipboard"
 msgstr "Prilepi naloge iz odloÅiÅÄa"
 
-#: ../calendar/gui/e-task-table.c:965
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../calendar/gui/e-task-table.c:986
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "IzbriÅi izbrane naloge"
 
-#: ../calendar/gui/e-task-table.c:971
+#: ../calendar/gui/e-task-table.c:992
 msgid "Select all visible tasks"
 msgstr "Izberi vse vidne naloge"
 
@@ -4431,15 +4448,16 @@ msgid "Select Timezone"
 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.
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:232
-#: ../calendar/gui/print.c:1856
+#: ../calendar/gui/print.c:1949
 msgid "%d %B"
 msgstr "%d %B"
 
 #: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has alarms."
+#, fuzzy
+msgid "It has reminders."
 msgstr "Ima alarme."
 
 #: ../calendar/gui/ea-cal-view-event.c:293
@@ -4467,27 +4485,27 @@ msgstr "pogled dogodka koledarja"
 msgid "Grab Focus"
 msgstr "Zgrabi ÅariÅÄe"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:315
 msgid "New Appointment"
 msgstr "Nov sestanek"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:316
 msgid "New All Day Event"
 msgstr "Nov celodnevni dogodek"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:317
 msgid "New Meeting"
 msgstr "Novo sreÄanje"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:318
 msgid "Go to Today"
 msgstr "Pojdi na danaÅnji dan"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:319
 msgid "Go to Date"
 msgstr "Pojdi na datum"
 
-#: ../calendar/gui/ea-day-view-main-item.c:312
+#: ../calendar/gui/ea-day-view-main-item.c:318
 #: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "razpredelnica za ogled in izbiro trenutnega Äasovnega obsega"
@@ -4535,21 +4553,21 @@ msgstr "pogled koledarja za enega ali veÄ dni"
 
 #: ../calendar/gui/ea-gnome-calendar.c:50
 #: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1003
+#: ../calendar/importers/icalendar-importer.c:1077
 msgid "Gnome Calendar"
 msgstr "Gnome Koledar"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1011
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%A %d %b %Y"
 msgstr "%A %d.%m.%Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1018
-#: ../modules/calendar/e-cal-shell-view-private.c:1024
-#: ../modules/calendar/e-cal-shell-view-private.c:1027
+#: ../modules/calendar/e-cal-shell-view-private.c:1057
+#: ../modules/calendar/e-cal-shell-view-private.c:1063
+#: ../modules/calendar/e-cal-shell-view-private.c:1066
 msgid "%a %d %b %Y"
 msgstr "%a %d.%b.%Y"
 
@@ -4557,10 +4575,10 @@ msgstr "%a %d.%b.%Y"
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1044
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
-#: ../modules/calendar/e-cal-shell-view-private.c:1062
-#: ../modules/calendar/e-cal-shell-view-private.c:1065
+#: ../modules/calendar/e-cal-shell-view-private.c:1083
+#: ../modules/calendar/e-cal-shell-view-private.c:1094
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
 msgid "%d %b %Y"
 msgstr "%d.%m.%Y"
 
@@ -4590,41 +4608,41 @@ msgstr "meseÄni pogled v koledarju"
 msgid "calendar view for one or more weeks"
 msgstr "pogled koledarja za enega ali veÄ tednov"
 
-#: ../calendar/gui/gnome-cal.c:2209
+#: ../calendar/gui/gnome-cal.c:2250
 msgid "Purging"
 msgstr "ÄiÅÄenje"
 
-#: ../calendar/gui/itip-utils.c:503
-#: ../calendar/gui/itip-utils.c:558
-#: ../calendar/gui/itip-utils.c:661
+#: ../calendar/gui/itip-utils.c:511
+#: ../calendar/gui/itip-utils.c:566
+#: ../calendar/gui/itip-utils.c:669
 msgid "An organizer must be set."
 msgstr "Organizator mora biti nastavljen."
 
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:558
 msgid "At least one attendee is necessary"
 msgstr "Zahtevan je vsaj en udeleÅenec"
 
-#: ../calendar/gui/itip-utils.c:747
-#: ../calendar/gui/itip-utils.c:908
+#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:916
 msgid "Event information"
 msgstr "Podatki o dogodku"
 
-#: ../calendar/gui/itip-utils.c:750
-#: ../calendar/gui/itip-utils.c:911
+#: ../calendar/gui/itip-utils.c:758
+#: ../calendar/gui/itip-utils.c:919
 msgid "Task information"
 msgstr "Podatki o nalogi"
 
-#: ../calendar/gui/itip-utils.c:753
-#: ../calendar/gui/itip-utils.c:914
+#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:922
 msgid "Memo information"
 msgstr "Podatki o opomnikih"
 
-#: ../calendar/gui/itip-utils.c:756
-#: ../calendar/gui/itip-utils.c:932
+#: ../calendar/gui/itip-utils.c:764
+#: ../calendar/gui/itip-utils.c:940
 msgid "Free/Busy information"
 msgstr "Podatki o zasedenosti"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:767
 msgid "Calendar information"
 msgstr "Podatki o koledarju"
 
@@ -4632,7 +4650,7 @@ msgstr "Podatki o koledarju"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:796
+#: ../calendar/gui/itip-utils.c:804
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Sprejeto"
@@ -4641,7 +4659,7 @@ msgstr "Sprejeto"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:803
+#: ../calendar/gui/itip-utils.c:811
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
@@ -4653,8 +4671,8 @@ msgstr "Poskusno sprejeto"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:810
-#: ../calendar/gui/itip-utils.c:858
+#: ../calendar/gui/itip-utils.c:818
+#: ../calendar/gui/itip-utils.c:866
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odklonjeno"
@@ -4663,7 +4681,7 @@ msgstr "Odklonjeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:825
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "PooblaÅÄeno zastopanje "
@@ -4671,7 +4689,7 @@ msgstr "PooblaÅÄeno zastopanje "
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:830
+#: ../calendar/gui/itip-utils.c:838
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Posodobljeno"
@@ -4679,7 +4697,7 @@ msgstr "Posodobljeno"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:845
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "PrekliÄi"
@@ -4687,7 +4705,7 @@ msgstr "PrekliÄi"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:844
+#: ../calendar/gui/itip-utils.c:852
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "OsveÅi"
@@ -4695,252 +4713,252 @@ msgstr "OsveÅi"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:851
+#: ../calendar/gui/itip-utils.c:859
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Nasprotni-predlog"
 
-#: ../calendar/gui/itip-utils.c:929
+#: ../calendar/gui/itip-utils.c:937
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podatki o zasedenosti (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:945
 msgid "iCalendar information"
 msgstr "Podrobnosti iCalendar"
 
-#: ../calendar/gui/itip-utils.c:962
+#: ../calendar/gui/itip-utils.c:970
 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:966
+#: ../calendar/gui/itip-utils.c:974
 msgid "Unable to book a resource, error: "
 msgstr "Ni mogoÄe rezervirati vira, napaka:"
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1137
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleÅenec dogodka."
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:581
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:581
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:581
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:581
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:581
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:582
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:582
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:582
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:582
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:582
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:583
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:583
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:583
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:583
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:583
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:584
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:584
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:584
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:584
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:584
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:585
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:585
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:585
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:585
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:585
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:586
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:586
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:586
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:586
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:586
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:587
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:644
 msgid "Su"
 msgstr "ne"
 
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:644
 msgid "Mo"
 msgstr "po"
 
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:644
 msgid "Tu"
 msgstr "to"
 
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:644
 msgid "We"
 msgstr "sr"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:645
 msgid "Th"
 msgstr "Äe"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:645
 msgid "Fr"
 msgstr "pe"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:645
 msgid "Sa"
 msgstr "so"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3014
+#: ../calendar/gui/print.c:3139
 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:3024
+#: ../calendar/gui/print.c:3149
 msgid " (Completed "
 msgstr " (KonÄano "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3030
+#: ../calendar/gui/print.c:3155
 msgid "Completed "
 msgstr "KonÄano "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3040
+#: ../calendar/gui/print.c:3165
 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:3047
+#: ../calendar/gui/print.c:3172
 msgid "Due "
 msgstr "Datum zapadlosti"
 
-#: ../calendar/gui/print.c:3212
+#: ../calendar/gui/print.c:3337
 #, c-format
 msgid "Summary: %s"
 msgstr "Povzetek: %s"
 
-#: ../calendar/gui/print.c:3239
+#: ../calendar/gui/print.c:3364
 msgid "Attendees: "
 msgstr "NavzoÄi:"
 
-#: ../calendar/gui/print.c:3282
+#: ../calendar/gui/print.c:3407
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../calendar/gui/print.c:3297
+#: ../calendar/gui/print.c:3422
 #, c-format
 msgid "Priority: %s"
 msgstr "Prednost: %s"
 
-#: ../calendar/gui/print.c:3315
+#: ../calendar/gui/print.c:3440
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Odstotkov opravljeno: %i"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3451
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3339
+#: ../calendar/gui/print.c:3464
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:3350
+#: ../calendar/gui/print.c:3475
 msgid "Contacts: "
 msgstr "Stiki: "
 
@@ -4971,181 +4989,182 @@ msgstr "je manjÅe kot"
 msgid "Appointments and Meetings"
 msgstr "Sestanki in sreÄanja"
 
-#: ../calendar/importers/icalendar-importer.c:407
-#: ../calendar/importers/icalendar-importer.c:817
-#: ../plugins/itip-formatter/itip-formatter.c:2094
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
 msgid "Opening calendar"
 msgstr "Odpiranje koledarja"
 
-#: ../calendar/importers/icalendar-importer.c:547
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "iCalendar files (.ics)"
 msgstr "Datoteke iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:548
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution iCalendar importer"
 msgstr "Uvoznik Evolution iCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:636
+#: ../calendar/importers/icalendar-importer.c:674
 msgid "Reminder!"
 msgstr "Opomnik!"
 
-#: ../calendar/importers/icalendar-importer.c:716
+#: ../calendar/importers/icalendar-importer.c:758
 msgid "vCalendar files (.vcs)"
 msgstr "Datoteke vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:717
+#: ../calendar/importers/icalendar-importer.c:759
 msgid "Evolution vCalendar importer"
 msgstr "Uvoznik Evolution vCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:966
+#: ../calendar/importers/icalendar-importer.c:1038
 msgid "Calendar Events"
 msgstr "Dogodki koledarja"
 
-#: ../calendar/importers/icalendar-importer.c:1004
+#: ../calendar/importers/icalendar-importer.c:1078
 msgid "Evolution Calendar intelligent importer"
 msgstr "Pametni uvoznik koledarja Evolutiona"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "SreÄanje"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Dogodek"
 
-#: ../calendar/importers/icalendar-importer.c:1072
-#: ../calendar/importers/icalendar-importer.c:1387
+#: ../calendar/importers/icalendar-importer.c:1149
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Naloga"
 
-#: ../calendar/importers/icalendar-importer.c:1075
-#: ../calendar/importers/icalendar-importer.c:1388
+#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1466
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Opomnik"
 
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/importers/icalendar-importer.c:1161
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ima ponavljanja"
 
-#: ../calendar/importers/icalendar-importer.c:1089
+#: ../calendar/importers/icalendar-importer.c:1166
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "je primerek"
 
-#: ../calendar/importers/icalendar-importer.c:1094
+#: ../calendar/importers/icalendar-importer.c:1171
+#, fuzzy
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "ima alarme"
+msgid "has reminders"
+msgstr "_Trenutni opomniki:"
 
-#: ../calendar/importers/icalendar-importer.c:1099
+#: ../calendar/importers/icalendar-importer.c:1176
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ima priloge"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1112
+#: ../calendar/importers/icalendar-importer.c:1189
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Javno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1192
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Zasebno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Zaupno"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1122
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Razvrstitev"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1127
-#: ../calendar/importers/icalendar-importer.c:1427
+#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Povzetek"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1133
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Mesto"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1141
-#: ../calendar/importers/icalendar-importer.c:1423
+#: ../calendar/importers/icalendar-importer.c:1218
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "ZaÄetek"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Datum zakasnelosti"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1164
+#: ../calendar/importers/icalendar-importer.c:1241
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Konec"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1174
+#: ../calendar/importers/icalendar-importer.c:1251
 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:1198
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "KonÄano"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1283
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1217
-#: ../calendar/importers/icalendar-importer.c:1220
+#: ../calendar/importers/icalendar-importer.c:1294
+#: ../calendar/importers/icalendar-importer.c:1297
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1240
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "UdeleÅenci"
 
-#: ../calendar/importers/icalendar-importer.c:1257
+#: ../calendar/importers/icalendar-importer.c:1334
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Opis"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1419
+#: ../calendar/importers/icalendar-importer.c:1497
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Vrsta"
@@ -6703,11 +6722,6 @@ msgstr "Tihi_ocean/Yap"
 msgid "Save as..."
 msgstr "Shrani kot ..."
 
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
-msgid "Attach a file"
-msgstr "PriloÅi datoteko"
-
 #: ../composer/e-composer-actions.c:296
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
@@ -6726,7 +6740,7 @@ msgid "Open New Message window"
 msgstr "Odpre okno novega sporoÄila"
 
 #: ../composer/e-composer-actions.c:312
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Nastavitve programa Evolution"
 
@@ -6867,35 +6881,35 @@ msgstr "Vnesite naslove, ki bodo prejeli kopijo sporoÄila"
 msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
 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:1020
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "_Od:"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "Odgovori-_na:"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "_Za:"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "_Kp:"
 
-#: ../composer/e-composer-header-table.c:1043
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "_Skp:"
 
-#: ../composer/e-composer-header-table.c:1048
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "_Objavi na:"
 
-#: ../composer/e-composer-header-table.c:1052
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "Z_adeva:"
 
-#: ../composer/e-composer-header-table.c:1061
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "_Podpis:"
 
@@ -6927,26 +6941,26 @@ msgstr "Iskanje in zamenjava besedila"
 msgid "Save draft"
 msgstr "Shrani osnutek"
 
-#: ../composer/e-msg-composer.c:791
+#: ../composer/e-msg-composer.c:812
 #, c-format
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Odhodnega sporoÄila ni mogoÄe podpisati: za ta raÄun ni nastavljeno nobeno potrdilo za podpisovanje"
 
-#: ../composer/e-msg-composer.c:800
+#: ../composer/e-msg-composer.c:821
 #, c-format
 msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "Odhodnega sporoÄila ni mogoÄe Åifrirati: za ta raÄun ni nastavljeno nobeno potrdilo za Åifriranje"
 
-#: ../composer/e-msg-composer.c:1695
-#: ../composer/e-msg-composer.c:2079
+#: ../composer/e-msg-composer.c:1699
+#: ../composer/e-msg-composer.c:2083
 msgid "Compose Message"
 msgstr "Sestavi sporoÄilo"
 
-#: ../composer/e-msg-composer.c:4159
+#: ../composer/e-msg-composer.c:4228
 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:4864
+#: ../composer/e-msg-composer.c:4933
 msgid "Untitled Message"
 msgstr "Neimenovano sporoÄilo"
 
@@ -7032,7 +7046,7 @@ msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "Datoteka '{0}' ni obiÄajna datoteka in je ni mogoÄe poslati s sporoÄilom."
 
 #: ../composer/mail-composer.error.xml.h:21
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "PoroÄana napaka je bila &quot;{0}&quot;."
 
@@ -7082,11 +7096,11 @@ msgid "_Try Again"
 msgstr "_Poskusi znova"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:153
+#: ../capplet/anjal-settings-main.c:154
 msgid "ID of the socket to embed in"
 msgstr "ID vtiÄa za vstavljanje"
 
-#: ../capplet/anjal-settings-main.c:154
+#: ../capplet/anjal-settings-main.c:155
 msgid "socket"
 msgstr "vtiÄ"
 
@@ -7107,157 +7121,159 @@ msgid "Please enter your password."
 msgstr "Vnesite svoje geslo."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
 #: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:483
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "Osebni podatki"
 
-#: ../capplet/settings/mail-account-view.c:490
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../capplet/settings/mail-account-view.c:499
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "Elektronski naslov:"
 
-#: ../capplet/settings/mail-account-view.c:509
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
 msgstr "Podrobnosti:"
 
-#: ../capplet/settings/mail-account-view.c:517
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
 msgstr "Prejemanje"
 
-#: ../capplet/settings/mail-account-view.c:524
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "Vrsta streÅnika:"
 
-#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "Naslov streÅnika:"
 
-#: ../capplet/settings/mail-account-view.c:542
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "UporabniÅko ime:"
 
-#: ../capplet/settings/mail-account-view.c:551
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "Uporabi Åifriranje:"
 
-#: ../capplet/settings/mail-account-view.c:556
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "nikoli"
 
-#: ../capplet/settings/mail-account-view.c:568
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
 msgstr "PoÅiljanje"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:607
 msgid "To use the email application you'll need to setup an account. Put your email address and password in below and we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well."
 msgstr "Za uporabo odjemalca elektronske poÅte je treba nastaviti raÄun. Spodaj je treba vpisati naslov elektronske poÅte in geslo, program pa bo poskuÅal ugotoviti vse nastavitve. V primeru da tega ni mogoÄe storiti samodejno, boste morali vnesti tudi podrobnosti streÅnika."
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried to make a start with the details you just entered but you may need to change them."
 msgstr "Ni mogoÄe samodejno nastaviti nastavitev elektronske poÅte. Vnesti jih je treba roÄno. Nekaj podatkov je Åe vnesenih, vendar pa jih je morda treba spremeniti."
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
 msgstr "Navesti je mogoÄe veÄ moÅnosti za nastavitev raÄuna."
 
-#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure."
 msgstr "Tukaj vpiÅite podatke za poÅiljanje poÅte. Nekaj podatkov je program poskusil uganiti, vendar pa jih je treba preveriti."
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr "Navesti je mogoÄe privzete nastavitve raÄuna."
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Time to check things over before we try and connect to the server and fetch your mail."
 msgstr "Zadnji pregled nastavitev pred poskusom povezave s streÅnikom in poskusom prejema vaÅe poÅte."
 
-#: ../capplet/settings/mail-account-view.c:633
-#: ../mail/em-account-editor.c:2181
-#: ../mail/em-account-editor.c:2313
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289
+#: ../mail/em-account-editor.c:2425
 msgid "Identity"
 msgstr "Istovetnost"
 
-#: ../capplet/settings/mail-account-view.c:633
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
 msgstr "Naprej - Prejemanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "Prejemanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
 msgstr "Naprej - PoÅiljanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
 msgstr "Nazaj - Istovetnost"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
 msgstr "Naprej - MoÅnosti prejemanja"
 
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "MoÅnosti prejemanja"
 
-#: ../capplet/settings/mail-account-view.c:635
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
 msgstr "Nazaj - Prejemanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "PoÅiljanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:637
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
 msgstr "Naprej - Pregled raÄuna"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
 msgstr "Naprej - Privzete nastavitve"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
 msgstr "Nazaj - MoÅnosti prejemanja"
 
-#: ../capplet/settings/mail-account-view.c:638
-#: ../mail/em-account-editor.c:3200
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
 msgid "Defaults"
 msgstr "Privzeto"
 
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
 msgstr "Nazaj - PoÅiljanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "Pregled raÄuna"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "KonÄaj"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
 msgstr "Nazaj - PoÅiljanje"
 
@@ -7293,12 +7309,12 @@ msgstr "Nastavite raÄuna Yahoo:"
 msgid "Yahoo Calendar name:"
 msgstr "Ime koledarja Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:1099
+#: ../capplet/settings/mail-account-view.c:1098
 msgid "Password:"
 msgstr "Geslo:"
 
 #: ../capplet/settings/mail-account-view.c:1150
-#: ../capplet/settings/mail-settings-view.c:248
+#: ../capplet/settings/mail-settings-view.c:254
 msgid "Close Tab"
 msgstr "Zapri zavihek"
 
@@ -7306,47 +7322,45 @@ msgstr "Zapri zavihek"
 msgid "Account Wizard"
 msgstr "Äarovnik za raÄune"
 
-#: ../capplet/settings/mail-capplet-shell.c:212
+#: ../capplet/settings/mail-capplet-shell.c:215
 msgid "Evolution account assistant"
 msgstr "PomoÄnik za raÄune Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:368
-#: ../mail/e-mail-migrate.c:744
-#: ../mail/e-mail-store.c:234
-#: ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149
-#: ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154
+#: ../capplet/settings/mail-capplet-shell.c:377
+#: ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:750
+#: ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:159
 #: ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163
-#: ../mail/mail-vfolder.c:235
-#: ../mail/message-list.c:1714
-#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../mail/em-folder-tree-model.c:168
+#: ../mail/em-folder-tree-model.c:170
+#: ../modules/addressbook/e-book-shell-backend.c:100
 #: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:113
 #: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-backend.c:102
 #: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-backend.c:102
 #: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "Na tem raÄunalniku"
 
-#: ../capplet/settings/mail-settings-view.c:145
+#: ../capplet/settings/mail-settings-view.c:150
 #, c-format
 msgid "Modify %s..."
 msgstr "Spremeni %s ..."
 
-#: ../capplet/settings/mail-settings-view.c:147
+#: ../capplet/settings/mail-settings-view.c:152
 msgid "Add a new account"
 msgstr "Dodaj nov raÄun"
 
-#: ../capplet/settings/mail-settings-view.c:183
+#: ../capplet/settings/mail-settings-view.c:188
 msgid "Account management"
 msgstr "Upravljanje z raÄunom"
 
-#: ../capplet/settings/mail-settings-view.c:258
+#: ../capplet/settings/mail-settings-view.c:264
 msgid "Settings"
 msgstr "Nastavitve"
 
@@ -7359,7 +7373,7 @@ msgid "Evolution Alarm Notify"
 msgstr "Obvestilo o alarmu Evolution"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../mail/e-mail-browser.c:996
+#: ../mail/e-mail-browser.c:999
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
@@ -7370,7 +7384,7 @@ msgid "Evolution Mail and Calendar"
 msgstr "Evolution koledar in poÅta"
 
 #: ../data/evolution.desktop.in.in.h:3
-#: ../shell/e-shell-window-actions.c:657
+#: ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Zbirka za skupinsko delo"
 
@@ -7503,86 +7517,86 @@ msgid "Visual"
 msgstr "Vidno"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1823
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1856
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Danes"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:210
+#: ../e-util/e-datetime-format.c:217
 #: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Jutri"
 
-#: ../e-util/e-datetime-format.c:212
+#: ../e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "VÄeraj"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:220
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:227
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Naslednji pon"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:226
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:233
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Naslednji tor"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:232
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:239
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Naslednja sre"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:238
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:245
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Naslednji Äet"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:244
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:251
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Naslednji pet"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:250
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:257
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Naslednja sob"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:256
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:263
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Naslednja ned"
 
-#: ../e-util/e-datetime-format.c:338
-#: ../e-util/e-datetime-format.c:348
-#: ../e-util/e-datetime-format.c:357
+#: ../e-util/e-datetime-format.c:350
+#: ../e-util/e-datetime-format.c:360
+#: ../e-util/e-datetime-format.c:369
 msgid "Use locale default"
 msgstr "Uporabi privzete nastavitve jezikovne oznake"
 
-#: ../e-util/e-datetime-format.c:554
+#: ../e-util/e-datetime-format.c:574
 msgid "Format:"
 msgstr "Oblika:"
 
@@ -7603,9 +7617,9 @@ msgstr "Zapisovanje \"%s\""
 msgid "Writing \"%s\" to %s"
 msgstr "Zapisovanje \"%s\" v %s"
 
-#: ../e-util/e-plugin-util.c:429
+#: ../e-util/e-plugin-util.c:455
 #: ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:380
+#: ../plugins/google-account-setup/google-contacts-source.c:388
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "tednov"
@@ -7622,7 +7636,7 @@ msgstr "Podrobnosti o napaki sistema tiskanja:"
 msgid "The printing system did not report any additional details about the error."
 msgstr "Ni dodatnih podrobnosti o napaki sistema tiskanja."
 
-#: ../e-util/e-signature.c:707
+#: ../e-util/e-signature.c:708
 msgid "Autogenerated"
 msgstr "Samodejno ustvarjeno"
 
@@ -7647,7 +7661,7 @@ msgid "File exists \"{0}\"."
 msgstr "Datoteka obstaja \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "_PrepiÅi"
 
@@ -7659,130 +7673,130 @@ msgstr "Ni mogoÄe odpreti povezave."
 msgid "Could not display help for Evolution."
 msgstr "Ni mogoÄe prikazati pomoÄi za program Evolution."
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "Napaka Gconf: %s"
 
-#: ../e-util/gconf-bridge.c:1329
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "Vse nadaljnje napake so izpisane le v terminalu."
 
-#: ../em-format/em-format-quote.c:284
-#: ../em-format/em-format.c:1054
+#: ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1060
 #: ../mail/e-mail-tag-editor.c:325
 #: ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "Od"
 
-#: ../em-format/em-format-quote.c:284
-#: ../em-format/em-format.c:1055
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Odgovori-na"
 
-#: ../em-format/em-format-quote.c:284
-#: ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2488
-#: ../mail/em-format-html.c:2556
-#: ../mail/em-format-html.c:2579
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1063
+#: ../mail/em-format-html.c:2593
+#: ../mail/em-format-html.c:2661
+#: ../mail/em-format-html.c:2684
+#: ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Kp"
 
-#: ../em-format/em-format-quote.c:284
-#: ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2489
-#: ../mail/em-format-html.c:2560
-#: ../mail/em-format-html.c:2582
-#: ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1064
+#: ../mail/em-format-html.c:2594
+#: ../mail/em-format-html.c:2665
+#: ../mail/em-format-html.c:2687
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Skp"
 
-#: ../em-format/em-format-quote.c:428
-#: ../em-format/em-format.c:1059
+#: ../em-format/em-format-quote.c:464
+#: ../em-format/em-format.c:1065
 #: ../mail/e-mail-tag-editor.c:330
 #: ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18
-#: ../modules/mail/em-mailer-prefs.c:75
-#: ../smime/lib/e-cert.c:1142
+#: ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1151
 msgid "Subject"
 msgstr "Zadeva"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:439
-#: ../mail/em-format-html.c:2676
-#: ../modules/mail/em-mailer-prefs.c:1129
+#: ../em-format/em-format-quote.c:475
+#: ../mail/em-format-html.c:2786
+#: ../modules/mail/em-mailer-prefs.c:1028
 msgid "Mailer"
 msgstr "PoÅtni odjemalec"
 
-#: ../em-format/em-format-quote.c:520
-#: ../mail/em-composer-utils.c:1190
+#: ../em-format/em-format-quote.c:565
+#: ../mail/em-composer-utils.c:1203
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Posredovano sporoÄilo --------"
 
-#: ../em-format/em-format.c:1060
+#: ../em-format/em-format.c:1066
 #: ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76
+#: ../modules/mail/em-mailer-prefs.c:78
 #: ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/em-format.c:1061
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1067
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "NoviÄarske skupine"
 
-#: ../em-format/em-format.c:1062
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1068
+#: ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Obraz"
 
-#: ../em-format/em-format.c:1465
+#: ../em-format/em-format.c:1472
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: ../em-format/em-format.c:1576
+#: ../em-format/em-format.c:1583
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ni mogoÄe razÄleniti sporoÄila S/MIME: neznana napaka"
 
-#: ../em-format/em-format.c:1768
-#: ../em-format/em-format.c:1994
+#: ../em-format/em-format.c:1777
+#: ../em-format/em-format.c:2005
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ni mogoÄe razÄleniti sporoÄila MIME. Prikazano bo kot vir."
 
-#: ../em-format/em-format.c:1779
+#: ../em-format/em-format.c:1788
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodprta vrsta Åifriranja za veÄdelno/Åifrirano"
 
-#: ../em-format/em-format.c:1799
+#: ../em-format/em-format.c:1808
 msgid "Could not parse PGP/MIME message"
 msgstr "Ni mogoÄe razÄleniti sporoÄila PGP/MIME"
 
-#: ../em-format/em-format.c:1800
+#: ../em-format/em-format.c:1809
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Ni mogoÄe razÄleniti sporoÄila PGP/MIME: neznana napaka"
 
-#: ../em-format/em-format.c:2019
+#: ../em-format/em-format.c:2030
 msgid "Unsupported signature format"
 msgstr "Nepodprta oblika podpisa"
 
-#: ../em-format/em-format.c:2032
-#: ../em-format/em-format.c:2214
+#: ../em-format/em-format.c:2043
+#: ../em-format/em-format.c:2225
 msgid "Error verifying signature"
 msgstr "Napaka med preverjanjem sporoÄila"
 
-#: ../em-format/em-format.c:2033
-#: ../em-format/em-format.c:2199
-#: ../em-format/em-format.c:2215
+#: ../em-format/em-format.c:2044
+#: ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
 msgid "Unknown error verifying signature"
 msgstr "Neznana napaka med preverjanjem podpisa"
 
-#: ../em-format/em-format.c:2307
+#: ../em-format/em-format.c:2318
 msgid "Could not parse PGP message: "
 msgstr "Ni mogoÄe razÄleniti PGP sporoÄila:"
 
@@ -7929,7 +7943,7 @@ msgstr "sedaj"
 msgid "%d-%b-%Y"
 msgstr "%d.%m.%Y"
 
-#: ../filter/e-filter-datespec.c:282
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Izberite Äas s katerim naj se primerja"
 
@@ -7937,73 +7951,74 @@ msgstr "Izberite Äas s katerim naj se primerja"
 msgid "Choose a File"
 msgstr "Izbor datoteke"
 
-#: ../filter/e-filter-rule.c:664
+#: ../filter/e-filter-rule.c:666
 msgid "R_ule name:"
 msgstr "Ime _pravila:"
 
-#: ../filter/e-filter-rule.c:694
+#: ../filter/e-filter-rule.c:696
 msgid "Find items that meet the following conditions"
 msgstr "Najdi predmete, ki ustrezajo naslednjim pogojem"
 
-#: ../filter/e-filter-rule.c:719
+#: ../filter/e-filter-rule.c:721
 msgid "If all conditions are met"
 msgstr "Äe je zadoÅÄeno vsem pogojem"
 
-#: ../filter/e-filter-rule.c:720
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "Äe je zadoÅÄeno kateremukoli pogoju"
 
-#: ../filter/e-filter-rule.c:723
+#: ../filter/e-filter-rule.c:725
 msgid "_Find items:"
 msgstr "_PoiÅÄi predmete:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:752
+#: ../filter/e-filter-rule.c:754
 msgid "None"
 msgstr "brez"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:755
 msgid "All related"
 msgstr "Vse povezano"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:756
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Odgovori"
 
-#: ../filter/e-filter-rule.c:755
+#: ../filter/e-filter-rule.c:757
 msgid "Replies and parents"
 msgstr "Odgovori in nadrejeni"
 
-#: ../filter/e-filter-rule.c:756
+#: ../filter/e-filter-rule.c:758
 msgid "No reply or parent"
 msgstr "Brez odgovora ali nadrejenega"
 
-#: ../filter/e-filter-rule.c:759
-msgid "I_nclude threads"
+#: ../filter/e-filter-rule.c:761
+#, fuzzy
+msgid "I_nclude threads:"
 msgstr "VkljuÄi _niti"
 
-#: ../filter/e-filter-rule.c:784
+#: ../filter/e-filter-rule.c:786
 msgid "A_dd Condition"
 msgstr "Dodaj _pogoj"
 
-#: ../filter/e-filter-rule.c:1133
+#: ../filter/e-filter-rule.c:1135
 #: ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:321
 msgid "Incoming"
 msgstr "Dohodna"
 
-#: ../filter/e-filter-rule.c:1133
-#: ../mail/em-utils.c:320
+#: ../filter/e-filter-rule.c:1135
+#: ../mail/em-utils.c:322
 msgid "Outgoing"
 msgstr "Odhodna"
 
-#: ../filter/e-rule-editor.c:263
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: ../filter/e-rule-editor.c:349
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
@@ -8028,7 +8043,7 @@ msgid "Missing file name."
 msgstr "Manjka ime datoteke."
 
 #: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "Manjka ime."
 
@@ -8085,7 +8100,7 @@ msgstr ""
 "Äasom, ko se izvede filtriranje."
 
 #: ../filter/filter.ui.h:11
-#: ../mail/em-filter-editor.c:193
+#: ../mail/em-filter-editor.c:194
 msgid "_Filter Rules"
 msgstr "Pravila _filtriranja"
 
@@ -8122,14 +8137,142 @@ msgstr "Äas, ki ga navedete"
 msgid "years"
 msgstr "let"
 
-#: ../mail/e-mail-attachment-bar.c:90
-#: ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1156
-#: ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
-msgid "Attachment"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863
+#: ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "Brez"
+
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "Nikoli"
+
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "Vedno"
+
+#: ../mail/em-account-editor.c:948
+msgid "Ask for each message"
+msgstr "VpraÅaj za vsako sporoÄilo"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1833
+#: ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Brez"
+
+#: ../mail/em-account-editor.c:2237
+msgid "Fil_e:"
+msgstr "_Datoteka:"
+
+#: ../mail/em-account-editor.c:2237
+#: ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "_Pot:"
+
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "Nastavitev poÅte"
+
+#: ../mail/em-account-editor.c:2287
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"DobrodoÅli v pomoÄniku za poÅtne nastavitve programa Evolution.\n"
+"\n"
+"Kliknite \"Naprej\" za zaÄetek."
+
+#: ../mail/em-account-editor.c:2290
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr "Spodaj vnesite svoje ime in naslov elektronske poÅte. Polj \"dodatno\" ni treba izpolnjevati, razen Äe Åelite tudi te podatke vkljuÄiti v elektronsko poÅto, ki jo boste poÅiljali."
+
+#: ../mail/em-account-editor.c:2292
+#: ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "Prejemanje elektronske poÅte"
+
+#: ../mail/em-account-editor.c:2293
+msgid "Please configure the following account settings."
+msgstr "Nastavite naslednje nastavitve raÄuna."
+
+#: ../mail/em-account-editor.c:2295
+#: ../mail/em-account-editor.c:3081
+msgid "Sending Email"
+msgstr "PoÅiljanje elektronske poÅte"
+
+#: ../mail/em-account-editor.c:2296
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "Vnesite podatke o naÄinu poÅiljanja poÅte. Äe niste prepriÄani, se obrnite na svojega sistemskega skrbnika ali ponudnika dostopa do medmreÅja."
+
+#: ../mail/em-account-editor.c:2298
+#: ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Podrobnosti raÄuna"
+
+#: ../mail/em-account-editor.c:2299
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"V spodnji prostor vnesite opisno ime tega raÄuna.\n"
+"To ime bo uporabljeno samo za prikaz."
+
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "KonÄano"
+
+#: ../mail/em-account-editor.c:2304
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Nastavljanje vaÅe poÅte je konÄano.\n"
+"\n"
+"Sedaj je mogoÄe prejemati in poÅiljati poÅto s pomoÄjo programa Evolution.\n"
+"\n"
+"S klikom na gumb \"Uveljavi\" bodo spremembe shranjene."
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "Samodejno preveri _novo poÅto vsakih"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "_minut"
+
+#: ../mail/em-account-editor.c:3520
+#: ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "Varnost"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3575
+#: ../mail/em-account-editor.c:3658
+msgid "Receiving Options"
+msgstr "MoÅnosti prejemanja"
+
+#: ../mail/em-account-editor.c:3576
+#: ../mail/em-account-editor.c:3659
+msgid "Checking for New Messages"
+msgstr "Preverjanje za nova sporoÄila"
+
+#: ../mail/e-mail-attachment-bar.c:90
+#: ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1416
+#: ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
+msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Prilog"
 msgstr[1] "Priloga"
@@ -8147,13 +8290,13 @@ msgid "List View"
 msgstr "Seznamski pogled"
 
 #: ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: ../mail/e-mail-browser.c:291
+#: ../mail/e-mail-browser.c:293
 msgid "(No Subject)"
 msgstr "(brez zadeve)"
 
@@ -8203,25 +8346,25 @@ msgstr[1] "Pridobivanje %d sporoÄila"
 msgstr[2] "Pridobivanje %d sporoÄil"
 msgstr[3] "Pridobivanje %d sporoÄil"
 
-#: ../mail/e-mail-folder-utils.c:824
+#: ../mail/e-mail-folder-utils.c:834
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Odstranjevanje mape '%s'"
 
-#: ../mail/e-mail-folder-utils.c:948
+#: ../mail/e-mail-folder-utils.c:968
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Datoteka \"%s\" je odstranjena."
 
-#: ../mail/e-mail-folder-utils.c:952
+#: ../mail/e-mail-folder-utils.c:972
 msgid "File has been removed."
 msgstr "Datoteka je odstranjena."
 
-#: ../mail/e-mail-folder-utils.c:1011
+#: ../mail/e-mail-folder-utils.c:1031
 msgid "Removing attachments"
 msgstr "Odstranjevanje prilog"
 
-#: ../mail/e-mail-folder-utils.c:1177
+#: ../mail/e-mail-folder-utils.c:1195
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -8230,12 +8373,19 @@ msgstr[1] "Shranjevanje %d sporoÄila"
 msgstr[2] "Shranjevanje %d sporoÄil"
 msgstr[3] "Shranjevanje %d sporoÄil"
 
-#: ../mail/e-mail-folder-utils.c:1515
-#: ../mail/em-folder-utils.c:577
+#: ../mail/e-mail-folder-utils.c:1539
+#: ../mail/em-folder-utils.c:613
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Neveljaven naslov URI mape '%s'"
 
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+#, fuzzy
+msgid "Junk filtering software:"
+msgstr "Upravljanje programske opreme"
+
 #: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
 msgstr "_Ime oznake:"
@@ -8265,7 +8415,7 @@ msgid "_Later"
 msgstr "_Pozneje"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:676
+#: ../modules/mail/e-mail-shell-view-actions.c:684
 msgid "Add Label"
 msgstr "Dodaj oznako"
 
@@ -8287,66 +8437,66 @@ msgstr "Barva"
 
 #: ../mail/e-mail-label-tree-view.c:98
 #: ../modules/plugin-manager/evolution-plugin-manager.c:69
-#: ../plugins/caldav/caldav-browse-server.c:1295
-#: ../widgets/menus/gal-define-views-dialog.c:336
+#: ../plugins/caldav/caldav-browse-server.c:1358
+#: ../widgets/menus/gal-define-views-dialog.c:347
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "Ime"
 
 #: ../mail/e-mail-local.c:41
-#: ../mail/em-folder-properties.c:310
-#: ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:720
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Dohodna poÅta"
 
 #: ../mail/e-mail-local.c:42
-#: ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Osnutki"
 
 #: ../mail/e-mail-local.c:43
-#: ../mail/em-folder-tree-model.c:726
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../mail/em-folder-tree-model.c:724
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Odhodni predal"
 
 #: ../mail/e-mail-local.c:44
-#: ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1069
+#: ../mail/em-folder-tree-model.c:728
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Poslano"
 
 #: ../mail/e-mail-local.c:45
-#: ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../mail/em-folder-tree-model.c:716
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:1006
-#: ../plugins/templates/templates.c:1283
-#: ../plugins/templates/templates.c:1293
+#: ../plugins/templates/templates.c:1034
+#: ../plugins/templates/templates.c:1312
+#: ../plugins/templates/templates.c:1322
 msgid "Templates"
 msgstr "Predloge"
 
-#: ../mail/e-mail-migrate.c:133
+#: ../mail/e-mail-migrate.c:134
 msgid "Migrating..."
 msgstr "Preseljevanje ..."
 
-#: ../mail/e-mail-migrate.c:168
+#: ../mail/e-mail-migrate.c:169
 msgid "Migration"
 msgstr "Preseljevanje"
 
-#: ../mail/e-mail-migrate.c:209
+#: ../mail/e-mail-migrate.c:210
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Preseljevanje '%s':"
 
-#: ../mail/e-mail-migrate.c:722
+#: ../mail/e-mail-migrate.c:728
 msgid "Migrating Folders"
 msgstr "Preselitev map"
 
-#: ../mail/e-mail-migrate.c:723
+#: ../mail/e-mail-migrate.c:729
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
 "\n"
@@ -8356,714 +8506,714 @@ msgstr ""
 "\n"
 "PoÄakajte, medtem ko Evolution preseli vaÅe mape ..."
 
-#: ../mail/e-mail-migrate.c:1279
+#: ../mail/e-mail-migrate.c:1527
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Ni mogoÄe ustvariti krajevnih map poÅte v '%s': %s"
 
-#: ../mail/e-mail-notebook-view.c:619
+#: ../mail/e-mail-notebook-view.c:621
 msgid "Please select a folder"
 msgstr "Izberite mapo"
 
-#: ../mail/e-mail-reader-utils.c:139
-msgid "Do not warn me again"
-msgstr "Ne opozori veÄ"
-
-#. Translators: %s is replaced with a folder
-#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:663
-#, c-format
-msgid "Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
-msgid_plural "Folder '%s' contains %u duplicate messages. Are you sure you want to delete them?"
-msgstr[0] "Mapa '%s' vsebuje %u podvojenih sporoÄil. Ali ste prepriÄani, da Åelite sporoÄila izbrisati?"
-msgstr[1] "Mapa '%s' vsebuje %u podvojeno sporoÄilo. Ali ste prepriÄani, da Åelite sporoÄilo izbrisati?"
-msgstr[2] "Mapa '%s' vsebuje %u podvojeni sporoÄili. Ali ste prepriÄani, da Åelite sporoÄili izbrisati?"
-msgstr[3] "Mapa '%s' vsebuje %u podvojena sporoÄila. Ali ste prepriÄani, da Åelite sporoÄila izbrisati?"
-
-#: ../mail/e-mail-reader-utils.c:960
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "Shrani sporoÄila"
-msgstr[1] "Shrani sporoÄilo"
-msgstr[2] "Shrani sporoÄili"
-msgstr[3] "Shrani sporoÄila"
-
-#. Translators: This is part of a suggested file name
-#. * used when saving a message or multiple messages to
-#. * 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:981
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "SporoÄila"
-msgstr[1] "SporoÄilo"
-msgstr[2] "SporoÄili"
-msgstr[3] "SporoÄila"
-
-#: ../mail/e-mail-reader.c:304
+#: ../mail/e-mail-reader.c:308
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopira v mapo"
 
-#: ../mail/e-mail-reader.c:304
-#: ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:308
+#: ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "K_opiraj"
 
-#: ../mail/e-mail-reader.c:806
+#: ../mail/e-mail-reader.c:814
 #: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Premakne v mapo"
 
-#: ../mail/e-mail-reader.c:806
-#: ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:814
+#: ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "Pre_makni"
 
-#: ../mail/e-mail-reader.c:1167
-#: ../mail/e-mail-reader.c:1355
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1175
+#: ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "_Ne vpraÅaj veÄ"
 
-#: ../mail/e-mail-reader.c:1401
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Vedno prezri dogovore-na: za dopisne sezname"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "_Dodaj poÅiljatelja v imenik"
 
-#: ../mail/e-mail-reader.c:1769
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "Doda poÅiljatelja v imenik"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "Preveri _neÅeleno poÅto"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "Preveri, ali so izbrana sporoÄila neÅelena"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo ..."
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "Kopira izbrana sporoÄila v drugo mapo"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "_IzbriÅi sporoÄilo"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "OznaÄi izbrana sporoÄila za brisanje"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "Filtriraj _dopisni seznam ..."
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1805
 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:1802
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "Filtriraj preje_mnike ..."
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Ustvari pravilo za filtriranje sporoÄil tem prejemnikom"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "Filtriraj poÅilja_telja ..."
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1819
 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:1816
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "Filtriraj za_devo ..."
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1826
 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:1823
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "Uveljavi pravila filtra na izbranih sporoÄilih"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "_Najdi v sporoÄilu ..."
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1840
 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:1837
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "Po_Äisti zastavico"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Odstrani zastavico navezave iz izbranih sporoÄil"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "_Zastavica je konÄana"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1854
 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:1851
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "Na_vezava ..."
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "Z zastavico oznaÄi izbrana sporoÄila za navezavo"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "_PriloÅeno"
 
-#: ../mail/e-mail-reader.c:1860
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1868
+#: ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Posreduje izbrano sporoÄilo kot prilogo"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "P_osreduj kot priloÅeno ..."
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "Kot del sporoÄ_ila"
 
-#: ../mail/e-mail-reader.c:1874
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:1889
 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:1879
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "P_osreduj v novem sporoÄilu"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:1888
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "Posreduj izbrano sporoÄilo citirano kot odgovor"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "P_osreduj kot citirano ..."
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "Na_loÅi slike"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1910
 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:1907
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "_Pomembno"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "Izbrana sporoÄila oznaÄi kot pomembna"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "_NeÅelena poÅta"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "Izbrana sporoÄila oznaÄi kot neÅelena"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "_Ni neÅeleno"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "Izbrana sporoÄila oznaÄi kot zaÅelena"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "_Preberano"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "Izbrana sporoÄila oznaÄi kot Åe prebrana"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "Nepo_membno"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "Izbrana sporoÄila oznaÄi kot nepomembna"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "_Neprebrano"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1952
 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:1949
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporoÄilo ..."
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "Odpri izbrana sporoÄila v sestavljalniku za urejanje"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "Sestavi _novo sporoÄilo"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1966
 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:1963
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "_Odpri v novem oknu"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "Izbrana sporoÄila odpre v novem oknu"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "Premakne v _mapo ..."
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "Izbrana sporoÄila premakne v drugo mapo"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "Preklopi na _mapo"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "PokaÅi nadrejeno mapo"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "Preklopi na _naslednji zavihek"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "Preklopi na naslednji zavihek"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "Preklopi na _predhodni zavihek"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "Preklopi na predhodni zavihek"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "_Zapri trenutni zavihek"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "Zapri trenutni zavihek"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "_Naslednje sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "PokaÅe naslednje sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "Naslednje po_membno sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "PokaÅe naslednje pomembno sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "Naslednja ni_t"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "PokaÅe naslednjo nit"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "Naslednje n_eprebrano sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "PokaÅe naslednje neprebrano sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "_Predhodno sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "PokaÅe predhodno sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "Pr_edhodno pomembno sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "PokaÅe predhodno pomembno sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "_Predhodna nit"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "PokaÅe predhodno sporoÄilno nit"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "P_redhodno neprebrano sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "PokaÅe predhodno neprebrano sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "Natisni to sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "Predogled sporoÄila pred tiskanjem"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "_Preusmeri"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preusmeri izbrano sporoÄilo k nekomu "
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "_Odstrani priloge"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "Odstrani priloge"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "Odstrani po_dvojena sporoÄila"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "Preveri izbrana sporoÄila za dvojnike"
 
-#: ../mail/e-mail-reader.c:2096
-#: ../mail/mail.error.xml.h:108
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../mail/e-mail-reader.c:2104
+#: ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2106
 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:2103
-#: ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2111
+#: ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2113
 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:2110
+#: ../mail/e-mail-reader.c:2118
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Odgovori poÅiljatelju"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sestavi odgovor poÅiljatelju izbranega sporoÄila"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "_Shrani kot mbox..."
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "Shrani izbrana sporoÄila kot datoteko mbox"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "_Vir sporoÄil"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "PokaÅe surov vir elektronskega sporoÄila"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "_Povrni izbrisano sporoÄilo"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "Povrne izbrana izbrisana sporoÄila"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "ObiÄaj_na velikost"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "Ponastavi besedilo na njegovo izvorno velikost"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "_PribliÅaj"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "PoveÄa velikost besedila"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "_Oddalji"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "ZmanjÅa velikost besedila"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "_Ustvari pravilo"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "Zn_akovno kodiranje"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "P_osreduj kot"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "_Skupinski odgovor"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "Po_jdi na"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "OznaÄi _kot"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "_SporoÄilo"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "_PribliÅaj"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2235
 msgid "Search Folder from Mailing _List..."
 msgstr "Iskalna mapa za Dopisni _seznam ..."
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2237
 msgid "Create a search folder for this mailing list"
 msgstr "Ustvari iskalno mapo za ta dopisni seznam"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2242
 msgid "Search Folder from Recipien_ts..."
 msgstr "Iskanje mape za _Prejemnike ..."
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2244
 msgid "Create a search folder for these recipients"
 msgstr "Ustvari iskalno mapo za te prejemnike"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2249
 msgid "Search Folder from Sen_der..."
 msgstr "Iskala mapa za P_oÅiljatelja ..."
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2251
 msgid "Create a search folder for this sender"
 msgstr "Ustvari iskalno mapo za tega poÅiljatelja"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2256
 msgid "Search Folder from S_ubject..."
 msgstr "Iskala mapa za _Zadevo ..."
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2258
 msgid "Create a search folder for this subject"
 msgstr "Ustvari iskalno mapo za to zadevo"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "OznaÄi kot na_vezujoÄe ..."
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "OznaÄi kot p_omembno"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "OznaÄi kot _neÅeleno"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "OznaÄi kot _zaÅeleno"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "OznaÄi kot _prebrano"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "OznaÄi kot nepo_membno"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "OznaÄi kot _neprebrano"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "NaÄin _kazalke"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2355
 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:2353
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "Vse _glave sporoÄil"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "PokaÅi sporoÄila z vsemi glavami elektronske poÅte"
 
-#: ../mail/e-mail-reader.c:2651
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Pridobivanje sporoÄila '%s'"
 
 #. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3229
+#. * other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:3246
 #: ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:306
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/google-account-setup/google-source.c:688
+#: ../plugins/google-account-setup/google-source.c:316
+#: ../plugins/google-account-setup/google-source.c:565
+#: ../plugins/google-account-setup/google-source.c:704
 #: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "Privzeto"
 
-#: ../mail/e-mail-reader.c:3396
+#: ../mail/e-mail-reader.c:3415
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: ../mail/e-mail-reader.c:3397
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "Nekomu posreduje izbrano sporoÄilo"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
 msgstr "Skupinski odgovor"
 
-#: ../mail/e-mail-reader.c:3417
+#: ../mail/e-mail-reader.c:3436
 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:3470
+#: ../mail/e-mail-reader.c:3489
 #: ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "IzbriÅi"
 
-#: ../mail/e-mail-reader.c:3503
-#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Naslednji"
 
-#: ../mail/e-mail-reader.c:3507
-#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Predhodni"
 
-#: ../mail/e-mail-reader.c:3516
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/e-mail-reader.c:4186
+#: ../mail/e-mail-reader.c:4205
 #, c-format
 msgid "Folder '%s'"
 msgstr "Mapa '%s'"
 
-#: ../mail/e-mail-session.c:661
+#: ../mail/e-mail-reader-utils.c:145
+msgid "Do not warn me again"
+msgstr "Ne opozori veÄ"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:670
+#, c-format
+msgid "Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
+msgid_plural "Folder '%s' contains %u duplicate messages. Are you sure you want to delete them?"
+msgstr[0] "Mapa '%s' vsebuje %u podvojenih sporoÄil. Ali ste prepriÄani, da Åelite sporoÄila izbrisati?"
+msgstr[1] "Mapa '%s' vsebuje %u podvojeno sporoÄilo. Ali ste prepriÄani, da Åelite sporoÄilo izbrisati?"
+msgstr[2] "Mapa '%s' vsebuje %u podvojeni sporoÄili. Ali ste prepriÄani, da Åelite sporoÄili izbrisati?"
+msgstr[3] "Mapa '%s' vsebuje %u podvojena sporoÄila. Ali ste prepriÄani, da Åelite sporoÄila izbrisati?"
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Shrani sporoÄila"
+msgstr[1] "Shrani sporoÄilo"
+msgstr[2] "Shrani sporoÄili"
+msgstr[3] "Shrani sporoÄila"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * 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:1068
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "SporoÄila"
+msgstr[1] "SporoÄilo"
+msgstr[2] "SporoÄili"
+msgstr[3] "SporoÄila"
+
+#: ../mail/e-mail-session.c:870
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Vnesite Åifrirno frazo za %s"
 
-#: ../mail/e-mail-session.c:665
+#: ../mail/e-mail-session.c:874
 msgid "Enter Passphrase"
 msgstr "Vnesite Åifrirno frazo"
 
-#: ../mail/e-mail-session.c:669
+#: ../mail/e-mail-session.c:878
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Vnesite geslo za %s"
 
-#: ../mail/e-mail-session.c:673
+#: ../mail/e-mail-session.c:882
 msgid "Enter Password"
 msgstr "Vnesite geslo"
 
-#: ../mail/e-mail-session.c:724
+#: ../mail/e-mail-session.c:933
 #, c-format
 msgid "User canceled operation."
 msgstr "Uporabnik je preklical dejanje."
 
-#: ../mail/e-mail-session.c:839
+#: ../mail/e-mail-session.c:1046
 #, c-format
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "Ciljni naslov ni doloÄen, posredovanje sporoÄila je preklicano."
 
-#: ../mail/e-mail-session.c:848
+#: ../mail/e-mail-session.c:1055
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Ni mogoÄe najti raÄuna za uporabo, posredovanje sporoÄila je preklicano."
@@ -9073,16 +9223,16 @@ msgstr "Ni mogoÄe najti raÄuna za uporabo, posredovanje sporoÄila je preklica
 msgid "Cannot get transport for account '%s'"
 msgstr "Ni mogoÄe pridobiti storitve prenosa za raÄun '%s'"
 
-#: ../mail/e-mail-session-utils.c:506
-#: ../mail/mail-ops.c:633
+#: ../mail/e-mail-session-utils.c:508
+#: ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Uveljavljanje izhodnih filtrov ni uspelo: %s"
 
-#: ../mail/e-mail-session-utils.c:530
-#: ../mail/e-mail-session-utils.c:564
-#: ../mail/mail-ops.c:652
-#: ../mail/mail-ops.c:686
+#: ../mail/e-mail-session-utils.c:532
+#: ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653
+#: ../mail/mail-ops.c:687
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9091,223 +9241,75 @@ msgstr ""
 "Pripenjanje v %s ni uspelo: %s\n"
 "Pripenjanje v krajevno mapo 'Poslano'."
 
-#: ../mail/e-mail-session-utils.c:584
-#: ../mail/mail-ops.c:706
+#: ../mail/e-mail-session-utils.c:586
+#: ../mail/mail-ops.c:707
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Pripenjanje v krajevno mapo 'Poslano' ni uspelo: %s"
 
-#: ../mail/e-mail-session-utils.c:795
-#: ../mail/mail-ops.c:809
-#: ../mail/mail-ops.c:905
+#: ../mail/e-mail-session-utils.c:797
+#: ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "PoÅiljanje sporoÄila"
 
-#: ../mail/e-mail-session-utils.c:871
+#: ../mail/e-mail-session-utils.c:873
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Preklicevanje naroÄnine na mapo '%s'"
 
-#: ../mail/e-mail-store-utils.c:167
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Prekinjanje povezave s streÅnikom '%s'"
 
-#: ../mail/e-mail-store-utils.c:258
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Ponovno povezovanje s streÅnikom '%s'"
 
-#: ../mail/e-mail-store-utils.c:333
+#: ../mail/e-mail-store-utils.c:334
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Pripravljanje raÄuna '%s' za delo brez povezave"
 
-#: ../mail/e-mail-tag-editor.c:291
-msgid "Flag to Follow Up"
-msgstr "Zastavica za navezavo"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:568
-#: ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "Brez Åifriranja"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:572
-#: ../mail/mail-config.ui.h:130
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "Åifriranje TLS"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:576
-#: ../mail/mail-config.ui.h:94
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "Åifriranje SSL"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:839
-#: ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "Brez"
-
-#: ../mail/em-account-editor.c:920
-msgid "Never"
-msgstr "Nikoli"
-
-#: ../mail/em-account-editor.c:921
-msgid "Always"
-msgstr "Vedno"
-
-#: ../mail/em-account-editor.c:922
-msgid "Ask for each message"
-msgstr "VpraÅaj za vsako sporoÄilo"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1742
-#: ../widgets/misc/e-account-tree-view.c:131
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "Brez"
-
-#: ../mail/em-account-editor.c:2178
-msgid "Mail Configuration"
-msgstr "Nastavitev poÅte"
-
-#: ../mail/em-account-editor.c:2179
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"DobrodoÅli v pomoÄniku za poÅtne nastavitve programa Evolution.\n"
-"\n"
-"Kliknite \"Naprej\" za zaÄetek."
-
-#: ../mail/em-account-editor.c:2182
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
-msgstr "Spodaj vnesite svoje ime in naslov elektronske poÅte. Polj \"dodatno\" ni treba izpolnjevati, razen Äe Åelite tudi te podatke vkljuÄiti v elektronsko poÅto, ki jo boste poÅiljali."
-
-#: ../mail/em-account-editor.c:2184
-#: ../mail/em-account-editor.c:2372
-msgid "Receiving Email"
-msgstr "Prejemanje elektronske poÅte"
-
-#: ../mail/em-account-editor.c:2185
-msgid "Please configure the following account settings."
-msgstr "Nastavite naslednje nastavitve raÄuna."
-
-#: ../mail/em-account-editor.c:2187
-#: ../mail/em-account-editor.c:2896
-msgid "Sending Email"
-msgstr "PoÅiljanje elektronske poÅte"
-
-#: ../mail/em-account-editor.c:2188
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "Vnesite podatke o naÄinu poÅiljanja poÅte. Äe niste prepriÄani, se obrnite na svojega sistemskega skrbnika ali ponudnika dostopa do medmreÅja."
-
-#: ../mail/em-account-editor.c:2190
-#: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Podrobnosti raÄuna"
-
-#: ../mail/em-account-editor.c:2191
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"V spodnji prostor vnesite opisno ime tega raÄuna.\n"
-"To ime bo uporabljeno samo za prikaz."
-
-#: ../mail/em-account-editor.c:2195
-msgid "Done"
-msgstr "KonÄano"
-
-#: ../mail/em-account-editor.c:2196
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Nastavljanje vaÅe poÅte je konÄano.\n"
-"\n"
-"Sedaj je mogoÄe prejemati in poÅiljati poÅto s pomoÄjo programa Evolution.\n"
-"\n"
-"S klikom na gumb \"Uveljavi\" bodo spremembe shranjene."
-
-#: ../mail/em-account-editor.c:2694
-msgid "Check for _new messages every"
-msgstr "Samodejno preveri _novo poÅto vsakih"
-
-#: ../mail/em-account-editor.c:2702
-msgid "minu_tes"
-msgstr "_minut"
-
-#: ../mail/em-account-editor.c:3013
-msgid "Please select a folder from the current account."
-msgstr "Izberite mapo trenutnega raÄuna."
-
-#: ../mail/em-account-editor.c:3339
-#: ../mail/mail-config.ui.h:101
-msgid "Security"
-msgstr "Varnost"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3393
-#: ../mail/em-account-editor.c:3476
-msgid "Receiving Options"
-msgstr "MoÅnosti prejemanja"
-
-#: ../mail/em-account-editor.c:3394
-#: ../mail/em-account-editor.c:3477
-msgid "Checking for New Messages"
-msgstr "Preverjanje za nova sporoÄila"
-
+#: ../mail/e-mail-tag-editor.c:291
+msgid "Flag to Follow Up"
+msgstr "Zastavica za navezavo"
+
 #. 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:1184
+#: ../mail/em-composer-utils.c:1197
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "Dne ${Day}.${Month}.${Year} (${AbbrevWeekdayName}) ob ${24Hour}:${Minute} ${TimeZone} je ${Sender} napisal(a):"
 
-#: ../mail/em-composer-utils.c:1195
+#: ../mail/em-composer-utils.c:1208
 msgid "-----Original Message-----"
 msgstr "-------- Izvirno sporoÄilo --------"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1976
+#: ../mail/em-composer-utils.c:1992
 #, 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."
 
-#: ../mail/em-composer-utils.c:2030
+#: ../mail/em-composer-utils.c:2052
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Obvestilo o dostavi za: \"%s\""
 
-#: ../mail/em-composer-utils.c:2532
+#: ../mail/em-composer-utils.c:2592
 msgid "an unknown sender"
 msgstr "neznan poÅiljatelj"
 
-#: ../mail/em-composer-utils.c:2933
+#: ../mail/em-composer-utils.c:2998
 msgid "Posting destination"
 msgstr "Cilj objave"
 
-#: ../mail/em-composer-utils.c:2934
+#: ../mail/em-composer-utils.c:2999
 msgid "Choose folders to post the message to."
 msgstr "Izberite mape, v katere Åelite objaviti sporoÄilo."
 
@@ -9479,7 +9481,7 @@ msgstr "Predvajaj zvok"
 
 #. Past tense, as in "has been read".
 #: ../mail/em-filter-i18n.h:54
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Prebrano"
 
@@ -9563,15 +9565,15 @@ msgid "Unset Status"
 msgstr "Nenastavljeno stanje"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:538
+#: ../mail/em-filter-rule.c:561
 msgid "Then"
 msgstr "Nato"
 
-#: ../mail/em-filter-rule.c:569
+#: ../mail/em-filter-rule.c:592
 msgid "Add Ac_tion"
 msgstr "Dodaj _dejanje"
 
-#: ../mail/em-folder-properties.c:143
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Neprebrana sporoÄila:"
@@ -9579,7 +9581,7 @@ msgstr[1] "Neprebrano sporoÄilo:"
 msgstr[2] "Neprebrani sporoÄili:"
 msgstr[3] "Neprebrana sporoÄila:"
 
-#: ../mail/em-folder-properties.c:154
+#: ../mail/em-folder-properties.c:156
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Skupaj sporoÄil:"
@@ -9587,305 +9589,314 @@ msgstr[1] "Skupaj sporoÄilo:"
 msgstr[2] "Skupaj sporoÄili:"
 msgstr[3] "Skupaj sporoÄila:"
 
-#: ../mail/em-folder-properties.c:175
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Omejitev uporabe (%s):"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "Omejitev uporabe"
 
-#: ../mail/em-folder-properties.c:315
+#: ../mail/em-folder-properties.c:317
 msgid "Folder Properties"
 msgstr "Lastnosti mape"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:79
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: ../mail/em-folder-selector.c:385
+#: ../mail/em-folder-selector.c:436
 msgid "C_reate"
 msgstr "Ustva_ri"
 
-#: ../mail/em-folder-selector.c:391
+#: ../mail/em-folder-selector.c:442
 msgid "Folder _name:"
 msgstr "Ime _mape:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147
-#: ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1165
-#: ../mail/mail-vfolder.c:1240
-msgid "Search Folders"
-msgstr "Iskalne mape"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172
-#: ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "Brez zadetka"
-
-#: ../mail/em-folder-tree-model.c:792
-#: ../mail/em-folder-tree-model.c:1061
-msgid "Loading..."
-msgstr "Nalaganje ..."
-
 #: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
 msgstr "Ime mape ne sme vsebovati '/'"
 
-#: ../mail/em-folder-tree.c:1331
+#: ../mail/em-folder-tree.c:768
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1568
+#: ../mail/em-folder-tree.c:1590
 msgid "Mail Folder Tree"
 msgstr "Drevesna razporeditev poÅtnih map"
 
-#: ../mail/em-folder-tree.c:2068
-#: ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2069
+#: ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premikanje mape %s"
 
-#: ../mail/em-folder-tree.c:2071
-#: ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2072
+#: ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiranje mape %s"
 
-#: ../mail/em-folder-tree.c:2078
-#: ../mail/message-list.c:2218
+#: ../mail/em-folder-tree.c:2079
+#: ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premikanje sporoÄil v mapo %s"
 
-#: ../mail/em-folder-tree.c:2082
-#: ../mail/message-list.c:2220
+#: ../mail/em-folder-tree.c:2083
+#: ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiranje sporoÄil v mapo %s"
 
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2102
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "SporoÄil(a) ni mogoÄe spustiti  v vrhnjo shrambo"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:172
+#: ../mail/em-folder-tree-model.c:174
+#: ../mail/mail-vfolder.c:1125
+#: ../mail/mail-vfolder.c:1239
+msgid "Search Folders"
+msgstr "Iskalne mape"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:179
+#: ../mail/em-folder-tree-model.c:181
+msgid "UNMATCHED"
+msgstr "Brez zadetka"
+
+#: ../mail/em-folder-tree-model.c:790
+#: ../mail/em-folder-tree-model.c:1075
+msgid "Loading..."
+msgstr "Nalaganje ..."
+
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Premakni mapo v"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Kopiraj mapo v"
 
-#: ../mail/em-folder-utils.c:556
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "Ustvari mapo"
 
-#: ../mail/em-folder-utils.c:557
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "DoloÄite kje naj se ustvari mapa:"
 
-#: ../mail/em-format-html-display.c:85
-#: ../mail/em-format-html.c:1683
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "Oblikovanje sporoÄila"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "Oblikovanje sporoÄila ..."
+
+#: ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1572
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "Pridobivanje '%s'"
+
+#: ../mail/em-format-html.c:1723
+#: ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "Nepodpisano"
 
-#: ../mail/em-format-html-display.c:85
-msgid "This message is not signed. There is no guarantee that this message is authentic."
-msgstr "To sporoÄilo ni podpisano, zato ni mogoÄe zagotoviti njegove pristnosti."
-
-#: ../mail/em-format-html-display.c:86
-#: ../mail/em-format-html.c:1684
+#: ../mail/em-format-html.c:1724
+#: ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "Veljaven podpis"
 
-#: ../mail/em-format-html-display.c:86
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "To sporoÄilo je podpisano in veljavno, zato je zelo verjetno tudi pristno."
-
-#: ../mail/em-format-html-display.c:87
-#: ../mail/em-format-html.c:1685
+#: ../mail/em-format-html.c:1725
+#: ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "Neveljaven podpis"
 
-#: ../mail/em-format-html-display.c:87
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr "Podpisa tega sporoÄila ni mogoÄe preveriti. Morda je bilo med prenosom spremenjeno."
-
-#: ../mail/em-format-html-display.c:88
-#: ../mail/em-format-html.c:1686
+#: ../mail/em-format-html.c:1726
+#: ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "Veljaven podpis, vendar ni mogoÄe preveriti poÅiljatelja"
 
-#: ../mail/em-format-html-display.c:88
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr "SporoÄilo je podpisano z veljavnim podpisom, vendar poÅiljatelja ni mogoÄe preveriti."
-
-#: ../mail/em-format-html-display.c:89
-#: ../mail/em-format-html.c:1687
+#: ../mail/em-format-html.c:1727
+#: ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "Podpis obstaja, vendar potrebuje javni kljuÄ"
 
-#: ../mail/em-format-html-display.c:89
-msgid "This message is signed with a signature, but there is no corresponding public key."
-msgstr "SporoÄilo je podpisano, vendar ustreznega javnega kljuÄa ni mogoÄe preveriti."
-
-#: ../mail/em-format-html-display.c:96
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "NeÅifrirano"
 
-#: ../mail/em-format-html-display.c:96
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr "SporoÄilo ni Åifrirano, zato je njegova vsebina med prenosom po medmreÅju vidna."
-
-#: ../mail/em-format-html-display.c:97
-#: ../mail/em-format-html.c:1694
+#: ../mail/em-format-html.c:1734
+#: ../mail/em-format-html-display.c:101
 msgid "Encrypted, weak"
 msgstr "Åibko Åifrirano"
 
-#: ../mail/em-format-html-display.c:97
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "SporoÄilo je Åifrirano, vendar s Åibkim Åifrirnim algoritmom, zato je tujcu v razumno kratkemu Äasu sicer teÅko, a Åe vedno mogoÄe pogledati njegovo vsebino."
-
-#: ../mail/em-format-html-display.c:98
-#: ../mail/em-format-html.c:1695
+#: ../mail/em-format-html.c:1735
+#: ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "Åifrirano"
 
-#: ../mail/em-format-html-display.c:98
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr "SporoÄilo je Åifrirano, zato je tujcu njegovo vsebino teÅko videti."
-
-#: ../mail/em-format-html-display.c:99
-#: ../mail/em-format-html.c:1696
+#: ../mail/em-format-html.c:1736
+#: ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "MoÄno Åifrirano"
 
-#: ../mail/em-format-html-display.c:99
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "To sporoÄilo je Åifrirano z moÄnim Åifrirnim algoritmom, zato je tujcu v razumno kratkemu Äasu zelo teÅko pogledati njegovo vsebino."
-
-#: ../mail/em-format-html-display.c:237
-#: ../smime/gui/smime-ui.ui.h:47
-msgid "_View Certificate"
-msgstr "_Poglej potrdila"
-
-#: ../mail/em-format-html-display.c:250
-msgid "This certificate is not viewable"
-msgstr "Tega potrdila ni mogoÄe pogledati"
-
-#: ../mail/em-format-html-display.c:539
-msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
-msgstr "Ni mogoÄe izrisati elektronskega sporoÄila, ker je preobseÅno. Lahko ga pogledate neoblikovanega ali pa si ga pogledate z zunanjim urejevalnikom besedila."
-
-#: ../mail/em-format-html-display.c:806
-msgid "Completed on"
-msgstr "DokonÄano dne"
-
-#: ../mail/em-format-html-display.c:814
-msgid "Overdue:"
-msgstr "Zaksanjeno:"
-
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:818
-msgid "by"
-msgstr "do"
-
-#: ../mail/em-format-html-display.c:1081
-#: ../mail/em-format-html-display.c:1128
-msgid "View _Unformatted"
-msgstr "Poglej _neoblikovano"
-
-#: ../mail/em-format-html-display.c:1083
-msgid "Hide _Unformatted"
-msgstr "Skrij _neoblikovano"
-
-#: ../mail/em-format-html-display.c:1148
-msgid "O_pen With"
-msgstr "Odpri _z"
-
-#: ../mail/em-format-html-print.c:176
-#, c-format
-msgid "Page %d of %d"
-msgstr "Stran %d od %d"
-
-#: ../mail/em-format-html.c:165
-msgid "Formatting message"
-msgstr "Oblikovanje sporoÄila"
-
-#: ../mail/em-format-html.c:364
-msgid "Formatting Message..."
-msgstr "Oblikovanje sporoÄila ..."
-
-#: ../mail/em-format-html.c:1527
-#: ../mail/em-format-html.c:1537
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "Pridobivanje '%s'"
-
-#: ../mail/em-format-html.c:2058
+#: ../mail/em-format-html.c:2136
 msgid "Unknown external-body part."
 msgstr "Neznan zunanji del telesa sporoÄila."
 
-#: ../mail/em-format-html.c:2066
+#: ../mail/em-format-html.c:2146
 msgid "Malformed external-body part."
 msgstr "Nepravilno oblikovan del zunanjega telesa sporoÄila."
 
-#: ../mail/em-format-html.c:2096
+#: ../mail/em-format-html.c:2177
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na povezavo FTP (%s)"
 
-#: ../mail/em-format-html.c:2107
+#: ../mail/em-format-html.c:2188
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na streÅniku \"%s\""
 
-#: ../mail/em-format-html.c:2109
+#: ../mail/em-format-html.c:2190
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na krajevno datoteko (%s)"
 
-#: ../mail/em-format-html.c:2130
+#: ../mail/em-format-html.c:2211
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljene podatke (%s)"
 
-#: ../mail/em-format-html.c:2141
+#: ../mail/em-format-html.c:2226
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2824
-#: ../plugins/mail-notification/mail-notification.c:407
+#: ../mail/em-format-html.c:2934
+#: ../plugins/mail-notification/mail-notification.c:402
 #, c-format
 msgid "From: %s"
 msgstr "Od: %s"
 
-#: ../mail/em-format-html.c:2837
+#: ../mail/em-format-html.c:2956
 msgid "(no subject)"
 msgstr "(brez zadeve)"
 
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2901
+#: ../mail/em-format-html.c:3032
 #, 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"
 
+#: ../mail/em-format-html-display.c:89
+msgid "This message is not signed. There is no guarantee that this message is authentic."
+msgstr "To sporoÄilo ni podpisano, zato ni mogoÄe zagotoviti njegove pristnosti."
+
+#: ../mail/em-format-html-display.c:90
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "To sporoÄilo je podpisano in veljavno, zato je zelo verjetno tudi pristno."
+
+#: ../mail/em-format-html-display.c:91
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "Podpisa tega sporoÄila ni mogoÄe preveriti. Morda je bilo med prenosom spremenjeno."
+
+#: ../mail/em-format-html-display.c:92
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "SporoÄilo je podpisano z veljavnim podpisom, vendar poÅiljatelja ni mogoÄe preveriti."
+
+#: ../mail/em-format-html-display.c:93
+msgid "This message is signed with a signature, but there is no corresponding public key."
+msgstr "SporoÄilo je podpisano, vendar ustreznega javnega kljuÄa ni mogoÄe preveriti."
+
+#: ../mail/em-format-html-display.c:100
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+msgstr "SporoÄilo ni Åifrirano, zato je njegova vsebina med prenosom po medmreÅju vidna."
+
+#: ../mail/em-format-html-display.c:101
+msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr "SporoÄilo je Åifrirano, vendar s Åibkim Åifrirnim algoritmom, zato je tujcu v razumno kratkemu Äasu sicer teÅko, a Åe vedno mogoÄe pogledati njegovo vsebino."
+
+#: ../mail/em-format-html-display.c:102
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr "SporoÄilo je Åifrirano, zato je tujcu njegovo vsebino teÅko videti."
+
+#: ../mail/em-format-html-display.c:103
+msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr "To sporoÄilo je Åifrirano z moÄnim Åifrirnim algoritmom, zato je tujcu v razumno kratkemu Äasu zelo teÅko pogledati njegovo vsebino."
+
+#: ../mail/em-format-html-display.c:241
+#: ../smime/gui/smime-ui.ui.h:47
+msgid "_View Certificate"
+msgstr "_Poglej potrdila"
+
+#: ../mail/em-format-html-display.c:254
+msgid "This certificate is not viewable"
+msgstr "Tega potrdila ni mogoÄe pogledati"
+
+#: ../mail/em-format-html-display.c:566
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
+msgstr "Ni mogoÄe izrisati elektronskega sporoÄila, ker je preobseÅno. Lahko ga pogledate neoblikovanega ali pa si ga pogledate z zunanjim urejevalnikom besedila."
+
+#: ../mail/em-format-html-display.c:756
+msgid "Save Image"
+msgstr "Shrani sliko"
+
+#: ../mail/em-format-html-display.c:804
+msgid "Save _Image..."
+msgstr "Shrani _sliko ..."
+
+#: ../mail/em-format-html-display.c:806
+#, fuzzy
+msgid "Save the image to a file"
+msgstr "Izbor datoteke v za shranjevanje slike"
+
+#: ../mail/em-format-html-display.c:1034
+msgid "Completed on"
+msgstr "DokonÄano dne"
+
+#: ../mail/em-format-html-display.c:1046
+msgid "Overdue:"
+msgstr "Zaksanjeno:"
+
+#: ../mail/em-format-html-display.c:1054
+msgid "by"
+msgstr "do"
+
+#: ../mail/em-format-html-display.c:1335
+#: ../mail/em-format-html-display.c:1386
+msgid "View _Unformatted"
+msgstr "Poglej _neoblikovano"
+
+#: ../mail/em-format-html-display.c:1337
+msgid "Hide _Unformatted"
+msgstr "Skrij _neoblikovano"
+
+#: ../mail/em-format-html-display.c:1408
+msgid "O_pen With"
+msgstr "Odpri _z"
+
+#: ../mail/em-format-html-print.c:176
+#, c-format
+msgid "Page %d of %d"
+msgstr "Stran %d od %d"
+
 #: ../mail/em-html-stream.c:82
 #: ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
@@ -9893,61 +9904,61 @@ msgstr "To sporoÄilo je poslano z raÄuna %s v imenu %s"
 msgid "No HTML stream available"
 msgstr "HTML pretok ni na voljo"
 
-#: ../mail/em-subscription-editor.c:1138
+#: ../mail/em-subscription-editor.c:1162
 msgid "Folder Subscriptions"
 msgstr "NaroÄnine na mape"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1201
 msgid "_Account:"
 msgstr "R_aÄun:"
 
-#: ../mail/em-subscription-editor.c:1192
+#: ../mail/em-subscription-editor.c:1216
 msgid "Clear Search"
 msgstr "PoÄisti iskanje"
 
-#: ../mail/em-subscription-editor.c:1210
+#: ../mail/em-subscription-editor.c:1234
 msgid "Sho_w items that contain:"
 msgstr "Pok_aÅi predmete, ki vsebujejo:"
 
-#: ../mail/em-subscription-editor.c:1249
+#: ../mail/em-subscription-editor.c:1273
 msgid "Subscribe to the selected folder"
 msgstr "NaroÄi se na izbrano mapo"
 
-#: ../mail/em-subscription-editor.c:1250
+#: ../mail/em-subscription-editor.c:1274
 msgid "Su_bscribe"
 msgstr "_NaroÄi"
 
-#: ../mail/em-subscription-editor.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Unsubscribe from the selected folder"
 msgstr "PrekliÄe naroÄnino na izbrano mapo"
 
-#: ../mail/em-subscription-editor.c:1262
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../mail/em-subscription-editor.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "_Unsubscribe"
 msgstr "_PrekliÄi naroÄnino"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1297
 msgid "Collapse all folders"
 msgstr "SkrÄi vse mape"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1298
 msgid "C_ollapse All"
 msgstr "_SkrÄi vse"
 
-#: ../mail/em-subscription-editor.c:1284
+#: ../mail/em-subscription-editor.c:1308
 msgid "Expand all folders"
 msgstr "RazÅiri vse mape"
 
-#: ../mail/em-subscription-editor.c:1285
+#: ../mail/em-subscription-editor.c:1309
 msgid "E_xpand All"
 msgstr "_RazÅiri vse"
 
-#: ../mail/em-subscription-editor.c:1295
+#: ../mail/em-subscription-editor.c:1319
 msgid "Refresh the folder list"
 msgstr "OsveÅi seznam map"
 
-#: ../mail/em-subscription-editor.c:1307
+#: ../mail/em-subscription-editor.c:1331
 msgid "Stop the current operation"
 msgstr "Zaustavi trenutno opravilo"
 
@@ -9969,11 +9980,11 @@ msgstr[3] "Ali ste prepriÄani, da Åelite hkrati odpreti %d sporoÄila?"
 msgid "_Do not show this message again"
 msgstr "_Ne pokaÅi veÄ tega sporoÄila"
 
-#: ../mail/em-utils.c:331
+#: ../mail/em-utils.c:333
 msgid "Message Filters"
 msgstr "Filtri sporoÄil"
 
-#: ../mail/em-utils.c:916
+#: ../mail/em-utils.c:918
 #, c-format
 msgid "Messages from %s"
 msgstr "SporoÄila od %s"
@@ -9982,7 +9993,7 @@ msgstr "SporoÄila od %s"
 msgid "Search _Folders"
 msgstr "Iskalne _mape"
 
-#: ../mail/em-vfolder-rule.c:604
+#: ../mail/em-vfolder-rule.c:618
 msgid "Add Folder"
 msgstr "Dodaj mapo"
 
@@ -10039,7 +10050,7 @@ msgid "Always request read receipt"
 msgstr "Vedno zahtevaj povratnico branja"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 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."
 
@@ -10160,7 +10171,8 @@ msgid "Default width of the mail browser window."
 msgstr "Privzeta Åirina glavnega okna brskalnika poÅte."
 
 #: ../mail/evolution-mail.schemas.in.h:44
-msgid "Describes wheter message headers in paned view should be collapsed or expanded by default. \"0\" = expanded \"1\" = collapsed"
+#, fuzzy
+msgid "Describes whether message headers in paned view should be collapsed or expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr "DoloÄa, ali naj bodo glave sporoÄila na seznamu pladnja privzeto zloÅene ali razÅirjene. Vrednost \"0\" doloÄa razÅirjen, \"1\" pa zloÅen pogled."
 
 #: ../mail/evolution-mail.schemas.in.h:45
@@ -10409,7 +10421,7 @@ msgid "Layout style"
 msgstr "Slog razporeditve"
 
 #: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Raven nad katero bi moralo sporoÄilo biti zabeleÅeno."
 
@@ -10862,129 +10874,113 @@ msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Barva podÄrtane narobe zapisane besede med uporabo Ärkovalnika."
 
 #: ../mail/evolution-mail.schemas.in.h:219
-msgid "Use SpamAssassin daemon and client"
-msgstr "Uporabi SpamAssassin ozadnji program in odjemalca"
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Uporabi SpamAssassin ozadnji program in odjemalca (spamc/spamd)"
-
-#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts"
 msgstr "Uporabi pisave po meri"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "Za prikaz poÅte uporabi pisave po meri."
 
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Use only local spam tests."
-msgstr "Uporabi le krajevno preskuÅanje neÅelene poÅte"
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Uporabi le krajevno preskuÅanje neÅelene poÅte (brez DNS)."
-
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:221
 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 message or the bottom."
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:222
 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 the message or the bottom."
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "Pisava spremenljive Åirine"
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Ali se povratnica  privzeto samodejno doda k vsakemu sporoÄilu."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Whether check for new messages in all active accounts regardless of the account \"Check for new messages every X minutes\" option when Evolution is started. This option is used only together with 'send_recv_on_start' option."
 msgstr "Ali naj program preveri za nova sporoÄila v vseh dejavnih raÄunih ob zagonu 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'."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid "Whether check for new messages when Evolution is started. This includes also sending messages from Outbox."
 msgstr "Ali naj program preveri za nova sporoÄilu ob zagonu. To vkljuÄuje poÅiljanje sporoÄil iz odhodne mape."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Ali je moÅnost elipsiranja imen map v stranski vrstici onemogoÄena."
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr "Ali naj se nitenje, ko sporoÄila ne vsebujejo glav Kot-Odgovor-Na ali Reference, navezuje na zadeve."
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Ali naj bodo niti razvrÅÄene po zadnjih sporoÄilih v niti"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid "Whether to flush Outbox after filtering is done. Outbox flush will happen only when there was used any 'Forward to' filter action and approximately one minute after the last action invocation."
 msgstr "Ali naj bo odhodni predal po filtriranju poÄiÅÄen. ÄiÅÄenje odhodnega predala se bo zgodilo samo ko je bilo uporabljeno dejanje filtra 'Posreduj na' in pribliÅno eno minuto po preklicu zadnjega dejanja."
 
-#: ../mail/evolution-mail.schemas.in.h:235
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "Åirina pladnja s seznamom sporoÄil"
 
-#: ../mail/evolution-mail.schemas.in.h:236
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "Åirina pladnja s seznamom sporoÄil."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "UvaÅanje podatkov Elm"
 
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/pine-importer.c:446
-#: ../modules/mail/e-mail-shell-view.c:1036
-#: ../widgets/misc/e-send-options.c:511
+#: ../mail/importers/elm-importer.c:351
+#: ../mail/importers/pine-importer.c:458
+#: ../modules/mail/e-mail-shell-view.c:1051
+#: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "PoÅta"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:396
 msgid "Evolution Elm importer"
 msgstr "Uvoznik Elm Evolution"
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:397
 msgid "Import mail from Elm."
 msgstr "Uvozi poÅto iz Elma."
 
-#: ../mail/importers/evolution-mbox-importer.c:135
-#: ../plugins/dbx-import/dbx-importer.c:249
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "_Ciljna mapa:"
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:460
 msgid "Select folder"
 msgstr "Izbor mape"
 
-#: ../mail/importers/evolution-mbox-importer.c:143
-#: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:319
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "Select folder to import into"
 msgstr "Izberite mapo za uvoz"
 
-#: ../mail/importers/evolution-mbox-importer.c:417
+#: ../mail/importers/evolution-mbox-importer.c:433
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Zadeva"
 
-#: ../mail/importers/evolution-mbox-importer.c:422
+#: ../mail/importers/evolution-mbox-importer.c:438
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Od"
 
-#: ../mail/importers/evolution-mbox-importer.c:466
+#: ../mail/importers/evolution-mbox-importer.c:482
 #: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "PoÅtni predal Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:467
+#: ../mail/importers/evolution-mbox-importer.c:483
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik map v obliki poÅtnih predalov Berkeley"
 
@@ -10994,32 +10990,31 @@ msgstr "UvaÅanje poÅtnega predala"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:500
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/dbx-import/dbx-importer.c:610
+#: ../plugins/pst-import/pst-importer.c:648
 #, c-format
 msgid "Importing '%s'"
 msgstr "UvaÅanje '%s'"
 
-#: ../mail/importers/mail-importer.c:315
+#: ../mail/importers/mail-importer.c:316
 #, c-format
 msgid "Scanning %s"
 msgstr "Preiskovanje %s"
 
-#: ../mail/importers/pine-importer.c:250
+#: ../mail/importers/pine-importer.c:260
 msgid "Importing Pine data"
 msgstr "UvaÅanje podatkov Pine"
 
-#: ../mail/importers/pine-importer.c:451
-#: ../modules/addressbook/addressbook-config.c:1053
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
 msgid "Address Book"
 msgstr "Imenik"
 
-#: ../mail/importers/pine-importer.c:493
+#: ../mail/importers/pine-importer.c:509
 msgid "Evolution Pine importer"
 msgstr "Uvoznik Pine Evolution"
 
-#: ../mail/importers/pine-importer.c:494
+#: ../mail/importers/pine-importer.c:510
 msgid "Import mail from Pine."
 msgstr "Uvozi poÅto iz Pina."
 
@@ -11028,23 +11023,23 @@ msgstr "Uvozi poÅto iz Pina."
 msgid "Mail to %s"
 msgstr "PoÅta za %s"
 
-#: ../mail/mail-autofilter.c:238
-#: ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:228
+#: ../mail/mail-autofilter.c:271
 #, c-format
 msgid "Mail from %s"
 msgstr "PoÅta od %s"
 
-#: ../mail/mail-autofilter.c:264
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: ../mail/mail-autofilter.c:305
+#: ../mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poÅtnih seznamov"
 
-#: ../mail/mail-autofilter.c:414
+#: ../mail/mail-autofilter.c:404
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtra  "
 
@@ -11053,7 +11048,7 @@ msgstr "Dodaj pravilo filtra  "
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:517
+#: ../mail/mail-autofilter.c:507
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11124,7 +11119,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "Uporabi enake nastavitve _pogleda za vse mape"
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1060
+#: ../modules/addressbook/addressbook-config.c:1088
 msgid "Authentication"
 msgstr "Overitev"
 
@@ -11177,7 +11172,7 @@ msgid "Composing Messages"
 msgstr "Sestavljanje sporoÄil"
 
 #: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+#: ../modules/plugin-manager/evolution-plugin-manager.c:161
 msgid "Configuration"
 msgstr "Nastavitve"
 
@@ -11190,8 +11185,8 @@ msgid "Confirmations"
 msgstr "Potrjevanje"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "Zapis datuma/Äasa"
 
@@ -11336,6 +11331,11 @@ msgstr "Prejemniki sporoÄila"
 msgid "No _Proxy for:"
 msgstr "Ni _posredniÅkega streÅnika za:"
 
+#: ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Brez Åifriranja"
+
 #: ../mail/mail-config.ui.h:73
 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 neÅeleno poÅto."
@@ -11358,7 +11358,7 @@ msgid "Pass_word:"
 msgstr "_Geslo:"
 
 #: ../mail/mail-config.ui.h:79
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Pick a color"
 msgstr "Izbor barve"
 
@@ -11414,6 +11414,11 @@ msgstr "SHA384"
 msgid "SHA512"
 msgstr "SHA512"
 
+#: ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Åifriranje SSL"
+
 #: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL v tej razliÄici programa Evolution ni podprt"
@@ -11535,6 +11540,11 @@ msgstr "Ob odgovarjanju se pisanje se zaÄne na _dnu "
 msgid "Start up"
 msgstr "Zagon"
 
+#: ../mail/mail-config.ui.h:130
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Åifriranje TLS"
+
 #: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "V_rsta:"
@@ -11590,131 +11600,120 @@ msgid "_Authentication Type"
 msgstr "Vrsta _overitve"
 
 #: ../mail/mail-config.ui.h:145
-msgid "_Default junk plugin:"
-msgstr "_Privzet vstavek neÅelene poÅte"
-
-#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "_Neposredna povezava z medmreÅjem"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne po_dpisuj zahtev za sreÄanja (za zdruÅljivost z Outlookom)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "NaÄin _posredovanja:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "Mapa _neÅelene poÅte:"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "_Ohrani podpis nad izvirnim sporoÄilom ob odgovoru"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_Jeziki"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "_NaloÅi slike le v sporoÄilih s stikov"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "_Poglej le v krajevni imenik"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "To naj bo _moj privzet raÄun"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "_RoÄna nastavitev posredniÅkega streÅnika:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "_Nikoli ne nalagaj slik z medmreja"
 
 #: ../mail/mail-config.ui.h:158
-msgid "_Path:"
-msgstr "_Pot:"
-
-#: ../mail/mail-config.ui.h:159
 #: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:159
 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:161
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "Slog odgovo_ra:"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "_Varni posredniÅki streÅnik HTTP:"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:164
 #: ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_StreÅnik:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "_PokaÅi animirane slike"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:167
 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:169
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "Mapa _smeti:"
 
-#: ../mail/mail-config.ui.h:170
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "_Uporabi varno povezavo:"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "Uporabi _privzete sistemske vrednosti"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "_Uporabi enake pisave kot drugi programi"
 
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:172
 #: ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:174
+#: ../mail/mail-config.ui.h:173
 #: ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "barva"
 
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "opis"
 
-#: ../mail/mail-config.ui.h:177
-msgid "gtk-ok"
-msgstr "gtk-ok"
-
 #: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "Vse dejavne oddaljene mape"
@@ -11731,63 +11730,64 @@ msgstr "Vse krajevne mape"
 msgid "Call"
 msgstr "KliÄi"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "_KonÄano"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Digitalni podpis"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Ne posreduj"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "Åifriranje"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Navezava"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Vam na znanje"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Posreduj"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "LicenÄni dogovor"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Odgovor ni potreben"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Ocena"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "Viri iskalne mape"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "Varnostni podatki"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "DoloÄene mape"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -11795,23 +11795,23 @@ msgstr ""
 "SporoÄila, ki ste jih izbrali za navezavo, so navedena spodaj.\n"
 "Izberite dejanje navezave iz menija \"Zastavica\"."
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "_Sprejmi licenco"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "_Datum zapadlosti:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "_Zastavica:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "_Obkljukajte za sprejem licenÄnega dogovora"
 
-#: ../mail/mail-folder-cache.c:767
+#: ../mail/mail-folder-cache.c:779
 #, c-format
 msgid "Pinging %s"
 msgstr "PoÅiljanje pinga %s"
@@ -11824,98 +11824,94 @@ msgstr "Filtriranje izbranih sporoÄil"
 msgid "Fetching Mail"
 msgstr "Pridobivanje poÅte"
 
-#: ../mail/mail-ops.c:820
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "PoÅiljanje sporoÄila %d od %d"
 
-#: ../mail/mail-ops.c:868
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "PoÅiljanje %d od %d sporoÄil ni uspelo"
 
-#: ../mail/mail-ops.c:872
-#: ../mail/mail-send-recv.c:824
+#: ../mail/mail-ops.c:873
+#: ../mail/mail-send-recv.c:837
 msgid "Canceled."
 msgstr "Preklicano."
 
-#: ../mail/mail-ops.c:874
-#: ../mail/mail-send-recv.c:826
+#: ../mail/mail-ops.c:875
+#: ../mail/mail-send-recv.c:839
 msgid "Complete."
 msgstr "KonÄano."
 
-#: ../mail/mail-ops.c:984
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Premikanje sporoÄil v '%s'"
 
-#: ../mail/mail-ops.c:985
+#: ../mail/mail-ops.c:986
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopiranje sporoÄil v '%s'"
 
-#: ../mail/mail-ops.c:1102
+#: ../mail/mail-ops.c:1104
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Shranjevanje mape '%s'"
 
-#: ../mail/mail-ops.c:1176
+#: ../mail/mail-ops.c:1179
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "UniÄevanje in shranjevanje raÄuna '%s'"
 
-#: ../mail/mail-ops.c:1177
+#: ../mail/mail-ops.c:1180
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Shranjevanje raÄuna '%s'"
 
-#: ../mail/mail-ops.c:1239
+#: ../mail/mail-ops.c:1242
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "OsveÅevanje mape '%s'"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1432
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "UniÄevanje mape '%s'"
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1517
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznjenje smeti v '%s'"
 
-#: ../mail/mail-ops.c:1491
-msgid "Local Folders"
-msgstr "Krajevne mape"
-
-#: ../mail/mail-ops.c:1589
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Prekinjanje povezave s streÅnikom '%s'"
 
-#: ../mail/mail-send-recv.c:197
+#: ../mail/mail-send-recv.c:198
 msgid "Canceling..."
 msgstr "Prekinjanje ..."
 
-#: ../mail/mail-send-recv.c:443
+#: ../mail/mail-send-recv.c:454
 msgid "Send & Receive Mail"
 msgstr "PoÅlji in prejmi poÅto"
 
-#: ../mail/mail-send-recv.c:459
+#: ../mail/mail-send-recv.c:470
 msgid "Cancel _All"
 msgstr "PrekliÄi _vse"
 
-#: ../mail/mail-send-recv.c:585
-#: ../mail/mail-send-recv.c:963
+#: ../mail/mail-send-recv.c:596
+#: ../mail/mail-send-recv.c:979
 msgid "Updating..."
 msgstr "Posodabljanje ..."
 
-#: ../mail/mail-send-recv.c:585
-#: ../mail/mail-send-recv.c:680
+#: ../mail/mail-send-recv.c:596
+#: ../mail/mail-send-recv.c:691
 msgid "Waiting..."
 msgstr "Äakanje ..."
 
-#: ../mail/mail-send-recv.c:943
+#: ../mail/mail-send-recv.c:959
 #, c-format
 msgid "Checking for new mail"
 msgstr "Preverjanje za novo poÅto"
@@ -11944,7 +11940,7 @@ msgstr "Posredovano sporoÄilo"
 msgid "Setting up Search Folder: %s"
 msgstr "Nastavljanje iskalne mape: %s"
 
-#: ../mail/mail-vfolder.c:238
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s' : %s"
 msgstr "Posodabljanje iskalne mape za '%s': %s"
@@ -11954,7 +11950,7 @@ msgstr "Posodabljanje iskalne mape za '%s': %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:681
+#: ../mail/mail-vfolder.c:678
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted folder\n"
@@ -11979,11 +11975,11 @@ msgstr[3] ""
 "%s so bile spremenjene zaradi odstranjene mape\n"
 "\"%s\"."
 
-#: ../mail/mail-vfolder.c:1294
+#: ../mail/mail-vfolder.c:1314
 msgid "Edit Search Folder"
 msgstr "Uredi iskalno mapo"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1423
 msgid "New Search Folder"
 msgstr "Nova iskalna mapa"
 
@@ -12231,51 +12227,56 @@ msgid "Failed to open folder."
 msgstr "Odpiranje mape je spodletelo."
 
 #: ../mail/mail.error.xml.h:66
+#, fuzzy
+msgid "Failed to query server for a list of supported authentication mechanisms."
+msgstr "Poizvedovanje streÅnika za seznam podprtih mehanizmov overitve."
+
+#: ../mail/mail.error.xml.h:67
 msgid "Failed to remove attachments from messages."
 msgstr "Odstranjevanje priloge iz sporoÄila je spodletelo."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Failed to retrieve messages."
 msgstr "Pridobivanje sporoÄil je spodletelo."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Failed to save messages to disk."
 msgstr "Shranjevanje sporoÄila na disk je spodletelo."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "Preklic naroÄnine iz mape je spodletel."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "Datoteka obstaja, vendar je ni mogoÄe prepisati."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "Datoteka obstaja, vendar ni obiÄajna datoteka."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Mapa '{0}' ne vsebuje podvojenih sporoÄil."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "V primeru, da boste nadaljevali, teh sporoÄil ne bo mogoÄe obnoviti."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently."
 msgstr "V primeru, da mapo izbriÅete, bo njena vsebina in vsebina njenih podmap trajno izbrisana."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "V primeru, da mapo izbriÅete, bo trajno izbrisana tudi njena celotna vsebina."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "V primeru da boste nadaljevali, bodo vsi raÄuni posredniÅkih streÅnikov trajno izbrisani."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12283,71 +12284,71 @@ msgstr ""
 "V primeru, da boste nadaljevali, bodo podatki o raÄunu in\n"
 "vsi podatki o posredniÅkih streÅnikih trajno izbrisani."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "V primeru da  nadaljujete, bodo vsi podatki o raÄunu trajno izbrisani."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "V primeru, da program konÄate, sporoÄila ne bodo poslana do ponovnega zagona Evolutiona."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "Neveljavna overitev"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "Neuspel izbris poÅte"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "PoÅtni filtri se samodejno posodabljajo."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
 msgstr "Åtevilni sistemi elektronske poÅte dodajo sporoÄilom, ki vsebujejo prejemnike le v polju SKP, glavo OÄitno-Za. V tem primeru glava vsebuje vse prejemnike. Temu se lahko izognete, Äe dodate vsaj enega prejemnika v polje Za: ali KP:."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Messages shown in Search Folders are not copies. Deleting them from a Search Folder will delete the actual messages from the folder or folders in which they physically reside. Do you really want to delete these messages?"
 msgstr "SporoÄila na seznamu iskanja map niso kopije sporoÄil. Brisanje sporoÄil iz iskalne mape, izbriÅe tudi dejansko sporoÄilo iz ene od vaÅih krajevnih ali oddaljenih map. Ali zares Åelite nadaljevati?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "ManjkajoÄa mapa."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "N_ikoli"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "Podvojenih sporoÄil ni mogoÄe najti."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "Noben vir ni izbran."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "Odpiranje prevelikega Åtevila sporoÄil hkrati lahko traja nekaj Äasa."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "Preverite nastavitve svojega raÄuna in poskusite znova."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "OmogoÄite raÄun ali poÅljite z drugim raÄunom."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
 msgstr "Vnesite veljaven naslov elektronske poÅte v polje Za:. Naslove elektronske poÅte lahko poiÅÄete s klikom na gumb Za: ob vnosnem polju."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
@@ -12355,67 +12356,67 @@ msgstr ""
 "PrepriÄajte se, da naslednji prejemniki Åelijo in lahko prejemajo poÅto v obliki HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "Izberite edinstveno ime za ugotovitev istovetnosti tega podpisa."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "PoÄakajte."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Napaka med seljenjem mape s staro poÅto \"{0}\"."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Poizvedovanje streÅnika za seznam podprtih mehanizmov overitve."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "Zahtevana je povratnica branja."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ali Åelite izbrisati mapo \"{0}\" in vse njene podmape?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "Ali Åelite izbrisati mapo \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "Ali Åelite odstraniti podvojena sporoÄila?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "Odgovori zasebno"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "Samodejno posodabljanje iskalnih map."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "Ali naj se odgovor poÅlje zasebno?"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "Ali naj se odgovor sporoÄilu poÅlje vsem prejemnikom?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "Podpis Åe obstaja"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ali naj se mape krajevno uskladijo za delo brez povezave?"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
 msgstr "Za pravilno delovanje Evolutiona je treba ohraniti sistemske mape, ki ne smejo biti preimenovane, premaknjene ali izbrisane."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12425,7 +12426,7 @@ msgstr ""
 "\n"
 "Åtevilni sistemi elektronske poÅte dodajo sporoÄilom, ki vsebujejo prejemnike le v polju SKP, glavo OÄitno-Za. V tem primeru bo glava vsebovala vse prejemnike. Temu se lahko izognete, Äe dodate vsaj enega prejemnika v polje Za: ali KP:."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12433,7 +12434,7 @@ msgstr ""
 "Navedeni naslov prejemnika ni bil prepoznan kot veljavni elektronski naslov:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12441,15 +12442,15 @@ msgstr ""
 "Navedeni naslovi prejemnikov niso bili prepoznani kot veljavni elektronski naslovi:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "Datoteka skripta mora obstajati in biti izvedljiva."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid "These messages are not copies."
 msgstr "Ta sporoÄila niso kopije sporoÄil."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12457,95 +12458,95 @@ msgstr ""
 "Mapa je bila morda dodana implicitno.\n"
 "Pojdite v urejevalnik map iskanja in jo dodajte izrecno, Äe je to potrebno."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:129
 msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "Tega sporoÄila ni mogoÄe poslati, ker raÄun za poÅiljanje ni omogoÄen"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:130
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Tega sporoÄila ni mogoÄe poslati, ker niste navedli nobenega prejemnika"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:131
 msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "StreÅnik ne podpira tovrstne overitve ni morda sploh ne podpira nikakrÅne overitve."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "Podpis je bil spremenjen, a ni bil shranjen."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:133
 msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "To bo oznaÄilo vsa sporoÄila v izbrani mapi in njenih podmapah kot prebrana."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr "To bo oznaÄilo vsa sporoÄila v izbrani mapi in njenih podmapah kot prebrana."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "Povezava s streÅnikom GroupWise ni uspela."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:136
 msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "Ni mogoÄe odpreti mape osnutkov za ta raÄun. Ali Åelite uporabiti sistemsko mapo osnutkov?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "LicenÄne datoteke ni mogoÄe prebrati."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:138
 msgid "Unable to retrieve message."
 msgstr "Ni mogoÄe pridobiti sporoÄila."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "Uporabi _privzeto"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "Ali naj bo uporabljena privzeta mapa osnutkov?"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "Ali Åelite zapreti okno s sporoÄili?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:142
 msgid "You are replying privately to a message which arrived via a mailing list, but the list is trying to redirect your reply to go back to the list. Are you sure you want to proceed?"
 msgstr "Odgovarjate zasebno poÅiljatelju na sporoÄilo, ki je prispelo preko dopisnega seznama, vendar pa bo sporoÄilo poslano neposredno na dopisni seznam. Ali Åelite nadaljevati?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:143
 msgid "You are replying to a message which arrived via a mailing list, but you are replying privately to the sender; not to the list. Are you sure you want to proceed?"
 msgstr "Odgovarjate na sporoÄilo, ki je prispelo preko dopisnega seznama, vendar odgovarjate zasebno poÅiljatelju in ne na seznam. Ali Åelite nadaljevati?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:144
 msgid "You are replying to a message which was sent to many recipients. Are you sure you want to reply to ALL of them?"
 msgstr "Odgovarjate na sporoÄilo, ki je bilo poslano veÄ prejemnikom. Ali ste prepriÄani, da Åelite odgovor poslati vsem prejemnikom?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nimate zadostnih dovoljenj za izbris te poÅte."
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "Niste vpisali vseh zahtevanih podatkov."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Imate neposlana sporoÄila. Ali Åelite kljub temu konÄati?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "Dveh raÄunov z enakim imenom ni mogoÄe ustvariti."
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "To iskalno mapo morate poimenovati."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "Navesti morate mapo."
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
@@ -12553,161 +12554,161 @@ msgstr ""
 "Kot vir morate navesti vsaj eno mapo.\n"
 "Mape lahko izberete posamiÄno ali pa izberete vse krajevne mape, vse oddaljene mape ali oboje."
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Prijava na vaÅ streÅnik \"{0}\" kot \"{0}\" ni uspela."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "_Vedno"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "P_ripni"
 
-#: ../mail/mail.error.xml.h:155
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../mail/mail.error.xml.h:156
+#: ../plugins/publish-calendar/publish-calendar.c:619
 msgid "_Disable"
 msgstr "O_nemogoÄi"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "_Prezri spremembe"
 
-#: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Empty Trash"
 msgstr "Izprazni _smeti"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
 msgstr "_KonÄaj Evolution"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "_UniÄi"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
 msgstr "_Preseli zdaj"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "_Ne"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "_Odpri sporoÄila"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "_PoÅlji povratnico"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "_Uskladi"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:169
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/message-list.c:1211
+#: ../mail/message-list.c:1261
 msgid "Unseen"
 msgstr "Nepregledano"
 
-#: ../mail/message-list.c:1212
+#: ../mail/message-list.c:1262
 msgid "Seen"
 msgstr "Videno"
 
-#: ../mail/message-list.c:1213
+#: ../mail/message-list.c:1263
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: ../mail/message-list.c:1214
+#: ../mail/message-list.c:1264
 msgid "Forwarded"
 msgstr "Posredovano"
 
-#: ../mail/message-list.c:1215
+#: ../mail/message-list.c:1265
 msgid "Multiple Unseen Messages"
 msgstr "VeÄ nepregledanih sporoÄil"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1266
 msgid "Multiple Messages"
 msgstr "VeÄ sporoÄil"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1270
 msgid "Lowest"
 msgstr "najniÅja"
 
-#: ../mail/message-list.c:1221
+#: ../mail/message-list.c:1271
 msgid "Lower"
 msgstr "nizka"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1275
 msgid "Higher"
 msgstr "visoka"
 
-#: ../mail/message-list.c:1226
+#: ../mail/message-list.c:1276
 msgid "Highest"
 msgstr "najviÅja"
 
-#: ../mail/message-list.c:1838
-#: ../widgets/table/e-cell-date.c:48
+#: ../mail/message-list.c:1909
+#: ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1845
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1916
 #: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Danes %H.%M"
 
-#: ../mail/message-list.c:1854
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "VÄeraj %H.%M"
 
-#: ../mail/message-list.c:1866
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1874
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "%d. %m. %H.%M"
 
-#: ../mail/message-list.c:1876
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%d. %m. %Y"
 
-#: ../mail/message-list.c:2644
+#: ../mail/message-list.c:2752
 msgid "Select all visible messages"
 msgstr "Izberi vsa vidna sporoÄila"
 
-#: ../mail/message-list.c:2802
+#: ../mail/message-list.c:2912
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "SporoÄila"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:3997
+#: ../mail/message-list.c:4160
 msgid "Follow-up"
 msgstr "Navezava"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4501
-#: ../mail/message-list.c:4920
+#: ../mail/message-list.c:4675
+#: ../mail/message-list.c:5098
 msgid "Generating message list"
 msgstr "Ustvarjanje seznama sporoÄil"
 
-#: ../mail/message-list.c:4738
+#: ../mail/message-list.c:4912
 msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
 msgstr "Ni sporoÄil, ki zadovoljijo vaÅe kriterije iskanja. Iskanje lahko poÄistite z menijem Iskanje->PoÄisti ali pa ga spremenite."
 
-#: ../mail/message-list.c:4740
+#: ../mail/message-list.c:4914
 msgid "There are no messages in this folder."
 msgstr "V tej mapi ni sporoÄil."
 
@@ -12745,27 +12746,27 @@ msgid "Subject - Trimmed"
 msgstr "Zadeva - OkleÅÄeno"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Body contains"
 msgstr "Telo vsebuje"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 msgid "Message contains"
 msgstr "SporoÄilo vsebuje"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1578
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "Recipients contain"
 msgstr "Prejemniki vsebujejo"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1585
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Sender contains"
 msgstr "PoÅiljatelj vsebuje"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
@@ -12785,49 +12786,49 @@ msgstr "V primeru, da izberete to moÅnost se bo Evolution na vaÅ streÅnik LDA
 msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
 msgstr "V primeru, da izberete to moÅnost vaÅ streÅnik ne podpira SSL ali TLS. To pomeni, da vaÅa povezava ne bo varna in da boste bolj ranljivi na varnostne izkoriÅÄevalske programe."
 
-#: ../modules/addressbook/addressbook-config.c:625
+#: ../modules/addressbook/addressbook-config.c:641
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Uporabi v koledarju _rojstnih dni in obletnic"
 
-#: ../modules/addressbook/addressbook-config.c:666
+#: ../modules/addressbook/addressbook-config.c:683
 msgid "Copy _book content locally for offline operation"
 msgstr "Vsebino _knjige kopiraj krajevno za delo brez povezave"
 
-#: ../modules/addressbook/addressbook-config.c:778
+#: ../modules/addressbook/addressbook-config.c:798
 msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
 msgstr "To so vrata streÅnika LDAP na katera se bo poskuÅal povezati Evolution. Na voljo je seznam obiÄajnih vrat. O tem, katera vrata morate navesti, se pozanimajte pri skrbniku vaÅega sistema."
 
-#: ../modules/addressbook/addressbook-config.c:857
+#: ../modules/addressbook/addressbook-config.c:879
 msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
 msgstr "To je naÄin, ki ga bo Evolution uporabil za vaÅo overitev. V primeru, da izberete \"Naslov elektronske poÅte\", bo zahtevan anonimni dostop do vaÅega streÅnika LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:937
+#: ../modules/addressbook/addressbook-config.c:962
 msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 msgstr "Doseg iskanja doloÄa, kako daleÄ po drevesu map naj se razÅiri iskanje. Doseg \"pod\" vkljuÄi vse vnose pod vaÅo iskalno zbirko, doseg \"en\" pa le vnose, ki so eno raven pod vaÅo zbirko."
 
-#: ../modules/addressbook/addressbook-config.c:1058
+#: ../modules/addressbook/addressbook-config.c:1086
 msgid "Server Information"
 msgstr "Podrobnosti o streÅniku"
 
-#: ../modules/addressbook/addressbook-config.c:1063
+#: ../modules/addressbook/addressbook-config.c:1091
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../modules/addressbook/addressbook-config.c:1064
+#: ../modules/addressbook/addressbook-config.c:1092
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Iskanje"
 
-#: ../modules/addressbook/addressbook-config.c:1066
+#: ../modules/addressbook/addressbook-config.c:1094
 msgid "Downloading"
 msgstr "Prejemanje"
 
-#: ../modules/addressbook/addressbook-config.c:1272
+#: ../modules/addressbook/addressbook-config.c:1309
 msgid "Address Book Properties"
 msgstr "Lastnosti imenika"
 
-#: ../modules/addressbook/addressbook-config.c:1274
+#: ../modules/addressbook/addressbook-config.c:1311
 msgid "New Address Book"
 msgstr "Nov imenik"
 
@@ -12912,64 +12913,65 @@ msgid "Whether to show the preview pane."
 msgstr "Ali naj bo prikazan pladenj predogleda."
 
 #. 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:165
-#: ../modules/mail/em-mailer-prefs.c:1150
+#: ../modules/addressbook/autocompletion-config.c:194
+#: ../modules/mail/em-mailer-prefs.c:1049
 msgid "_Table column:"
 msgstr "_Stolpec razpredelnice:"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:197
 msgid "Autocompletion"
 msgstr "Samodejno dopolnjevanje"
 
-#: ../modules/addressbook/autocompletion-config.c:171
+#: ../modules/addressbook/autocompletion-config.c:200
 msgid "Always _show address of the autocompleted contact"
 msgstr "Vedno _pokaÅi naslov samodejno dopolnjenega stika"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-backend.c:102
 #: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "Na streÅnikih LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Stik"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:304
 #: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "Ustvari nov stik"
 
-#: ../modules/addressbook/e-book-shell-backend.c:291
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Seznam _stikov"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:311
 #: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: ../modules/addressbook/e-book-shell-backend.c:301
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Imenik"
 
-#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-backend.c:321
 #: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "Ustvari nov imenik"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:320
+#: ../modules/addressbook/e-book-shell-backend.c:338
 #: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-backend.c:115
 #: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "Stiki"
 
-#: ../modules/addressbook/e-book-shell-backend.c:330
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
 msgstr "Potrdila"
 
@@ -13024,10 +13026,10 @@ 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:854
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
-#: ../modules/calendar/e-task-shell-view-actions.c:751
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "_Rename..."
 msgstr "_Preimenuj ..."
 
@@ -13100,22 +13102,22 @@ msgid "Send a message to the selected contacts"
 msgstr "PoÅlje sporoÄilo izbranim stikom"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Actions"
 msgstr "_Dejanja"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:816
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
+#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "_Preview"
 msgstr "_Predogled"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-memo-shell-view-actions.c:690
+#: ../modules/calendar/e-task-shell-view-actions.c:842
 msgid "_Delete"
 msgstr "_IzbriÅi"
 
@@ -13144,9 +13146,9 @@ msgid "Show maps in contact preview window"
 msgstr "PokaÅe zemljevid v oknu predogleda stika"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1018
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:1472
 msgid "_Classic View"
 msgstr "_ObiÄajni pogled"
 
@@ -13155,9 +13157,9 @@ msgid "Show contact preview below the contact list"
 msgstr "PokaÅi predogled stika pod seznamom stikov"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1025
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:905
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "_Vertical View"
 msgstr "_NavpiÄni pogled"
 
@@ -13166,25 +13168,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "PokaÅi predogled stika ob seznamu stikov"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1035
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Any Category"
 msgstr "Katerakoli kategorija"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1677
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
-#: ../shell/e-shell-content.c:638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
@@ -13238,22 +13240,22 @@ msgstr "_PoÅlji sporoÄilo seznamu"
 msgid "_Send Message to Contact"
 msgstr "_PoÅlji sporoÄilo stiku"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:149
 msgid "Multiple vCards"
 msgstr "VeÄ vizitk vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:155
+#: ../modules/addressbook/eab-composer-util.c:157
 #, c-format
 msgid "vCard for %s"
 msgstr "Vizitka vCard za %s"
 
-#: ../modules/addressbook/eab-composer-util.c:167
-#: ../modules/addressbook/eab-composer-util.c:194
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information"
 msgstr "Podatki o stiku"
 
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:198
 #, c-format
 msgid "Contact information for %s"
 msgstr "Podatki o stiku za %s"
@@ -13339,14 +13341,43 @@ msgstr "_Doseg iskanja:"
 msgid "_Timeout:"
 msgstr "Äasovna _zakasnitev:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "_Uporabi varno povezavo:"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "vizitke"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, fuzzy, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Cev na Bogofilter ni uspelo, koda napake: %d."
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "MoÅnosti Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Pretvori poÅtna sporoÄila v znakovni nabor _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Pretvori poÅtna sporoÄila v znakovni nabor Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgstr "Pretvori sporoÄilo v Unicode UTF-8 za poenotenje Åetonov neÅelene poÅte, ki so v drugih naborih znakov."
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -13376,38 +13407,44 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alerts"
 msgstr "Opozorila"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Day _ends:"
 msgstr "Konec dn_eva:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "Days"
 msgstr "Dnevi"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Default Free/Busy Server"
 msgstr "Privzet streÅnik zasedenosti"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Display"
 msgstr "PokaÅi"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#, fuzzy
+msgid "Display reminders in _notification area only"
 msgstr "Prikaz alarmov le v obvestilnem p_odroÄju"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Hours"
 msgstr "Ure"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
 msgid "Minutes"
 msgstr "Minute"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#, fuzzy
+msgid "Publishing Information"
+msgstr "<b>Podrobnosti razpredelnice</b>"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "S_un"
@@ -13422,7 +13459,8 @@ msgid "Se_cond zone:"
 msgstr "_Drug pas:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
+#, fuzzy
+msgid "Select the calendars for reminder notification"
 msgstr "Izberite koledarje za obvestila alarma"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
@@ -13452,354 +13490,361 @@ msgstr "_Naloge, ki zakasnijo danes:"
 msgid "T_hu"
 msgstr "Ä_et"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "Predloga:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Äas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "Oblika izpisa Äasa:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Uporabi _sistemski Äasovni pas"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "_ZaÄetek tedna:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Work Week"
 msgstr "Delovni teden"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "Delovni dnevi:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 urna (dop./pop.)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 urna"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_VpraÅaj za potrditev ob brisanju predmetov"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Stisni vikende v meseÄnem pogledu"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "ZaÄetek _dneva:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "_pet"
 
-#: ../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"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "po_n"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "_Zakasnele naloge:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "so_b"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "PokaÅi Äase koncev _sestankov v tedenskih in meseÄnih pogledih"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "Deli_tve Äasa:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "_tor"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "_sre"
 
 #. 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:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "pred vsako obletnico ali rojstnim dnem"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "pred vsakim sestankom"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Programi alarma"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "VpraÅaj za potrditev ob brisanju predmetov"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Barva ozadja nalog, ki zakasnijo danes, v obliki \"#rrggbb\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Barva ozadja zakasnjenih nalog v obliki \"#rrggbb\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "Opomnik rojstnih dni in obletnic"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "Enote rojstnih dni in obletnic"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "Vrednost opomnika rojstnih dni in obletnic"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#, fuzzy
+msgid "Calendars to run reminders for"
 msgstr "Koledarji za katere teÄejo alarmi"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Barva Ärt Marcusa Baina v vrstici Äasa (prazno za privzeto vrednost)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Barva Ärt Marcusa Baina v dnevnem pogledu."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "Stisni vikende v meseÄnem pogledu"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "Potrdi uniÄenje"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Dnevi, ko naj bosta oznaÄena zaÄetek in konec delovnih ur."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Privzet opomnik za sestanke"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Privzete enote opomnika"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Privzeta vrednost opomnika"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#, fuzzy
+msgid "Directory for saving reminder audio files"
 msgstr "Mapa za shranjevanje zvoÄnih datotek za alarm"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "URL-ji streÅnika zasedenosti"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "URL predloge zasedenosti"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Skrij konÄane naloge"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Skrij enote nalog"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Skrij vrednost nalog"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "PoloÅaj vodoravnega pladnja"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Ura, ko se konÄa delovni dan (od 0 do 23)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Ura, ko se zaÄne delovni dan (od 0 do 23)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "Izbrana moÅnost omogoÄa prikaz pladnja predogleda opomnikov v glavnem oknu."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "Izbrana moÅnost omogoÄa prikaz pladnja predogleda nalog v glavnem oknu."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervali prikazani v dnevnemu pogledu in pogledu delovnega tedna v minutah."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "Zadnji Äas alarma"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr "Zadnji Äas opomnika"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "Seznam nedavno uporabljenih drugih Äasovnih pasov v dnevnem pogledu."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "Seznam URL-jev streÅnikov za objavljanje zasedenosti."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Ärta Marcusa Baina"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Barva Ärte Marcusa Baina - dnevni pogled"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Barva Ärte Marcusa Baina - vrstica Äasa"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
 msgstr "NajveÄje Åtevilo nedavno uporabljenih Äasovnih pasov na seznamu 'day_second_zones' za pomnjenje"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "NajveÄje Åtevilo nedavno uporabljenih Äasovnih pasov za pomnjenje."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "Slog razporeditve opomnikov"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "PoloÅaj pladnja predogleda opomnikov (vodoravno)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "PoloÅaj okna predogleda opomnikov (navpiÄno)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuta, ko se konÄa delovni dan (od 0 do 59)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuta, ko se zaÄne delovni dan (od 0 do 59)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "PoloÅaj vodoravnega pladnja v meseÄnem pogledu"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "PoloÅaj navpiÄnega pladnja v meseÄnem pogledu"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "Åtevilo enot za doloÄanje opomnika za rojstni dan ali obletnico."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "Åtevilo enot za doloÄanje privzetega opomnika."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "Åtevilo enot za doloÄanje, kdaj so naloge skrite."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "Barva zakasnelih nalog"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
 msgstr "PoloÅaj vodoravnega pladnja med krmarjem datumov koledarja in seznamom nalog, kadar ni v meseÄnem pogledu v toÄkah."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "PoloÅaj vodoravnega pladnja med pogledom in krmarjem datumov koledarja ter seznamom nalog v meseÄnemu pogledu v toÄkah."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "PoloÅaj pladnja predogleda opomnikov, kadar je ta usmerjen navpiÄno."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "PoloÅaj pladnja nalog, kadar je ta usmerjen vodoravno."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "PoloÅaj pladnja predogleda nalog, kadar je ta usmerjen navpiÄno."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "PoloÅaj navpiÄnega pladnja med seznami koledarjev in krmarjem datumov koledarja."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "PoloÅaj navpiÄnega pladnja med pogledom in krmarjem datumov koledarja ter seznamom nalog v meseÄnem pogledu v toÄkah."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
 msgstr "PoloÅaj navpiÄnega pladnja med pogledom in krmarjem datumov koledarja ter seznamom nalog, kadar ni v meseÄnem pogledu v toÄkah."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "Osnovni koledar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "Osnovni seznam opomnikov"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "Osnovni seznam nalog"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#, fuzzy
+msgid "Programs that are allowed to be run by reminders."
 msgstr "Programi, ki jih lahko zaÅenejo alarmi."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "Nedavno uporabljeni drugi Äasovni pasovi v dnevnem pogledu"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "PonavljajoÄi se dogodki so zapisani v leÅeÄi pisavi"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+msgid "Reminder programs"
+msgstr ""
+"\n"
+"ManjkajoÄi programi: %s."
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
+#, fuzzy
+msgid "Save directory for reminder audio"
 msgstr "Shrani mapo za zvoÄni alarm"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
@@ -13827,7 +13872,8 @@ msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr "PokaÅi dneve s ponavljajoÄimi se dogodki v leÅeÄi pisavi v spodnjem levem koledarju."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
+#, fuzzy
+msgid "Show display reminders in notification tray"
 msgstr "PokaÅi zaslonske alarme v obvestilni vrstici"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
@@ -13916,7 +13962,8 @@ msgid "Time divisions"
 msgstr "Delitve Äasa"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
+#, fuzzy
+msgid "Time the last reminder ran, in time_t."
 msgstr "Äas, ko je tekel zadnji alarm."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
@@ -13960,7 +14007,8 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ZaÄetni dan tedna, od nedelje (0) do sobote (6)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+#, fuzzy
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr "Ali naj bo za zaslonske alarme uporabljena obvestilna vrstica."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
@@ -14051,419 +14099,433 @@ msgstr "Ura zaÄetka delovnega dne"
 msgid "Workday start minute"
 msgstr "Minuta zaÄetka delovnega dne"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:286
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "_Uvozi"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:367
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "Izbor koledarja"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:394
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "Izbor seznama nalog"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "Uvoz_i v koledar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:411
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "Uvoz_i v naloge"
 
+#: ../modules/calendar/e-calendar-preferences.c:461
+msgid "Selected Calendars for Reminders"
+msgstr "Izbrani koledarji za opomnike"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+msgid "Ti_me and date:"
+msgstr "_Äas in datum:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+msgid "_Date only:"
+msgstr "Le _datum:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-backend.c:117
 #: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:100
+#: ../modules/calendar/e-memo-shell-backend.c:104
 #: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:100
+#: ../modules/calendar/e-task-shell-backend.c:104
 #: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "Na spletu"
 
-#: ../modules/calendar/e-cal-shell-backend.c:115
-#: ../plugins/calendar-weather/calendar-weather.c:125
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "Vreme"
 
-#: ../modules/calendar/e-cal-shell-backend.c:202
+#: ../modules/calendar/e-cal-shell-backend.c:206
 #: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "Rojstni dnevi in obletnice"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Sestanek"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "Ustvari nov sestanek"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevni _sestanek"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "Ustvari nov celodnevni sestanek"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_reÄanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "Ustvari nov zahtevek za sreÄanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Koledar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:755
-#: ../plugins/itip-formatter/itip-formatter.c:2946
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "Koledar in naloge"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:180
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "Nalaganje koledarjev"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:721
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
 msgstr "_Nov koledar ..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:738
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "Izbirnik koledarjev"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1087
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Odpiranje koledarja na %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "Natisni"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:310
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 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 events."
 msgstr "S tem dejanjem bodo trajno izbrisani vsi dogodki, ki so starejÅi od izbrane vrednosti. V primeru, da boste nadaljevali, teh dogodkov ne bo mogoÄe obnoviti."
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:327
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "PoÄisti dogodke starejÅe kot"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:541
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "Kopiranje predmetov"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 msgid "Moving Items"
 msgstr "Premikanje predmetov"
 
 #. 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:1143
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "dogodek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1145
-#: ../modules/calendar/e-cal-shell-view-memopad.c:220
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:511
-#: ../modules/calendar/e-task-shell-view-actions.c:628
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../modules/calendar/e-cal-shell-view-memopad.c:219
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "Save as iCalendar"
 msgstr "Shrani kot iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "_Kopiraj ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "D_elete Calendar"
 msgstr "_IzbriÅi koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Delete the selected calendar"
 msgstr "IzbriÅe izbrani koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Go Back"
 msgstr "Pojdi nazaj "
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Go Forward"
 msgstr "Pojdi naprej"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Select today"
 msgstr "Izbere danes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Select _Date"
 msgstr "Izberi _datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Select a specific date"
 msgstr "Izberi doloÄen datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "_New Calendar"
 msgstr "_Nov koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr "PoÄ_isti"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Purge old appointments and meetings"
 msgstr "PoÄisti stare sestanke in sreÄanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Re_fresh"
 msgstr "_OsveÅi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Refresh the selected calendar"
 msgstr "OsveÅi izbrani koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Rename the selected calendar"
 msgstr "Preimenuj izbrani koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Show _Only This Calendar"
 msgstr "PokaÅi _le ta koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj v _koledar ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "_Delegate Meeting..."
 msgstr "_PoblaÅÄeno zastopanje sreÄanja..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "_Delete Appointment"
 msgstr "_IzbriÅi sestanek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Delete selected appointments"
 msgstr "IzbriÅe izbrane sestanke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "Delete This _Occurrence"
 msgstr "IzbriÅi to _pojavitev"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Delete this occurrence"
 msgstr "IzbriÅe to pojavitev"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Delete All Occ_urrences"
 msgstr "IzbriÅi _vse pojavitve"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Delete all occurrences"
 msgstr "ZbriÅe vse pojavitve"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "New All Day _Event..."
 msgstr "Nov _celodnevni dogodek ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Create a new all day event"
 msgstr "Ustvari nov celodnevni sestanek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
-#: ../modules/calendar/e-cal-shell-view-memopad.c:254
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "_Forward as iCalendar..."
 msgstr "_Posreduj kot iCalendar  ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "New _Meeting..."
 msgstr "Novo _sreÄanje ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Create a new meeting"
 msgstr "Ustvari novo sreÄanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Mo_ve to Calendar..."
 msgstr "Premakni _v koledar ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "New _Appointment..."
 msgstr "Nov _sestanek ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _premakljivo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Open Appointment"
 msgstr "_Odpri sestanek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "View the current appointment"
 msgstr "Ogled trenutnega sestanka"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "_Reply"
 msgstr "Odgovo_ri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "_Schedule Meeting..."
 msgstr "_NaÄrtuj sreÄanje ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Converts an appointment to a meeting"
 msgstr "Pretvori sestanek v sreÄanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Conv_ert to Appointment..."
 msgstr "_Pretvori v sestanek ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Converts a meeting to an appointment"
 msgstr "Pretvori sreÄanje v sestanek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "Quit"
 msgstr "KonÄaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Day"
 msgstr "Dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one day"
 msgstr "PokaÅi en dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "List"
 msgstr "Seznam"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show as list"
 msgstr "PokaÅi kot seznam"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 msgid "Month"
 msgstr "Mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Show one month"
 msgstr "PokaÅi en mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
 msgid "Week"
 msgstr "Teden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Show one week"
 msgstr "PokaÅi en teden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 msgid "Show one work week"
 msgstr "PokaÅi en delovni teden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Active Appointments"
 msgstr "Dejavni sestanki"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Next 7 Days' Appointments"
 msgstr "Sestanki naslednjih 7 dni"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "Opis vsebuje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "Povzetek vsebuje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Preview the calendar to be printed"
 msgstr "Predogled koledarja pred tiskanjem"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1749
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-msgid "Save as iCalendar..."
-msgstr "Shrani kot iCalendar ..."
+#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../modules/calendar/e-cal-shell-view-memopad.c:294
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
+#: ../modules/calendar/e-memo-shell-view-actions.c:843
+#: ../modules/calendar/e-task-shell-view-actions.c:1042
+msgid "_Save as iCalendar..."
+msgstr "_Shrani kot iCalendar ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
 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:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:509
+#: ../modules/calendar/e-cal-shell-view-memopad.c:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
 msgid "memo"
 msgstr "opomnik"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:261
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
 msgid "New _Memo"
 msgstr "Nov _opomnik"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-memo-shell-backend.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "Create a new memo"
 msgstr "Ustvari nov opomnik"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:268
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
 msgid "_Open Memo"
 msgstr "_Odpri opomnik"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:270
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "View the selected memo"
 msgstr "Ogled izbranega opomnika"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:806
 msgid "Open _Web Page"
 msgstr "Odpri _spletno stran"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
 msgid "Print the selected memo"
 msgstr "Natisni izbrani opomnik"
 
@@ -14471,182 +14533,172 @@ msgstr "Natisni izbrani opomnik"
 #. * 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:285
-#: ../modules/calendar/e-task-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
 msgid "task"
 msgstr "naloga"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Assign Task"
 msgstr "Dodeli _nalogo"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "_Mark as Complete"
 msgstr "_OznaÄi kot opravljeno"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Mark selected tasks as complete"
 msgstr "OznaÄi izbrane naloge kot opravljene"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 msgid "_Mark as Incomplete"
 msgstr "_OznaÄi kot nedokonÄano"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mark selected tasks as incomplete"
 msgstr "OznaÄi izbrane naloge kot nedokonÄane"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "New _Task"
 msgstr "Nova _naloga"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../modules/calendar/e-task-shell-backend.c:286
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "Create a new task"
 msgstr "Ustvari novo nalogo"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "_Open Task"
 msgstr "_Odpri nalogo"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "View the selected task"
 msgstr "Pogled izbrane naloge"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
 msgid "Print the selected task"
 msgstr "Natisni izbrano nalogo"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
-msgid "_Save as iCalendar..."
-msgstr "_Shrani kot iCalendar ..."
-
-#: ../modules/calendar/e-calendar-preferences.c:441
-msgid "Selected Calendars for Alarms"
-msgstr "Izbrani koledarji za alarme"
-
-#: ../modules/calendar/e-calendar-preferences.c:840
-msgid "Ti_me and date:"
-msgstr "_Äas in datum:"
-
-#: ../modules/calendar/e-calendar-preferences.c:841
-msgid "_Date only:"
-msgstr "Le _datum:"
-
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Opomnik"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Souporabljen opomnik"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
 msgstr "Ustvari nov souporabljen opomnik"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "_Seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Create a new memo list"
 msgstr "Ustvari nov seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:175
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "Nalaganje opomnikov"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:662
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "Izbirnik seznama opomnikov"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:973
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Odpiranje opomnikov na %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "Natisni opomnike"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Delete Memo"
 msgstr "_IzbriÅi opomnik"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Find in Memo..."
 msgstr "_Najdi v opomniku ..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Search for text in the displayed memo"
 msgstr "PoiÅÄi besedilo v prikazanem opomniku"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "D_elete Memo List"
 msgstr "_IzbriÅi seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Delete the selected memo list"
 msgstr "IzbriÅi izbran seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
 msgid "_New Memo List"
 msgstr "_Nov seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Refresh the selected memo list"
 msgstr "OsveÅi izbran seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Preimenuj izbran seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "PokaÅi _le ta seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:713
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Memo _Preview"
 msgstr "_Predogled opomnika"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview pane"
 msgstr "PokaÅi pladenj predogleda opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
 msgid "Show memo preview below the memo list"
 msgstr "PokaÅi predogled opomnikov pod seznamom opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
 msgid "Show memo preview alongside the memo list"
 msgstr "PokaÅi predogled opomnikov ob seznamu opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the list of memos"
 msgstr "Natisni seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
 msgid "Preview the list of memos to be printed"
 msgstr "Predogled seznama opomnikov pred tiskanjem"
 
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "IzbriÅi opomnike"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "IzbriÅi opomnik"
+
 #: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
@@ -14657,63 +14709,55 @@ msgstr[2] "%d opomnika"
 msgstr[3] "%d opomniki"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:573
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
 msgid "%d selected"
 msgstr "%d izbranih"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
-msgid "Delete Memos"
-msgstr "IzbriÅi opomnike"
-
-#: ../modules/calendar/e-memo-shell-view.c:229
-msgid "Delete Memo"
-msgstr "IzbriÅi opomnik"
-
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "_Naloga"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_Dodeljena naloga"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "Ustvari novo dodeljeno nalogo"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Seznam _nalog"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Create a new task list"
 msgstr "Ustvari nov seznam nalog"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:175
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "Nalaganje nalog"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:662
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "Izbirnik seznama nalog"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:973
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Odpiranje nalog v %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "Natisni naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:583
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
@@ -14723,107 +14767,115 @@ msgstr ""
 " \n"
 "Ali Åelite izbrisati te naloge? "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:590
 msgid "Do not ask me again"
 msgstr "Ne spraÅuj veÄ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Delete Task"
 msgstr "_IzbriÅi nalogo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "_Find in Task..."
 msgstr "_Najdi v nalogi ..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Search for text in the displayed task"
 msgstr "PoiÅÄi besedilo v prikazani nalogi"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "Copy..."
 msgstr "Kopiraj ..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 msgid "D_elete Task List"
 msgstr "_IzbriÅi seznam opravil"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "Delete the selected task list"
 msgstr "IzbriÅi izbrani seznam opravil"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "_New Task List"
 msgstr "_Nov seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Refresh the selected task list"
 msgstr "OsveÅi izbrani seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Rename the selected task list"
 msgstr "Preimenuj izbrani seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Show _Only This Task List"
 msgstr "PokaÅi _le ta seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Mar_k as Incomplete"
 msgstr "_OznaÄi kot nedokonÄano"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Delete completed tasks"
 msgstr "IzbriÅi konÄane naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:877
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Task _Preview"
 msgstr "_Predogled nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:879
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Show task preview pane"
 msgstr "PokaÅe pladenj predogleda nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview below the task list"
 msgstr "PokaÅi predogled nalog pod seznamom nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Show task preview alongside the task list"
 msgstr "PokaÅi predogled nalog ob seznamu nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Active Tasks"
 msgstr "Dejavne naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Completed Tasks"
 msgstr "KonÄane naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Next 7 Days' Tasks"
 msgstr "Naloge naslednjih 7 dni"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Overdue Tasks"
 msgstr "Zakasnjene naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:963
 msgid "Tasks with Attachments"
 msgstr "Naloge s prilogami"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the list of tasks"
 msgstr "Natisni seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
 msgid "Preview the list of tasks to be printed"
 msgstr "Predogled seznama nalog pred tiskanjem"
 
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "IzbriÅi naloge"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "IzbriÅi nalogo"
+
 #: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "UniÄuvanje"
 
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -14832,13 +14884,13 @@ msgstr[1] "%d naloga"
 msgstr[2] "%d nalogi"
 msgstr[3] "%d naloge"
 
-#: ../modules/calendar/e-task-shell-view.c:362
-msgid "Delete Tasks"
-msgstr "IzbriÅi naloge"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "PomoÄnik za raÄune Evolutiona"
 
-#: ../modules/calendar/e-task-shell-view.c:364
-msgid "Delete Task"
-msgstr "IzbriÅi nalogo"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "Urejevalnik raÄunov"
 
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:384
@@ -14846,13 +14898,6 @@ msgstr "IzbriÅi nalogo"
 msgid "%d attached messages"
 msgstr "%d priloÅenih sporoÄil"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "Brez"
-
 #: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
@@ -14871,315 +14916,327 @@ msgstr "PoÅtna _mapa"
 msgid "Create a new mail folder"
 msgstr "Ustvari novo poÅtno mapo"
 
-#: ../modules/mail/e-mail-shell-backend.c:408
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "PoÅtni raÄuni"
 
-#: ../modules/mail/e-mail-shell-backend.c:416
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "MoÅnosti poÅte"
 
-#: ../modules/mail/e-mail-shell-backend.c:424
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "MoÅnosti sestavljalnika"
 
-#: ../modules/mail/e-mail-shell-backend.c:432
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "MoÅnosti omreÅja"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
 msgid "_Disable Account"
 msgstr "_OnemogoÄi raÄun"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "Disable this account"
 msgstr "OnemogoÄi ta raÄun"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 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:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Download Messages for Offline Usage"
 msgstr "_Prejmi sporoÄila za pregledovanje brez povezave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 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:1138
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Fl_ush Outbox"
 msgstr "_Odplakni odhodna sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "_Copy Folder To..."
 msgstr "_Kopiraj mapo v ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Copy the selected folder into another folder"
 msgstr "Kopira izbrano mapo v drugo mapo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Permanently remove this folder"
 msgstr "Trajno odstrani to mapo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "E_xpunge"
 msgstr "_UniÄi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 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:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Mar_k All Messages as Read"
 msgstr "OznaÄi vsa sporoÄila _kot prebrana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 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:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "_Move Folder To..."
 msgstr "Premakni _mapo v ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Move the selected folder into another folder"
 msgstr "Premakne izbrano mapo v drugo mapo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "_New..."
 msgstr "_Nova ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "Create a new folder for storing mail"
 msgstr "Ustvari novo mapo za shranjevanje poÅte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Change the properties of this folder"
 msgstr "Spremeni lastnosti te mape"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Refresh the folder"
 msgstr "OsveÅi mapo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Change the name of this folder"
 msgstr "Spremeni ime te mape"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Select Message _Thread"
 msgstr "Izberi _nit sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 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:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select Message S_ubthread"
 msgstr "Izberi pod_nit sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 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:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Empty _Trash"
 msgstr "Izprazni _smeti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 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:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "N_one"
 msgstr "_Brez"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "_Manage Subscriptions"
 msgstr "Upravljanje _naroÄnin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 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:1266
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send / _Receive"
 msgstr "PoÅlji / p_rejmi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 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:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "R_eceive All"
 msgstr "P_rejmi vse"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Receive new items from all accounts"
 msgstr "Prejemi nove predmete za vse raÄune"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "_Send All"
 msgstr "_PoÅlji vse"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 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:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "PrekliÄi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Cancel the current mail operation"
 msgstr "PrekliÄi trenutno opravilo poÅte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Collapse All _Threads"
 msgstr "ZloÅi vse ni_ti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse all message threads"
 msgstr "ZloÅi niti vseh sporoÄil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "E_xpand All Threads"
 msgstr "_RazÅiri vse niti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Expand all message threads"
 msgstr "RazÅiri niti vseh sporoÄil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "_Message Filters"
 msgstr "Filtri _sporoÄil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 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:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_Subscriptions..."
 msgstr "_NaroÄnine ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "F_older"
 msgstr "_Mapa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Label"
 msgstr "_Oznaka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
 msgid "C_reate Search Folder From Search..."
 msgstr "Ustva_ri iskalno mapo iz iskanja ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
 msgid "Search F_olders"
 msgstr "Iskalne _mape"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
 msgid "Create or edit search folder definitions"
 msgstr "Ustvari ali uredi doloÄila iskalnih map"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "_New Folder..."
 msgstr "_Nova mapa ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show Message _Preview"
 msgstr "PokaÅi _predogled sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 msgid "Show message preview pane"
 msgstr "PokaÅi pladenj predogleda sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Show _Deleted Messages"
 msgstr "PokaÅi _izbrisana sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1447
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 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:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "_Group By Threads"
 msgstr "_ZdruÅi po nitih"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1455
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "Threaded message list"
 msgstr "Niten seznam sporoÄil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1476
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 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:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 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:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
 msgid "All Messages"
 msgstr "Vsa sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
 msgid "Important Messages"
 msgstr "Pomembna sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
 msgid "Last 5 Days' Messages"
 msgstr "SporoÄila zadnjih 5 dni"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "Messages Not Junk"
 msgstr "SporoÄila, ki niso neÅelena"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Messages with Attachments"
 msgstr "SporoÄila s prilogami"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "No Label"
 msgstr "Brez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "Read Messages"
 msgstr "Prebrana sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "Recent Messages"
 msgstr "Nedavna sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Unread Messages"
 msgstr "Neprebrana sporoÄila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "Subject or Addresses contain"
 msgstr "Zadeva ali poÅiljatelj vsebuje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1609
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "All Accounts"
 msgstr "Vsi raÄuni"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Current Account"
 msgstr "Trenutni raÄun"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Current Folder"
 msgstr "Trenutna mapa"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "Iskanje po vseh raÄunih"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "Iskanje raÄuna"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "_Odjavi se iz posredniÅkega streÅnika"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -15188,7 +15245,7 @@ msgstr[1] "%d izbrano, "
 msgstr[2] "%d izbrani, "
 msgstr[3] "%d izbrana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -15197,8 +15254,8 @@ msgstr[1] "%d izbrisano"
 msgstr[2] "%d izbrisani"
 msgstr[3] "%d izbrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -15207,7 +15264,7 @@ msgstr[1] "%d neÅeleno"
 msgstr[2] "%d neÅeleni"
 msgstr[3] "%d neÅelena"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -15216,7 +15273,7 @@ msgstr[1] "%d osnutek"
 msgstr[2] "%d osnutka"
 msgstr[3] "%d osnutki"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -15225,7 +15282,7 @@ msgstr[1] "%d neposlano"
 msgstr[2] "%d neposlani"
 msgstr[3] "%d neposlana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -15234,7 +15291,7 @@ msgstr[1] "%d poslano"
 msgstr[2] "%d poslani"
 msgstr[3] "%d poslana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -15243,7 +15300,7 @@ msgstr[1] "%d neprebrano,"
 msgstr[2] "%d neprebrani,"
 msgstr[3] "%d neprebrana,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15252,93 +15309,55 @@ msgstr[1] "skupaj: %d"
 msgstr[2] "skupaj: %d"
 msgstr[3] "skupaj: %d"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "Smeti"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1541
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ../modules/mail/e-mail-shell-view.c:559
-msgid "All Account Search"
-msgstr "Iskanje po vseh raÄunih"
-
-#: ../modules/mail/e-mail-shell-view.c:732
-msgid "Account Search"
-msgstr "Iskanje raÄuna"
-
-#: ../modules/mail/e-mail-shell-view.c:943
-msgid "Proxy _Logout"
-msgstr "_Odjavi se iz posredniÅkega streÅnika"
-
-#: ../modules/mail/em-account-prefs.c:218
-msgid "Evolution Account Assistant"
-msgstr "PomoÄnik za raÄune Evolutiona"
-
-#: ../modules/mail/em-account-prefs.c:267
-msgid "Account Editor"
-msgstr "Urejevalnik raÄunov"
-
-#: ../modules/mail/em-composer-prefs.c:491
-#: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:361
+#: ../plugins/publish-calendar/publish-calendar.c:857
 #: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "OmogoÄeno"
 
-#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "Jezik(i)"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "Vedno"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "Enkrat na dan"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "Enkrat na teden"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "Enkrat na mesec"
 
-#: ../modules/mail/em-mailer-prefs.c:288
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Header"
 msgstr "Glava"
 
-#: ../modules/mail/em-mailer-prefs.c:292
+#: ../modules/mail/em-mailer-prefs.c:297
 msgid "Contains Value"
 msgstr "Vsebuje vrednost"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:703
-#: ../modules/mail/em-mailer-prefs.c:776
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s vstavek je na voljo in je pravilno nameÅÄen."
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:711
-#: ../modules/mail/em-mailer-prefs.c:785
-#, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
-msgstr "Vstavek %s ni na voljo. Preverite, ali je paket nameÅÄen."
-
-#: ../modules/mail/em-mailer-prefs.c:749
-msgid "No junk plugin available"
-msgstr "Vstavek nezaÅelene poÅte ni na voljo"
-
 #. 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:1152
+#: ../modules/mail/em-mailer-prefs.c:1051
 msgid "_Date header:"
 msgstr "_Glava datuma:"
 
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1052
 msgid "Show _original header value"
 msgstr "PokaÅi _izvirno vrednost glave"
 
@@ -15370,35 +15389,55 @@ msgstr "Evolution trenutno ni povezan."
 msgid "Evolution will return to online mode once a network connection is established."
 msgstr "Program Evolution se bo v povezan naÄin vrnil, ko bo vzpostavljena omreÅna povezava."
 
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain an authentication token."
+msgstr ""
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid "This option will connect to the server by way of the GNOME Online Accounts service"
+msgstr ""
+
 #: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
 msgstr "Avtor(ji)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
 msgid "Plugin Manager"
 msgstr "Upravljalnik vstavkov"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+#: ../modules/plugin-manager/evolution-plugin-manager.c:271
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Opozorilo: nekatere spremembe ne bodo uveljavljene do ponovnega zagona"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:298
+#: ../modules/plugin-manager/evolution-plugin-manager.c:300
 msgid "Overview"
 msgstr "Pregled"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:367
-#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+#: ../modules/plugin-manager/evolution-plugin-manager.c:369
+#: ../modules/plugin-manager/evolution-plugin-manager.c:452
 msgid "Plugin"
 msgstr "Vstavek"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "_Plugins"
 msgstr "_Vstavki"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:491
 msgid "Enable and disable plugins"
 msgstr "OmogoÄi ali onemogoÄi vstavke"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Preizkusni vstavek Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Preizkusni vstavek za nalagalnik Python EPlugin."
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -15407,47 +15446,96 @@ msgstr "Hello Python"
 msgid "Python Plugin Loader tests"
 msgstr "Testi nalaganja Python vstavkov"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Preizkusni vstavek Python"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, fuzzy, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "Cev na SpamAssassin ni uspelo, koda napake: %d"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Preizkusni vstavek za nalagalnik Python EPlugin."
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+#, fuzzy
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "Filtriranje neÅelenih sporoÄil s SpamAssassin."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, fuzzy, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Ni mogoÄe zapisati datoteke `%s' %s"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+#, fuzzy
+msgid "Failed to read output from SpamAssassin: "
+msgstr "Branje iz zaÄasne datoteke je spodletelo"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "MoÅnosti SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "VkljuÄi oddalje_ne preskuse"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "S tem bo postal SpamAssasin bolj zanesljiv, vendar poÄasnejÅi"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "Uporabi SpamAssassin ozadnji program in odjemalca"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Uporabi SpamAssassin ozadnji program in odjemalca (spamc/spamd)"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "Uporabi le krajevno preskuÅanje neÅelene poÅte"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Uporabi le krajevno preskuÅanje neÅelene poÅte (brez DNS)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:281
+#: ../modules/startup-wizard/evolution-startup-wizard.c:280
 #: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "Izberite podatke, ki jih Åelite uvoziti:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "Od: %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:324
-#: ../modules/startup-wizard/evolution-startup-wizard.c:422
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
 msgid "Importing Files"
 msgstr "UvaÅanje datotek"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:400
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "Uvoz je preklican. Kliknite \"Naprej\" za nadaljevanje."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:418
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "Uvoz je konÄan. Kliknite \"Naprej\" za nadaljevanje."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:492
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
 msgid "Evolution Setup Assistant"
 msgstr "PomoÄnik za namestitev Evolutiona"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 msgid "Welcome"
 msgstr "DobrodoÅli"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+#: ../modules/startup-wizard/evolution-startup-wizard.c:508
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
@@ -15457,7 +15545,7 @@ msgstr ""
 "\n"
 "Za nadaljevanje kliknite gumb \"Naprej\". "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:608
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
 msgid "Loading accounts..."
 msgstr "Nalaganje raÄunov ..."
 
@@ -15473,12 +15561,12 @@ msgstr "Krajevni imeniki"
 msgid "List of clues for the attachment reminder plugin to look for in a message body"
 msgstr "Seznam namigov, ki naj jih vstavek opomnik prilog iÅÄe v telesu sporoÄila"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:125
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Tega sporoÄila _ne prikaÅi veÄ."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:457
-#: ../plugins/templates/templates.c:450
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "KljuÄne besede"
 
@@ -15514,55 +15602,55 @@ msgstr "Znotraj vrstiÄni zvok"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Predvaja zvoÄne priloge neposredno v poÅtnih sporoÄilih."
 
-#: ../plugins/backup-restore/backup-restore.c:186
+#: ../plugins/backup-restore/backup-restore.c:192
 msgid "Select name of the Evolution backup file"
 msgstr "Izberite ime datoteke varnostne kopije Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:219
+#: ../plugins/backup-restore/backup-restore.c:225
 msgid "_Restart Evolution after backup"
 msgstr "_Znova zaÅeni Evolution po ustvarjanju varnostne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:245
+#: ../plugins/backup-restore/backup-restore.c:251
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Izberite ime varnostne kopije za obnovitev"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restart Evolution after restore"
 msgstr "_Znova zaÅeni Evolution po obnovitvi"
 
-#: ../plugins/backup-restore/backup-restore.c:326
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
 msgstr "Nastavitve programa Evolution lahko obnovite iz varnostne kopije. Varnostna kopija shranjuje poÅto, koledarje, naloge, opomnike in stike. Prav tako je mogoÄe obnoviti vse osebne nastavitve, filtre poÅte in podobno."
 
-#: ../plugins/backup-restore/backup-restore.c:333
+#: ../plugins/backup-restore/backup-restore.c:344
 msgid "_Restore Evolution from the backup file"
 msgstr "_Obnovi Evolution iz varnostne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Izberite arhiv programa Evolution za obnovitev:"
 
-#: ../plugins/backup-restore/backup-restore.c:343
+#: ../plugins/backup-restore/backup-restore.c:354
 msgid "Choose a file to restore"
 msgstr "Izbor datoteke za shranjevanje"
 
-#: ../plugins/backup-restore/backup-restore.c:351
+#: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore from backup"
 msgstr "Obnovi iz varnostne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:389
+#: ../plugins/backup-restore/backup-restore.c:402
 msgid "_Back up Evolution Data..."
 msgstr "_Ustvari varnostno kopijo trenutnih podatkov programa Evolution ..."
 
-#: ../plugins/backup-restore/backup-restore.c:391
+#: ../plugins/backup-restore/backup-restore.c:404
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Ustvari varnostno kopijo podatkov in nastavitev programa Evolution v datoteko arhiva"
 
-#: ../plugins/backup-restore/backup-restore.c:396
+#: ../plugins/backup-restore/backup-restore.c:409
 msgid "R_estore Evolution Data..."
 msgstr "O_bnovi podatke Evolution ..."
 
-#: ../plugins/backup-restore/backup-restore.c:398
+#: ../plugins/backup-restore/backup-restore.c:411
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Obnovi podatke in nastavitve iz varnostne kopije podatkov programa Evolution"
 
@@ -15587,84 +15675,84 @@ msgid "With Graphical User Interface"
 msgstr "Z grafiÄnim uporabniÅkim vmesnikom"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:295
-#: ../plugins/backup-restore/backup.c:412
+#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:418
 msgid "Shutting down Evolution"
 msgstr "Izklapljanje programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:308
 msgid "Backing Evolution accounts and settings"
 msgstr "Varnostno kopiranje raÄunov in nastavitev"
 
-#: ../plugins/backup-restore/backup.c:314
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Varnostna kopija podatkov Evolution (poÅta, imenik, koledar, naloge, zaznamki)"
 
-#: ../plugins/backup-restore/backup.c:327
+#: ../plugins/backup-restore/backup.c:331
 msgid "Back up complete"
 msgstr "Varnostna kopija je uspeÅno ustvarjena"
 
-#: ../plugins/backup-restore/backup.c:334
-#: ../plugins/backup-restore/backup.c:521
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
 msgid "Restarting Evolution"
 msgstr "Ponovni zagon programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:418
+#: ../plugins/backup-restore/backup.c:424
 msgid "Back up current Evolution data"
 msgstr "Ustvari varnostno kopijo trenutnih podatkov programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:426
+#: ../plugins/backup-restore/backup.c:432
 msgid "Extracting files from back up"
 msgstr "RazÅirjanje datotek iz varnostne kopije"
 
-#: ../plugins/backup-restore/backup.c:485
+#: ../plugins/backup-restore/backup.c:491
 msgid "Loading Evolution settings"
 msgstr "Nalaganje nastavitev programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:502
+#: ../plugins/backup-restore/backup.c:508
 msgid "Removing temporary back up files"
 msgstr "Odstranjevanje zaÄasnih datotek varnostnih kopij"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:520
 msgid "Ensuring local sources"
 msgstr "Zagotavljanje krajevnih virov"
 
-#: ../plugins/backup-restore/backup.c:699
+#: ../plugins/backup-restore/backup.c:707
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Shranjevanje varnostne kopije v mapo %s"
 
-#: ../plugins/backup-restore/backup.c:704
+#: ../plugins/backup-restore/backup.c:712
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Obnavljanje podatkov iz mape %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:728
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Back up"
 msgstr "Varnostna kopija programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:728
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Restore"
 msgstr "Obnavljanje Evolutiona"
 
-#: ../plugins/backup-restore/backup.c:766
+#: ../plugins/backup-restore/backup.c:774
 msgid "Backing up Evolution Data"
 msgstr "Varnostna kopija podatkov programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:767
+#: ../plugins/backup-restore/backup.c:775
 msgid "Please wait while Evolution is backing up your data."
 msgstr "PoÄakajte, dokler program ne naredi varnostne kopije vaÅih podatkov."
 
-#: ../plugins/backup-restore/backup.c:769
+#: ../plugins/backup-restore/backup.c:777
 msgid "Restoring Evolution Data"
 msgstr "Obnovitev podatkov programa Evolution"
 
-#: ../plugins/backup-restore/backup.c:770
+#: ../plugins/backup-restore/backup.c:778
 msgid "Please wait while Evolution is restoring your data."
 msgstr "PoÄakajte, dokler program ne obnovi vaÅih podatkov."
 
-#: ../plugins/backup-restore/backup.c:788
+#: ../plugins/backup-restore/backup.c:796
 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 raÄunu."
 
@@ -15717,36 +15805,36 @@ msgstr "Za ustvarjanje varnostne kopije podatkov in nastavitev morate najprej za
 msgid "To restore your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding. This will delete all your current Evolution data and settings and restore them from your back up."
 msgstr "Za obnovitev podatkov in nastavitev morate najprej zapreti program Evolution. Najprej seveda shranite vse podatke. To dejanje bo najprej izbrisalo vaÅe trenutne podatke in nastavitve Evolution, potem pa bodo obnovljene iz varnostne kopije."
 
-#: ../plugins/bbdb/bbdb.c:675
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:686
+#: ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Samodejni stiki"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "_Ustvari vnose v imeniku pri odgovarjanju na sporoÄila"
 
-#: ../plugins/bbdb/bbdb.c:705
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izberite imenik za samodejne stike"
 
-#: ../plugins/bbdb/bbdb.c:720
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "Stiki hipnega sporoÄanja"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:735
+#: ../plugins/bbdb/bbdb.c:746
 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:741
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Izberite imenik za seznam stikov Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi s _seznamom prijateljev"
 
@@ -15764,65 +15852,15 @@ msgstr ""
 "\n"
 "Samodejno doda imena in naslove elektronske poÅte v imenik, ko odgovarjate na sporoÄila. Prav tako doda stike iz seznama prijateljev odjemalca za hipno sporoÄanje."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr "Bogofilter ni na voljo. Namestite ga."
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:165
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "PriÅlo je do napake med zaganjanjem %s: %s"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:194
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "Podrejeno opravilo Bogofilter se ne odziva, poteka uniÄevanje opravila ..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "Äakanje na prekinitev podrejenega opravila Bogofilter, zakljuÄevanje ..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:219
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "Cev na Bogofilter ni uspelo, koda napake: %d."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:404
-msgid "Convert message text to _Unicode"
-msgstr "Pretvori poÅtna sporoÄila v znakovni nabor _Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Pretvori poÅtna sporoÄila v znakovni nabor Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
-msgstr "Pretvori sporoÄilo v Unicode UTF-8 za poenotenje Åetonov neÅelene poÅte, ki so v drugih naborih znakov."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Bogofilter vstavek neÅelene poÅte"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "MoÅnosti Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "Filtriranje neÅelenih sporoÄil z vstavkom Bogofilter."
-
-#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:214
 msgid "Authentication failed. Server requires correct login."
 msgstr "Overitev ni uspela. StreÅnik zahteva pravilno prijavo."
 
-#: ../plugins/caldav/caldav-browse-server.c:205
+#: ../plugins/caldav/caldav-browse-server.c:216
 msgid "Given URL cannot be found."
 msgstr "Podanega naslova URL ni mogoÄe najti."
 
-#: ../plugins/caldav/caldav-browse-server.c:209
+#: ../plugins/caldav/caldav-browse-server.c:220
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -15831,118 +15869,120 @@ msgstr ""
 "StreÅnik je vrnil nepriÄakovane podatke.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:339
-#: ../plugins/caldav/caldav-browse-server.c:663
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
 msgid "Failed to parse server response."
 msgstr "Napaka med razÄlenjevanjem odgovora streÅnika."
 
-#: ../plugins/caldav/caldav-browse-server.c:433
+#: ../plugins/caldav/caldav-browse-server.c:454
 msgid "Events"
 msgstr "Dogodki"
 
-#: ../plugins/caldav/caldav-browse-server.c:455
+#: ../plugins/caldav/caldav-browse-server.c:476
 msgid "User's calendars"
 msgstr "UporabniÅki koledarji"
 
-#: ../plugins/caldav/caldav-browse-server.c:564
-#: ../plugins/caldav/caldav-browse-server.c:732
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
 msgid "Failed to get server URL."
 msgstr "Napaka pridobivanja naslova URL streÅnika."
 
-#: ../plugins/caldav/caldav-browse-server.c:730
-#: ../plugins/caldav/caldav-browse-server.c:771
-#: ../plugins/caldav/caldav-browse-server.c:1430
+#: ../plugins/caldav/caldav-browse-server.c:761
+#: ../plugins/caldav/caldav-browse-server.c:802
+#: ../plugins/caldav/caldav-browse-server.c:1493
 msgid "Searching for user's calendars..."
 msgstr "Iskanje koledarjev uporabnika ..."
 
-#: ../plugins/caldav/caldav-browse-server.c:769
+#: ../plugins/caldav/caldav-browse-server.c:800
 msgid "Could not find any user calendar."
 msgstr "Ni mogoÄe najti uporabniÅkih koledarjev."
 
-#: ../plugins/caldav/caldav-browse-server.c:901
+#: ../plugins/caldav/caldav-browse-server.c:938
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Predhodni poskus ni uspel: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:903
+#: ../plugins/caldav/caldav-browse-server.c:940
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Predhodni poskus ni uspel s kodo %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:908
+#: ../plugins/caldav/caldav-browse-server.c:945
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "Vnesite geslo za uporabnika %s na streÅniku %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:967
+#: ../plugins/caldav/caldav-browse-server.c:1008
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Ni mogoÄe ustvariti sporoÄila za naslov URL '%s'"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1213
+#: ../plugins/caldav/caldav-browse-server.c:1266
 msgid "Searching folder content..."
 msgstr "Iskanje vsebine map ..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1262
-#: ../plugins/caldav/caldav-source.c:258
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Server _handles meeting invitations"
 msgstr "StreÅnik _upravlja povabila sreÄanja"
 
-#: ../plugins/caldav/caldav-browse-server.c:1269
+#: ../plugins/caldav/caldav-browse-server.c:1332
 msgid "List of available calendars:"
 msgstr "Seznam razpoloÅljivih koledarjev:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1307
+#: ../plugins/caldav/caldav-browse-server.c:1370
 msgid "Supports"
 msgstr "Podpira"
 
-#: ../plugins/caldav/caldav-browse-server.c:1334
-#: ../plugins/caldav/caldav-source.c:256
-msgid "User e-_mail:"
-msgstr "UporabniÅka e-_poÅta:"
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
+msgid "User e_mail:"
+msgstr "Elektronski naslov:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1406
+#: ../plugins/caldav/caldav-browse-server.c:1469
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Ni mogoÄe ustvariti niti: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1515
+#: ../plugins/caldav/caldav-browse-server.c:1585
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "Naslov URL streÅnika '%s' ni veljaven naslov URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1521
+#: ../plugins/caldav/caldav-browse-server.c:1591
 msgid "Browse for a CalDAV calendar"
 msgstr "Brskanje za CalDAV koledarji"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-http/calendar-http.c:104
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:351
-msgid "Use _SSL"
-msgstr "Uporabi _SSL"
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/google-account-setup/google-contacts-source.c:359
+#, fuzzy
+msgid "Use _secure connection"
+msgstr "_Uporabi varno povezavo:"
 
-#: ../plugins/caldav/caldav-source.c:246
-#: ../plugins/google-account-setup/google-contacts-source.c:329
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
 msgid "User_name:"
 msgstr "Uporab_niÅko ime:"
 
-#: ../plugins/caldav/caldav-source.c:261
+#: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr "_Brskanje streÅnika za koledarji"
 
-#: ../plugins/caldav/caldav-source.c:279
-#: ../plugins/calendar-file/calendar-file.c:195
-#: ../plugins/calendar-http/calendar-http.c:123
-#: ../plugins/calendar-weather/calendar-weather.c:403
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-#: ../plugins/google-account-setup/google-source.c:659
+#: ../plugins/caldav/caldav-source.c:282
+#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-http/calendar-http.c:129
+#: ../plugins/calendar-weather/calendar-weather.c:421
+#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/google-account-setup/google-source.c:675
 msgid "Re_fresh:"
 msgstr "_OsveÅi:"
 
@@ -15954,31 +15994,31 @@ msgstr "Dodaj podporo CalDAV v Evolution."
 msgid "CalDAV Support"
 msgstr "Podpora CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:129
+#: ../plugins/calendar-file/calendar-file.c:134
 msgid "_Customize options"
 msgstr "_Prilagodi moÅnosti"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:153
 msgid "File _name:"
 msgstr "Ime _datoteke:"
 
-#: ../plugins/calendar-file/calendar-file.c:152
+#: ../plugins/calendar-file/calendar-file.c:157
 msgid "Choose calendar file"
 msgstr "Izbor datoteke koledarja"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:209
 msgid "On open"
 msgstr "Ob odpiranju"
 
-#: ../plugins/calendar-file/calendar-file.c:201
+#: ../plugins/calendar-file/calendar-file.c:210
 msgid "On file change"
 msgstr "Ob spremembi datoteke"
 
-#: ../plugins/calendar-file/calendar-file.c:202
+#: ../plugins/calendar-file/calendar-file.c:211
 msgid "Periodically"
 msgstr "PonavljajoÄe"
 
-#: ../plugins/calendar-file/calendar-file.c:217
+#: ../plugins/calendar-file/calendar-file.c:228
 msgid "Force read _only"
 msgstr "Vsili le za _branje"
 
@@ -15990,11 +16030,7 @@ msgstr "Dodaj krajevni koledar v Evolution."
 msgid "Local Calendars"
 msgstr "Krajevni koledarji"
 
-#: ../plugins/calendar-http/calendar-http.c:138
-msgid "_Secure connection"
-msgstr "_Varna povezava"
-
-#: ../plugins/calendar-http/calendar-http.c:198
+#: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "_UporabniÅko ime:"
 
@@ -16006,62 +16042,62 @@ msgstr "Dodaj spletni koledar v Evolution."
 msgid "Web Calendars"
 msgstr "Spletni koledarji"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "Vreme: megleno"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy"
 msgstr "Vreme: oblaÄno"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Cloudy Night"
 msgstr "Vreme: oblaÄna noÄ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Overcast"
 msgstr "Vreme: megleno"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Showers"
 msgstr "Vreme: plohe"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Snow"
 msgstr "Vreme: sneÅi"
 
-#: ../plugins/calendar-weather/calendar-weather.c:70
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Sunny"
 msgstr "Vreme: sonÄno"
 
-#: ../plugins/calendar-weather/calendar-weather.c:71
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Clear Night"
 msgstr "Vreme: jasna noÄ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:72
+#: ../plugins/calendar-weather/calendar-weather.c:73
 msgid "Weather: Thunderstorms"
 msgstr "Vreme: nevihtno"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:239
 msgid "Select a location"
 msgstr "Izberite mesto"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:336
-#: ../plugins/calendar-weather/calendar-weather.c:381
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Brez"
 
-#: ../plugins/calendar-weather/calendar-weather.c:456
+#: ../plugins/calendar-weather/calendar-weather.c:477
 msgid "_Units:"
 msgstr "_Enote: "
 
-#: ../plugins/calendar-weather/calendar-weather.c:465
+#: ../plugins/calendar-weather/calendar-weather.c:486
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MetriÄne (Celzij, cm, itd.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:468
+#: ../plugins/calendar-weather/calendar-weather.c:489
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperialne (Fahrenheit, palec, itd.)"
 
@@ -16073,7 +16109,7 @@ msgstr "Dodaj vremenski koledar v Evolution."
 msgid "Weather Calendars"
 msgstr "Vremenski koledarji"
 
-#: ../plugins/dbx-import/dbx-importer.c:282
+#: ../plugins/dbx-import/dbx-importer.c:284
 msgid "Importing Outlook Express data"
 msgstr "UvaÅanje podatkov Outlook Express"
 
@@ -16089,23 +16125,23 @@ msgstr "Uvoz Outlook PST"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Osebne mape Outlook Express 5/6 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:87
+#: ../plugins/default-source/default-source.c:168
 msgid "Mark as _default address book"
 msgstr "OznaÄi kot _privzeti imenik"
 
-#: ../plugins/default-source/default-source.c:100
+#: ../plugins/default-source/default-source.c:182
 msgid "A_utocomplete with this address book"
 msgstr "_Samodejno dopolnjevanje stikov tega imenika"
 
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-source/default-source.c:191
 msgid "Mark as _default calendar"
 msgstr "OznaÄi kot _privzeti koledar"
 
-#: ../plugins/default-source/default-source.c:110
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default task list"
 msgstr "OznaÄi kot _privzeti seznam nalog"
 
-#: ../plugins/default-source/default-source.c:111
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default memo list"
 msgstr "OznaÄi kot _privzeti seznam opomnikov"
 
@@ -16125,52 +16161,52 @@ msgstr "Seznam glav po meri"
 msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
 msgstr "KljuÄ doloÄa seznam glav po meri, ki jih lahko dodate odhajajoÄi poÅti. Oblika za navedbo glave in vrednosti glave je: Ime glave po meri, ki mu sledi znak \"=\" in nato vrednosti loÄene z znakom \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Varnost:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../plugins/email-custom-header/email-custom-header.c:326
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Osebno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:327
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "NerazvrÅÄeno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:328
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "ZaÅÄiteno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:329
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Zaupno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:330
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Srkivnost"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:331
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Stroga skrivnost"
 
-#: ../plugins/email-custom-header/email-custom-header.c:382
+#: ../plugins/email-custom-header/email-custom-header.c:388
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Brez"
 
-#: ../plugins/email-custom-header/email-custom-header.c:574
+#: ../plugins/email-custom-header/email-custom-header.c:584
 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:833
+#: ../plugins/email-custom-header/email-custom-header.c:847
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16178,12 +16214,12 @@ 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:887
+#: ../plugins/email-custom-header/email-custom-header.c:901
 msgid "Key"
 msgstr "KljuÄ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:456
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
 msgid "Values"
 msgstr "Vrednosti"
 
@@ -16205,7 +16241,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "Samodejno zaÅeni urejevalnik, ko je pritisnjena tipka v sestavljalniku poÅte"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:131
+#: ../plugins/external-editor/external-editor.c:132
 msgid "Automatically launch when a new mail is edited"
 msgstr "Samodejno zaÅeni med urejanjem nove poÅte"
 
@@ -16217,11 +16253,11 @@ msgstr "Privzeti zunanji urejevalnik"
 msgid "The default command that must be used as the editor."
 msgstr "Privzeti ukaz za zagon urejevalnika."
 
-#: ../plugins/external-editor/external-editor.c:120
+#: ../plugins/external-editor/external-editor.c:121
 msgid "Command to be executed to launch the editor: "
 msgstr "Ukaz za zagon urejevalnika:"
 
-#: ../plugins/external-editor/external-editor.c:121
+#: ../plugins/external-editor/external-editor.c:122
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16229,8 +16265,8 @@ msgstr ""
 "Za Emacs uporabite \"xemacs\"\n"
 "Za VI uporabite \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:399
-#: ../plugins/external-editor/external-editor.c:401
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
 msgid "Compose in External Editor"
 msgstr "Sestavi v zunanjem urejevalniku"
 
@@ -16274,23 +16310,23 @@ msgstr "Privzeto vstavi sliÄico obraza odhajajoÄemu sporoÄilu"
 msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
 msgstr "Ali naj se odhajajoÄemu sporoÄilu privzeto pripne sliÄica obraza. Sliko je treba izbrati pred izbiro te moÅnosti."
 
-#: ../plugins/face/face.c:286
+#: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "Izberi sliÄico obraza"
 
-#: ../plugins/face/face.c:296
+#: ../plugins/face/face.c:302
 msgid "Image files"
 msgstr "Slikovne datoteke"
 
-#: ../plugins/face/face.c:352
+#: ../plugins/face/face.c:359
 msgid "_Insert Face picture by default"
 msgstr "Privzeto _vstavi sliÄico obraza"
 
-#: ../plugins/face/face.c:363
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr "NaloÅi novo _sliÄico obraza"
 
-#: ../plugins/face/face.c:420
+#: ../plugins/face/face.c:429
 msgid "Include _Face"
 msgstr "Vstavi _sliÄico obraza"
 
@@ -16322,17 +16358,17 @@ msgstr "Datoteke ni mogoÄe prebrati"
 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/google-account-setup/google-contacts-source.c:317
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:243
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "Server"
 msgstr "StreÅnik"
 
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:459
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Vnesite geslo uporabnika %s za dostop do naroÄenih koledarjev."
 
-#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/google-account-setup/google-source.c:576
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16341,17 +16377,17 @@ msgstr ""
 "Ni mogoÄe prebrati podatkov streÅnika Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:560
-#: ../plugins/mail-to-task/mail-to-task.c:796
-#: ../plugins/mail-to-task/mail-to-task.c:1045
+#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Unknown error."
 msgstr "Neznana napaka."
 
-#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-source.c:679
 msgid "Cal_endar:"
 msgstr "_Koledar:"
 
-#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-source.c:714
 msgid "Retrieve _List"
 msgstr "Pridobi _seznam"
 
@@ -16371,12 +16407,12 @@ msgstr "Slika znotraj sporoÄila"
 msgid "View image attachments directly in mail messages."
 msgstr "Pregled slikovnih prilog neposredno v poÅtnih sporoÄilih."
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:337
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Glave sporoÄil po meri"
 
-#: ../plugins/imap-features/imap-headers.c:346
+#: ../plugins/imap-features/imap-headers.c:349
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "Glave IMAP"
@@ -16402,8 +16438,9 @@ msgstr ""
 "VeÄ ko imate izbranih glav, veÄ Äasa traja prejem sporoÄila."
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
+#, fuzzy
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "_Osnovne glave sporoÄil - (NajhitrejÅe) \n"
@@ -16422,243 +16459,247 @@ msgid "IMAP Features"
 msgstr "MoÅnosti IMAP"
 
 #. Translators: The first '%s' is replaced with a calendar name,
-#. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:490
+#. * the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:499
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "NaloÅiti koledarja '%s' je spodletelo (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:631
+#: ../plugins/itip-formatter/itip-formatter.c:659
 #, 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:655
+#: ../plugins/itip-formatter/itip-formatter.c:683
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Sestanek je bil najden v koledarju '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:761
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find any calendars"
 msgstr "Ni mogoÄe najti nobenega koledarja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this meeting in any calendar"
 msgstr "SreÄanja ni mogoÄe najti v nobenem koledarju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this task in any task list"
 msgstr "Naloge ni mogoÄe najti v nobenem seznamu nalog"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find this memo in any memo list"
 msgstr "Opomnika ni mogoÄe najti v nobenem seznamu opomnikov"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1026
+#: ../plugins/itip-formatter/itip-formatter.c:1082
 msgid "Opening the calendar. Please wait..."
 msgstr "Odpiranje koledarja. PoÄakajte ..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1085
 msgid "Searching for an existing version of this appointment"
 msgstr "Iskanje obstojeÄe razliÄice tega sestanka"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1302
+#: ../plugins/itip-formatter/itip-formatter.c:1362
 msgid "Unable to parse item"
 msgstr "Ni mogoÄe razÄleniti predmeta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1391
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ni mogoÄe poslati predmeta v koledar '%s'. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslano koledarju '%s' kot sprejeto"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1467
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslano koledarju '%s' kot poskusno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/itip-formatter/itip-formatter.c:1472
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslano koledarju '%s' kot odklonjeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1477
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslano koledarju '%s' kot preklicano"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1579
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je odstranil pooblaÅÄenca %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "Sent a cancelation notice to the delegate"
 msgstr "PooblaÅÄencu je bilo poslano obvestilo o preklicu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "PooblaÅÄencu ni mogoÄe poslati obvestila o preklicu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1631
+#: ../plugins/itip-formatter/itip-formatter.c:1700
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Stanja udeleÅenca ni mogoÄe posodobiti zaradi neveljavnega stanja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1729
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ni mogoÄe posodobiti udeleÅenca. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1733
 msgid "Attendee status updated"
 msgstr "Stanje udeleÅenca je posodobljeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 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Ä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1690
+#: ../plugins/itip-formatter/itip-formatter.c:1759
 msgid "Meeting information sent"
 msgstr "Podatki o sreÄanju so bili uspeÅno poslani"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "Task information sent"
 msgstr "Podatki o nalogi so bili uspeÅno poslani"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1696
+#: ../plugins/itip-formatter/itip-formatter.c:1765
 msgid "Memo information sent"
 msgstr "Podatki o opomniku so bili uspeÅno poslani"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1708
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "Unable to send task information, the task does not exist"
 msgstr "Podrobnosti naloge ni mogoÄe poslati, saj ne obstaja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1711
+#: ../plugins/itip-formatter/itip-formatter.c:1780
 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.
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1846
 msgid "calendar.ics"
 msgstr "koledar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1781
+#: ../plugins/itip-formatter/itip-formatter.c:1851
 msgid "Save Calendar"
 msgstr "Shrani koledar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1839
-#: ../plugins/itip-formatter/itip-formatter.c:1850
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The calendar attached is not valid"
 msgstr "PriloÅen koledar ni veljaven"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1840
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:1915
+#: ../plugins/itip-formatter/itip-formatter.c:1926
 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."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1891
-#: ../plugins/itip-formatter/itip-formatter.c:1919
-#: ../plugins/itip-formatter/itip-formatter.c:2028
+#: ../plugins/itip-formatter/itip-formatter.c:1966
+#: ../plugins/itip-formatter/itip-formatter.c:1994
+#: ../plugins/itip-formatter/itip-formatter.c:2103
 msgid "The item in the calendar is not valid"
 msgstr "Predmet v koledarju ni veljaven"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1892
-#: ../plugins/itip-formatter/itip-formatter.c:1920
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:1967
+#: ../plugins/itip-formatter/itip-formatter.c:1995
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
 msgstr "SporoÄilo vsebuje koledar, vendar koledar ne vsebuje nobenih dogodkov, nalog ali podatkov o zasedenosti"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:2008
 msgid "The calendar attached contains multiple items"
 msgstr "PriloÅen koledar vsebuje veÄ predmetov"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2592
+#: ../plugins/itip-formatter/itip-formatter.c:2672
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Brez"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2688
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2726
+#: ../plugins/itip-formatter/itip-formatter.c:2806
 msgid "This meeting recurs"
 msgstr "SreÄanje se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2729
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "This task recurs"
 msgstr "Ta naloga se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2732
+#: ../plugins/itip-formatter/itip-formatter.c:2812
 msgid "This memo recurs"
 msgstr "Opomnik se ponavlja"
 
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+msgid "Meeting Invitations"
+msgstr "Povabila na sreÄanja"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2971
+#: ../plugins/itip-formatter/itip-formatter.c:3061
 msgid "_Delete message after acting"
 msgstr "IzbriÅi sporoÄilo po _dejanju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2981
-#: ../plugins/itip-formatter/itip-formatter.c:3014
+#: ../plugins/itip-formatter/itip-formatter.c:3071
+#: ../plugins/itip-formatter/itip-formatter.c:3104
 msgid "Conflict Search"
 msgstr "Iskanje sporov"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2996
+#: ../plugins/itip-formatter/itip-formatter.c:3086
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Izberite koledarje za iskanje sporov med sreÄanji"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Danes %H.%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Danes %H.%M.%S"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Danes %H.%M.%S"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Jutri %H.%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Jutri %H.%M.%S"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
+#. * in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Jutri %H.%M"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Jutri %H.%M.%S"
@@ -16670,56 +16711,56 @@ msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %H.%M"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a date
-#. without a year.
+#. * without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
-#. without a year and a time,
-#. in 24-hour format, without seconds.
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %H.%M"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 24-hour format.
+#. * and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format, without seconds.
+#. * and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %H.%M"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format.
+#. * and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %H.%M.%S"
@@ -16730,365 +16771,365 @@ msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y %H.%M.%S"
 
-#: ../plugins/itip-formatter/itip-view.c:362
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
+#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:540
 msgid "An unknown person"
 msgstr "neznana oseba"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Odzovite se v imenu %s"
 
-#: ../plugins/itip-formatter/itip-view.c:369
-#: ../plugins/itip-formatter/itip-view.c:457
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Prejeto v imenu %s"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s je preko %s objavil(a) naslednje podatke o sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s je objavil(a) naslednje podatke o sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s vam je pooblastil zastopanje naslednjega sreÄanja:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s preko %s zahteva vaÅo navzoÄnost na naslednjem sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s zahteva vaÅo navzoÄnost na naslednjem sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s vas Åeli preko %s dodati k obstojeÄemu sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s vas Åeli dodati k obstojeÄemu sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr "%s Åeli preko %s pridobiti najnovejÅe podrobnosti o sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s Åeli dobiti najnovejÅe podatke o naslednjem sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s</b> je preko %s poslal(a) naslednji odgovor o sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s je poslal(a) naslednji odgovor o sreÄanju:"
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s je preko %s preklical(a) naslednje sreÄanje:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "%s has canceled the following meeting."
 msgstr "%s je preklical(a) naslednje sreÄanje."
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s preko %s predlaga naslednje spremembe sreÄanja."
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
 msgid "%s has proposed the following meeting changes."
 msgstr "%s je predlagal(a) naslednje spremembe sreÄanja."
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s je preko %s odklonil(a) naslednje spremembe sreÄanja:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s has declined the following meeting changes."
 msgstr "%s je odklonil(a) naslednje spremembe sreÄanja."
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s je preko %s objavil(a) naslednje naloge:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s je objavil(a) naslednjo nalogo:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s zahteva dodelitev %s naslednji nalogi:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s vam je preko %s dodelil(a) nalogo:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s vam je dodelil(a) nalogo:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s vas Åeli preko %s dodati k obstojeÄi nalogi:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s vas Åeli dodati k obstojeÄi nalogi:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s through %s wishes to receive the latest information for the following assigned task:"
 msgstr "%s Åeli preko %s pridobiti najnovejÅe podrobnosti o naslednji nalogi:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s Åeli dobiti najnovejÅe podatke o naslednji nalogi:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s preko %s poÅilja naslednji odgovor o dodeljeni nalogi:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s je poslal(a) naslednji odgovor o dodeljeni nalogi:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s je preko %s preklical(a) naslednjo dodeljeno nalogo:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:502
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s je preklical(a) naslednjo dodeljeno nalogo:"
 
-#: ../plugins/itip-formatter/itip-view.c:504
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s je preko %s predlagal(a) naslednje spremembe dodelitev naloge:"
 
-#: ../plugins/itip-formatter/itip-view.c:506
+#: ../plugins/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s je predlagal(a) naslednje spremembe dodelitev naloge:"
 
-#: ../plugins/itip-formatter/itip-view.c:510
+#: ../plugins/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s je preko %s odklonil(a) naslednjo dodeljeno nalogo:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
+#: ../plugins/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s je odklonil(a) naslednjo dodeljeno nalogo:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s je preko %s objavil(a) naslednji opomnik:"
 
-#: ../plugins/itip-formatter/itip-view.c:551
+#: ../plugins/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s je objavil(a) naslednji opomnik:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s vas Åeli preko %s dodati k obstojeÄemu opomniku:"
 
-#: ../plugins/itip-formatter/itip-view.c:558
+#: ../plugins/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s vas Åeli dodati k obstojeÄemu opomniku:"
 
-#: ../plugins/itip-formatter/itip-view.c:562
+#: ../plugins/itip-formatter/itip-view.c:564
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s je preko %s preklical(a) naslednji zapisek v souporabi:"
 
-#: ../plugins/itip-formatter/itip-view.c:564
+#: ../plugins/itip-formatter/itip-view.c:566
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s je preklical(a) naslednji opomnik v souporabi:"
 
-#: ../plugins/itip-formatter/itip-view.c:688
+#: ../plugins/itip-formatter/itip-view.c:690
 msgid "All day:"
 msgstr "Celodnevno:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:700
 msgid "Start day:"
 msgstr "Dan zaÄetka:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1055
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Start time:"
 msgstr "Äas zaÄetka:"
 
-#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:712
 msgid "End day:"
 msgstr "Dan konca:%d dni"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "End time:"
 msgstr "Äas konca:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Open Calendar"
 msgstr "_Odpri koledar"
 
-#: ../plugins/itip-formatter/itip-view.c:850
 #: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:886
 msgid "_Decline"
 msgstr "_Odkloni"
 
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:879
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:867
+#: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "A_ccept"
 msgstr "_Sprejmi"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Decline all"
 msgstr "_Odkloni vse"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative all"
 msgstr "Vse _poskusno"
 
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:878
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:887
 msgid "_Tentative"
 msgstr "_Poskusno"
 
-#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "A_ccept all"
 msgstr "Sprejmi _vse"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:867
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Send Information"
 msgstr "_PoÅlji podatke"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:875
 msgid "_Update Attendee Status"
 msgstr "_Posodobi stanje udeleÅenca"
 
-#: ../plugins/itip-formatter/itip-view.c:874
+#: ../plugins/itip-formatter/itip-view.c:878
 msgid "_Update"
 msgstr "_Posodobi"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1086
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
 msgid "Comment:"
 msgstr "Opomba: "
 
-#: ../plugins/itip-formatter/itip-view.c:1125
+#: ../plugins/itip-formatter/itip-view.c:1132
 msgid "Send _reply to sender"
 msgstr "_Odgovori poÅiljatelju"
 
-#: ../plugins/itip-formatter/itip-view.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "Send _updates to attendees"
 msgstr "PoÅlji _posodobitve udeleÅencem"
 
-#: ../plugins/itip-formatter/itip-view.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "_Apply to all instances"
 msgstr "Uveljavi za vse _primerke"
 
-#: ../plugins/itip-formatter/itip-view.c:1173
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "Show time as _free"
 msgstr "PokaÅi Äas kot _prosto"
 
-#: ../plugins/itip-formatter/itip-view.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1183
 msgid "_Preserve my reminder"
 msgstr "_Ohrani moj opomnik"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1182
+#: ../plugins/itip-formatter/itip-view.c:1189
 msgid "_Inherit reminder"
 msgstr "_Prevzemi opomnik"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1965
 msgid "_Tasks:"
 msgstr "_Naloge:"
 
-#: ../plugins/itip-formatter/itip-view.c:1927
+#: ../plugins/itip-formatter/itip-view.c:1967
 msgid "_Memos:"
 msgstr "_Opomniki:"
 
@@ -17117,66 +17158,50 @@ msgid "Beep or play sound file."
 msgstr "Predvajaj pisk ali zvoÄno datoteko."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "OmogoÄi sporoÄila D-Bus."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "OmogoÄi ikono v obvestilnem podroÄju."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Ustvari sporoÄilo D-Bus, ko prispejo nova sporoÄila."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
 msgstr "Izbrana moÅnost omogoÄa pisk ob prihodu novega sporoÄila namesto predvajanja zvoÄne datoteke."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "Obvesti o novih sporoÄilih le v mapi Prejete poÅte."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "Ob prejemu novih sporoÄil predvajaj zvok."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "Predvajaj zvok teme ob prejetju novega sporoÄila, Äe ni doloÄen le pisk."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "Pojavno sporoÄilo naj se prikaÅe skupaj z ikono."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "Ko prispejo nova sporoÄila, pokaÅi ikono nove poÅte v obvestilnem podroÄju."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "Ime zvoÄne datoteke za predvajanje."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "ZvoÄna datoteka, ki se predvaja ob prispetju nove poÅte, Äe ni doloÄen le pisk."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr "Uporabi zvoÄno temo"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Ali naj se predvaja zvok ali pisk ob prejemu novega sporoÄila."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "Ali naj prikaÅe sporoÄilo preko ikone ob prejemu novega sporoÄila."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Ali naj se prikaÅe obvestilo le za nova sporoÄila v mapi prihajajoÄih sporoÄil."
 
-#: ../plugins/mail-notification/mail-notification.c:396
+#: ../plugins/mail-notification/mail-notification.c:391
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17199,12 +17224,12 @@ msgstr[3] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:416
 #, c-format
 msgid "Subject: %s"
 msgstr "Zadeva: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:430
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -17213,47 +17238,48 @@ msgstr[1] "Prejeli ste %d novo sporoÄilo."
 msgstr[2] "Prejeli ste %d novi sporoÄili."
 msgstr[3] "Prejeli ste %d nova sporoÄila."
 
-#: ../plugins/mail-notification/mail-notification.c:443
-#: ../plugins/mail-notification/mail-notification.c:451
-#: ../plugins/mail-notification/mail-notification.c:454
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
 msgid "New email"
 msgstr "Novo elektronsko sporoÄilo"
 
-#: ../plugins/mail-notification/mail-notification.c:509
-msgid "Show icon in _notification area"
-msgstr "_PokaÅi ikono v obvestilnem podroÄju"
-
-#: ../plugins/mail-notification/mail-notification.c:539
-msgid "Popup _message together with the icon"
-msgstr "_Pojavno sporoÄilo naj se prikaÅe skupaj z ikono"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, c-format
+msgid "Show %s"
+msgstr "PokaÅi %s"
 
-#: ../plugins/mail-notification/mail-notification.c:726
-msgid "_Play sound when new messages arrive"
-msgstr "Ob prihodu nove poÅte predvajaj z_vok"
+#: ../plugins/mail-notification/mail-notification.c:673
+#, fuzzy
+msgid "_Play sound when a new message arrives"
+msgstr "Ob prejemu novih sporoÄil predvajaj zvok."
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "_Beep"
 msgstr "_Pisk"
 
-#: ../plugins/mail-notification/mail-notification.c:769
+#: ../plugins/mail-notification/mail-notification.c:716
 msgid "Use sound _theme"
 msgstr "Uporabi _zvoÄno temo"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _file:"
 msgstr "Predvajaj _datoteko:"
 
-#: ../plugins/mail-notification/mail-notification.c:799
+#: ../plugins/mail-notification/mail-notification.c:744
 msgid "Select sound file"
 msgstr "Izbor zvoÄne datoteke"
 
-#: ../plugins/mail-notification/mail-notification.c:857
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Notify new messages for _Inbox only"
 msgstr "PokaÅi obvestilo le za nova sporoÄila v mapi _prihajajoÄih sporoÄil"
 
-#: ../plugins/mail-notification/mail-notification.c:866
-msgid "Generate a _D-Bus message"
-msgstr "Ustvari sporoÄilo _D-Bus"
+#: ../plugins/mail-notification/mail-notification.c:811
+#, fuzzy
+msgid "Show _notification when a new message arrives"
+msgstr "Ko prispejo nova sporoÄila, pokaÅi ikono nove poÅte v obvestilnem podroÄju."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -17264,113 +17290,113 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Ob prejemu novega sporoÄila se prikaÅe obvestilo."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:235
+#: ../plugins/mail-to-task/mail-to-task.c:238
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Ustvarjeno iz poÅte z %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:586
+#: ../plugins/mail-to-task/mail-to-task.c:603
 #, c-format
 msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
 msgstr "Izbran koledar Åe vsebuje dogodek '%s'. Ali Åelite urejati stari dogodek?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:589
+#: ../plugins/mail-to-task/mail-to-task.c:606
 #, c-format
 msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
 msgstr "Izbran seznam nalog Åe vsebuje nalogo '%s'. Ali Åelite urediti staro nalogo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:592
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
 msgstr "Izbran koledar Åe vsebuje opomnik '%s'. Ali Åelite urejati star opomnik?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#: ../plugins/mail-to-task/mail-to-task.c:626
 #, c-format
 msgid "You have selected %d mails to be converted to events. Do you really want to add them all?"
 msgstr "Izbranih je %d elektronskih sporoÄil za pretvarjanje v dogodke koledarja. Ali zares Åelite pretvoriti vse?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:612
+#: ../plugins/mail-to-task/mail-to-task.c:629
 #, c-format
 msgid "You have selected %d mails to be converted to tasks. Do you really want to add them all?"
 msgstr "Izbranih je %d elektronskih sporoÄil za pretvarjanje v naloge. Ali zares Åelite pretvoriti vse?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:615
+#: ../plugins/mail-to-task/mail-to-task.c:632
 #, c-format
 msgid "You have selected %d mails to be converted to memos. Do you really want to add them all?"
 msgstr "Izbranih je %d elektronskih sporoÄil za pretvarjanje v opomnike. Ali zares Åelite pretvoriti vse?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:634
+#: ../plugins/mail-to-task/mail-to-task.c:651
 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:709
+#: ../plugins/mail-to-task/mail-to-task.c:726
 msgid "[No Summary]"
 msgstr "[Brez povzetka]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:721
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid "Invalid object returned from a server"
 msgstr "StreÅnik je vrnil neveljaven predmet"
 
-#: ../plugins/mail-to-task/mail-to-task.c:771
+#: ../plugins/mail-to-task/mail-to-task.c:788
 #, 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:796
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ni mogoÄe odpreti koledarja. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:803
+#: ../plugins/mail-to-task/mail-to-task.c:820
 msgid "Selected source is read only, thus cannot create event there. Select other source, please."
 msgstr "Izbrani vir je le za branje, zato ni mogoÄe ustvariti dogodka. Izberite drug vir."
 
-#: ../plugins/mail-to-task/mail-to-task.c:806
+#: ../plugins/mail-to-task/mail-to-task.c:823
 msgid "Selected source is read only, thus cannot create task there. Select other source, please."
 msgstr "Izbrani vir je le za branje, zato ni mogoÄe ustvariti naloge. Izberite drug vir."
 
-#: ../plugins/mail-to-task/mail-to-task.c:809
+#: ../plugins/mail-to-task/mail-to-task.c:826
 msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
 msgstr "Izbrani vir je le za branje, zato ni mogoÄe ustvariti opomnika. Izberite drug vir."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1045
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Ni mogoÄe pridobiti seznama virov. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1104
+#: ../plugins/mail-to-task/mail-to-task.c:1138
 msgid "No writable calendar is available."
 msgstr "Na voljo ni nobenega zapisljivega koledarja"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1196
+#: ../plugins/mail-to-task/mail-to-task.c:1230
 msgid "Create an _Event"
 msgstr "Ustvari _dogodek"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1198
+#: ../plugins/mail-to-task/mail-to-task.c:1232
 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:1203
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 msgid "Create a Mem_o"
 msgstr "Ustvari _opomnik"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1205
+#: ../plugins/mail-to-task/mail-to-task.c:1239
 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:1210
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 msgid "Create a _Task"
 msgstr "Ustvari _nalogo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1212
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 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:1220
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create a _Meeting"
 msgstr "Ustvari  _sreÄanje"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1222
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 msgid "Create a new meeting from the selected message"
 msgstr "Ustvari novo sreÄanje iz izbranega sporoÄila"
 
@@ -17378,55 +17404,55 @@ msgstr "Ustvari novo sreÄanje iz izbranega sporoÄila"
 msgid "Convert a mail message to a task."
 msgstr "Pretvori sporoÄilo v novo nalogo."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:345
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
 msgid "Get List _Archive"
 msgstr "Pridobi _arhiv seznama"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:347
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
 msgid "Get an archive of the list this message belongs to"
 msgstr "Pridobi arhiv seznama, ki mu pripada to sporoÄilo"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
 msgid "Get List _Usage Information"
 msgstr "Pridobi podatke o _uporabi seznama"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:354
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Pridobi podatke o uporabi seznama, ki mu pripada to sporoÄilo"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
 msgid "Contact List _Owner"
 msgstr "Stopi v stik z _lastnikom seznama"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:361
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Stop v stik z lastnikom dopisnega seznama, ki mu pripada to sporoÄilo"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "_Post Message to List"
 msgstr "_Objavi sporoÄilo na seznam"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Objavi sporoÄilo na dopisni seznam, ki mu pripada to sporoÄilo"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "_Subscribe to List"
 msgstr "_NaroÄi se na seznam"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "NaroÄi se na dopisni seznam, ki mu pripada to sporoÄilo"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "_Unsubscribe from List"
 msgstr "_PrekliÄi naroÄnino na seznam"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "PrekliÄe naroÄnino na dopisni seznam, ki mu pripada to sporoÄilo"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
 msgid "Mailing _List"
 msgstr "Dopisni _seznam"
 
@@ -17512,15 +17538,15 @@ msgstr "Ali naj bodo oznaÄena tudi sporoÄila v podmapah?"
 msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
 msgstr "Ali Åelite oznaÄiti sporoÄila kot prebrana le v trenutni mapi ali pa tudi v podmapah?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:213
+#: ../plugins/mark-all-read/mark-all-read.c:215
 msgid "In Current Folder and _Subfolders"
 msgstr "V trenutni mapi in _podmapah"
 
-#: ../plugins/mark-all-read/mark-all-read.c:227
+#: ../plugins/mark-all-read/mark-all-read.c:229
 msgid "In Current _Folder Only"
 msgstr "_Le v trenutni mapi"
 
-#: ../plugins/mark-all-read/mark-all-read.c:565
+#: ../plugins/mark-all-read/mark-all-read.c:575
 msgid "Mark Me_ssages as Read"
 msgstr "OznaÄi _sporoÄila kot prebrana"
 
@@ -17545,35 +17571,35 @@ msgstr "Prednostno uporabi obiÄajno besedilo"
 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."
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Show HTML if present"
 msgstr "PokaÅi HTML, Äe je na voljo"
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:252
 msgid "Let Evolution choose the best part to show."
 msgstr "Naj program sam izbere najboljÅi del za prikaz."
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../plugins/prefer-plain/prefer-plain.c:255
 msgid "Show plain text if present"
 msgstr "PokaÅi le obiÄajno besedilo, Äe je prisotno"
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../plugins/prefer-plain/prefer-plain.c:256
 msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
 msgstr "PokaÅi le obiÄajno besedilo, v nasprotnem primeru pa naj program Evolution izbere najboljÅi naÄin prikaza."
 
-#: ../plugins/prefer-plain/prefer-plain.c:243
+#: ../plugins/prefer-plain/prefer-plain.c:260
 msgid "Only ever show plain text"
 msgstr "PokaÅi le obiÄajno besedilo"
 
-#: ../plugins/prefer-plain/prefer-plain.c:243
+#: ../plugins/prefer-plain/prefer-plain.c:261
 msgid "Always show plain text part and make attachments from other parts, if requested."
 msgstr "Vedno pokaÅi le obiÄajno besedilo, oblikovano besedilo pa naj se oblikuje v priloge."
 
-#: ../plugins/prefer-plain/prefer-plain.c:290
+#: ../plugins/prefer-plain/prefer-plain.c:313
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "PokaÅi zadrÅane HTML dele sporoÄila kot _priloge"
 
-#: ../plugins/prefer-plain/prefer-plain.c:310
+#: ../plugins/prefer-plain/prefer-plain.c:333
 msgid "HTML _Mode"
 msgstr "NaÄin _HTML"
 
@@ -17589,43 +17615,39 @@ msgstr "Uvoz Outlook PST "
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook osebne mape (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:450
 msgid "_Mail"
 msgstr "_PoÅta"
 
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:469
 msgid "Destination folder:"
 msgstr "Ciljna mapa:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:475
 msgid "_Address Book"
 msgstr "_Imenik"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:339
+#: ../plugins/pst-import/pst-importer.c:476
 msgid "A_ppointments"
 msgstr "_Sestanki"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:345
+#: ../plugins/pst-import/pst-importer.c:477
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Naloge"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:478
 msgid "_Journal entries"
 msgstr "_Dnevnik"
 
-#: ../plugins/pst-import/pst-importer.c:366
+#: ../plugins/pst-import/pst-importer.c:585
 msgid "Importing Outlook data"
 msgstr "UvaÅanje podatkov Outlooka"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:154
-#: ../plugins/publish-calendar/publish-calendar.c:156
+#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../plugins/publish-calendar/publish-calendar.c:155
+#: ../plugins/publish-calendar/publish-calendar.c:157
 msgid "Calendar Publishing"
 msgstr "Objavljanje koledarjev"
 
@@ -17637,49 +17659,49 @@ msgstr "Mesta"
 msgid "Publish calendars to the web."
 msgstr "Objavi koledarje na spletu."
 
-#: ../plugins/publish-calendar/publish-calendar.c:212
-#: ../plugins/publish-calendar/publish-calendar.c:453
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:471
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ni mogoÄe odpreti %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../plugins/publish-calendar/publish-calendar.c:218
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Ni mogoÄe odpreti %s: neznana napaka"
 
-#: ../plugins/publish-calendar/publish-calendar.c:234
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Med objavljanjem v %s je priÅlo do napake:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Objavljanje v %s je uspeÅno konÄano"
 
-#: ../plugins/publish-calendar/publish-calendar.c:280
+#: ../plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Priklop %s je spodletel:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../plugins/publish-calendar/publish-calendar.c:619
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "_OmogoÄi"
 
-#: ../plugins/publish-calendar/publish-calendar.c:743
+#: ../plugins/publish-calendar/publish-calendar.c:767
 msgid "Are you sure you want to remove this location?"
 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:1057
+#. * 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:1099
 msgid "Could not create publish thread."
 msgstr "Ni mogoÄe objaviti niti sporoÄil."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1065
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "Objavi _podatke o koledarju"
 
@@ -17771,158 +17793,103 @@ msgstr "_UporabniÅko ime:"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:88
-#: ../plugins/publish-calendar/publish-format-ical.c:86
+#: ../plugins/publish-calendar/publish-format-fb.c:95
+#: ../plugins/publish-calendar/publish-format-ical.c:92
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Ni mogoÄe objaviti koledarja: Hrbtni del koledarja ne obstaja veÄ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:487
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
 msgid "New Location"
 msgstr "Novo mesto"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:489
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
 msgid "Edit Location"
 msgstr "Urejanje mesta"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "Vstavka SpamAssassin ni mogoÄe najti, koda: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "Napaka med ustvarjanjem cevi: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "Napaka po razviliÄenju: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "Podrejeno opravilo SpamAssassin se ne odziva, poteka uniÄevanje opravila ..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "Äakanje na prekinitev podrejenega opravila SpamAssassin, poteka konÄevanje opravila ..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "Cev na SpamAssassin ni uspelo, koda napake: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "Program SpamAssassin ni na voljo. Namestite ga."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "S tem bo postal SpamAssasin bolj zanesljiv, vendar poÄasnejÅi"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr "VkljuÄi oddalje_ne preskuse"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "Filtriranje neÅelenih sporoÄil s SpamAssassin."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "Filter neÅelene poÅte SpamAssassin "
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "MoÅnosti SpamAssassin"
-
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../plugins/save-calendar/csv-format.c:168
 msgid "%F %T"
 msgstr "%d.%m.%Y %H.%M.%S"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Description List"
 msgstr "Seznam opisov"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Categories List"
 msgstr "Seznam kategorij"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Comment List"
 msgstr "Seznam opomb"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Contact List"
 msgstr "Seznam stikov"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Start"
 msgstr "ZaÄetek"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "End"
 msgstr "Konec"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "Due"
 msgstr "Datum zapadlosti"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "percent Done"
 msgstr "odstotkov konÄano"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Attendees List"
 msgstr "Seznam udeleÅencev"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:398
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "A_dvanced options for the CSV format"
 msgstr "_Napredne moÅnosti zapisa CSV"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Prepend a _header"
 msgstr "Spredaj dodaj _glavo"
 
-#: ../plugins/save-calendar/csv-format.c:577
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Value delimiter:"
 msgstr "Razmejilnik _vrednosti:"
 
-#: ../plugins/save-calendar/csv-format.c:588
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Record delimiter:"
 msgstr "Razmejilnik _zapisov:"
 
-#: ../plugins/save-calendar/csv-format.c:599
+#: ../plugins/save-calendar/csv-format.c:612
 msgid "_Encapsulate values with:"
 msgstr "_Ovij vrednosti z:"
 
-#: ../plugins/save-calendar/csv-format.c:625
-msgid "Comma separated value format (.csv)"
-msgstr "Zapis vrednosti, loÄenih z vejicami (.csv)"
+#: ../plugins/save-calendar/csv-format.c:638
+msgid "Comma separated values (.csv)"
+msgstr "Z vejico loÄene vrednosti (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:166
-msgid "iCalendar format (.ics)"
-msgstr "Zapis iCalendar (.ics)"
+#: ../plugins/save-calendar/ical-format.c:173
+#: ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -17937,31 +17904,31 @@ msgstr "Shrani koledar ali nalogo na disk."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:156
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:375
-msgid "RDF format (.rdf)"
-msgstr "Zapis RDF (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:389
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:122
+#: ../plugins/save-calendar/save-calendar.c:127
 msgid "_Format:"
 msgstr "_Oblika:"
 
-#: ../plugins/save-calendar/save-calendar.c:183
+#: ../plugins/save-calendar/save-calendar.c:189
 msgid "Select destination file"
 msgstr "Izberite ciljno datoteko"
 
-#: ../plugins/save-calendar/save-calendar.c:336
+#: ../plugins/save-calendar/save-calendar.c:344
 msgid "Save the selected calendar to disk"
 msgstr "Shrani izbrani koledar na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:367
+#: ../plugins/save-calendar/save-calendar.c:375
 msgid "Save the selected memo list to disk"
 msgstr "Shrani izbrani seznam opomnikov na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:398
+#: ../plugins/save-calendar/save-calendar.c:406
 msgid "Save the selected task list to disk"
 msgstr "Shrani seznam nalog na disk"
 
@@ -17973,15 +17940,15 @@ msgstr "Seznam kljuÄnih besed in vrednosti za vstavek predlog kot zamenjavo v t
 msgid "Drafts based template plugin. You can use variables like $ORIG[subject], $ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from an email you are replying to."
 msgstr "Vstavek predloge osnutkov sporoÄil. Uporabiti je mogoÄe spremenljivke kot so $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:1066
+#: ../plugins/templates/templates.c:1094
 msgid "No Title"
 msgstr "Brez naslova"
 
-#: ../plugins/templates/templates.c:1167
+#: ../plugins/templates/templates.c:1195
 msgid "Save as _Template"
 msgstr "Shrani kot _predlogo"
 
-#: ../plugins/templates/templates.c:1169
+#: ../plugins/templates/templates.c:1197
 msgid "Save as Template"
 msgstr "Shrani kot predlogo"
 
@@ -18001,20 +17968,20 @@ msgstr "Vizitke vCard v besedilu"
 msgid "Show vCards directly in mail messages."
 msgstr "PokaÅi vizitke vCards neposredno v poÅtnih sporoÄilih."
 
-#: ../plugins/vcard-inline/vcard-inline.c:200
-#: ../plugins/vcard-inline/vcard-inline.c:285
+#: ../plugins/vcard-inline/vcard-inline.c:207
+#: ../plugins/vcard-inline/vcard-inline.c:292
 msgid "Show Full vCard"
 msgstr "PokaÅi celotno vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:203
+#: ../plugins/vcard-inline/vcard-inline.c:210
 msgid "Show Compact vCard"
 msgstr "PokaÅi strjeno vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:264
+#: ../plugins/vcard-inline/vcard-inline.c:271
 msgid "There is one other contact."
 msgstr "Obstaja en drug stik."
 
-#: ../plugins/vcard-inline/vcard-inline.c:273
+#: ../plugins/vcard-inline/vcard-inline.c:280
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -18023,7 +17990,7 @@ msgstr[1] "Obstaja Åe %d drug stik."
 msgstr[2] "Obstajata Åe %d druga stika."
 msgstr[3] "Obstajajo Åe %d drugi stiki."
 
-#: ../plugins/vcard-inline/vcard-inline.c:294
+#: ../plugins/vcard-inline/vcard-inline.c:301
 msgid "Save in Address Book"
 msgstr "Shrani v imenik"
 
@@ -18035,15 +18002,15 @@ msgstr "Doda stike WebDAV v Evolution."
 msgid "WebDAV contacts"
 msgstr "stiki WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:67
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:255
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:281
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Izogni se IfMatch (zahtevan na apache < 2.2.8)"
 
@@ -18265,8 +18232,8 @@ msgid "Use HTTP proxy"
 msgstr "Uporabi HTTP posredniÅki streÅnik"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr "UporabniÅko ime za overitev na HTTP posredniÅkem streÅniku."
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr "UporabniÅko ime za overitev posredniÅkega streÅnika HTTP."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -18304,12 +18271,12 @@ msgstr "Slog gumbov okna"
 msgid "Window buttons are visible"
 msgstr "Gumbi okna so vidni"
 
-#: ../shell/e-shell-content.c:699
-#: ../shell/e-shell-content.c:700
+#: ../shell/e-shell-content.c:729
+#: ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "Iskanja"
 
-#: ../shell/e-shell-content.c:742
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
@@ -18337,300 +18304,288 @@ msgstr "_v"
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:225
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
 #: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "Vse datoteke (*)"
 
-#: ../shell/e-shell-view.c:295
+#: ../shell/e-shell-view.c:296
 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:648
+#: ../shell/e-shell-window-actions.c:645
 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:659
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Evolution spletna stran"
 
-#: ../shell/e-shell-window-actions.c:921
+#: ../shell/e-shell-window-actions.c:902
 msgid "Categories Editor"
 msgstr "Urejevalnik kategorij"
 
-#: ../shell/e-shell-window-actions.c:1256
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "Program Bug buddy ni nameÅÄen."
 
-#: ../shell/e-shell-window-actions.c:1258
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "Programa Bug buddy ni mogoÄe zagnati."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "PokaÅe podatke o Evolutionu"
 
-#: ../shell/e-shell-window-actions.c:1444
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "_Zapri okno"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "Odpre uporabniÅko pomoÄ programa"
 
-#: ../shell/e-shell-window-actions.c:1493
-msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
-
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Odpre spletno stran pogosto zastavljenih vpraÅanj"
-
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "_Pozabi gesla"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "Pozabi vsa shranjena gesla"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "_Uvozi ..."
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "Uvozi podatke iz drugih programov"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "Novo _okno"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "Ustvari novo okno s prikazom tega pogleda"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Available Cate_gories"
 msgstr "RazpoloÅljive _kategorije"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Manage available categories"
 msgstr "Upravljanje z razpoloÅljivimi kategorijami"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "_Hitri priroÄnik"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "PokaÅi tipkovne bliÅnjice programa Evolution"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "N_apredno iskanje ..."
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr "Sestavljanje naprednejÅega iskanja"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "PoÄisti trenutne parametre iskanja"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi shranjena iskanja ..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "Upravljanje s shranjenimi iskanji"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "Kliknite tukaj za zamenjavo vrste iskanja"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "_Najdi zdaj"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "Izvedi trenutna parametre iskanja"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "_Shrani iskanje ..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "Shrani trenutne parametre iskanja"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "PoÅlji _poroÄilo o hroÅÄu ..."
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1581
 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:1612
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "_Delo brez povezave"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "Nadaljuje v naÄinu brez povezave"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "_Delo s povezavo"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "Nadaljuje v povezanem naÄinu"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "Razp_oreditev"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "_Nova"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "I_skanje"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "Videz _preklopnika"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "_Okno"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "PokaÅi s_transko vrstico"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "PokaÅe stransko vrstico"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "PokaÅi _gumbe"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "PokaÅe preklopne gumbe"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "PokaÅi vrstico _stanja"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "PokaÅe vrstico stanja"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "PokaÅi orodno vrs_tico"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "PokaÅe orodno vrstico"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "Le _ikone"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "PokaÅe gumbe okna le z ikonami"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "_Le besedilo"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "PokaÅe gumbe okna le z besedilom"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "I_kone in besedilo"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "PokaÅe gumbe okna z ikonami in besedilom"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "Slog orodne _vrstice"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "PokaÅi gumbe okna z uporabo nastavitev orodnih vrstic namizja"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "DoloÄi poglede ..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "Ustvari ali uredi poglede"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "Shrani pogled po meri ..."
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "Shrani trenutni pogled po meri"
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "Tren_utni pogled"
 
-#: ../shell/e-shell-window-actions.c:1818
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "Pogled po meri"
 
-#: ../shell/e-shell-window-actions.c:1820
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "Trenutni pogled je prilagojen"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
 msgstr "Spremeni nastavitve strani za vaÅ trenutni tiskalnik"
 
-#: ../shell/e-shell-window-actions.c:2215
+#: ../shell/e-shell-window-actions.c:2194
 #, c-format
 msgid "Switch to %s"
 msgstr "Preklopi na %s"
 
-#: ../shell/e-shell-window-actions.c:2430
+#: ../shell/e-shell-window-actions.c:2414
 msgid "Execute these search parameters"
 msgstr "Izvedi te parametre iskanja"
 
@@ -18750,12 +18705,12 @@ msgstr "Uvozi naslove URI ali imena datotek podana kot argumenti."
 msgid "Request a running Evolution process to quit"
 msgstr "Zahteva po konÄanju programa Evolution"
 
-#: ../shell/main.c:511
-#: ../shell/main.c:519
+#: ../shell/main.c:512
+#: ../shell/main.c:520
 msgid "- The Evolution PIM and Email Client"
 msgstr "- PoÅtni odjemalec in PIM Evolution"
 
-#: ../shell/main.c:582
+#: ../shell/main.c:583
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18764,7 +18719,7 @@ msgstr ""
 "%s: --online in --offline ne moreta biti uporabljena soÄasno.\n"
 " Uporabite '%s --help' za veÄ podrobnosti.\n"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:589
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -18833,37 +18788,37 @@ msgstr "Preizkusni _vir"
 msgid "Create a new test source"
 msgstr "Ustvari nov preizkusni vir"
 
-#: ../smclient/eggdesktopfile.c:165
+#: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr "Datoteka ni veljavna datoteka .desktop"
 
-#: ../smclient/eggdesktopfile.c:188
+#: ../smclient/eggdesktopfile.c:189
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Neznana razliÄica datoteke namizja '%s'"
 
-#: ../smclient/eggdesktopfile.c:957
+#: ../smclient/eggdesktopfile.c:959
 #, c-format
 msgid "Starting %s"
 msgstr "Zaganjanje %s"
 
-#: ../smclient/eggdesktopfile.c:1098
+#: ../smclient/eggdesktopfile.c:1102
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "Program ne sprejme dokumentov preko ukazne vrstice"
 
-#: ../smclient/eggdesktopfile.c:1166
+#: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Nepoznana moÅnost zagona: %d"
 
-#: ../smclient/eggdesktopfile.c:1365
+#: ../smclient/eggdesktopfile.c:1370
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "Ni mogoÄe poslati naslova URI dokumenta na vnos 'Vrsta=Povezava' predmeta namizja"
 
-#: ../smclient/eggdesktopfile.c:1386
+#: ../smclient/eggdesktopfile.c:1391
 #, c-format
 msgid "Not a launchable item"
 msgstr "Predmet ni izvedljiv"
@@ -18896,7 +18851,7 @@ msgstr "MoÅnosti upravljanja seje:"
 msgid "Show session management options"
 msgstr "PokaÅi moÅnosti upravljanja seje"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -18907,11 +18862,11 @@ msgstr ""
 "\n"
 "Uredi nastavitve zaupanja:"
 
-#: ../smime/gui/cert-trust-dialog.c:144
+#: ../smime/gui/cert-trust-dialog.c:146
 msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
 msgstr "Ker zaupate odgovornemu pooblastitelju potrdil, zaupate tudi pristnosti tega potrdila, razen Äe doloÄite drugaÄe"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
 msgstr "Ker ne zaupate pooblastitelju potrdil, ne zaupate tudi pristnosti tega potrdila, razen Äe doloÄite drugaÄe"
 
@@ -18935,7 +18890,7 @@ msgstr "Izdano za oddelek organizacije"
 #: ../smime/gui/certificate-manager.c:96
 #: ../smime/gui/certificate-manager.c:114
 #: ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:566
+#: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Zaporedna Åtevilka"
 
@@ -18992,54 +18947,54 @@ msgstr "Prstni odtis MD5"
 
 #: ../smime/gui/certificate-manager.c:93
 #: ../smime/gui/certificate-manager.c:113
-msgid "E-Mail Address"
-msgstr "Naslov elektronske poÅte"
+msgid "Email Address"
+msgstr "Elektronski naslov"
 
-#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:575
 msgid "Select a certificate to import..."
 msgstr "Izberite potrdilo za uvoz ..."
 
-#: ../smime/gui/certificate-manager.c:587
+#: ../smime/gui/certificate-manager.c:588
 msgid "All files"
 msgstr "Vse datoteke"
 
-#: ../smime/gui/certificate-manager.c:622
+#: ../smime/gui/certificate-manager.c:623
 msgid "Failed to import certificate"
 msgstr "UvaÅanje potrdila je spodletelo"
 
-#: ../smime/gui/certificate-manager.c:990
+#: ../smime/gui/certificate-manager.c:991
 msgid "All PKCS12 files"
 msgstr "Vse datoteke PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1008
+#: ../smime/gui/certificate-manager.c:1009
 msgid "All email certificate files"
 msgstr "Datoteke potrdil za overjanje elektronske poÅte"
 
-#: ../smime/gui/certificate-manager.c:1026
+#: ../smime/gui/certificate-manager.c:1027
 msgid "All CA certificate files"
 msgstr "Vsa CA potrdila"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:345
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Pregledovalnik potrdil: %s"
 
-#: ../smime/gui/component.c:46
+#: ../smime/gui/component.c:50
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Vnesite geslo za '%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:69
+#: ../smime/gui/component.c:76
 msgid "Enter new password for certificate database"
 msgstr "Vnesite geslo za podatkovno zbirko potrdil"
 
-#: ../smime/gui/component.c:71
+#: ../smime/gui/component.c:78
 msgid "Enter new password"
 msgstr "Vnesite novo geslo"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19048,7 +19003,7 @@ msgstr ""
 "Izdano za:\n"
 " Zadeva: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19057,7 +19012,7 @@ msgstr ""
 "Izdal:\n"
 " Zadeva: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:169
+#: ../smime/gui/e-cert-selector.c:172
 msgid "Select certificate"
 msgstr "Izbor potrdila"
 
@@ -19078,7 +19033,7 @@ msgid "Before trusting this CA for any purpose, you should examine its certifica
 msgstr "Preden zaupate tej CA za poljuben namen, si oglejte njeno potrdilo, ravnanje in postopke (Äe so na voljo)."
 
 #: ../smime/gui/smime-ui.ui.h:5
-#: ../smime/lib/e-cert.c:1088
+#: ../smime/lib/e-cert.c:1097
 msgid "Certificate"
 msgstr "Potrdilo"
 
@@ -19155,12 +19110,12 @@ msgid "Organizational Unit (OU)"
 msgstr "Organizacijska enota (OU)"
 
 #: ../smime/gui/smime-ui.ui.h:30
-#: ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:829
 msgid "SSL Client Certificate"
 msgstr "Potrdilo odjemalca SSL"
 
 #: ../smime/gui/smime-ui.ui.h:31
-#: ../smime/lib/e-cert.c:828
+#: ../smime/lib/e-cert.c:833
 msgid "SSL Server Certificate"
 msgstr "Potrdilo streÅnika SSL"
 
@@ -19213,7 +19168,7 @@ msgstr "_Varnostna kopija"
 msgid "_Edit CA Trust"
 msgstr "Ur_edi zaupanje CA"
 
-#: ../smime/lib/e-cert-db.c:906
+#: ../smime/lib/e-cert-db.c:912
 msgid "Certificate already exists"
 msgstr "Potrdilo Åe obstaja "
 
@@ -19223,151 +19178,151 @@ msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:414
+#: ../smime/lib/e-cert.c:417
 msgid "Sign"
 msgstr "PodpiÅi"
 
-#: ../smime/lib/e-cert.c:415
+#: ../smime/lib/e-cert.c:418
 msgid "Encrypt"
 msgstr "Åifriraj"
 
-#: ../smime/lib/e-cert.c:527
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "RazliÄica"
 
-#: ../smime/lib/e-cert.c:542
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "RazliÄica 1"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "RazliÄica 2"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "RazliÄica 3"
 
-#: ../smime/lib/e-cert.c:630
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "Åifriranje PKCS #1 MD2 z RSA"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "Åifriranje PKCS #1 MD5 z RSA"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "Åifriranje PKCS #1 SHA-1 z RSA"
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:643
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "Åifriranje PKCS #1 SHA-256 z RSA"
 
-#: ../smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:646
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "Åifriranje PKCS #1 SHA-384 z RSA"
 
-#: ../smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "Åifriranje PKCS #1 SHA-512 z RSA"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:676
 msgid "PKCS #1 RSA Encryption"
 msgstr "Åifriranje PKCS #1 RSA"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:679
 msgid "Certificate Key Usage"
 msgstr "Uporaba kljuÄa potrdila"
 
-#: ../smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:682
 msgid "Netscape Certificate Type"
 msgstr "Vrsta potrdila Netscapa"
 
-#: ../smime/lib/e-cert.c:681
+#: ../smime/lib/e-cert.c:685
 msgid "Certificate Authority Key Identifier"
 msgstr "DoloÄevalnik kljuÄa pooblastitelja potrdil"
 
-#: ../smime/lib/e-cert.c:693
+#: ../smime/lib/e-cert.c:697
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "DoloÄilo predmeta (%s)"
 
-#: ../smime/lib/e-cert.c:744
+#: ../smime/lib/e-cert.c:749
 msgid "Algorithm Identifier"
 msgstr "DoloÄilo algoritma"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:757
 msgid "Algorithm Parameters"
 msgstr "DoloÄila algoritma"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Info"
 msgstr "Podatki o javnem kljuÄu zadeve"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:784
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritem javnega kljuÄa zadeve"
 
-#: ../smime/lib/e-cert.c:794
+#: ../smime/lib/e-cert.c:799
 msgid "Subject's Public Key"
 msgstr "Javni kljuÄ zadeve"
 
-#: ../smime/lib/e-cert.c:815
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:870
 msgid "Error: Unable to process extension"
 msgstr "Napaka: ni mogoÄe obdelati razÅiritve"
 
-#: ../smime/lib/e-cert.c:836
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:841
+#: ../smime/lib/e-cert.c:853
 msgid "Object Signer"
 msgstr "Podpisnik predmeta"
 
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:845
 msgid "SSL Certificate Authority"
 msgstr "Pooblastitelj potrdil SSL"
 
-#: ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:849
 msgid "Email Certificate Authority"
 msgstr "Pooblastitelj potrdil elektronske poÅte"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:878
 msgid "Signing"
 msgstr "Podpisovanje"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:882
 msgid "Non-repudiation"
 msgstr "Nepreklicno"
 
-#: ../smime/lib/e-cert.c:880
+#: ../smime/lib/e-cert.c:886
 msgid "Key Encipherment"
 msgstr "Åifriranje kljuÄa"
 
-#: ../smime/lib/e-cert.c:884
+#: ../smime/lib/e-cert.c:890
 msgid "Data Encipherment"
 msgstr "Åifriranje podatkov"
 
-#: ../smime/lib/e-cert.c:888
+#: ../smime/lib/e-cert.c:894
 msgid "Key Agreement"
 msgstr "Dogovor o kljuÄu"
 
-#: ../smime/lib/e-cert.c:892
+#: ../smime/lib/e-cert.c:898
 msgid "Certificate Signer"
 msgstr "Podpisnik potrdila"
 
-#: ../smime/lib/e-cert.c:896
+#: ../smime/lib/e-cert.c:902
 msgid "CRL Signer"
 msgstr "Podpisnik CRL"
 
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:951
 msgid "Critical"
 msgstr "KritiÄno"
 
-#: ../smime/lib/e-cert.c:946
-#: ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:953
+#: ../smime/lib/e-cert.c:956
 msgid "Not Critical"
 msgstr "Ni kritiÄno"
 
-#: ../smime/lib/e-cert.c:970
+#: ../smime/lib/e-cert.c:977
 msgid "Extensions"
 msgstr "RazÅiritve"
 
@@ -19379,41 +19334,41 @@ msgstr "RazÅiritve"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1047
+#: ../smime/lib/e-cert.c:1055
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1102
-#: ../smime/lib/e-cert.c:1225
+#: ../smime/lib/e-cert.c:1111
+#: ../smime/lib/e-cert.c:1234
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritem podpisa potrdila"
 
-#: ../smime/lib/e-cert.c:1111
+#: ../smime/lib/e-cert.c:1120
 msgid "Issuer"
 msgstr "Izdajatelj"
 
-#: ../smime/lib/e-cert.c:1166
+#: ../smime/lib/e-cert.c:1175
 msgid "Issuer Unique ID"
 msgstr "Edinstven ID izdajatelja"
 
-#: ../smime/lib/e-cert.c:1185
+#: ../smime/lib/e-cert.c:1194
 msgid "Subject Unique ID"
 msgstr "Edinstven ID zadeve"
 
-#: ../smime/lib/e-cert.c:1231
+#: ../smime/lib/e-cert.c:1240
 msgid "Certificate Signature Value"
 msgstr "Vrednost podpisa potrdila"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:256
 msgid "PKCS12 File Password"
 msgstr "Geslo datoteke PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:257
 msgid "Enter password for PKCS12 file:"
 msgstr "Vnesite geslo za datoteko PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:352
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "UvoÅeno potrdilo"
 
@@ -19495,7 +19450,7 @@ msgstr "S _stanjem"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:780
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
 msgid "UTC"
 msgstr "UTC"
 
@@ -19523,14 +19478,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Izbor"
 
-#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-define-views-dialog.c:359
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "DoloÄi poglede za %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
 msgid "Define Views"
 msgstr "DoloÄi poglede"
 
@@ -19543,7 +19498,7 @@ msgstr "DoloÄi poglede za \"%s\""
 msgid "Table"
 msgstr "Razpredelnica"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:275
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Shrani trenutni pogled"
 
@@ -19661,8 +19616,8 @@ msgstr[3] "Shrani priloge"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:642
-#: ../widgets/misc/e-attachment.c:1809
-#: ../widgets/misc/e-attachment.c:2351
+#: ../widgets/misc/e-attachment.c:1810
+#: ../widgets/misc/e-attachment.c:2352
 msgid "attachment.dat"
 msgstr "priloga.dat"
 
@@ -19708,61 +19663,61 @@ msgstr "Odpri prilogo v %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:997
+#: ../widgets/misc/e-attachment.c:998
 msgid "Attached message"
 msgstr "PriloÅeno sporoÄilo"
 
-#: ../widgets/misc/e-attachment.c:1852
-#: ../widgets/misc/e-attachment.c:2653
+#: ../widgets/misc/e-attachment.c:1853
+#: ../widgets/misc/e-attachment.c:2654
 msgid "A load operation is already in progress"
 msgstr "Dejanje nalaganja je Åe v teku"
 
-#: ../widgets/misc/e-attachment.c:1860
-#: ../widgets/misc/e-attachment.c:2661
+#: ../widgets/misc/e-attachment.c:1861
+#: ../widgets/misc/e-attachment.c:2662
 msgid "A save operation is already in progress"
 msgstr "Dejanje shranjevanja je Åe v teku"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1953
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Ni mogoÄe naloÅiti '%s'"
 
-#: ../widgets/misc/e-attachment.c:1955
+#: ../widgets/misc/e-attachment.c:1956
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Ni mogoÄe naloÅiti priloge"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2232
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Ni mogoÄe odpreti '%s'"
 
-#: ../widgets/misc/e-attachment.c:2234
+#: ../widgets/misc/e-attachment.c:2235
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Ni mogoÄe odpreti priloge"
 
-#: ../widgets/misc/e-attachment.c:2669
+#: ../widgets/misc/e-attachment.c:2670
 msgid "Attachment contents not loaded"
 msgstr "Vsebina priloge ni naloÅena"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2746
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Ni mogoÄe shraniti '%s'"
 
-#: ../widgets/misc/e-attachment.c:2748
+#: ../widgets/misc/e-attachment.c:2749
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Ni mogoÄe shraniti priloge"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:387
 msgid "Ctrl-click to open a link"
 msgstr "S Ctrl+klikom se odpre povezava"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1247
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -19782,7 +19737,7 @@ msgstr "Vnesite nabor znakov, ki naj se uporablja"
 msgid "Other..."
 msgstr "Drugo ..."
 
-#: ../widgets/misc/e-contact-map-window.c:347
+#: ../widgets/misc/e-contact-map-window.c:355
 msgid "Contacts Map"
 msgstr "Zemljevid stikov"
 
@@ -19811,24 +19766,24 @@ msgid "_Today"
 msgstr "_Danes"
 
 #. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
+#. * is not permitted.
 #: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Brez"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1686
-#: ../widgets/misc/e-dateedit.c:1918
+#: ../widgets/misc/e-dateedit.c:1688
+#: ../widgets/misc/e-dateedit.c:1921
 msgctxt "date"
 msgid "None"
 msgstr "Brez"
 
-#: ../widgets/misc/e-dateedit.c:1813
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "Neveljavna vrednost datuma"
 
-#: ../widgets/misc/e-dateedit.c:1857
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "Neveljavna vrednost Äasa"
 
@@ -19850,7 +19805,7 @@ msgid "File _type:"
 msgstr "Vrs_ta datoteke:"
 
 #: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:910
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "Izberite cilj za ta uvoz"
 
@@ -19871,37 +19826,37 @@ msgid "Evolution checked for settings to import from the following applications:
 msgstr "Evolution je iskal nastavitve programov Pine, Netscape, Elm in iCalendar, vendar jih ni mogoÄe najti. V primeru, da Åelite poskusiti znova, kliknite gumb \"Nazaj\"."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:767
+#: ../widgets/misc/e-import-assistant.c:768
 msgid "_Cancel Import"
 msgstr "_PrekliÄi uvoz"
 
-#: ../widgets/misc/e-import-assistant.c:909
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Preview data to be imported"
 msgstr "Predogled podatkov za uvoz"
 
-#: ../widgets/misc/e-import-assistant.c:915
-#: ../widgets/misc/e-import-assistant.c:928
-#: ../widgets/misc/e-import-assistant.c:1273
-#: ../widgets/misc/e-import-assistant.c:1349
-#: ../widgets/misc/e-import-assistant.c:1358
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1352
+#: ../widgets/misc/e-import-assistant.c:1361
 msgid "Import Data"
 msgstr "Uvozi podatke"
 
-#: ../widgets/misc/e-import-assistant.c:923
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr "Izberite vrsto datotek za uvoz iz seznama."
 
-#: ../widgets/misc/e-import-assistant.c:1263
-#: ../widgets/misc/e-import-assistant.c:1298
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
 msgid "Evolution Import Assistant"
 msgstr "PomoÄnik za uvoz v Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1280
-#: ../widgets/misc/e-import-assistant.c:1336
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
 msgid "Import Location"
 msgstr "Uvozi mesto"
 
-#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing external files into Evolution."
@@ -19909,27 +19864,27 @@ msgstr ""
 "DobrodoÅli v PomoÄniku za uvoz podatkov v program Evolution.\n"
 "PomoÄnik vas vodi skozi postopek uvoza zunanjih datotek v program Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Importer Type"
 msgstr "Vrsta uvoznika"
 
-#: ../widgets/misc/e-import-assistant.c:1318
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "Izberite podatke za uvoz"
 
-#: ../widgets/misc/e-import-assistant.c:1327
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Select a File"
 msgstr "Izbor datoteke"
 
-#: ../widgets/misc/e-import-assistant.c:1344
+#: ../widgets/misc/e-import-assistant.c:1347
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Kliknite \"Uvozi\" za zaÄetek uvoza datoteke v Evolution. "
 
-#: ../widgets/misc/e-map.c:869
+#: ../widgets/misc/e-map.c:883
 msgid "World Map"
 msgstr "Zemljevid sveta"
 
-#: ../widgets/misc/e-map.c:872
+#: ../widgets/misc/e-map.c:886
 msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
 msgstr "Gradnik za interaktivni izbor Äasovnega pasu z miÅko na zemljevidu. Uporabniki tipkovnice lahko Äasovni pas izberejo iz spodnjega spustnega polja."
 
@@ -19949,52 +19904,52 @@ msgstr "Program Evolution trenutno ni povezan, ker omreÅna povezava ni na voljo
 msgid "Evolution Preferences"
 msgstr "MoÅnosti Evolution"
 
-#: ../widgets/misc/e-search-bar.c:79
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "Zadetki: %d"
 
-#: ../widgets/misc/e-search-bar.c:561
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "Zapri vrstico iskanja"
 
-#: ../widgets/misc/e-search-bar.c:569
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "_Najdi:"
 
-#: ../widgets/misc/e-search-bar.c:581
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "PoÄisti iskanje"
 
-#: ../widgets/misc/e-search-bar.c:605
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "_Predhodni"
 
-#: ../widgets/misc/e-search-bar.c:611
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "Najde predhodno ponovitev izraza"
 
-#: ../widgets/misc/e-search-bar.c:624
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "_Naslednji"
 
-#: ../widgets/misc/e-search-bar.c:630
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "Najde naslednjo ponovitev izraza"
 
-#: ../widgets/misc/e-search-bar.c:643
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "_UpoÅtevaj velikost Ärk"
 
-#: ../widgets/misc/e-search-bar.c:671
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr "DoseÅeno je dno strani, nadaljevanje z vrha"
 
-#: ../widgets/misc/e-search-bar.c:693
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "DoseÅen je bil vrh strani, nadaljevanje z dna"
 
-#: ../widgets/misc/e-send-options.c:543
+#: ../widgets/misc/e-send-options.c:552
 msgid "When de_leted:"
 msgstr "Ko je iz_brisano:"
 
@@ -20182,66 +20137,66 @@ msgstr "Datoteka skripta mora biti izvedljiva."
 msgid "Click here to go to URL"
 msgstr "Kliknite tukaj za obisk URL-ja"
 
-#: ../widgets/misc/e-web-view.c:408
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "_Kopiraj mesto povezave"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "Kopira povezavo na odloÅiÅÄe"
 
-#: ../widgets/misc/e-web-view.c:418
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "Odpre povezavo v spletnemu brskalniku"
 
-#: ../widgets/misc/e-web-view.c:428
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "Kopiraj _elektronski naslov"
 
-#: ../widgets/misc/e-web-view.c:445
+#: ../widgets/misc/e-web-view.c:447
 msgid "_Copy Image"
 msgstr "_Kopiraj sliko"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:449
 msgid "Copy the image to the clipboard"
 msgstr "Kopira sliko v odloÅiÅÄe"
 
-#: ../widgets/misc/e-web-view.c:467
-#: ../widgets/misc/e-web-view.c:1292
+#: ../widgets/misc/e-web-view.c:469
+#: ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "Izberi vse besedilo in slike"
 
-#: ../widgets/misc/e-web-view.c:956
-#: ../widgets/misc/e-web-view.c:958
-#: ../widgets/misc/e-web-view.c:960
+#: ../widgets/misc/e-web-view.c:982
+#: ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite za klicanje %s"
 
-#: ../widgets/misc/e-web-view.c:962
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknite za skritje/prikaz naslovov"
 
-#: ../widgets/misc/e-web-view.c:964
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za odpiranje %s"
 
-#: ../widgets/misc/ea-calendar-item.c:302
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:314
+#: ../widgets/misc/ea-calendar-item.c:318
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Koledar: od %s do %s"
 
-#: ../widgets/misc/ea-calendar-item.c:350
+#: ../widgets/misc/ea-calendar-item.c:354
 msgid "evolution calendar item"
 msgstr "predmet koledarja evolution"
 
@@ -20268,40 +20223,40 @@ msgstr "V redu"
 msgid "The time must be in the format: %s"
 msgstr "Datum mora biti v obliki: %s"
 
-#: ../widgets/table/e-cell-percent.c:76
+#: ../widgets/table/e-cell-percent.c:80
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v odstotkih mora biti med vkljuÄno 0 in 100"
 
-#: ../widgets/table/e-table-click-to-add.c:594
+#: ../widgets/table/e-table-click-to-add.c:607
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:141
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "kliknite za dodajanje"
 
-#: ../widgets/table/e-table-config.c:387
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:393
+#: ../widgets/table/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(naraÅÄajoÄe)"
 
-#: ../widgets/table/e-table-config.c:387
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:393
+#: ../widgets/table/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(padajoÄe)"
 
-#: ../widgets/table/e-table-config.c:394
+#: ../widgets/table/e-table-config.c:400
 msgid "Not sorted"
 msgstr "NerazvrÅÄeno"
 
-#: ../widgets/table/e-table-config.c:435
+#: ../widgets/table/e-table-config.c:441
 msgid "No grouping"
 msgstr "Brez zdruÅevanja v skupine"
 
-#: ../widgets/table/e-table-config.c:659
+#: ../widgets/table/e-table-config.c:666
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "PokaÅi polja"
 
-#: ../widgets/table/e-table-config.c:679
+#: ../widgets/table/e-table-config.c:686
 msgid "Available Fields"
 msgstr "RazpoloÅljiva polja"
 
@@ -20310,7 +20265,7 @@ msgid "A_vailable Fields:"
 msgstr "_RazpoloÅljiva polja:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1679
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Ascending"
 msgstr "NaraÅÄajoÄe"
 
@@ -20323,7 +20278,7 @@ msgid "Clear _All"
 msgstr "PoÄisti _vse"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1679
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Descending"
 msgstr "PadajoÄe"
 
@@ -20400,13 +20355,13 @@ msgstr ""
 "povlecite do mesta kjer naj se pojavi."
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which has set a title.
-#. The first %s is replaced with a column title.
-#. The second %s is replaced with an actual  group value.
-#. Finally the %d is replaced with count of items in this group.
-#. Example: "Family name: Smith (13 items)"
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * Finally the %d is replaced with count of items in this group.
+#. * Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:353
+#: ../widgets/table/e-table-group-container.c:361
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -20416,12 +20371,12 @@ msgstr[2] "%s : %s (%d predmeta)"
 msgstr[3] "%s : %s (%d predmeti)"
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which doesn't have set a title.
-#. The %s is replaced with an actual group value.
-#. The %d is replaced with count of items in this group.
-#. Example: "Smith (13 items)"
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:365
+#: ../widgets/table/e-table-group-container.c:373
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -20430,60 +20385,60 @@ msgstr[1] "%s (%d predmet)"
 msgstr[2] "%s (%d predmeta)"
 msgstr[3] "%s (%d predmeti)"
 
-#: ../widgets/table/e-table-header-item.c:1523
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "Customize Current View"
 msgstr "Prilagodi trenutni pogled"
 
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Sort _Ascending"
 msgstr "Razvrsti _naraÅÄajoÄe"
 
-#: ../widgets/table/e-table-header-item.c:1547
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Sort _Descending"
 msgstr "Razvrsti _padajoÄe"
 
-#: ../widgets/table/e-table-header-item.c:1550
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "_Unsort"
 msgstr "O_dstrani razvrstitev"
 
-#: ../widgets/table/e-table-header-item.c:1553
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Group By This _Field"
 msgstr "ZdruÅi po tem _polju"
 
-#: ../widgets/table/e-table-header-item.c:1556
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Group By _Box"
 msgstr "ZdruÅi po _Åkatli"
 
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Remove This _Column"
 msgstr "Odstrani ta _stolpec"
 
-#: ../widgets/table/e-table-header-item.c:1563
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Add a C_olumn..."
 msgstr "_Dodaj stolpec ..."
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "A_lignment"
 msgstr "_Poravnava"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1605
 msgid "B_est Fit"
 msgstr "NajboljÅe _prileganje"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1608
 msgid "Format Column_s..."
 msgstr "_Oblikuj stolpce ..."
 
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Custo_mize Current View..."
 msgstr "Prila_godi trenutni pogled ..."
 
-#: ../widgets/table/e-table-header-item.c:1636
+#: ../widgets/table/e-table-header-item.c:1674
 msgid "_Sort By"
 msgstr "_Razvrsti po"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1654
+#: ../widgets/table/e-table-header-item.c:1692
 msgid "_Custom"
 msgstr "_Po meri"
 
@@ -20507,26 +20462,198 @@ 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"
 
-#: ../widgets/table/gal-a11y-e-cell.c:121
+#: ../widgets/table/gal-a11y-e-cell.c:123
 msgid "Table Cell"
 msgstr "Celica razpredelnice"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:71
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "kliknite"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:157
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "razvrsti"
 
-#: ../widgets/text/e-text.c:2306
+#: ../widgets/text/e-text.c:2327
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ../widgets/text/e-text.c:2318
+#: ../widgets/text/e-text.c:2339
 msgid "Input Methods"
 msgstr "NaÄini vnosa"
 
+#~ msgid "Edit Alarm"
+#~ msgstr "Uredi alarm"
+
+#~ msgid "Add Alarm"
+#~ msgstr "Dodaj alarm"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarm"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmi"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "Kliknite tukaj za zaprtje trenutnega okna"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "Kliknite tukaj za ogled razpoloÅljive pomoÄi"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "Kliknite tukaj za shranjevanje trenutnega okna"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "Kliknite tukaj za dodajanje prilog"
+
+#~ msgid "_Alarms"
+#~ msgstr "_Alarmi"
+#~ msgctxt "cal-alarms"
+
+#~ msgid "None"
+#~ msgstr "Brez"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Alarm po meri:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_Alarm"
+
+#~ msgid "_Group:"
+#~ msgstr "_Skupina:"
+
+#~ msgid "It has alarms."
+#~ msgstr "Ima alarme."
+#~ msgctxt "iCalImp"
+
+#~ msgid "has alarms"
+#~ msgstr "ima alarme"
+
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "Izberite mapo trenutnega raÄuna."
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "_Privzet vstavek neÅelene poÅte"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "_Uporabi varno povezavo:"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid "Local Folders"
+#~ msgstr "Krajevne mape"
+
+#~ msgid "Alarm programs"
+#~ msgstr "Programi alarma"
+
+#~ msgid "Save as iCalendar..."
+#~ msgstr "Shrani kot iCalendar ..."
+#~ msgctxt "mail-junk-hook"
+
+#~ msgid "None"
+#~ msgstr "Brez"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "%s vstavek je na voljo in je pravilno nameÅÄen."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr "Vstavek %s ni na voljo. Preverite, ali je paket nameÅÄen."
+
+#~ msgid "No junk plugin available"
+#~ msgstr "Vstavek nezaÅelene poÅte ni na voljo"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr "Bogofilter ni na voljo. Namestite ga."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "PriÅlo je do napake med zaganjanjem %s: %s"
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr ""
+#~ "Podrejeno opravilo Bogofilter se ne odziva, poteka uniÄevanje opravila ..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr ""
+#~ "Äakanje na prekinitev podrejenega opravila Bogofilter, zakljuÄevanje ..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "Cev na Bogofilter ni uspelo, koda napake: %d."
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Bogofilter vstavek neÅelene poÅte"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Filtriranje neÅelenih sporoÄil z vstavkom Bogofilter."
+
+#~ msgid "Use _SSL"
+#~ msgstr "Uporabi _SSL"
+
+#~ msgid "_Secure connection"
+#~ msgstr "_Varna povezava"
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "OmogoÄi sporoÄila D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "Ustvari sporoÄilo D-Bus, ko prispejo nova sporoÄila."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "Pojavno sporoÄilo naj se prikaÅe skupaj z ikono."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr "Ali naj prikaÅe sporoÄilo preko ikone ob prejemu novega sporoÄila."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "_PokaÅi ikono v obvestilnem podroÄju"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "_Pojavno sporoÄilo naj se prikaÅe skupaj z ikono"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "Ustvari sporoÄilo _D-Bus"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "Vstavka SpamAssassin ni mogoÄe najti, koda: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "Napaka med ustvarjanjem cevi: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "Napaka po razviliÄenju: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr ""
+#~ "Podrejeno opravilo SpamAssassin se ne odziva, poteka uniÄevanje "
+#~ "opravila ..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr ""
+#~ "Äakanje na prekinitev podrejenega opravila SpamAssassin, poteka "
+#~ "konÄevanje opravila ..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "Cev na SpamAssassin ni uspelo, koda napake: %d"
+
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "Program SpamAssassin ni na voljo. Namestite ga."
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "Filter neÅelene poÅte SpamAssassin "
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "Zapis iCalendar (.ics)"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "Evolution _FAQ"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "Odpre spletno stran pogosto zastavljenih vpraÅanj"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "Naslov elektronske poÅte"
+
 #~ msgid ""
 #~ "Selected calendar contains some events for the given mails already. Would "
 #~ "you like to create new events anyway?"
@@ -20875,9 +21002,6 @@ msgstr "NaÄini vnosa"
 #~ msgid "Con_tacts..."
 #~ msgstr "S_tiki ..."
 
-#~ msgid "Shared Folder Notification"
-#~ msgstr "Obvestilo o deljeni mapi"
-
 #~ msgid "Users:"
 #~ msgstr "Uporabniki:"
 
@@ -20902,9 +21026,6 @@ msgstr "NaÄini vnosa"
 #~ msgid "Read items marked _private"
 #~ msgstr "Preberi predmete, oznaÄene kot _zasebne"
 
-#~ msgid "Reminder Notes"
-#~ msgstr "Opombe opomnika"
-
 #~ msgid "Subscribe to my _alarms"
 #~ msgstr "NaroÄi se na moje _alarme"
 
@@ -21139,9 +21260,6 @@ msgstr "NaÄini vnosa"
 #~ msgid "%s has published meeting information."
 #~ msgstr "%s je izdal(a) podatke o sreÄanju."
 
-#~ msgid "Meeting Information"
-#~ msgstr "Podatki o sreÄanju"
-
 #~ msgid "%s requests the presence of %s at a meeting."
 #~ msgstr "%s zahteva navzoÄnost %s na sreÄanju."
 
@@ -22490,9 +22608,6 @@ msgstr "NaÄini vnosa"
 #~ msgid "Import"
 #~ msgstr "Uvozi"
 
-#~ msgid "View"
-#~ msgstr "Pogled"
-
 #~ msgid "Collection"
 #~ msgstr "Zbirka"
 
@@ -23476,9 +23591,6 @@ msgstr "NaÄini vnosa"
 #~ msgid "message"
 #~ msgstr "sporoÄilo"
 
-#~ msgid "Save Message..."
-#~ msgstr "Shrani sporoÄilo ..."
-
 #~ msgid "Save As..."
 #~ msgstr "Shrani kot ..."
 



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