Updated Slovenian translation

svn path=/trunk/; revision=12201

1 files changed, 6193 insertions, 4796 deletions

diff --git a/po/sl.po b/po/sl.po
index bef137c3db..3d092490cf 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,19 +5,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-07-05 14:17+0200\n"
+"POT-Creation-Date: 2001-08-17 18:42+0200\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3546
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Tovarna uvozov datotek eVizitk v Evolucijo."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Uvozi datoteke eVizitk v Evolucijo. "
+
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3548
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +33,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3549
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +41,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3550
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +49,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3551
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -49,15 +57,15 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3552
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 "\n"
-"  Družinsko:     "
+"  DruĹžinsko:     "
 
-#: addressbook/backend/ebook/e-card.c:3553
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +73,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +81,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3578
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -81,15 +89,15 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3580
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 "\n"
-"  Poštni predal:  "
+"  PoĹĄtni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3581
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +105,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3582
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +113,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3583
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +121,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3584
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -121,23 +129,23 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 "\n"
-"  Poštna številka: "
+"  PoĹĄtna ĹĄtevilka: "
 
-#: addressbook/backend/ebook/e-card.c:3586
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 "\n"
-"  Država:      "
+"  DrĹžava:      "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +153,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +161,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3614
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +169,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +177,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -177,31 +185,31 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 "\n"
-"Poštni program: "
+"PoĹĄtni program: "
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 "\n"
-"Časovni pas: "
+"Časovni pas: "
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 "\n"
-"Geografski položaj: "
+"Geografski poloĹžaj: "
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +217,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +225,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3691
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +233,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +241,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3693
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +249,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3694
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +257,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3695
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +265,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3699
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +273,7 @@ msgstr ""
 "\n"
 "Kategorije: "
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -283,72 +291,60 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 "\n"
-"Enoličen niz:  "
+"Enoličen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 "\n"
-"Javni ključ: "
+"Javni ključ: "
 
-#: addressbook/backend/ebook/e-card.c:3978
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
-msgstr "Več eVizitk"
+msgstr "Več eVizitk"
 
-#: addressbook/backend/ebook/e-card.c:3986
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "eVizitka za %s"
 
-#: addressbook/backend/ebook/e-destination.c:344
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Tovarna uvozov datotek eVizitk v Evolucijo."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Uvozi datoteke eVizitk v Evolucijo. "
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:48
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
-msgstr "Kazalec se ni mogel naložiti\n"
+msgstr "Kazalec se ni mogel naloĹžiti\n"
 
 #: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
-msgstr "EKnjiga ni naložena\n"
+msgstr "EKnjiga ni naloĹžena\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
-msgstr "Nisem mogel pognati strežnika wombat"
+msgstr "Nisem mogel pognati streĹžnika wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
@@ -357,280 +353,655 @@ msgstr "Nisem mogel pognati programa wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Kontrola Bonobo za vznik naslova."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Kontrola Bonobo za prikaz naslova."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Vzorčna kontrola Bonobo, ki prikaže adresar."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Kontrola, ki prikaĹže mini vizitko iz Evolucijinega adresarja."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Evolucijina komponenta za urejanje stikov."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Tovarna za orodje mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Tovarna za prikazovalnik adresarjeve adrese"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Tovarna za Adresarjev vznik naslova"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Tovarna za Evolucijino komponento adresarja."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Tovarna za vzorčno kontrolo adresarja"
+
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Uredi adresar"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Dodaj"
+msgid "389"
+msgstr "389"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Account Name"
+msgstr "Ime računa"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
+msgstr "Dodaj adresar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Viri adresarja"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Advanced"
+msgstr "Napredno"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Osnovno"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+msgid "Basic"
+msgstr "Osnove"
+
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "De_lete"
+msgstr "Z_briĹĄi"
+
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "Ena"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Search _base:"
+msgstr "Iskanje v _zbirki:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "Search s_cope: "
+msgstr "_Doseg iskanja:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:12
+msgid "Server Name"
+msgstr "Ime streĹžnika"
+
+#: addressbook/gui/component/addressbook-config.glade.h:13
+msgid "Sub"
+msgstr "Pod"
+
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr "Podatki spodaj so potrebni za dodajanje adresarja.  "
+
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr "Te podatki za večino strežnikov ldap niso potrebni"
+
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
+msgstr ""
+"Te podatke potrebuje vaš strežnik ldap za določitev katera vozlišča naj se uporabljajo za iskanja. Za več podatkov se obrnite na svojega administratorja."
+
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
+"To je izhodiščno vozlišče vseh vaših iskanj na strežniku ldap. Za več podatkov "
+"se obrnite na svojega administratorja."
+
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr "To je ime streĹžnika, kjer se nahaja vaĹĄ adresar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr "To so vrata, ki jih uporablja vaĹĄ streĹžnik ldap."
+
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
+"To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za prikaz."
+
+#: addressbook/gui/component/addressbook-config.glade.h:21
+msgid "_Account name:"
+msgstr "Ime _računa:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:89
+#: my-evolution/my-evolution.glade.h:18
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: mail/mail-config.glade.h:94 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:40
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_My server requires authentication"
+msgstr "_Moj streĹžnik zahteva avtentifikacijo"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+msgid "_Port:"
+msgstr "_Vrata:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+msgid "_Server name:"
+msgstr "Ime _streĹžnika:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
+msgid "Other Contacts"
+msgstr "Drugo stiki"
+
+#: addressbook/gui/component/addressbook.c:372
+msgid "Please enter your email address and password for access to %s"
+msgstr "Prosim vpiĹĄite naslov svoje e-poĹĄte in geslo za %s"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid "LDAP Authentication"
+msgstr "Avtentifikacija LDAP"
+
+#: addressbook/gui/component/addressbook.c:391
+msgid "Email Address:"
+msgstr "E-poĹĄtni naslov:"
+
+#: addressbook/gui/component/addressbook.c:404
+msgid "Password:"
+msgstr "Geslo:"
+
+#: addressbook/gui/component/addressbook.c:467
+msgid "Unable to open addressbook"
+msgstr "Kliknite tu za odprtje adresarja"
+
+#: addressbook/gui/component/addressbook.c:474
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"Ne morem odpreti tega adresarja. To pomeni, da \n"
+"ste vpisali neveljaven URI ali, da streĹžnik LDAP ne deluje"
+
+#: addressbook/gui/component/addressbook.c:479
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Ta različica Evolucije nima vgrajene podpore za LDAP.\n"
+"Če želite v Evoluciji uporabljati LDAP, morate po tem,\n"
+"ko boste s spodnje povezave prenesli program OpenLDAP,\n"
+"Evolucijo prevesti iz izvorne kode CVS.\n"
+
+#: addressbook/gui/component/addressbook.c:487
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
+"pot obstaja in ali imate dovoljenje za dostop."
+
+#: addressbook/gui/component/addressbook.c:628
+#: calendar/gui/cal-search-bar.c:55
+msgid "Any field contains"
+msgstr "Katerokoli polje vsebuje"
+
+#: addressbook/gui/component/addressbook.c:629
+msgid "Name contains"
+msgstr "Ime vsebuje"
+
+#: addressbook/gui/component/addressbook.c:630
+msgid "Email contains"
+msgstr "E-naslov vsebuje"
+
+#: addressbook/gui/component/addressbook.c:631
+#: calendar/gui/cal-search-bar.c:59
+msgid "Category is"
+msgstr "Kategorija je"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:632 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Napredno..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:821
+#: calendar/gui/cal-search-bar.c:412
+msgid "Any Category"
+msgstr "katerakoli kategorija"
+
+#: addressbook/gui/component/addressbook.c:859
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, ki naj ga prikaĹže brskalnik map"
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(brez)"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1585
+msgid "Primary Email"
+msgstr "prvi e-naslov"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1586
+#: addressbook/gui/widgets/e-addressbook-view.c:801
+msgid "Email 2"
+msgstr "E-naslov 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1587
+#: addressbook/gui/widgets/e-addressbook-view.c:802
+msgid "Email 3"
+msgstr "E-naslov 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Izberi dejanje"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Ustvari nov stik \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj naslov k obstoječemu stiku \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
+msgstr "Poizvedujem v adresarju..."
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
+msgid "Edit Contact Info"
+msgstr "Uredi podatke stika"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
+msgid "Add to Contacts"
+msgstr "Dodaj k stikom"
+
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "Zlij E-poĹĄtne naslove"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Izključi poizvedbe"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Vključi poizvedbe (nevarno!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:640
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:543 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
+msgid "Remove"
+msgstr "Odstrani"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Odstrani vse"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "PoĹĄlji poĹĄto v obliki HTML?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
+msgid "Unnamed Contact"
+msgstr "Neimenovan stik"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr "Ne morem dobiti krajevne shrambe. To se nikoli ne bi smelo zgoditi."
+
+#: addressbook/gui/component/select-names/e-select-names.c:484
+msgid "Select Contacts from Addressbook"
+msgstr "Izberi stike iz adresarja"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "C_ontaining:"
+msgstr "_Vsebujejo:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Co_ntacts:"
+msgstr "_Stiki:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "F_ind"
+msgstr "_Poišči"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Izberi imena"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr "KaĹži stike, ki ustrezajo naslednjim kriterijem:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "_Category:"
+msgstr "_Kategorija:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "_Folder:"
+msgstr "_Mapa:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "_Message Recipients:"
+msgstr "Prejemniki _sporočila:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ob_letnica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
-msgstr "V sl_užbi"
+msgstr "V sl_uĹžbi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
-msgstr "Službeni _faks"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_Stiki..."
+msgstr "SluĹžbeni _faks"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/event-page.glade.h:2
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:135
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Zavedi kot:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File A_s:"
+msgstr "Zavedi _kot:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "General"
-msgstr "Splošno"
+msgstr "SploĹĄno"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nov tip telefona"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Opom_be:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "Organi_zation:"
+msgstr "Organi_zacija:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipi telefonov"
 
-#: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
-msgstr "Želi dobivati _HTML e-pošto"
+msgstr "Želi dobivati _HTML e-poťto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Naslov spletne strani:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:100
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_Naslov..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
-msgstr "_Ime pomočnika:"
+msgstr "_Ime pomočnika:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_Rojstni dan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
-msgstr "_Službeni"
+msgstr "_SluĹžbeni"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Podjetje:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Stiki..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1237 mail/mail-config.glade.h:101
-#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
-#: ui/evolution.xml.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1476 mail/folder-browser.c:1319
+#: mail/mail-config.glade.h:93 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
 msgid "_Delete"
-msgstr "_Zbriši"
+msgstr "_ZbriĹĄi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "O_ddelek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Polno Ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Doma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
-msgstr "Službeni _naziv:"
+msgstr "SluĹžbeni _naziv:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Ime _managerja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "Pi_sarna:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Poklic:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_Partner(ka):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
-msgstr "_To je poštni naslov"
+msgstr "_To je poĹĄtni naslov"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Web page address:"
+msgstr "Naslov _spletne strani:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "ZbriĹĄi stik?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:725
 msgid "This contact belongs to these categories:"
-msgstr "Stik pripada sledečim kategorijam:"
+msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1543
+#: addressbook/gui/widgets/e-addressbook-view.c:809
 msgid "Assistant"
-msgstr "Pomočnik"
+msgstr "Pomočnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1544
+#: addressbook/gui/contact-editor/e-contact-editor.c:1611
 msgid "Business"
-msgstr "Služba"
+msgstr "SluĹžba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1545
 msgid "Business 2"
-msgstr "Služba"
+msgstr "SluĹžba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1546
+#: addressbook/gui/widgets/e-addressbook-view.c:789
 msgid "Business Fax"
-msgstr "Službeni faks"
+msgstr "SluĹžbeni faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1547
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1548
 msgid "Car"
 msgstr "Avto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1549
 msgid "Company"
 msgstr "Podjetje"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1550
+#: addressbook/gui/contact-editor/e-contact-editor.c:1612
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1551
 msgid "Home 2"
 msgstr "Doma 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1552
+#: addressbook/gui/widgets/e-addressbook-view.c:790
 msgid "Home Fax"
-msgstr "Domači faks"
+msgstr "Domači faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1553
+#: addressbook/gui/widgets/e-addressbook-view.c:793
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1554
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor.c:1555
+#: addressbook/gui/contact-editor/e-contact-editor.c:1613
+#: mail/mail-config.glade.h:50
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1556
+#: addressbook/gui/widgets/e-addressbook-view.c:795
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/widgets/e-addressbook-view.c:796
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1558
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1559
+#: addressbook/gui/widgets/e-addressbook-view.c:797
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1560
+#: addressbook/gui/widgets/e-addressbook-view.c:798
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:727
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
-#: addressbook/gui/widgets/e-addressbook-view.c:728
-msgid "Email 3"
-msgstr "E-naslov 3"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Zbriši stik?"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Uredi celoto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:776
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
-msgstr "E-pošta"
+msgstr "E-poĹĄta"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s Ĺže obstaja\n"
+"Jo Ĺželite prepisati?"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
@@ -646,7 +1017,7 @@ msgstr "Preveri naslov"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
-msgstr "Drža_va:"
+msgstr "DrĹža_va:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
@@ -666,15 +1037,15 @@ msgstr "_Mesto:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
-msgstr "_Poštni predal:"
+msgstr "_PoĹĄtni predal:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
-msgstr "_Država/Provinca:"
+msgstr "_DrĹžava/Provinca:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
-msgstr "_Poštna številka:"
+msgstr "_PoĹĄtna ĹĄtevilka:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
@@ -706,7 +1077,7 @@ msgstr "Ml."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
-msgstr "Gdč."
+msgstr "Gdč."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
@@ -744,374 +1115,35 @@ msgstr "P_ripona:"
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "Vpišite geslo za %s"
-
-#: addressbook/gui/component/addressbook.c:373
-msgid "Unable to open addressbook"
-msgstr "Kliknite tu za odprtje adresarja"
-
-#: addressbook/gui/component/addressbook.c:380
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
-msgstr ""
-"Ne morem odpreti tega adresarja. To pomeni, da \n"
-"ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
-
-#: addressbook/gui/component/addressbook.c:385
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Ta različica Evolucije nima vgrajene podpore za LDAP.\n"
-"Če želite v Evoluciji uporabljati LDAP, morate po tem,\n"
-"ko boste s spodnje povezave prenesli program OpenLDAP,\n"
-"Evolucijo prevesti iz izvorne kode CVS.\n"
-
-#: addressbook/gui/component/addressbook.c:393
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
-"pot obstaja in ali imate dovoljenje za dostop."
-
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
-msgid "Any field contains"
-msgstr "Katerokoli polje vsebuje"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Name contains"
-msgstr "Ime vsebuje"
-
-#: addressbook/gui/component/addressbook.c:556
-msgid "Email contains"
-msgstr "E-naslov vsebuje"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
-msgstr "Kategorija vsebuje"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ki naj ga prikaže brskalnik map"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Strežnik LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Datoteka"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Neznan tip adresarja"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Brez (anonimni način)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
-msgid "Password"
-msgstr "Geslo"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Neznan način avtentifikacije"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Osnovno"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Ena"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Poddrevo"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Neznan tip dosega"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Povezan z domeno:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Bind DN Help text here"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:72
-msgid "Remember this password"
-msgstr "Zapomni si geslo"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
-msgid "Host:"
-msgstr "Gostitelj:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Host help text here."
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Kornsko ime domene:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root DN help text here."
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Vrata:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Port help text here."
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Doseg iskanja:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Avtentifikacija:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Napredne možnosti LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
-msgid "Path:"
-msgstr "Pot:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Path help text here"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Če pot ne obstaja jo ustvari."
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Uredi adresar"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Dodaj adresar"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Izberite tip adresarja, ki ga imate in vnestite potrebne podatke o njem."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53
-msgid "Name:"
-msgstr "Ime:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME Name help text here"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Opis:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME Description help text here"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Viri adresarja"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
-msgid "Delete"
-msgstr "Zbriši"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Uredi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Ime"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Drugo stiki"
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(brez)"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "List _name:"
+msgstr "_Ime seznama::"
 
-#: addressbook/gui/component/e-address-popup.c:579
-msgid "Select an Action"
-msgstr "Izberi dejanje"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
+msgstr "Člani"
 
-#: addressbook/gui/component/e-address-popup.c:585
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Ustvari nov stik \"%s\""
-
-#: addressbook/gui/component/e-address-popup.c:597
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj naslov k obstoječemu stiku \"%s\""
-
-#: addressbook/gui/component/e-address-popup.c:859
-msgid "Querying Addressbook..."
-msgstr "Poizvedujem v adresarju..."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr "VpiĹĄite e-poĹĄtni naslov ali potegnite skik na spodnji seznam:"
 
-#: addressbook/gui/component/e-address-popup.c:916
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:276
-msgid "Edit Contact Info"
-msgstr "Uredi podatke stika"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr "_Skrij naslove ob poĹĄiljanju poĹĄte na ta seznam"
 
-#: addressbook/gui/component/e-address-popup.c:946
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:342
-msgid "Add to Contacts"
-msgstr "Dodaj k stikom"
-
-#: addressbook/gui/component/e-address-popup.c:989
-msgid "Merge E-Mail Address"
-msgstr "Zlij E-poštne naslove"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Izključi poizvedbe"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Vključi poizvedbe (nevarno!)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Kontrola Bonobo za vznik naslova."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Kontrola Bonobo za prikaz naslova."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Vzorčna kontrola Bonobo, ki prikaže adresar."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrola, ki prikaže mini vizitko iz Evolucijinega adresarja."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Evolucijina komponenta za urejanje stikov."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Tovarna za orodje mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Tovarna za prikazovalnik adresarjeve adrese"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Tovarna za Adresarjev vznik naslova"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Tovarna za Evolucijino komponento adresarja."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Tovarna za vzorčno kontrolo adresarja"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:267 shell/e-shortcuts-view.c:470
-msgid "Remove"
-msgstr "Odstrani"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-msgid "Remove All"
-msgstr "Odstrani vse"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
-msgid "Send HTML Mail?"
-msgstr "Pošlji pošto v obliki HTML?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Prejemniki sporočila"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Izberi imena"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "Izberi ime iz _mape:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
+msgid "_Remove"
+msgstr "_Odstrani"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "_Category:"
-msgstr "_Kategorija:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
+msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "I_skanje"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+msgid "Contact List Editor"
+msgstr "Urejevalnik stikov"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
@@ -1135,8 +1167,8 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Ime ali e-poštni naslov tega stika že obstaja v tej mapi.\n"
-"Ga želite vseeno dodati?"
+"Ime ali e-poĹĄtni naslov tega stika Ĺže obstaja v tej mapi.\n"
+"Ga Ĺželite vseeno dodati?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 msgid "Change Anyway"
@@ -1155,11 +1187,16 @@ msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Spremenjeno ime ali e-poštni naslov tega stika že\n"
-"obstaja v tej mapi. Ga želite vseeno dodati?"
+"Spremenjeno ime ali e-poĹĄtni naslov tega stika Ĺže\n"
+"obstaja v tej mapi. Ga Ĺželite vseeno dodati?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "Napredno iskanje"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Iskanje"
 
@@ -1271,168 +1308,248 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:1286
+#: ui/evolution-addressbook.xml.h:18
 msgid "Save as VCard"
 msgstr "Shrani kot eVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Odpri"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send contact to other"
-msgstr "Pošlji stik drugim"
+msgstr "PoĹĄlji stik drugim"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
-msgstr "Stiku pošlji sporočilo"
+msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
+#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Natisni"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:283
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "ZbriĹĄi"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr "Uspeh"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1638
+#: shell/e-storage.c:503
+msgid "Unknown error"
+msgstr "Neznana napaka"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr "Skladišče, ki ni na mreži"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+msgid "Permission denied"
+msgstr "Nimate dovoljenja"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr "Vizitka ni bila najdena"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr "ID vizitke Ĺže obstaja"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr "Protokol ni podprt"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
+#: camel/camel-service.c:580
+msgid "Cancelled"
+msgstr "preklicano"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr "Drugačna napaka"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr "Napaka ob dodajanju seznama"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr "Napaka ob dodajanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr "Napaka ob spreminjanju seznama"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+msgid "Error removing list"
+msgstr "Napaka ob odstranjevanju seznama"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1159
+msgid "Error removing card"
+msgstr "Napaka ob odstranjevanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:774
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:775
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:777
 msgid "Email"
-msgstr "E-pošta"
+msgstr "E-poĹĄta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:778
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:779
 msgid "Assistant Phone"
-msgstr "Pomožni telefon"
+msgstr "PomoĹžni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:780
 msgid "Business Phone"
-msgstr "Službebni telefon"
+msgstr "SluĹžbebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:781
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:782
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:783
 msgid "Home Phone"
-msgstr "Domač telefon"
+msgstr "Domač telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:784
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Business Address"
-msgstr "Službeni naslov"
+msgstr "SluĹžbeni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:786
 msgid "Home Address"
-msgstr "Domači naslov"
+msgstr "Domači naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:787
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:788
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:791
 msgid "Business Phone 2"
-msgstr "Službeni telefon 2"
+msgstr "SluĹžbeni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:792
 msgid "Home Phone 2"
-msgstr "Domač telefon 2"
+msgstr "Domač telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:794
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:799
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "Other Address"
 msgstr "Drug naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:803
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Department"
 msgstr "Oddelek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:806
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Profession"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:811
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:812
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:813
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1156
 msgid "Done."
 msgstr "Opravljeno."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-msgid "Error removing card"
-msgstr "Napaka ob odstranjevanju vizitke"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1188
 msgid "Removing cards..."
 msgstr "Odstranjujem vizitke..."
 
-#: addressbook/gui/widgets/e-minicard.c:451
-msgid "Error modifying card"
-msgstr "Napaka ob spreminjanju vizitke"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
@@ -1449,7 +1566,7 @@ msgstr ""
 "\n"
 "V tem pogledu ni predmetov za prikaz\n"
 "\n"
-"Če želite ustvariti nov stik, dvojno kliknite tu.."
+"Če želite ustvariti nov stik, dvojno kliknite tu.."
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
@@ -1480,8 +1597,8 @@ msgid "Dimensions:"
 msgstr "Mere:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Pisava..."
+msgid "F_ont..."
+msgstr "_Pisava..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
@@ -1509,11 +1626,11 @@ msgstr "Zaglavja"
 
 #: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
-msgstr "Zaglavja za vsako črko"
+msgstr "Zaglavja za vsako črko"
 
 #: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
-msgstr "Višina:"
+msgstr "ViĹĄina:"
 
 #: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
@@ -1521,11 +1638,11 @@ msgstr "Si sledijo takoj"
 
 #: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
-msgstr "Vključi:"
+msgstr "Vključi:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
-msgstr "Ležeče"
+msgstr "Ležeče"
 
 #: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
@@ -1533,7 +1650,7 @@ msgstr "Levo:"
 
 #: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
-msgstr "Uhlji črk ob strani"
+msgstr "Uhlji črk ob strani"
 
 #: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
@@ -1541,11 +1658,11 @@ msgstr "Robovi"
 
 #: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
-msgstr "Število stolpcev:"
+msgstr "Ĺ tevilo stolpcev:"
 
 #: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
-msgstr "Možnosti"
+msgstr "MoĹžnosti"
 
 #: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
@@ -1569,7 +1686,7 @@ msgstr "Vir papirja:"
 
 #: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
-msgstr "Pokončno"
+msgstr "Pokončno"
 
 #: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
@@ -1577,7 +1694,7 @@ msgstr "Predogled:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
-msgstr "Tiskaj z uporabo sivinskega senčenja"
+msgstr "Tiskaj z uporabo sivinskega senčenja"
 
 #: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
@@ -1593,7 +1710,7 @@ msgstr "Sekcije:"
 
 #: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
-msgstr "Senčenje"
+msgstr "Senčenje"
 
 #: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
@@ -1601,7 +1718,7 @@ msgstr "Velikost:"
 
 #: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
-msgstr "Začni na novi strani"
+msgstr "Začni na novi strani"
 
 #: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
@@ -1617,39 +1734,76 @@ msgstr "Tip:"
 
 #: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
-msgstr "Širina:"
+msgstr "Ĺ irina:"
+
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr "_Pisava..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.c:1091
+msgid "Print cards"
+msgstr "Natisni vizitke"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+msgid "Print card"
+msgstr "Natisni vizitko"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+msgid "Print envelope"
+msgstr "Natisni kuverto"
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
-msgstr "Napaka ob komuniciranju s strežnikom koledarja"
+msgstr "Napaka ob komuniciranju s streĹžnikom koledarja"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
-msgid "Reminder of your appointment at "
-msgstr "Opomin na zmenek ob "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Kontrola Bonobo, ki prikaĹže koledar."
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-msgid "Snooze"
-msgstr "Podaljšek spanja"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolucijina komponenta za povzetke."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
-msgid "Ok"
-msgstr "V redu"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolucijin pregledovalnik iTip/iMip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Komponenta Evolucije za urejanje koledarja."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Tovarna komponent za povzetke koledarja."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Tovarna komponent Evolucije za urejanje koledarja."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Tvoarna za orodje koledarja iTip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Vzorčna tovarna za kontrolo koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Tovarna za centralzacijo dialogov urejevalnika komponent koledarja."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1659,86 +1813,84 @@ msgstr "Storitev opozorilnega alarma"
 msgid "Factory for the alarm notification service"
 msgstr "Tovarna za storitev opozorlinega alarma"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
-msgstr "Obvestilo o vašem zmenku, ki se začne ob %s in konča ob %s"
+msgstr "Obvestilo o vašem sestanku, ki se začne ob %s in konča ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
-msgstr "Obvestilo o vašem zmenku, ki se začne ob %s"
+msgstr "Obvestilo o vašem sestanku, ki se začne ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
-msgstr "Obvestilo o vašem zmenku, ki se konča ob %s"
+msgstr "Obvestilo o vašem sestanku, ki se konča ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
-msgstr "Obvestilo o vašem zmenku"
+msgstr "Obvestilo o vaĹĄem sestanku"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
-msgstr "Obvestilo o vašem opravilu, ki se konča ob %s in konča ob %s"
+msgstr "Obvestilo o vašem opravilu, ki se konča ob %s in konča ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, c-format
 msgid "Notification about your task starting on %s"
-msgstr "Obvestilo o vašem opravilu, ki se začne ob %s"
+msgstr "Obvestilo o vašem opravilu, ki se začne ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, c-format
 msgid "Notification about your task ending on %s"
-msgstr "Obvestilo o vašem opravilu, ki se konča ob %s"
+msgstr "Obvestilo o vašem opravilu, ki se konča ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
-msgstr "Obvestilo o vašem opravilu"
+msgstr "Obvestilo o vaĹĄem opravilu"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
-#, c-format
-msgid "Notification about your journal entry starting on %s and ending on %s"
-msgstr "Obvestilo o vašem dnevniškem vpisu, ki se začne ob %s in konča ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
-#, c-format
-msgid "Notification about your journal entry starting on %s"
-msgstr "Obvestilo o vašem dnevniškem vpisu, ki se začne ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
-#, c-format
-msgid "Notification about your journal entry ending on %s"
-msgstr "Obvestilo o vašem dnevniškem vpisu, ki se konča ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
-msgid "Notification about your journal entry"
-msgstr "Obvestilo o vašem dnevniškem vpisu"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm na %A %d %b %Y ob %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
-msgid "No summary available."
-msgstr "Povzetek ni na voljo."
-
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Zapri"
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Zapri"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Uredi zmenek"
+msgid "Snoo_ze"
+msgstr "Podal_jĹĄek spanja"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
-msgstr "Čas podaljška spanja (minut)"
+msgstr "Čas podaljška spanja (minut)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+msgid "_Edit appointment"
+msgstr "_Uredi sestanek"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr "Opis ni na voljo."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Opomin na sestanek ob "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "PodaljĹĄek spanja"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "V redu"
 
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
@@ -1746,13 +1898,13 @@ msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
-"Ura je %s. Trenutni Unix čas je %ld. Mislili smo, da bi vas lahko zanimalo."
+"Ura je %s. Trenutni Unix čas je %ld. Mislili smo, da bi vas lahko zanimalo."
 
 #: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Nisem mogel inicializirati GNOMEa"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 msgid "Could not initialize gnome-vfs"
 msgstr "Nisem mogel inicializirati gnome-vfs"
 
@@ -1760,128 +1912,137 @@ msgstr "Nisem mogel inicializirati gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/calendar-commands.c:277
-msgid "File not found"
-msgstr "Datoteke ni mogoče najti"
+#: calendar/gui/calendar-commands.c:405
+msgid "%A %d %B %Y"
+msgstr "%A, %d %B %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/calendar-commands.c:426
+msgid "%d"
+msgstr "%d"
 
-#: calendar/gui/calendar-commands.c:301
-msgid "Open calendar"
-msgstr "Odpri koledar"
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: calendar/gui/calendar-commands.c:343
-msgid "Save calendar"
-msgstr "Shrani koledar"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:545
+#: calendar/gui/calendar-commands.c:581
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a "
 "in OAF-a."
 
-#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:974
-#: calendar/gui/e-calendar-table.c:426
-msgid "Public"
-msgstr "javno"
-
-#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
+#: calendar/gui/e-calendar-table.c:307
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:334
-#: calendar/gui/dialogs/alarm-page.c:370
-#: camel/providers/smtp/camel-smtp-transport.c:222
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "neznano"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "javno"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:620
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "visoka"
 
-#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
-#: calendar/gui/calendar-model.c:1675
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:619
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
-msgstr "običajna"
+msgstr "običajna"
 
-#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:618
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "nizka"
 
-#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
-#: calendar/gui/e-calendar-table.c:502
-msgid "Transparent"
-msgstr "Prozorno"
+#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+msgid "Free"
+msgstr "Prost"
 
-#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
-#: calendar/gui/e-calendar-table.c:501
-msgid "Opaque"
-msgstr "Prosojno"
+#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Zaseden"
 
-#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
-#: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:522
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
-msgstr "ni pričeto"
+msgstr "ni pričeto"
 
-#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:523
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:524
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
-msgstr "končano"
-
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
-#: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
-#: camel/camel-service.c:580
-msgid "Cancelled"
-msgstr "preklicano"
+msgstr "končano"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:878
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1892,23 +2053,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:958
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr "Uvrstitev mora biti 'Javno', 'Zastebno', 'Zaupno' ali 'Brez'"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
-#: calendar/gui/calendar-model.c:1258 calendar/gui/e-calendar-table.c:425
-#: calendar/gui/e-calendar-table.c:500 mail/mail-account-gui.c:1295
-#: mail/mail-accounts.c:129 mail/mail-accounts.c:380
-#: mail/mail-config.glade.h:56 shell/e-shell-view.c:1397
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:439
-#: widgets/misc/e-dateedit.c:1369 widgets/misc/e-dateedit.c:1484
-msgid "None"
-msgstr "brez"
-
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1918,164 +2063,274 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1094
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
+msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
 
-#: calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "Prioriteta mora biti 'Visoka', 'Običajna', 'Nizka' ali 'Nedefinirana'."
+msgstr "Prioriteta mora biti 'Visoka', 'Običajna', 'Nizka' ali 'Nedefinirana'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1148
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:451
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: calendar/gui/calendar-model.c:1189
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "Prosojnost mora biti 'Prozorno', 'Prosojno' ali 'Brez'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:390
+#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1386
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-dateedit.c:1356 widgets/misc/e-dateedit.c:1471
+msgid "None"
+msgstr "brez"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1679
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
-msgstr "Določena"
+msgstr "Določena"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Ne"
 
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+msgid "Day View"
+msgstr "Dnevni pogled"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
+msgstr "Pogled delavnega tedna"
+
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
+msgstr "Tedenski pogled"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
+msgstr "Mesečni pogled"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "Povzetek vsebuje"
+
+#: calendar/gui/cal-search-bar.c:57
+msgid "Description contains"
+msgstr "Opis vsebuje"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "Komentar vsebuje"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr "Brez zadetka"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
-msgstr "URI, ki naj ga prikaže brskalnik map"
+msgstr "URI, ki naj ga prikaĹže brskalnik map"
+
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
+msgstr "Možnosti zvočnega alarma"
+
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
+msgstr "možnosti alrama sporočil"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
+msgstr "MoĹžnosti alarma poĹĄte"
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr "MoĹžnosti alarma programa"
+
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr "Neznane moĹžnosti alarma"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr "Ponovitev alarma"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr "FIXME: moĹžnosti alarma poĹĄte"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
+msgstr "Sporočila za prikaz"
 
-#: calendar/gui/dialogs/alarm-page.c:269
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
+msgstr "Predvajaj zvok:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr "Ponovi alarm"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
+msgstr "PoĹženi program:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr "S temi argumenti:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dni"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr "dodatnih ponovitev vsakih"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "ur"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minut"
+
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:271
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 dan"
 
-#: calendar/gui/dialogs/alarm-page.c:274
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d tednov"
 
-#: calendar/gui/dialogs/alarm-page.c:276
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 teden"
 
-#: calendar/gui/dialogs/alarm-page.c:279
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d ur"
 
-#: calendar/gui/dialogs/alarm-page.c:281
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 ura"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:316
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: calendar/gui/dialogs/alarm-page.c:320
-msgid "Show a dialog"
-msgstr "Kaži dialog"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr "Kaži sporočilo"
 
-#: calendar/gui/dialogs/alarm-page.c:324
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
-msgstr "Pošlji e-pošto"
+msgstr "PoĹĄlji e-poĹĄto"
 
-#: calendar/gui/dialogs/alarm-page.c:328
-#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
-msgstr "Poženi program"
+msgstr "PoĹženi program"
+
+#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "neznano"
 
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid " before start of appointment"
-msgstr " pred pričetkom zmenka"
+#: calendar/gui/dialogs/alarm-page.c:361
+msgid "before start of appointment"
+msgstr "pred pričetkom sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:349
-msgid " after start of appointment"
-msgstr " po pričetku zmenka"
+#: calendar/gui/dialogs/alarm-page.c:364
+msgid "after start of appointment"
+msgstr "po pričetku sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:359
-msgid " before end of appointment"
-msgstr " pred koncem zmenka"
+#: calendar/gui/dialogs/alarm-page.c:374
+msgid "before end of appointment"
+msgstr "pred koncem sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:362
-msgid " after end of appointment"
-msgstr " po koncu zmenka"
+#: calendar/gui/dialogs/alarm-page.c:377
+msgid "after end of appointment"
+msgstr "po koncu sestanka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Osnove"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:293
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
 msgstr "Datum/ura:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-msgid "Display a message"
-msgstr "Kaži sporočilo"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Options..."
-msgstr "Možnosti..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
-msgstr "Opozorila"
+msgstr "Opomnilniki"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+msgid "_Options..."
+msgstr "_MoĹžnosti..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "pred"
 
@@ -2086,19 +2341,19 @@ msgstr "dni"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
-msgstr "konec zmenka"
+msgstr "konec sestanka"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:114
 msgid "minute(s)"
 msgstr "minut"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
-msgstr "pričetek zmenka"
+msgstr "pričetek sestanka"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -2109,332 +2364,717 @@ msgid "10 minutes"
 msgstr "10 minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 urna (dop./pop.)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 urna"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minut"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "Calendar and Tasks Settings"
+msgstr "Nastavitve koledarja in nalog"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr "Barva za opravila, katerim je rok Ĺže pretekel"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Pozvoni, ko se pokažejo okna alarmov."
+msgid "Color for tasks due today"
+msgstr "Barva za opravila, ki so na vrsti danes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9 shell/e-shortcuts.c:1001
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Koledar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Create new appointments with a default _reminder"
+msgstr "Ustvari nove sestanke s privzetim _opomnilnikom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "Nastavitve koledarja"
+msgid "Days"
+msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr "Barva za opravila, katerim je rok že pretekel"
+msgid "First day of wee_k:"
+msgstr "Prvi dan ted_na:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr "Barva za opravila, ki so na vrsti danes"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "petek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr "Barve za opravila"
+msgid "Hours"
+msgstr "Ur"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
-msgstr "Skrči vikende v mesečnem pogledu"
+msgid "Minutes"
+msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
-msgstr "Navigator po datumih"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "ponedeljek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Privzeto"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "sobota"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
-msgid "Display"
-msgstr "Prikaz"
+msgid "Show appointment _end times in week and month views"
+msgstr "Kaži čase _koncev sestankov v tedenskih in mesečnih pogledih"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Konec dneva:"
+msgid "Show week _numbers in date navigator"
+msgstr "KaĹži ĹĄtevilke tednov v navigatorju po dnevih"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "Prvi dan tedna:"
+msgid "Sta_rt of day:"
+msgstr "Zače_tek dneva:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "pet"
+msgid "Su_n"
+msgstr "_ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:963
-msgid "Friday"
-msgstr "petek"
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "nedeljo"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "T_hu"
+msgstr "č_et"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "pon"
+msgid "T_ue"
+msgstr "_tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:959
-msgid "Monday"
-msgstr "ponedeljek"
+msgid "Tas_ks due today:"
+msgstr "Nalo_ge z danaĹĄnjim rokom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr "Možnosti obveščanja"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "četrtek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
-msgstr "Predmeti s prekoračenim rokom"
+msgid "Time"
+msgstr "Čas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Opomni me na vse zmenke"
+msgid "Time _zone:"
+msgstr "Časovni _pas:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Time di_visions:"
+msgstr "Časovne _delitve:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "sob"
+msgid "Time format:"
+msgstr "Oblika izpisa časa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:964
-msgid "Saturday"
-msgstr "sobota"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "torek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Show appointment end times in week and month views"
-msgstr "Kaži čase koncev zmenkov v tedenskih in mesečnih pogledih"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "sreda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Kaži številke tednov"
+#: ui/evolution-calendar.xml.h:30
+msgid "Work Week"
+msgstr "Delavni teden"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Začetek dneva:"
+msgid "_12 hour (am/pm)"
+msgstr "_12 urna (dop./pop.)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "ned"
+msgid "_24 hour"
+msgstr "_24 urna"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Sunday"
-msgstr "nedeljo"
+msgid "_Ask for confirmation when deleting items"
+msgstr "_VpraĹĄaj za potrditev ob brisanju predmetov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Task List"
-msgstr "Seznam nalog"
+msgid "_Compress weekends in month view"
+msgstr "_Skrči vikende v mesečnem pogledu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
-msgstr "Naloge z današnjim rokom"
+msgid "_Display"
+msgstr "_Prikaz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "čet"
+msgid "_End of day:"
+msgstr "_Konec dneva:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:962
-msgid "Thursday"
-msgstr "četrtek"
+msgid "_Fri"
+msgstr "_pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Time"
-msgstr "Čas"
+msgid "_General"
+msgstr "_SploĹĄno"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Časovne delitve:"
+msgid "_Mon"
+msgstr "po_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Oblika izpisa časa:"
+msgid "_Other"
+msgstr "_Drugo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Time zone:"
-msgstr "Časovni pas:"
+msgid "_Overdue tasks:"
+msgstr "Naloge s p_rekoračenim rokom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "tor"
+msgid "_Sat"
+msgstr "so_b"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:960
-msgid "Tuesday"
-msgstr "torek"
+msgid "_Task List"
+msgstr "Seznam _nalog"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "sre"
+msgid "_Wed"
+msgstr "_sre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:961
-msgid "Wednesday"
-msgstr "sreda"
+msgid "before the start of the appointment"
+msgstr "pred pričetkom sestanka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Work Week"
-msgstr "Delavni teden"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr "Stanje sestanka se je spremenilo. Pošlji posodobljeno različico?"
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Ste prepričani, da želite preklicati in zbrisati to opravilo?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Ste prepričani, da želite preklicati in zbrisati ta dnevniški vpis?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr "Ta dogodek je bil zbrisan."
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr "To opravilo je bilo zbrisano."
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr "Ta dnevniĹĄki vpis je bil zbrisan."
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr "%s  Naredili ste spremembe. Prekliči spremembe in zapri urejevalnik?"
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr "%s  Ničesar niste spremenili, zapri urejevalnik?"
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr "Ta dogodek je bil spremenjen."
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr "Ta posel je bil spremenjen."
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr "Ta dnevniĹĄki vpis je bil spremenjen."
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr "%s  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
+
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
+msgid " (Completed "
+msgstr " (Končano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr "končano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr " (Rok "
+
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
+msgid "Due "
+msgstr "Rok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "minut preden se zgodijo."
+#: calendar/gui/dialogs/comp-editor-util.c:273
+#: calendar/gui/dialogs/comp-editor-util.c:329 shell/e-local-storage.c:174
+#: shell/e-shortcuts.c:1026
+msgid "Contacts"
+msgstr "Stik"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+msgid "Edit Appointment"
+msgstr "Uredi sestake"
+
+#: calendar/gui/dialogs/comp-editor.c:459
+#, c-format
+msgid "Appointment - %s"
+msgstr "Sestanek - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:462
+#, c-format
+msgid "Task - %s"
+msgstr "Naloga - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:465
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Vpis v dnevniku - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:479
+msgid "No summary"
+msgstr "Ni povzetka"
+
+#: calendar/gui/dialogs/comp-editor.c:849 mail/mail-callbacks.c:1485
+#: mail/mail-display.c:99
+msgid "Overwrite file?"
+msgstr "PrepiĹĄi datoteko?"
+
+#: calendar/gui/dialogs/comp-editor.c:853 mail/mail-callbacks.c:1491
+#: mail/mail-display.c:103
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Datoteka z enakim imenom Ĺže obstaja.\n"
+"Naj jo prepiĹĄem?"
+
+#: calendar/gui/dialogs/comp-editor.c:916 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Shrani kot..."
+
+#: calendar/gui/dialogs/comp-editor.c:1069
+msgid "Unable to obtain current version!"
+msgstr "Ne morem dobiti trenutne različice!"
 
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Ste prepričani, da želite zbrisati ta zmenek `%s'?"
+msgstr "Ste prepričani, da želite zbrisati ta sestanek `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Ste prepričani, želite zbrisati ta neimenovan zmenek?"
+msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
 
 #: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
+msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
-msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
+msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
 
 #: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
+msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Ste prepričani, da želite izbrisati ta neimenovan dnevniški vpis?"
+msgstr "Ste prepričani, da želite izbrisati ta neimenovan dnevniški vpis?"
 
 #: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
-msgstr "Ste prepričani, da želite zbrisati %d zmenkov?"
+msgstr "Ste prepričani, da želite zbrisati %d sestankov?"
 
 #: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
-msgstr "Ste prepričani, da želite zbrisati %d opravil?"
+msgstr "Ste prepričani, da želite zbrisati %d opravil?"
 
 #: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
+msgstr "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+msgid "Addressbook..."
+msgstr "Adresar..."
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+msgid "Delegate To:"
+msgstr "Delegirano komu:"
 
-#: calendar/gui/dialogs/event-editor.c:136
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+msgid "Enter Delegate"
+msgstr "Vnesi delegata"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Izberi časovni pas"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Izbira"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Časovni pasovi"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Uporabite lev miškin gumb za povečavo območja zemljevida in izbiro časovnega pasu.\n"
+" Uporabite desni miĹĄkin gumb za pomanjĹĄavo."
+
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
-msgstr "Zmenek"
+msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:141
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
-msgstr "Opozorilo"
+msgstr "Opomnilnik"
 
-#: calendar/gui/dialogs/event-editor.c:146
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
-msgstr "Srečanje"
+msgstr "Sestanek"
 
 #: calendar/gui/dialogs/event-page.glade.h:1
 msgid "A_ll day event"
 msgstr "_Celodnevni dogodek"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:248
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "B_usy"
+msgstr "_Zaseden"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Uvrstitev"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "Con_fidential"
+msgstr "_Zaupno"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Datum in ura"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+msgid "F_ree"
+msgstr "P_rost"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vatno"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Show Time As"
+msgstr "Kaži čas kot"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "_Povzetek:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Zaupno"
-
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "_Stiki..."
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
-msgstr "_Čas konca:"
+msgstr "_Čas konca:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
-msgstr "_Čas pričetka:"
+msgstr "_Čas pričetka:"
+
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
+msgid "Individual"
+msgstr "Individualno"
+
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
+msgid "Group"
+msgstr "Skupina"
+
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
+msgid "Resource"
+msgstr "Vir"
+
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
+msgid "Room"
+msgstr "Soba"
+
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
+msgid "Chair"
+msgstr "Stol"
+
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Required Participant"
+msgstr "Potrebni udeleĹženci"
+
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
+msgid "Optional Participant"
+msgstr "Možni sodelujoči"
+
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
+msgid "Non-Participant"
+msgstr "Ne-sodelujoči"
+
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
+msgid "Needs Action"
+msgstr "Potrebuje dejanje"
+
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
+msgid "Accepted"
+msgstr "Sprejeto"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Custom recurrence"
-msgstr "Ponovitev po meri"
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
+msgid "Declined"
+msgstr "Zavrnjeno"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Poskusno"
+
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
+msgid "Delegated"
+msgstr "Delegirano"
+
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
+msgid "In Process"
+msgstr "V obdelavi"
+
+#: calendar/gui/dialogs/meeting-page.c:737
+msgid "That person is already attending the meeting!"
+msgstr "Ta oseba se je Ĺže udeleĹženec sestanka!"
+
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
+msgid "Chair Persons"
+msgstr "Predsedujoči"
+
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
+msgid "Required Participants"
+msgstr "Potrebni udeleĹženci"
+
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
+msgid "Optional Participants"
+msgstr "MoĹžni udeleĹženci"
+
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
+msgid "Non-Participants"
+msgstr "Ne-udeleĹženci"
+
+#: calendar/gui/dialogs/meeting-page.c:920
+msgid "Sent By:"
+msgstr "Poslano od:"
+
+#: calendar/gui/dialogs/meeting-page.c:1471
+msgid "_Delegate To..."
+msgstr "_Delegiraj komu..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "UdeleĹžen"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
+msgstr "SploĹĄno ime"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+msgid "Delegated From"
+msgstr "Delegirano od"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+msgid "Delegated To"
+msgstr "Delegirano komu:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
+msgstr "Jezik"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
+msgstr "Član"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Vloga"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Stanje"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:84
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Vrsta"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
+msgstr "_Spremeni organizatorja"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
+msgstr "_Povabi ostale"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
+msgstr "_Drug organizator"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Ta sestanek vsebuje ponovitve, ki jih Evolucija ne zna urejati."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "na"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dan"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "na"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "4."
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "pojavitve"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
+msgstr "_Dodaj"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Vsak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Izjeme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "Spremeni"
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Preview"
+msgstr "Predogled"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Recurrence Rule"
+msgstr "Pravilo ponovitev"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "No recurrence"
-msgstr "Ni ponovitev"
+msgid "_Custom recurrence"
+msgstr "_Poljubna ponovitev"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "Preview"
-msgstr "Predogled"
+msgid "_Modify"
+msgstr "_Spremeni"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "Recurrence Rule"
-msgstr "Pravilo ponovitev"
+msgid "_No recurrence"
+msgstr "_Brez ponovitve"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-msgid "Simple recurrence"
-msgstr "Enostavna ponovitev"
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Simple recurrence"
+msgstr "_Enostavna ponovitev"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
@@ -2460,418 +3100,453 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/dialogs/recurrence-page.c:412 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:560
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
-
-#: calendar/gui/dialogs/recurrence-page.c:932
-msgid "on"
-msgstr "na"
-
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dan"
-
-#: calendar/gui/dialogs/recurrence-page.c:1088
-msgid "on the"
-msgstr "na"
-
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/dialogs/recurrence-page.c:1266
-msgid "occurrences"
-msgstr "pojavitve"
-
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
-msgstr "Želite shraniti spremembe"
+msgstr "Želite shraniti spremembe"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
-msgstr "Končano dne:"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-msgid "Delegated From:"
-msgstr "Delegirano od:"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr "Podatki o sestanku so se spremenili. Pošlji posodobljeno različico?"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Delegated To:"
-msgstr "Delegirano komu:"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-msgid "No one"
-msgstr "Nikomur"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr "Podatki o nalogi so se spremenili. Pošlji posodobljeno različico?"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr "Dnevniški zapis se je spremenil. Pošlji posodobljeno različico?"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Naloga"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
+msgid "% Complete"
+msgstr "% končano"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% konča_no:"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Končano dne:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Napredek"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
-msgid "Sta_rt Date:"
-msgstr "Datum _pričetka:"
-
-#: calendar/gui/dialogs/task-page.glade.h:21
-msgid "_Due Date:"
-msgstr "_Do datuma:"
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Prioriteta:"
 
-#: calendar/gui/dialogs/task-page.glade.h:23
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/e-calendar-table.c:247
-msgid "Categories"
-msgstr "kategorije"
-
-#: calendar/gui/e-calendar-table.c:249
-msgid "Completion Date"
-msgstr "Datum zaključka"
-
-#: calendar/gui/e-calendar-table.c:250
-msgid "End Date"
-msgstr "Datum konca"
-
-#: calendar/gui/e-calendar-table.c:251
-msgid "Start Date"
-msgstr "Datum pričetka"
-
-#: calendar/gui/e-calendar-table.c:252
-msgid "Due Date"
-msgstr "Do datuma"
-
-#: calendar/gui/e-calendar-table.c:253
-msgid "Geographical Position"
-msgstr "Zemljepisna lega"
-
-#: calendar/gui/e-calendar-table.c:254
-msgid "Percent complete"
-msgstr "Procentov opravljeno"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+msgid "Assignment"
+msgstr "Dodelitev"
 
-#: calendar/gui/e-calendar-table.c:255
-msgid "Priority"
-msgstr "Prioriteta"
-
-#: calendar/gui/e-calendar-table.c:256
-msgid "Summary"
-msgstr "Povzetek"
-
-#: calendar/gui/e-calendar-table.c:257
-msgid "Transparency"
-msgstr "Prosojnost"
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Opis:"
 
-#: calendar/gui/e-calendar-table.c:258
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Sta_rt Date:"
+msgstr "Datum _pričetka:"
 
-#: calendar/gui/e-calendar-table.c:259
-msgid "Alarms"
-msgstr "Alarmi"
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Zaupno"
 
-#: calendar/gui/e-calendar-table.c:260
-msgid "Click here to add a task"
-msgstr "Kliknite tu za dodajo opravila"
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "_Due Date:"
+msgstr "_Do datuma:"
 
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:474
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:475
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:477
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:478
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:479
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:957
-msgid "Edit this task"
-msgstr "Uredi to opravilo"
+#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1284
+msgid "_Open"
+msgstr "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3315 calendar/gui/e-week-view.c:3158
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Izreži"
+#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_IzreĹži"
 
-#: calendar/gui/e-calendar-table.c:959 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3317 calendar/gui/e-week-view.c:3160
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Kopiraj"
+#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
-#: calendar/gui/e-day-view.c:3290 calendar/gui/e-day-view.c:3319
-#: calendar/gui/e-week-view.c:3134 calendar/gui/e-week-view.c:3162
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Prilepi"
+#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:962
-msgid "Mark as complete"
-msgstr "Označi kot opravljeno"
+#: calendar/gui/e-calendar-table.c:862
+msgid "_Mark as Complete"
+msgstr "_Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:963
-msgid "Delete this task"
-msgstr "Zbriši to nalogo"
+#: calendar/gui/e-calendar-table.c:864
+msgid "_Delete this Task"
+msgstr "_ZbriĹĄi to opravilo"
 
-#: calendar/gui/e-calendar-table.c:972
-msgid "Mark tasks as complete"
-msgstr "Označi opravila kot opravljena"
+#: calendar/gui/e-calendar-table.c:867
+msgid "_Mark Tasks as Complete"
+msgstr "_Označi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
-msgstr "Zbriši izbrana opravila"
+#: calendar/gui/e-calendar-table.c:869
+msgid "_Delete Selected Tasks"
+msgstr "_ZbriĹĄi izbrana opravila"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:574 calendar/gui/e-week-view.c:307
-#: calendar/gui/print.c:785
-msgid "am"
-msgstr "dop"
+#: calendar/gui/e-calendar-table.c:1129
+msgid "Click to add a task"
+msgstr "Kliknite tu za dodajanje opravila"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:577 calendar/gui/e-week-view.c:310
-#: calendar/gui/print.c:787
-msgid "pm"
-msgstr "pop"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmi"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "kategorije"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Končano"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Datum zaključka"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Do datuma"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Datum konca"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Zemljepisna lega"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioriteta"
+
+#: calendar/gui/e-calendar-table.etspec.h:13
+msgid "Start Date"
+msgstr "Datum pričetka"
+
+#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-storage-set-view.c:1465
+#: shell/e-summary-storage.c:78
+msgid "Summary"
+msgstr "Povzetek"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Task sort"
+msgstr "Sortiranje opravil"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1327
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1341
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1354
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Nov zmenek"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "dop"
 
-#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
-msgid "New All Day Event"
-msgstr "Nov celodnevni dogodek"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3302 calendar/gui/e-week-view.c:3146
-msgid "Go to Today"
-msgstr "Pojdi na danes"
+#: calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr "Nov _sestanek"
 
-#: calendar/gui/e-day-view.c:3304 calendar/gui/e-week-view.c:3148
-msgid "Go to Date..."
-msgstr "Pojdi na datum..."
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+msgid "New All Day _Event"
+msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-day-view.c:3311 calendar/gui/e-week-view.c:3154
-#: shell/e-shortcuts-view.c:463 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Odpri"
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:14
+msgid "Go to _Today"
+msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3156
-msgid "Delete this Appointment"
-msgstr "Zbriši ta zmenek"
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
+msgid "_Go to Date..."
+msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3176
-msgid "Make this Occurrence Movable"
-msgstr "Naredi to pojavitev prestavljivo"
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
+msgid "_Delete this Appointment"
+msgstr "_ZbriĹĄi ta sestanek"
 
-#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3178
-msgid "Delete this Occurrence"
-msgstr "Zbriši to pojavitev"
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
+msgid "Make this Occurrence _Movable"
+msgstr "Naredi to pojavitev _prestavljivo"
 
-#: calendar/gui/e-day-view.c:3332
-msgid "Delete all Occurrences"
-msgstr "Zbriši vse pojavitve"
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+msgid "Delete this _Occurrence"
+msgstr "ZbriĹĄi to _pojavitev"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
+msgid "Delete _All Occurrences"
+msgstr "ZbriĹĄi _vse pojavitve"
+
+#: calendar/gui/e-itip-control.c:617
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> je izdal(a) podatke o sestanku."
+
+#: calendar/gui/e-itip-control.c:618
+msgid "Meeting Information"
+msgstr "Podatki o sestanku"
+
+#: calendar/gui/e-itip-control.c:622
 #, c-format
-msgid "%02i minute divisions"
-msgstr "%02i deljenj minute"
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> zahteva vaĹĄo prisotnost na sestanku."
 
-#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
-msgid " to "
-msgstr " do "
+#: calendar/gui/e-itip-control.c:623
+msgid "Meeting Proposal"
+msgstr "Predlog sestanka"
 
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
-msgid " (Completed "
-msgstr " (Končano "
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> vas želi dodati k obstoječem sestanku."
 
-#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
-msgid "Completed "
-msgstr "končano "
+#: calendar/gui/e-itip-control.c:628
+msgid "Meeting Update"
+msgstr "Posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
-msgid " (Due "
-msgstr " (Rok "
+#: calendar/gui/e-itip-control.c:632
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> Ĺželi dobiti najnovejĹĄe podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
-msgid "Due "
-msgstr "Rok"
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
+msgstr "Zahtevek za posodobitev sestanka"
+
+#: calendar/gui/e-itip-control.c:637
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
 
-#: calendar/gui/e-itip-control.c:613
-msgid "This is an event that can be added to your calendar."
-msgstr "To je dogodek, ki je lahko dodan vašemu koledarju."
+#: calendar/gui/e-itip-control.c:638
+msgid "Meeting Reply"
+msgstr "Odgovor na sestanek"
 
-#: calendar/gui/e-itip-control.c:616
-msgid "This is a meeting request."
-msgstr "To je zahtevek po srečanju."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:619
-msgid "This is one or more additions to a current meeting."
-msgstr "To so en ali več dodatkov k trenutnemu srečanju."
+#: calendar/gui/e-itip-control.c:643
+msgid "Meeting Cancellation"
+msgstr "Preklic sestanka"
 
-#: calendar/gui/e-itip-control.c:622
-msgid "This is a request for the latest event information."
-msgstr "To je zahtevek za sveže podatke o dogodku."
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> je poslal(a) nerazumljivo sporočilo."
 
-#: calendar/gui/e-itip-control.c:625
-msgid "This is a reply to a meeting request."
-msgstr "To je odgovor na zahtevek po srečanju."
+#: calendar/gui/e-itip-control.c:648
+msgid "Bad Meeting Message"
+msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: calendar/gui/e-itip-control.c:628
-msgid "This is an event cancellation."
-msgstr "To je preklic dogodka."
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> je objavil(a) podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
-#: calendar/gui/e-itip-control.c:698
-msgid "The message is not understandable."
-msgstr "To sporočilo ni razumljivo."
+#: calendar/gui/e-itip-control.c:666
+msgid "Task Information"
+msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:655
-msgid "This is an task that can be added to your calendar."
-msgstr "To je opravilo, ki je lahko dodano v vaš koledar."
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> zahteva, da opravite nalogo."
 
-#: calendar/gui/e-itip-control.c:658
-msgid "This is a task request."
-msgstr "To je zahtevek po opravilu."
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
+msgstr "Predlog naloge"
 
-#: calendar/gui/e-itip-control.c:661
-msgid "This is a request for the latest task information."
-msgstr "To je zahtevek za sveže podatke o opravilu."
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> vas želi dodati k obstoječi nalogi."
 
-#: calendar/gui/e-itip-control.c:664
-msgid "This is a reply to a task request."
-msgstr "To je odgovor na zahtevek po opravilu."
+#: calendar/gui/e-itip-control.c:676
+msgid "Task Update"
+msgstr "Posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:667
-msgid "This is an task cancellation."
-msgstr "To je preklic opravila."
+#: calendar/gui/e-itip-control.c:680
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> Ĺželi dobiti najnovejĹĄe podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:689
-msgid "This is freebusy information."
-msgstr "To je podatek o zasedenosti."
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
+msgstr "Zahtevek za posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:692
-msgid "This is a request for freebusy information."
-msgstr "To je zahtevek za podatk o zasedenosti."
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge"
 
-#: calendar/gui/e-itip-control.c:695
-msgid "This is a reply to a freebusy request."
-msgstr "To je odgovor na podatek o zasedenosti."
+#: calendar/gui/e-itip-control.c:686
+msgid "Task Reply"
+msgstr "Odgovor na nalogo"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> je preklical(a) nalogo."
+
+#: calendar/gui/e-itip-control.c:691
+msgid "Task Cancellation"
+msgstr "Preklic naloge"
+
+#: calendar/gui/e-itip-control.c:696
+msgid "Bad Task Message"
+msgstr "Nerazumljivo sporočilo o nalogi"
+
+#: calendar/gui/e-itip-control.c:713
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> je objavil(a) podatke o zasedenosti."
+
+#: calendar/gui/e-itip-control.c:714
+msgid "Free/Busy Information"
+msgstr "Podatki o zasedenosti"
 
 #: calendar/gui/e-itip-control.c:718
-msgid "The message does not appear to be properly formed"
-msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> zahteva vaĹĄe podatke o zasedenosti."
+
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
+msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "The message contains only unsupported requests."
-msgstr "To sporočilo vsebuje le nepodprte zahtevke"
+#: calendar/gui/e-itip-control.c:723
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:753
-msgid "The information contained in this attachment was not valid"
-msgstr "Podatki vsebovani v tej prilogi niso veljavni"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
+msgstr "Odgovor na zasedenost"
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:729
+msgid "Bad Free/Busy Message"
+msgstr "Nerazumljivo sporočilo o zasedenosti"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
-msgstr "Nisem mogel posodobiti vašege datoteeke koledarja!\n"
+msgstr "Nisem mogel posodobiti vaĹĄege datoteeke koledarja!\n"
+
+#: calendar/gui/e-itip-control.c:942
+msgid "Update complete\n"
+msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:894
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
-msgstr "Nisem mogel odstraniti predmeta iz vaše datoteke koledarja!\n"
+msgstr "Nisem mogel odstraniti predmeta iz vaĹĄe datoteke koledarja!\n"
+
+#: calendar/gui/e-itip-control.c:969
+msgid "Removal Complete"
+msgstr "Odstranjevanje končano"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+msgid "Item sent!\n"
+msgstr "Predmet poslan!\n"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be send!\n"
+msgstr "Predmeta ni mogoče poslati!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2884,7 +3559,7 @@ msgstr "--za--"
 
 #: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
-msgstr "Sporočilo koledarja"
+msgstr "Sporočilo koledarja"
 
 #: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
@@ -2900,107 +3575,39 @@ msgstr "Nalagam koledar..."
 
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
-msgstr "Sporočilo strežnika:"
+msgstr "Sporočilo strežnika:"
 
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
-msgstr "končni-datum"
+msgstr "končni-datum"
 
 #: calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
-msgstr "začetni-datum"
-
-#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:522
-#: calendar/gui/e-tasks.c:555
-msgid "All"
-msgstr "Vse"
-
-#: calendar/gui/e-tasks.c:191
-msgid "Category:"
-msgstr "Kategorija:"
+msgstr "začetni-datum"
 
-#: calendar/gui/e-tasks.c:330
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
-msgstr "Nisem mogel naložiti poslov v `%s'"
+msgstr "Nisem mogel naloĹžiti poslov v `%s'"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
-msgstr "Postopek potreben za naložitev `%s' ni podprt"
+msgstr "Postopek potreben za naloĹžitev `%s' ni podprt"
 
-#: calendar/gui/e-week-view.c:3139 calendar/gui/e-week-view.c:3167
-msgid "New Appointment..."
-msgstr "Nov zmenek..."
-
-#: calendar/gui/e-week-view.c:3180
-msgid "Delete All Occurrences"
-msgstr "Zbriši vse pojavitve"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1586
-msgid "%d %B"
-msgstr "%d %B"
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
+msgid "New _Appointment..."
+msgstr "Nov _sestanek..."
 
-#: calendar/gui/gnome-cal.c:219
-msgid "Summary contains"
-msgstr "Povzetek vsebuje"
-
-#: calendar/gui/gnome-cal.c:220
-msgid "Description contains"
-msgstr "Opis vsebuje"
-
-#: calendar/gui/gnome-cal.c:221
-msgid "Comment contains"
-msgstr "Komentar vsebuje"
-
-#: calendar/gui/gnome-cal.c:222
-msgid "Has category"
-msgstr "Ima kategorijo"
-
-#: calendar/gui/gnome-cal.c:1054
+#: calendar/gui/gnome-cal.c:1257
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1065
+#: calendar/gui/gnome-cal.c:1268
 #, c-format
 msgid "The method required to open `%s' is not supported"
-msgstr "Postopek potreben za naložitev `%s' ni podprt"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Kontrola Bonobo, ki prikaže koledar."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Komponenta Evolucije za urejanje koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Tovarna komponent za povzetke koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Tovarna komponent Evolucije za urejanje koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Tvoarna za orodje koledarja iTip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Vzorčna tovarna za kontrolo koledarja"
+msgstr "Postopek potreben za naloĹžitev `%s' ni podprt"
 
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -3058,220 +3665,223 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/itip-utils.c:228
+msgid "An organizer must be set."
+msgstr "Organizator mora biti naveden."
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Th"
-msgstr "če"
+msgstr "če"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:1847 shell/e-shortcuts.c:1002
-#: views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
+#: my-evolution/e-summary-tasks.c:228 shell/e-local-storage.c:179
+#: shell/e-shortcuts.c:1025 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Naloge"
 
 #. Day
-#: calendar/gui/print.c:1954
-msgid "Current day (%a %b %d %Y)"
-msgstr "Trenuten dan (%b %a %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
+msgstr "Izbrann dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1974
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1985
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Trenutni teden (%s - %s)"
+#: calendar/gui/print.c:1846
+msgid "Selected week (%s - %s)"
+msgstr "Izbran teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1993
-msgid "Current month (%b %Y)"
-msgstr "Trenutni mesec (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
+msgstr "Izbran mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:2000
-msgid "Current year (%Y)"
-msgstr "Trenutno leto (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
+msgstr "Izbrano leto (%Y)"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
-#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1781 my-evolution/e-summary.c:452
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
-#: ui/evolution-comp-editor.xml.h:10
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1883 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/print.c:2438
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2519
+#: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
-msgstr "URI mape poslov, ki naj se kaže"
+msgstr "URI mape poslov, ki naj se kaĹže"
 
 #: calendar/gui/tasks-migrate.c:106
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolucija je vzela posle, ki so bili v vaši mapi koledarja in jih samodejno "
+"Evolucija je vzela posle, ki so bili v vaĹĄi mapi koledarja in jih samodejno "
 "prenesla v novo mapo poslov."
 
 #: calendar/gui/tasks-migrate.c:109
@@ -3281,9 +3891,9 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolucija je poskušala vzeti vse posle, ki so bili v vaši mapi koledarja in "
+"Evolucija je poskuĹĄala vzeti vse posle, ki so bili v vaĹĄi mapi koledarja in "
 "jih prenesti v novo mapo poslov.\n"
-"Nekaterih poslov ni bilo mogoče prenesti, zato bo ta proces v prihodnosti še "
+"Nekaterih poslov ni bilo mogoče prenesti, zato bo ta proces v prihodnosti še "
 "ponovljen."
 
 #: calendar/gui/tasks-migrate.c:121
@@ -3292,7 +3902,7 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prenešen v mapo "
+"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo preneĹĄen v mapo "
 "poslov."
 
 #: calendar/gui/tasks-migrate.c:134
@@ -3301,105 +3911,107 @@ msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
-"Metoda potrebna za naložitev `%s' ni podprta; predmeti iz mape koledarja ne "
-"bodo prenešeni v mapo poslov."
+"Metoda potrebna za naloĹžitev `%s' ni podprta; predmeti iz mape koledarja ne "
+"bodo preneĹĄeni v mapo poslov."
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
-msgstr "NPTSČPS"
+msgstr "NPTSČPS"
 
 #: calendar/pcs/query.c:218
 msgid "time-now expects 0 arguments"
-msgstr "time-now ne pričakuje argumentov"
+msgstr "time-now ne pričakuje argumentov"
 
 #: calendar/pcs/query.c:242
 msgid "make-time expects 1 argument"
-msgstr "make-time pričakuje 1 argument"
+msgstr "make-time pričakuje 1 argument"
 
 #: calendar/pcs/query.c:247
 msgid "make-time expects argument 1 to be a string"
-msgstr "make-time pričakuje, da je 1. argument niz"
+msgstr "make-time pričakuje, da je 1. argument niz"
 
 #: calendar/pcs/query.c:255
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "1. argument make-time mora biti niz ISO 8601 datuma/časa"
+msgstr "1. argument make-time mora biti niz ISO 8601 datuma/časa"
 
-#: calendar/pcs/query.c:281
+#: calendar/pcs/query.c:284
 msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day pričakuje 2 argumenta"
+msgstr "time-add-day pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:286
+#: calendar/pcs/query.c:289
 msgid "time-add-day expects argument 1 to be a time_t"
-msgstr "time-add-day pričakuje, da je 1. argument time_t"
+msgstr "time-add-day pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:293
+#: calendar/pcs/query.c:296
 msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day pričakuje, da je 2. argument celo število (integer)"
+msgstr "time-add-day pričakuje, da je 2. argument celo število (integer)"
 
-#: calendar/pcs/query.c:318
+#: calendar/pcs/query.c:323
 msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin pričakuje 1 argument"
+msgstr "time-day-begin pričakuje 1 argument"
 
-#: calendar/pcs/query.c:323
+#: calendar/pcs/query.c:328
 msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-begin pričakuje, da je 1. argument time_t"
+msgstr "time-day-begin pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:348
+#: calendar/pcs/query.c:355
 msgid "time-day-end expects 1 argument"
-msgstr "time-day-end pričakuje 1 argument"
+msgstr "time-day-end pričakuje 1 argument"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-day-end pričakuje, da je 1. argument time_t"
+msgstr "time-day-end pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:389
+#: calendar/pcs/query.c:396
 msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype ne pričakuje argumentov"
+msgstr "get-vtype ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:485
+#: calendar/pcs/query.c:492
 msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? pričakuje 2 argumenta"
+msgstr "occur-in-time-range? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:490
+#: calendar/pcs/query.c:497
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr "occur-in-time-range? pričakuje, da je 1. argument time_t"
+msgstr "occur-in-time-range? pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:497
+#: calendar/pcs/query.c:504
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr "occur-in-time-range? pričakuje, da je 2. argument time_t"
+msgstr "occur-in-time-range? pričakuje, da je 2. argument time_t"
 
-#: calendar/pcs/query.c:627
+#: calendar/pcs/query.c:634
 msgid "contains? expects 2 arguments"
-msgstr "contains? pričakuje 2 argumenta"
+msgstr "contains? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:632
+#: calendar/pcs/query.c:639
 msgid "contains? expects argument 1 to be a string"
-msgstr "contains? pričakuje, da je 1. argument niz"
+msgstr "contains? pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:639
+#: calendar/pcs/query.c:646
 msgid "contains? expects argument 2 to be a string"
-msgstr "contains? pričakuje, da je 2. argument niz"
+msgstr "contains? pričakuje, da je 2. argument niz"
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:663
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
-"contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
+"contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
 "\" (povzetek), \"description\"(opis)"
 
-#: calendar/pcs/query.c:694
+#: calendar/pcs/query.c:705
 msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? pričakuje vsaj 1 argument"
+msgstr "has-categories? pričakuje vsaj 1 argument"
 
-#: calendar/pcs/query.c:700
-msgid "has-categories? expects all arguments to be strings"
-msgstr "has-categories? pričakuje, da so vsi argumenti nizi"
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr "has-categories? pričakuje, da so vsi argumenti nizi ali da je natanko en argument boolean neresničen (#f)"
 
-#: calendar/pcs/query.c:948
+#: calendar/pcs/query.c:967
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
-"Izračun iskalnega izraza ni podal vrednosti resnično/neresnično (boolean)"
+"Izračun iskalnega izraza ni podal vrednosti resnično/neresnično (boolean)"
 
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
@@ -3407,79 +4019,101 @@ msgstr "Podpisovanje v tem kodirniku ni podprto"
 
 #: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
-msgstr "Čisto podpisovanje v tem šifrirniku ni podprto"
+msgstr "Čisto podpisovanje v tem šifrirniku ni podprto"
 
 #: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
-msgstr "Preverjanje v tem šifrirniku ni podprto"
+msgstr "Preverjanje v tem ĹĄifrirniku ni podprto"
 
 #: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
-msgstr "Šifriranje v tem šifrirniku ni podprto"
+msgstr "Ĺ ifriranje v tem ĹĄifrirniku ni podprto"
 
 #: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
-msgstr "Dešifriranje v tem šifrirniku ni podprto"
+msgstr "DeĹĄifriranje v tem ĹĄifrirniku ni podprto"
+
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+"Ne morem zapisati dnevniĹĄkega zapisa: %s\n"
+"Nadalnje operacije na tem streĹžniku ne bodo pomnjene, ko se boste\n"
+"znova povezali v mreĹžo."
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+"Ne morem odpreti `%s':\n"
+"%s\n"
+"Spremembe storjene v tej mapi ne bodo sinhronizirane."
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr "Sinhroniziram s streĹžnikom"
 
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
-msgstr "Za dokončanje te operacije morate delati z mrežo"
+msgstr "Za dokončanje te operacije morate delati z mrežo"
 
-#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:635
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
-msgstr "Ne morem odpreti čakalne mape"
+msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
-msgstr "Nisem mogel obdelati čakalne mape"
+msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:658
+#: camel/camel-filter-driver.c:667
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Dobivam sporočilo %d (%d%%)"
+msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
 msgid "Failed on message %d"
-msgstr "Nauspeh ob sporočilu %d"
+msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:663
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
-msgstr "Ne morem dobiti sporočila"
+msgstr "Ne morem dobiti sporočila"
 
-#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
-msgid "Complete"
-msgstr "Končano"
-
-#: camel/camel-filter-driver.c:753
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Dobivam sporočilo %d od %d"
+msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
-msgstr "Neuspeh pri sporočilu %d od %d"
+msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: camel/camel-filter-driver.c:876
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Napaka ob razčlenjanju filtra: %s: %s"
+msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:882
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
@@ -3490,7 +4124,7 @@ msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"Nisem mogel razčleniti iskalnega izraza %s:\n"
+"Nisem mogel razčleniti iskalnega izraza %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:338
@@ -3506,162 +4140,179 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) zahteva enojen booleanov rezultat"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
-msgstr "Neveljaven tip v body-contains, pričakovan niz"
+msgstr "Neveljaven tip v body-contains, pričakovan niz"
+
+#: camel/camel-lock-client.c:110
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nisem mogel ustvariti cevi za pomoč pri zaklepanju: %s"
+
+#: camel/camel-lock-client.c:123
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne morem razvejiti pomočnika za zaklepanje: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Nisem mogel zakleniti '%s': napaka v protokolu s programom lock-helper"
+
+#: camel/camel-lock-client.c:212
+msgid "Could not lock '%s'"
+msgstr "Nisem se mogel zakleniti '%s'"
 
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
+msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
 
 #: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
-"Ob pridobivanju ključavnice na %s je pretekla časovna omejitev. Poskusite "
+"Ob pridobivanju ključavnice na %s je pretekla časovna omejitev. Poskusite "
 "znova kasneje."
 
 #: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
+msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 
 #: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
+msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "Nisem mogel preverti poštne datoteke %s: %s"
+msgstr "Nisem mogel preverti poĹĄtne datoteke %s: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Nisem mogel odpreti poštne datoteke %s: %s"
+msgstr "Nisem mogel odpreti poĹĄtne datoteke %s: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "Nisem mogel odpreti začasne poštne datoteke %s: %s"
-
-#: camel/camel-movemail.c:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Napaka ob branju poštne datoteke: %s"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Napaka ob pisanju v začasno poštno datoteko: %s"
+msgstr "Nisem mogel odpreti začasne poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
+msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: camel/camel-movemail.c:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Napaka ob branju poĹĄtne datoteke: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Napaka ob pisanju v začasno poštno datoteko: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
+msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
-msgstr "Prosim vpišite svoje %s geslo za %s"
+msgstr "Prosim vpiĹĄite svoje %s geslo za %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
-msgstr "Prosim vpišite svoje %s geslo"
+msgstr "Prosim vpiĹĄite svoje %s geslo"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Ni besedila za podpis."
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Geslo ni bilo dano."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
-msgstr "Ni besedila za čisti podpis."
+msgstr "Ni besedila za čisti podpis."
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Ni besedila za preverbo."
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
-msgstr "Nisem mogel ustvariti začasne datoteke: %s"
+msgstr "Nisem mogel ustvariti začasne datoteke: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
-msgstr "Ni besedila za šifriranje."
+msgstr "Ni besedila za ĹĄifriranje."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Prejemniki niso navedeni"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
-msgstr "Ni šifriranega besedila za dešifriranje."
+msgstr "Ni ĹĄifriranega besedila za deĹĄifriranje."
 
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Nisem mogel naložiti %s: Nalaganje modulov na tem sistemu ni podprto."
+msgstr "Nisem mogel naloĹžiti %s: Nalaganje modulov na tem sistemu ni podprto."
 
 #: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
-msgstr "Nisem mogel naložiti %s: %s"
+msgstr "Nisem mogel naloĹžiti %s: %s"
 
 #: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "Nisem mogel naložiti %s: V modulu ni inicializacijske kode."
+msgstr "Nisem mogel naloĹžiti %s: V modulu ni inicializacijske kode."
 
 #: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
-msgstr "strežnik %s %s"
+msgstr "streĹžnik %s %s"
 
 #: camel/camel-remote-store.c:195
 #, c-format
@@ -3673,7 +4324,7 @@ msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
@@ -3682,15 +4333,15 @@ msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
-msgstr "Povezava s strežnikom je bila nepričakovano prekinjena"
+msgstr "Povezava s strežnikom je bila nepričakovano prekinjena"
 
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
@@ -3698,7 +4349,7 @@ msgstr "Anonimno"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr "Ta možnost narekuje povezavo s strežnikom z uporabo anonimne prijave."
+msgstr "Ta moĹžnost narekuje povezavo s streĹžnikom z uporabo anonimne prijave."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
@@ -3710,7 +4361,7 @@ msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Neveljavni podatki o izvoru e-poštnega naslova:\n"
+"Neveljavni podatki o izvoru e-poĹĄtnega naslova:\n"
 "%s"
 
 #: camel/camel-sasl-anonymous.c:131
@@ -3740,8 +4391,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom z uporabo varnega CRAM-MD5 gesla, "
-"če to podpira strežnik."
+"Ta moĹžnost narekuje povezavo s streĹžnikom z uporabo varnega CRAM-MD5 gesla, "
+"če to podpira strežnik."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -3752,34 +4403,34 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom z uporabo varnega DIGEST-MD5 "
-"gesla, če to podpira strežnik."
+"Ta moĹžnost narekuje povezavo s streĹžnikom z uporabo varnega DIGEST-MD5 "
+"gesla, če to podpira strežnik."
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
-msgstr "Strežnikov izziv predolg (>2048 oktetov)\n"
+msgstr "StreĹžnikov izziv predolg (>2048 oktetov)\n"
 
 #: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
-msgstr "Strežnikov izziv ni veljaven\n"
+msgstr "StreĹžnikov izziv ni veljaven\n"
 
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Strežnikov izziv je vseboval neveljaven člen \"Quality of Protection"
-"\" (kvaliteta zaščite)\n"
+"Strežnikov izziv je vseboval neveljaven člen \"Quality of Protection"
+"\" (kvaliteta zaščite)\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
-msgstr "Odziv strežnika ni vseboval podatkov o avtorizaciji\n"
+msgstr "Odziv streĹžnika ni vseboval podatkov o avtorizaciji\n"
 
 #: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
-msgstr "Odziv strežnika je vseboval nepopolne podatke o avtorizaciji\n"
+msgstr "Odziv streĹžnika je vseboval nepopolne podatke o avtorizaciji\n"
 
 #: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
-msgstr "Odziv strežnika ne ustreza\n"
+msgstr "Odziv streĹžnika ne ustreza\n"
 
 #: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
@@ -3788,7 +4439,7 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom z uporabo avtentikacije Kerberos 4."
+"Ta moĹžnost narekuje povezavo s streĹžnikom z uporabo avtentikacije Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -3800,9 +4451,9 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
-msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
+msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
 #: camel/camel-sasl-login.c:32
 msgid "NT Login"
@@ -3810,12 +4461,38 @@ msgstr "Prijava na NT"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Ta možnost narekuje povezavo s strežnikom z uporabo enostavnega gesla."
+msgstr "Ta moĹžnost narekuje povezavo s streĹžnikom z uporabo enostavnega gesla."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
 msgstr "Neznano stanje avtentifikacije."
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:53
+msgid "Password"
+msgstr "Geslo"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr "POP pred SMTP"
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr "Ta moĹžnost bo avtorizirala povezavo POP pred poskuĹĄanjem SMTP"
+
+#: camel/camel-sasl-popb4smtp.c:107
+msgid "POP Source URI"
+msgstr "URI vira POP"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr "Avtentifikacija POP pred SMTP z uporabo neznanega transporta"
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr "Avtentifikacija POP pred SMTP z uporabo ne-pop vira"
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3824,7 +4501,7 @@ msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
 #: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "URL '%s' potrebuje komponento uporabniškega imena"
+msgstr "URL '%s' potrebuje komponento uporabniĹĄkega imena"
 
 #: camel/camel-service.c:162
 #, c-format
@@ -3858,18 +4535,18 @@ msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
 #: camel/camel-session.c:68
 msgid "Virtual folder email provider"
-msgstr "Nuditelj virutalne mape e-pošte"
+msgstr "Nuditelj virutalne mape e-poĹĄte"
 
 #: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
-msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
+msgstr "Za branje poĹĄte kot poizvedbe po drugem sklopu map"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3881,11 +4558,11 @@ msgstr ""
 #: camel/camel-smime-context.c:173
 #, c-format
 msgid "Please enter your password for %s"
-msgstr "Prosim vpišite svoje geslo za %s"
+msgstr "Prosim vpiĹĄite svoje geslo za %s"
 
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
-msgstr "Prosim navedite vzdevek certifikata s katerim se želite podpisati."
+msgstr "Prosim navedite vzdevek certifikata s katerim se Ĺželite podpisati."
 
 #: camel/camel-smime-context.c:209
 #, c-format
@@ -3895,7 +4572,7 @@ msgstr "Podpisni certifikat za \"%s\" ne obstaja."
 #: camel/camel-smime-context.c:249
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
-msgstr "Šifrirni certifikat za \"%s\" ne obstaja."
+msgstr "Ĺ ifrirni certifikat za \"%s\" ne obstaja."
 
 #: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
 #: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
@@ -3909,39 +4586,23 @@ msgstr "Nisem mogel najti skupnega algoritma."
 
 #: camel/camel-smime-context.c:799
 msgid "Failed to decode message."
-msgstr "Nisem uspel dešifrirati sporočila"
+msgstr "Nisem uspel dešifrirati sporočila"
 
 #: camel/camel-smime-context.c:844
 msgid "Failed to verify certificates."
 msgstr "Nisem mogel preveriti certifikatov."
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:971 mail/mail-ops.c:978
-#: mail/mail-ops.c:996 mail/mail-ops.c:997
-msgid "Trash"
-msgstr "Smeti"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"E-pošta: %s\n"
-"Običajno ime: %s\n"
-"Organizacijska enota: %s\n"
-"Organizacija: %s\n"
-"Krajevnost: %s\n"
-"Regija/Zvezna država: %s\n"
-"Država: %s"
+"Proizvedel: %s\n"
+"Zadeva: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3954,115 +4615,131 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Ga želite vseeno sprejeti?"
+"Ga Ĺželite vseeno sprejeti?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Proizvedel: %s\n"
-"Zadeva: %s"
+"E-poĹĄta: %s\n"
+"Običajno ime: %s\n"
+"Organizacijska enota: %s\n"
+"Organizacija: %s\n"
+"Krajevnost: %s\n"
+"Regija/Zvezna drĹžava: %s\n"
+"DrĹžava: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
-msgstr "Ne morem odpreti razčleniti URLja '%s'"
+msgstr "Ne morem odpreti razčleniti URLja '%s'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
-msgstr "Ni takšnega sporočila %s v %s"
+msgstr "Ni takšnega sporočila %s v %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
-msgstr "Ni takšnega sporočila: %s"
+msgstr "Ni takšnega sporočila: %s"
 
 #: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
-msgstr "Ne morete kopirati sporočil iz te mape smeti."
+msgstr "Ne morete kopirati sporočil iz te mape smeti."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "Nepričakovan odgovor strežnika IMAP: %s"
+msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Neznana napaka"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
-msgstr "Odgovor strežnika se je prehitro končal."
+msgstr "Odgovor strežnika se je prehitro končal."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "odgovor IMAP strežnika ni vseboval podatkov %s"
+msgstr "odgovor IMAP streĹžnika ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Nepričakovan OK odgovor strežnika IMAP: %s"
+msgstr "Nepričakovan OK odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
-msgstr "Nisem mogel naložiti povzetka za %s"
+msgstr "Nisem mogel naloĹžiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
-msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
+msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
 
-#: camel/providers/imap/camel-imap-folder.c:430
-msgid "Scanning IMAP folder"
-msgstr "Pregledujem mapo IMAP"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:435
+msgid "Scanning for changed messages"
+msgstr "Pregledujem za spremenjenimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1763
+#: camel/providers/imap/camel-imap-folder.c:1478
+#: camel/providers/imap/camel-imap-folder.c:1902
 msgid "This message is not currently available"
-msgstr "To sporočilo trenutno ni na voljo"
+msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1796
+#: camel/providers/imap/camel-imap-folder.c:1620
+#: camel/providers/imap/camel-imap-folder.c:1701
+msgid "Fetching summary information for new messages"
+msgstr "Prenašam povzetke novih sporočil"
+
+#: camel/providers/imap/camel-imap-folder.c:1626
+msgid "Scanning for new messages"
+msgstr "Pregledujem za novimi sporočili"
+
+#: camel/providers/imap/camel-imap-folder.c:1935
 msgid "Could not find message body in FETCH response."
-msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
+msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
+
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Nisem mogel odpreti predpomnilniĹĄkega imenika: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
-msgstr "Preverjam za novo pošto"
+msgstr "Preverjam za novo poĹĄto"
 
 #: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
-msgstr "Preveri za nova sporočila v vseh mapah"
+msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:655
 msgid "Folders"
 msgstr "Mape"
 
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
-msgstr "Kaži le naročene mape"
+msgstr "Kaži le naročene mape"
 
 #: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
-msgstr "Povozi imenski prostor map, ki ga nudi strežnik"
+msgstr "Povozi imenski prostor map, ki ga nudi streĹžnik"
 
 #: camel/providers/imap/camel-imap-provider.c:54
 msgid "Namespace"
@@ -4070,7 +4747,7 @@ msgstr "Imenski prostor"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Uveljavi filtre na novih sporočiliv v mapi INBOX tega strežnika"
+msgstr "Uveljavi filtre na novih sporočiliv v mapi INBOX tega strežnika"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
@@ -4078,82 +4755,87 @@ msgstr "IMAPv4"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
-msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
+msgstr "Za branje in hranjenje poĹĄte na streĹžnikih IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
+msgstr "Ta moĹžnost narekuje povezavo s streĹžnikom IMAP z neĹĄifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "Strežnik IMAP %s ne podpira zahtevanega načina avtentifikacije %s"
+msgstr "Strežnik IMAP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
-msgstr "Ni podpore za način avtentifikacije %s"
+msgstr "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sProsim vpišite geslo IMAP za %s@%s"
+msgstr "%sProsim vpiĹĄite geslo IMAP za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Strežniku IMAP se nisem mogel avtentificirati.\n"
+"StreĹžniku IMAP se nisem mogel avtentificirati.\n"
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
+#: camel/providers/imap/camel-imap-store.c:837 mail/mail-local.c:333
 #, c-format
 msgid "No such folder %s"
-msgstr "Ni takšne mape %s"
+msgstr "Ni takĹĄne mape %s"
+
+#: camel/providers/imap/camel-imap-store.c:1037
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "StarĹĄevski mapi ni dovoljeno vsebovati podmape"
 
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
-msgstr "Poštni imeniki tipa MH"
+msgstr "PoĹĄtni imeniki tipa MH"
 
 #: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
-msgstr "Za shranjevanje krajevne pošte v imenikih tipa MH"
+msgstr "Za shranjevanje krajevne poĹĄte v imenikih tipa MH"
 
 #: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
-msgstr "Običajna Unix datoteka poštnega predala"
+msgstr "Običajna Unix datoteka poštnega predala"
 
 #: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
-msgstr "Za shranjevanje krajevne pošte v datoteki tipa mbox"
+msgstr "Za shranjevanje krajevne poĹĄte v datoteki tipa mbox"
 
 #: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
-msgstr "Poštne datoteke tipa Qmail"
+msgstr "PoĹĄtne datoteke tipa Qmail"
 
 #: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
-msgstr "Za shranjevanje krajevne pošte v imenikih tipa qmail"
+msgstr "Za shranjevanje krajevne poĹĄte v imenikih tipa qmail"
 
 #: camel/providers/local/camel-local-provider.c:70
 msgid "Unix mbox spool-format mail files"
-msgstr "Poštne datoteke tipa mbox spool"
+msgstr "PoĹĄtne datoteke tipa 'spool'"
 
 #: camel/providers/local/camel-local-provider.c:71
 msgid "For storing local mail in standard Unix spool directories"
-msgstr "Za shranjevanje krajevne pošte v običajnih Unix spool imenikih"
+msgstr "Za shranjevanje krajevne pošte v običajnih Unix 'spool' imenikih"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Korenski imenik shrambe %s ni absolutna pot"
@@ -4161,7 +4843,7 @@ msgstr "Korenski imenik shrambe %s ni absolutna pot"
 #: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "Korenski imenik shrambe %s ni običajnen imenik"
+msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:158
@@ -4176,7 +4858,7 @@ msgstr "Krajevno shrambe nimajo vhodnega predala"
 #: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
-msgstr "Krajevna datoteka s pošto %s"
+msgstr "Krajevna datoteka s poĹĄto %s"
 
 #: camel/providers/local/camel-local-store.c:237
 #, c-format
@@ -4193,42 +4875,45 @@ msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
+msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
 #: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Ne morem dodati sporočila v mapo tipa maildir: %s: %s"
+msgstr "Ne morem dodati sporočila v mapo tipa maildir: %s: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
-"Ne morem dobiti sporočila: %s\n"
+"Ne morem dobiti sporočila: %s\n"
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
-msgstr "Ni takšnega sporočila"
+msgstr "Ni takšnega sporočila"
 
 #: camel/providers/local/camel-maildir-folder.c:222
 #: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
-msgstr "Neveljavna vsebina sporočila"
+msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:101
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4238,14 +4923,14 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/local/camel-maildir-store.c:112
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4255,23 +4940,23 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:127
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ni imenik tipa maildir."
 
-#: camel/providers/local/camel-maildir-store.c:156
-#: camel/providers/local/camel-maildir-store.c:193
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisem mogel zbrisati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "ni imenik tipa maildir"
 
-#: camel/providers/local/camel-maildir-store.c:267
+#: camel/providers/local/camel-maildir-store.c:276
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisem mogel prebrati mape `%s': %s"
@@ -4280,41 +4965,48 @@ msgstr "Nisem mogel prebrati mape `%s': %s"
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Ne morem odpreti poštnega imenika maildir: %s: %s"
+msgstr "Ne morem odpreti poĹĄtnega imenika maildir: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
+msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
+msgstr "Ne morem odpreti poĹĄtnega predala: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Ne morem pripeti sporočila k datoteki tipa mbox: %s: %s"
+msgstr "Ne morem pripeti sporočila k datoteki tipa mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
-"Ne morem dobiti sporočila: %s iz mape %s\n"
+"Ne morem dobiti sporočila: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
+msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
 
-#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-mbox-folder.c:390
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
+msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
 #: camel/providers/local/camel-mbox-store.c:94
 #, c-format
@@ -4338,7 +5030,7 @@ msgstr ""
 #: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
-msgstr "`%s' ni običajna datoteka."
+msgstr "`%s' ni običajna datoteka."
 
 #: camel/providers/local/camel-mbox-store.c:138
 #: camel/providers/local/camel-mbox-store.c:161
@@ -4358,59 +5050,69 @@ msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
-msgid "Summarising folder"
+#: camel/providers/local/camel-spool-summary.c:379
+msgid "Summarizing folder"
 msgstr "Delam povzetek mape"
 
 #: camel/providers/local/camel-mbox-summary.c:254
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Nisem mogel odpreti mape: %s: povzetek delam od %ld dalje: %s"
+#: camel/providers/local/camel-spool-summary.c:384
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
+msgstr "Nisem mogel odpreti mape: %s: povzetek delam od poloĹžaja %ld dalje: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Usodna napaka razčlenjevanja pošte na mestu %ld v mapi %s"
+msgstr "Usodna napaka razčlenjevanja pošte na mestu %ld v mapi %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Ne morem narediti povzetka mape %s: %s"
+msgid "Cannot summarize folder: %s: %s"
+msgstr "Ne morem narediti povzetka mape: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1445
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1549
 msgid "Synchronising folder"
 msgstr "Uskljajujem mapo %s"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
+msgid "Could not open folder to summarize: %s: %s"
+msgstr "Nisem mogel odpreti mape za izdelavo povzetka: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
+msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:549
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
-msgstr "Napaka ob pisanju v začasni poštni predal: %s"
+msgstr "Napaka ob pisanju v začasni poštni predal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
+msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
@@ -4418,14 +5120,16 @@ msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 #: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
-msgstr "Nisem mogel zapreti začasne mape: %s"
+msgstr "Nisem mogel zapreti začasne mape: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
@@ -4433,7 +5137,7 @@ msgstr "Neznana napaka: %s"
 #: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Ne morem dodati sporočila v mapo tipa mh: %s: %s"
+msgstr "Ne morem dodati sporočila v mapo tipa mh: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:110
 #, c-format
@@ -4443,123 +5147,183 @@ msgstr "`%s' ni imenik."
 #: camel/providers/local/camel-mh-summary.c:218
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "Ne morem odpreti poštnega imenika MH: %s: %s"
+msgstr "Ne morem odpreti poĹĄtnega imenika MH: %s: %s"
+
+#: camel/providers/local/camel-spool-folder.c:465
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Ne morem pripeti sporočila k datoteki vrste 'spool': %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
+
+#: camel/providers/local/camel-spool-store.c:159
+msgid "Folder `%s/%s' does not exist."
+msgstr "Mapa `%s/%s' ne obstaja."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr "Shramba vrste 'Spool' nima dohodnega predala"
+
+#: camel/providers/local/camel-spool-store.c:186
+msgid "Spool mail file %s"
+msgstr "Datoteka vrste 'spool' s poĹĄto %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr "Map vrste 'spool' ni moĹžno preimenovati"
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr "Map vrste 'spool' ni moĹžno zbrisati."
+
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Ne morem narediti povzetka mape %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Nisem mogel uskladiti začasne mape %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+msgid "Could not sync spool folder %s: %s"
+msgstr "Nisem mogel uskladiti mape vrste 'spool' %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+"Nisem mogel uskladiti mape vrste 'spool' %s: %s\n"
+"Mapa je morda pokvarjena, kopija shranjena v `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
-msgstr "Prosim vpišite geslo NNTP za %s@%s"
+msgstr "Prosim vpiĹĄite geslo NNTP za %s@%s"
 
 #: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
-msgstr "Strežnik je zavrnil uporabniško ime"
+msgstr "StreĹžnik je zavrnil uporabniĹĄko ime"
 
 #: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
-msgstr "Nisem uspel poslati uporabniškega imena strežniku"
+msgstr "Nisem uspel poslati uporabniĹĄkega imena streĹžniku"
 
 #: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
-msgstr "Strežnik je zavrnil uporabniško ime/geslo"
+msgstr "StreĹžnik je zavrnil uporabniĹĄko ime/geslo"
 
 #: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
-msgstr "Sporočilo %s ni bilo najdeno."
+msgstr "Sporočilo %s ni bilo najdeno."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
-msgstr "Nisem mogel dobiti seznama skupin s strežnika."
+msgstr "Nisem mogel dobiti seznama skupin s streĹžnika."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:97
-#: camel/providers/nntp/camel-nntp-grouplist.c:106
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
-msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
+msgstr "Nisem mogel naloĹžiti datoteke s seznamom skupin za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:157
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
-msgstr "USENET novičke"
+msgstr "USENET novičke"
 
 #: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "To je nuditelj za branje in pisanje v novičkarske skupine USENET."
+msgstr "To je nuditelj za branje in pisanje v novičkarske skupine USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
-msgstr "Nisem mogel odpreti imenika za novičkarski strežnik: %s"
+msgstr "Nisem mogel odpreti imenika za novičkarski strežnik: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
-msgstr "USNET Novičke preko %s"
+msgstr "USNET Novičke preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
-"Ta možnost se bo avtentificirala pri strežniku NNTP z nešifriranim geslom."
+"Ta moĹžnost se bo avtentificirala pri streĹžniku NNTP z neĹĄifriranim geslom."
 
-#: camel/providers/nntp/camel-nntp-store.c:323
-#: camel/providers/nntp/camel-nntp-store.c:485
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:193
 msgid "Retrieving POP summary"
-msgstr "Prenašam povzetek POP"
+msgstr "PrenaĹĄam povzetek POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:199
 #, c-format
 msgid "Could not check POP server for new messages: %s"
-msgstr "Nisem mogel preveriti strežnika POP za nova sporočila: %s."
+msgstr "Nisem mogel preveriti strežnika POP za nova sporočila: %s."
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:239
 msgid "Could not open folder: message listing was incomplete."
-msgstr "Nisem mogel odpreti mape: seznam sporočil je bil nepopoln."
+msgstr "Nisem mogel odpreti mape: seznam sporočil je bil nepopoln."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
+#: camel/providers/pop3/camel-pop3-folder.c:332
 #, c-format
-msgid "No message with uid %s"
-msgstr "Ni sporočila z uid %s"
+msgid "Could not fetch message: %s"
+msgstr "Nisem mogel dobiti sporočila: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:296
+#: camel/providers/pop3/camel-pop3-folder.c:348
 #, c-format
-msgid "Retrieving POP message %d"
-msgstr "Prenašam sporočilo POP %d"
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr "Nisem uspel prenesti sporočila s strežnika POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
-msgid "Could not fetch message: %s"
-msgstr "Nisem mogel dobiti sporočila: %s"
+msgid "No message with uid %s"
+msgstr "Ni sporočila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:375
 #, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nisem uspel prenesti sporočila s strežnika POP %s: %s"
+msgid "Retrieving POP message %d"
+msgstr "Prenašam sporočilo POP %d"
 
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
-msgstr "Hramba sporočil"
+msgstr "Hramba sporočil"
 
 #: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Leave messages on server"
-msgstr "Pusti sporočila na strežniku"
+msgstr "Pusti sporočila na strežniku"
 
 #: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
-msgstr "Zbriši po %s dneh"
+msgstr "ZbriĹĄi po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:52
 msgid "POP"
 msgstr "POP"
 
@@ -4568,17 +5332,17 @@ msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
-"Za povezovanje s strežniki POP. Protokol POP se lahko uporabi tudi za "
-"prenašanje pošte iz nekaterih spletnih nuditeljev pošte in zaprtih sistemov "
-"e-pošte."
+"Za povezovanje s streĹžniki POP. Protokol POP se lahko uporabi tudi za "
+"prenaĹĄanje poĹĄte iz nekaterih spletnih nuditeljev poĹĄte in zaprtih sistemov "
+"e-poĹĄte."
 
 #: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom POP z nešifriranim geslom. To je v "
-"večini edina možnost, ki jo strežniki POP podpirajo."
+"Ta moĹžnost narekuje povezavo s streĹžnikom POP z neĹĄifriranim geslom. To je v "
+"večini edina možnost, ki jo strežniki POP podpirajo."
 
 #: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
@@ -4586,36 +5350,36 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom POP z uporabo šifriranega gesla "
+"Ta moĹžnost narekuje povezavo s streĹžnikom POP z uporabo ĹĄifriranega gesla "
 "preko protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo "
-"za strežnike, ki trdijo, da jo podpirajo."
+"za streĹžnike, ki trdijo, da jo podpirajo."
 
 #: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
-"To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
+"To se bo povezalo s streĹžnikom POP in uporabilo Kerbos 4 za ustrezno "
 "avtentifikacijo."
 
 #: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
-msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
+msgstr "StreĹžniku KPOP se nisem mogel avtentificirati: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not connect to server: %s"
-msgstr "Nisem se mogel povezati s strežnikom: %s."
+msgstr "Nisem se mogel povezati s streĹžnikom: %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
-msgstr "Nisem se mogel povezati s strežnikom POP na %s."
+msgstr "Nisem se mogel povezati s streĹžnikom POP na %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sProsim vpišite POP3 geslo za %s@%s"
+msgstr "%sProsim vpiĹĄite POP3 geslo za %s@%s"
 
 #: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
@@ -4623,8 +5387,8 @@ msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
-"Nisem se mogel povezati s strežnikom POP.\n"
-"Napaka ob pošiljanju uporabniškega imena: %s"
+"Nisem se mogel povezati s streĹžnikom POP.\n"
+"Napaka ob poĹĄiljanju uporabniĹĄkega imena: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:382
 #: camel/providers/pop3/camel-pop3-store.c:419
@@ -4636,7 +5400,7 @@ msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
-"Ne morem se povezati s strežnikom POP.\n"
+"Ne morem se povezati s streĹžnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
 #: camel/providers/pop3/camel-pop3-store.c:417
@@ -4645,16 +5409,16 @@ msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
-"Nisem se mogel povezati s strežnikom POP.\n"
-"Napaka ob pošiljanju gesla: %s"
+"Nisem se mogel povezati s streĹžnikom POP.\n"
+"Napaka ob poĹĄiljanju gesla: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
-msgstr "Ni takšne mape `%s'."
+msgstr "Ni takĹĄne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:71
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -4663,42 +5427,42 @@ msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
-"Za dostavljanjem pošte preko programa \"sendmail\" na krajevnem sistemu."
+"Za dostavljanjem poĹĄte preko programa \"sendmail\" na krajevnem sistemu."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
-"Nisem mogel ustvariti cevi do programa sendmail: %s: pošta ni bila poslana"
+"Nisem mogel ustvariti cevi do programa sendmail: %s: poĹĄta ni bila poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Nisem mogel vejiti programa sendmail: %s: pošta ni bila poslana"
+msgstr "Nisem mogel vejiti programa sendmail: %s: poĹĄta ni bila poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
-msgstr "Nisem mogel poslati sporočila: %s"
+msgstr "Nisem mogel poslati sporočila: %s"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "program sendmail je zaključil s signalom %s: pošta ni bila poslana."
+msgstr "program sendmail je zaključil s signalom %s: pošta ni bila poslana."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "Nisem mogel izvršiti %s: pošta ni bila poslana."
+msgstr "Nisem mogel izvrĹĄiti %s: poĹĄta ni bila poslana."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "program sendmail je zaključil s stanjem %d: pošta ni bila poslana."
+msgstr "program sendmail je zaključil s stanjem %d: pošta ni bila poslana."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
-msgstr "V sporočilu nisem našel naslova 'From' (pošiljatelja)."
+msgstr "V sporočilu nisem našel naslova 'From' (pošiljatelja)."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
@@ -4706,256 +5470,268 @@ msgstr "program sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
-msgstr "Dostava pošte preko programa sendmail"
+msgstr "Dostava poĹĄte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:74
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:64
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
-"Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
+"Za dostavo poĹĄte preko povezave z oddaljenim poĹĄtnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
-msgstr "Sintaktična napaka, ukaz ni prepoznan"
+msgstr "Sintaktična napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
-msgstr "Sintaktična napaka v parametrih ali argumentih"
+msgstr "Sintaktična napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
-msgstr "Stanje sistema ali odgvor na pomoč"
+msgstr "Stanje sistema ali odgvor na pomoč"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
-msgstr "Sporčilo pomoči"
+msgstr "Sporčilo pomoči"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "Uporabnik ni krajeven; bom posredoval na <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Zahtevano poštno dejanje ni bilo izvedeno: poštni predal ni na voljo"
+msgstr "Zahtevano poĹĄtno dejanje ni bilo izvedeno: poĹĄtni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "Zahtevano dejanje ni bilo izvedeno: poštni predal ni na voljo"
+msgstr "Zahtevano dejanje ni bilo izvedeno: poĹĄtni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Zahtevano dejanje ni bilo izvedeno: premalo prostora na disku"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Zahtevano dejanje preklicano: prekoračena obremenitev diska"
+msgstr "Zahtevano dejanje preklicano: prekoračena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Zahtevano dejanje ni bilo izvedeno: ime poštnega predala ni dovoljeno"
+msgstr "Zahtevano dejanje ni bilo izvedeno: ime poĹĄtnega predala ni dovoljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Začni z vpisom pošte; končaj z <ENTER>.<ENTER>"
+msgstr "Začni z vpisom pošte; končaj z <ENTER>.<ENTER>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
-msgstr "Mehanizem avtentifikacije je prešibak"
+msgstr "Mehanizem avtentifikacije je preĹĄibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
-msgstr "Za zahtevan mehanizem avtentifikacije je potrebno šifriranje"
+msgstr "Za zahtevan mehanizem avtentifikacije je potrebno ĹĄifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
-msgstr "Začasna napaka avtentifikacije"
+msgstr "Začasna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Napaka pri pozdravu: %s: morda ni usodna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
-msgstr "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %s"
+msgstr "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:396
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
-msgstr "%sProsim vpišite geslo SMTP za %s@%s"
+msgstr "%sProsim vpiĹĄite geslo SMTP za %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:419
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Strežniku SMTP se nisem mogel avtentificirati.\n"
+"StreĹžniku SMTP se nisem mogel avtentificirati.\n"
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
-msgstr "Strežnik SMTP %s"
+msgstr "StreĹžnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr "Dostava pošte s SMTP preko %s"
+msgstr "Dostava poĹĄte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
-msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
+msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
 
-#: camel/providers/smtp/camel-smtp-transport.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
-msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
+msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
+msgid "Sending message"
+msgstr "Pošiljam sporočilo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
-msgstr "Ne morem poslati sporočila: ni naslovnikov."
+msgstr "Ne morem poslati sporočila: ni naslovnikov."
+
+#: camel/providers/smtp/camel-smtp-transport.c:686
+msgid "SMTP Greeting"
+msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
-msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
+msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:760
+msgid "SMTP Authentication"
+msgstr "Avtentifikacija SMTP"
+
+#: camel/providers/smtp/camel-smtp-transport.c:766
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
-msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
+msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
-msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
+msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
-"Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
+"Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:855
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "Napaka v ogovoru na MAIL FROM: %s: pošta ni bila poslana"
+msgstr "Napaka v ogovoru na MAIL FROM: %s: poĹĄta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
-"Zahtevek RCPT TO je prekoračil časovno omejitev: %s: pošta ni bila poslana"
+"Zahtevek RCPT TO je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:899
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
+msgstr "Napaka v ogovoru na RCPT TO: %s: poĹĄta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
-"Zahtevek DATA je prekoračil časovno omejitev: %s: pošta ni bila poslana"
+"Zahtevek DATA je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
-msgstr "Napaka v ogovoru na DATA: %s: pošta ni bila poslana"
+msgstr "Napaka v ogovoru na DATA: %s: poĹĄta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
-"Zahtevek DATA je prekoračil časovno omejitev: konec sporočila: %s: pošta ni "
+"Zahtevek DATA je prekoračil časovno omejitev: konec sporočila: %s: pošta ni "
 "bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Napaka v ogovoru na DATA: konec sporočila: %s: pošta ni bila poslana"
+msgstr "Napaka v ogovoru na DATA: konec sporočila: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
-msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
+msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Napaka v odgovoru na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
+msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
@@ -4985,7 +5761,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "priloga"
 
@@ -4999,7 +5775,7 @@ msgstr "Dodaj prilogo..."
 
 #: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
-msgstr "Priloži datoteko k sporočilu"
+msgstr "Priloži datoteko k sporočilu"
 
 #: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
@@ -5014,10 +5790,69 @@ msgid "MIME type:"
 msgstr "Tip MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer.c:667
+#: composer/e-msg-composer-hdrs.c:327
+msgid "Click here for the address book"
+msgstr "Kliknite tu za adresar"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:358
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:364
+msgid "Reply-To:"
+msgstr "Odgovori-na:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:375
+msgid "Subject:"
+msgstr "Zadeva:"
+
+#: composer/e-msg-composer-hdrs.c:389
+msgid "To:"
+msgstr "Za:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "Enter the recipients of the message"
+msgstr "Vnesite prejemnike sporočila"
+
+#: composer/e-msg-composer-hdrs.c:393
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporočila"
+
+#: composer/e-msg-composer-hdrs.c:397
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:398
+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 karbonske kopije sporočila, a  se ne bodo "
+"pojavili v seznamu prejemnikov sporočila."
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "PriloĹži datoteko"
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5026,7 +5861,7 @@ msgstr ""
 "Nisem mogel odpreti datoteke: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:680
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5035,38 +5870,53 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:876
+#: composer/e-msg-composer.c:882
+msgid "Warning!"
+msgstr "Opozorilo!"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr "Datoteka obstaja, prepiĹĄi?"
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:896
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
-"Ni mogoče odpreti mape osnutkov za ta račun.\n"
-"Želite uporabiti privzeto mapo osnutkov?"
+"Ni mogoče odpreti mape osnutkov za ta račun.\n"
+"Želite uporabiti privzeto mapo osnutkov?"
 
-#: composer/e-msg-composer.c:1015
-#, c-format
-msgid "Error opening file: %s"
-msgstr "Napaka ob odpiranju datoteke: %s"
+#: composer/e-msg-composer.c:1047
+msgid "Error accessing file: %s"
+msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1023
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
-msgstr "Od urejevalnika nisem uspel dobiti sporočila"
+msgstr "Od urejevalnika nisem uspel dobiti sporočila"
+
+#: composer/e-msg-composer.c:1061
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:1029
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5075,118 +5925,65 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1038
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
-"Napaka ob samodejnem shranjevanju sporočila: %s\n"
+"Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1103
+#: composer/e-msg-composer.c:1176
 msgid ""
-"Evolution has detected an editor buffer from a previous session.\n"
-"Would you like to recover this buffer?"
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
-"Evolucija je zaznala medpomnilnik urejevalnika iz prejšnje seje.\n"
-"Želite znova uporabiti ta medpomnilnik?"
+"Evolucija je zaznala neshranjene datoteke iz prejĹĄnje seje.\n"
+"Želite poskusiti obnovitev?"
 
-#: composer/e-msg-composer.c:1228 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:231
-msgid "Evolution"
-msgstr "Evolucija"
-
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1324
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
-"To sporočilo ni bilo poslano.\n"
+"To sporočilo ni bilo poslano.\n"
 "\n"
-"Želite shraniti spremembe?"
+"Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1331 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:216
+msgid "Evolution"
+msgstr "Evolucija"
+
+#: composer/e-msg-composer.c:1354
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1408
+#: composer/e-msg-composer.c:1503
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:1765 composer/e-msg-composer.c:2138
+#: composer/e-msg-composer.c:1877 composer/e-msg-composer.c:2318
 msgid "Compose a message"
-msgstr "Sestavi novo sporočilo"
+msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2232
+#: composer/e-msg-composer.c:2408
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
-#: composer/e-msg-composer-hdrs.c:325
-msgid "Click here for the address book"
-msgstr "Kliknite tu za adresar"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:356
-msgid "From:"
-msgstr "Od:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:362
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:373
-msgid "Subject:"
-msgstr "Zadeva:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "To:"
-msgstr "Za:"
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the recipients of the message"
-msgstr "Vnesite prejemnike sporočila"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporočila"
-
-#: composer/e-msg-composer-hdrs.c:395
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:396
-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 karbonske kopije sporočila, a  se ne bodo "
-"pojavili v seznamu prejemnikov sporočila."
-
 #: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
-"Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
-"identitet v komponenti pošte."
+"Nisem mogel ustvariti okna skladatelja, ker ĹĄe niste nastavili\n"
+"identitet v komponenti poĹĄte."
 
 #: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
-msgstr "Ne morem inicializirati Evolucijinega skladatelja."
+msgstr "Ne morem inicializirati Evolucijinega sestavljalca."
 
 #: data/evolution.desktop.in.h:2
 msgid "The Evolution groupware suite"
@@ -5200,41 +5997,82 @@ msgstr "vizitka"
 msgid "calendar information"
 msgstr "podatki o kodledarju"
 
+#: default_user/searches.xml.h:1
+msgid "Body contains"
+msgstr "Telo vsebuje"
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr "Telo ne vsebuje"
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr "Telo ali zadeva vsebuje"
+
+#: default_user/searches.xml.h:4
+msgid "Recipients contain"
+msgstr "Prejemniki vsebujejo"
+
+#: default_user/searches.xml.h:5
+msgid "Sender contains"
+msgstr "PoĹĄiljatelj vsebuje"
+
+#: default_user/searches.xml.h:6
+msgid "Subject contains"
+msgstr "Zadeva vsebuje"
+
+#: default_user/searches.xml.h:7
+msgid "Subject does not contain"
+msgstr "Zadeva ne vsebuje"
+
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
-#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
-#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+msgid "%x"
+msgstr "%x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5242,127 +6080,127 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "leto"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "let"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mesec"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mesecev"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "teden"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "tedenov"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dni"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "ura"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "ur"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minut"
-
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekunda"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr " sekund"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Opa. Pozabili ste izbrati datum."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Opa. Izbrali ste neveljaven datum."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
-"Datum tega sporočila bo primerjan s\n"
-"časom ob katerem se bo pognal filter\n"
+"Datum tega sporočila bo primerjan s\n"
+"časom ob katerem se bo pognal filter\n"
 "ali vmapa odprta."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
-"Datum tega sporočila bo primerjan s časom,\n"
+"Datum tega sporočila bo primerjan s časom,\n"
 "ki ga navedete tu."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
 "\"a week ago\", for example."
 msgstr ""
-"Datum tega sporočila bo primerjan s časom\n"
-"relativnim glede na čas zagona filtra;\n"
+"Datum tega sporočila bo primerjan s časom\n"
+"relativnim glede na čas zagona filtra;\n"
 ".na primer \"teden dni nazaj\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
-msgstr "trenutni čas"
+msgstr "trenutni čas"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
-msgstr "čas, ki ga navedete"
+msgstr "čas, ki ga navedete"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
-msgstr "čas, relatievn trenutnemu"
+msgstr "čas, relatievn trenutnemu"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Primerjaj z"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "sedaj"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr " nazaj "
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "nazaj"
+
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
@@ -5385,21 +6223,78 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 "Opa, pozabili ste izbrati mapo.\n"
-"Prosim pojdite nazaj in navedite veljavno mapo kamor naj se pošta dostavi."
+"Prosim pojdite nazaj in navedite veljavno mapo kamor naj se poĹĄta dostavi."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:701
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:808
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Vnesite URI mape"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
+#: filter/filter-input.c:197
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Napaka v regularnem izrazu '%s':\n"
+"%s"
+
+#: filter/filter-part.c:488
+msgid "Test"
+msgstr "Preizkus"
+
+#: filter/filter-rule.c:626
+msgid "Rule name: "
+msgstr "Ime pravila: "
+
+#: filter/filter-rule.c:630
+msgid "Untitled"
+msgstr "Neimenovan"
+
+#: filter/filter-rule.c:647
+msgid "If"
+msgstr "Če"
+
+#: filter/filter-rule.c:665
+msgid "Execute actions"
+msgstr "IzvrĹĄi dejanja"
+
+#: filter/filter-rule.c:669
+msgid "if all criteria are met"
+msgstr "če je zadoščeno vsem pogojem"
+
+#: filter/filter-rule.c:674
+msgid "if any criteria are met"
+msgstr "če je zadoščeno kateremukoli pogoju"
+
+#: filter/filter-rule.c:685
+msgid "Add criterion"
+msgstr "Dodaj pogoj"
+
+#: filter/filter-rule.c:770
+msgid "incoming"
+msgstr "dohodna"
+
+#: filter/filter-rule.c:770
+msgid "outgoing"
+msgstr "odhodna"
+
+#: filter/filter.glade.h:1
+msgid "Add"
+msgstr "Dodaj"
+
+#: filter/filter.glade.h:3
+msgid "Edit"
+msgstr "Uredi"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Uredi filtre"
@@ -5440,254 +6335,198 @@ msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
 msgid "with all local folders"
 msgstr "z vsemi krajevnimi mapami"
 
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Napaka v regularnem izrazu '%s':\n"
-"%s"
-
-#: filter/filter-part.c:488
-msgid "Test"
-msgstr "Preizkus"
-
-#: filter/filter-rule.c:626
-msgid "Rule name: "
-msgstr "Ime pravila: "
-
-#: filter/filter-rule.c:630
-msgid "Untitled"
-msgstr "Neimenovan"
-
-#: filter/filter-rule.c:646
-msgid "If"
-msgstr "Če"
-
-#: filter/filter-rule.c:664
-msgid "Execute actions"
-msgstr "Izvrši dejanja"
-
-#: filter/filter-rule.c:668
-msgid "if all criteria are met"
-msgstr "če je zadoščeno vsem pogojem"
-
-#: filter/filter-rule.c:673
-msgid "if any criteria are met"
-msgstr "če je zadoščeno kateremukoli pogoju"
-
-#: filter/filter-rule.c:684
-msgid "Add criterion"
-msgstr "Dodaj pogoj"
-
-#: filter/filter-rule.c:769
-msgid "incoming"
-msgstr "dohodna"
-
-#: filter/filter-rule.c:769
-msgid "outgoing"
-msgstr "odhodna"
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Color"
+msgstr "Dodeli barvo"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr "Pripiši barvo"
-
-#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
-msgstr "Pripiši točke"
+msgstr "Dodeli točke"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Priloge"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "vsebuje"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Zbrisano"
 
+#: filter/libfilter-i18n.h:10
+msgid "Do Not Exist"
+msgstr "ne obstaja"
+
+#: filter/libfilter-i18n.h:11
+msgid "Draft"
+msgstr "Osnutek"
+
+#: filter/libfilter-i18n.h:12
+msgid "Exist"
+msgstr "obstaja"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ne vsebuje"
+msgid "Expression"
+msgstr "Izraz"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "se ne konča z"
+msgid "Important"
+msgstr "Pomembno"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ne obstaja"
+msgid "Mailing list"
+msgstr "Dopisni seznam"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "ne zveni kot"
+msgid "Message Body"
+msgstr "Jedro sporočila"
 
 #: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "se ne začne z"
+msgid "Message Header"
+msgstr "Glava sporočila"
 
 #: filter/libfilter-i18n.h:18
-msgid "Do Not Exist"
-msgstr "ne obstaja"
+msgid "Message was received"
+msgstr "Sporočilo je bilo sprejeto"
 
 #: filter/libfilter-i18n.h:19
-msgid "Draft"
-msgstr "Osnutek"
+msgid "Message was sent"
+msgstr "Sporočilo je bilo poslano"
 
 #: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "se konča z"
+msgid "Move to Folder"
+msgstr "Prestavi v mapo"
 
 #: filter/libfilter-i18n.h:21
-msgid "Exist"
-msgstr "obstaja"
+msgid "Read"
+msgstr "Beri"
 
 #: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "obstaja"
+msgid "Recipients"
+msgstr "Prejemnik"
 
 #: filter/libfilter-i18n.h:23
-msgid "Expression"
-msgstr "Izraz"
+msgid "Regex Match"
+msgstr "Regularni izraz"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Posreduj na naslove"
+msgid "Replied to"
+msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:25
-msgid "Important"
-msgstr "Pomembno"
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
+msgstr "Točke"
 
-#: filter/libfilter-i18n.h:26
-msgid "is"
-msgstr "je"
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
+msgid "Sender"
+msgstr "PoĹĄiljatelj"
 
 #: filter/libfilter-i18n.h:27
-msgid "is greater than"
-msgstr "je večje"
+msgid "Set Status"
+msgstr "Nastavi stanje"
 
 #: filter/libfilter-i18n.h:28
-msgid "is less than"
-msgstr "je manjše"
+msgid "Size (kB)"
+msgstr "Velikost (kB)"
 
 #: filter/libfilter-i18n.h:29
-msgid "is not"
-msgstr "ni"
+msgid "Source Account"
+msgstr "Izvorni račun"
 
 #: filter/libfilter-i18n.h:30
-msgid "Mailing list"
-msgstr "Dopisni seznam"
-
-#: filter/libfilter-i18n.h:31
-msgid "Message Body"
-msgstr "Jedro sporočila"
+msgid "Specific header"
+msgstr "Določena glava"
 
 #: filter/libfilter-i18n.h:32
-msgid "Message Header"
-msgstr "Glava sporočila"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was received"
-msgstr "Sporočilo je bilo sprejeto"
-
-#: filter/libfilter-i18n.h:34
-msgid "Message was sent"
-msgstr "Sporočilo je bilo poslano"
+msgid "Stop Processing"
+msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:35
-msgid "Move to Folder"
-msgstr "Prestavi v mapo"
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "Zadeva"
 
 #: filter/libfilter-i18n.h:36
-msgid "on or after"
-msgstr "na ali po"
+msgid "contains"
+msgstr "vsebuje"
 
 #: filter/libfilter-i18n.h:37
-msgid "on or before"
-msgstr "na ali pred"
+msgid "does not contain"
+msgstr "ne vsebuje"
 
 #: filter/libfilter-i18n.h:38
-msgid "Read"
-msgstr "Beri"
+msgid "does not end with"
+msgstr "se ne konča z"
 
 #: filter/libfilter-i18n.h:39
-msgid "Recipients"
-msgstr "Prejemnik"
+msgid "does not exist"
+msgstr "ne obstaja"
 
 #: filter/libfilter-i18n.h:40
-msgid "Regex Match"
-msgstr "Regularni izraz"
+msgid "does not sound like"
+msgstr "ne zveni kot"
 
 #: filter/libfilter-i18n.h:41
-msgid "Replied to"
-msgstr "Odgovorjeno na"
+msgid "does not start with"
+msgstr "se ne začne z"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
-msgid "Score"
-msgstr "Točke"
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "se konča z"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1049
-msgid "Sender"
-msgstr "Pošiljatelj"
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "obstaja"
 
 #: filter/libfilter-i18n.h:44
-msgid "Set Status"
-msgstr "Nastavi stanje"
+msgid "is greater than"
+msgstr "je večje"
 
 #: filter/libfilter-i18n.h:45
-msgid "Size (kB)"
-msgstr "Velikost (kB)"
+msgid "is less than"
+msgstr "je manjĹĄe"
 
 #: filter/libfilter-i18n.h:46
-msgid "sounds like"
-msgstr "zveni kot"
+msgid "is not"
+msgstr "ni"
 
 #: filter/libfilter-i18n.h:47
-msgid "Source Account"
-msgstr "Izvorni račun"
+msgid "is"
+msgstr "je"
 
 #: filter/libfilter-i18n.h:48
-msgid "Specific header"
-msgstr "Določena glava"
+msgid "on or after"
+msgstr "na ali po"
 
 #: filter/libfilter-i18n.h:49
-msgid "starts with"
-msgstr "se začne z"
+msgid "on or before"
+msgstr "na ali pred"
 
-#: filter/libfilter-i18n.h:50 mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Stanje"
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "zveni kot"
 
 #: filter/libfilter-i18n.h:51
-msgid "Stop Processing"
-msgstr "Prenehaj z obdelavo"
-
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:776
-#: mail/message-list.etspec.h:9
-msgid "Subject"
-msgstr "Zadeva"
+msgid "starts with"
+msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "je bilo pred"
 
@@ -5705,262 +6544,275 @@ msgstr "Uredi pravilo"
 
 #: filter/score-editor.c:130
 msgid "Score Rules"
-msgstr "Točke pravil"
+msgstr "Točke pravil"
+
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr "Opa. Kot vir morate navesti vsaj eno mapo."
 
-#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:224
-#: importers/netscape-importer.c:769 importers/pine-importer.c:638
-#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:194
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Uvozi"
 
-#: importers/elm-importer.c:506 importers/netscape-importer.c:774
-#: importers/pine-importer.c:643
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632
 msgid "Mail"
-msgstr "Pošta"
+msgstr "PoĹĄta"
 
-#: importers/elm-importer.c:510
-msgid "Elm Aliases"
-msgstr "Vzdevki programa Elm"
-
-#: importers/elm-importer.c:517 importers/evolution-gnomecard-importer.c:236
-#: importers/netscape-importer.c:796 importers/pine-importer.c:660
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Ne sprašuj me več"
-
-#: importers/elm-importer.c:550
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolucija je našla poštne datoteke programa Elm.\n"
-"Jih želite uvoziti v Evolucijo?"
+"Evolucija je naĹĄla poĹĄtne datoteke programa Elm.\n"
+"Jih Ĺželite uvoziti v Evolucijo?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
-msgstr "Poštni program Elm"
+msgstr "PoĹĄtni program Elm"
 
-#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adresar"
 
-#: importers/evolution-gnomecard-importer.c:261
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
-"Evolucija je našla datoteke GnomeCard-a.\n"
-"Jih želite uvoziti v Evolucijo?"
+"Evolucija je naĹĄla datoteke GnomeCard-a.\n"
+"Jih Ĺželite uvoziti v Evolucijo?"
 
-#: importers/netscape-importer.c:779 importers/pine-importer.c:648
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1693
-msgid "Filters"
-msgstr "Filtri"
-
-#: importers/netscape-importer.c:789
-msgid "Addressbooks"
-msgstr "Adresarji"
-
-#: importers/netscape-importer.c:836
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
-"Evolucija je našla poštne datoteke programa Netscape.\n"
-"Jih želite uvoziti v Evolucijo?"
+"Evolucija je naĹĄla poĹĄtne datoteke programa Netscape.\n"
+"Jih Ĺželite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:697
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolucija je našla poštne datoteke programa Pine.\n"
-"Jih želite uvoziti v Evolucijo?"
+"Evolucija je naĹĄla poĹĄtne datoteke programa Pine.\n"
+"Jih Ĺželite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:725
+#: importers/pine-importer.c:691
 msgid "Pine mail"
-msgstr "Poštni program Pine"
+msgstr "PoĹĄtni program Pine"
 
-#: mail/component-factory.c:666
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolucijina komponenta za obravnavo poĹĄte."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolucijin setavljalnik poĹĄte."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolucijina komponenta za povzetke."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolucijina komponenta za poĹĄtne mape."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolucijina komponenta za tovarne poĹĄtnih map."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Tovarna za Evolucijinega skladatelja."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Tovarna za Evolucijino komponento poĹĄte."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Tovarna za komponento povzetka poĹĄte."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Vmesnik za nastavitev poĹĄte"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr "Ta mapa ne more vsebovati sporočil."
+
+#: mail/component-factory.c:331
+msgid "Properties..."
+msgstr "Lastnosti..."
+
+#: mail/component-factory.c:331
+msgid "Change this folder's properties"
+msgstr "Spremeni lastnosti te mape"
+
+#: mail/component-factory.c:738
+msgid "New Mail Message"
+msgstr "Novo poštno sporočilo"
+
+#: mail/component-factory.c:738
+msgid "New _Mail Message"
+msgstr "Novo _poštno sporočilo"
+
+#: mail/component-factory.c:770
 msgid "Cannot initialize Evolution's mail component."
-msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
+msgstr "Ne morem inicializirati Evolucijine komponente za poĹĄto."
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:907
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser.c:211 mail/mail-display.c:268
+#: mail/folder-browser-ui.c:256
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Lastnosti za \"%s\""
+
+#: mail/folder-browser-ui.c:258
+msgid "Properties"
+msgstr "Lastnosti"
+
+#: mail/folder-browser.c:233 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
-msgstr "Nisem mogel ustvariti začasnega imenika: %s"
+msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/folder-browser.c:830
-msgid "Store search as vFolder"
-msgstr "Shrani iskanje kot vMapo"
+#: mail/folder-browser.c:906
+msgid "Create vFolder from Search"
+msgstr "Ustvari vMapo iz iskanja"
 
-#: mail/folder-browser.c:1173
+#: mail/folder-browser.c:1251
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1176
+#: mail/folder-browser.c:1254
 msgid "VFolder on Se_nder"
-msgstr "vMapa glede na _pošiljatelja"
+msgstr "vMapa glede na _poĹĄiljatelja"
 
-#: mail/folder-browser.c:1179
+#: mail/folder-browser.c:1257
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1182
+#: mail/folder-browser.c:1260
 msgid "VFolder on Mailing _List"
-msgstr "vMapa glede na poštni se_znam"
+msgstr "vMapa glede na poĹĄtni se_znam"
 
-#: mail/folder-browser.c:1188
+#: mail/folder-browser.c:1266
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1191
+#: mail/folder-browser.c:1269
 msgid "Filter on Sen_der"
-msgstr "Filter glede na pošilja_telja"
+msgstr "Filter glede na poĹĄilja_telja"
 
-#: mail/folder-browser.c:1194
+#: mail/folder-browser.c:1272
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1197
+#: mail/folder-browser.c:1275
 msgid "Filter on _Mailing List"
-msgstr "Filter glede na p_oštni seznam"
+msgstr "Filter glede na p_oĹĄtni seznam"
 
-#: mail/folder-browser.c:1206
-msgid "_Open"
-msgstr "_Odpri"
-
-#: mail/folder-browser.c:1208
-msgid "Resend"
-msgstr "Znova pošlji"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:89
+msgid "_Edit as New Message..."
+msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/folder-browser.c:1210 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:96
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:1212 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1290
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:95
 msgid "_Reply to Sender"
-msgstr "_Odgovori pošiljatelju"
+msgstr "_Odgovori poĹĄiljatelju"
 
-#: mail/folder-browser.c:1219 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1221 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1223
+#: mail/folder-browser.c:1301
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1226
+#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
-msgstr "Označi kot _prebrano"
+msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1228
+#: mail/folder-browser.c:1306 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
-msgstr "Označi kot _neprebrano"
+msgstr "Označi kot _neprebrano"
+
+#: mail/folder-browser.c:1308
+msgid "Mark as _Important"
+msgstr "Označi kot po_membno"
+
+#: mail/folder-browser.c:1310
+msgid "Mark as Unim_portant"
+msgstr "Označi kot ne_pomembno"
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1315
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:1235
+#: mail/folder-browser.c:1317
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1239 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:98
 msgid "_Undelete"
-msgstr "O_dbriši"
+msgstr "O_dbriĹĄi"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1326
 msgid "Add Sender to Address Book"
-msgstr "Pošiljatelja dodaj v adresar"
+msgstr "PoĹĄiljatelja dodaj v adresar"
 
-#: mail/folder-browser.c:1249
+#: mail/folder-browser.c:1331
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1335
 msgid "Create Ru_le From Message"
-msgstr "Iz sporočila ustvari _pravilo"
+msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1493
 msgid "Filter on Mailing List"
-msgstr "Filter glede na Poštni seznam"
+msgstr "Filter glede na dopisni seznam"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1494
 msgid "VFolder on Mailing List"
-msgstr "vMapa glede na Poštni seznam"
+msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:1395
+#: mail/folder-browser.c:1496
 #, c-format
 msgid "Filter on Mailing List (%s)"
-msgstr "Filter glede na Poštni seznam (%s)"
+msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:1396
+#: mail/folder-browser.c:1497
 #, c-format
 msgid "VFolder on Mailing List (%s)"
-msgstr "vMapa glede na Poštni seznam (%s)"
+msgstr "vMapa glede na dopisni seznam (%s)"
 
-#: mail/folder-browser-ui.c:252
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Lastnosti za \"%s\""
-
-#: mail/folder-browser-ui.c:254
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolucijina komponenta za obravnavo pošte."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolucijin setavljalnik pošte."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolucijina komponenta za poštne mape."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolucijina komponenta za tovarne poštnih map."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Tovarna za Evolucijinega skladatelja."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Tovarna za Evolucijino komponento pošte."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Tovarna za komponento povzetka pošte."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "Vmesnik za nastavitev pošte"
+#: mail/folder-info.c:60
+msgid "Getting Folder Information"
+msgstr "Dobivam podatke o mapi"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
@@ -5972,7 +6824,7 @@ msgstr "Uvozi mbox daoteke v Evolucijo"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Tovarna za uvoz pošte Outlook Express 4 v Evolucijo"
+msgstr "Tovarna za uvoz poĹĄte Outlook Express 4 v Evolucijo"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
@@ -5984,7 +6836,7 @@ msgstr "Trenutna oblika hranjenja:"
 
 #: mail/local-config.glade.h:2
 msgid "Mailbox Format"
-msgstr "Tip poštnega predala"
+msgstr "Tip poĹĄtnega predala"
 
 #: mail/local-config.glade.h:3
 msgid "New store format:"
@@ -5996,9 +6848,9 @@ msgid ""
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
-"Opomba: Ob pretvarjanju med različnimi oblikami poštnih predalov\n"
+"Opomba: Ob pretvarjanju med različnimi oblikami poštnih predalov\n"
 "napaka (na primer pomanjkanje prosotra na disku) ni nujno samodejno\n"
-" odpravljiva. Prosimo to možnost uprabljajte pazljivo."
+" odpravljiva. Prosimo to moĹžnost uprabljajte pazljivo."
 
 #: mail/local-config.glade.h:7
 msgid "maildir"
@@ -6012,20 +6864,25 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Niste vpisali vseh potrebnih podatkov."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+msgid "Evolution News Editor"
+msgstr "Urejevalnik Evolucijinih novic"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:162
 msgid "Evolution Account Editor"
-msgstr "Urejevalnik Evolucijinih računov"
+msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:891
+#: mail/mail-account-gui.c:998
 msgid "Save signature"
 msgstr "Shrani podpis"
 
-#: mail/mail-account-gui.c:897
+#: mail/mail-account-gui.c:1004
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6033,37 +6890,45 @@ msgid ""
 msgstr ""
 "Podpis je bil spremenjen, a ni bil shranjen.\n"
 "\n"
-"Želite shraniti spremembe?"
+"Želite shraniti spremembe?"
 
-#: mail/mail-accounts.c:130
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (privzeto)"
 
-#: mail/mail-accounts.c:169
+#: mail/mail-accounts.c:190
 msgid "Disable"
-msgstr "Izključi"
+msgstr "Izključi"
 
-#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:192
 msgid "Enable"
-msgstr "Vključi"
+msgstr "Vključi"
 
-#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
-msgstr "Ste prepričani, da želite zbrisati ta račun?"
+msgstr "Ste prepričani, da želite zbrisati ta račun?"
+
+#: mail/mail-accounts.c:284
+msgid "Don't delete"
+msgstr "Ne zbriĹĄi"
+
+#: mail/mail-accounts.c:287
+msgid "Really delete account?"
+msgstr "Resnično zbriši račun?"
 
-#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
+#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
 msgid "Are you sure you want to delete this news account?"
-msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
+msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:697
-msgid "Evolution Account Manager"
-msgstr "Upravljalnik Evolucijinih računov"
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:757 mail/mail-config.glade.h:41
+msgid "Mail Settings"
+msgstr "Nastavitev poĹĄte"
 
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
-msgstr "Pošta za %s"
+msgstr "PoĹĄta za %s"
 
 #: mail/mail-autofilter.c:213
 #, c-format
@@ -6073,145 +6938,148 @@ msgstr "Zadeva je %s"
 #: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
-msgstr "Pošta od %s"
+msgstr "PoĹĄta od %s"
 
 #: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
-msgstr "%s poštnih seznamov"
+msgstr "%s poĹĄtnih seznamov"
 
 #: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
 "receive or compose mail.\n"
 "Would you like to configure it now?"
 msgstr ""
-"Niste nastavili vašega odjemalca pošte.\n"
-"To morate storiti preden lahko pošiljate,\n"
-"ali skladate pošto.\n"
-"Bi ga želeli nastaviti sedaj?"
+"Niste nastavili vaĹĄega odjemalca poĹĄte.\n"
+"To morate storiti preden lahko poĹĄiljate,\n"
+"ali skladate poĹĄto.\n"
+"Bi ga Ĺželeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:149
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 "Nastaviti morate sovjo identiteto\n"
-"preden lahko skladate pošto."
+"preden lahko skladate poĹĄto."
 
-#: mail/mail-callbacks.c:161
+#: mail/mail-callbacks.c:160
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
-"Nastaviti morate način prenosa pošte\n"
-"preden lahko skladate pošto."
+"Nastaviti morate način prenosa pošte\n"
+"preden lahko skladate poĹĄto."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:184
 msgid "You have not set a mail transport method"
-msgstr "Niste nastavili postopka prenašanja pošte"
+msgstr "Niste nastavili postopka prenaĹĄanja poĹĄte"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:217
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
-"To poročilo nima 'zadeve'.\n"
-"Resnično pošlji?"
+"To poročilo nima 'zadeve'.\n"
+"Resnično pošlji?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:252
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"To sporočilo vsebuje le prejemnike bcc.\n"
-"Možno je, da poštni strežnik razkrije prejemnike z dodatkom glave Apparenlty-"
-"To (Očitno-za).\n"
-"Vseeno pošlji?"
+"To sporočilo vsebuje le prejemnike bcc.\n"
+"MoĹžno je, da poĹĄtni streĹžnik razkrije prejemnike z dodatkom glave Apparenlty-"
+"To (Očitno-za).\n"
+"Vseeno poĹĄlji?"
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:338
 msgid "You must specify recipients in order to send this message."
-msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
+msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:389
 msgid "You must configure an account before you can send this email."
-msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto."
+msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto."
 
-#: mail/mail-callbacks.c:655
+#: mail/mail-callbacks.c:632
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Na %s, je %s zapisal(a):"
 
-#: mail/mail-callbacks.c:874
+#: mail/mail-callbacks.c:893
 msgid "Forwarded message:\n"
-msgstr "Posredovano sporočilo:\n"
+msgstr "Posredovano sporočilo:\n"
 
-#: mail/mail-callbacks.c:968
+#: mail/mail-callbacks.c:990
 msgid "Move message(s) to"
-msgstr "Prestavi sporočilo(a) v"
+msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:970
+#: mail/mail-callbacks.c:992
 msgid "Copy message(s) to"
-msgstr "Kopiraj sporočilo(a) v"
+msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1325
+#: mail/mail-callbacks.c:1361
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
-msgstr "Ste prepričani, da želite urediti vseh %d sporočil?"
+msgstr "Ste prepričani, da želite urediti vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:1347
+#: mail/mail-callbacks.c:1383
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
-"Urejate lahko le sporočila shranjena\n"
+"Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1381
+#: mail/mail-callbacks.c:1417
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
-"Znova lahko pošljete le sporočila\n"
+"Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1393
+#: mail/mail-callbacks.c:1429
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
+msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:1414
+#: mail/mail-callbacks.c:1450
 msgid "No Message Selected"
-msgstr "Izbrano ni nilo nobeno sporočilo"
-
-#: mail/mail-callbacks.c:1448 mail/mail-display.c:98
-msgid "Overwrite file?"
-msgstr "Prepiši datoteko?"
-
-#: mail/mail-callbacks.c:1452 mail/mail-display.c:102
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Datoteka z enakim imenom že obstaja.\n"
-"Naj jo prepišem?"
+msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:1496
+#: mail/mail-callbacks.c:1535
 msgid "Save Message As..."
-msgstr "Shrani sporočilo kot..."
+msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:1498
+#: mail/mail-callbacks.c:1537
 msgid "Save Messages As..."
-msgstr "Shrani sporočila kot..."
+msgstr "Shrani sporočila kot..."
+
+#: mail/mail-callbacks.c:1679 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Opozorilo"
+
+#: mail/mail-callbacks.c:1686
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages. \n"
+" \n"
+" Really erase these messages? "
+msgstr ""
+"Ta operacija bo trajno zbrisala vsa sporočila označena kot zbrisana. Če boste nadaljevali ne boste mogli več do teh sporočil. \n"
+" \n"
+" Resnično zbriši ta sporočila? "
 
-#: mail/mail-callbacks.c:1683
+#: mail/mail-callbacks.c:1788
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6220,22 +7088,22 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1741
+#: mail/mail-callbacks.c:1798
+msgid "Filters"
+msgstr "Filtri"
+
+#: mail/mail-callbacks.c:1844
 msgid "Print Message"
-msgstr "Natisni sporočilo"
+msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:1788
+#: mail/mail-callbacks.c:1890
 msgid "Printing of message failed"
-msgstr "Tiskanje sporočila ni uspelo"
+msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:1883
+#: mail/mail-callbacks.c:1974
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
-
-#: mail/mail-config.c:1561 mail/mail-config.c:1564
-msgid "Connecting to server..."
-msgstr "Vzpostavljam povezavo s strežnikom..."
+msgstr "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
 
 #: mail/mail-config-druid.c:99
 msgid ""
@@ -6243,9 +7111,9 @@ msgid ""
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
-"Prosimo spodaj vpišite svoje ime in e-poštni naslov. Polj \"po želji\" ni "
-"potrebno izpolniti, razen, če ne želite vključiti te podatke v e-pošto, ki "
-"jo boste pošiljali."
+"Prosimo spodaj vpiĹĄite svoje ime in e-poĹĄtni naslov. Polj \"po Ĺželji\" ni "
+"potrebno izpolniti, razen, če ne želite vključiti te podatke v e-pošto, ki "
+"jo boste poĹĄiljali."
 
 #: mail/mail-config-druid.c:101
 msgid ""
@@ -6253,8 +7121,8 @@ msgid ""
 "know what kind of server you use, contact your system administrator or "
 "Internet Service Provider."
 msgstr ""
-"Prosimo spodaj vpišite podatke o vašem strežniku dohodne pošte. Če ne veste "
-"katero vrsto strežnika uporabljate se obrnite na vašega sistemskega "
+"Prosimo spodaj vpišite podatke o vašem strežniku dohodne pošte. Če ne veste "
+"katero vrsto streĹžnika uporabljate se obrnite na vaĹĄega sistemskega "
 "administratorja ali ponudnika internet dostopa."
 
 #: mail/mail-config-druid.c:105
@@ -6263,8 +7131,8 @@ msgid ""
 "don't know which protocol you use, contact your system administrator or "
 "Internet Service Provider."
 msgstr ""
-"Prosimo spodaj vpišite podatke o vašem strežniku odhodne pošte. Če ne veste "
-"kater protokol uporabljatie se obrnite na vašega sistemskega administratorja "
+"Prosimo spodaj vpišite podatke o vašem strežniku odhodne pošte. Če ne veste "
+"kater protokol uporabljatie se obrnite na vaĹĄega sistemskega administratorja "
 "ali ponudnika internet dostopa."
 
 #: mail/mail-config-druid.c:107
@@ -6275,77 +7143,90 @@ msgid ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 msgstr ""
-"Skoraj ste že končali z procesom nastavljanja pošte. Identiteta, strežnik "
-"prihajajoče pošte in metoda pošiljanja pošte bodo združene skupaj in tako bo "
-"ustvarjen račun pošte Evolucija. Prosimo v prostor spodaj vpišite ime za ta "
-"račun. Ime bo uporabljeno le za prikaz."
+"S procesom nastavljanja poĹĄte ste skoraj pri koncu. Identiteta, streĹžnik "
+"prihajajoče pošte in metoda pošiljanja pošte bodo združene skupaj in tako bo "
+"ustvarjen račun pošte Evolucija. Prosimo v prostor spodaj vpišite ime za ta "
+"račun. Ime bo uporabljeno le za prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr "Evolucijin čarovnik za račune"
+#: mail/mail-config-druid.c:464
+msgid "Evolution Account Assistant"
+msgstr "Evolucijin druid za račune"
+
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1534
+msgid "%s: Inbox"
+msgstr "%s: Dohdona poĹĄta"
 
-#: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr " Preveri za podprte tipe"
+#: mail/mail-config.c:1764
+msgid "Checking Service"
+msgstr "Preverjam storitev"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.c:1835 mail/mail-config.c:1838
+msgid "Connecting to server..."
+msgstr "Vzpostavljam povezavo s streĹžnikom..."
+
+#: mail/mail-config.glade.h:1
 msgid " color"
 msgstr " barvo"
 
+#: mail/mail-config.glade.h:2
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "(SSL v tej različici Evolucije ni podprt)"
+
 #: mail/mail-config.glade.h:3
 msgid "Account"
-msgstr "Račun"
+msgstr "Račun"
 
 #: mail/mail-config.glade.h:4
 msgid "Account Information"
-msgstr "Podatki o računu"
+msgstr "Podatki o računu"
 
 #: mail/mail-config.glade.h:5
 msgid "Account Management"
-msgstr "Upravljanje z računom"
+msgstr "Upravljanje z računom"
 
 #: mail/mail-config.glade.h:6
 msgid "Accounts"
-msgstr "Računi"
+msgstr "Računi"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
-msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
+msgstr "Kadar poĹĄiljam ĹĄifrirano poĹĄto, vedno ĹĄifriraj sebi"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
-msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
+msgstr "Kadar poĹĄiljam ĹĄifrirano poĹĄto, vedno ĹĄifriraj sebi"
 
-#: mail/mail-config.glade.h:10
-msgid "Always load images off the net"
-msgstr "Vedno naloži slike s spleta"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
+msgstr "Ob uporabi tega računa vedno podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
-msgstr "Način avtentifikacije: "
-
-#: mail/mail-config.glade.h:14
-msgid "Automatically check for new mail every"
-msgstr "Samodejno preveri za novo pošto vsakih"
+msgstr "Način avtentifikacije: "
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "ID certifikata:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Skladatelj"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6354,502 +7235,584 @@ msgid ""
 "\n"
 "Click \"Finish\" to save your settings."
 msgstr ""
-"Čestitke, nastavljanje vaše pošte je končano.\n"
+"Čestitke, nastavljanje vaše pošte je končano.\n"
 "\n"
-"Sedaj ste pripravljeni na sprejemanje in pošiljanje pošte \n"
-"s pomočjo Evolucije. \n"
+"Sedaj ste pripravljeni na sprejemanje in poĹĄiljanje poĹĄte \n"
+"s pomočjo Evolucije. \n"
 "\n"
-"Kliknite \"Končaj\" za shranitev vaših nastavitev."
+"Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
-msgstr "Privzet način \"Posreduj naprej\" je: "
+#: mail/mail-config.glade.h:23
+msgid "Default Forward style is: "
+msgstr "Privzet način posredovanja naprej je: "
 
-#: mail/mail-config.glade.h:26
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr "Digitalni IDji..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Prikaz"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:175
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Mapa osnutkov:"
 
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:30
+msgid "E_nable"
+msgstr "_Vključi"
+
+#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: mail/mail-config.glade.h:35
-msgid "Email Address:"
-msgstr "E-poštni naslov:"
-
-#: mail/mail-config.glade.h:36
-msgid "Empty trash folders on exit"
-msgstr "Ob izhodu sprazni mapo smeti"
-
-#: mail/mail-config.glade.h:38
-msgid "Full Name:"
-msgstr "Polno ime:"
+#: mail/mail-config.glade.h:32
+msgid "Enabled"
+msgstr "Vključeno"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Get Digital ID..."
 msgstr "Dobi digitalni ID..."
 
-#: mail/mail-config.glade.h:40
-msgid "HTML Signature:"
-msgstr "Podpis HTML:"
-
-#: mail/mail-config.glade.h:41
-msgid "Highlight citations with"
-msgstr "Osvetli citiranja z"
+#: mail/mail-config.glade.h:34
+msgid "HTML signature file:"
+msgstr "Datoteka s podpisom HTML:"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:35
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:36
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:37
 msgid "In HTML mail"
-msgstr "V pošti HTML"
+msgstr "V poĹĄti HTML"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:38
 msgid "Inline"
-msgstr "Kot del sporočila"
+msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:39
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
-msgid "Load images if sender is in addressbook"
-msgstr "Naloži slike, če je pošiljatelj v adresarju"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration"
-msgstr "Nastavitev pošte"
+msgstr "Nastavitev poĹĄte"
 
-#: mail/mail-config.glade.h:50
-msgid "Make this my default account"
-msgstr "Naj bo to moj privzet račun"
+#: mail/mail-config.glade.h:42
+msgid "Mailbox location"
+msgstr "Mesto poĹĄtnega predala"
 
-#: mail/mail-config.glade.h:51
-msgid "Mark messages as \"Read\" after:"
-msgstr "Označi sporočila kot \"Prebrana\" po:"
+#: mail/mail-config.glade.h:43
+msgid "Make this my _default account"
+msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:52
-msgid "NNTP Server:"
-msgstr "Strežnik NNTP"
+#: mail/mail-config.glade.h:44
+msgid "Message _preview should be displayed by default"
+msgstr "Privzet naj bo _predogled sporočila"
 
-#: mail/mail-config.glade.h:54
-msgid "Never load images off the net"
-msgstr "Nikoli ne naloži slik s spleta"
+#: mail/mail-config.glade.h:45
+msgid "Message list should display in a _threaded fashion by default"
+msgstr "Seznam sporočil naj bo privzeto prikazan _niteno"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:46
+msgid "NNTP Server:"
+msgstr "StreĹžnik NNTP"
+
+#: mail/mail-config.glade.h:47
 msgid "News"
 msgstr "Novice"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:49
 msgid "Optional Information"
-msgstr "Podatki po želji"
-
-#: mail/mail-config.glade.h:58
-msgid "Organization:"
-msgstr "Organizacija:"
+msgstr "Podatki po Ĺželji"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:51
 msgid "PGP Key ID:"
-msgstr "ID ključa PGP:"
+msgstr "ID ključa PGP:"
 
-#: mail/mail-config.glade.h:61
-msgid "PGP binary path:"
-msgstr "Pot do izvršljive datoteke PGP"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:54
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:55
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy (precej dobra zasebnost)"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:56
+msgid "Prompt when sending messages with an _empty subject"
+msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
+
+#: mail/mail-config.glade.h:57
+msgid "Prompt when sending messages with only _Bcc recipients defined"
+msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
+
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
-msgstr "Poštni imenik Qmail"
+msgstr "PoĹĄtni imenik Qmail"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:60
 msgid "Receiving Email"
-msgstr "Sprejemam e-pošto"
+msgstr "Sprejemam e-poĹĄto"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:61
 msgid "Receiving Mail"
-msgstr "Sprejemanje pošte"
+msgstr "Sprejemanje poĹĄte"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:62
 msgid "Receiving Options"
-msgstr "Možnosti sprejema"
+msgstr "MoĹžnosti sprejema"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:63
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:65
 msgid "Secure MIME"
 msgstr "Varni MIME"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:66
 msgid "Security"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:67
+msgid "Select Filter Log file..."
+msgstr "Izberi datoteko za dnevnik filtra..."
+
+#: mail/mail-config.glade.h:68
 msgid "Select PGP binary"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:78
-msgid "Send mail in HTML format by default."
-msgstr "Privzeto pošlji pošto v HTML obliki."
-
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:69
 msgid "Sending Email"
-msgstr "Pošiljam e-pošto"
+msgstr "PoĹĄiljam e-poĹĄto"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:70
 msgid "Sending Mail"
-msgstr "Pošiljanje pošte"
+msgstr "PoĹĄiljanje poĹĄte"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:72 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:178
 msgid "Sent"
 msgstr "Poslano"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:73
 msgid "Sent and Draft Messages"
-msgstr "Poslana sporočila in osnutki"
+msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:74
 msgid "Sent messages folder:"
-msgstr "Mapa poslanih sporočil:"
+msgstr "Mapa poslanih sporočil:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:75
 msgid "Server Configuration"
-msgstr "Nastavitev strežnika"
+msgstr "Nastavitev streĹžnika"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:76
 msgid "Server Type: "
-msgstr "Vrsta strežnika:"
+msgstr "Vrsta streĹžnika:"
 
-#: mail/mail-config.glade.h:87
-msgid "Server requires authentication"
-msgstr "Strežnik zahteva avtentifikacijo"
+#: mail/mail-config.glade.h:77
+msgid "Server requires _authentication"
+msgstr "StreĹžnik zahteva _avtentifikacijo"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:78
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:79
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:80
 msgid "Source Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:81
 msgid "Sources"
 msgstr "Viri"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:82
 msgid "Special Folders"
 msgstr "Posebne mape"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:83
 msgid "Standard Unix mbox"
-msgstr "Običajnen Unix poštni predal"
-
-#: mail/mail-config.glade.h:94
-msgid "Type"
-msgstr "Vrsta"
-
-#: mail/mail-config.glade.h:95
-msgid "Use secure connection (SSL)"
-msgstr "Uporabi varno povezavo (SSL)"
+msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:96
-msgid "Username:"
-msgstr "Uporabniško ime:"
+#: mail/mail-config.glade.h:85
+msgid "Use secure connection (_SSL)"
+msgstr "Uporabi varno povezavo (_SSL)"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:86
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
-"Dobrodošli v Evolucijinem druidu za nastavitev pošte.\n"
+"DobrodoĹĄli v Evolucijinem druidu za nastavitev poĹĄte.\n"
 "\n"
-"Kliknite \"Naprej\" za začetek. "
+"Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:102 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:47
-msgid "_Edit"
-msgstr "_Uredi"
+#: mail/mail-config.glade.h:90
+msgid "_Always load images off the net"
+msgstr "_Vedno naloĹži slike s spleta"
+
+#: mail/mail-config.glade.h:91
+msgid "_Automatically check for new mail every"
+msgstr "_Samodejno preveri za novo poĹĄto vsakih"
+
+#: mail/mail-config.glade.h:92
+msgid "_Check for supported types"
+msgstr "_Preveri za podprte tipe"
+
+#: mail/mail-config.glade.h:95
+msgid "_Email Address:"
+msgstr "_E-poĹĄtni naslov:"
+
+#: mail/mail-config.glade.h:96
+msgid "_Empty trash folders on exit"
+msgstr "Ob izhodu _sprazni mapo smeti"
+
+#: mail/mail-config.glade.h:97
+msgid "_Full Name:"
+msgstr "_Polno ime:"
+
+#: mail/mail-config.glade.h:98
+msgid "_HTML Signature:"
+msgstr "Podpis _HTML:"
+
+#: mail/mail-config.glade.h:99
+msgid "_Highlight citations with"
+msgstr "_Osvetli citiranja z"
+
+#: mail/mail-config.glade.h:100
+msgid "_Host:"
+msgstr "_Gostitelj:"
+
+#: mail/mail-config.glade.h:101
+msgid "_Load images if sender is in addressbook"
+msgstr "_Naloži slike, če je pošiljatelj v adresarju"
+
+#: mail/mail-config.glade.h:102
+msgid "_Log filter actions to:"
+msgstr "Zapisuj dejanja filtra v:"
+
+#: mail/mail-config.glade.h:103
+msgid "_Mark messages as Read after"
+msgstr "_Označi sporočila kot prebrana po:"
 
 #: mail/mail-config.glade.h:104
+msgid "_Name:"
+msgstr "_Ime:"
+
+#: mail/mail-config.glade.h:105
+msgid "_Never load images off the net"
+msgstr "_Nikoli ne naloĹži slik s spleta"
+
+#: mail/mail-config.glade.h:106
+msgid "_Organization:"
+msgstr "_Organizacija:"
+
+#: mail/mail-config.glade.h:107
+msgid "_PGP binary path:"
+msgstr "Pot do izvrĹĄljive datoteke _PGP"
+
+#: mail/mail-config.glade.h:108
+msgid "_Path:"
+msgstr "_Pot:"
+
+#: mail/mail-config.glade.h:109
+msgid "_Remember PGP Passphrase until exit"
+msgstr "Do izhoda pomni geslo PGP"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember this password"
+msgstr "_Zapomni si to geslo"
+
+#: mail/mail-config.glade.h:111
+msgid "_Send mail in HTML format by default."
+msgstr "Privzeto poĹĄiljaj poĹĄto v _HTML obliki."
+
+#: mail/mail-config.glade.h:112
+msgid "_Signature file:"
+msgstr "Datoteka s _podpisom:"
+
+#: mail/mail-config.glade.h:113
+msgid "_Username:"
+msgstr "_UporabniĹĄko ime:"
+
+#: mail/mail-config.glade.h:115
 msgid "newswindow1"
 msgstr "oknonovic1"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:116
 msgid "placeholder"
-msgstr "držalec mesta"
+msgstr "drĹžalec mesta"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:117
 msgid "seconds."
 msgstr "sekund."
 
-#: mail/mail-crypto.c:59
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
-msgstr "Nisem mogel ustvariti konteksta šifiranja PGP."
+msgstr "Nisem mogel ustvariti konteksta ĹĄifiranja PGP."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
-msgstr "Nisem mogel ustvariti konteksta dešifriranja PGP."
+msgstr "Nisem mogel ustvariti konteksta deĹĄifriranja PGP."
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisa S/MIME"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nisem mogel ustvariti konteksta certifikatov S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
-msgstr "Nisem mogel ustvariti konteksta šifriranja S/MIME."
+msgstr "Nisem mogel ustvariti konteksta ĹĄifriranja S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
-msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
+msgstr "Nisem mogel ustvariti konteksta deĹĄifriranja S/MIME."
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:332
-#, c-format
-msgid "Open in %s..."
-msgstr "Odpri v %s..."
-
-#: mail/mail-display.c:334
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:369
-msgid "External Viewer"
-msgstr "zunanjem pregledovalniku"
+#: mail/mail-display.c:345
+#, c-format
+msgid "Open in %s..."
+msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:402
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:396
+#: mail/mail-display.c:406
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:1028
+#: mail/mail-display.c:427
+msgid "External Viewer"
+msgstr "zunanjem pregledovalniku"
+
+#: mail/mail-display.c:1051
 msgid "Loading message content"
-msgstr "Nalagam vsebino sporočila"
+msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1371
+#: mail/mail-display.c:1407
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1373
+#: mail/mail-display.c:1409
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1375
+#: mail/mail-display.c:1411
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1377
-msgid "Save Image as"
-msgstr "Shrani sliko kot"
+#: mail/mail-display.c:1413
+msgid "Save Image as..."
+msgstr "Shrani sliko kot..."
+
+#: mail/mail-folder-cache.c:147
+msgid "%d new"
+msgstr "%d novih"
+
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
+msgid ", "
+msgstr ", "
+
+#: mail/mail-folder-cache.c:154
+#, c-format
+msgid "%d hidden"
+msgstr "%d skritih"
+
+#: mail/mail-folder-cache.c:161
+msgid "%d selected"
+msgstr "%d izbranih"
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:170
+msgid "%d unsent"
+msgstr "%d neposlanih"
+
+#: mail/mail-folder-cache.c:172
 #, c-format
+msgid "%d total"
+msgstr "skupaj %d"
+
+#: mail/mail-format.c:623
 msgid "%s attachment"
-msgstr "%s priloga"
+msgstr "priloga %s"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
+msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/mail-format.c:649 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:765 mail/message-list.etspec.h:4
+#: mail/mail-format.c:856
+msgid "Bad Address"
+msgstr "Slab naslov"
+
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:768
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:771 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:774
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "Program GPG/PGP ni nastavljen."
 
-#: mail/mail-format.c:1111
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
-msgstr "Šifrirano sporočilo ni prikazano"
+msgstr "Šifrirano sporočilo ni prikazano"
 
-#: mail/mail-format.c:1117
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
-msgstr "Šifrirano sporočilo"
+msgstr "Šifrirano sporočilo"
 
-#: mail/mail-format.c:1118
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
-msgstr "Kliknite ikono za dešifriranje."
+msgstr "Kliknite ikono za deĹĄifriranje."
 
-#: mail/mail-format.c:1174
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
-msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
+msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
-"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
+"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
+msgstr "Kazalec na krajevno datoteko (%s) veljaven na streĹžniku \"%s\""
 
-#: mail/mail-format.c:1849
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1883
+#: mail/mail-format.c:2109
+msgid "Pointer to remote data (%s)"
+msgstr "Kazalec na oddaljen podatek (%s)"
+
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1888
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
-msgstr "Napačno oblikovano dodatno telo sporočila."
+msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:455
+#: mail/mail-local.c:466
 #, c-format
 msgid "Opening '%s'"
 msgstr "Odpiram '%s'"
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:754
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:759
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
-
-#: mail/mail-local.c:782
-msgid "Reconfiguring folder"
-msgstr "Prenastavljam mapo"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:811
-msgid "Closing current folder"
-msgstr "Zapiram trenutno mapo"
-
-#: mail/mail-local.c:838
-msgid "Renaming old folder and opening"
-msgstr "Preimenujem in odpiram staro mapo"
-
-#: mail/mail-local.c:856
-msgid "Creating new folder"
-msgstr "Ustvari novo mapo"
-
-#: mail/mail-local.c:870
-msgid "Copying messages"
-msgstr "Kopiram sporočilo"
-
-#: mail/mail-local.c:887
+#: mail/mail-local.c:875
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
-"Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
+"Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:926
+#: mail/mail-local.c:914
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
-"Če ne morete več odpreti tega poštnega predala, potem\n"
-"ga boste morda morali popraviti ročno."
+"Če ne morete več odpreti tega poštnega predala, potem\n"
+"ga boste morda morali popraviti ročno."
 
-#: mail/mail-local.c:1012
+#: mail/mail-local.c:1007
+msgid "You cannot change the format of a non-local folder."
+msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
+
+#: mail/mail-local.c:1018
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znova nastavi %s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6858,7 +7821,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6867,110 +7830,115 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Zapomni si geslo"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-mt.c:867
-msgid "Evolution progress"
-msgstr "Napredek evolucije"
+#: mail/mail-ops.c:84
+msgid "Filtering Folder"
+msgstr "Mapa filtrov"
+
+#: mail/mail-ops.c:227
+msgid "Fetching Mail"
+msgstr "Sprejemanje poĹĄte"
 
-#: mail/mail-ops.c:547
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
-msgstr "Pošiljam \"%s\""
+msgstr "PoĹĄiljam \"%s\""
 
-#: mail/mail-ops.c:551
-msgid "Sending message"
-msgstr "Pošiljam sporočilo"
-
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "Pošiljam sporočilo %d od %d"
+msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:681
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
-msgstr "Neuspeh pri sporočilu %d od %d"
+msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:683 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
 msgid "Complete."
-msgstr "Končano."
+msgstr "Končano."
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
-msgstr "Shranjujem sporočilo v mapo"
+msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
-msgstr "Prestavljam sporočila v %s"
+msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
-msgstr "Kopiram sporočia v %s"
+msgstr "Kopiram sporočia v %s"
 
-#: mail/mail-ops.c:863
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:956
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "Osvežujem mape v \"%s\""
+msgstr "Pregledujem mape v \"%s\""
 
-#: mail/mail-ops.c:1118
+#. Fill in the new fields
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:180
+msgid "Trash"
+msgstr "Smeti"
+
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
-msgstr "Posredovana sporočila"
+msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1159 mail/mail-ops.c:1297
+#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1226
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1365
+#: mail/mail-ops.c:1460
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1599
 msgid "Refreshing folder"
-msgstr "Osvežujem mapo"
+msgstr "OsveĹžujem mapo"
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1635
 msgid "Expunging folder"
-msgstr "Uničujem mapo"
+msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1684
 #, c-format
 msgid "Retrieving message %s"
-msgstr "Prenašam sporočilo %s"
-
-#: mail/mail-ops.c:1649
-msgid "Retrieving messages"
-msgstr "Prenašam sporočilo"
+msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1659
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Prenašam sporočilo številka %d od %d (uid \"%s\")"
+#: mail/mail-ops.c:1751
+msgid "Retrieving %d message(s)"
+msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1733
-msgid "Saving messages"
-msgstr "Shranjujem sporočila"
+#: mail/mail-ops.c:1837
+msgid "Saving %d messsage(s)"
+msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1812
+#: mail/mail-ops.c:1917
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6979,25 +7947,20 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1825
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Shranjujem sporočilo %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1943
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
-"Napaka ob shranjevanju sporočil v: %s:\n"
+"Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:2017
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:2033
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7006,173 +7969,175 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1956
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2133
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "I_skanje"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
-msgstr "(Neimenovano sporočilo)"
+msgstr "(Neimenovano sporočilo)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:237
+msgid "Untitled Message"
+msgstr "Neimenovano sporočilo"
+
+#: mail/mail-search.c:241
+msgid "Empty Message"
+msgstr "Prazno sporočilo"
+
+#: mail/mail-search.c:288
 msgid "Find in Message"
-msgstr "Poišči v sporočilu"
+msgstr "Poišči v sporočilu"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
-msgstr "Razlikuj velike in male črke"
+msgstr "Razlikuj velike in male črke"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:320
 msgid "Search Forward"
-msgstr "Išči naprej"
+msgstr "Išči naprej"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:340
 msgid "Find:"
-msgstr "Poišči"
+msgstr "Poišči"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Ustreza:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "Preklicujem..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
-msgstr "Oddaja in sprejem pošte"
+msgstr "Oddaja in sprejem poĹĄte"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Sprejemam"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "Posodabljam..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
-msgstr "Čakam..."
-
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Pošiljam"
+msgstr "Čakam..."
 
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:507
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: mail/mail-tools.c:159
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Nisem mogel ustvariti začasnega poštnega predala `%s': %s"
+#: mail/mail-session.c:182
+msgid "User canceled operation."
+msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-tools.c:207
+#: mail/mail-tools.c:173
 #, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (posredovano sporočilo)"
-
-#: mail/mail-tools.c:217
-msgid "Fwd: (no subject)"
-msgstr "Posreduj: (ni zadeve)"
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr "Nisem mogel ustvariti začasnega poštnega predala `%s': %s"
 
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "Posredovano sporočilo %s"
+msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:236
-msgid "Forwarded message (no subject)"
-msgstr "Posredovano sporočilo (brez navedene zadeve)"
+#: mail/mail-tools.c:245
+msgid "Forwarded message"
+msgstr "Posredovano sporočilo"
 
-#: mail/mail-tools.c:457
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Posredovano sporočilo-----<br><b>Od:</b> %s<br><b>Za:</b> %"
-"s<br><b>Predmet:</b> %s<br>"
+#: mail/mail-tools.c:471
+msgid "Forwarded Message"
+msgstr "Posredovano sporočilo"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:282
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:502
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-list.c:608
+#: mail/message-browser.c:125
+msgid "(No subject)"
+msgstr "(brez zadeve)"
+
+#: mail/message-browser.c:127
+msgid "%s - Message"
+msgstr "%s - sporočilo"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:609
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
-msgstr "več nevidenih sporočil"
+msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:612
+#: mail/message-list.c:640
 msgid "Multiple Messages"
-msgstr "Več sporočil"
+msgstr "Več sporočil"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:644
 msgid "Lowest"
-msgstr "najnižja"
+msgstr "najniĹžja"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:650
 msgid "Highest"
-msgstr "najvišja"
+msgstr "najviĹĄja"
 
-#: mail/message-list.c:872
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
-msgstr "Včeraj %l:%M %p"
+msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:908
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
-
-#: mail/message-list.c:910
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2314
+msgid "Generating message list"
+msgstr "Ustvarjam seznam sporočil"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
-msgstr "Označeno"
+msgstr "Označeno"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Sprejeto"
 
@@ -7180,41 +8145,68 @@ msgstr "Sprejeto"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/mail-session.c:170
-msgid "User canceled operation."
-msgstr "Uporabnik je dejanje preklical."
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Mapa"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Shramba"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Prikaži mape, ki se začnejo z:"
+#: mail/subscribe-dialog.c:166
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Pregledujem mape pod %s na \"%s\""
 
 #: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Dobivam shrambo za \"%s\""
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Pregledujem korenske mape na \"%s\""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:267
 #, c-format
 msgid "Subscribing to folder \"%s\""
-msgstr "Naročam se na mapo \"%s\""
+msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:269
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
-msgstr "Preklicujem naročnino na mapo \"%s\""
+msgstr "Preklicujem naročnino na mapo \"%s\""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Mapa"
+
+#: mail/subscribe-dialog.c:1432
+msgid "No server has been selected"
+msgstr "StreĹžnik ni bil izbran"
+
+#: mail/subscribe-dialog.c:1489
+msgid "Please select a server."
+msgstr "Prosimo izberite streĹžnik."
+
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
+msgstr " _OsveĹži seznam"
+
+#: mail/subscribe-dialog.glade.h:2
+msgid "All folders"
+msgstr "Vse mape"
+
+#: mail/subscribe-dialog.glade.h:3
+msgid "Display options"
+msgstr "PokaĹži moĹžnosti"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr "Mape, katerih ime se začno z:"
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
-msgstr "Uredi naročnine"
+msgstr "Uredi naročnine"
+
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr "KaĹži _mape s streĹžnika: "
+
+#: mail/subscribe-dialog.glade.h:7
+msgid "_Subscribe"
+msgstr "_Naroči se"
+
+#: mail/subscribe-dialog.glade.h:8
+msgid "_Unsubscribe"
+msgstr "_Prekliči naročnino"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
@@ -7224,143 +8216,215 @@ msgstr "Evolucijina komponenta za povzetke."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Tovarna za Evolucijine komponente za povzetke."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
 
-#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
-msgstr "Zmeneki"
+msgstr "Sestanki"
 
-#: my-evolution/e-summary-calendar.c:159
+#: my-evolution/e-summary-calendar.c:183
 msgid "No appointments"
-msgstr "Ni zmenkov"
+msgstr "Ni sestankovov"
 
-#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: my-evolution/e-summary-calendar.c:236
+msgid "%l:%M%p"
+msgstr "%l:%M%p"
 
-#: my-evolution/e-summary-mail.c:100
+#: my-evolution/e-summary-calendar.c:238
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M%p"
+
+#: my-evolution/e-summary-mail.c:105
 msgid "Mail summary"
-msgstr "Povzetek pošte"
+msgstr "Povzetek poĹĄte"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com beseda dneva"
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr "Citati dneva"
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr "Dodaj vir novic"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr "VpiĹĄite vir novic, ki ga Ĺželite dodati"
+
+#: my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Ime:"
+
+#: my-evolution/e-summary-preferences.c:1403
+msgid "Summary Settings"
+msgstr "Nastavitev povzetka"
 
-#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr "Napaka ob prenaĹĄanju vira novic."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
-msgstr "<b>Napaka ob prenašanju RDF</b>"
+msgstr "<b>Napaka ob prenaĹĄanju RDF</b>"
+
+#: my-evolution/e-summary-tasks.c:213
+msgid "No tasks"
+msgstr "Brez nalog"
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:296
-msgid "<b>Error downloading Metar</b>"
-msgstr "<b>Napaka ob prenašanju Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr "<dd><b>StreĹžnik vremena ni dosegljiv</b></dd>"
 
-#: my-evolution/e-summary-weather.c:612
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
-msgstr "Območja"
+msgstr "Območja"
 
-#: my-evolution/e-summary.c:413 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
-msgstr "Natisni Mojo evolucijo"
+#: my-evolution/e-summary.c:145
+msgid "%A, %B %e %Y"
+msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:459
-msgid "Printing of My Evolution failed"
-msgstr "Tiskanje Moje evolucije ni uspelo"
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+msgid "Print Summary"
+msgstr "Natisni povzetek"
+
+#: my-evolution/e-summary.c:518
+msgid "Printing of Summary failed"
+msgstr "Tiskanje povzetka ni uspelo"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\n"
 
-#: my-evolution/metar.c:43
+#: my-evolution/metar.c:29
+msgid "°F"
+msgstr "°F"
+
+#: my-evolution/metar.c:29
+msgid "°C"
+msgstr "°C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "vozlov"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/h"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "milje"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometrov"
+
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Jasno"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
-msgstr "Pretežno oblačno"
+msgstr "Pretežno oblačno"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
-msgstr "Delno oblačno"
+msgstr "Delno oblačno"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Few clouds"
-msgstr "Pretežno jasno"
+msgstr "PreteĹžno jasno"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Overcast"
-msgstr "Oblačno"
+msgstr "Oblačno"
 
-#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
 msgstr "Neveljavno"
 
-#: my-evolution/metar.c:62
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "Spremenljivo"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "sever"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "sever - severovzhod"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "severovzhod"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "vzhod - severovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "vzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "vzhod - jugovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "jugovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "jug - jugovzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "jug"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "jug - jugozahod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "jugozahod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "zahod - jugozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "zahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "zahod - severozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "severozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "sever - severozahod"
 
@@ -7368,1071 +8432,1210 @@ msgstr "sever - severozahod"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle"
-msgstr "Pršenje"
+msgstr "PrĹĄenje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
-msgstr "Pršenje v okolici"
+msgstr "PrĹĄenje v okolici"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
-msgstr "Rahlo pršenje"
+msgstr "Rahlo prĹĄenje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
-msgstr "Zmerno pršenje"
+msgstr "Zmerno prĹĄenje"
 
 # @ Hmmm...
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
-msgstr "Močno pršenje"
+msgstr "Močno pršenje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
-msgstr "Plitvo pršenje"
+msgstr "Plitvo prĹĄenje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
-msgstr "Ponekod prši"
+msgstr "Ponekod prĹĄi"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
-msgstr "Prši s presledki"
+msgstr "PrĹĄi s presledki"
 
-#: my-evolution/metar.c:99 my-evolution/metar.c:100
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr "Nevihta"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
-msgstr "Pršenje z vetrom"
+msgstr "PrĹĄenje z vetrom"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
-msgstr "Pršenje v pasovih"
+msgstr "PrĹĄenje v pasovih"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
-msgstr "Zmrzujoče pršenje"
+msgstr "Zmrzujoče pršenje"
 
 #. RAIN
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain"
-msgstr "Dež"
+msgstr "DeĹž"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
-msgstr "Dež v okolici"
+msgstr "DeĹž v okolici"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Light rain"
-msgstr "Rahel dež"
+msgstr "Rahel deĹž"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
-msgstr "Zmeren dež"
+msgstr "Zmeren deĹž"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
-msgstr "Močan dež"
+msgstr "Močan dež"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
-msgstr "Plitev dež"
+msgstr "Plitev deĹž"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
-msgstr "Ponekod dežuje"
+msgstr "Ponekod deĹžuje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
-msgstr "Dežuje s presledki"
+msgstr "DeĹžuje s presledki"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
-msgstr "Dež z vetrom"
+msgstr "DeĹž z vetrom"
 
 # @ Hmmm....
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Drifting rain"
-msgstr "Dež v pasovih"
+msgstr "DeĹž v pasovih"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Freezing rain"
-msgstr "Zmrzujoč dež"
+msgstr "Zmrzujoč dež"
 
 #. SNOW
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow"
-msgstr "Sneži"
+msgstr "SneĹži"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
-msgstr "Sneži v okolici"
+msgstr "SneĹži v okolici"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Light snow"
-msgstr "Rahlo sneži"
+msgstr "Rahlo sneĹži"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
-msgstr "Zmerno sneži"
+msgstr "Zmerno sneĹži"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
-msgstr "Močno sneži"
+msgstr "Močno sneži"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
-msgstr "Plitvo sneži"
+msgstr "Plitvo sneĹži"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
-msgstr "Ponekod sneži"
+msgstr "Ponekod sneĹži"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
-msgstr "Sneži s presledki"
+msgstr "SneĹži s presledki"
 
-#: my-evolution/metar.c:101 my-evolution/metar.c:102
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
-msgstr "Snežna nevihta"
+msgstr "SneĹžna nevihta"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
-msgstr "Sneži z vetrom"
+msgstr "SneĹži z vetrom"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow showers"
-msgstr "Snežne plohe"
+msgstr "SneĹžne plohe"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
-msgstr "Sneži v pasovih"
+msgstr "SneĹži v pasovih"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
-msgstr "Zmrzujoče sneži"
+msgstr "Zmrzujoče sneži"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr "Zrnat sneg"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
-msgstr "Zrnato sneži v okolici"
+msgstr "Zrnato sneĹži v okolici"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
-msgstr "Rahlo zrnato sneži"
+msgstr "Rahlo zrnato sneĹži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
-msgstr "Zmerno zrnato sneži"
+msgstr "Zmerno zrnato sneĹži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
-msgstr "Močno zrnato sneži"
+msgstr "Močno zrnato sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
-msgstr "Plitvo zrnato sneži"
+msgstr "Plitvo zrnato sneĹži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
-msgstr "Ponekod zrnato sneži"
+msgstr "Ponekod zrnato sneĹži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
-msgstr "Zrnato sneži s presledki"
+msgstr "Zrnato sneĹži s presledki"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
-msgstr "Zrnato sneži z vetrom"
+msgstr "Zrnato sneĹži z vetrom"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr "Plohe zrnatega snega"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Drifting snow grains"
-msgstr "Zrnato sneži v pasovih"
+msgstr "Zrnato sneĹži v pasovih"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
-msgstr "Zmrzujoče zrnato sneži"
+msgstr "Zmrzujoče zrnato sneži"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr "Ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr "Ledene iglice v okolici"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr "Malo ledenih iglic"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr "Zmerne ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
-msgstr "Močne ledene iglice"
+msgstr "Močne ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr "Ponekod ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr "Ledene iglice s presledki"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr "Nevihta ledenih iglic"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr "Ledene iglice z vetrom"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr "Plohe ledenih iglic"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr "Ledene iglice v pasovih"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
-msgstr "Zmrzujoče ledene iglice"
+msgstr "Zmrzujoče ledene iglice"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
-msgstr "Babje pšeno"
+msgstr "Babje pĹĄeno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
-msgstr "Babje pšeno v okolici"
+msgstr "Babje pĹĄeno v okolici"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
-msgstr "Nekaj babjega pšena"
+msgstr "Nekaj babjega pĹĄena"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
-msgstr "Zmerno babje pšeno"
+msgstr "Zmerno babje pĹĄeno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
-msgstr "Močno babje pšeno"
+msgstr "Močno babje pšeno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
-msgstr "Plitvo babje pšeno"
+msgstr "Plitvo babje pĹĄeno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
-msgstr "Ponekod babje pšeno"
+msgstr "Ponekod babje pĹĄeno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
-msgstr "Babje pšeno s presledki"
+msgstr "Babje pĹĄeno s presledki"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
-msgstr "Nevihta babjega pšena"
+msgstr "Nevihta babjega pĹĄena"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
-msgstr "Babje pšeno z vetrom"
+msgstr "Babje pĹĄeno z vetrom"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
-msgstr "Plohe babjega pšena"
+msgstr "Plohe babjega pĹĄena"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
-msgstr "Babje pšeno v pasovih"
+msgstr "Babje pĹĄeno v pasovih"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
-msgstr "Zmrzujoče babje pšeno"
+msgstr "Zmrzujoče babje pšeno"
 
 #. HAIL
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail"
-msgstr "Toča"
+msgstr "Toča"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
-msgstr "Toča v okolici"
+msgstr "Toča v okolici"
 
-#: my-evolution/metar.c:105 my-evolution/metar.c:106
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
-msgstr "Rahla toča"
+msgstr "Rahla toča"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
-msgstr "Zmerna toča"
+msgstr "Zmerna toča"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
-msgstr "Močna toča"
+msgstr "Močna toča"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Shallow hail"
-msgstr "Plitva toča"
+msgstr "Plitva toča"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
-msgstr "Ponekod toča"
+msgstr "Ponekod toča"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Partial hail"
-msgstr "Toča s presledki"
+msgstr "Toča s presledki"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
-msgstr "Nevihta toče"
+msgstr "Nevihta toče"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
-msgstr "Toča z vetrom"
+msgstr "Toča z vetrom"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail showers"
-msgstr "Ploha toče"
+msgstr "Ploha toče"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
-msgstr "Toča v pasovih"
+msgstr "Toča v pasovih"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Freezing hail"
-msgstr "Zmrzujoča toča"
+msgstr "Zmrzujoča toča"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr "Sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr "Sodra v okolici"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr "Zmerna sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
-msgstr "Močna sodra"
+msgstr "Močna sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Shallow small hail"
 msgstr "Plitva sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr "Ponekod sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr "Sodra s presledki"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr "Nevihta sodre"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr "Sodra z vetrom"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Showers of small hail"
 msgstr "Ploha sodre"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr "Sodra v pasovih"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
-msgstr "Zmrzujoča sodra"
+msgstr "Zmrzujoča sodra"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown precipitation"
 msgstr "Neznane padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr "Padavine v okolici"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Light precipitation"
 msgstr "Rahle padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr "Zmerne padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
-msgstr "Močne padavine"
+msgstr "Močne padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr "Plitve padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr "Ponekod padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr "Padavine s presledki"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown thunderstorm"
 msgstr "Nevihta neznanih padavin"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr "Padavine z vetrom"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr "Ploha neznanih padavin"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr "Padavine v pasovih"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Freezing precipitation"
-msgstr "Zmrzujoče padavine"
+msgstr "Zmrzujoče padavine"
 
 #. MIST
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist"
 msgstr "Meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr "Meglice v okolici"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr "Rahle meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr "Zmerne meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr "Goste meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr "Plitve meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr "Ponekod meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Partial mist"
 msgstr "Meglice s presledki"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr "Meglice z vetrom"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Drifting mist"
 msgstr "Meglice v pasovih"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
-msgstr "Zmrzujoče meglice"
+msgstr "Zmrzujoče meglice"
 
 #. FOG
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr "Megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr "Megla v okolici"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr "Rahla megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr "Zmerna megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr "Gosta megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Shallow fog"
 msgstr "Plitva megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr "Ponekod megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr "Megla s presledki"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog with wind"
 msgstr "Megla z vetrom"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr "Megla v pasovih"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
-msgstr "Zmrzujoča megla"
+msgstr "Zmrzujoča megla"
 
 #. SMOKE
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke"
 msgstr "Dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr "Dim v okolici"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr "Redek dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr "Zmeren dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr "Gost dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Shallow smoke"
 msgstr "Plitev dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr "Ponekod dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr "Dim s presledki"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr "Dim z grmenjem"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke with wind"
 msgstr "Dim z vetrom"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr "Dim v pasovih"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr "Vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkanski pepel v okolici"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr "Zmeren vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr "Gost vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr "Plitev vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr "Ponekod vulkanski dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr "Vulkanski dim s presledki"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr "Vulkanski dim z grmenjem"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr "Vulkanski dim z vetrom"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr "Plohe vulkanskega dima"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr "Vulkanski dim v pasovih"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
-msgstr "Zmrzujoč vulkanski dim"
+msgstr "Zmrzujoč vulkanski dim"
 
 #. SAND
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand"
 msgstr "Pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr "Pesek v okolici"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr "Rahel pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr "Zmeren pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
-msgstr "Močan pesek"
+msgstr "Močan pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr "Ponekod pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr "Pesek s presledki"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr "Pesek z vetrom"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr "Pesek v pasovih"
 
 #. HAZE
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze"
 msgstr "Suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr "Suha motnost v okolici"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr "Rahla suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr "Zmerna suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr "Gosta suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr "Plitva suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr "Ponekod suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr "Suha motnost s presledki"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr "Suha motnost z vetrom"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr "Suhta motnost v pasovih"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
-msgstr "Zmrzujoča suha motnost"
+msgstr "Zmrzujoča suha motnost"
 
 #. SPRAY
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays"
-msgstr "Pršec"
+msgstr "PrĹĄec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
-msgstr "Pršec v okolici"
+msgstr "PrĹĄec v okolici"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Light sprays"
-msgstr "Rahel pršec"
+msgstr "Rahel prĹĄec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
-msgstr "Zmeren pršec"
+msgstr "Zmeren prĹĄec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
-msgstr "Močan pršec"
+msgstr "Močan pršec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
-msgstr "Plitev pršec"
+msgstr "Plitev prĹĄec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
-msgstr "Ponekod pršec"
+msgstr "Ponekod prĹĄec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
-msgstr "Pršec s presledki"
+msgstr "PrĹĄec s presledki"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
-msgstr "Pršec z vetrom"
+msgstr "PrĹĄec z vetrom"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
-msgstr "Pršec v pasovih"
+msgstr "PrĹĄec v pasovih"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
-msgstr "Zmrzujoč pršec"
+msgstr "Zmrzujoč pršec"
 
 #. DUST
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust"
 msgstr "Prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr "Prah v okolici"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr "Rahel prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr "Zmeren prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr "Gost prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr "Ponekod prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr "Prah s presledki"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr "Prah z vetrom"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr "Prah v pasovih"
 
 #. SQUALL
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall"
-msgstr "Piš vetra"
+msgstr "PiĹĄ vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
-msgstr "Piš vetra v okolici"
+msgstr "PiĹĄ vetra v okolici"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Light squall"
-msgstr "Rahel piš vetra"
+msgstr "Rahel piĹĄ vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
-msgstr "Zmeren piš vetra"
+msgstr "Zmeren piĹĄ vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
-msgstr "Močan piš vetra"
+msgstr "Močan piš vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Partial squall"
-msgstr "Piš vetra s presledki"
+msgstr "PiĹĄ vetra s presledki"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
-msgstr "Piš vetra z grmenjem"
+msgstr "PiĹĄ vetra z grmenjem"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
-msgstr "Nôšen piš vetra"
+msgstr "NĂ´ĹĄen piĹĄ vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
-msgstr "Piš vetra v pasovih"
+msgstr "PiĹĄ vetra v pasovih"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
-msgstr "Zmrzujoč piš vetra"
+msgstr "Zmrzujoč piš vetra"
 
 #. SANDSTORM
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
-msgstr "Peščeni vihar"
+msgstr "Peščeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
-msgstr "Peščeni vihar v okolici"
+msgstr "Peščeni vihar v okolici"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
-msgstr "Rahel peščeni vihar"
+msgstr "Rahel peščeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
-msgstr "Zmeren peščeni vihar"
+msgstr "Zmeren peščeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
-msgstr "Močan peščeni vihar"
+msgstr "Močan peščeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
-msgstr "Plitev peščeni vihar"
+msgstr "Plitev peščeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
-msgstr "Peščeni vihar s presledki"
+msgstr "Peščeni vihar s presledki"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
-msgstr "Peščeni vihar z grmenjem"
+msgstr "Peščeni vihar z grmenjem"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
-msgstr "Nôsen peščeni vihar"
+msgstr "Nôsen peščeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
-msgstr "Peščeni vihar v pasovih"
+msgstr "Peščeni vihar v pasovih"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
-msgstr "Zmrzujoč peščeni vihar"
+msgstr "Zmrzujoč peščeni vihar"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm"
-msgstr "Prašni vihar"
+msgstr "PraĹĄni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
-msgstr "Prašni vihar v okolici"
+msgstr "PraĹĄni vihar v okolici"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
-msgstr "Rahel prašni vihar"
+msgstr "Rahel praĹĄni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
-msgstr "Zmeren prašni vihar"
+msgstr "Zmeren praĹĄni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
-msgstr "Močan prašni vihar"
+msgstr "Močan prašni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
-msgstr "Plitev prašni vihar"
+msgstr "Plitev praĹĄni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
-msgstr "Prašni vihar s presledki"
+msgstr "PraĹĄni vihar s presledki"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
-msgstr "Prašni vihar z grmenjem"
+msgstr "PraĹĄni vihar z grmenjem"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
-msgstr "Nôsen prašni vihar"
+msgstr "NĂ´sen praĹĄni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
-msgstr "Prašni vihar v pasovih"
+msgstr "PraĹĄni vihar v pasovih"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
-msgstr "Zmrzujoč prašni vihar"
+msgstr "Zmrzujoč prašni vihar"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr "Tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr "Tromba v okolici"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr "Rahla tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr "Zmerna tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr "Gosta tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr "Plitva tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr "Ponekod trombe"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr "Trombe s presledki"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr "Tromba z vetrom"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr "Tromba v pasovih"
 
 #. TORNADO
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr "Tornado v okolici"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr "Zmeren tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Raging tornado"
 msgstr "Hud tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr "Tornado s presledki"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Thunderous tornado"
 msgstr "Tornado z grmenjem"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr "Tornado v pasovih"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
-msgstr "Zmrzujoč tornado"
+msgstr "Zmrzujoč tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
-msgstr "Prašni vrtinec"
+msgstr "PraĹĄni vrtinec"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
-msgstr "Prašni vrtinci v okolici"
+msgstr "PraĹĄni vrtinci v okolici"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
-msgstr "Rahli prašni vrtinci"
+msgstr "Rahli praĹĄni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
-msgstr "Zmerni prašni vrtinci"
+msgstr "Zmerni praĹĄni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
-msgstr "Močni prašni vrtinci"
+msgstr "Močni prašni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
-msgstr "Plitvi prašni vrtinci"
+msgstr "Plitvi praĹĄni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
-msgstr "Ponekod prašni vrtinci"
+msgstr "Ponekod praĹĄni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
-msgstr "Prašni vrtinci s presledki"
+msgstr "PraĹĄni vrtinci s presledki"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
-msgstr "Prašni vrtinci z vetrom"
+msgstr "PraĹĄni vrtinci z vetrom"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
-msgstr "Prašni vrtinci v pasovih"
+msgstr "PraĹĄni vrtinci v pasovih"
+
+#: my-evolution/my-evolution.glade.h:1
+msgid " _Remove"
+msgstr " _Odstrani"
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "Add n_ew feed"
+msgstr "Dodaj _nov vir novic"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "Al_l stations:"
+msgstr "Vse _postaje:"
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All _folders:"
+msgstr "Vse _mape:"
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
+msgstr "Vsi viri _novic:"
+
+#: my-evolution/my-evolution.glade.h:6 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1024
+msgid "Calendar"
+msgstr "Koledar"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "How many days should the calendar display at once?"
+msgstr "Koliko dni naj koledar pokaĹže hkrati?"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Ma_x number of items shown:"
+msgstr "Na_jvečje število prikazanih predmetov:"
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "News Feed Settings"
+msgstr "Nastavitve virov novic"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "One mont_h"
+msgstr "En _mesec"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "One w_eek"
+msgstr "En _teden"
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Refresh _time (seconds):"
+msgstr "Čas _osvežitve (sekund):"
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Show _all tasks"
+msgstr "KaĹži _vse naloge"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "Show _today's tasks"
+msgstr "KaĹži _danaĹĄnje naloge"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "Tasks "
+msgstr "Naloge "
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "Units: "
+msgstr "Enote: "
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "Weather settings"
+msgstr "Nastavitve vremena"
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "_Display folders:"
+msgstr "_KaĹži mape:"
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "_Display stations:"
+msgstr "_KaĹži postaje:"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "_Displayed feeds:"
+msgstr "_KaĹži novice:"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "_Five days"
+msgstr "_pet dni"
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "_Mail"
+msgstr "_PoĹĄta"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "_News Feeds"
+msgstr "_Viri novic"
+
+#: my-evolution/my-evolution.glade.h:25
+msgid "_One day"
+msgstr "_En dan"
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "_Refresh time (seconds):"
+msgstr "_Čas osvežitve (sekund):"
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "_Schedule"
+msgstr "_Načrtuj"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "_Show full path for folders"
+msgstr "KaĹži celotne poti map"
+
+#: my-evolution/my-evolution.glade.h:29
+msgid "_Weather"
+msgstr "_Vreme"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr "_imperijski"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
+msgstr "_metrični"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolucijina lupina."
 
 #: shell/e-activity-handler.c:198
 msgid "Show Details"
-msgstr "Kaži podrobnosti"
+msgstr "KaĹži podrobnosti"
 
 #: shell/e-activity-handler.c:200
 msgid "Cancel Operation"
-msgstr "Prekliči operacijo"
+msgstr "Prekliči operacijo"
+
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1023
+msgid "Inbox"
+msgstr "Dohodna poĹĄta"
 
-#: shell/e-setup.c:125 shell/e-setup.c:198
+#: shell/e-local-storage.c:177
+msgid "Outbox"
+msgstr "Odhodna poĹĄta"
+
+#: shell/e-local-storage.c:591
+msgid "Local Folders"
+msgstr "Krajevne mape"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
@@ -8441,33 +9644,29 @@ msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
-"Ta različica Evolucije mora namestiti dodatne datoteke\n"
-"v vaš osebni imenik Evolucije"
+"Ta različica Evolucije mora namestiti dodatne datoteke\n"
+"v vaĹĄ osebni imenik Evolucije"
 
 #: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
-"Prosim kliknite \"V redu\" za namestitev datotek ali \"Prekliči\" za izhod."
+"Prosim kliknite \"V redu\" za namestitev datotek ali \"Prekliči\" za izhod."
 
 #: shell/e-setup.c:170
 msgid "Could not update files correctly"
-msgstr "Nisem mogel pravilno prenoviti datotek"
-
-#: shell/e-setup.c:173 shell/e-setup.c:241
-msgid "Evolution files successfully installed."
-msgstr "Evolucijine datoteke so se uspešno namestile."
+msgstr "Nisem mogel pravilno posodobiti datotek"
 
-#: shell/e-setup.c:202
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
-msgstr "Kaže, da je to vaš prvi zagon Evolucije."
+msgstr "KaĹže, da je to vaĹĄ prvi zagon Evolucije."
 
-#: shell/e-setup.c:203
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
-"Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških datotek "
+"Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniĹĄkih datotek "
 "pod"
 
-#: shell/e-setup.c:222
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -8478,16 +9677,13 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:237
-#, c-format
+#: shell/e-setup.c:235
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Ne morem kopirati datotek v\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Ob kopiranju datotek v\n`%s'\n se je zgodila napaka."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8496,9 +9692,9 @@ msgid ""
 msgstr ""
 "Datoteka `%s' ni imenik.\n"
 "Prosim premestite jo, da se lahko namestitev\n"
-"Evolucijinih uporabniških datotek nadaljuje."
+"Evolucijinih uporabniĹĄkih datotek nadaljuje."
 
-#: shell/e-setup.c:318
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8509,10 +9705,10 @@ msgstr ""
 "Evolucija je zaznala star imenik\n"
 "povzetka.\n"
 "Ta mora biti odstranjen preden se\n"
-"lahko Evolucija požene.\n"
-"Želite, da odstranim ta imenik?"
+"lahko Evolucija poĹžene.\n"
+"Želite, da odstranim ta imenik?"
 
-#: shell/e-setup.c:343
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8521,58 +9717,75 @@ msgid ""
 msgstr ""
 "Datoteka `%s' obstaja a ni Evolucijin imenik.\n"
 "Prosim premestite jo, da se lahko namestitev\n"
-"Evolucijinih uporabniških datotek nadaljuje."
+"Evolucijinih uporabniĹĄkih datotek nadaljuje."
 
-#: shell/e-shell.c:446
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+#: shell/e-shell-folder-commands.c:174
+msgid "Cannot move a folder over itself."
+msgstr "Ne morem prestaviti mape nase."
 
-#: shell/e-shell.c:1308
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Opa!  Pogled `%s' je nepričakovano umru.  :-(\n"
-"To verjetno pomeni, da se je komponenta %s sesula."
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot copy a folder over itself."
+msgstr "Ne morem kopirati mape nase."
 
-#: shell/e-shell-folder-commands.c:242
+#: shell/e-shell-folder-commands.c:190
+msgid "Cannot move a folder into one of its descendants."
+msgstr "Ne morem kopirati mape v eno od naslednic."
+
+#: shell/e-shell-folder-commands.c:284
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Navedite mapo kamor naj se skopira mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:247
+#: shell/e-shell-folder-commands.c:289
 msgid "Copy folder"
 msgstr "Kopiraj mapo"
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:327
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Navedite mapo, kamor naj se prestavi mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:332
 msgid "Move folder"
 msgstr "Prestavi mapo"
 
-#. Popup a dialog asking if they are sure they want to delete
-#. the folder
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:357
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Nisem mogel zbrisati mape:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:373
 #, c-format
 msgid "Delete folder '%s'"
-msgstr "Zbriši mapo '%s'"
+msgstr "ZbriĹĄi mapo '%s'"
 
-#: shell/e-shell-folder-commands.c:332
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:383
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
-msgstr "Ste prepričani, da želite zbrisati mapo '%s'?"
+msgstr "Ste prepričani, da želite zbrisati mapo '%s'?"
 
-#: shell/e-shell-folder-commands.c:390
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:458
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Preimenuj mapo '%s'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:462 shell/e-shortcuts-view.c:383
+msgid "Rename"
+msgstr "Preimenuj"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:470
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Ime mape:"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -8581,11 +9794,11 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Izbrano ime mape ni veljavno."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
@@ -8597,11 +9810,11 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
@@ -8613,10 +9826,10 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Izberite datoteko, ki jo želite uvoziti v Evolucijo in izberite vrsto "
+"Izberite datoteko, ki jo Ĺželite uvoziti v Evolucijo in izberite vrsto "
 "datoteke s seznama\n"
 "\n"
-"Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
+"Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
 "ugotoviti."
 
 #. Importer isn't ready yet.
@@ -8628,9 +9841,9 @@ msgid ""
 "Importer not ready.\n"
 "Waiting 5 seconds to retry."
 msgstr ""
-"Uvažam %s\n"
+"UvaĹžam %s\n"
 "Uvoznik ni pripravljen.\n"
-"Čakam 5 sekund na nov poskus."
+"Čakam 5 sekund na nov poskus."
 
 #: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
@@ -8638,8 +9851,8 @@ msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
-"Uvažam %s\n"
-"Uvažam predmet %d."
+"UvaĹžam %s\n"
+"UvaĹžam predmet %d."
 
 #: shell/e-shell-importer.c:352
 #, c-format
@@ -8652,7 +9865,7 @@ msgstr ""
 
 #: shell/e-shell-importer.c:362
 msgid "Importing"
-msgstr "Uvažam"
+msgstr "UvaĹžam"
 
 #: shell/e-shell-importer.c:370
 #, c-format
@@ -8660,8 +9873,8 @@ msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
-"Uvažam %s.\n"
-"Pričenjam %s"
+"UvaĹžam %s.\n"
+"Pričenjam %s"
 
 #: shell/e-shell-importer.c:383
 #, c-format
@@ -8679,8 +9892,8 @@ msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
-"Uvažam %s\n"
-"Uvažam predmet 1."
+"UvaĹžam %s\n"
+"UvaĹžam predmet 1."
 
 #: shell/e-shell-importer.c:488
 msgid "Automatic"
@@ -8690,7 +9903,7 @@ msgstr "Samodejno"
 msgid "Filename:"
 msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
@@ -8706,274 +9919,300 @@ msgstr "Izberi mapo"
 msgid "Select a destination folder for importing this data"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-view.c:173
-msgid "(No folder displayed)"
-msgstr "(Nobena mapa ni prikazana)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1386 shell/e-storage-set-view.c:1441
-msgid "My Evolution"
-msgstr "Moja Evolucija"
-
-#: shell/e-shell-view.c:1403
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolucija %s"
-
-#: shell/e-shell-view.c:1405
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolucija %s [%s]"
-
-#: shell/e-shell-view.c:1443
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolucija je trenutno na mereži.  Kliknite na ta gumb za delo brez mreže."
-
-#: shell/e-shell-view.c:1450
-msgid "Evolution is in the process of going offline."
-msgstr "Evolucija je v procesu odklapljanja z mreže."
-
-#: shell/e-shell-view.c:1456
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
-
 #: shell/e-shell-view-menu.c:182
 msgid "Bug buddy was not found in your $PATH."
-msgstr "Program 'Bug buddy' ni bil najden v vaši poti ($PATH)."
+msgstr "Program 'Bug buddy' ni bil najden v vaĹĄi poti ($PATH)."
 
-#: shell/e-shell-view-menu.c:188
+#: shell/e-shell-view-menu.c:190
 msgid "Bug buddy could not be run."
-msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
+msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:218
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Avtorske pravice pridržane 1999, 2000, 2001 Ximian, Inc."
+msgstr "Avtorske pravice pridrĹžane 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:220
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 "Evolucija je zbirka programov okolja \n"
-"GNOME za delo v skupinah, za pošto, koledar in \n"
+"GNOME za delo v skupinah, za poĹĄto, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:464
+#: shell/e-shell-view-menu.c:436
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:437
 msgid "Select the folder that you want to open"
-msgstr "Izberite mapo, ki jo želite odpreti"
+msgstr "Izberite mapo, ki jo Ĺželite odpreti"
 
-#: shell/e-shell-view-menu.c:610
+#: shell/e-shell-view-menu.c:582
 msgid "Create a new shortcut"
-msgstr "Ustvari novo bližnjico"
+msgstr "Ustvari novo bliĹžnjico"
 
-#: shell/e-shell-view-menu.c:611
+#: shell/e-shell-view-menu.c:583
 msgid "Select the folder you want the shortcut to point to:"
-msgstr "Izberite mapo na katero naj kaže bližnjica:"
+msgstr "Izberite mapo na katero naj kaĹže bliĹžnjica:"
 
-#: shell/e-shell-view-menu.c:718
-msgid "Work online"
-msgstr "Delaj na mreži"
+#: shell/e-shell-view-menu.c:701
+msgid "Work Online"
+msgstr "Delaj na mreĹži"
 
-#: shell/e-shell-view-menu.c:730 shell/e-shell-view-menu.c:742
-msgid "Work offline"
-msgstr "Delaj brez mreže"
+#: shell/e-shell-view-menu.c:714 shell/e-shell-view-menu.c:727
+#: ui/evolution.xml.h:35
+msgid "Work Offline"
+msgstr "Delaj brez mreĹže"
 
-#: shell/e-shortcuts.c:601
-msgid "Error saving shortcuts."
-msgstr "Napaka ob shranjevanju bližnjic."
+#: shell/e-shell-view.c:178
+msgid "(No folder displayed)"
+msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shortcuts.c:998
-msgid "Shortcuts"
-msgstr "Bližnjice"
+#: shell/e-shell-view.c:1391
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolucija %s"
 
-#: shell/e-shortcuts.c:1000
-msgid "Inbox"
-msgstr "Dohodna pošta"
+#: shell/e-shell-view.c:1393
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolucija %s [%s]"
 
-#: shell/e-shortcuts.c:1003
-msgid "Contacts"
-msgstr "Stik"
+#: shell/e-shell-view.c:1431
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolucija je trenutno na mereĹži.  Kliknite na ta gumb za delo brez mreĹže."
+
+#: shell/e-shell-view.c:1438
+msgid "Evolution is in the process of going offline."
+msgstr "Evolucija je v procesu odklapljanja z mreĹže."
+
+#: shell/e-shell-view.c:1444
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolucija trenutno ni na mreĹži.  Kliknite ta gumb za delo z mreĹžo."
+
+#: shell/e-shell.c:508
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+
+#: shell/e-shell.c:1424
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Opa!  Pogled `%s' je nepričakovano umru.  :-(\n"
+"To verjetno pomeni, da se je komponenta %s sesula."
+
+#: shell/e-shell.c:1628 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "V redu"
+
+#: shell/e-shell.c:1630
+msgid "Invalid arguments"
+msgstr "Neveljavni argumenti"
+
+#: shell/e-shell.c:1632
+msgid "Cannot register on OAF"
+msgstr "Ne morem se registrirati pri OAF"
+
+#: shell/e-shell.c:1634
+msgid "Configuration Database not found"
+msgstr "Podatkovna zbirka nastavitev ni bila najdena"
+
+#: shell/e-shell.c:1636 shell/e-storage.c:481
+msgid "Generic error"
+msgstr "Generična napaka"
 
-#: shell/e-shortcuts-view.c:136
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
-msgstr "Ustvari novo skupino bližnjic"
+msgstr "Ustvari novo skupino bliĹžnjic"
 
-#: shell/e-shortcuts-view.c:139
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
-"Zares želite odstraniti skupino\n"
-"`%s' iz vrstice bližnjic?"
+"Zares Ĺželite odstraniti skupino\n"
+"`%s' iz vrstice bliĹžnjic?"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
-msgstr "Preimenuj skupino bližnjic"
+msgstr "Preimenuj skupino bliĹžnjic"
 
-#: shell/e-shortcuts-view.c:293
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
-msgstr "Preimenuj izbrano skupino bližnjic v:"
+msgstr "Preimenuj izbrano skupino bliĹžnjic v:"
 
-#: shell/e-shortcuts-view.c:303
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:304
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
-msgstr "Kaži bližnjice kot majhne ikone"
+msgstr "KaĹži bliĹžnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:306
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:307
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
-msgstr "Kaži bližnjice kot velike ikone"
+msgstr "KaĹži bliĹžnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:319
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
-msgstr "Ustvari novo skupino bližnjic"
+msgstr "Ustvari novo skupino bliĹžnjic"
 
-#: shell/e-shortcuts-view.c:321
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:236
+msgid "_Remove this Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:322
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
-msgstr "Odstrani to skupino bližnjic"
+msgstr "Odstrani to skupino bliĹžnjic"
 
-#: shell/e-shortcuts-view.c:324
-msgid "Re_name This Group..."
+#: shell/e-shortcuts-view.c:239
+msgid "Re_name this Group..."
 msgstr "_Preimenuj to skupino..."
 
-#: shell/e-shortcuts-view.c:325
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
-msgstr "Preimenuj to skupino bližnjic"
+msgstr "Preimenuj to skupino bliĹžnjic"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
-msgstr "_Skrij vrstico z bližnjicami"
+msgstr "_Skrij vrstico z bliĹžnjicami"
 
-#: shell/e-shortcuts-view.c:331
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
-msgstr "Skrij vrstico z bližnjicami"
+msgstr "Skrij vrstico z bliĹžnjicami"
 
-#: shell/e-shortcuts-view.c:450
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
-msgstr "Preimenuj bližnjico"
+msgstr "Preimenuj bliĹžnjico"
 
-#: shell/e-shortcuts-view.c:451
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
-msgstr "Preimenuj izbrano bližnjico v:"
+msgstr "Preimenuj izbrano bliĹžnjico v:"
 
-#: shell/e-shortcuts-view.c:463
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
-msgstr "Odpri mapo povezano s to bližnjico"
+msgstr "Odpri mapo povezano s to bliĹžnjico"
 
-#: shell/e-shortcuts-view.c:465 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
-#: shell/e-shortcuts-view.c:465
+#: shell/e-shortcuts-view.c:380
 msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Odpri mapo povezano s to bližnjico v novem oknu"
+msgstr "Odpri mapo povezano s to bliĹžnjico v novem oknu"
 
-#: shell/e-shortcuts-view.c:468
-msgid "Rename"
-msgstr "Preimenuj"
-
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
-msgstr "Preimenuj to bližnjico"
+msgstr "Preimenuj to bliĹžnjico"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
-msgstr "Odstrani to bližnjico iz vrstice bližnjic"
+msgstr "Odstrani to bliĹžnjico iz vrstice bliĹžnjic"
+
+#: shell/e-shortcuts.c:620
+msgid "Error saving shortcuts."
+msgstr "Napaka ob shranjevanju bliĹžnjic."
+
+#: shell/e-shortcuts.c:1019
+msgid "Shortcuts"
+msgstr "BliĹžnjice"
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:479
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:461
-msgid "Generic error"
-msgstr "Generična napaka"
-
-#: shell/e-storage.c:463
+#: shell/e-storage.c:483
 msgid "A folder with the same name already exists"
-msgstr "Mapa z enakim imenom že obstaja"
+msgstr "Mapa z enakim imenom Ĺže obstaja"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:485
 msgid "The specified folder type is not valid"
 msgstr "Izbran tip mape ni veljaven"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:487
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:489
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:491
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:493
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Nimate dovoljenja"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:497
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:499
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
-#: shell/e-task-widget.c:167
+#: shell/e-storage.c:501
+msgid "The specified folder cannot be modified or removed"
+msgstr "Izbrane mape ni moĹžno spremeniti ali odstraniti"
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:172
+#: shell/e-task-widget.c:175
 #, c-format
 msgid "%s (%d%% complete)"
-msgstr "%s (%d%% končano)"
+msgstr "%s (%d%% končano)"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Ime mape:"
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+msgstr "Aktivne povezave"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr "Kliknite \"V redu\" za zaprtje povezav in nadalnje delo brez mreĹže"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr "Gostitelj"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr "Sledeče povezave so trenutno aktivne:"
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
@@ -8983,29 +10222,33 @@ msgstr "Vrsta mape:"
 msgid "Specify where to create the folder:"
 msgstr "Navedi kje naj se ustvarimapa:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolucijina lupina."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Kliknite \"Uvozi\" za pričetek uvoza datoteke v Evolucijo. "
+msgstr "Kliknite \"Uvozi\" za pričetek uvoza datoteke v Evolucijo. "
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolucijino uvozno orodje"
+msgid "Evolution Import Assistant"
+msgstr "Evolucijin uvozni druid"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolucijino uvozno orodje"
+msgid "Evolution Importer Assistant"
+msgstr "Evolucijin uvozni druid"
+
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr "Uvozi datoteko (2. korak od 2)"
+
+#: shell/importer/import.glade.h:5
+msgid "Select a File (step 1 of 2)"
+msgstr "Izberi datoteko (1. korak od 2)"
 
 #: shell/importer/import.glade.h:6
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
-"Dobrodošli v Evolucijinem uvnoznem orodju.\n"
+"DobrodoĹĄli v Evolucijinem druidu za uvaĹžanje.\n"
 "S tem druidom boste vodeni skozi proces uvoza\n"
 "zunanjih datotek v Evolucijo."
 
@@ -9017,44 +10260,43 @@ msgstr "Uvozniki"
 msgid "Don't import"
 msgstr "Ne uvozi"
 
-#: shell/main.c:89
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Ne sprašuj me več"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution can import data from the following files:"
+msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
+
+#: shell/main.c:95
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"Zdravo.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
+"Pozdrav.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
 "programja za delovne skupine Evolucija.\n"
 "\n"
-"Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka ali\n"
-"deluje le polovično. Če ne morete ugotoviti kako nekaj narediti, je to\n"
-"verjetno zato, ker tega zaenkrat še ni možno narediti. :-)\n"
+"Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka ali\n"
+"deluje le polovično.\n"
 "\n"
-"Upamo, da vam bo Evolucija uporabna, a še vedno vas moramo opozoriti, da se\n"
-"lahko: sesuje, izgubi vašo pošto, pusti teči mrtve procese, porabi 100% "
-"vašega\n"
-"procesorskega časa, pošlje neveljavne ukaze na vaše strežnike in vas na\n"
-"splošno osramoti pred prijatelji in sodelavci. Uporabljajte jo le tako \n"
-"kot je predvideno.\n"
+"Če najdete hrošča, ga prosimo sporočite na bugzilla.ximian.com.\n"
+"Ta izdelek prihaja brez kakrĹĄnihkoli zagotovil in ni primeren za\n"
+"osebe, ki doĹživljajo nasilne napade jeze.\n" 
 "\n"
-"Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
-"pričakujemo vaše prispevke!\n"
+"Upamo, da boste uĹživali sadove naĹĄega trdega dela in nestrpno\n"
+"pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:114
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9062,28 +10304,32 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:152
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr "Ne morem dostopati do lupine Evolucije."
 
-#: shell/main.c:212
+#: shell/main.c:184
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Ne morem inicializirati lupine Evolucije: %s"
+
+#: shell/main.c:228
 msgid "Disable splash screen"
-msgstr "Izključi začetni zaslon"
+msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:213
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
-msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
+msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
 
-#: shell/main.c:248
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "_Izreži"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopiraj"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
@@ -9095,13 +10341,17 @@ msgstr "Ustvari nov stik"
 msgid "Create new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "IzreĹži"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
-msgstr "Izreži izbrano"
+msgstr "IzreĹži izbrano"
 
 #: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
-msgstr "Zbriši izbrane stike"
+msgstr "ZbriĹĄi izbrane stike"
 
 #: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
@@ -9111,9 +10361,13 @@ msgstr "Nov stik"
 msgid "New list"
 msgstr "Nov seznam"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Prilepi"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
 msgid "Paste the clipboard"
-msgstr "Prilepi odložišče"
+msgstr "Prilepi odložišče"
 
 #: ui/evolution-addressbook.xml.h:14
 msgid "Previews the contacts to be printed"
@@ -9123,234 +10377,210 @@ msgstr "Predogled stikov, ki bodo natisnjeni"
 msgid "Print selected contacts"
 msgstr "Natisni izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save selected contacts as a VCard."
+msgstr "Shrani izbrane kontakte kot eVizitke"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select all contacts"
 msgstr "Izberi vse stike"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
+msgid "Send _contact to other"
+msgstr "PoĹĄlji _stik drugim"
+
+#: ui/evolution-addressbook.xml.h:23
+msgid "Send _message to contact"
+msgstr "Stiku pošlji _sporočilo"
+
+#: ui/evolution-addressbook.xml.h:24
+msgid "Send a mess to the selected contacts."
+msgstr "Pošlji poročilo izbranim stikom."
+
+#: ui/evolution-addressbook.xml.h:27
+msgid "Send selected contacts to another person."
+msgstr "PoĹĄlji izbrane stike drugi osebi."
+
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:31
+#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_Dejanja"
+
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Addressbook Sources..."
 msgstr "Viri _adresarja..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Stik"
 
-#: ui/evolution-addressbook.xml.h:24
-msgid "_Contact Group"
-msgstr "Skupina _stikov"
-
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-msgid "_Copy"
-msgstr "_Kopiraj"
+#: ui/evolution-addressbook.xml.h:33
+msgid "_Contact List"
+msgstr "Seznam _stikov"
 
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-msgid "_Paste"
-msgstr "_Prilepi"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
+#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Na_tisni..."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:37
+msgid "_Save as VCard"
+msgstr "_Shrani kot eVizitko"
+
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Search for contacts"
-msgstr "_Išči po kontaktih"
+msgstr "_Išči po kontaktih"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:20
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Orodja"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dni"
-
 #: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Alternativne nastavitve"
+msgid "Configure the calendar's settings"
+msgstr "Nastavi pogled koledarja"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
-msgstr "Ustvari nov celodnevni dogodek"
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a New All-Day _Event"
+msgstr "Ustvari nov celodnevni _dogodek"
+
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a _New Appointment"
+msgstr "Ustvari _nov sestanek"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new appointment"
-msgstr "Ustvari nov zmenek"
+msgstr "Ustvari nov sestanek"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Ustvari nov koledar"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr "Ustvari sestanek, ki zavzame cel dan"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:9
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:10 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go back in time"
-msgstr "Pojdi po času nazaj"
+#: ui/evolution-calendar.xml.h:11
+msgid "Go back"
+msgstr "Pojdi nazaj"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go forward in time"
-msgstr "Pojdi po času naprej"
+#: ui/evolution-calendar.xml.h:12
+msgid "Go forward"
+msgstr "Pojdi naprej"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Pojdi na _danes"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
-msgstr "Pojdi na določen datum"
+msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.xml.h:19
-msgid "Go to present time"
-msgstr "Pojdi na sedanjost"
+#: ui/evolution-calendar.xml.h:16
+msgid "Go to today"
+msgstr "Pojdi na danes"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "Nov _dogodek"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
-msgid "Next"
-msgstr "Naslednje"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Odpri koledar"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Nazaj"
+#: ui/evolution-calendar.xml.h:18
+msgid "New Appointment"
+msgstr "Nov sestanek"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "Print calendar"
-msgstr "Natisni koledar"
+#: ui/evolution-calendar.xml.h:21 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Predogled _tiskanja"
 
-#: ui/evolution-calendar.xml.h:33
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:22
+msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy Information"
 msgstr "Objavi podatek o zasedenosti"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatek o zasedenosti za ta koledar"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Shrani kot"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr "Shrani koledar kot nekaj drugega"
-
-#: ui/evolution-calendar.xml.h:38
-msgid "Settings..."
-msgstr "Nastavitve..."
-
-#: ui/evolution-calendar.xml.h:39
-msgid "Show 1 day"
-msgstr "Kaži en dan"
-
-#: ui/evolution-calendar.xml.h:40
-msgid "Show 1 month"
-msgstr "Kaži en mesec"
+#: ui/evolution-calendar.xml.h:25
+msgid "Show one day"
+msgstr "KaĹži en dan"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "Show 1 week"
-msgstr "Kaži en teden"
+#: ui/evolution-calendar.xml.h:26
+msgid "Show one month"
+msgstr "KaĹži en mesec"
 
-#: ui/evolution-calendar.xml.h:42
-msgid "Show the working week"
-msgstr "Pokaži delavni teden"
+#: ui/evolution-calendar.xml.h:27
+msgid "Show one week"
+msgstr "KaĹži en teden"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:431
-msgid "Today"
-msgstr "Danes"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "W_ork Week"
-msgstr "_Delavni teden"
+#: ui/evolution-calendar.xml.h:28
+msgid "Show work week"
+msgstr "KaĹži en delovni teden"
 
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:29
 msgid "Week"
 msgstr "Teden"
 
-#: ui/evolution-calendar.xml.h:46
-msgid "_Appointment"
-msgstr "_Zmenek"
-
-#: ui/evolution-calendar.xml.h:48
-msgid "_Day"
-msgstr "_Dan"
-
-#: ui/evolution-calendar.xml.h:49
-msgid "_Month"
-msgstr "_Mesec"
-
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:57
-msgid "_New"
-msgstr "_Nova"
-
-#: ui/evolution-calendar.xml.h:51
-msgid "_Open Calendar"
-msgstr "Odpri ko_ledar"
+#: ui/evolution-calendar.xml.h:32
+msgid "_Appointment..."
+msgstr "_Sestanek..."
 
-#: ui/evolution-calendar.xml.h:56
-msgid "_Week"
-msgstr "_Teden"
+#: ui/evolution-calendar.xml.h:33
+msgid "_Calendar Settings..."
+msgstr "_Nastavitve poĹĄte..."
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Zapri"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Zapri"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
-msgstr "Zapri ta zmenek"
+msgstr "Zapri ta sestanek"
 
 #: ui/evolution-comp-editor.xml.h:5
 msgid "Delete this appointment"
-msgstr "Zbriši ta zmenek"
+msgstr "ZbriĹĄi ta sestanek"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:22
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
@@ -9358,37 +10588,25 @@ msgstr "Glavna orodna vrstica"
 msgid "Preview the printed item"
 msgstr "Predogled natisnjenega predmeta"
 
-#: ui/evolution-comp-editor.xml.h:9
-msgid "Print Pre_view"
-msgstr "Predogled _tiskanja"
-
 #: ui/evolution-comp-editor.xml.h:11
 msgid "Print S_etup"
 msgstr "Nastavitev t_iskanja"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Natisni ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:13
 msgid "Print..."
 msgstr "Natisni..."
 
-#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Shrani kot..."
-
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save and Close"
 msgstr "Shrani in zapri"
 
 #: ui/evolution-comp-editor.xml.h:16
 msgid "Save the appointment and close the dialog box"
-msgstr "Shrani zmenek in zapri dialog"
+msgstr "Shrani sestanek in zapri dialog"
 
 #: ui/evolution-comp-editor.xml.h:17
 msgid "Save this item to disk"
@@ -9396,45 +10614,39 @@ msgstr "Shrani ta predmet na disk"
 
 #: ui/evolution-comp-editor.xml.h:18
 msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
+msgstr "Nastavi lastnosti strani za vaĹĄ trenutni tiskalnik"
 
-#: ui/evolution-comp-editor.xml.h:19
-msgid "_Action"
-msgstr "_Dejanje"
-
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:48
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:52
-msgid "_Help"
-msgstr "_Pomoč"
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Zbriši ta predmet"
-
 #: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete..."
-msgstr "Zbriši..."
+msgid "Delete this item"
+msgstr "ZbriĹĄi ta predmet"
 
 #: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
-msgstr "Pomoč"
+msgstr "Pomoč"
 
-#: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr "Natisni kuverto..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Shrani"
+
+#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Shrani _kot..."
 
@@ -9444,45 +10656,50 @@ msgstr "Shrani stik in zapri dialog"
 
 #: ui/evolution-contact-editor.xml.h:11
 msgid "Se_nd contact to other..."
-msgstr "Pošlji stik drugim..."
+msgstr "PoĹĄlji stik drugim..."
 
 #: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
-msgstr "Glej pomoč na liniji"
+msgstr "Glej pomoč na liniji"
 
 #: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
-msgstr "Pošlji _sporočilo stiku..."
+msgstr "Pošlji _sporočilo stiku..."
 
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ui/evolution-contact-list-editor.xml.h:2
-msgid "Delete this group"
-msgstr "Zbriši to skupino"
+#: ui/evolution-contact-list-editor.xml.h:3
+msgid "Delete this list"
+msgstr "ZbriĹĄi ta seznam"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Save the group and close the dialog box"
-msgstr "Shrani skupino in zapri pogovorno okno"
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "ZbriĹĄi..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
+msgid "Save the list and close the dialog box"
+msgstr "Shrani seznam in zapri dialog"
 
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Se_nd group to other..."
-msgstr "_Pošlji skupino drugim..."
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Se_nd list to other..."
+msgstr "_PoĹĄlji seznam drugim..."
 
-#: ui/evolution-contact-list-editor.xml.h:11
-msgid "Send _message to group..."
-msgstr "Pošlji _sporočilo skupini..."
+#: ui/evolution-contact-list-editor.xml.h:9
+msgid "Send _message to list..."
+msgstr "Pošlji _sporočilo na seznam..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
-msgstr "Prekliči ses_tanek"
+msgstr "Prekliči ses_tanek"
 
 #: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
 msgid "Cancel the meeting for this item"
-msgstr "Prekliči sestanek za ta predmet"
+msgstr "Prekliči sestanek za ta predmet"
 
 #: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 msgid "Forward as i_Calendar"
@@ -9490,28 +10707,23 @@ msgstr "Posreduj naprej kot i_Koledar"
 
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
 msgid "Forward this item via email"
-msgstr "Posreduj naprej preko e-pošte"
+msgstr "Posreduj naprej preko e-poĹĄte"
 
 #: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
 msgid "Obtain the latest meeting information"
-msgstr "Dobi osvežene podatke o sestanku"
+msgstr "Dobi osveĹžene podatke o sestanku"
 
 #: ui/evolution-event-editor.xml.h:6
 msgid "Re_fresh Meeting"
-msgstr "Osveži sestanek"
+msgstr "OsveĹži sestanek"
 
 #: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
-msgstr "_Načrtuj sestanek"
+msgstr "_Načrtuj sestanek"
 
 #: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
 msgid "Schedule a meeting for this item"
-msgstr "Načrtuj sestanek za ta predmet"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:41
-msgid "_Actions"
-msgstr "_Dejanja"
+msgstr "Načrtuj sestanek za ta predmet"
 
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
@@ -9519,51 +10731,51 @@ msgstr "Prikroji Mojo Evolucijo"
 
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
-msgstr "Prekliči"
+msgstr "Prekliči"
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
-msgstr "Prekliči trenutno operacijo pošte"
+msgstr "Prekliči trenutno operacijo pošte"
 
 #: ui/evolution-mail-global.xml.h:3
 msgid "Compose"
 msgstr "Sestavi"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
+msgid "Compose _New Message"
+msgstr "Sestavi _novo sporočilo"
 
 #: ui/evolution-mail-global.xml.h:5
-msgid "Create or edit rules for filtering new mail"
-msgstr "Ustvari ali uredi pravila za filtriranje nove pošte"
+msgid "Create or edit mail accounts and other preferences"
+msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
 
 #: ui/evolution-mail-global.xml.h:6
-msgid "Create or edit virtual folder definitions"
-msgstr "Ustvari ali uredi določitve navideznih map"
+msgid "Create or edit rules for filtering new mail"
+msgstr "Ustvari ali uredi pravila za filtriranje nove poĹĄte"
 
 #: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr "Ustvari ali uredi določitve navideznih map"
+
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Sprazni _smeti"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail-global.xml.h:9
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Pozabi pomnjena gesla tako, da boste zanje znova vprašani"
-
 #: ui/evolution-mail-global.xml.h:10
-msgid "Manage _Subscriptions..."
-msgstr "Uredi _naročnine..."
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Pozabi pomnjena gesla tako, da boste zanje znova vpraĹĄani"
 
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
-msgstr "Odpri okno za sestavljanje novega poštnega sporočila"
+msgstr "Odpri okno za sestavljanje novega poštnega sporočila"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
+msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
@@ -9571,84 +10783,88 @@ msgstr "Oddaja / sprejem"
 
 #: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
-msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
+msgstr "PoĹĄlji poĹĄto v vrsti in sprejmi novo poĹĄto"
 
 #: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
-msgstr "Kaži okno predogleda sporočila"
+msgstr "Kaži okno predogleda sporočila"
 
 #: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Naroči se ali prekliči naročnino na mape z oddaljenih strežnikov"
+msgstr "Naroči se ali prekliči naročnino na mape z oddaljenih strežnikov"
 
 #: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
-msgstr "_Pošlji sporočilo"
+msgstr "_Pošlji sporočilo"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
-msgstr "_Nastavive pošte..."
+msgstr "_Nastavive poĹĄte..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
+#: ui/evolution-mail-global.xml.h:24
+msgid "_Subscribe to Folders..."
+msgstr "_Naroči se na mape..."
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Spremeni lastnosti te mape"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Copy selected messages"
-msgstr "Kopiraj izbrana sporočila"
+msgstr "Kopiraj izbrana sporočila"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Cut selected messages"
-msgstr "Izreži izbrana sporočila"
+msgstr "Izreži izbrana sporočila"
 
 #: ui/evolution-mail-list.xml.h:6
 msgid "Hide S_elected Messages"
-msgstr "Skrij _izbrana sporočila"
+msgstr "Skrij _izbrana sporočila"
 
 #: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Deleted Messages"
-msgstr "Skrij _zbrisana sporočila"
+msgstr "Skrij _zbrisana sporočila"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide _Read messages"
-msgstr "Skrij _prebrana sporočila"
+msgid "Hide _Read Messages"
+msgstr "Skrij _prebrana sporočila"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Raje skrij zbrisana sporočila kot, da jih prikažeš prečrtana"
+msgstr "Raje skrij zbrisana sporočila kot, da so prikazana prečrtana"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark All as R_ead"
-msgstr "Označi vs_e kot prebrano"
+msgstr "Označi vs_e kot prebrano"
 
 #: ui/evolution-mail-list.xml.h:11
 msgid "Mark all visible messages as read"
-msgstr "Označi vsa vidna sporočila kot prebrana"
+msgstr "Označi vsa vidna sporočila kot prebrana"
 
 #: ui/evolution-mail-list.xml.h:13
 msgid "Paste message in the clipboard"
-msgstr "Prilepi sporočilo na odložišče"
+msgstr "Prilepi sporočilo na odložišče"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Trajno odstrani vsa zbrisana sporočila iz te mape"
+msgstr "Trajno odstrani vsa zbrisana sporočila iz te mape"
 
 #: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
@@ -9660,95 +10876,95 @@ msgstr "Izberi ni_t"
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all and only the messages that are not currently selected"
-msgstr "Izberi vse in le tista sporočila, ki trenutno niso izbrana"
+msgstr "Izberi vse in le tista sporočila, ki trenutno niso izbrana"
 
 #: ui/evolution-mail-list.xml.h:18
 msgid "Select all messages in the same thread as the selected message"
-msgstr "Izberi vsa sporočila iz iste niti kot izbrano sporočilo"
+msgstr "Izberi vsa sporočila iz iste niti kot izbrano sporočilo"
 
 #: ui/evolution-mail-list.xml.h:19
 msgid "Select all visible messages"
-msgstr "Izberi vsa vidna sporočila"
+msgstr "Izberi vsa vidna sporočila"
 
 #: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "Kaži _vse"
+msgid "Sh_ow Hidden Messages"
+msgstr "K_aži skrita sporočila"
 
 #: ui/evolution-mail-list.xml.h:21
 msgid "Show messages that have been temporarily hidden"
-msgstr "Kaži sporočila, ki so bila začasno skrita"
+msgstr "Kaži sporočila, ki so bila začasno skrita"
 
 #: ui/evolution-mail-list.xml.h:22
 msgid "Temporarily hide all messages that have already been read"
-msgstr "Začasno skrij vsa že prebrana sporočila"
+msgstr "Začasno skrij vsa že prebrana sporočila"
 
 #: ui/evolution-mail-list.xml.h:23
 msgid "Temporarily hide the selected messages"
-msgstr "Začasno skrij vsa izbrana sporočila"
+msgstr "Začasno skrij vsa izbrana sporočila"
 
 #: ui/evolution-mail-list.xml.h:24
 msgid "Threaded Message list"
-msgstr "Niten seznam sporočil"
+msgstr "Niten seznam sporočil"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
-msgstr "_Uniči"
+msgstr "_Uniči"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:49
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
 msgid "_Folder"
 msgstr "_Mapa"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:59
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_Lastnosti..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
-msgstr "_Niten seznam sporočil"
+msgstr "_Niten seznam sporočil"
 
 #: ui/evolution-mail-message.xml.h:1
 msgid "Apply filter rules to the selected messages"
-msgstr "Uveljavi pravila filtra na izbranih sporočilih"
+msgstr "Uveljavi pravila filtra na izbranih sporočilih"
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Sestavi odgovor vsem prejemnikom izbranega sporočila"
+msgstr "Sestavi odgovor vsem prejemnikom izbranega sporočila"
 
 #: ui/evolution-mail-message.xml.h:3
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Sestavi odgovor na dopisni seznam izbranega sporočila"
+msgstr "Sestavi odgovor na dopisni seznam izbranega sporočila"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
-msgstr "Sestavi odgovor pošiljatelju izbranega sporočila"
+msgstr "Sestavi odgovor pošiljatelju izbranega sporočila"
 
 #: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
-msgstr "Kopiraj izbrana sporočila v drugo mapo"
+msgstr "Kopiraj izbrana sporočila v drugo mapo"
 
 #: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
-msgstr "Iz sporočila ustvari na_videzno mapo"
+msgstr "Iz sporočila ustvari na_videzno mapo"
 
 #: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
-msgstr "Ustvari pravilo za filtriranje sporočil tega pošiljatelja"
+msgstr "Ustvari pravilo za filtriranje sporočil tega pošiljatelja"
 
 #: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Ustvari pravilo za filtriranje sporočil tem prejemnikom"
+msgstr "Ustvari pravilo za filtriranje sporočil tem prejemnikom"
 
 #: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Ustvari pravilo za filtriranje spročil temu dopisnemu seznamu"
+msgstr "Ustvari pravilo za filtriranje spročil temu dopisnemu seznamu"
 
 #: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
-msgstr "Ustvari pravilo za filtriranje sporočil s tem predmetom"
+msgstr "Ustvari pravilo za filtriranje sporočil s tem predmetom"
 
 #: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
@@ -9756,11 +10972,11 @@ msgstr "Ustvari navidezno mapo za te prejemnike"
 
 #: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
-msgstr "Ustvari navidezno mapo za ta poštni seznam"
+msgstr "Ustvari navidezno mapo za ta dopisni seznam"
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
-msgstr "Ustvari navidezno mapo za tega pošiljatelja"
+msgstr "Ustvari navidezno mapo za tega poĹĄiljatelja"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
@@ -9768,51 +10984,51 @@ msgstr "Ustvari navidezno mapo za ta predmet"
 
 #: ui/evolution-mail-message.xml.h:17
 msgid "Display the next important message"
-msgstr "Kaži naslednje pomembno sporočilo"
+msgstr "Kaži naslednje pomembno sporočilo"
 
 #: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
-msgstr "Kaži naslednje sporočilo"
+msgstr "Kaži naslednje sporočilo"
 
 #: ui/evolution-mail-message.xml.h:19
 msgid "Display the next unread message"
-msgstr "Kaži naslednje neprebrano sporočilo"
+msgstr "Kaži naslednje neprebrano sporočilo"
 
 #: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
-msgstr "Kaži naslednjo neprebrano nit"
+msgstr "KaĹži naslednjo neprebrano nit"
 
 #: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
-msgstr "Kaži prejšnje pomembno sporočilo"
+msgstr "Kaži prejšnje pomembno sporočilo"
 
 #: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
-msgstr "Kaži prejšnje sporočilo"
+msgstr "Kaži prejšnje sporočilo"
 
 #: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
-msgstr "Kaži prejšnje neprebrano sporočilo"
+msgstr "Kaži prejšnje neprebrano sporočilo"
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List"
-msgstr "Filter glede na p_oštni seznam"
+msgid "Filter on Mailing _List..."
+msgstr "Filter glede na p_oĹĄtni seznam..."
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder"
-msgstr "Filter glede na pošilja_telja"
+msgid "Filter on Se_nder..."
+msgstr "Filter glede na poĹĄilja_telja"
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients"
-msgstr "Filter glede na preje_mnike"
+msgid "Filter on _Recipients..."
+msgstr "Filter glede na preje_mnike..."
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject"
-msgstr "Filter glede na za_devo"
+msgid "Filter on _Subject..."
+msgstr "Filter glede na za_devo..."
 
 #: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
-msgstr "Prisili, da bodo slike v HTML pošti naložene"
+msgstr "Prisili, da bodo slike v HTML poĹĄti naloĹžene"
 
 #: ui/evolution-mail-message.xml.h:29
 msgid "Forward"
@@ -9828,7 +11044,7 @@ msgstr "Posreduj _pripeto"
 
 #: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
-msgstr "Posreduj kot _del sporočila"
+msgstr "Posreduj kot _del sporočila"
 
 #: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
@@ -9836,238 +11052,247 @@ msgstr "Posreduj kot _citirano"
 
 #: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
-msgstr "Posreduj naprej izbrano sporočilo v telesu novega sporočila"
+msgstr "Posreduj naprej izbrano sporočilo v telesu novega sporočila"
 
 #: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
-msgstr "Posreduj izbrano sporočilo citirano kot odgovor"
+msgstr "Posreduj izbrano sporočilo citirano kot odgovor"
 
 #: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
-msgstr "Nekomu posreduj izbrano sporočilo"
+msgstr "Nekomu posreduj izbrano sporočilo"
 
 #: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
-msgstr "Nekomu posreduj izbrano sporočilo kot prilogo"
-
-#: ui/evolution-mail-message.xml.h:38
-msgid "Load _Images"
-msgstr "Naloži _slike"
+msgstr "Nekomu posreduj izbrano sporočilo kot prilogo"
 
 #: ui/evolution-mail-message.xml.h:39
-msgid "Mar_k As Read"
-msgstr "Označi _kot prebrano"
-
-#: ui/evolution-mail-message.xml.h:40
-msgid "Mark As I_mportant"
-msgstr "Označi kot po_membno"
+msgid "Load _Images"
+msgstr "NaloĹži _slike"
 
 #: ui/evolution-mail-message.xml.h:41
-msgid "Mark As U_nread"
-msgstr "Označi kot _neprebrano"
-
-#: ui/evolution-mail-message.xml.h:42
-msgid "Mark the selected messages as having been read"
-msgstr "Označi izbrana sporočila kot prebrana"
+msgid "Mark as I_mportant"
+msgstr "Označi kot po_membno"
 
 #: ui/evolution-mail-message.xml.h:43
-msgid "Mark the selected messages as important"
-msgstr "Označi izbrana sporočila kot pomembna"
+msgid "Mark as Unimp_ortant"
+msgstr "Označi kot _nepomembno"
 
 #: ui/evolution-mail-message.xml.h:44
-msgid "Mark the selected messages as not having been read"
-msgstr "Označi izbrana sporočila kot neprebrana"
+msgid "Mark the selected messages as having been read"
+msgstr "Označi izbrana sporočila kot prebrana"
 
 #: ui/evolution-mail-message.xml.h:45
-msgid "Mark the selected messages for deletion"
-msgstr "Označi izbrana sporočila za brisanje"
+msgid "Mark the selected messages as important"
+msgstr "Označi izbrana sporočila kot pomembna"
 
 #: ui/evolution-mail-message.xml.h:46
-msgid "Move"
-msgstr "Prestavi"
+msgid "Mark the selected messages as not having been read"
+msgstr "Označi izbrana sporočila kot neprebrana"
 
 #: ui/evolution-mail-message.xml.h:47
-msgid "Move selected messages to another folder"
-msgstr "Prestavi izbrana sporočila v drugo mapo"
+msgid "Mark the selected messages as unimportant"
+msgstr "Označi izbrana sporočila kot nepomembna"
+
+#: ui/evolution-mail-message.xml.h:48
+msgid "Mark the selected messages for deletion"
+msgstr "Označi izbrana sporočila za brisanje"
 
 #: ui/evolution-mail-message.xml.h:49
-msgid "Open the selected message in a new window"
-msgstr "Odpri izbrano sporočilo v novem oknu"
+msgid "Move"
+msgstr "Prestavi"
 
 #: ui/evolution-mail-message.xml.h:50
-msgid "Open the selected message in the composer to re-send it"
-msgstr "Odpri izbrano sporočilo v skladatelju za vnovično pošiljanje"
+msgid "Move selected messages to another folder"
+msgstr "Prestavi izbrana sporočila v drugo mapo"
 
 #: ui/evolution-mail-message.xml.h:51
-msgid "Previews the message to be printed"
-msgstr "Predogled sporočika, ki bo natisnjeno"
+msgid "Next"
+msgstr "Naslednje"
 
 #: ui/evolution-mail-message.xml.h:52
-msgid "Previous"
-msgstr "Prejšnje"
+msgid "Next Important Message"
+msgstr "Naslednje pomembno sporočilo"
+
+#: ui/evolution-mail-message.xml.h:53
+msgid "Next Message"
+msgstr "Naslednje sporočilo"
 
 #: ui/evolution-mail-message.xml.h:54
-msgid "Print Message..."
-msgstr "Natisni sporočilo..."
+msgid "Next Thread"
+msgstr "Naslednja nit"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Print Preview..."
-msgstr "Predogled tiskanja..."
+msgid "Next Unread Message"
+msgstr "Naslednje neprebrano sporočilo"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Print message to the printer"
-msgstr "Natisni sporočilo na tiskalniku"
+msgid "Open the selected message in a new window"
+msgstr "Odpri izbrano sporočilo v novem oknu"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Redirect (FIXME: implement me)"
-msgstr "Preusmeri (FIXME: implementiraj me)"
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Odpri izbrano sporočilo v skladatelju za vnovično pošiljanje"
 
 #: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Predogled sporočika, ki bo natisnjeno"
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "PrejĹĄnje"
+
+#: ui/evolution-mail-message.xml.h:60
+msgid "Previous Important Message"
+msgstr "Prejšnje pomembno sporočilo"
+
+#: ui/evolution-mail-message.xml.h:61
+msgid "Previous Message"
+msgstr "Prejšnje sporočilo"
+
+#: ui/evolution-mail-message.xml.h:62
+msgid "Previous Unread Message"
+msgstr "Prejšnje neprebrano sporočilo"
+
+#: ui/evolution-mail-message.xml.h:64
+msgid "Print Message..."
+msgstr "Natisni sporočilo..."
+
+#: ui/evolution-mail-message.xml.h:65
+msgid "Print Preview..."
+msgstr "Predogled tiskanja..."
+
+#: ui/evolution-mail-message.xml.h:66
+msgid "Print this message"
+msgstr "Natisni to sporočilo"
+
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
-msgstr "_Išči v sporočilu"
+msgstr "_Išči v sporočilu"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
-msgstr "Shrani sporočilo kot datoteko z besedilom"
+msgstr "Shrani sporočilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
-msgstr "Išči besedilo v telesu prikazanega sporočila"
+msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
-msgstr "Kaži _izvor pošte"
+msgstr "KaĹži _izvorno kodo poĹĄte"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
-msgstr "Kaži celotne _glave"
+msgstr "KaĹži celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
-msgstr "Kaži sporočila v običajnem slogu"
+msgstr "Kaži sporočila v običajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
-msgstr "Kaži sporočila s celotnimi glavami"
+msgstr "Kaži sporočila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
-msgstr "Kaži neposredno izvorno kodo sporočila"
+msgstr "Kaži neposredno izvorno kodo sporočila"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
-msgstr "Odbriši izbrana sporočila"
+msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
-msgstr "vMapa glede na poštni se_znam..."
+msgstr "vMapa glede na poĹĄtni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
-msgstr "vMapa glede na _pošiljatelja..."
+msgstr "vMapa glede na _poĹĄiljatelja..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
-msgstr "Iz sporočila _ustvari filter"
+msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
-msgstr "Sporočilo _posreduj naprej"
+msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
-msgstr "Prikaz _sporočila"
+msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
-msgstr "_Običajen prikaz"
+msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
-msgstr "_Odpri sporočilo"
+msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail-message.xml.h:84
-msgid "_Re-send Message"
-msgstr "_Znova pošlji sporočilo"
-
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
-msgid "Customi_ze Toolbars..."
-msgstr "_Prilagodi orodne vrstice..."
-
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:12
-msgid "Customize"
-msgstr "Prilagodi"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:13
-msgid "Customize toolbars"
-msgstr "Prliagodi orodne vrstice"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:37
 msgid "_Close"
 msgstr "_Zapri"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:65
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
 msgid "_View"
 msgstr "Po_gled"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
-msgstr "Priloži"
+msgstr "PriloĹži"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Priloži datoteko"
-
-#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
 #: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
-msgstr "Zbriši vse razen podpisa"
+msgstr "ZbriĹĄi vse razen podpisa"
 
 #: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
-msgstr "Šifriraj to sporočilo s PGP"
+msgstr "Šifriraj to sporočilo s PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Šifriraj to sporočilo z S/MIME šifrirnim certifikatom"
+msgstr "Šifriraj to sporočilo z S/MIME šifrirnim certifikatom"
 
 #: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
@@ -10078,50 +11303,51 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Insert a file as text into the message"
-msgstr "Vstavi datoteko v sporočilo kot besedilo"
+msgid "Inline Text _File..."
+msgstr "Vstavi _datoteko z besedilom..."
 
 #: ui/evolution-message-composer.xml.h:11
+msgid "Insert a file as text into the message"
+msgstr "Vstavi datoteko v sporočilo kot besedilo"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Vstavi datoteko z besedilom..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Odpri datoteko"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
-msgstr "Šifriraj s PGP"
+msgstr "Ĺ ifriraj s PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Podpis s PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
-msgstr "Šifriraj z S/MIME"
+msgstr "Ĺ ifriraj z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Podpis z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:240
-msgid "Save"
-msgstr "Shrani"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Shrani kot"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Shrani _osnutek"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Shrani v _mapo... (FIXME)"
-
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Shrani v mapo..."
 
 #: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
@@ -10131,51 +11357,51 @@ msgstr "Shrani trenutno datoteko pod drugim imenom"
 
 #: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
-msgstr "Shrani sporočilo v izbrano mapo"
+msgstr "Shrani sporočilo v izbrano mapo"
 
 #: ui/evolution-message-composer.xml.h:27
 msgid "Send"
-msgstr "Pošlji"
+msgstr "PoĹĄlji"
 
 #: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
-msgstr "Pošilji _kaseneje"
+msgstr "PoĹĄilji _kaseneje"
 
 #: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
-msgstr "Pošlji _kasneje"
+msgstr "PoĹĄlji _kasneje"
 
 #: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
-msgstr "Pošlji pošto v HTML obliki"
+msgstr "PoĹĄlji poĹĄto v HTML obliki"
 
 #: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
-msgstr "Pošlji sporočilo kasneje"
+msgstr "Pošlji sporočilo kasneje"
 
 #: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
-msgstr "Takoj pošlji to sporočilo"
+msgstr "Takoj pošlji to sporočilo"
 
 #: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
-msgstr "Kaži / skrij priloge"
+msgstr "KaĹži / skrij priloge"
 
 #: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
-msgstr "Kaži priloge"
+msgstr "KaĹži priloge"
 
 #: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
-msgstr "Kaži priloge"
+msgstr "KaĹži priloge"
 
 #: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
-msgstr "Podpiši to sporočilo s svojim PGP ključem"
+msgstr "Podpiši to sporočilo s svojim PGP ključem"
 
 #: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Podpiši to sporočilo s svojim S/MIME podpisnim certifikatom"
+msgstr "Podpiši to sporočilo s svojim S/MIME podpisnim certifikatom"
 
 #: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
@@ -10194,33 +11420,35 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Preklopi prikaz polja Odgovori na"
 
 #: ui/evolution-message-composer.xml.h:42
+msgid "_Attachment..."
+msgstr "_Priloga..."
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Polje _bcc"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Polje _cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
-msgstr "_Razhroščuj"
+msgstr "_Razhroščuj"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
-msgstr "_Zbriši vse"
+msgstr "_ZbriĹĄi vse"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Polje _od"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Vstavi datoteko z besedilom..."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Odpri..."
@@ -10233,9 +11461,13 @@ msgstr "Polje _Odgovori-na:"
 msgid "_Security"
 msgstr "_Varnost"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "_Pomoč"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
-msgstr "Dodaj mapo na seznam naročenih map"
+msgstr "Dodaj mapo na seznam naročenih map"
 
 #: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
@@ -10243,27 +11475,27 @@ msgstr "_Mapa"
 
 #: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
-msgstr "Osveži seznam"
+msgstr "OsveĹži seznam"
 
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
-msgstr "Osveži seznam map"
+msgstr "OsveĹži seznam map"
 
 #: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
-msgstr "Odstrani mapo iz seznama naročenih map"
+msgstr "Odstrani mapo iz seznama naročenih map"
 
 #: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
-msgstr "Naroči"
+msgstr "Naroči"
 
 #: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
-msgstr "Prekini naročnino"
+msgstr "Prekini naročnino"
 
 #: ui/evolution-task-editor.xml.h:1
 msgid "Cancel Task"
-msgstr "Prekliči opravilo"
+msgstr "Prekliči opravilo"
 
 #: ui/evolution-task-editor.xml.h:3
 msgid "Delegate Task"
@@ -10271,43 +11503,47 @@ msgstr "Delegiraj opravilo"
 
 #: ui/evolution-task-editor.xml.h:7
 msgid "Re_fresh Task"
-msgstr "Osveži opravilo"
+msgstr "OsveĹži opravilo"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr "Nastavi pogled nalog"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiraj izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
-msgstr "Izreži izbrano opravilo"
+msgstr "IzreĹži izbrano opravilo"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "ZbriĹĄi izbrana opravila"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nova naloga"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
-msgstr "Prilepi opravilo z odložišča"
+msgstr "Prilepi opravilo z odložišča"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Shrani posel kot nekaj drugega"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Nastavi pogled opravila"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "Nastavitve poslov..."
-
 #: ui/evolution-tasks.xml.h:13
-msgid "TasksPreferences"
-msgstr "Nastavitve opravil..."
+msgid "Tasks Settings"
+msgstr "Nastavitve nalog"
+
+#: ui/evolution-tasks.xml.h:17
+msgid "_Print Task..."
+msgstr "Na_tisni nalogo..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -10319,199 +11555,191 @@ msgstr "_O Evoluciji..."
 
 #: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
-msgstr "Dodaj v vrstico z _bližnjicami"
+msgstr "Dodaj v vrstico z _bliĹžnjicami"
 
 #: ui/evolution.xml.h:3
 msgid "Change the name of this folder"
 msgstr "Spremeni ime te mape"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Spremeni lastnosti te mape"
-
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:6
 msgid "Copy this folder"
 msgstr "Kopiraj mapo"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "Ustvari _novo mapo..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
-msgstr "Ustvari bližnjico na to mapo v vrstici bližnjic"
+msgstr "Ustvari bliĹžnjico na to mapo v vrstici bliĹžnjic"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Ustvari novo mapo"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
-msgstr "Zbriši to mapo"
+msgstr "ZbriĹĄi to mapo"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
-msgstr "Pokaži drugo mapo"
+msgstr "PokaĹži drugo mapo"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "Iz_hod"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
-msgstr "_Pogosto zastavljena vprašanja"
+msgstr "_Pogosto zastavljena vpraĹĄanja"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Okno Evolucije"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Getting _Started"
-msgstr "Kako _začeti"
+msgstr "Kako _začeti"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr "Uvozi datoteko zunanje oblike"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:19
 msgid "Move this folder to another place"
 msgstr "Prestavi to mapo na drugo mesto"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Odpri v novem _oknu"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Show information about Evolution"
-msgstr "Kaži podatke o Evoluciji"
+msgstr "KaĹži podatke o Evoluciji"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
-msgstr "Pošlji poročilo o hrošču"
+msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
-msgstr "_Pošlji poročilo o hrošču"
+msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:30
-msgid "Submit bug report using Bug Buddy."
-msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy."
+#: ui/evolution.xml.h:26
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
-msgstr "Preklopi prikaz vrstice z bližnjicami"
+msgstr "Preklopi prikaz vrstice z bliĹžnjicami"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
-msgstr "Preklopi delo z mrežo"
+msgstr "Preklopi delo z mreĹžo"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:31
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:33
 msgid "Using the _Mailer"
-msgstr "Uporaba _pošte"
+msgstr "Uporaba _poĹĄte"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
-#: ui/evolution.xml.h:39
-msgid "Work Offline"
-msgstr "Delaj brez mreže"
-
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:36
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.xml.h:42
-msgid "_Appointment (FIXME)"
-msgstr "_Zmenek (FIXME)"
-
-#: ui/evolution.xml.h:44
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
-
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:43
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:44
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:46
 msgid "_Import file..."
 msgstr "_Uvozi datoteko..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:47
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: ui/evolution.xml.h:55
-msgid "_Mail message"
-msgstr "_Pošlji sporočilo"
-
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:49
+msgid "_New"
+msgstr "_Nova"
+
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:51
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:52
 msgid "_Shortcut"
-msgstr "_Bližnjica"
+msgstr "_BliĹžnjica"
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:53
 msgid "_Shortcut Bar"
-msgstr "_Vrstica z bližnjicami"
+msgstr "_Vrstica z bliĹžnjicami"
 
-#: ui/evolution.xml.h:63
-msgid "_Task (FIXME)"
-msgstr "_Naloga (FIXME)"
-
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:55
 msgid "_Work Offline"
-msgstr "_Delaj brez mreže"
+msgstr "_Delaj brez mreĹže"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr "Spremeni nastavitve za Mojo Evolucijo"
+msgid "Change the settings for the summary"
+msgstr "Spremeni nastavitve povzetka"
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
-msgstr "_Nastavive Moje Evolucije..."
+msgid "Print summary"
+msgstr "Natisni povzetek"
+
+#: ui/my-evolution.xml.h:5
+msgid "Reload"
+msgstr "Znova naloĹži"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr "Znova naloĹži ta pogled"
+
+#: ui/my-evolution.xml.h:8
+msgid "_Summary Settings..."
+msgstr "Nastaviteve _povzetka..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -10525,25 +11753,9 @@ msgstr "Po podjetju"
 msgid "Phone List"
 msgstr "Seznam telefonov"
 
-#: views/calendar/galview.xml.h:1
-msgid "Day View"
-msgstr "Dnevni pogled"
-
-#: views/calendar/galview.xml.h:2
-msgid "Month View"
-msgstr "Mesečni pogled"
-
-#: views/calendar/galview.xml.h:3
-msgid "Week View"
-msgstr "Tedenski pogled"
-
-#: views/calendar/galview.xml.h:4
-msgid "Work Week View"
-msgstr "Pogled delavnega tedna"
-
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
-msgstr "Po pošiljatelju"
+msgstr "Po poĹĄiljatelju"
 
 #: views/mail/galview.xml.h:2
 msgid "By Status"
@@ -10555,19 +11767,18 @@ msgstr "Po zadevi"
 
 #: views/mail/galview.xml.h:4
 msgid "Messages"
-msgstr "Sporočila"
+msgstr "Sporočila"
 
 #: views/tasks/galview.xml.h:2
 msgid "With Category"
 msgstr "S kategorijo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Poskusno"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Zaseden"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
@@ -10583,15 +11794,15 @@ msgstr "_Povabi ostale..."
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
-msgstr "_Možnosti"
+msgstr "_MoĹžnosti"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
-msgstr "Kaži le delavne ure"
+msgstr "KaĹži le delavne ure"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
-msgstr "Kaži poman_jšano"
+msgstr "KaĹži poman_jĹĄano"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
@@ -10627,51 +11838,44 @@ msgstr "Potrebni ljudje in eno sredstvo"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
-msgstr "Čas pričetka sestanka:"
+msgstr "Čas pričetka sestanka:"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
-msgstr "Čas zaključka sestanka:"
+msgstr "Čas zaključka sestanka:"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
-msgstr "Vsi udeleženi"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
+msgstr "Vsi udeleĹženi"
 
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Trenutni pogled"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
-msgstr "Določi poglede"
+msgstr "Določi poglede"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
-msgstr "PTSČPSN"
+msgstr "PTSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
+#: widgets/misc/e-calendar-item.c:1071
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Sedaj"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "V redu"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Danes"
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datum mora biti v obliki: %s"
@@ -10690,11 +11894,11 @@ msgstr "Kitajski"
 
 #: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
-msgstr "Cirilični"
+msgstr "Cirilični"
 
 #: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
-msgstr "Grški"
+msgstr "GrĹĄki"
 
 #: widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
@@ -10706,7 +11910,7 @@ msgstr "Korejski"
 
 #: widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
-msgstr "Turški"
+msgstr "TurĹĄki"
 
 #: widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
@@ -10739,7 +11943,7 @@ msgstr "Neznan nabor znakov: %s"
 
 #: widgets/misc/e-charset-picker.c:202
 msgid "Enter the character set to use"
-msgstr "Vpišite nabor znakov, ki naj se uporablja"
+msgstr "VpiĹĄite nabor znakov, ki naj se uporablja"
 
 #: widgets/misc/e-charset-picker.c:277
 msgid "Other..."
@@ -10753,58 +11957,62 @@ msgstr "Nabor znakov"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:167
+#: widgets/misc/e-filter-bar.c:158
+msgid "Search Editor"
+msgstr "Urejevalnik iskanja"
+
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.c:238
-msgid "Advanced Search"
-msgstr "Napredno iskanje"
+#: widgets/misc/e-filter-bar.h:94
+msgid "Add to Saved Searches"
+msgstr "Dodaj med shranjena iskanja"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Kaži vse"
+#: widgets/misc/e-filter-bar.h:95
+msgid "Clear"
+msgstr "Počisti"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Napredno..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "KaĹži vse"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Podatki"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Opozorilo"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Napaka"
 
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
-msgstr "Vprašanje"
+msgstr "VpraĹĄanje"
 
 #: widgets/misc/e-messagebox.c:180
 msgid "Message"
-msgstr "Sporočilo"
+msgstr "Sporočilo"
 
 #. Add the "Don't show this message again." checkbox
 #: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
-msgstr "Tega sporočila ne kaži več."
+msgstr "Tega sporočila ne kaži več."
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:333
 msgid "Sear_ch"
 msgstr "_Iskanje"
 
+#: widgets/misc/e-search-bar.c:459
+msgid "Find Now"
+msgstr "Išči sedaj"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
-msgstr "Strežnik osebnega adresarja"
+msgstr "StreĹžnik osebnega adresarja"
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
-msgstr "Strežnik osebnega koledarja; tovarna koledarjal"
+msgstr "StreĹžnik osebnega koledarja; tovarna koledarjal"
 
 #: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
@@ -10818,6 +12026,427 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_Stiki..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Podjetje:"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "VpiĹĄite geslo za %s"
+
+#~ msgid "Category contains"
+#~ msgstr "Kategorija vsebuje"
+
+#~ msgid "LDAP Server"
+#~ msgstr "StreĹžnik LDAP"
+
+#~ msgid "File"
+#~ msgstr "Datoteka"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Neznan tip adresarja"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Brez (anonimni način)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Neznan način avtentifikacije"
+
+#~ msgid "Subtree"
+#~ msgstr "Poddrevo"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Neznan tip dosega"
+
+#~ msgid "Bind DN:"
+#~ msgstr "Povezan z domeno:"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "FIXME Bind DN Help text here"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "FIXME Host help text here."
+
+#~ msgid "Root DN:"
+#~ msgstr "Kornsko ime domene:"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "FIXME Root DN help text here."
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "FIXME Port help text here."
+
+#~ msgid "Authentication:"
+#~ msgstr "Avtentifikacija:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "Napredne moĹžnosti LDAP"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "FIXME Path help text here"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Če pot ne obstaja jo ustvari."
+
+#~ msgid ""
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
+#~ msgstr ""
+#~ "Izberite tip adresarja, ki ga imate in vnestite potrebne podatke o njem."
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "FIXME Name help text here"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "FIXME Description help text here"
+
+#~ msgid "Name"
+#~ msgstr "Ime"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Select name from _folder:"
+#~ msgstr "Izberi ime iz _mape:"
+
+#~ msgid ""
+#~ "Notification about your journal entry starting on %s and ending on %s"
+#~ msgstr ""
+#~ "Obvestilo o vašem dnevniškem vpisu, ki se začne ob %s in konča ob %s"
+
+#~ msgid "Notification about your journal entry starting on %s"
+#~ msgstr "Obvestilo o vašem dnevniškem vpisu, ki se začne ob %s"
+
+#~ msgid "Notification about your journal entry ending on %s"
+#~ msgstr "Obvestilo o vašem dnevniškem vpisu, ki se konča ob %s"
+
+#~ msgid "Notification about your journal entry"
+#~ msgstr "Obvestilo o vaĹĄem dnevniĹĄkem vpisu"
+
+#~ msgid "Open calendar"
+#~ msgstr "Odpri koledar"
+
+#~ msgid "Save calendar"
+#~ msgstr "Shrani koledar"
+
+#~ msgid "Transparent"
+#~ msgstr "Prozorno"
+
+#~ msgid "Opaque"
+#~ msgstr "Prosojno"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr "Uvrstitev mora biti 'Javno', 'Zastebno', 'Zaupno' ali 'Brez'"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "Prosojnost mora biti 'Prozorno', 'Prosojno' ali 'Brez'."
+
+#~ msgid "Show a dialog"
+#~ msgstr "KaĹži dialog"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Pozvoni, ko se pokaĹžejo okna alarmov."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Nastavitve koledarja"
+
+#~ msgid "Colors for Tasks"
+#~ msgstr "Barve za opravila"
+
+#~ msgid "Date Navigator"
+#~ msgstr "Navigator po datumih"
+
+#~ msgid "Defaults"
+#~ msgstr "Privzeto"
+
+#~ msgid "Notification Options"
+#~ msgstr "Možnosti obveščanja"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Opomni me na vse sestankee"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minut preden se zgodijo."
+
+#~ msgid "No one"
+#~ msgstr "Nikomur"
+
+#~ msgid "Task"
+#~ msgstr "Naloga"
+
+#~ msgid "Percent complete"
+#~ msgstr "Procentov opravljeno"
+
+#~ msgid "Transparency"
+#~ msgstr "Prosojnost"
+
+#~ msgid "Edit this task"
+#~ msgstr "Uredi to opravilo"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "ZbriĹĄi vse pojavitve"
+
+#~ msgid "This is an event that can be added to your calendar."
+#~ msgstr "To je dogodek, ki je lahko dodan vaĹĄemu koledarju."
+
+#~ msgid "This is one or more additions to a current meeting."
+#~ msgstr "To so en ali več dodatkov k trenutnem sestanku."
+
+#~ msgid "This is a request for the latest event information."
+#~ msgstr "To je zahtevek za sveĹže podatke o dogodku."
+
+#~ msgid "The message is not understandable."
+#~ msgstr "To sporočilo ni razumljivo."
+
+#~ msgid "This is an task that can be added to your calendar."
+#~ msgstr "To je opravilo, ki je lahko dodano v vaĹĄ koledar."
+
+#~ msgid "This is a task request."
+#~ msgstr "To je zahtevek po opravilu."
+
+#~ msgid "This is a reply to a task request."
+#~ msgstr "To je odgovor na zahtevek po opravilu."
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "To sporočilo vsebuje le nepodprte zahtevke"
+
+#~ msgid "The information contained in this attachment was not valid"
+#~ msgstr "Podatki vsebovani v tej prilogi niso veljavni"
+
+#~ msgid "All"
+#~ msgstr "Vse"
+
+#~ msgid "Has category"
+#~ msgstr "Ima kategorijo"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Pregledujem mapo IMAP"
+
+#~ msgid "Error opening file: %s"
+#~ msgstr "Napaka ob odpiranju datoteke: %s"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Posreduj na naslove"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Vzdevki programa Elm"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Adresarji"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Shrani iskanje kot vMapo"
+
+#~ msgid "Resend"
+#~ msgstr "Znova poĹĄlji"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Upravljalnik Evolucijinih računov"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Prenastavljam mapo"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Zapiram trenutno mapo"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Preimenujem in odpiram staro mapo"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Ustvari novo mapo"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopiram sporočilo"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Napredek evolucije"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Prenašam sporočilo številka %d od %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Shranjujem sporočilo %d od %d (uid \"%s\")"
+
+#~ msgid "Receiving"
+#~ msgstr "Sprejemam"
+
+#~ msgid "Sending"
+#~ msgstr "PoĹĄiljam"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (posredovano sporočilo)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Posredovano sporočilo (brez navedene zadeve)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+#~ "s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Posredovano sporočilo-----<br><b>Od:</b> %s<br><b>Za:</b> %"
+#~ "s<br><b>Predmet:</b> %s<br>"
+
+#~ msgid "Store"
+#~ msgstr "Shramba"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Dobivam shrambo za \"%s\""
+
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr "<b>Napaka ob prenaĹĄanju Metar</b>"
+
+#~ msgid "Print My Evolution"
+#~ msgstr "Natisni Mojo evolucijo"
+
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Tiskanje Moje evolucije ni uspelo"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolucijine datoteke so se uspeĹĄno namestile."
+
+#~ msgid "My Evolution"
+#~ msgstr "Moja Evolucija"
+
+#~ msgid "_Contact Group"
+#~ msgstr "Skupina _stikov"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dni"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Alternativne nastavitve"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Ustvari nov koledar"
+
+#~ msgid "Go to present time"
+#~ msgstr "Pojdi na sedanjost"
+
+#~ msgid "New _Event"
+#~ msgstr "Nov _dogodek"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Odpri koledar"
+
+#~ msgid "Prev"
+#~ msgstr "Nazaj"
+
+#~ msgid "Print this Calendar"
+#~ msgstr "Natisni ta koledar"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Shrani koledar kot nekaj drugega"
+
+#~ msgid "Settings..."
+#~ msgstr "Nastavitve..."
+
+#~ msgid "Show the working week"
+#~ msgstr "PokaĹži delavni teden"
+
+#~ msgid "W_ork Week"
+#~ msgstr "_Delavni teden"
+
+#~ msgid "_Day"
+#~ msgstr "_Dan"
+
+#~ msgid "_Month"
+#~ msgstr "_Mesec"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "Odpri ko_ledar"
+
+#~ msgid "_Week"
+#~ msgstr "_Teden"
+
+#~ msgid "_Action"
+#~ msgstr "_Dejanje"
+
+#~ msgid "Delete this group"
+#~ msgstr "ZbriĹĄi to skupino"
+
+#~ msgid "Save the group and close the dialog box"
+#~ msgstr "Shrani skupino in zapri pogovorno okno"
+
+#~ msgid "Se_nd group to other..."
+#~ msgstr "_PoĹĄlji skupino drugim..."
+
+#~ msgid "Send _message to group..."
+#~ msgstr "Pošlji _sporočilo skupini..."
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Uredi _naročnine..."
+
+#~ msgid "Show _All"
+#~ msgstr "KaĹži _vse"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Označi _kot prebrano"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Označi kot _neprebrano"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Natisni sporočilo na tiskalniku"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Preusmeri (FIXME: implementiraj me)"
+
+#~ msgid "_Re-send Message"
+#~ msgstr "_Znova pošlji sporočilo"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "_Prilagodi orodne vrstice..."
+
+#~ msgid "Customize"
+#~ msgstr "Prilagodi"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Prliagodi orodne vrstice"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Shrani v _mapo... (FIXME)"
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Vstavi datoteko z besedilom..."
+
+#~ msgid "Set task view preferences"
+#~ msgstr "Nastavi pogled opravila"
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Nastavitve poslov..."
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Nastavitve opravil..."
+
+#~ msgid "Change the properties for this folder"
+#~ msgstr "Spremeni lastnosti te mape"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Sestanek (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakt (FIXME)"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Pošlji sporočilo"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Naloga (FIXME)"
+
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "_Nastavive Moje Evolucije..."
+
 #~ msgid "As _Minicards"
 #~ msgstr "Kot _minivizitke"
 
@@ -10825,28 +12454,19 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Kot tabelo"
 
 #~ msgid "Find..."
-#~ msgstr "Poišči..."
-
-#~ msgid "%A, %e %B %Y"
-#~ msgstr "%A, %e %B %Y"
+#~ msgstr "Poišči..."
 
 #~ msgid "<b>Error loading calendar:<br>Method not supported"
 #~ msgstr "<b>Napaka ob nalaganju koledarja: <br>Postopek ni podprt"
 
 #~ msgid "Alarms timeout after"
-#~ msgstr "Alarmi pretečejo čez"
-
-#~ msgid "Audio Alarms"
-#~ msgstr "Zvočni alarmi"
+#~ msgstr "Alarmi pretečejo čez"
 
 #~ msgid "Colors"
 #~ msgstr "Barve"
 
-#~ msgid "Display options"
-#~ msgstr "Pokaži možnosti"
-
 #~ msgid "Enable snoozing for"
-#~ msgstr "Omogoči podaljšanje spanja za"
+#~ msgstr "Omogoči podaljšanje spanja za"
 
 #~ msgid "Highlight"
 #~ msgstr "Osvetli"
@@ -10861,13 +12481,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Predmeti z rokom v prihodnosti:"
 
 #~ msgid "Overdue Items:"
-#~ msgstr "Predmeti s prekoračenim rokom:"
-
-#~ msgid "TaskPad"
-#~ msgstr "Naloge"
+#~ msgstr "Naloge s prekoračenim rokom:"
 
 #~ msgid "Time Until Due"
-#~ msgstr "Čas do preteka"
+#~ msgstr "Čas do preteka"
 
 #~ msgid "Visual Alarms"
 #~ msgstr "Vidni alarmi"
@@ -10878,50 +12495,32 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit Task"
 #~ msgstr "Uredi nalogo"
 
-#~ msgid "Appointment - %s"
-#~ msgstr "Zmenek - %s"
-
-#~ msgid "Task - %s"
-#~ msgstr "Naloga - %s"
-
-#~ msgid "Journal entry - %s"
-#~ msgstr "Vpis v dnevniku - %s"
-
-#~ msgid "No summary"
-#~ msgstr "Ni povzetka"
-
-#~ msgid "Mark Complete"
-#~ msgstr "Označi kot opravljeno"
-
 #~ msgid "Edit the task"
 #~ msgstr "Uredi opravilo"
 
 #~ msgid "Schedule Meeting"
-#~ msgstr "Načrtuj sestanek"
+#~ msgstr "Načrtuj sestanek"
 
 #~ msgid "Component successfully updated."
-#~ msgstr "Komponenta je bila uspešno posodobljena."
-
-#~ msgid "There was an error loading the calendar file."
-#~ msgstr "Napaka ob nalaganju datoteke koledarja."
+#~ msgstr "Komponenta je bila uspeĹĄno posodobljena."
 
 #~ msgid "I couldn't open your calendar file!\n"
 #~ msgstr "Nisem mogel odpreti datoteke koledarja!\n"
 
 #~ msgid "I couldn't load your calendar file!\n"
-#~ msgstr "Nisem mogel naložiti vašege datoteke koledarja!\n"
+#~ msgstr "Nisem mogel naloĹžiti vaĹĄege datoteke koledarja!\n"
 
 #~ msgid "This is a reply from someone who was uninvited!"
 #~ msgstr "To je odgovor nekoga, ki ni bil povabljen!"
 
 #~ msgid "I couldn't update your calendar store."
-#~ msgstr "Nisem mogel posodobiti vaše shrambe koledarja."
+#~ msgstr "Nisem mogel posodobiti vaĹĄe shrambe koledarja."
 
 #~ msgid "I couldn't delete the calendar component!\n"
 #~ msgstr "Nisem mogel zbriati komponente koledarja!\n"
 
 #~ msgid "Component successfully deleted."
-#~ msgstr "Komponenta uspešno zbrisana."
+#~ msgstr "Komponenta uspeĹĄno zbrisana."
 
 #~ msgid "I don't recognize this type of calendar component."
 #~ msgstr "Ne preoznam te vrste komponente koledarja."
@@ -10929,43 +12528,25 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Add to Calendar"
 #~ msgstr "Dodaj _koledarju"
 
-#~ msgid " Accept "
-#~ msgstr " Sprejmi "
-
-#~ msgid " Decline "
-#~ msgstr " Zavrni "
-
 #~ msgid " Tentative "
 #~ msgstr " Poskusno "
 
 #~ msgid "Update Calendar"
 #~ msgstr "Posodobi koledar"
 
-#~ msgid "Attendee"
-#~ msgstr "Udeležen"
-
 #~ msgid "Attendee address"
-#~ msgstr "Naslov udeleženca"
+#~ msgstr "Naslov udeleĹženca"
 
 #~ msgid "Attendees: "
-#~ msgstr "Udeleženi:"
+#~ msgstr "UdeleĹženi:"
 
 #~ msgid ""
 #~ "Cancel\n"
 #~ "Meeting"
 #~ msgstr ""
-#~ "Prekliči\n"
+#~ "Prekliči\n"
 #~ "sestanek"
 
-#~ msgid "Chair"
-#~ msgstr "Stol"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Ne-sodelujoči"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Možni sodelujoči"
-
 #~ msgid "Organizer: "
 #~ msgstr "Organizator: "
 
@@ -10976,36 +12557,17 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Objavi\n"
 #~ "dogodek"
 
-#~ msgid "RSVP"
-#~ msgstr "RSVP"
-
-#~ msgid "Required Participant"
-#~ msgstr "Potrebni udeleženci"
-
-#~ msgid "Role"
-#~ msgstr "Vloga"
-
-#~ msgid ""
-#~ "Schedule\n"
-#~ "Time"
-#~ msgstr ""
-#~ "Načrtuj\n"
-#~ "čas"
-
-#~ msgid "Edit Appointment"
-#~ msgstr "Uredi zmenek"
-
 #~ msgid "Appointment Basics"
-#~ msgstr "Osnove zmenkov"
+#~ msgstr "Osnove sestankov"
 
 #~ msgid "_Starting date:"
-#~ msgstr "Datum _pričetka:"
+#~ msgstr "Datum _pričetka:"
 
 #~ msgid "Could not test lock file for %s: %s"
-#~ msgstr "Nisem mogel preveriti ključavnične datoteke %s: %s"
+#~ msgstr "Nisem mogel preveriti ključavnične datoteke %s: %s"
 
 #~ msgid "Error hashing password."
-#~ msgstr "Napaka ob razprševanju gesla."
+#~ msgstr "Napaka ob razprĹĄevanju gesla."
 
 #~ msgid "Invalid password."
 #~ msgstr "Neveljavno geslo.7"
@@ -11021,44 +12583,44 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nisem mogel podpisati: nisem uspel ustvariti podpisa"
 
 #~ msgid "'clearsign' is not supported by S/MIME."
-#~ msgstr "'čisto podpisovanje' v S/MIME ni podprto."
+#~ msgstr "'čisto podpisovanje' v S/MIME ni podprto."
 
 #~ msgid "Could not encrypt: failed to create enveloped data."
-#~ msgstr "Nisem mogel šifrirati: nisem uspel ustvariti podatkovne ovojnice."
+#~ msgstr "Nisem mogel ĹĄifrirati: nisem uspel ustvariti podatkovne ovojnice."
 
 #~ msgid "Could not encrypt: failed to create encryption context."
-#~ msgstr "Nisem mogel šifrirati: nisem uspel ustvariti konteksta šifriranja"
+#~ msgstr "Nisem mogel ĹĄifrirati: nisem uspel ustvariti konteksta ĹĄifriranja"
 
 #~ msgid "Could not encrypt data: invalid user key: \"%s\"."
-#~ msgstr "Nisem mogel šifrirati podatkov: neveljaven ključ uporabnika \"%s\"."
+#~ msgstr "Nisem mogel šifrirati podatkov: neveljaven ključ uporabnika \"%s\"."
 
 #~ msgid "Could not encrypt: encoding failed."
-#~ msgstr "Nisem mogel šifirirati: enkodiranje ni uspelo."
+#~ msgstr "Nisem mogel ĹĄifirirati: enkodiranje ni uspelo."
 
 #~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Nisem uspel dešifirati: vzrok neznan"
+#~ msgstr "Nisem uspel deĹĄifirati: vzrok neznan"
 
 #~ msgid "Inline attachment"
-#~ msgstr "Priloga kot del sporočila"
+#~ msgstr "Priloga kot del sporočila"
 
 #~ msgid "Send as:"
-#~ msgstr "Pošlji kot:"
+#~ msgstr "PoĹĄlji kot:"
 
 #~ msgid ""
 #~ "This version of Evolution was not built with support for S/MIME.\n"
 #~ "You may wish to instead use PGP to %s your document."
 #~ msgstr ""
-#~ "Ta različica Evolucije ni bila zgrajena s podporo za S/MIME.\n"
-#~ "Morda želite uporabiti PGP za %s vašega dokumenta."
+#~ "Ta različica Evolucije ni bila zgrajena s podporo za S/MIME.\n"
+#~ "Morda Ĺželite uporabiti PGP za %s vaĹĄega dokumenta."
 
 #~ msgid "sign and encrypt"
-#~ msgstr "podpis in šifriranje"
+#~ msgstr "podpis in ĹĄifriranje"
 
 #~ msgid "sign"
 #~ msgstr "podpis"
 
 #~ msgid "encrypt"
-#~ msgstr "šifriranje"
+#~ msgstr "ĹĄifriranje"
 
 #~ msgid ""
 #~ "Could not open signature file %s:\n"
@@ -11068,7 +12630,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "%s"
 
 #~ msgid "That is not a regular file."
-#~ msgstr "To ni običajna datoteka."
+#~ msgstr "To ni običajna datoteka."
 
 #~ msgid "That file exists but is not readable."
 #~ msgstr "Ta datoteka obstaja a ni berljiva."
@@ -11080,11 +12642,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "The file is very large (more than 100K).\n"
 #~ "Are you sure you wish to insert it?"
 #~ msgstr ""
-#~ "Datoteka je zelo velika (čez 100K).\n"
-#~ "Ste prepričani,da jo želite vstaviti?"
-
-#~ msgid "An error occurred while reading the file."
-#~ msgstr "Ob branju datoteke se je zgodila napaka."
+#~ "Datoteka je zelo velika (čez 100K).\n"
+#~ "Ste prepričani,da jo želite vstaviti?"
 
 #~ msgid "%I:%M:%S %p%n"
 #~ msgstr "%I:%M:%S %p%n"
@@ -11108,16 +12667,13 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "File does not have a place for the services.\n"
 #~ msgstr "Datoteka nima mesta za storitve.\n"
 
-#~ msgid "Select a service"
-#~ msgstr "Izberi storitev"
-
 #~ msgid ""
 #~ "You can select a different HTML page for the background of the Executive "
 #~ "Summary.\n"
 #~ "\n"
 #~ "Just leave it blank for the default"
 #~ msgstr ""
-#~ "Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
+#~ "Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
 #~ "\n"
 #~ "Pustite pravno za privzete nastavitve"
 
@@ -11128,10 +12684,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
 
 #~ msgid "Send an email to %s"
-#~ msgstr "Pošlji e-pošto %s"
+#~ msgstr "PoĹĄlji e-poĹĄto %s"
 
 #~ msgid "Run %s"
-#~ msgstr "Poženi %s"
+#~ msgstr "PoĹženi %s"
 
 #~ msgid "Close %s"
 #~ msgstr "Zapri %s"
@@ -11143,7 +12699,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Premakni %s na desno"
 
 #~ msgid "Move %s into the previous row"
-#~ msgstr "Premakni %s v prešnjo vrstico"
+#~ msgstr "Premakni %s v preĹĄnjo vrstico"
 
 #~ msgid "Move %s into the next row"
 #~ msgstr "Premakni %s v naslednjo vrstico"
@@ -11160,7 +12716,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "you compiled Bonobo against GOAD instead of OAF."
 #~ msgstr ""
 #~ "Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
-#~ "Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
+#~ "Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
 #~ "da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
 
 #~ msgid "Factory for the RDF summary."
@@ -11184,9 +12740,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Update automatically"
 #~ msgstr "Samodejno posodobi"
 
-#~ msgid "Update every "
-#~ msgstr "Posodobi vsakih"
-
 #~ msgid "PGP"
 #~ msgstr "PGP"
 
@@ -11194,34 +12747,25 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nisem mogel ustvariti konteksta preverjanja S/MIME."
 
 #~ msgid "Incomplete message written on pipe!"
-#~ msgstr "V cev je bilo zapisano nepopolno sporočilo!"
+#~ msgstr "V cev je bilo zapisano nepopolno sporočilo!"
 
 #~ msgid "Reply to the sender of this message"
-#~ msgstr "Odgovori pošiljatelju tega sporočila"
+#~ msgstr "Odgovori pošiljatelju tega sporočila"
 
 #~ msgid "Reply to all recipients of this message"
-#~ msgstr "Odgovori vsem prejemnikom tega sporočila"
+#~ msgstr "Odgovori vsem prejemnikom tega sporočila"
 
 #~ msgid "Delete this message"
-#~ msgstr "Zbriši to sporčilo"
-
-#~ msgid "Previous message"
-#~ msgstr "Prejšnje sporočilo"
-
-#~ msgid "Next message"
-#~ msgstr "Naslednje sporočilo"
+#~ msgstr "Zbriši to sporčilo"
 
 #~ msgid "Activate"
 #~ msgstr "Aktiviraj"
 
 #~ msgid "Activate this shortcut"
-#~ msgstr "Aktiviraj to bližnjico"
-
-#~ msgid "Find"
-#~ msgstr "Poišči"
+#~ msgstr "Aktiviraj to bliĹžnjico"
 
 #~ msgid "Find a contact"
-#~ msgstr "Poišči stik"
+#~ msgstr "Poišči stik"
 
 #~ msgid "View All"
 #~ msgstr "Glej vse"
@@ -11241,14 +12785,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "A_dresar... (FIXME)"
 
-#~ msgid "C_lear"
-#~ msgstr "Poč_isti"
-
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "_Preveri imena (FIXME)"
 
 #~ msgid "Clear the selection"
-#~ msgstr "Počisti izbiro"
+#~ msgstr "Počisti izbiro"
 
 #~ msgid "Cop_y to Folder... (FIXME)"
 #~ msgstr "_Kopiraj v mapo... (FIXME)"
@@ -11257,7 +12798,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Shrani kot XML"
 
 #~ msgid "Dump the UI Xml description"
-#~ msgstr "Shranio Xml opis uporabniškega vmesnika"
+#~ msgstr "Shranio Xml opis uporabniĹĄkega vmesnika"
 
 #~ msgid "Fi_rst Item in Folder (FIXME)"
 #~ msgstr "P_rvi predmet v mapi (FIXME)"
@@ -11269,25 +12810,22 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Pojdi na naslednji predmet"
 
 #~ msgid "Go to the previous item"
-#~ msgstr "Pojdi na prejšnji predmet"
+#~ msgstr "Pojdi na prejĹĄnji predmet"
 
 #~ msgid "In_complete Task (FIXME)"
 #~ msgstr "Ne_popolna naloga (FIXME)"
 
-#~ msgid "Modify the file's properties"
-#~ msgstr "Spremeni lastnosti datoteke"
-
 #~ msgid "N_ext"
 #~ msgstr "Napr_ej"
 
 #~ msgid "Pre_vious"
-#~ msgstr "P_rejšnji"
+#~ msgstr "P_rejĹĄnji"
 
 #~ msgid "Print S_etup..."
 #~ msgstr "Nas_tavitev tiskanja..."
 
 #~ msgid "Schedule some sort of a meeting"
-#~ msgstr "Načrtuj nek tip sestanka"
+#~ msgstr "Načrtuj nek tip sestanka"
 
 #~ msgid "Select everything"
 #~ msgstr "Izberi vse"
@@ -11302,13 +12840,13 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "_Predmet (FIXME)"
 
 #~ msgid "_Journal Entry (FIXME)"
-#~ msgstr "_Dnevniški zapis (FIXME)"
+#~ msgstr "_DnevniĹĄki zapis (FIXME)"
 
 #~ msgid "_Last Item in Folder (FIXME)"
 #~ msgstr "_Zadnji predmet v mapi (FIXME)"
 
 #~ msgid "_Mail Message (FIXME)"
-#~ msgstr "Pošlji _sporočilo (FIXME)"
+#~ msgstr "Pošlji _sporočilo (FIXME)"
 
 #~ msgid "_Move to Folder... (FIXME)"
 #~ msgstr "_Prestavi v mapo... (FIXME)"
@@ -11326,13 +12864,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Dodaj novo storitev v povzetek"
 
 #~ msgid "Create a new email"
-#~ msgstr "Ustvari novo e-pošto"
-
-#~ msgid "Executive Summary Settings..."
-#~ msgstr "Nastaviteve povzetka..."
+#~ msgstr "Ustvari novo e-poĹĄto"
 
 #~ msgid "New Mail"
-#~ msgstr "Nova pošta"
+#~ msgstr "Nova poĹĄta"
 
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_Vstavi datoteko z besedilom... (FIXME)"
@@ -11340,9 +12875,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Assig_n Task (FIXME)"
 #~ msgstr "Dodali _nalogo (FIXME)"
 
-#~ msgid "Meeting Re_quest (FIXME)"
-#~ msgstr "Za_htevek po sestanku (FIXME)"
-
 #~ msgid "Redo"
 #~ msgstr "Obnovi"
 
@@ -11359,16 +12891,16 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Odgovori _vsem (FIXME)"
 
 #~ msgid "S_end Status Report (FIXME)"
-#~ msgstr "Pošlji poročilo stanja (FIXME)"
+#~ msgstr "Pošlji poročilo stanja (FIXME)"
 
 #~ msgid "S_kip Occurrence (FIXME)"
-#~ msgstr "Preskoči ponovitev (FIXME)"
+#~ msgstr "Preskoči ponovitev (FIXME)"
 
 #~ msgid "Search again for the same string"
-#~ msgstr "Išči enak niz znova"
+#~ msgstr "Išči enak niz znova"
 
 #~ msgid "Search for a string"
-#~ msgstr "Išči niz"
+#~ msgstr "Išči niz"
 
 #~ msgid "Undo"
 #~ msgstr "Razveljavi"
@@ -11377,20 +12909,17 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Razveljavi zadnje dejanje"
 
 #~ msgid "_Mark Complete (FIXME)"
-#~ msgstr "_Označi kot opravljeno (FIXME)"
+#~ msgstr "_Označi kot opravljeno (FIXME)"
 
 #~ msgid "_Reply (FIXME)"
 #~ msgstr "_Odgovori (FIXME)"
 
 #~ msgid "Evolution bar _shortcut"
-#~ msgstr "Evolucijina vrstica z _bližnjicami"
+#~ msgstr "Evolucijina vrstica z _bliĹžnjicami"
 
 #~ msgid "Remove the selected folder"
 #~ msgstr "Odstrani izbrano mapo"
 
-#~ msgid "_Remove"
-#~ msgstr "_Odstrani"
-
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either\n"
 #~ "means you have entered an incorrect URI, or have tried\n"
@@ -11401,104 +12930,92 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "able to use LDAP, you'll need to download and install\n"
 #~ "OpenLDAP and recompile and install Evolution.\n"
 #~ msgstr ""
-#~ "Adresarja ni bilo mogoče odpreti. To lahko pomeni ali\n"
-#~ "da ste vnesli napačen URI, ali pa poskušali dostopati \n"
-#~ "do strežnika LDAP brez prevedene podpore LDAP. Če ste \n"
+#~ "Adresarja ni bilo mogoče odpreti. To lahko pomeni ali\n"
+#~ "da ste vnesli napačen URI, ali pa poskušali dostopati \n"
+#~ "do strežnika LDAP brez prevedene podpore LDAP. Če ste \n"
 #~ "vnesli URI, preverite njegovo pravilnost in ga znova \n"
-#~ "vnesite. Če ne, ste verjetno poskušali dostopati do LDAP \n"
-#~ "strežnika. Če želite uporabljalti LDAP morate naložiti in \n"
+#~ "vnesite. Če ne, ste verjetno poskušali dostopati do LDAP \n"
+#~ "strežnika. Če želite uporabljalti LDAP morate naložiti in \n"
 #~ "namestiti OpenLDAP in ponovno prevesti in namestiti Evolucijo. \n"
 
 #~ msgid "SASL"
 #~ msgstr "SASL"
 
 #~ msgid "%s is not a selectable folder"
-#~ msgstr "%s ni mogoče izbrati kot mapo"
+#~ msgstr "%s ni mogoče izbrati kot mapo"
 
 #~ msgid "Apply any new filters to the mail in this box"
-#~ msgstr "Uveljavi vse nove filtre pošti tega predala"
-
-#~ msgid "Compose a new message"
-#~ msgstr "Sestavi novo sporočilo"
+#~ msgstr "Uveljavi vse nove filtre poĹĄti tega predala"
 
 #~ msgid "Configure Folder..."
 #~ msgstr "Nastavi mapo..."
 
 #~ msgid "Copy message to a new folder"
-#~ msgstr "Prestavi sporočilo v novo mapo"
+#~ msgstr "Prestavi sporočilo v novo mapo"
 
 #~ msgid "Display all of the message headers"
-#~ msgstr "Kaži vse glave sporočil"
+#~ msgstr "Kaži vse glave sporočil"
 
 #~ msgid "Edit the current message"
-#~ msgstr "Uredi trenutno sporočilo"
+#~ msgstr "Uredi trenutno sporočilo"
 
 #~ msgid "Expunge"
-#~ msgstr "Uniči"
+#~ msgstr "Uniči"
 
 #~ msgid "Finaly remove all mails tagged for deletion"
-#~ msgstr "Dokončno odstrani vso pošto označeno za izbris"
+#~ msgstr "Dokončno odstrani vso pošto označeno za izbris"
 
 #~ msgid "Forward inline"
-#~ msgstr "Posreduj naprej kot del sporočila"
+#~ msgstr "Posreduj naprej kot del sporočila"
 
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
-#~ msgstr "Posreduj to sporočilo kot del vaše pošte, da ga lahko uredite"
+#~ msgstr "Posreduj to sporočilo kot del vaše pošte, da ga lahko uredite"
 
 #~ msgid "Hide Deleted Messages"
-#~ msgstr "Skrij zbrisana sporočila"
+#~ msgstr "Skrij zbrisana sporočila"
 
 #~ msgid "Invert Selection"
 #~ msgstr "Obrni izbor"
 
 #~ msgid "Move message to a new folder"
-#~ msgstr "Prestavi sporočilo v novo mapo"
+#~ msgstr "Prestavi sporočilo v novo mapo"
 
 #~ msgid "Print Preview of message..."
-#~ msgstr "Predogled tiskanja sporočila..."
+#~ msgstr "Predogled tiskanja sporočila..."
 
 #~ msgid "Reply to all"
 #~ msgstr "Odgovori vsem"
 
 #~ msgid "Reply to sender"
-#~ msgstr "Odgovori pošiljatelju"
+#~ msgstr "Odgovori poĹĄiljatelju"
 
 #~ msgid "S_ource"
 #~ msgstr "_Vir"
 
 #~ msgid "Send a reply to the person who sent you this mail"
-#~ msgstr "Pošlji odgovor osebi, ki vam je poslala to pošto"
+#~ msgstr "PoĹĄlji odgovor osebi, ki vam je poslala to poĹĄto"
 
 #~ msgid "Send a single mail in reply to all the selected mail"
-#~ msgstr "Pošlji en sam odgovor na vso izbrano pošto"
+#~ msgstr "PoĹĄlji en sam odgovor na vso izbrano poĹĄto"
 
 #~ msgid ""
 #~ "Send queued mail\n"
 #~ "    and retrieve new mail"
 #~ msgstr ""
-#~ "Pošlji čakajočo pošto\n"
+#~ "Pošlji čakajočo pošto\n"
 #~ "    in sprejmi novo"
 
-#~ msgid "Undelete"
-#~ msgstr "Odbriši"
-
 #~ msgid "View Raw Message Source"
-#~ msgstr "Glej izvorno obliko sporočila"
-
-#~ msgid "_Attachment"
-#~ msgstr "_Priloga"
+#~ msgstr "Glej izvorno obliko sporočila"
 
 #~ msgid "_Reply"
 #~ msgstr "_Odgovori"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "_Shrani sporočilo kot..."
-
 #~ msgid "_Threaded"
 #~ msgstr "_Niteno"
 
 #~ msgid "Send the message now"
-#~ msgstr "Takoj pošlji sporočilo"
+#~ msgstr "Takoj pošlji sporočilo"
 
 #~ msgid "Advanced ..."
 #~ msgstr "Napredno ..."
@@ -11507,7 +13024,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Kliknite tu za dodajo stika"
 
 #~ msgid "No such host %s."
-#~ msgstr "Ni takšnega gostitelja %s."
+#~ msgstr "Ni takĹĄnega gostitelja %s."
 
 #~ msgid "Temporarily unable to look up hostname %s."
 #~ msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
@@ -11522,16 +13039,16 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "vMapa glede na Zadevo"
 
 #~ msgid "VFolder on Sender"
-#~ msgstr "vMapa glede na Pošiljatelja"
+#~ msgstr "vMapa glede na PoĹĄiljatelja"
 
 #~ msgid "VFolder on Recipients"
 #~ msgstr "vMapa glede na Prejemnika"
 
 #~ msgid "Mark as Read"
-#~ msgstr "Označi kot prebrano"
+#~ msgstr "Označi kot prebrano"
 
 #~ msgid "Mark as Unread"
-#~ msgstr "Označi kot neprebrano"
+#~ msgstr "Označi kot neprebrano"
 
 #~ msgid "Move to Folder..."
 #~ msgstr "Prestavi v mapo..."
@@ -11543,20 +13060,20 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Sprejemate?"
 
 #~ msgid "Disable."
-#~ msgstr "Izključeno."
+#~ msgstr "Izključeno."
 
 #~ msgid "_Compose"
 #~ msgstr "_Sestavi"
 
 #~ msgid "PLAIN"
-#~ msgstr "ČISTO"
+#~ msgstr "ČISTO"
 
 #~ msgid ""
 #~ "This option will connect to the server using a the PLAIN SASL mechanism "
 #~ "if the server supports it."
 #~ msgstr ""
-#~ "Ta možnost narekuje povezavo s strežnikom z uporabo ČISTEGA SASL "
-#~ "mehanizma,če strežnik to podpira."
+#~ "Ta možnost narekuje povezavo s strežnikom z uporabo ČISTEGA SASL "
+#~ "mehanizma,če strežnik to podpira."
 
 #~ msgid "URL string `%s' contains no protocol"
 #~ msgstr "URL niz '%s' ne vsebuje protokola"
@@ -11565,10 +13082,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "URL niz '%s' vsebuje neveljaven protokol"
 
 #~ msgid "Port number in URL `%s' is non-numeric"
-#~ msgstr "Številka vrat v URL '%s' ni numerična"
+#~ msgstr "Številka vrat v URL '%s' ni numerična"
 
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
-#~ msgstr "Za branje in hranjenje pošte na IMAP strežnikih preko povezave SSL."
+#~ msgstr "Za branje in hranjenje poĹĄte na IMAP streĹžnikih preko povezave SSL."
 
 #~ msgid "Secure POP"
 #~ msgstr "Varni POP"
@@ -11578,68 +13095,47 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "can also be used to retrieve mail from certain web mail providers and "
 #~ "proprietary email systems."
 #~ msgstr ""
-#~ "Za povezovanje s strežniki POP preko povezave SSL. Protokol POP se lahko "
-#~ "uporabi tudi za prenašanje pošte iz nekaterih spletnih nuditeljev pošte "
-#~ "in zaprtih sistemov e-pošte."
-
-#~ msgid "Secure SMTP"
-#~ msgstr "Varni SMTP"
+#~ "Za povezovanje s streĹžniki POP preko povezave SSL. Protokol POP se lahko "
+#~ "uporabi tudi za prenaĹĄanje poĹĄte iz nekaterih spletnih nuditeljev poĹĄte "
+#~ "in zaprtih sistemov e-poĹĄte."
 
 #~ msgid ""
 #~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
 #~ "SSL connection.\n"
 #~ msgstr ""
-#~ "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z "
+#~ "Za dostavo poĹĄte preko povezave z oddaljenim poĹĄtnim razdelilcem z "
 #~ "uporabo SMTP preko povezave SSL.\n"
 
 #~ msgid ""
 #~ "One or more of your servers are not configured correctly.\n"
 #~ "Do you wish to save anyway?"
 #~ msgstr ""
-#~ "Eden ali več strežnikov ni pravilno nastavljenih.\n"
+#~ "Eden ali več strežnikov ni pravilno nastavljenih.\n"
 #~ "Vseeno shrani?"
 
 #~ msgid "Unspecified"
 #~ msgstr "Ni naveden"
 
-#~ msgid "Advanced"
-#~ msgstr "Napredno"
-
-#~ msgid "Check settings"
-#~ msgstr "Preveri nastavitve"
-
 #~ msgid "Email address:"
-#~ msgstr "E-poštni naslov:"
+#~ msgstr "E-poĹĄtni naslov:"
 
 #~ msgid "Evolution Mail Configuration"
-#~ msgstr "Nastavitev Evolucijine pošte"
-
-#~ msgid "Hostname:"
-#~ msgstr "Ime gostitelja:"
+#~ msgstr "Nastavitev Evolucijine poĹĄte"
 
 #~ msgid "IMAP"
 #~ msgstr "IMAP"
 
 #~ msgid "Include this account when receiving mail"
-#~ msgstr "Vključi ta račun ob sprejemanju pošte"
+#~ msgstr "Vključi ta račun ob sprejemanju pošte"
 
 #~ msgid "Keep mail on server"
-#~ msgstr "Ohrani pošto na strežniku"
-
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos"
+#~ msgstr "Ohrani poĹĄto na streĹžniku"
 
 #~ msgid "Mail Account"
-#~ msgstr "Poštni račun"
-
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Druid za nastavitev pošte"
-
-#~ msgid "Password:"
-#~ msgstr "Geslo:"
+#~ msgstr "Poštni račun"
 
 #~ msgid "Plain Text"
-#~ msgstr "Nešifrirano"
+#~ msgstr "NeĹĄifrirano"
 
 #~ msgid "Remember my password"
 #~ msgstr "Zapomni si geslo"
@@ -11650,9 +13146,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Required"
 #~ msgstr "Potrebno"
 
-#~ msgid "Server type:"
-#~ msgstr "Vrsta strežnika:"
-
 #~ msgid "Transport"
 #~ msgstr "Prenos"
 
@@ -11663,8 +13156,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Type the name by which you would like to refer to these servers. For "
 #~ "example: \"Work\" or \"Home\"."
 #~ msgstr ""
-#~ "Vpišite ime s katerimi želite nazivati te strežnike. Na primer:\"službeni"
-#~ "\" ali \"domači\"."
+#~ "VpiĹĄite ime s katerimi Ĺželite nazivati te streĹžnike. Na primer:\"sluĹžbeni"
+#~ "\" ali \"domači\"."
 
 #~ msgid "minutes."
 #~ msgstr "minut."
@@ -11673,21 +13166,21 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Failed to verify the incoming mail configuration.\n"
 #~ "You may experience problems retrieving your mail from %s"
 #~ msgstr ""
-#~ "Nisem uspel preveriti nastavitve dohodne pošte.\n"
-#~ "Morda boste naleteli na probleme ob dobivanju pošte z %s"
+#~ "Nisem uspel preveriti nastavitve dohodne poĹĄte.\n"
+#~ "Morda boste naleteli na probleme ob dobivanju poĹĄte z %s"
 
 #~ msgid ""
 #~ "Failed to verify the outgoing mail configuration.\n"
 #~ "You may experience problems sending your mail using %s"
 #~ msgstr ""
-#~ "Nisem uspel preveriti nastavitve odhodne pošte.\n"
-#~ "Morda boste naleteli na probleme ob pošiljanju pošte preko %s"
+#~ "Nisem uspel preveriti nastavitve odhodne poĹĄte.\n"
+#~ "Morda boste naleteli na probleme ob poĹĄiljanju poĹĄte preko %s"
 
 #~ msgid "%s message %d of %d (uid \"%s\")"
-#~ msgstr "%s sporočilo %d od %d (uid \"%s\")"
+#~ msgstr "%s sporočilo %d od %d (uid \"%s\")"
 
 #~ msgid "Disabled"
-#~ msgstr "Izključeno"
+#~ msgstr "Izključeno"
 
 #~ msgid "Synchronize"
 #~ msgstr "Uskladi"
@@ -11742,17 +13235,14 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "An error occured when trying to fetch\n"
 #~ "pilot list from the gnome-pilot daemon"
 #~ msgstr ""
-#~ "Ob prenašanju seznama pilotov z gnome-pilot\n"
+#~ "Ob prenaĹĄanju seznama pilotov z gnome-pilot\n"
 #~ "daemona se je zgodila napaka"
 
-#~ msgid "Configure the address conduit"
-#~ msgstr "Nastavi veznik adresarja"
-
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Evolucijin veznik adresarja "
 
 #~ msgid "label26"
-#~ msgstr "označba26"
+#~ msgstr "označba26"
 
 #~ msgid "Evolution Calendar Conduit"
 #~ msgstr "Evolucijin veznik koledarja"
@@ -11779,7 +13269,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nastavitveno orodje za Evolucijin veznik opravil.\n"
 
 #~ msgid "label21"
-#~ msgstr "označba21"
+#~ msgstr "označba21"
 
 #~ msgid "label55"
 #~ msgstr "label55"
@@ -11791,15 +13281,15 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "This option will connect to the SMTP server without using any kind of "
 #~ "authentication. This should be fine for connecting to most SMTP servers."
 #~ msgstr ""
-#~ "Ta možnost narekuje povezavo s strežnikom SMTP brez uporabe "
-#~ "avtentifikacije. To bi moralo biti v redu za povezavo z večino strežniki "
+#~ "Ta moĹžnost narekuje povezavo s streĹžnikom SMTP brez uporabe "
+#~ "avtentifikacije. To bi moralo biti v redu za povezavo z večino strežniki "
 #~ "SMTP."
 
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Uredi pravilo filtra"
 
 #~ msgid "Set Flag"
-#~ msgstr "Postavi označbo"
+#~ msgstr "Postavi označbo"
 
 #~ msgid "matches regex"
 #~ msgstr "ustreza regularnemu izrazu"
@@ -11820,40 +13310,40 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "<neznan>"
 
 #~ msgid "_Message Hiding"
-#~ msgstr "_Skrivanje sporočila"
+#~ msgstr "_Skrivanje sporočila"
 
 #~ msgid "The time is invalid"
-#~ msgstr "Čas ni veljaven"
+#~ msgstr "Čas ni veljaven"
 
 #~ msgid "The priority must be between 1 and 9, inclusive"
-#~ msgstr "Prioriteta mora biti med vključno 1 in 9"
+#~ msgstr "Prioriteta mora biti med vključno 1 in 9"
 
 #~ msgid "Edit this appointment..."
-#~ msgstr "Uredi ta zmenek..."
+#~ msgstr "Uredi ta sestanek..."
 
 #~ msgid "Enter the identity you wish to send this message from"
-#~ msgstr "Vnesite identiteto s katero želite poslati to sporočilo"
+#~ msgstr "Vnesite identiteto s katero želite poslati to sporočilo"
 
 #~ msgid "Enter the subject of the mail"
-#~ msgstr "Vnesite zadevo spročila"
+#~ msgstr "Vnesite zadevo spročila"
 
 #~ msgid "Account Properties"
-#~ msgstr "Lastnosti računa"
+#~ msgstr "Lastnosti računa"
 
 #~ msgid "Include in \"Get Mail\" operations."
-#~ msgstr "Vključuj v operacije \"Dobi pošto\"."
+#~ msgstr "Vključuj v operacije \"Dobi pošto\"."
 
 #~ msgid "Incoming Mail Server"
-#~ msgstr "Strežnik dohodne pošte"
+#~ msgstr "StreĹžnik dohodne poĹĄte"
 
 #~ msgid "Miscellaneous"
 #~ msgstr "Razno"
 
 #~ msgid "Outgoing Mail Server"
-#~ msgstr "Strežnik odhodne pošte"
+#~ msgstr "StreĹžnik odhodne poĹĄte"
 
 #~ msgid "Servers"
-#~ msgstr "Strežniki"
+#~ msgstr "StreĹžniki"
 
 #~ msgid "_Addressbook Configuration..."
 #~ msgstr "Nastavitev _adresarja..."
@@ -11867,38 +13357,29 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Calendar Preferences..."
 #~ msgstr "Nastavitve koledarja..."
 
-#~ msgid "_Print this calendar"
-#~ msgstr "Na_tisni ta koledar"
-
 #~ msgid "Create Rule"
 #~ msgstr "Ustvari pravilo"
 
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Filtriraj glede na Pošiljatelja"
-
 #~ msgid "Filter on Rec_ipients"
 #~ msgstr "Filtriraj glede na Prejemnike"
 
 #~ msgid "Get Mail"
-#~ msgstr "Poberi pošto"
+#~ msgstr "Poberi poĹĄto"
 
 #~ msgid "Reply to _Sender"
-#~ msgstr "Odgovori _pošiljatelju"
-
-#~ msgid "Show _All Messages"
-#~ msgstr "Kaži vsa sporočila"
+#~ msgstr "Odgovori _poĹĄiljatelju"
 
 #~ msgid "_Filter on Subject"
 #~ msgstr "Filtriraj glede na _Zadevo"
 
 #~ msgid "_Mail Configuration..."
-#~ msgstr "Nastavitev _Pošte..."
+#~ msgstr "Nastavitev _PoĹĄte..."
 
 #~ msgid "_Open in New Window"
 #~ msgstr "_Odpri v novem oknu"
 
 #~ msgid "_Print Message"
-#~ msgstr "Na_tisni sporočilo"
+#~ msgstr "Na_tisni sporočilo"
 
 #~ msgid "_VFolder on Subject"
 #~ msgstr "vMapa glede na _Zadevo"
@@ -11907,37 +13388,19 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "_Prilagodi..."
 
 #~ msgid "Show the _Folder Bar"
-#~ msgstr "Kaži vrstico z _mapami"
+#~ msgstr "KaĹži vrstico z _mapami"
 
 #~ msgid "Show the _Shortcut Bar"
-#~ msgstr "Kaži vrstico z bližnjicami"
-
-#~ msgid "Saving changes to message..."
-#~ msgstr "Shranjujem spremembe sporočila..."
+#~ msgstr "KaĹži vrstico z bliĹžnjicami"
 
 #~ msgid "Save changes to message..."
-#~ msgstr "Shranjujem spremembe sporočila..."
+#~ msgstr "Shranjujem spremembe sporočila..."
 
 #~ msgid "Error saving composition to 'Drafts': %s"
 #~ msgstr "Napaka ob shranjevanju kompozicije v 'Osnutki': %s"
 
-#~ msgid "Body or subject contains"
-#~ msgstr "Telo ali zadeva vsebuje"
-
-#~ msgid "Subject contains"
-#~ msgstr "Zadeva vsebuje"
-
-#~ msgid "Body does not contain"
-#~ msgstr "Telo ne vsebuje"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "Zadeva ne vsebuje"
-
-#~ msgid "Sender contains"
-#~ msgstr "Pošiljatelj vsebuje"
-
 #~ msgid "Connect to server"
-#~ msgstr "Poveži se s strežnikom"
+#~ msgstr "PoveĹži se s streĹžnikom"
 
 #~ msgid "Registering local folder"
 #~ msgstr "Registriam krajevno mapo"
@@ -11945,20 +13408,17 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Appending \"%s\""
 #~ msgstr "Dodajam \"%s\""
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Dodajam sporočilo brez navedene zadeve"
-
 #~ msgid "Moving messages from \"%s\" into \"%s\""
-#~ msgstr "Prestavljam sporočila iz \"%s\" v \"%s\""
+#~ msgstr "Prestavljam sporočila iz \"%s\" v \"%s\""
 
 #~ msgid "Copying messages from \"%s\" into \"%s\""
-#~ msgstr "Kopiram sporočila iz \"%s\" v \"%s\""
+#~ msgstr "Kopiram sporočila iz \"%s\" v \"%s\""
 
 #~ msgid "Move messages from \"%s\" into \"%s\""
-#~ msgstr "Prestavi sporočilo iz \"%s\" v \"%s\""
+#~ msgstr "Prestavi sporočilo iz \"%s\" v \"%s\""
 
 #~ msgid "Copy messages from \"%s\" into \"%s\""
-#~ msgstr "Kopiraj sporočilo iz \"%s\" v \"%s\""
+#~ msgstr "Kopiraj sporočilo iz \"%s\" v \"%s\""
 
 #~ msgid "(No description)"
 #~ msgstr "(ni opisa)"
@@ -11970,7 +13430,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nalagam mapo %s za %s"
 
 #~ msgid "Load %s Folder for %s"
-#~ msgstr "Naloži mapo %s za %s"
+#~ msgstr "NaloĹži mapo %s za %s"
 
 #~ msgid ""
 #~ "Error while `%s':\n"
@@ -11980,10 +13440,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "%s"
 
 #~ msgid "Error reading commands from dispatching thread."
-#~ msgstr "Napaka ob branju ukazov iz razpošiljalne niti."
+#~ msgstr "Napaka ob branju ukazov iz razpoĹĄiljalne niti."
 
 #~ msgid "Corrupted message from dispatching thread?"
-#~ msgstr "Prispelo pokvarjeno sporočilo iz razpošiljalne niti?"
+#~ msgstr "Prispelo pokvarjeno sporočilo iz razpošiljalne niti?"
 
 #~ msgid ""
 #~ "Cannot open location `%s':\n"
@@ -11996,19 +13456,13 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Dobi shrambo za \"%s\""
 
 #~ msgid "Unsubscribe from folder \"%s\""
-#~ msgstr "Prekliči naročnino na mapo \"%s\""
-
-#~ msgid "All Folders"
-#~ msgstr "Vse mape"
-
-#~ msgid "Display folders whose name contain:"
-#~ msgstr "Prikaži mape, katerih ime vsebuje:"
+#~ msgstr "Prekliči naročnino na mapo \"%s\""
 
 #~ msgid "Query"
 #~ msgstr "Poizvedba"
 
 #~ msgid "Subscribed"
-#~ msgstr "Naročen"
+#~ msgstr "Naročen"
 
 #~ msgid ""
 #~ "\n"
@@ -12022,7 +13476,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "G.\n"
 #~ "Ga.\n"
 #~ "Ga.\n"
-#~ "Gdč.\n"
+#~ "Gdč.\n"
 #~ "Dr.\n"
 
 #~ msgid ""
@@ -12045,33 +13499,30 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "Krajevno hranjenje nima privzete mape"
 
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Krajevnih map ni mogoče gnezditi."
-
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr ""
-#~ "Opomba: Med pretvarjanjem med različnimi oblikami poštnih predalov\n"
+#~ "Opomba: Med pretvarjanjem med različnimi oblikami poštnih predalov\n"
 
 #~ msgid "(such as lack of disk space) may not be automatically\n"
 #~ msgstr "napaka (kot pomanjkanje diska) ni nujno samodejno\n"
 
 #~ msgid "recoverable.  Please use this feature with care."
-#~ msgstr "odpravljiva. Prosimo pazljivo uporabljajte to možnost."
+#~ msgstr "odpravljiva. Prosimo pazljivo uporabljajte to moĹžnost."
 
 #~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Čestitamo, vaša nastavitev pošte je opravljena.\n"
+#~ msgstr "Čestitamo, vaša nastavitev pošte je opravljena.\n"
 
 #~ msgid "\n"
 #~ msgstr "\n"
 
 #~ msgid "You are now ready to send and receive email \n"
-#~ msgstr "Sedaj ste pripravljeni za sprejemanje e-pošte \n"
+#~ msgstr "Sedaj ste pripravljeni za sprejemanje e-poĹĄte \n"
 
 #~ msgid "Click \"Finish\" to save your settings."
-#~ msgstr "Kliknite \"Končaj\" za shranitev vaših nastavitev."
+#~ msgstr "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
 #~ msgid "Click \"Next\" to begin. "
-#~ msgstr "Kliknite \"Naprej\" za začetek. "
+#~ msgstr "Kliknite \"Naprej\" za začetek. "
 
 #~ msgid "FIXME: Assig_n Task"
 #~ msgstr "FIXME: Dodali _nalogo"
@@ -12089,7 +13540,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "FIXME: _Oblikuj obrazec..."
 
 #~ msgid "FIXME: Define Print _Styles"
-#~ msgstr "FIXME: Določi _sloge tiskanja"
+#~ msgstr "FIXME: Določi _sloge tiskanja"
 
 #~ msgid "FIXME: Desi_gn This Form"
 #~ msgstr "FIXME: Obli_kuj ta obrazec"
@@ -12098,10 +13549,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "FIXME: _Posreduj naprej"
 
 #~ msgid "FIXME: Help"
-#~ msgstr "FIXME: Pomoč"
+#~ msgstr "FIXME: Pomoč"
 
 #~ msgid "FIXME: In_complete Task"
-#~ msgstr "FIXME: Do_končana naloga"
+#~ msgstr "FIXME: Do_končana naloga"
 
 #~ msgid "FIXME: It_em..."
 #~ msgstr "FIXME: Pr_edmet..."
@@ -12125,19 +13576,16 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "FIXME: Odgovori v_sem"
 
 #~ msgid "FIXME: S_end"
-#~ msgstr "FIXME: Pošlji"
+#~ msgstr "FIXME: PoĹĄlji"
 
 #~ msgid "FIXME: Save Attac_hments..."
 #~ msgstr "FIXME: Dodaj prilogo..."
 
 #~ msgid "FIXME: Script _Debugger"
-#~ msgstr "FIXME: Razhroščevalnik skript"
-
-#~ msgid "FIXME: Task _Request"
-#~ msgstr "FIXME: Zahteva po _nalogi"
+#~ msgstr "FIXME: Razhroščevalnik skript"
 
 #~ msgid "FIXME: _Appointment"
-#~ msgstr "FIXME: _Zmenek"
+#~ msgstr "FIXME: _Sestanek"
 
 #~ msgid "FIXME: _Contact"
 #~ msgstr "FIXME: _Stik"
@@ -12161,13 +13609,13 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "FIXME: _Vpis v dnevniku"
 
 #~ msgid "FIXME: _Mail Message"
-#~ msgstr "FIXME: _Pošlji sporočilo"
+#~ msgstr "FIXME: _Pošlji sporočilo"
 
 #~ msgid "FIXME: _Mark Complete"
-#~ msgstr "FIXME: _Označi kot dokončano"
+#~ msgstr "FIXME: _Označi kot dokončano"
 
 #~ msgid "FIXME: _Memo Style"
-#~ msgstr "FIXME: V slogu zabeležka"
+#~ msgstr "FIXME: V slogu zabeleĹžka"
 
 #~ msgid "FIXME: _Move to Folder..."
 #~ msgstr "FIXME: Prestavi v mapo..."
@@ -12185,10 +13633,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "FIXME: _Odgovori"
 
 #~ msgid "FIXME: _Spelling..."
-#~ msgstr "FIXME: _Črkovanje..."
+#~ msgstr "FIXME: _Črkovanje..."
 
 #~ msgid "FIXME: _Standard"
-#~ msgstr "FIXME: _Običajno"
+#~ msgstr "FIXME: _Običajno"
 
 #~ msgid "FIXME: _Task"
 #~ msgstr "FIXME: _Naloga"
@@ -12200,10 +13648,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "FIXME: _opomba"
 
 #~ msgid "Find _Again"
-#~ msgstr "Poišči znova"
+#~ msgstr "Poišči znova"
 
 #~ msgid "_Find..."
-#~ msgstr "_Poišči..."
+#~ msgstr "_Poišči..."
 
 #~ msgid "_Forms"
 #~ msgstr "_Obrazci"
@@ -12220,9 +13668,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Undo"
 #~ msgstr "_Razveljavi"
 
-#~ msgid "C_lassification:"
-#~ msgstr "_Uvrstitev:"
-
 #~ msgid "S_ummary"
 #~ msgstr "_Povzetek"
 
@@ -12232,21 +13677,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Open..."
 #~ msgstr "Odpri..."
 
-#~ msgid "Hours"
-#~ msgstr "Ur"
-
 #~ msgid "Mail _to:"
-#~ msgstr "Pošlji pošto _za:"
-
-#~ msgid "Minutes"
-#~ msgstr "Minut"
+#~ msgstr "PoĹĄlji poĹĄto _za:"
 
 #~ msgid "_Audio"
 #~ msgstr "_Zvok"
 
-#~ msgid "_Mail"
-#~ msgstr "_Pošlji pošto"
-
 #~ msgid "_Program"
 #~ msgstr "_Program"
 
@@ -12257,65 +13693,59 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Odpri koledar"
 
 #~ msgid "FIXME: _New Appointment"
-#~ msgstr "FIXME: _Nov zmenek"
+#~ msgstr "FIXME: _Nov sestanek"
 
 #~ msgid "FIXME: _Note"
 #~ msgstr "FIXME: _Opomba"
 
-#~ msgid "Group %i"
-#~ msgstr "Skupina %i"
-
 #~ msgid "Failed to perform regex search on message header: %s"
 #~ msgstr ""
-#~ "Nisem uspel izvesti iskanja z regularnimi izrazi v glavah sporočil: %s"
+#~ "Nisem uspel izvesti iskanja z regularnimi izrazi v glavah sporočil: %s"
 
 #~ msgid "You have no Outbox configured"
-#~ msgstr "Nimate nastavljenega Izhodnega poštnega predala"
+#~ msgstr "Nimate nastavljenega Izhodnega poĹĄtnega predala"
 
 #~ msgid "Fetch email from %s"
-#~ msgstr "Poberi pošto iz %s"
+#~ msgstr "Poberi poĹĄto iz %s"
 
 #~ msgid "Filtering email on demand"
-#~ msgstr "Filtriram pošto na zahtevo"
+#~ msgstr "Filtriram poĹĄto na zahtevo"
 
 #~ msgid "Filter email on demand"
-#~ msgstr "Fitriraj pošto na zahtevo"
+#~ msgstr "Fitriraj poĹĄto na zahtevo"
 
 #~ msgid "Sending queue"
-#~ msgstr "Pošiljam vrsto"
+#~ msgstr "PoĹĄiljam vrsto"
 
 #~ msgid "Send queue"
-#~ msgstr "Pošlji vrsto"
+#~ msgstr "PoĹĄlji vrsto"
 
 #~ msgid "Examining %s"
-#~ msgstr "Preučujem %s"
+#~ msgstr "Preučujem %s"
 
 #~ msgid ""
 #~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
 #~ msgstr ""
 #~ "Nisem mogel prebrati UID medpomnilne datoteke \"%s\". Morda boste "
-#~ "dobilipodvojeno sporočilo."
+#~ "dobilipodvojeno sporočilo."
 
 #~ msgid "Retrieving message %d of %d"
-#~ msgstr "Prenašam sporočilo %d od %d"
+#~ msgstr "Prenašam sporočilo %d od %d"
 
 #~ msgid "Saving changes to %s"
 #~ msgstr "Shranjujem spremembe pri %s"
 
 #~ msgid "Experimental/new code to get/receive mail"
-#~ msgstr "Eksperimentalna/nova koda za sprejem/pošiljanje pošte"
+#~ msgstr "Eksperimentalna/nova koda za sprejem/poĹĄiljanje poĹĄte"
 
 #~ msgid "Get Mail (new)"
-#~ msgstr "Dobi pošto (novo)"
+#~ msgstr "Dobi poĹĄto (novo)"
 
 #~ msgid "External Directories"
 #~ msgstr "Zunanji imeniki"
 
 #~ msgid "Port Number:"
-#~ msgstr "Številka vrat:"
-
-#~ msgid "window2"
-#~ msgstr "okno2"
+#~ msgstr "Ĺ tevilka vrat:"
 
 #~ msgid "Headings:"
 #~ msgstr "Zaglavja:"
@@ -12324,16 +13754,16 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Osvetljen dan:"
 
 #~ msgid "Day numbers:"
-#~ msgstr "Številke dni:"
+#~ msgstr "Ĺ tevilke dni:"
 
 #~ msgid "Current day's number:"
-#~ msgstr "Številka trenutnega dne:"
+#~ msgstr "Ĺ tevilka trenutnega dne:"
 
 #~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Opravilo, ki še ni na vrsti:"
+#~ msgstr "Opravilo, ki ĹĄe ni na vrsti:"
 
 #~ msgid "To-Do item that is overdue:"
-#~ msgstr "Opravilo, ki je že pretekel:"
+#~ msgstr "Opravilo, ki je Ĺže pretekel:"
 
 #~ msgid "Recur on the"
 #~ msgstr "Ponovitev na"
@@ -12348,10 +13778,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "However, the appointment will recur at the appropriate time and will be "
 #~ "displayed properly in the calendar views."
 #~ msgstr ""
-#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana "
+#~ "Ta sestanek ima pravila ponovitev po meri, ki ne morejo biti urejana "
 #~ "znotraj Evolucije.\n"
 #~ "\n"
-#~ "Vendar se bo zmenek ponovil pravočasno in bo  pravilno prikazan v pogledu "
+#~ "Vendar se bo sestanek ponovil pravočasno in bo  pravilno prikazan v pogledu "
 #~ "koledarja."
 
 #~ msgid "may"
@@ -12376,13 +13806,13 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "sre"
 
 #~ msgid "thursday"
-#~ msgstr "četrtek"
+#~ msgstr "četrtek"
 
 #~ msgid "thur"
-#~ msgstr "čet"
+#~ msgstr "čet"
 
 #~ msgid "thurs"
-#~ msgstr "čet"
+#~ msgstr "čet"
 
 #~ msgid "friday"
 #~ msgstr "petek"
@@ -12391,7 +13821,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "sobota"
 
 #~ msgid "fortnight"
-#~ msgstr "štirinajst dni"
+#~ msgstr "ĹĄtirinajst dni"
 
 #~ msgid "min"
 #~ msgstr "min"
@@ -12403,7 +13833,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "jutri"
 
 #~ msgid "yesterday"
-#~ msgstr "včeraj"
+#~ msgstr "včeraj"
 
 #~ msgid "today"
 #~ msgstr "danes"
@@ -12424,7 +13854,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "peti"
 
 #~ msgid "sixth"
-#~ msgstr "šesti"
+#~ msgstr "ĹĄesti"
 
 #~ msgid "seventh"
 #~ msgstr "sedmi"
@@ -12441,9 +13871,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "twelfth"
 #~ msgstr "dvanajsti"
 
-#~ msgid "ago"
-#~ msgstr "nazaj"
-
 #~ msgid "Create to-do item"
 #~ msgstr "Ustvari opravilo"
 
@@ -12464,15 +13891,15 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "When you click on a day, you will be taken\n"
 #~ "to that date."
 #~ msgstr ""
-#~ "Prosim izberite datum na katerega hočete iti.\n"
-#~ "Ko klikente na dan boste samodejno šli\n"
+#~ "Prosim izberite datum na katerega hočete iti.\n"
+#~ "Ko klikente na dan boste samodejno ĹĄli\n"
 #~ "na ta datum."
 
 #~ msgid "Time display"
-#~ msgstr "Prikaz časa"
+#~ msgstr "Prikaz časa"
 
 #~ msgid "Time format"
-#~ msgstr "Oblika izpisa časa"
+#~ msgstr "Oblika izpisa časa"
 
 #~ msgid "12-hour (AM/PM)"
 #~ msgstr "12 urna (dop./pop.)"
@@ -12481,7 +13908,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "24 urna"
 
 #~ msgid "Weeks start on"
-#~ msgstr "Tedni se začnejo v"
+#~ msgstr "Tedni se začnejo v"
 
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
@@ -12489,24 +13916,24 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Times outside this range will not be displayed\n"
 #~ "by default."
 #~ msgstr ""
-#~ "Prosim izberite ure začetka in konca dneva, ki naj\n"
+#~ "Prosim izberite ure začetka in konca dneva, ki naj\n"
 #~ "bodo prikazane v dnevnem in tedenskem pogledu.\n"
-#~ "Časi izven tega razpona ne bodo samodejno prikazani"
+#~ "Časi izven tega razpona ne bodo samodejno prikazani"
 
 #~ msgid "Day end:"
 #~ msgstr "Konec dneva:"
 
 #~ msgid "Show on TODO List:"
-#~ msgstr "Pokaži v seznamu opravil:"
+#~ msgstr "PokaĹži v seznamu opravil:"
 
 #~ msgid "To Do List style options:"
 #~ msgstr "Slog seznama opravil:"
 
 #~ msgid "Highlight overdue items"
-#~ msgstr "Osvetli pretečene predmete"
+#~ msgstr "Osvetli pretečene predmete"
 
 #~ msgid "Highlight not yet due items"
-#~ msgstr "Osvetli še nepretečene predmete"
+#~ msgstr "Osvetli še nepretečene predmete"
 
 #~ msgid "To Do List Properties"
 #~ msgstr "Lastnosti seznama opravil"
@@ -12517,17 +13944,14 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Preferences"
 #~ msgstr "Nastavitve"
 
-#~ msgid "Alarm Properties"
-#~ msgstr "Lastnosti alarma"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Piskaj ob zaslonskih alarmih"
 
 #~ msgid "Audio alarms timeout after"
-#~ msgstr "Zvočni alarmi pretečejo po"
+#~ msgstr "Zvočni alarmi pretečejo po"
 
 #~ msgid "Enable snoozing for "
-#~ msgstr "Omogoči podaljšanje spanja za "
+#~ msgstr "Omogoči podaljšanje spanja za "
 
 #~ msgid "Could not create summary"
 #~ msgstr "Nisem mogel ustvariti povzetka"
@@ -12536,11 +13960,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "Za branje pošte dostavljene na krajevni sistem in za shranjevanje pošte "
+#~ "Za branje poĹĄte dostavljene na krajevni sistem in za shranjevanje poĹĄte "
 #~ "na krajevni disk."
 
 #~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj že obstaja"
+#~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj Ĺže obstaja"
 
 #~ msgid "Could not open summary %s"
 #~ msgstr "Nisem mogel odpreti povzetka %s"
@@ -12552,7 +13976,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Ne morem kopirati podatkov v izhodno datoteko: %s"
 
 #~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Nisem mogel preimenovati mape `%s': %s že obstaja"
+#~ msgstr "Nisem mogel preimenovati mape `%s': %s Ĺže obstaja"
 
 #~ msgid "MH folders may not be nested."
 #~ msgstr "MH mape ne morejo biti gnezdene"
@@ -12562,31 +13986,28 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr ""
-#~ "Ne morem inicializirati Evolucijine komponente za razpršeno shrambo."
+#~ "Ne morem inicializirati Evolucijine komponente za razprĹĄeno shrambo."
 
 #~ msgid "Custom search"
 #~ msgstr "Iskanje po meri"
 
-#~ msgid "Copy Message"
-#~ msgstr "Kopiraj sporočilo"
-
 #~ msgid "You have no mail sources configured"
-#~ msgstr "Nimate nastavljenih izvorov pošte"
+#~ msgstr "Nimate nastavljenih izvorov poĹĄte"
 
 #~ msgid ""
 #~ "Enter your name and email address to be used in outgoing mail. You may "
 #~ "also, optionally, enter the name of your organization, and the name of a "
 #~ "file to read your signature from."
 #~ msgstr ""
-#~ "Vnesite svoje ime in e-poštni naslov, ki naj se uporablja v izhodni pošti "
-#~ "Po želji lahko vnesete tudi ime vaše organizacije in ime datoteke iz "
-#~ "katere naj se prebere vaš podpis."
+#~ "Vnesite svoje ime in e-poĹĄtni naslov, ki naj se uporablja v izhodni poĹĄti "
+#~ "Po Ĺželji lahko vnesete tudi ime vaĹĄe organizacije in ime datoteke iz "
+#~ "katere naj se prebere vaĹĄ podpis."
 
 #~ msgid "Signature File"
 #~ msgstr "Datoteka s podpisom"
 
 #~ msgid "Mail source type:"
-#~ msgstr "Tip izvora pošte:"
+#~ msgstr "Tip izvora poĹĄte:"
 
 #~ msgid ""
 #~ "Select the kind of mail server you have, and enter the relevant "
@@ -12595,10 +14016,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "If the server requires authentication, you can click the \"Detect "
 #~ "supported types...\" button after entering the other information."
 #~ msgstr ""
-#~ "Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
+#~ "Izberite vrsto poĹĄtnega streĹžnika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
 #~ "\n"
-#~ "Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
+#~ "Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
 #~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
 
 #~ msgid ""
@@ -12608,14 +14029,14 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "If the server requires authentication, you can click the \"Detect "
 #~ "supported types...\" button after entering the other information."
 #~ msgstr ""
-#~ "Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
+#~ "Izberite vrsto poĹĄtnega streĹžnika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
 #~ "\n"
-#~ "Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
+#~ "Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
 #~ "podprte tipe...\", po tem ko boste vnesli ostale podatke."
 
 #~ msgid "Mail transport type:"
-#~ msgstr "Tip prenosa pošte:"
+#~ msgstr "Tip prenosa poĹĄte:"
 
 #~ msgid "Add Identity"
 #~ msgstr "Dodaj identiteto"
@@ -12626,20 +14047,17 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit Source"
 #~ msgstr "Uredi izbor"
 
-#~ msgid "Add News Server"
-#~ msgstr "Dodaj novičarski strežnik"
-
 #~ msgid "Edit News Server"
-#~ msgstr "Uredi novičarski strežnik"
+#~ msgstr "Uredi novičarski strežnik"
 
 #~ msgid "The connection was successful!"
-#~ msgstr "Povezava je bila uspešna!"
+#~ msgstr "Povezava je bila uspeĹĄna!"
 
 #~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Poizvedujem o možnostih avtentifikacije pri \"%s\""
+#~ msgstr "Poizvedujem o moĹžnostih avtentifikacije pri \"%s\""
 
 #~ msgid "Query authorization at \"%s\""
-#~ msgstr "Poizvedi o možnostih avtentifikacije pri \"%s\""
+#~ msgstr "Poizvedi o moĹžnostih avtentifikacije pri \"%s\""
 
 #~ msgid ""
 #~ "Welcome to the Evolution Mail configuration wizard!\n"
@@ -12647,20 +14065,17 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "settings, you can start sending and receiving email\n"
 #~ "right away. Click Next to continue."
 #~ msgstr ""
-#~ "Dobrodošli v nastavitvenem čarovniku pošte!\n"
-#~ "Z vpisom nekaterih podatkov o vaših nastavitvah e-pošte\n"
-#~ "lahko takoj pričnete pošiljati in sprejemati pošto\n"
+#~ "DobrodoĹĄli v nastavitvenem druidu poĹĄte!\n"
+#~ "Z vpisom nekaterih podatkov o vaĹĄih nastavitvah e-poĹĄte\n"
+#~ "lahko takoj pričnete pošiljati in sprejemati pošto\n"
 #~ "Kliknite naprej za nadaljevanje."
 
 #~ msgid "Mail Transport"
-#~ msgstr "Prenos Pošte"
+#~ msgstr "Prenos PoĹĄte"
 
 #~ msgid "Identities"
 #~ msgstr "Identitete"
 
-#~ msgid "News Servers"
-#~ msgstr "Novičarski strežniki"
-
 #~ msgid "News Sources"
 #~ msgstr "Viri novic"
 
@@ -12668,101 +14083,95 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nisem mogel ustvariti cevi do %s: %s"
 
 #~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Nisem mogel izvršiti %s: %s\n"
+#~ msgstr "Nisem mogel izvrĹĄiti %s: %s\n"
 
 #~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "V tej različici Evolucije GPG/PGP podpora ni prisotna."
+#~ msgstr "V tej različici Evolucije GPG/PGP podpora ni prisotna."
 
 #~ msgid " (XXX unread)"
 #~ msgstr " (XXX neprebran)"
 
 #~ msgid "Expunge \"%s\""
-#~ msgstr "Uniči \"%s\""
+#~ msgstr "Uniči \"%s\""
 
 #~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Izbiram sporočila v mapi \"%s\""
+#~ msgstr "Izbiram sporočila v mapi \"%s\""
 
 #~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Izberi sporočila v mapi \"%s\""
+#~ msgstr "Izberi sporočila v mapi \"%s\""
 
 #~ msgid "Scan folders in \"%s\""
-#~ msgstr "Osveži mape v \"%s\""
+#~ msgstr "OsveĹži mape v \"%s\""
 
 #~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "Prilagam sporočilo iz mape \"%s\""
+#~ msgstr "Prilagam sporočilo iz mape \"%s\""
 
 #~ msgid "Attach messages from \"%s\""
-#~ msgstr "Priloži sporočilo iz mape \"%s\""
+#~ msgstr "Priloži sporočilo iz mape \"%s\""
 
 #~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Posredujem sporočilo \"%s\""
+#~ msgstr "Posredujem sporočilo \"%s\""
 
 #~ msgid "Forwarding a message without a subject"
-#~ msgstr "Posredujem sporočilo brez navedene zadeve"
+#~ msgstr "Posredujem sporočilo brez navedene zadeve"
 
 #~ msgid "Forward message \"%s\""
-#~ msgstr "Posreduj sporočilo \"%s\""
+#~ msgstr "Posreduj sporočilo \"%s\""
 
 #~ msgid ""
 #~ "Failed to generate mime part from message while generating forwarded "
 #~ "message."
 #~ msgstr ""
-#~ "Nisem uspel generirati mime dela iz sporočila med generiranjem "
-#~ "posredovanega sporočila."
+#~ "Nisem uspel generirati mime dela iz sporočila med generiranjem "
+#~ "posredovanega sporočila."
 
 #~ msgid "Loading \"%s\""
 #~ msgstr "Nalagam \"%s\""
 
 #~ msgid "Load \"%s\""
-#~ msgstr "Naloži \"%s\""
+#~ msgstr "NaloĹži \"%s\""
 
 #~ msgid "Creating \"%s\""
 #~ msgstr "Ustvarjam \"%s\""
 
 #~ msgid "Exception while reporting result to shell component listener."
-#~ msgstr "Izjema med sporočanjem rezultatov lupini"
+#~ msgstr "Izjema med sporočanjem rezultatov lupini"
 
 #~ msgid "Synchronize \"%s\""
 #~ msgstr "Uskladi \"%s\""
 
 #~ msgid "Displaying message UID \"%s\""
-#~ msgstr "Prikazujem sporočilo z UID \"%s\""
+#~ msgstr "Prikazujem sporočilo z UID \"%s\""
 
 #~ msgid "Clearing message display"
-#~ msgstr "Čistim prikazano sporočilo"
+#~ msgstr "Čistim prikazano sporočilo"
 
 #~ msgid "Display message UID \"%s\""
-#~ msgstr "Prikaži sporočilo z UID \"%s\""
+#~ msgstr "Prikaži sporočilo z UID \"%s\""
 
 #~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "Odpiram sporočila iz  mape \"%s\""
+#~ msgstr "Odpiram sporočila iz  mape \"%s\""
 
 #~ msgid "Open messages from \"%s\""
-#~ msgstr "Odpri sporočilo iz \"%s\""
+#~ msgstr "Odpri sporočilo iz \"%s\""
 
 #~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Gledam sporočilo iz mape \"%s\""
+#~ msgstr "Gledam sporočilo iz mape \"%s\""
 
 #~ msgid "View messages from \"%s\""
-#~ msgstr "Glej sporočilo iz \"%s\""
+#~ msgstr "Glej sporočilo iz \"%s\""
 
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "Ne poznam protokola za odpiranje URIja `%s'"
 
 #~ msgid "Rebuilding message view"
-#~ msgstr "Obnavljam pogled sporočil"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "Obnovi pogled sporočil"
-
-#~ msgid "Threading message list"
-#~ msgstr "Nitim seznam sporočil"
+#~ msgstr "Obnavljam pogled sporočil"
 
 #~ msgid "N_ew Directory Server"
-#~ msgstr "N_ov strežnik imenikov"
+#~ msgstr "N_ov streĹžnik imenikov"
 
 #~ msgid "_New appointment..."
-#~ msgstr "_Nov zmenek..."
+#~ msgstr "_Nov sestanek..."
 
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Shrani koledar kot"
@@ -12771,7 +14180,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Hitro iskanje"
 
 #~ msgid "Bad storage URL (no server): %s"
-#~ msgstr "Neveljaven URL shrambe (ni strežnika): %s"
+#~ msgstr "Neveljaven URL shrambe (ni streĹžnika): %s"
 
 #~ msgid "Ne_xt"
 #~ msgstr "_Naslednji"
@@ -12798,7 +14207,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "FIXME: _Zastavica za nadaljevanje..."
 
 #~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "FIXME: _Pokaži zemljevid naslova"
+#~ msgstr "FIXME: _PokaĹži zemljevid naslova"
 
 #~ msgid "FIXME: _Open Web Page"
 #~ msgstr "FIXME: _Odpri spletno stran"
@@ -12810,7 +14219,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Vstavi datoteko kot prilogo"
 
 #~ msgid "FIXME: Previous"
-#~ msgstr "FIXME: Prejšnji"
+#~ msgstr "FIXME: PrejĹĄnji"
 
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: Naslednji"
@@ -12825,13 +14234,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Leto"
 
 #~ msgid "Show 1 year"
-#~ msgstr "Pokaže vrstico z mapami"
+#~ msgstr "PokaĹže vrstico z mapami"
 
 #~ msgid "New appointment for _today..."
-#~ msgstr "Nov zmenek za _danes..."
-
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Ustvari nov zmenek za danes"
+#~ msgstr "Nov sestanek za _danes..."
 
 #~ msgid "%s%s"
 #~ msgstr "%s%s"
@@ -12840,7 +14246,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr " koledar"
 
 #~ msgid "FIXME: _Delete"
-#~ msgstr "FIXME: _Zbriši"
+#~ msgstr "FIXME: _ZbriĹĄi"
 
 #~ msgid "FIXME: Save and Close"
 #~ msgstr "FIXME: Shrani in zapri"
@@ -12861,7 +14267,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nekomu dodeli nalogo"
 
 #~ msgid "FIXME: Delete"
-#~ msgstr "FIXME: Zbriši"
+#~ msgstr "FIXME: ZbriĹĄi"
 
 #~ msgid "S_ubject:"
 #~ msgstr "Z_adeva:"
@@ -12872,9 +14278,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Completed\n"
 #~ "Cancelled\n"
 #~ msgstr ""
-#~ "Ni pričeto\n"
+#~ "Ni pričeto\n"
 #~ "V delu\n"
-#~ "Končano\n"
+#~ "Končano\n"
 #~ "Zavrnjeno\n"
 
 #~ msgid ""
@@ -12883,12 +14289,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Low\n"
 #~ msgstr ""
 #~ "Visoka\n"
-#~ "Običajna\n"
+#~ "Običajna\n"
 #~ "Nizka\n"
 
-#~ msgid "Resources:"
-#~ msgstr "Viri:"
-
 #~ msgid "Last Modification Date"
 #~ msgstr "Datum zadnje spremembe"
 
@@ -12899,16 +14302,16 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "FIXME: Ko_kedar..."
 
 #~ msgid "FIXME: Invite _Attendees..."
-#~ msgstr "FIXME: Povabi udeležence..."
+#~ msgstr "FIXME: Povabi udeleĹžence..."
 
 #~ msgid "FIXME: C_ancel Invitation..."
-#~ msgstr "FIXME: Prekliči povabilo..."
+#~ msgstr "FIXME: Prekliči povabilo..."
 
 #~ msgid "FIXME: Invite Attendees..."
-#~ msgstr "FIXME: Povabi udeležence..."
+#~ msgstr "FIXME: Povabi udeleĹžence..."
 
 #~ msgid "Invite attendees to a meeting"
-#~ msgstr "Povabi udeležence na sestanek"
+#~ msgstr "Povabi udeleĹžence na sestanek"
 
 #~ msgid "_Summary:"
 #~ msgstr "_Povzetek:"
@@ -12932,7 +14335,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Tedenske"
 
 #~ msgid "Monthly"
-#~ msgstr "Mesečne"
+#~ msgstr "Mesečne"
 
 #~ msgid "Yearly"
 #~ msgstr "Letne"
@@ -12971,7 +14374,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Ponedeljek\n"
 #~ "Torek\n"
 #~ "Sreda\n"
-#~ "Četrtek\n"
+#~ "Četrtek\n"
 #~ "Petek\n"
 #~ "Sobota\n"
 #~ "Nedelja\n"
@@ -12980,13 +14383,13 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "oznaka27"
 
 #~ msgid "Ending date"
-#~ msgstr "Datum zaključka"
+#~ msgstr "Datum zaključka"
 
 #~ msgid "Add to-do item..."
 #~ msgstr "Dodaj opravilo..."
 
 #~ msgid "Time Left"
-#~ msgstr "Preostalo časa"
+#~ msgstr "Preostalo časa"
 
 #~ msgid "To-do list"
 #~ msgstr "Seznam za opravit"
@@ -13019,10 +14422,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Trenutni teden (%s %s %d %d - %s %s %d %d)"
 
 #~ msgid "Cut selected item into clipboard"
-#~ msgstr "Izreži izbran predmet na odložišče"
+#~ msgstr "Izreži izbran predmet na odložišče"
 
 #~ msgid "Copy selected item into clipboard"
-#~ msgstr "Kopiraj izbran predmet na odložišče"
+#~ msgstr "Kopiraj izbran predmet na odložišče"
 
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Izberi naslove prejemnikov"
@@ -13046,7 +14449,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "oznaka8"
 
 #~ msgid "Load a previously saved message"
-#~ msgstr "Naloži prej shranjeno sporočilo"
+#~ msgstr "Naloži prej shranjeno sporočilo"
 
 #~ msgid "_Format"
 #~ msgstr "_Oblika izpisa"
@@ -13055,19 +14458,16 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Urejevalnik vMap ..."
 
 #~ msgid "Currently pending operations:"
-#~ msgstr "Trenutno čakajoče operacije:"
+#~ msgstr "Trenutno čakajoče operacije:"
 
 #~ msgid "Waiting for user to close error dialog"
-#~ msgstr "Čakam na uporabnika, da zapre dialog z napako"
+#~ msgstr "Čakam na uporabnika, da zapre dialog z napako"
 
 #~ msgid "Waiting for user to enter data"
-#~ msgstr "Čakam na uporabnika, da vpiše podatek"
-
-#~ msgid "Show _folder bar"
-#~ msgstr "Kaži vrstico z _mapami"
+#~ msgstr "Čakam na uporabnika, da vpiše podatek"
 
 #~ msgid "Help _index"
-#~ msgstr "Kazalo _pomoči"
+#~ msgstr "Kazalo _pomoči"
 
 #~ msgid "Sort"
 #~ msgstr "Sortiranje"
@@ -13079,8 +14479,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "To add a column to your table, drag it into\n"
 #~ "the location in which you want it to appear."
 #~ msgstr ""
-#~ "Da bi dodali stolpec k vaši tabeli, ga potegnite\n"
-#~ "do mesta kjer želite, da se pojavi."
+#~ "Da bi dodali stolpec k vaĹĄi tabeli, ga potegnite\n"
+#~ "do mesta kjer Ĺželite, da se pojavi."
 
 #~ msgid "Available fields"
 #~ msgstr "Polja na voljo"
@@ -13095,10 +14495,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "<< odstrani"
 
 #~ msgid "Discard this message?"
-#~ msgstr "Zavrzi to sporočilo"
+#~ msgstr "Zavrzi to sporočilo"
 
 #~ msgid "Finish"
-#~ msgstr "Končaj"
+#~ msgstr "Končaj"
 
 #~ msgid "Apply"
 #~ msgstr "Uporabi"
@@ -13114,10 +14514,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Preveri te vrednosti pred nadaljevanjem"
 
 #~ msgid "Select the method you would like to use to deliver your mail."
-#~ msgstr "Izberite način na katerega želite dostavljati vašo pošto."
-
-#~ msgid "Enter the hostname of the News Server you have."
-#~ msgstr "Vpišite ime računalnika na katerem teče novičarski strežnik."
+#~ msgstr "Izberite način na katerega želite dostavljati vašo pošto."
 
 #~ msgid "Cannot initialize the configuration system."
 #~ msgstr "Ne morem inicializirati nastavitvenega sistema."