Updated Slovenian translation

svn path=/trunk/; revision=12091

1 files changed, 3035 insertions, 4077 deletions

diff --git a/po/sl.po b/po/sl.po
index 2739adea32..bef137c3db 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-07-05 14:17+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"
@@ -13,19 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: 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:3605
+#: addressbook/backend/ebook/e-card.c:3546
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3548
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +25,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3549
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +33,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3550
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +41,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3551
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +49,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3552
 msgid ""
 "\n"
 "  Family:     "
@@ -65,7 +57,7 @@ msgstr ""
 "\n"
 "  Družinsko:     "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3553
 msgid ""
 "\n"
 "  Suffix:     "
@@ -73,7 +65,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3567
 msgid ""
 "\n"
 "Birth Date: "
@@ -81,7 +73,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3578
 msgid ""
 "\n"
 "Address:"
@@ -89,7 +81,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3580
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -97,7 +89,7 @@ msgstr ""
 "\n"
 "  Poštni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3581
 msgid ""
 "\n"
 "  Ext:         "
@@ -105,7 +97,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3582
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +105,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3583
 msgid ""
 "\n"
 "  City:        "
@@ -121,7 +113,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3584
 msgid ""
 "\n"
 "  Region:      "
@@ -129,7 +121,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3585
 msgid ""
 "\n"
 "  Postal Code: "
@@ -137,7 +129,7 @@ msgstr ""
 "\n"
 "  Poštna številka: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3586
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +137,7 @@ msgstr ""
 "\n"
 "  Država:      "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,7 +145,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "Telephones:\n"
@@ -161,7 +153,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3614
 msgid ""
 "\n"
 "Telephone:"
@@ -169,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3638
 msgid ""
 "\n"
 "E-mail:\n"
@@ -177,7 +169,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "E-mail:"
@@ -185,7 +177,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Mailer: "
@@ -193,7 +185,7 @@ msgstr ""
 "\n"
 "Poštni program: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3666
 msgid ""
 "\n"
 "Time Zone: "
@@ -201,7 +193,7 @@ msgstr ""
 "\n"
 "Časovni pas: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3674
 msgid ""
 "\n"
 "Geo Location: "
@@ -209,7 +201,7 @@ msgstr ""
 "\n"
 "Geografski položaj: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3678
 msgid ""
 "\n"
 "Business Role: "
@@ -217,7 +209,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "Org: "
@@ -225,7 +217,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3691
 msgid ""
 "\n"
 "  Name:  "
@@ -233,7 +225,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "  Unit:  "
@@ -241,7 +233,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3693
 msgid ""
 "\n"
 "  Unit2: "
@@ -249,7 +241,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3694
 msgid ""
 "\n"
 "  Unit3: "
@@ -257,7 +249,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3695
 msgid ""
 "\n"
 "  Unit4: "
@@ -265,7 +257,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3699
 msgid ""
 "\n"
 "Categories: "
@@ -273,7 +265,7 @@ msgstr ""
 "\n"
 "Kategorije: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "Comment: "
@@ -291,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3713
 msgid ""
 "\n"
 "Unique String: "
@@ -299,7 +291,7 @@ msgstr ""
 "\n"
 "Enoličen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "Public Key: "
@@ -307,23 +299,35 @@ msgstr ""
 "\n"
 "Javni ključ: "
 
-#: addressbook/backend/ebook/e-card.c:4037
+#: addressbook/backend/ebook/e-card.c:3978
 msgid "Multiple VCards"
 msgstr "Več eVizitk"
 
-#: addressbook/backend/ebook/e-card.c:4045
+#: addressbook/backend/ebook/e-card.c:3986
 #, 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:46
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: addressbook/gui/component/addressbook-factory.c:42
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
@@ -337,14 +341,14 @@ msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naložena\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati strežnika wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
@@ -353,636 +357,264 @@ 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: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:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
-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"
-
-#. Remember the password?
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
-msgid "Remember this password"
-msgstr "Zapomni si geslo"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-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:69
-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:663
-msgid "Edit Addressbook"
-msgstr "Uredi adresar"
-
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Dodaj adresar"
-
-#: addressbook/gui/component/addressbook-config.c:683
-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:691
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
-msgid "Name:"
-msgstr "Ime:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
-msgstr "FIXME Name help text here"
-
-#: addressbook/gui/component/addressbook-config.c:694
-#: 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:695
-msgid "FIXME Description help text here"
-msgstr "FIXME Description help text here"
-
 #: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Viri adresarja"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "De_lete"
-msgstr "Zbriši"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Ime"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:108
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: addressbook/gui/component/addressbook-storage.c:118
-msgid "Other Contacts"
-msgstr "Drugo stiki"
-
-#: 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
-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/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1536
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1537
-#: addressbook/gui/widgets/e-addressbook-view.c:728
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1538
-#: addressbook/gui/widgets/e-addressbook-view.c:729
-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:274
-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:341
-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:630
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1168
-#: my-evolution/e-summary-preferences.c:1218
-#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:481
-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:327
-#, fuzzy
-msgid "Unnamed Contact"
-msgstr "Spremenjen stik:"
-
-#: addressbook/gui/component/select-names/e-select-names.c:403
-msgid "Unable to get local storage.  This should never happen."
-msgstr ""
-
-#: 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/component/select-names/select-names.glade.h:4
-msgid "_Category:"
-msgstr "_Kategorija:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "I_skanje"
-
 #: 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"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "Anni_versary:"
 msgstr "Ob_letnica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "B_usiness"
 msgstr "V sl_užbi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Business _Fax"
 msgstr "Službeni _faks"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr "_Stiki..."
+
+#: 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
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Zavedi kot:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Splošno"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "New phone type"
 msgstr "Nov tip telefona"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "No_tes:"
 msgstr "Opom_be:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#, fuzzy
-msgid "Organi_zation:"
-msgstr "Organizacija:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 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"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: 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:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Assistant's name:"
 msgstr "_Ime pomočnika:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Birthday:"
 msgstr "_Rojstni dan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Business"
 msgstr "_Službeni"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "_Stiki..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1447
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+msgid "_Company:"
+msgstr "_Podjetje:"
+
+#: 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
 msgid "_Delete"
 msgstr "_Zbriši"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "O_ddelek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Full Name..."
 msgstr "_Polno Ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Home"
 msgstr "_Doma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Job title:"
 msgstr "Službeni _naziv:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Manager's Name:"
 msgstr "Ime _managerja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "Pi_sarna:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "_Poklic:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "_Partner(ka):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_This is the mailing address"
 msgstr "_To je poštni naslov"
 
-#: 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:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:663
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Assistant"
 msgstr "Pomočnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1435
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Business"
 msgstr "Služba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1436
 msgid "Business 2"
 msgstr "Služba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1437
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Business Fax"
 msgstr "Službeni faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1438
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1439
 msgid "Car"
 msgstr "Avto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1440
 msgid "Company"
 msgstr "Podjetje"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1441
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1442
 msgid "Home 2"
 msgstr "Doma 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1443
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Home Fax"
 msgstr "Domači faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1445
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1446
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: mail/mail-config.glade.h:59
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1448
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1449
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1450
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1451
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1452
 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
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
@@ -992,7 +624,7 @@ msgid "Edit Full"
 msgstr "Uredi celoto"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Full Name"
 msgstr "Polno ime"
 
@@ -1112,45 +744,381 @@ msgstr "P_ripona:"
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#, fuzzy
-msgid "List _name:"
-msgstr "Ime gostitelja:"
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Vpišite geslo za %s"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#, fuzzy
-msgid "Members"
-msgstr "december"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Type an email address or drag a contact into the list below:"
+#: 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/contact-list-editor/contact-list-editor.glade.h:5
-msgid "_Hide addresses when sending mail to this list"
+#: 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/contact-list-editor/contact-list-editor.glade.h:6
-msgid "_Remove"
-msgstr "_Odstrani"
+#: 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/contact-list-editor/contact-list-editor.glade.h:7
-#, fuzzy
-msgid "contact-list-editor"
-msgstr "Urejevalnik stikov"
+#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
+msgid "Any field contains"
+msgstr "Katerokoli polje vsebuje"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
-#, fuzzy
-msgid "Contact List Editor"
-msgstr "Urejevalnik stikov"
+#: 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/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:276
+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: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/component/select-names/select-names.glade.h:4
+msgid "_Category:"
+msgstr "_Kategorija:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "I_skanje"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Vseeno dodaj"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "Zaznan podvojen stik"
 
@@ -1171,14 +1139,18 @@ msgstr ""
 "Ga želite vseeno dodati?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Change Anyway"
+msgstr "Vseeno spremeni"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Spremenjen stik:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "Konfliktni stik:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1186,13 +1158,8 @@ msgstr ""
 "Spremenjeno ime ali e-poštni naslov tega stika že\n"
 "obstaja v tej mapi. Ga želite vseeno dodati?"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
-#, fuzzy
-msgid "_Change Anyway"
-msgstr "Vseeno spremeni"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: mail/mail-search.c:242
 msgid "Search"
 msgstr "Iskanje"
 
@@ -1323,9 +1290,9 @@ 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-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
-#: ui/my-evolution.xml.h:2
+#: 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
 msgid "Print"
 msgstr "Natisni"
 
@@ -1334,213 +1301,138 @@ msgstr "Natisni"
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: mail/mail-config.glade.h:28 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: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
-#, fuzzy
-msgid "Success"
-msgstr "Viri"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
-msgid "Unknown error"
-msgstr "Neznana napaka"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#, fuzzy
-msgid "Repository offline"
-msgstr "Delaj brez mreže"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
-msgid "Permission denied"
-msgstr "Nimate dovoljenja"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:38
-#, fuzzy
-msgid "Card not found"
-msgstr "Datoteke ni mogoče najti"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:39
-msgid "Card ID already exists"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-util.c:40
-#, fuzzy
-msgid "Protocol not supported"
-msgstr "Operacija ni podprta"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
-msgstr "preklicano"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#, fuzzy
-msgid "Other error"
-msgstr "V/I napaka"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:59
-#, fuzzy
-msgid "Error adding list"
-msgstr "Napaka ob nalaganju %s"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:59
-#, fuzzy
-msgid "Error adding card"
-msgstr "Napaka ob spreminjanju vizitke"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#, fuzzy
-msgid "Error modifying list"
-msgstr "Napaka ob spreminjanju vizitke"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#, fuzzy
-msgid "Error removing list"
-msgstr "Napaka ob odstranjevanju vizitke"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-msgid "Error removing card"
-msgstr "Napaka ob odstranjevanju vizitke"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Assistant Phone"
 msgstr "Pomožni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Business Phone"
 msgstr "Službebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Home Phone"
 msgstr "Domač telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Business Address"
 msgstr "Službeni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Business Phone 2"
 msgstr "Službeni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Home Phone 2"
 msgstr "Domač telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "Other Address"
 msgstr "Drug naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Department"
 msgstr "Oddelek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Profession"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Done."
 msgstr "Opravljeno."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: 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
 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"
@@ -1588,8 +1480,7 @@ msgid "Dimensions:"
 msgstr "Mere:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-#, fuzzy
-msgid "F_ont..."
+msgid "Font..."
 msgstr "Pisava..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1728,62 +1619,37 @@ msgstr "Tip:"
 msgid "Width:"
 msgstr "Širina:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-#, fuzzy
-msgid "_Font..."
-msgstr "Pisava..."
-
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s strežnikom koledarja"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
-#: 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/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:8
-msgid "Factory for the sample Calendar control"
-msgstr "Vzorčna tovarna za kontrolo koledarja"
+#: 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:9
-#, fuzzy
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Tovarna komponent Evolucije za urejanje koledarja."
+#. 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/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1793,87 +1659,86 @@ 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:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
 #, 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"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Obvestilo o vašem zmenku, ki se začne ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Obvestilo o vašem zmenku, ki se konča ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
 msgid "Notification about your appointment"
 msgstr "Obvestilo o vašem zmenku"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
 #, 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"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Obvestilo o vašem opravilu, ki se začne ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Obvestilo o vašem opravilu, ki se konča ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
 msgid "Notification about your task"
 msgstr "Obvestilo o vašem opravilu"
 
-#: 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: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.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Zapri"
+#: 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.glade.h:2
-#, fuzzy
-msgid "Snoo_ze"
-msgstr "Podaljšek spanja"
+#: 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.glade.h:3
-msgid "Snooze time (minutes)"
-msgstr "Čas podaljška spanja (minut)"
+#: 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.glade.h:4
-#, fuzzy
-msgid "_Edit appointment"
-msgstr "Uredi zmenek"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarm na %A %d %b %Y ob %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:487
-#, fuzzy
-msgid "No description available."
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
+msgid "No summary available."
 msgstr "Povzetek 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 zmenek ob "
+#: 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"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:991
-msgid "Snooze"
-msgstr "Podaljšek spanja"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr "Uredi zmenek"
 
-#. 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/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr "Čas podaljška spanja (minut)"
 
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
@@ -1895,151 +1760,128 @@ 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:402
-#, fuzzy
-msgid "%A %d %B %Y"
-msgstr "%A, %e %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:1344 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
-#, fuzzy
-msgid "%a %d %b %Y"
-msgstr "%a %d %b"
+#: calendar/gui/calendar-commands.c:277
+msgid "File not found"
+msgstr "Datoteke ni mogoče najti"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:301
+msgid "Open calendar"
+msgstr "Odpri koledar"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
-#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%B %Y"
+#: calendar/gui/calendar-commands.c:343
+msgid "Save calendar"
+msgstr "Shrani koledar"
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:545
 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:391 calendar/gui/calendar-model.c:997
-#: calendar/gui/e-calendar-table.c:307
+#: 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:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
+#: calendar/gui/e-calendar-table.c:427
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
+#: calendar/gui/e-calendar-table.c:428
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
-#: calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:676
-#: calendar/gui/dialogs/meeting-page.c:1226
-#: calendar/gui/dialogs/meeting-page.c:1242
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: 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:497
+#: calendar/gui/calendar-model.c:479
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:479
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:481
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:481
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: 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:329 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:620
 msgid "High"
 msgstr "visoka"
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1708
+#: 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:330 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:619
 msgid "Normal"
 msgstr "običajna"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: 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:331 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:618
 msgid "Low"
 msgstr "nizka"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
-#: calendar/gui/e-calendar-table.c:383
+#: 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:580 calendar/gui/calendar-model.c:1241
-#: calendar/gui/e-calendar-table.c:382
+#: 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:734 calendar/gui/calendar-model.c:1293
+#: 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:403
+#: calendar/gui/e-calendar-table.c:522
 msgid "Not Started"
 msgstr "ni pričeto"
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: 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:404
+#: calendar/gui/e-calendar-table.c:523
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
-#: calendar/gui/dialogs/meeting-page.c:648
-#: calendar/gui/dialogs/meeting-page.c:671
+#: 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:405
+#: calendar/gui/e-calendar-table.c:524
 msgid "Completed"
 msgstr "končano"
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: 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:406 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "preklicano"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:878
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2050,27 +1892,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:981
+#: 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:995 calendar/gui/calendar-model.c:1237
-#: calendar/gui/calendar-model.c:1291
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:327
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
-#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
-#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
-#: shell/e-shell-view.c:1405 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
+#: 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:1087
+#: calendar/gui/calendar-model.c:1054
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2080,253 +1918,158 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1094
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1135
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteta mora biti 'Visoka', 'Običajna', 'Nizka' ali 'Nedefinirana'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:1148
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/e-calendar-table.c:451
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: calendar/gui/calendar-model.c:1222
+#: calendar/gui/calendar-model.c:1189
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Prosojnost mora biti 'Prozorno', 'Prosojno' ali 'Brez'."
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1677
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1679
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1158
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/calendar-model.c:1685
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1685
 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/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: calendar/gui/dialogs/alarm-options.c:354
-#, fuzzy
-msgid "Audio Alarm Options"
-msgstr "Zvočni alarmi"
-
-#: calendar/gui/dialogs/alarm-options.c:363
-#, fuzzy
-msgid "Message Alarm Options"
-msgstr "Prejemniki sporočila"
-
-#: calendar/gui/dialogs/alarm-options.c:372
-#, fuzzy
-msgid "Mail Alarm Options"
-msgstr "Pokaži možnosti"
-
-#: calendar/gui/dialogs/alarm-options.c:381
-msgid "Program Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:390
-#, fuzzy
-msgid "Unknown Alarm Options"
-msgstr "Neznane padavine"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-#, fuzzy
-msgid "Alarm Repeat"
-msgstr "Lastnosti alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "FIXME: mail alarm options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-#, fuzzy
-msgid "Message to Display"
-msgstr "Prikaz _sporočila"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-#, fuzzy
-msgid "Play sound:"
-msgstr "Predvajaj zvok"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Repeat the alarm"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-#, fuzzy
-msgid "Run program:"
-msgstr "Poženi program"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "With these arguments:"
-msgstr ""
-
-#: 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
-#, fuzzy
-msgid "extra times every"
-msgstr "Posodobi 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
+#: calendar/gui/dialogs/alarm-page.c:269
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:271
 msgid "1 day"
 msgstr "1 dan"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:274
 #, c-format
 msgid "%d weeks"
 msgstr "%d tednov"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:276
 msgid "1 week"
 msgstr "1 teden"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:279
 #, c-format
 msgid "%d hours"
 msgstr "%d ur"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:281
 msgid "1 hour"
 msgstr "1 ura"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:331
-#: calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.c:316
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: 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:320
+msgid "Show a dialog"
+msgstr "Kaži dialog"
 
-#: calendar/gui/dialogs/alarm-page.c:339
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:324
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "Send an email"
 msgstr "Pošlji e-pošto"
 
-#: calendar/gui/dialogs/alarm-page.c:343
-#: calendar/gui/dialogs/alarm-page.glade.h:6
+#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.glade.h:9
 msgid "Run a program"
 msgstr "Poženi program"
 
-#: calendar/gui/dialogs/alarm-page.c:361
-#, fuzzy
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:346
+msgid " before start of appointment"
 msgstr " pred pričetkom zmenka"
 
-#: calendar/gui/dialogs/alarm-page.c:364
-#, fuzzy
-msgid "after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:349
+msgid " after start of appointment"
 msgstr " po pričetku zmenka"
 
-#: calendar/gui/dialogs/alarm-page.c:374
-#, fuzzy
-msgid "before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:359
+msgid " before end of appointment"
 msgstr " pred koncem zmenka"
 
-#: calendar/gui/dialogs/alarm-page.c:377
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:362
+msgid " after end of appointment"
 msgstr " po koncu zmenka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: 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:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: 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:298
+#: calendar/gui/e-itip-control.c:293
 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"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: 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:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#, fuzzy
-msgid "_Options..."
-msgstr "Možnosti..."
-
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2349,7 +2092,7 @@ msgstr "konec zmenka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:103
 msgid "minute(s)"
 msgstr "minut"
 
@@ -2389,8 +2132,8 @@ msgstr "60 minut"
 msgid "Beep when alarm windows appear."
 msgstr "Pozvoni, ko se pokažejo okna alarmov."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9 shell/e-shortcuts.c:1001
+#: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "Koledar"
 
@@ -2423,7 +2166,7 @@ msgid "Defaults"
 msgstr "Privzeto"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Display"
 msgstr "Prikaz"
 
@@ -2440,7 +2183,7 @@ msgid "Fri"
 msgstr "pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "petek"
 
@@ -2449,7 +2192,7 @@ msgid "Mon"
 msgstr "pon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -2470,7 +2213,7 @@ msgid "Sat"
 msgstr "sob"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "sobota"
 
@@ -2491,7 +2234,7 @@ msgid "Sun"
 msgstr "ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -2508,7 +2251,7 @@ msgid "Thu"
 msgstr "čet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "četrtek"
 
@@ -2533,7 +2276,7 @@ msgid "Tue"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "torek"
 
@@ -2542,7 +2285,7 @@ msgid "Wed"
 msgstr "sre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "sreda"
 
@@ -2554,142 +2297,6 @@ msgstr "Delavni teden"
 msgid "minutes before they occur."
 msgstr "minut preden se zgodijo."
 
-#: calendar/gui/dialogs/cancel-comp.c:52
-msgid "The meeting status has changed. Send an updated version?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:58
-#, fuzzy
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Ste prepričani, da želite zbrisati ta račun?"
-
-#: calendar/gui/dialogs/cancel-comp.c:63
-#, fuzzy
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Ste prepričani, da želite zbrisati %d opravil?"
-
-#: calendar/gui/dialogs/cancel-comp.c:68
-#, fuzzy
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
-
-#: calendar/gui/dialogs/changed-comp.c:60
-msgid "This event has been deleted."
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:64
-#, fuzzy
-msgid "This task has been deleted."
-msgstr "To je zahtevek po srečanju."
-
-#: calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:77
-#, c-format
-msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:79
-#, c-format
-msgid "%s  You have made no changes, close the editor?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:84
-msgid "This event has been changed."
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:88
-#, fuzzy
-msgid "This task has been changed."
-msgstr "To je preklic dogodka."
-
-#: calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:101
-#, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:103
-#, c-format
-msgid "%s  You have made no changes, update the editor?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
-msgid " (Completed "
-msgstr " (Končano "
-
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
-msgid "Completed "
-msgstr "končano "
-
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
-msgid " (Due "
-msgstr " (Rok "
-
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
-msgid "Due "
-msgstr "Rok"
-
-#: calendar/gui/dialogs/comp-editor.c:449
-msgid "Edit Appointment"
-msgstr "Uredi zmenek"
-
-#: calendar/gui/dialogs/comp-editor.c:454
-#, c-format
-msgid "Appointment - %s"
-msgstr "Zmenek - %s"
-
-#: calendar/gui/dialogs/comp-editor.c:457
-#, c-format
-msgid "Task - %s"
-msgstr "Naloga - %s"
-
-#: calendar/gui/dialogs/comp-editor.c:460
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Vpis v dnevniku - %s"
-
-#: calendar/gui/dialogs/comp-editor.c:474
-msgid "No summary"
-msgstr "Ni povzetka"
-
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
-msgid "Overwrite file?"
-msgstr "Prepiši datoteko?"
-
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: 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?"
-
-#: calendar/gui/dialogs/comp-editor.c:873 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:1026
-msgid "Unable to obtain current version!"
-msgstr ""
-
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2732,44 +2339,20 @@ msgstr "Ste prepričani, da želite zbrisati %d opravil?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-#, fuzzy
-msgid "Select a Time Zone"
-msgstr "Izberi datoteko"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-#, fuzzy
-msgid "Selection:"
-msgstr "Sekcije:"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-#, fuzzy
-msgid "Time Zones"
-msgstr ""
-"\n"
-"Časovni pas: "
-
-#: 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 ""
-
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:136
 msgid "Appointment"
 msgstr "Zmenek"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:141
 msgid "Reminder"
 msgstr "Opozorilo"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:146
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:151
+#: calendar/gui/dialogs/event-editor.c:223
 msgid "Meeting"
 msgstr "Srečanje"
 
@@ -2779,7 +2362,7 @@ msgstr "_Celodnevni dogodek"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.c:248
 msgid "Classification"
 msgstr "Uvrstitev"
 
@@ -2808,6 +2391,11 @@ msgstr "_Povzetek:"
 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
 msgid "_End time:"
 msgstr "_Čas konca:"
@@ -2816,271 +2404,38 @@ msgstr "_Čas konca:"
 msgid "_Start time:"
 msgstr "_Čas pričetka:"
 
-#: calendar/gui/dialogs/meeting-page.c:551
-#: calendar/gui/dialogs/meeting-page.c:568
-#: calendar/gui/dialogs/meeting-page.c:1154
-#: calendar/gui/dialogs/meeting-page.c:1222
-msgid "Individual"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
-#, fuzzy
-msgid "Group"
-msgstr "Skupina %i"
-
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
-#, fuzzy
-msgid "Resource"
-msgstr "Viri:"
-
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
-msgid "Room"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
-msgid "Chair"
-msgstr "Stol"
-
-#: calendar/gui/dialogs/meeting-page.c:588
-#: calendar/gui/dialogs/meeting-page.c:605
-#: calendar/gui/dialogs/meeting-page.c:1156
-#: calendar/gui/dialogs/meeting-page.c:1239
-msgid "Required Participant"
-msgstr "Potrebni udeleženci"
-
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
-msgid "Optional Participant"
-msgstr "Možni sodelujoči"
-
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
-msgid "Non-Participant"
-msgstr "Ne-sodelujoči"
-
-#: calendar/gui/dialogs/meeting-page.c:638
-#: calendar/gui/dialogs/meeting-page.c:661
-#: calendar/gui/dialogs/meeting-page.c:1164
-#: calendar/gui/dialogs/meeting-page.c:1267
-#, fuzzy
-msgid "Needs Action"
-msgstr "Izberi dejanje"
-
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
-#, fuzzy
-msgid "Accepted"
-msgstr " Sprejmi "
-
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
-#, fuzzy
-msgid "Declined"
-msgstr " Zavrni "
-
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Poskusno"
-
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
-#, fuzzy
-msgid "Delegated"
-msgstr "Zbrisano"
-
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
-#, fuzzy
-msgid "In Process"
-msgstr "v teku"
-
-#: calendar/gui/dialogs/meeting-page.c:712
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
-#, fuzzy
-msgid "Chair Persons"
-msgstr "Telefon v avtu"
-
-#: calendar/gui/dialogs/meeting-page.c:765
-#: calendar/gui/dialogs/meeting-page.c:813
-#: calendar/gui/dialogs/meeting-page.c:933
-#, fuzzy
-msgid "Required Participants"
-msgstr "Potrebni udeleženci"
-
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
-#, fuzzy
-msgid "Optional Participants"
-msgstr "Možni sodelujoči"
-
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
-#, fuzzy
-msgid "Non-Participants"
-msgstr "Ne-sodelujoči"
-
-#: calendar/gui/dialogs/meeting-page.c:891
-#, fuzzy
-msgid "Sent By:"
-msgstr "Poslano"
-
-#: calendar/gui/dialogs/meeting-page.c:1442
-#, fuzzy
-msgid "_Delegate To..."
-msgstr "Delegirano komu:"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-msgid "Attendee"
-msgstr "Udeležen"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#, fuzzy
-msgid "Common Name"
-msgstr "Datum zaključka"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#, fuzzy
-msgid "Delegated From"
-msgstr "Delegirano od:"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#, fuzzy
-msgid "Delegated To"
-msgstr "Delegirano komu:"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#, fuzzy
-msgid "Language"
-msgstr "Upravljalec"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#, fuzzy
-msgid "Member"
-msgstr "december"
-
-#: 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:13 filter/libfilter-i18n.h:49
-#: 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:102
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Vrsta"
-
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
-
-#: calendar/gui/dialogs/meeting-page.glade.h:3
-#, fuzzy
-msgid "_Change Organizer"
-msgstr "Organizator:"
-
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#, fuzzy
-msgid "_Invite Others"
-msgstr "_Povabi ostale..."
-
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "_Other Organizer"
-msgstr "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 zmenek vsebuje pojavitve, 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:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Custom recurrence"
 msgstr "Ponovitev po meri"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Every"
 msgstr "Vsak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Exceptions"
 msgstr "Izjeme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Modify"
+msgstr "Spremeni"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "No recurrence"
 msgstr "Ni ponovitev"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "Preview"
 msgstr "Predogled"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "Recurrence Rule"
 msgstr "Pravilo ponovitev"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "Simple recurrence"
 msgstr "Enostavna ponovitev"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#, fuzzy
-msgid "_Modify"
-msgstr "Spremeni"
-
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "za"
@@ -3105,21 +2460,38 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Želite shraniti spremembe"
+#: 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/send-comp.c:56
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
+#: 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/send-comp.c:61
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:932
+msgid "on"
+msgstr "na"
 
-#: calendar/gui/dialogs/send-comp.c:66
-msgid "The journal entry has changed. Send an updated version?"
-msgstr ""
+#: 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"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
@@ -3137,8 +2509,12 @@ msgstr "Delegirano komu:"
 msgid "No one"
 msgstr "Nikomur"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -3171,317 +2547,329 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/e-calendar-table.c:351
+#: 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/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/e-calendar-table.c:258
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-calendar-table.c:259
+msgid "Alarms"
+msgstr "Alarmi"
+
+#: calendar/gui/e-calendar-table.c:260
+msgid "Click here to add a task"
+msgstr "Kliknite tu za dodajo opravila"
+
+#: calendar/gui/e-calendar-table.c:470
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:471
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:472
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:473
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:474
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:475
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:476
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:477
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:478
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:479
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:480
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
-#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
-msgid "_Open"
-msgstr "_Odpri"
+#: calendar/gui/e-calendar-table.c:957
+msgid "Edit this task"
+msgstr "Uredi to opravilo"
 
-#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
-#: calendar/gui/e-week-view.c:3173 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: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:854 calendar/gui/e-day-view.c:3338
-#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
-#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
-msgid "_Copy"
-msgstr "_Kopiraj"
+#: 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:856 calendar/gui/e-day-view.c:3313
-#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
-#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
-msgid "_Paste"
-msgstr "_Prilepi"
+#: 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:861
-#, fuzzy
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-table.c:962
+msgid "Mark as complete"
 msgstr "Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:863
-#, fuzzy
-msgid "_Delete this Task"
+#: calendar/gui/e-calendar-table.c:963
+msgid "Delete this task"
 msgstr "Zbriši to nalogo"
 
-#: calendar/gui/e-calendar-table.c:866
-#, fuzzy
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:972
+msgid "Mark tasks as complete"
 msgstr "Označi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:868
-#, fuzzy
-msgid "_Delete Selected Tasks"
+#: 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:1137
-msgid "Click here to add a task"
-msgstr "Kliknite tu za dodajo opravila"
-
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, fuzzy, no-c-format
-msgid "% Complete"
-msgstr "% konča_no:"
-
-#: 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:12
-msgid "Start Date"
-msgstr "Datum pričetka"
-
-#: calendar/gui/e-calendar-table.etspec.h:14
-msgid "Summary"
-msgstr "Povzetek"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
-#, fuzzy
-msgid "Task sort"
-msgstr "Seznam nalog"
-
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Transparency"
-msgstr "Prosojnost"
-
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
+#. 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-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i deljenj minute"
+#. 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"
 
 #. 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:1330
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+#: 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
 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:1357
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
-#: calendar/gui/print.c:759
-msgid "am"
-msgstr "dop"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
-#: calendar/gui/print.c:761
-msgid "pm"
-msgstr "pop"
-
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
-msgid "New _Appointment"
+#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
+msgid "New Appointment"
 msgstr "Nov zmenek"
 
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
-#, fuzzy
-msgid "New All Day _Event"
+#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
+msgid "New All Day Event"
 msgstr "Nov celodnevni dogodek"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Pojdi na _danes"
+#: 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:3320 calendar/gui/e-week-view.c:3158
-#, fuzzy
-msgid "_Go to Date..."
+#: 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:3329 calendar/gui/e-week-view.c:3166
-#, fuzzy
-msgid "_Delete this Appointment"
+#: 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:3313 calendar/gui/e-week-view.c:3156
+msgid "Delete this Appointment"
 msgstr "Zbriši ta zmenek"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
-#, fuzzy
-msgid "Make this Occurrence _Movable"
+#: 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:3350 calendar/gui/e-week-view.c:3193
-#, fuzzy
-msgid "Delete this _Occurrence"
+#: 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:3352 calendar/gui/e-week-view.c:3195
-#, fuzzy
-msgid "Delete _All Occurrences"
+#: calendar/gui/e-day-view.c:3332
+msgid "Delete all Occurrences"
 msgstr "Zbriši vse pojavitve"
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i deljenj minute"
+
+#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
+msgid " (Completed "
+msgstr " (Končano "
+
+#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
+msgid "Completed "
+msgstr "končano "
+
+#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
+msgid " (Due "
+msgstr " (Rok "
+
+#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
+msgid "Due "
+msgstr "Rok"
+
+#: 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:697
+#: 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:700
+#: 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:703
+#: 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:706
+#: 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:709
+#: calendar/gui/e-itip-control.c:628
 msgid "This is an event cancellation."
 msgstr "To je preklic dogodka."
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: 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:737
+#: 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:740
+#: 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:743
+#: 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:746
+#: 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:749
+#: calendar/gui/e-itip-control.c:667
 msgid "This is an task cancellation."
 msgstr "To je preklic opravila."
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:689
 msgid "This is freebusy information."
 msgstr "To je podatek o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:774
+#: 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:777
+#: 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:834
+#: 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"
 
-#: calendar/gui/e-itip-control.c:853
+#: 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:877
+#: 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:989
+#: calendar/gui/e-itip-control.c:869
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nisem mogel posodobiti vašege datoteeke koledarja!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:894
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nisem mogel odstraniti predmeta iz vaše datoteke koledarja!\n"
 
@@ -3522,48 +2910,98 @@ msgstr "končni-datum"
 msgid "date-start"
 msgstr "začetni-datum"
 
-#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
-#: calendar/gui/e-tasks.c:629
+#: 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:252
+#: calendar/gui/e-tasks.c:191
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:330
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel naložiti poslov v `%s'"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:342
 #, c-format
 msgid "The method required to load `%s' is not supported"
 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:1436
-#: my-evolution/e-summary-calendar.c:230
+#: 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:3144 calendar/gui/e-week-view.c:3182
-#, fuzzy
-msgid "New _Appointment..."
-msgstr "Nov zmenek..."
+#: 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:999
+#: 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
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1065
 #, 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"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -3585,255 +3023,246 @@ msgid "Go To Date"
 msgstr "Pojdi na datum"
 
 #: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
+msgstr "Pojdi na danes"
+
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "januar"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "julij"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "junij"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "marec"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "maj"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "november"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "oktober"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Pojdi na danes"
-
-#: calendar/gui/itip-utils.c:224
-msgid "An organizer must be set."
-msgstr ""
-
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:451
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:451
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:451
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:451
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:451
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:452
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:452
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:452
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:452
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:452
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:453
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:453
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:453
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:453
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:453
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:454
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:454
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:454
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:454
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:454
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:455
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:455
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:455
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:455
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:455
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:456
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:456
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:456
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:456
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:456
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:457
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:516
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:516
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:516
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:516
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:517
 msgid "Th"
 msgstr "če"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:517
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:517
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
-#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: calendar/gui/print.c:1847 shell/e-shortcuts.c:1002
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Naloge"
 
 #. Day
-#: calendar/gui/print.c:1815
-#, fuzzy
-msgid "Selected day (%a %b %d %Y)"
+#: calendar/gui/print.c:1954
+msgid "Current day (%a %b %d %Y)"
 msgstr "Trenuten dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
+#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1835
+#: calendar/gui/print.c:1974
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1846
-#, fuzzy, c-format
-msgid "Selected week (%s - %s)"
+#: calendar/gui/print.c:1985
+#, c-format
+msgid "Current week (%s - %s)"
 msgstr "Trenutni teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1854
-#, fuzzy
-msgid "Selected month (%b %Y)"
+#: calendar/gui/print.c:1993
+msgid "Current month (%b %Y)"
 msgstr "Trenutni mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1861
-#, fuzzy
-msgid "Selected year (%Y)"
+#: calendar/gui/print.c:2000
+msgid "Current year (%Y)"
 msgstr "Trenutno leto (%Y)"
 
-#: calendar/gui/print.c:2200
+#: calendar/gui/print.c:2321
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
-#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: 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
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/print.c:2317
+#: calendar/gui/print.c:2438
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2519
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:122
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape poslov, ki naj se kaže"
 
@@ -3879,6 +3308,99 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "NPTSČPS"
 
+#: calendar/pcs/query.c:218
+msgid "time-now expects 0 arguments"
+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"
+
+#: 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"
+
+#: 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"
+
+#: calendar/pcs/query.c:281
+msgid "time-add-day expects 2 arguments"
+msgstr "time-add-day pričakuje 2 argumenta"
+
+#: calendar/pcs/query.c:286
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr "time-add-day pričakuje, da je 1. argument time_t"
+
+#: calendar/pcs/query.c:293
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr "time-add-day pričakuje, da je 2. argument celo število (integer)"
+
+#: calendar/pcs/query.c:318
+msgid "time-day-begin expects 1 argument"
+msgstr "time-day-begin pričakuje 1 argument"
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr "time-day-begin pričakuje, da je 1. argument time_t"
+
+#: calendar/pcs/query.c:348
+msgid "time-day-end expects 1 argument"
+msgstr "time-day-end pričakuje 1 argument"
+
+#: calendar/pcs/query.c:353
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr "time-day-end pričakuje, da je 1. argument time_t"
+
+#: calendar/pcs/query.c:389
+msgid "get-vtype expects 0 arguments"
+msgstr "get-vtype ne pričakuje argumentov"
+
+#: calendar/pcs/query.c:485
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr "occur-in-time-range? pričakuje 2 argumenta"
+
+#: calendar/pcs/query.c:490
+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"
+
+#: calendar/pcs/query.c:497
+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"
+
+#: calendar/pcs/query.c:627
+msgid "contains? expects 2 arguments"
+msgstr "contains? pričakuje 2 argumenta"
+
+#: calendar/pcs/query.c:632
+msgid "contains? expects argument 1 to be a string"
+msgstr "contains? pričakuje, da je 1. argument niz"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 2 to be a string"
+msgstr "contains? pričakuje, da je 2. argument niz"
+
+#: calendar/pcs/query.c:656
+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"
+"\" (povzetek), \"description\"(opis)"
+
+#: calendar/pcs/query.c:694
+msgid "has-categories? expects at least 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:948
+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)"
+
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Podpisovanje v tem kodirniku ni podprto"
@@ -3899,75 +3421,60 @@ msgstr "Šifriranje v tem šifrirniku ni podprto"
 msgid "Decryption is not supported by this cipher"
 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 ""
-
-#: 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 ""
-
-#: camel/camel-disco-diary.c:278
-msgid "Resynchronizing with server"
-msgstr ""
-
 #: 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"
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:635
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti čakalne mape"
 
-#: camel/camel-filter-driver.c:653
+#: camel/camel-filter-driver.c:644
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati čakalne mape"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:658
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:663
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporočila"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:766
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
+msgid "Complete"
+msgstr "Končano"
+
+#: camel/camel-filter-driver.c:753
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: camel/camel-filter-driver.c:892
+#: camel/camel-filter-driver.c:876
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:898
+#: camel/camel-filter-driver.c:882
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
@@ -4008,26 +3515,6 @@ msgstr "Opravljam poizvedbo na neznani glavi: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neveljaven tip v body-contains, pričakovan niz"
 
-#: camel/camel-lock-client.c:110
-#, fuzzy, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nisem mogel ustvariti cevi: %s"
-
-#: camel/camel-lock-client.c:123
-#, fuzzy, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne morem ustvariti ključavnice na mapi: %s: %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 ""
-
-#: camel/camel-lock-client.c:212
-#, fuzzy, c-format
-msgid "Could not lock '%s'"
-msgstr "Nisem se mogel razvejiti: %s"
-
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
@@ -4051,108 +3538,108 @@ msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nisem mogel preverti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:118
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:126
 #, 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:159
+#: 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"
+
+#: camel/camel-movemail.c:181
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:211
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:223
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:262
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: 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
+#: camel/camel-movemail.c:492
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:190
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Prosim vpišite svoje %s geslo za %s"
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Prosim vpišite svoje %s geslo"
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:511
 msgid "No plaintext to sign."
 msgstr "Ni besedila za podpis."
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
+#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
 msgid "No password provided."
 msgstr "Geslo ni bilo dano."
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
-#: camel/camel-pgp-context.c:1295
+#: 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
 #, 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:693
+#: camel/camel-pgp-context.c:683
 msgid "No plaintext to clearsign."
 msgstr "Ni besedila za čisti podpis."
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:873
 msgid "No plaintext to verify."
 msgstr "Ni besedila za preverbo."
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:890
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Nisem mogel ustvariti začasne datoteke: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1047
 msgid "No plaintext to encrypt."
 msgstr "Ni besedila za šifriranje."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1073
 msgid "No recipients specified"
 msgstr "Prejemniki niso navedeni"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1261
 msgid "No ciphertext to decrypt."
 msgstr "Ni šifriranega besedila za dešifriranje."
 
@@ -4186,7 +3673,7 @@ msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
@@ -4195,13 +3682,13 @@ msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
-#: 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:382
+#: 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
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:476
 msgid "Server unexpectedly disconnected"
 msgstr "Povezava s strežnikom je bila nepričakovano prekinjena"
 
@@ -4279,8 +3766,8 @@ 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"
@@ -4313,7 +3800,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:438
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -4382,7 +3869,7 @@ msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:479
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4428,17 +3915,33 @@ msgstr "Nisem uspel dešifrirati sporočila"
 msgid "Failed to verify certificates."
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: camel/camel-tcp-stream-openssl.c:415
+#. 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
 #, 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"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4453,36 +3956,26 @@ msgstr ""
 "\n"
 "Ga želite vseeno sprejeti?"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:423
 #, 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"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti razčleniti URLja '%s'"
 
-#: camel/camel-vee-folder.c:452
+#: camel/camel-vee-folder.c:451
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ni takšnega sporočila %s v %s"
 
-#: camel/camel-vee-folder.c:547
+#: camel/camel-vee-folder.c:546
 #, c-format
 msgid "No such message: %s"
 msgstr "Ni takšnega sporočila: %s"
@@ -4491,26 +3984,35 @@ msgstr "Ni takšnega sporočila: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Ne morete kopirati sporočil iz te mape smeti."
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: 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
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: 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
 msgid "Server response ended too soon."
 msgstr "Odgovor strežnika se je prehitro končal."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:489
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "odgovor IMAP strežnika ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:526
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan OK odgovor strežnika IMAP: %s"
@@ -4529,37 +4031,20 @@ msgstr "Nisem mogel naložiti povzetka za %s"
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
 
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:437
-#, fuzzy
-msgid "Scanning for changed messages"
-msgstr "Shranjujem spremembe sporočila..."
+#: camel/providers/imap/camel-imap-folder.c:430
+msgid "Scanning IMAP folder"
+msgstr "Pregledujem mapo IMAP"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1483
+#: camel/providers/imap/camel-imap-folder.c:1763
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
-msgid "Fetching summary information for new messages"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:1647
-#, fuzzy
-msgid "Scanning for new messages"
-msgstr "Shranjujem sporočila"
-
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1796
 msgid "Could not find message body in FETCH response."
 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:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
 msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
 
@@ -4567,7 +4052,7 @@ msgstr "Preverjam za novo pošto"
 msgid "Check for new messages in all folders"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
 msgid "Folders"
 msgstr "Mape"
 
@@ -4599,28 +4084,28 @@ msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 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."
 
-#: camel/providers/imap/camel-imap-store.c:463
+#: camel/providers/imap/camel-imap-store.c:461
 #, 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"
 
-#: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/imap/camel-imap-store.c:471
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:495
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpišite geslo IMAP za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/imap/camel-imap-store.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:411
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:538
+#: camel/providers/imap/camel-imap-store.c:536
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4631,15 +4116,11 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1035
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr ""
-
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Poštni imeniki tipa MH"
@@ -4673,7 +4154,6 @@ msgid "For storing local mail in standard Unix spool directories"
 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"
@@ -4713,8 +4193,7 @@ 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:417
-#: camel/providers/local/camel-spool-summary.c:1153
+#: camel/providers/local/camel-local-summary.c:404
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
@@ -4730,7 +4209,6 @@ msgstr "Ne morem dodati sporočila v mapo tipa maildir: %s: %s"
 #: 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"
@@ -4742,7 +4220,6 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: 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"
 
@@ -4751,7 +4228,7 @@ msgstr "Ni takšnega sporočila"
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-maildir-store.c:101
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4761,14 +4238,14 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:105
 #: 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:114
+#: camel/providers/local/camel-maildir-store.c:112
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4778,23 +4255,23 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:129
+#: camel/providers/local/camel-maildir-store.c:127
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ni imenik tipa maildir."
 
-#: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-maildir-store.c:156
+#: camel/providers/local/camel-maildir-store.c:193
 #: 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:166
+#: camel/providers/local/camel-maildir-store.c:157
 msgid "not a maildir directory"
 msgstr "ni imenik tipa maildir"
 
-#: camel/providers/local/camel-maildir-store.c:276
+#: camel/providers/local/camel-maildir-store.c:267
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisem mogel prebrati mape `%s': %s"
@@ -4806,13 +4283,11 @@ msgid "Cannot open maildir directory path: %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"
 
 #: camel/providers/local/camel-mbox-folder.c:203
-#: 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"
@@ -4825,9 +4300,6 @@ 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-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"
@@ -4837,12 +4309,10 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
-#: 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."
 
 #: camel/providers/local/camel-mbox-folder.c:384
-#: 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?"
 
@@ -4888,45 +4358,36 @@ 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
-#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Delam povzetek mape"
 
 #: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
 #, 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-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"
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#: 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-mbox-summary.c:502
-#: 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:1516
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1445
 msgid "Synchronising folder"
 msgstr "Uskljajujem mapo %s"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
-#: 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-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"
@@ -4935,28 +4396,21 @@ msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 #: 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"
 
 #: 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"
 
 #: 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"
@@ -4971,9 +4425,7 @@ msgstr "Nisem mogel zapreti začasne mape: %s"
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:878
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1106
+#: camel/providers/local/camel-mbox-summary.c:879
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
@@ -4993,62 +4445,6 @@ msgstr "`%s' ni imenik."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne morem odpreti poštnega imenika MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:465
-#, fuzzy, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Ne morem pripeti sporočila k datoteki tipa mbox: %s: %s"
-
-#: camel/providers/local/camel-spool-store.c:132
-#, fuzzy, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "`%s' ni običajna datoteka."
-
-#: camel/providers/local/camel-spool-store.c:159
-#, fuzzy, c-format
-msgid "Folder `%s/%s' does not exist."
-msgstr "Mapa `%s' ne obstaja."
-
-#: camel/providers/local/camel-spool-store.c:176
-#, fuzzy
-msgid "Spool stores do not have an inbox"
-msgstr "Krajevno shrambe nimajo vhodnega predala"
-
-#: camel/providers/local/camel-spool-store.c:186
-#, fuzzy, c-format
-msgid "Spool mail file %s"
-msgstr "Krajevna datoteka s pošto %s"
-
-#: camel/providers/local/camel-spool-store.c:222
-#, fuzzy
-msgid "Spool folders cannot be renamed"
-msgstr "Krajevnih map ni mogoče gnezditi."
-
-#: camel/providers/local/camel-spool-store.c:230
-#, fuzzy
-msgid "Spool folders cannot be deleted"
-msgstr "Krajevnih map ni mogoče gnezditi."
-
-#: camel/providers/local/camel-spool-summary.c:784
-#: camel/providers/local/camel-spool-summary.c:793
-#: camel/providers/local/camel-spool-summary.c:802
-#, fuzzy, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "Nisem mogel odpreti začasne poštne datoteke %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:817
-#, fuzzy, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Nisem mogel prebrati mape `%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 ""
-
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -5071,17 +4467,17 @@ msgstr "Strežnik je zavrnil uporabniško ime/geslo"
 msgid "Message %s not found."
 msgstr "Sporočilo %s ni bilo najdeno."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Nisem mogel dobiti seznama skupin s strežnika."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
@@ -5094,25 +4490,25 @@ msgstr "USENET novičke"
 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."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:224
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nisem mogel odpreti imenika za novičkarski strežnik: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:286
 #, c-format
 msgid "USENET News via %s"
 msgstr "USNET Novičke preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:293
 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."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:323
+#: camel/providers/nntp/camel-nntp-store.c:485
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
@@ -5163,7 +4559,7 @@ msgstr "Pusti sporočila na strežniku"
 msgid "Delete after %s day(s)"
 msgstr "Zbriši po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
 msgid "POP"
 msgstr "POP"
 
@@ -5258,7 +4654,7 @@ msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:81
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -5312,7 +4708,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:74
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5322,122 +4718,122 @@ msgstr ""
 "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaktična napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaktična napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Stanje sistema ali odgvor na pomoč"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Sporčilo pomoči"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 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:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Zahtevano poštno dejanje ni bilo izvedeno: poštni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Zahtevano dejanje ni bilo izvedeno: poštni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 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:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Zahtevano dejanje preklicano: prekoračena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Zahtevano dejanje ni bilo izvedeno: ime poštnega predala ni dovoljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Začni z vpisom pošte; končaj z <ENTER>.<ENTER>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizem avtentifikacije je prešibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Za zahtevan mehanizem avtentifikacije je potrebno šifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Začasna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:396
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsim vpišite geslo SMTP za %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:419
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5448,132 +4844,118 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:535
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:537
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:562
 msgid "Cannot send message: sender address not defined."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:569
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
-msgid "Sending message"
-msgstr "Pošiljam sporočilo"
-
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
-#, fuzzy
-msgid "SMTP Greeting"
-msgstr "Srečanje"
-
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:696
 #, 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:744
+#: camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, fuzzy
-msgid "SMTP Authentication"
-msgstr "Avtentifikacija"
-
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:744
+#: camel/providers/smtp/camel-smtp-transport.c:756
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:765
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:836
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:855
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na MAIL FROM: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:880
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:899
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:930
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:984
 #, 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 "
 "bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1003
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1027
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1046
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Napaka v odgovoru na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
@@ -5603,7 +4985,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
 msgid "attachment"
 msgstr "priloga"
 
@@ -5632,69 +5014,10 @@ 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-hdrs.c:328
-msgid "Click here for the address book"
-msgstr "Kliknite tu za adresar"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:359
-msgid "From:"
-msgstr "Od:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:365
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:376
-msgid "Subject:"
-msgstr "Zadeva:"
-
-#: composer/e-msg-composer-hdrs.c:390
-msgid "To:"
-msgstr "Za:"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Enter the recipients of the message"
-msgstr "Vnesite prejemnike sporočila"
-
-#: composer/e-msg-composer-hdrs.c:394
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:395
-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:398
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:399
-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
+#: composer/e-msg-composer.c:667
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5703,7 +5026,7 @@ msgstr ""
 "Nisem mogel odpreti datoteke: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:683
+#: composer/e-msg-composer.c:680
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5712,30 +5035,21 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:882
-#, fuzzy
-msgid "Warning!"
-msgstr "Opozorilo"
-
-#: composer/e-msg-composer.c:884
-msgid "File exists, overwrite?"
-msgstr ""
-
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:876
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:896
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:967
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5743,25 +5057,16 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: composer/e-msg-composer.c:1047
-#, fuzzy, c-format
-msgid "Error accessing file: %s"
-msgstr "Napaka ob shranjevanju datoteke: %s"
+#: composer/e-msg-composer.c:1015
+#, c-format
+msgid "Error opening file: %s"
+msgstr "Napaka ob odpiranju datoteke: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1023
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1061
-#, fuzzy, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
-msgstr ""
-"Nisem mogel ustvariti izhodne datoteke: %s\n"
-" %s"
-
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1029
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5770,7 +5075,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1038
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5779,16 +5084,20 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
-#, fuzzy
+#: composer/e-msg-composer.c:1103
 msgid ""
-"Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Evolution has detected an editor buffer from a previous session.\n"
+"Would you like to recover this buffer?"
 msgstr ""
 "Evolucija je zaznala medpomnilnik urejevalnika iz prejšnje seje.\n"
 "Želite znova uporabiti ta medpomnilnik?"
 
-#: composer/e-msg-composer.c:1321
+#: 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
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5798,27 +5107,75 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
-msgid "Evolution"
-msgstr "Evolucija"
-
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1259
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1408
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1765 composer/e-msg-composer.c:2138
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2232
 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"
@@ -5844,56 +5201,40 @@ msgid "calendar information"
 msgstr "podatki o kodledarju"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:239
+#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
 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:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:312
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:304
 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: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
+#: 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
 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: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
+#: 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
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
-#, fuzzy
-msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
-
-#: e-util/e-time-utils.c:241
-#, fuzzy
-msgid "%Y/%m/%d"
-msgstr "%a %d/%m/%Y"
-
-#: e-util/e-time-utils.c:242
-#, fuzzy, c-format
-msgid "%x"
-msgstr "x"
-
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:258
 #: 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"
@@ -5901,65 +5242,77 @@ 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:303
+#: e-util/e-time-utils.c:263
 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:312
+#: e-util/e-time-utils.c:272
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "leto"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "let"
 
-#: filter/filter-datespec.c:81
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "mesec"
 
-#: filter/filter-datespec.c:81
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "mesecev"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "teden"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "tedenov"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:81
+msgid "days"
+msgstr "dni"
+
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "ura"
 
-#: filter/filter-datespec.c:85
+#: filter/filter-datespec.c:82
+msgid "hours"
+msgstr "ur"
+
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:83
+msgid "minutes"
+msgstr "minut"
+
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "sekunda"
 
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr " sekund"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Opa. Pozabili ste izbrati datum."
 
-#: filter/filter-datespec.c:196
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr "Opa. Izbrali ste neveljaven datum."
 
-#: filter/filter-datespec.c:271
+#: filter/filter-datespec.c:276
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5969,7 +5322,7 @@ msgstr ""
 "časom ob katerem se bo pognal filter\n"
 "ali vmapa odprta."
 
-#: filter/filter-datespec.c:294
+#: filter/filter-datespec.c:299
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5977,7 +5330,7 @@ msgstr ""
 "Datum tega sporočila bo primerjan s časom,\n"
 "ki ga navedete tu."
 
-#: filter/filter-datespec.c:334
+#: filter/filter-datespec.c:339
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5988,37 +5341,28 @@ msgstr ""
 ".na primer \"teden dni nazaj\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
+#: filter/filter-datespec.c:374
 msgid "the current time"
 msgstr "trenutni čas"
 
-#: filter/filter-datespec.c:369
+#: filter/filter-datespec.c:374
 msgid "a time you specify"
 msgstr "čas, ki ga navedete"
 
-#: filter/filter-datespec.c:370
+#: filter/filter-datespec.c:375
 msgid "a time relative to the current time"
 msgstr "čas, relatievn trenutnemu"
 
 #. The label
-#: filter/filter-datespec.c:428
+#: filter/filter-datespec.c:433
 msgid "Compare against"
 msgstr "Primerjaj z"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
 msgid "now"
 msgstr "sedaj"
 
-#: filter/filter-datespec.c:575
-#, fuzzy
-msgid " ago"
-msgstr "nazaj"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "nazaj"
-
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:707
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
@@ -6043,8 +5387,8 @@ msgstr ""
 "Opa, pozabili ste izbrati mapo.\n"
 "Prosim pojdite nazaj in navedite veljavno mapo kamor naj se pošta dostavi."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
+#: mail/mail-account-gui.c:701
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
@@ -6056,6 +5400,46 @@ msgstr "Vnesite URI mape"
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Uredi filtre"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Uredi vMape"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Dohodna"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Odhodna"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtualne mape"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "le izbrane mape"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Viri vMap"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "z vsemi aktivnimi oddaljenimi mapami"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "z vsemi krajevnimi mapami"
+
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -6077,88 +5461,36 @@ msgstr "Ime pravila: "
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Če"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Izvrši dejanja"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "če je zadoščeno vsem pogojem"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "če je zadoščeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:769
 msgid "incoming"
 msgstr "dohodna"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:769
 msgid "outgoing"
 msgstr "odhodna"
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1161
-#: my-evolution/e-summary-preferences.c:1209
-#: my-evolution/e-summary-preferences.c:1271
-msgid "Add"
-msgstr "Dodaj"
-
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
-msgid "Edit"
-msgstr "Uredi"
-
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Uredi filtre"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Uredi vMape"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Dohodna"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Odhodna"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtualne mape"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "le izbrane mape"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "Viri vMap"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "z vsemi aktivnimi oddaljenimi mapami"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "z vsemi krajevnimi mapami"
-
 #: filter/libfilter-i18n.h:3
-#, fuzzy
-msgid "Assign Color"
+msgid "Assign Colour"
 msgstr "Pripiši barvo"
 
 #: filter/libfilter-i18n.h:4
@@ -6234,120 +5566,128 @@ msgid "Expression"
 msgstr "Izraz"
 
 #: filter/libfilter-i18n.h:24
+msgid "Forward to Address"
+msgstr "Posreduj na naslove"
+
+#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Pomembno"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:27
 msgid "is greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "Message Header"
 msgstr "Glava sporočila"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "Message was received"
 msgstr "Sporočilo je bilo sprejeto"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "Message was sent"
 msgstr "Sporočilo je bilo poslano"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36
 msgid "on or after"
 msgstr "na ali po"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:37
 msgid "on or before"
 msgstr "na ali pred"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Read"
 msgstr "Beri"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:39
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
+#: 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 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1049
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:50 mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Stanje"
+
+#: filter/libfilter-i18n.h:51
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:52 mail/mail-format.c:776
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "was before"
 msgstr "je bilo pred"
 
@@ -6367,23 +5707,29 @@ msgstr "Uredi pravilo"
 msgid "Score Rules"
 msgstr "Točke pravil"
 
-#: filter/vfolder-rule.c:198
-msgid "Oops.  You need to to specify at least one folder as a source."
-msgstr ""
-
-#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: 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
 msgid "Import"
 msgstr "Uvozi"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:506 importers/netscape-importer.c:774
+#: importers/pine-importer.c:643
 msgid "Mail"
 msgstr "Pošta"
 
-#: importers/elm-importer.c:498
+#: 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
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -6391,15 +5737,15 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Elm.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/elm-importer.c:527
+#: importers/elm-importer.c:579
 msgid "Elm mail"
 msgstr "Poštni program Elm"
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
 msgid "Addressbook"
 msgstr "Adresar"
 
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:261
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6407,11 +5753,19 @@ msgstr ""
 "Evolucija je našla datoteke GnomeCard-a.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:779 importers/pine-importer.c:648
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:849
+#: 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
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6419,7 +5773,7 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Netscape.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:697
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -6427,207 +5781,187 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Pine.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:725
 msgid "Pine mail"
 msgstr "Poštni program Pine"
 
-#: 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 ""
-
-#: mail/component-factory.c:337
-#, fuzzy
-msgid "Properties..."
-msgstr "_Lastnosti..."
-
-#: mail/component-factory.c:337
-#, fuzzy
-msgid "Change this folder's properties"
-msgstr "Spremeni lastnosti datoteke"
-
-#: mail/component-factory.c:757
+#: mail/component-factory.c:666
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:800
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:254
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Lastnosti za \"%s\""
-
-#: mail/folder-browser-ui.c:256
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:211 mail/mail-display.c:268
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/folder-browser.c:893
+#: mail/folder-browser.c:830
 msgid "Store search as vFolder"
 msgstr "Shrani iskanje kot vMapo"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1173
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1176
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1179
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1182
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1188
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1191
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1194
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1197
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/folder-browser.c:1273
+#: mail/folder-browser.c:1206
+msgid "_Open"
+msgstr "_Odpri"
+
+#: mail/folder-browser.c:1208
 msgid "Resend"
 msgstr "Znova pošlji"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1210 ui/evolution-calendar.xml.h:54
+#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1212 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1219 ui/evolution-mail-message.xml.h:61
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1221 ui/evolution-mail-message.xml.h:60
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1223
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1226
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1228
 msgid "Mark as U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1295
-#, fuzzy
-msgid "Mark as _Important"
-msgstr "Označi kot po_membno"
-
-#: mail/folder-browser.c:1297
-#, fuzzy
-msgid "Mark as Unim_portant"
-msgstr "Označi kot po_membno"
-
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1233
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1235
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1239 ui/evolution-mail-message.xml.h:87
 msgid "_Undelete"
 msgstr "O_dbriši"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1244
 msgid "Add Sender to Address Book"
 msgstr "Pošiljatelja dodaj v adresar"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1249
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1253
 msgid "Create Ru_le From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1392
 msgid "Filter on Mailing List"
 msgstr "Filter glede na Poštni seznam"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1393
 msgid "VFolder on Mailing List"
 msgstr "vMapa glede na Poštni seznam"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1395
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Poštni seznam (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1396
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na Poštni 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/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
@@ -6678,26 +6012,20 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor.c:105
 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-news.c:160
-#, fuzzy
-msgid "Evolution News Editor"
-msgstr "Urejevalnik Evolucijinih računov"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:154
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:891
 msgid "Save signature"
 msgstr "Shrani podpis"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:897
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6707,38 +6035,28 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-accounts.c:130
 msgid " (default)"
 msgstr " (privzeto)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:169
 msgid "Disable"
 msgstr "Izključi"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
 msgid "Enable"
 msgstr "Vključi"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepričani, da želite zbrisati ta račun?"
 
-#: mail/mail-accounts.c:268
-#, fuzzy
-msgid "Don't delete"
-msgstr "Odbriši"
-
-#: mail/mail-accounts.c:271
-#, fuzzy
-msgid "Really delete account?"
-msgstr "Naj bo to moj privzet račun"
-
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:697
 msgid "Evolution Account Manager"
 msgstr "Upravljalnik Evolucijinih računov"
 
@@ -6814,8 +6132,8 @@ msgid ""
 "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"
+"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
@@ -6826,29 +6144,29 @@ msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 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."
 
-#: mail/mail-callbacks.c:653
+#: mail/mail-callbacks.c:655
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Na %s, je %s zapisal(a):"
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:874
 msgid "Forwarded message:\n"
 msgstr "Posredovano sporočilo:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:968
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:970
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1325
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ste prepričani, da želite urediti vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1347
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6856,7 +6174,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1381
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6864,24 +6182,36 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1393
 #, 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?"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1414
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:1545
+#: 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?"
+
+#: mail/mail-callbacks.c:1496
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1498
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1683
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6890,23 +6220,23 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
-msgid "Filters"
-msgstr "Filtri"
-
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1741
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1788
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:1883
 #, 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..."
+
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6951,14 +6281,10 @@ msgstr ""
 "račun. Ime bo uporabljeno le za prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:466
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr "Evolucijin čarovnik za račune"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
-msgid "Connecting to server..."
-msgstr "Vzpostavljam povezavo s strežnikom..."
-
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Preveri za podprte tipe"
@@ -6968,63 +6294,58 @@ msgid " color"
 msgstr " barvo"
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "Podpisovanje v tem kodirniku ni podprto"
-
-#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Račun"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Podatki o računu"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Računi"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:11
+#: 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:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Način avtentifikacije: "
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Automatically check for new mail every"
 msgstr "Samodejno preveri za novo pošto vsakih"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Certificate ID:"
 msgstr "ID certifikata:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Composer"
 msgstr "Skladatelj"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7040,273 +6361,244 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:26
-#, fuzzy
-msgid "Default Forward style is: "
+#: mail/mail-config.glade.h:25
+msgid "Default \"Forward\" style is: "
 msgstr "Privzet način \"Posreduj naprej\" je: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Default character set: "
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Digital IDs..."
 msgstr "Digitalni IDji..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Drafts folder:"
 msgstr "Mapa osnutkov:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Email Address:"
 msgstr "E-poštni naslov:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Empty trash folders on exit"
 msgstr "Ob izhodu sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Enabled"
-msgstr "Vključi"
-
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:38
 msgid "Full Name:"
 msgstr "Polno ime:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:39
 msgid "Get Digital ID..."
 msgstr "Dobi digitalni ID..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:40
 msgid "HTML Signature:"
 msgstr "Podpis HTML:"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Highlight citations with"
 msgstr "Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:43
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:44
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:45
 msgid "In HTML mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:46
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:50
+#: 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:51
+#: mail/mail-config.glade.h:49
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:52
-#, fuzzy
-msgid "Mailbox location"
-msgstr "Tip poštnega predala"
-
-#: mail/mail-config.glade.h:53
+#: 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:54
-#, fuzzy
-msgid "Mark messages as Read after"
+#: 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:55
-msgid "Message list should display in a threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:52
 msgid "NNTP Server:"
 msgstr "Strežnik NNTP"
 
-#: mail/mail-config.glade.h:59
+#: 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:60
+#: mail/mail-config.glade.h:55
 msgid "News"
 msgstr "Novice"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:57
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:58
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:60
 msgid "PGP Key ID:"
 msgstr "ID ključa PGP:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:61
 msgid "PGP binary path:"
 msgstr "Pot do izvršljive datoteke PGP"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:65
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:66
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy (precej dobra zasebnost)"
 
-#: mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Prompt when sending messages with an empty subject"
-msgstr "Dodajam sporočilo brez navedene zadeve"
-
-#: mail/mail-config.glade.h:73
-#, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
-msgstr "Ne morem poslati sporočila: ni naslovnikov."
-
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:67
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:68
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:69
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:70
 msgid "Receiving Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:71
 msgid "Receiving Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:73
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:75
 msgid "Secure MIME"
 msgstr "Varni MIME"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:76
 msgid "Security"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:77
 msgid "Select PGP binary"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:86
+#: 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:87
+#: mail/mail-config.glade.h:79
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:80
 msgid "Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:82
 msgid "Sent"
 msgstr "Poslano"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:83
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:84
 msgid "Sent messages folder:"
 msgstr "Mapa poslanih sporočil:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:85
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:86
 msgid "Server Type: "
 msgstr "Vrsta strežnika:"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:87
 msgid "Server requires authentication"
 msgstr "Strežnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:88
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:89
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:90
 msgid "Source Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:91
 msgid "Sources"
 msgstr "Viri"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:92
 msgid "Special Folders"
 msgstr "Posebne mape"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:93
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:103
+#: 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)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:96
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:97
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -7316,228 +6608,226 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:112
+#: 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:104
 msgid "newswindow1"
 msgstr "oknonovic1"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:105
 msgid "placeholder"
 msgstr "držalec mesta"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:106
 msgid "seconds."
 msgstr "sekund."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr "Nisem mogel ustvariti konteksta šifiranja PGP."
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja PGP."
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisa S/MIME"
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nisem mogel ustvariti konteksta certifikatov S/MIME."
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nisem mogel ustvariti konteksta šifriranja S/MIME."
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:220
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:330
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:340
-msgid "View Inline"
-msgstr "Poglej vsebino"
-
-#: mail/mail-display.c:342
+#: mail/mail-display.c:332
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:334
+msgid "View Inline"
+msgstr "Poglej vsebino"
+
+#: mail/mail-display.c:369
+msgid "External Viewer"
+msgstr "zunanjem pregledovalniku"
+
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:424
-msgid "External Viewer"
-msgstr "zunanjem pregledovalniku"
-
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1028
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1371
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1373
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1375
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1410
-#, fuzzy
-msgid "Save Image as..."
+#: mail/mail-display.c:1377
+msgid "Save Image as"
 msgstr "Shrani sliko kot"
 
-#: mail/mail-folder-cache.c:170
-#, fuzzy, c-format
-msgid "%d new"
-msgstr "%d minut"
-
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
-msgid ", "
-msgstr ""
-
-#: mail/mail-folder-cache.c:177
-#, c-format
-msgid "%d hidden"
-msgstr ""
-
-#: mail/mail-folder-cache.c:186
-#, fuzzy, c-format
-msgid "%d unsent"
-msgstr "%d sekund"
-
-#: mail/mail-folder-cache.c:188
-#, c-format
-msgid "%d total"
-msgstr ""
-
-#: mail/mail-format.c:609
+#: mail/mail-format.c:532
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:580
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:649 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:842
-#, fuzzy
-msgid "Bad Address"
-msgstr "E-poštni naslov:"
-
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:765 mail/message-list.etspec.h:4
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:768
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:771 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:774
 msgid "Cc"
-msgstr "Cc:"
+msgstr "Cc"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1096
 msgid "No GPG/PGP program configured."
 msgstr "Program GPG/PGP ni nastavljen."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1111
 msgid "Encrypted message not displayed"
 msgstr "Šifrirano sporočilo ni prikazano"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1117
 msgid "Encrypted message"
 msgstr "Šifrirano sporočilo"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1118
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za dešifriranje."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1174
 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."
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1182
 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."
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:1833
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:1845
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:1849
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2094
-#, fuzzy, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Kazalec na FTP povezavo (%s)"
-
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:1883
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:1888
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:455
 #, c-format
 msgid "Opening '%s'"
 msgstr "Odpiram '%s'"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:755
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:868
+#: 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
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7546,7 +6836,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:926
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7554,17 +6844,12 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#: mail/mail-local.c:1000
-#, fuzzy
-msgid "You cannot change the format of a non-local folder."
-msgstr "Ne morete kopirati sporočil iz te mape smeti."
-
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1012
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znova nastavi %s"
 
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7573,7 +6858,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:193
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7582,104 +6867,110 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-ops.c:578
+#: mail/mail-mt.c:867
+msgid "Evolution progress"
+msgstr "Napredek evolucije"
+
+#: mail/mail-ops.c:547
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:551
+msgid "Sending message"
+msgstr "Pošiljam sporočilo"
+
+#: mail/mail-ops.c:662
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:681
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:683 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:768
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:846
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:846
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočia v %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:863
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:866
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:956
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osvežujem mape v \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
-msgid "Trash"
-msgstr "Smeti"
-
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1118
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1159 mail/mail-ops.c:1297
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1226
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1365
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1497
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1533
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1582
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1722
-#, fuzzy, c-format
-msgid "Retrieving %d message(s)"
+#: mail/mail-ops.c:1649
+msgid "Retrieving messages"
 msgstr "Prenašam sporočilo"
 
-#: mail/mail-ops.c:1808
-#, fuzzy, c-format
-msgid "Saving %d messsage(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:1733
+msgid "Saving messages"
 msgstr "Shranjujem sporočila"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1812
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7688,7 +6979,12 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: 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
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7697,11 +6993,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:1913
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7710,12 +7006,12 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:1956
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2023
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
@@ -7724,33 +7020,23 @@ msgstr "Odklapljam se od %s"
 msgid "(Untitled Message)"
 msgstr "(Neimenovano sporočilo)"
 
-#: mail/mail-search.c:235
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Neimenovano sporočilo)"
-
-#: mail/mail-search.c:239
-#, fuzzy
-msgid "Empty Message"
-msgstr "Kopiraj sporočilo"
-
-#: mail/mail-search.c:284
+#: mail/mail-search.c:268
 msgid "Find in Message"
 msgstr "Poišči v sporočilu"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:298
 msgid "Case Sensitive"
 msgstr "Razlikuj velike in male črke"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:299
 msgid "Search Forward"
 msgstr "Išči naprej"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:316
 msgid "Find:"
 msgstr "Poišči"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:319
 msgid "Matches:"
 msgstr "Ustreza:"
 
@@ -7782,108 +7068,111 @@ msgstr "Pošiljam"
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: mail/mail-session.c:171
-msgid "User canceled operation."
-msgstr "Uporabnik je dejanje preklical."
-
-#: mail/mail-tools.c:173
+#: 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-tools.c:241
+#: mail/mail-tools.c:207
+#, c-format
+msgid "[%s] (forwarded message)"
+msgstr "[%s] (posredovano sporočilo)"
+
+#: mail/mail-tools.c:217
+msgid "Fwd: (no subject)"
+msgstr "Posreduj: (ni zadeve)"
+
+#: mail/mail-tools.c:234
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:245
-#, fuzzy
-msgid "Forwarded message"
-msgstr "Posredovana sporočila"
+#: mail/mail-tools.c:236
+msgid "Forwarded message (no subject)"
+msgstr "Posredovano sporočilo (brez navedene zadeve)"
 
-#: mail/mail-tools.c:469
-#, fuzzy
-msgid "Forwarded Message"
-msgstr "Posredovana sporočila"
+#: 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-vfolder.c:270
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:438
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-list.c:613
+#: mail/message-list.c:608
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:609
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:610
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:611
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:612
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:616
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:617
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:621
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:622
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:872
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:879
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:888
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:900
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:908
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:910
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2290
-#, fuzzy
-msgid "Updating message list"
-msgstr "Nitim seznam sporočil"
-
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 msgid "Flagged"
 msgstr "Označeno"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Received"
 msgstr "Sprejeto"
 
@@ -7891,6 +7180,10 @@ 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"
@@ -7935,87 +7228,43 @@ msgstr "Tovarna za Evolucijine komponente za povzetke."
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
 msgid "Appointments"
 msgstr "Zmeneki"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:159
 msgid "No appointments"
 msgstr "Ni zmenkov"
 
-#: my-evolution/e-summary-calendar.c:226
-#, fuzzy
-msgid "%l:%M%p"
+#: 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:228
-#, fuzzy
-msgid "%a %l:%M%p"
-msgstr "%a %l:%M %p"
-
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:100
 msgid "Mail summary"
 msgstr "Povzetek pošte"
 
-#: my-evolution/e-summary-preferences.c:420
-msgid "Dictionary.com Word of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:442
-msgid "Quotes of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:869
-#, fuzzy
-msgid "Add a news feed"
-msgstr "Dodaj novičarski strežnik"
-
-#: my-evolution/e-summary-preferences.c:877
-#, fuzzy
-msgid "Enter the URL of the news feed you wish to add"
-msgstr "Vpišite ime računalnika na katerem teče novičarski strežnik."
-
-#: my-evolution/e-summary-preferences.c:1408
-#, fuzzy
-msgid "My Evolution Settings"
-msgstr "_Nastavive Moje Evolucije..."
-
-#: my-evolution/e-summary-rdf.c:281
-#, fuzzy
-msgid "There was an error downloading news feed"
-msgstr "Napaka ob nalaganju datoteke koledarja."
-
-#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Napaka ob prenašanju RDF</b>"
 
-#: my-evolution/e-summary-tasks.c:206
-#, fuzzy
-msgid "No tasks"
-msgstr "Nova naloga"
-
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:56
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:313
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr ""
+#: 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:643
+#: my-evolution/e-summary-weather.c:612
 msgid "Regions"
 msgstr "Območja"
 
-#: my-evolution/e-summary.c:145
-#, fuzzy
-msgid "%A, %d %B %Y"
-msgstr "%A, %e %B %Y"
-
-#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#: 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:518
+#: my-evolution/e-summary.c:459
 msgid "Printing of My Evolution failed"
 msgstr "Tiskanje Moje evolucije ni uspelo"
 
@@ -8023,95 +7272,95 @@ msgstr "Tiskanje Moje evolucije ni uspelo"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\n"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:43
 msgid "Clear sky"
 msgstr "Jasno"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:44
 msgid "Broken clouds"
 msgstr "Pretežno oblačno"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:45
 msgid "Scattered clouds"
 msgstr "Delno oblačno"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:46
 msgid "Few clouds"
 msgstr "Pretežno jasno"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:47
 msgid "Overcast"
 msgstr "Oblačno"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
 msgid "Invalid"
 msgstr "Neveljavno"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:62
 msgid "Variable"
 msgstr "Spremenljivo"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:63
 msgid "North"
 msgstr "sever"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:63
 msgid "North - NorthEast"
 msgstr "sever - severovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:63
 msgid "Northeast"
 msgstr "severovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:63
 msgid "East - NorthEast"
 msgstr "vzhod - severovzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:64
 msgid "East"
 msgstr "vzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:64
 msgid "East - Southeast"
 msgstr "vzhod - jugovzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:64
 msgid "Southeast"
 msgstr "jugovzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:64
 msgid "South - Southeast"
 msgstr "jug - jugovzhod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:65
 msgid "South"
 msgstr "jug"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:65
 msgid "South - Southwest"
 msgstr "jug - jugozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:65
 msgid "Southwest"
 msgstr "jugozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:65
 msgid "West - Southwest"
 msgstr "zahod - jugozahod"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:66
 msgid "West"
 msgstr "zahod"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:66
 msgid "West - Northwest"
 msgstr "zahod - severozahod"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:66
 msgid "Northwest"
 msgstr "severozahod"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:66
 msgid "North - Northwest"
 msgstr "sever - severozahod"
 
@@ -8119,1194 +7368,1062 @@ msgstr "sever - severozahod"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Drizzle"
 msgstr "Pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Drizzle in the vicinity"
 msgstr "Pršenje v okolici"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Light drizzle"
 msgstr "Rahlo pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Moderate drizzle"
 msgstr "Zmerno pršenje"
 
 # @ Hmmm...
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Heavy drizzle"
 msgstr "Močno pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Shallow drizzle"
 msgstr "Plitvo pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Patches of drizzle"
 msgstr "Ponekod prši"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Partial drizzle"
 msgstr "Prši s presledki"
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:99 my-evolution/metar.c:100
 msgid "Thunderstorm"
 msgstr "Nevihta"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Windy drizzle"
 msgstr "Pršenje z vetrom"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Drifting drizzle"
 msgstr "Pršenje v pasovih"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:99
 msgid "Freezing drizzle"
 msgstr "Zmrzujoče pršenje"
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Rain"
 msgstr "Dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Rain in the vicinity"
 msgstr "Dež v okolici"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Light rain"
 msgstr "Rahel dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Moderate rain"
 msgstr "Zmeren dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Heavy rain"
 msgstr "Močan dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Shallow rain"
 msgstr "Plitev dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Patches of rain"
 msgstr "Ponekod dežuje"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Partial rainfall"
 msgstr "Dežuje s presledki"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Blowing rainfall"
 msgstr "Dež z vetrom"
 
 # @ Hmmm....
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Rain showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Drifting rain"
 msgstr "Dež v pasovih"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:100
 msgid "Freezing rain"
 msgstr "Zmrzujoč dež"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Snow"
 msgstr "Sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Snow in the vicinity"
 msgstr "Sneži v okolici"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Light snow"
 msgstr "Rahlo sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Moderate snow"
 msgstr "Zmerno sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Heavy snow"
 msgstr "Močno sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Shallow snow"
 msgstr "Plitvo sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Patches of snow"
 msgstr "Ponekod sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Partial snowfall"
 msgstr "Sneži s presledki"
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:101 my-evolution/metar.c:102
 msgid "Snowstorm"
 msgstr "Snežna nevihta"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Blowing snowfall"
 msgstr "Sneži z vetrom"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Snow showers"
 msgstr "Snežne plohe"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Drifting snow"
 msgstr "Sneži v pasovih"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:101
 msgid "Freezing snow"
 msgstr "Zmrzujoče sneži"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Snow grains"
 msgstr "Zrnat sneg"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Snow grains in the vicinity"
 msgstr "Zrnato sneži v okolici"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Light snow grains"
 msgstr "Rahlo zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Moderate snow grains"
 msgstr "Zmerno zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Heavy snow grains"
 msgstr "Močno zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Shallow snow grains"
 msgstr "Plitvo zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Patches of snow grains"
 msgstr "Ponekod zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Partial snow grains"
 msgstr "Zrnato sneži s presledki"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Blowing snow grains"
 msgstr "Zrnato sneži z vetrom"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Snow grain showers"
 msgstr "Plohe zrnatega snega"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Drifting snow grains"
 msgstr "Zrnato sneži v pasovih"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:102
 msgid "Freezing snow grains"
 msgstr "Zmrzujoče zrnato sneži"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Ice crystals"
 msgstr "Ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Ice crystals in the vicinity"
 msgstr "Ledene iglice v okolici"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Few ice crystals"
 msgstr "Malo ledenih iglic"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Moderate ice crystals"
 msgstr "Zmerne ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Heavy ice crystals"
 msgstr "Močne ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Patches of ice crystals"
 msgstr "Ponekod ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Partial ice crystals"
 msgstr "Ledene iglice s presledki"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Ice crystal storm"
 msgstr "Nevihta ledenih iglic"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Blowing ice crystals"
 msgstr "Ledene iglice z vetrom"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Showers of ice crystals"
 msgstr "Plohe ledenih iglic"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Drifting ice crystals"
 msgstr "Ledene iglice v pasovih"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:103
 msgid "Freezing ice crystals"
 msgstr "Zmrzujoče ledene iglice"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Ice pellets"
 msgstr "Babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Ice pellets in the vicinity"
 msgstr "Babje pšeno v okolici"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Few ice pellets"
 msgstr "Nekaj babjega pšena"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Moderate ice pellets"
 msgstr "Zmerno babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Heavy ice pellets"
 msgstr "Močno babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Shallow ice pellets"
 msgstr "Plitvo babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Patches of ice pellets"
 msgstr "Ponekod babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Partial ice pellets"
 msgstr "Babje pšeno s presledki"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Ice pellet storm"
 msgstr "Nevihta babjega pšena"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Blowing ice pellets"
 msgstr "Babje pšeno z vetrom"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Showers of ice pellets"
 msgstr "Plohe babjega pšena"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Drifting ice pellets"
 msgstr "Babje pšeno v pasovih"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:104
 msgid "Freezing ice pellets"
 msgstr "Zmrzujoče babje pšeno"
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Hail"
 msgstr "Toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Hail in the vicinity"
 msgstr "Toča v okolici"
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:105 my-evolution/metar.c:106
 msgid "Light hail"
 msgstr "Rahla toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Moderate hail"
 msgstr "Zmerna toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Heavy hail"
 msgstr "Močna toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Shallow hail"
 msgstr "Plitva toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Patches of hail"
 msgstr "Ponekod toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Partial hail"
 msgstr "Toča s presledki"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Hailstorm"
 msgstr "Nevihta toče"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Blowing hail"
 msgstr "Toča z vetrom"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Hail showers"
 msgstr "Ploha toče"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Drifting hail"
 msgstr "Toča v pasovih"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:105
 msgid "Freezing hail"
 msgstr "Zmrzujoča toča"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Small hail"
 msgstr "Sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Small hail in the vicinity"
 msgstr "Sodra v okolici"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Moderate small hail"
 msgstr "Zmerna sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Heavy small hail"
 msgstr "Močna sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Shallow small hail"
 msgstr "Plitva sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Patches of small hail"
 msgstr "Ponekod sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Partial small hail"
 msgstr "Sodra s presledki"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Small hailstorm"
 msgstr "Nevihta sodre"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Blowing small hail"
 msgstr "Sodra z vetrom"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Showers of small hail"
 msgstr "Ploha sodre"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Drifting small hail"
 msgstr "Sodra v pasovih"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:106
 msgid "Freezing small hail"
 msgstr "Zmrzujoča sodra"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Unknown precipitation"
 msgstr "Neznane padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Precipitation in the vicinity"
 msgstr "Padavine v okolici"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Light precipitation"
 msgstr "Rahle padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Moderate precipitation"
 msgstr "Zmerne padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Heavy precipitation"
 msgstr "Močne padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Shallow precipitation"
 msgstr "Plitve padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Patches of precipitation"
 msgstr "Ponekod padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Partial precipitation"
 msgstr "Padavine s presledki"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Unknown thunderstorm"
 msgstr "Nevihta neznanih padavin"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Blowing precipitation"
 msgstr "Padavine z vetrom"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Showers, type unknown"
 msgstr "Ploha neznanih padavin"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Drifting precipitation"
 msgstr "Padavine v pasovih"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:107
 msgid "Freezing precipitation"
 msgstr "Zmrzujoče padavine"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Mist"
 msgstr "Meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Mist in the vicinity"
 msgstr "Meglice v okolici"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Light mist"
 msgstr "Rahle meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Moderate mist"
 msgstr "Zmerne meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Thick mist"
 msgstr "Goste meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Shallow mist"
 msgstr "Plitve meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Patches of mist"
 msgstr "Ponekod meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Partial mist"
 msgstr "Meglice s presledki"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Mist with wind"
 msgstr "Meglice z vetrom"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Drifting mist"
 msgstr "Meglice v pasovih"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:108
 msgid "Freezing mist"
 msgstr "Zmrzujoče meglice"
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Fog"
 msgstr "Megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Fog in the vicinity"
 msgstr "Megla v okolici"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Light fog"
 msgstr "Rahla megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Moderate fog"
 msgstr "Zmerna megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Thick fog"
 msgstr "Gosta megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Shallow fog"
 msgstr "Plitva megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Patches of fog"
 msgstr "Ponekod megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Partial fog"
 msgstr "Megla s presledki"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Fog with wind"
 msgstr "Megla z vetrom"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Drifting fog"
 msgstr "Megla v pasovih"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:109
 msgid "Freezing fog"
 msgstr "Zmrzujoča megla"
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Smoke"
 msgstr "Dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Smoke in the vicinity"
 msgstr "Dim v okolici"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Thin smoke"
 msgstr "Redek dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Moderate smoke"
 msgstr "Zmeren dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Thick smoke"
 msgstr "Gost dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Shallow smoke"
 msgstr "Plitev dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Patches of smoke"
 msgstr "Ponekod dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Partial smoke"
 msgstr "Dim s presledki"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Smoke w/ thunders"
 msgstr "Dim z grmenjem"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Smoke with wind"
 msgstr "Dim z vetrom"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:110
 msgid "Drifting smoke"
 msgstr "Dim v pasovih"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Volcanic ash"
 msgstr "Vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkanski pepel v okolici"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Moderate volcanic ash"
 msgstr "Zmeren vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Thick volcanic ash"
 msgstr "Gost vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Shallow volcanic ash"
 msgstr "Plitev vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Patches of volcanic ash"
 msgstr "Ponekod vulkanski dim"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Partial volcanic ash"
 msgstr "Vulkanski dim s presledki"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Volcanic ash w/ thunders"
 msgstr "Vulkanski dim z grmenjem"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Blowing volcanic ash"
 msgstr "Vulkanski dim z vetrom"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Showers of volcanic ash "
 msgstr "Plohe vulkanskega dima"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Drifting volcanic ash"
 msgstr "Vulkanski dim v pasovih"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:111
 msgid "Freezing volcanic ash"
 msgstr "Zmrzujoč vulkanski dim"
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:112
 msgid "Sand"
 msgstr "Pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:112
 msgid "Sand in the vicinity"
 msgstr "Pesek v okolici"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:112
 msgid "Light sand"
 msgstr "Rahel pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:112
 msgid "Moderate sand"
 msgstr "Zmeren pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:112
 msgid "Heavy sand"
 msgstr "Močan pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:112
 msgid "Patches of sand"
 msgstr "Ponekod pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:112
 msgid "Partial sand"
 msgstr "Pesek s presledki"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:112
 msgid "Blowing sand"
 msgstr "Pesek z vetrom"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:112
 msgid "Drifting sand"
 msgstr "Pesek v pasovih"
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Haze"
 msgstr "Suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Haze in the vicinity"
 msgstr "Suha motnost v okolici"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Light haze"
 msgstr "Rahla suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Moderate haze"
 msgstr "Zmerna suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Thick haze"
 msgstr "Gosta suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Shallow haze"
 msgstr "Plitva suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Patches of haze"
 msgstr "Ponekod suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Partial haze"
 msgstr "Suha motnost s presledki"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Haze with wind"
 msgstr "Suha motnost z vetrom"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Drifting haze"
 msgstr "Suhta motnost v pasovih"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:113
 msgid "Freezing haze"
 msgstr "Zmrzujoča suha motnost"
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Sprays"
 msgstr "Pršec"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Sprays in the vicinity"
 msgstr "Pršec v okolici"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Light sprays"
 msgstr "Rahel pršec"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Moderate sprays"
 msgstr "Zmeren pršec"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Heavy sprays"
 msgstr "Močan pršec"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Shallow sprays"
 msgstr "Plitev pršec"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Patches of sprays"
 msgstr "Ponekod pršec"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Partial sprays"
 msgstr "Pršec s presledki"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Blowing sprays"
 msgstr "Pršec z vetrom"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Drifting sprays"
 msgstr "Pršec v pasovih"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:114
 msgid "Freezing sprays"
 msgstr "Zmrzujoč pršec"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:115
 msgid "Dust"
 msgstr "Prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:115
 msgid "Dust in the vicinity"
 msgstr "Prah v okolici"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:115
 msgid "Light dust"
 msgstr "Rahel prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:115
 msgid "Moderate dust"
 msgstr "Zmeren prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:115
 msgid "Heavy dust"
 msgstr "Gost prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:115
 msgid "Patches of dust"
 msgstr "Ponekod prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:115
 msgid "Partial dust"
 msgstr "Prah s presledki"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:115
 msgid "Blowing dust"
 msgstr "Prah z vetrom"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:115
 msgid "Drifting dust"
 msgstr "Prah v pasovih"
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Squall"
 msgstr "Piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Squall in the vicinity"
 msgstr "Piš vetra v okolici"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Light squall"
 msgstr "Rahel piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Moderate squall"
 msgstr "Zmeren piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Heavy squall"
 msgstr "Močan piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Partial squall"
 msgstr "Piš vetra s presledki"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Thunderous squall"
 msgstr "Piš vetra z grmenjem"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Blowing squall"
 msgstr "Nôšen piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Drifting squall"
 msgstr "Piš vetra v pasovih"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:116
 msgid "Freezing squall"
 msgstr "Zmrzujoč piš vetra"
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Sandstorm"
 msgstr "Peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Sandstorm in the vicinity"
 msgstr "Peščeni vihar v okolici"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Light standstorm"
 msgstr "Rahel peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Moderate sandstorm"
 msgstr "Zmeren peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Heavy sandstorm"
 msgstr "Močan peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Shallow sandstorm"
 msgstr "Plitev peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Partial sandstorm"
 msgstr "Peščeni vihar s presledki"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Thunderous sandstorm"
 msgstr "Peščeni vihar z grmenjem"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Blowing sandstorm"
 msgstr "Nôsen peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Drifting sandstorm"
 msgstr "Peščeni vihar v pasovih"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:117
 msgid "Freezing sandstorm"
 msgstr "Zmrzujoč peščeni vihar"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Duststorm"
 msgstr "Prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Duststorm in the vicinity"
 msgstr "Prašni vihar v okolici"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Light duststorm"
 msgstr "Rahel prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Moderate duststorm"
 msgstr "Zmeren prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Heavy duststorm"
 msgstr "Močan prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Shallow duststorm"
 msgstr "Plitev prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Partial duststorm"
 msgstr "Prašni vihar s presledki"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Thunderous duststorm"
 msgstr "Prašni vihar z grmenjem"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Blowing duststorm"
 msgstr "Nôsen prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Drifting duststorm"
 msgstr "Prašni vihar v pasovih"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:118
 msgid "Freezing duststorm"
 msgstr "Zmrzujoč prašni vihar"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Funnel cloud"
 msgstr "Tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Funnel cloud in the vicinity"
 msgstr "Tromba v okolici"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Light funnel cloud"
 msgstr "Rahla tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Moderate funnel cloud"
 msgstr "Zmerna tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Thick funnel cloud"
 msgstr "Gosta tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Shallow funnel cloud"
 msgstr "Plitva tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Patches of funnel clouds"
 msgstr "Ponekod trombe"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Partial funnel clouds"
 msgstr "Trombe s presledki"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Funnel cloud w/ wind"
 msgstr "Tromba z vetrom"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:119
 msgid "Drifting funnel cloud"
 msgstr "Tromba v pasovih"
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:120
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:120
 msgid "Tornado in the vicinity"
 msgstr "Tornado v okolici"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:120
 msgid "Moderate tornado"
 msgstr "Zmeren tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:120
 msgid "Raging tornado"
 msgstr "Hud tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:120
 msgid "Partial tornado"
 msgstr "Tornado s presledki"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:120
 msgid "Thunderous tornado"
 msgstr "Tornado z grmenjem"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:120
 msgid "Drifting tornado"
 msgstr "Tornado v pasovih"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:120
 msgid "Freezing tornado"
 msgstr "Zmrzujoč tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Dust whirls"
 msgstr "Prašni vrtinec"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Dust whirls in the vicinity"
 msgstr "Prašni vrtinci v okolici"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Light dust whirls"
 msgstr "Rahli prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Moderate dust whirls"
 msgstr "Zmerni prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Heavy dust whirls"
 msgstr "Močni prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Shallow dust whirls"
 msgstr "Plitvi prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Patches of dust whirls"
 msgstr "Ponekod prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Partial dust whirls"
 msgstr "Prašni vrtinci s presledki"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Blowing dust whirls"
 msgstr "Prašni vrtinci z vetrom"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:121
 msgid "Drifting dust whirls"
 msgstr "Prašni vrtinci v pasovih"
 
-#: my-evolution/my-evolution.glade.h:1
-#, fuzzy
-msgid "Add new feed"
-msgstr "Dodaj novičarski strežnik"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
-msgid "All folders:"
-msgstr "Vse mape"
-
-#: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "All stations:"
-msgstr "Vsi udeleženi"
-
-#: my-evolution/my-evolution.glade.h:6
-#, fuzzy
-msgid "Display folders:"
-msgstr "Prikaži mape, ki se začnejo z:"
-
-#: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Pokaži možnosti"
-
-#: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "Prikaz"
-
-#: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "petek"
-
-#: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:13
-#, fuzzy
-msgid "News Feed Settings"
-msgstr "Nastavitve"
-
-#: my-evolution/my-evolution.glade.h:14
-#, fuzzy
-msgid "News Feeds"
-msgstr "Novičarski strežniki"
-
-#: my-evolution/my-evolution.glade.h:15
-#, fuzzy
-msgid "One day"
-msgstr "1 dan"
-
-#: my-evolution/my-evolution.glade.h:16
-#, fuzzy
-msgid "One month"
-msgstr "mesec"
-
-#: my-evolution/my-evolution.glade.h:17
-#, fuzzy
-msgid "One week"
-msgstr "1 teden"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:19
-#, fuzzy
-msgid "Schedule"
-msgstr ""
-"Načrtuj\n"
-"čas"
-
-#: my-evolution/my-evolution.glade.h:20
-#, fuzzy
-msgid "Show all tasks"
-msgstr "Kaži vse"
-
-#: my-evolution/my-evolution.glade.h:21
-#, fuzzy
-msgid "Show full path for folders"
-msgstr "Kaži celotne _glave"
-
-#: my-evolution/my-evolution.glade.h:22
-msgid "Show today's tasks"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "Tasks "
-msgstr "Naloge"
-
-#: my-evolution/my-evolution.glade.h:24
-#, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  Enota:  "
-
-#: my-evolution/my-evolution.glade.h:25
-#, fuzzy
-msgid "Weather"
-msgstr "Moje vreme"
-
-#: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "Preveri nastavitve"
-
-#: my-evolution/my-evolution.glade.h:27
-#, fuzzy
-msgid "imperial"
-msgstr "april"
-
-#: my-evolution/my-evolution.glade.h:28
-msgid "metric"
-msgstr ""
-
-#: 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"
@@ -9315,12 +8432,7 @@ msgstr "Kaži podrobnosti"
 msgid "Cancel Operation"
 msgstr "Prekliči operacijo"
 
-#: shell/e-local-storage.c:554
-#, fuzzy
-msgid "Local Folders"
-msgstr "Posebne mape"
-
-#: shell/e-setup.c:125 shell/e-setup.c:196
+#: shell/e-setup.c:125 shell/e-setup.c:198
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
@@ -9341,17 +8453,21 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno prenoviti datotek"
 
-#: shell/e-setup.c:200
+#: shell/e-setup.c:173 shell/e-setup.c:241
+msgid "Evolution files successfully installed."
+msgstr "Evolucijine datoteke so se uspešno namestile."
+
+#: shell/e-setup.c:202
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Kaže, da je to vaš prvi zagon Evolucije."
 
-#: shell/e-setup.c:201
+#: shell/e-setup.c:203
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških datotek "
 "pod"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:222
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -9362,14 +8478,16 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:235
-#, fuzzy, c-format
+#: shell/e-setup.c:237
+#, c-format
 msgid ""
-"An error occurred in copying files into\n"
+"Cannot copy files into\n"
+"`%s'."
+msgstr ""
+"Ne morem kopirati datotek v\n"
 "`%s'."
-msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:304
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9380,7 +8498,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:318
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9394,7 +8512,7 @@ msgstr ""
 "lahko Evolucija požene.\n"
 "Želite, da odstranim ta imenik?"
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:343
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9405,56 +8523,56 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-shell-folder-commands.c:160
-#, fuzzy
-msgid "Cannot move a folder over itself."
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: shell/e-shell-folder-commands.c:162
-#, fuzzy
-msgid "Cannot copy a folder over itself."
-msgstr ""
-"Ne morem kopirati datotek v\n"
-"`%s'."
+#: 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:176
-msgid "Cannot move a folder into one of its descendants."
+#: 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:270
+#: shell/e-shell-folder-commands.c:242
 #, 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:275
+#: shell/e-shell-folder-commands.c:247
 msgid "Copy folder"
 msgstr "Kopiraj mapo"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:285
 #, 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:318
+#: shell/e-shell-folder-commands.c:290
 msgid "Move folder"
 msgstr "Prestavi mapo"
 
-#: shell/e-shell-folder-commands.c:354
+#. Popup a dialog asking if they are sure they want to delete
+#. the folder
+#: shell/e-shell-folder-commands.c:324
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Zbriši mapo '%s'"
 
-#: shell/e-shell-folder-commands.c:363
+#: shell/e-shell-folder-commands.c:332
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Ste prepričani, da želite zbrisati mapo '%s'?"
 
-#: shell/e-shell-folder-commands.c:422
+#: shell/e-shell-folder-commands.c:390
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Preimenuj mapo '%s'"
 
-#: shell/e-shell-folder-creation-dialog.c:111
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9463,11 +8581,11 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "Izbrano ime mape ni veljavno."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:263
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
@@ -9479,11 +8597,11 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:332
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
@@ -9592,19 +8710,51 @@ msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-view-menu.c:181
+#: 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)."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:188
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:233
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Avtorske pravice pridržane 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:235
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9614,87 +8764,55 @@ msgstr ""
 "GNOME za delo v skupinah, za pošto, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:464
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:465
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo želite odpreti"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:610
 msgid "Create a new shortcut"
 msgstr "Ustvari novo bližnjico"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:611
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Izberite mapo na katero naj kaže bližnjica:"
 
-#: shell/e-shell-view-menu.c:689
-#, fuzzy
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:718
+msgid "Work online"
 msgstr "Delaj na mreži"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
-msgid "Work Offline"
+#: 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.c:175
-msgid "(No folder displayed)"
-msgstr "(Nobena mapa ni prikazana)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
-msgid "My Evolution"
-msgstr "Moja Evolucija"
-
-#: shell/e-shell-view.c:1411
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolucija %s"
-
-#: shell/e-shell-view.c:1413
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolucija %s [%s]"
-
-#: shell/e-shell-view.c:1451
-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:1458
-msgid "Evolution is in the process of going offline."
-msgstr "Evolucija je v procesu odklapljanja z mreže."
+#: shell/e-shortcuts.c:601
+msgid "Error saving shortcuts."
+msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-shell-view.c:1464
-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-shortcuts.c:998
+msgid "Shortcuts"
+msgstr "Bližnjice"
 
-#: shell/e-shell.c:446
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+#: shell/e-shortcuts.c:1000
+msgid "Inbox"
+msgstr "Dohodna pošta"
 
-#: shell/e-shell.c:1311
-#, 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-shortcuts.c:1003
+msgid "Contacts"
+msgstr "Stik"
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shortcuts-view.c:136
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:139
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:262
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9703,191 +8821,156 @@ msgstr ""
 "Zares želite odstraniti skupino\n"
 "`%s' iz vrstice bližnjic?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:267
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:292
 msgid "Rename Shortcut Group"
 msgstr "Preimenuj skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:293
 msgid "Rename selected shortcut group to:"
 msgstr "Preimenuj izbrano skupino bližnjic v:"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:303
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:304
 msgid "Show the shortcuts as small icons"
 msgstr "Kaži bližnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:306
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:307
 msgid "Show the shortcuts as large icons"
 msgstr "Kaži bližnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:318
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:319
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:332
-#, fuzzy
-msgid "_Remove this Group..."
+#: shell/e-shortcuts-view.c:321
+msgid "_Remove This Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:322
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:335
-#, fuzzy
-msgid "Re_name this Group..."
+#: shell/e-shortcuts-view.c:324
+msgid "Re_name This Group..."
 msgstr "_Preimenuj to skupino..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:325
 msgid "Rename this shortcut group"
 msgstr "Preimenuj to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:330
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:331
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:450
 msgid "Rename shortcut"
 msgstr "Preimenuj bližnjico"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:451
 msgid "Rename selected shortcut to:"
 msgstr "Preimenuj izbrano bližnjico v:"
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Odpri"
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:463
 msgid "Open the folder linked to this shortcut"
 msgstr "Odpri mapo povezano s to bližnjico"
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:465 ui/evolution.xml.h:24
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:465
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Odpri mapo povezano s to bližnjico v novem oknu"
 
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:468
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:468
 msgid "Rename this shortcut"
 msgstr "Preimenuj to bližnjico"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:470
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
-#: shell/e-shortcuts.c:585
-msgid "Error saving shortcuts."
-msgstr "Napaka ob shranjevanju bližnjic."
-
-#: shell/e-shortcuts.c:982
-msgid "Shortcuts"
-msgstr "Bližnjice"
-
-#: shell/e-shortcuts.c:984
-msgid "Inbox"
-msgstr "Dohodna pošta"
-
-#: shell/e-shortcuts.c:987
-msgid "Contacts"
-msgstr "Stik"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:477
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "Generična napaka"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "Izbran tip mape ni veljaven"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:475
+msgid "Permission denied"
+msgstr "Nimate dovoljenja"
+
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
-#: shell/e-task-widget.c:168
+#: shell/e-task-widget.c:167
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:172
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-#, fuzzy
-msgid "Active connections"
-msgstr "Prekinjam povezave..."
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr ""
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-#, fuzzy
-msgid "Host"
-msgstr "Gostitelj:"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
-msgid "The following connections are currently active:"
-msgstr ""
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ime mape:"
@@ -9900,6 +8983,10 @@ 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. "
@@ -9930,26 +9017,22 @@ msgstr "Uvozniki"
 msgid "Don't import"
 msgstr "Ne uvozi"
 
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Ne sprašuj me več"
-
-#: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
-msgstr ""
-
-#: shell/main.c:96
-#, fuzzy, no-c-format
+#: shell/main.c:89
+#, no-c-format
 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. \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"
 "\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"
+"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"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -9971,7 +9054,7 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:117
+#: shell/main.c:114
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9979,28 +9062,28 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:155
+#: shell/main.c:152
 msgid "Cannot access the Evolution shell."
 msgstr "Ne morem dostopati do lupine Evolucije."
 
-#: shell/main.c:215
+#: shell/main.c:212
 msgid "Disable splash screen"
 msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:216
+#: shell/main.c:213
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
 
-#: shell/main.c:255
+#: shell/main.c:248
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
-#: 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:1 ui/evolution-calendar.xml.h:3
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_Izreži"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
@@ -10012,11 +9095,7 @@ msgstr "Ustvari nov stik"
 msgid "Create new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: 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
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
@@ -10032,11 +9111,7 @@ msgstr "Nov stik"
 msgid "New list"
 msgstr "Nov seznam"
 
-#: 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:17
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
 msgid "Paste the clipboard"
 msgstr "Prilepi odložišče"
 
@@ -10076,8 +9151,19 @@ msgstr "_Stik"
 msgid "_Contact Group"
 msgstr "Skupina _stikov"
 
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
-#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#: 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: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
 msgid "_Print..."
 msgstr "Na_tisni..."
 
@@ -10089,132 +9175,171 @@ msgstr "_Išči po kontaktih"
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:64
 msgid "_Tools"
 msgstr "_Orodja"
 
+#: ui/evolution-calendar.xml.h:1
+msgid "5 Days"
+msgstr "5 dni"
+
 #: ui/evolution-calendar.xml.h:2
-#, fuzzy
-msgid "Configure the calendar's settings"
-msgstr "Nastavi veznik adresarja"
+msgid "Alter preferences"
+msgstr "Alternativne nastavitve"
 
-#: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a New All-Day _Event"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create a new all day Event"
 msgstr "Ustvari nov celodnevni dogodek"
 
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Ustvari nov zmenek"
-
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:8
 msgid "Create a new appointment"
 msgstr "Ustvari nov zmenek"
 
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Create an event for the whole day"
-msgstr "Ustvari nov zmenek za danes"
+#: ui/evolution-calendar.xml.h:9
+msgid "Create a new calendar"
+msgstr "Ustvari nov koledar"
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr "Dan"
+
+#: ui/evolution-calendar.xml.h:13
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back in time"
 msgstr "Pojdi po času nazaj"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward in time"
 msgstr "Pojdi po času naprej"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:17
+msgid "Go to _Today"
+msgstr "Pojdi na _danes"
+
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to present time"
 msgstr "Pojdi na sedanjost"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
-msgstr "Nov zmenek"
+#: ui/evolution-calendar.xml.h:20
+msgid "Month"
+msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:18
+#: 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:29
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:32
 msgid "Print calendar"
 msgstr "Natisni koledar"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:33
 msgid "Print this Calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:34
 msgid "Publish Free/Busy Information"
 msgstr "Objavi podatek o zasedenosti"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:35
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatek o zasedenosti za ta koledar"
 
-#: ui/evolution-calendar.xml.h:24
+#: 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:25
+#: ui/evolution-calendar.xml.h:40
 msgid "Show 1 month"
 msgstr "Kaži en mesec"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:41
 msgid "Show 1 week"
 msgstr "Kaži en teden"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:42
 msgid "Show the working week"
 msgstr "Pokaži delavni teden"
 
-#: ui/evolution-calendar.xml.h:28
+#: 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:29
-#, fuzzy
-msgid "_Appointment..."
-msgstr "_Zmenek"
+#: ui/evolution-calendar.xml.h:45
+msgid "Week"
+msgstr "Teden"
 
-#: ui/evolution-calendar.xml.h:30
-#, fuzzy
-msgid "_Calendar Settings..."
-msgstr "_Nastavive pošte..."
+#: ui/evolution-calendar.xml.h:46
+msgid "_Appointment"
+msgstr "_Zmenek"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:48
 msgid "_Day"
 msgstr "_Dan"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:49
 msgid "_Month"
 msgstr "_Mesec"
 
-#: ui/evolution-calendar.xml.h:37
+#: 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:56
 msgid "_Week"
 msgstr "_Teden"
 
-#: 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:1
+msgid "C_lose"
+msgstr "_Zapri"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
@@ -10225,7 +9350,7 @@ msgid "Delete this appointment"
 msgstr "Zbriši ta zmenek"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
@@ -10233,7 +9358,7 @@ msgstr "Glavna orodna vrstica"
 msgid "Preview the printed item"
 msgstr "Predogled natisnjenega predmeta"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#: ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
 
@@ -10242,15 +9367,22 @@ 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
 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
 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:5
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save and Close"
 msgstr "Shrani in zapri"
 
@@ -10270,15 +9402,18 @@ msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
 msgid "_Action"
 msgstr "_Dejanje"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:9
+#: 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:48
 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"
@@ -10293,12 +9428,13 @@ msgid "Help"
 msgstr "Pomoč"
 
 #: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "Natisni kuverto..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "Shrani _kot..."
 
@@ -10319,31 +9455,26 @@ msgid "Send _message to contact..."
 msgstr "Pošlji _sporočilo stiku..."
 
 #: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:14
 #: 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
-#, fuzzy
-msgid "Delete this list"
-msgstr "Zbriši ta predmet"
+msgid "Delete this group"
+msgstr "Zbriši to skupino"
 
-#: ui/evolution-contact-list-editor.xml.h:6
-#, fuzzy
-msgid "Save the list and close the dialog box"
-msgstr "Shrani stik in zapri dialog"
+#: 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:7
-#, fuzzy
-msgid "Se_nd list to other..."
-msgstr "Pošlji stik drugim..."
+#: 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
-#, fuzzy
-msgid "Send _message to list..."
-msgstr "Pošlji _sporočilo stiku..."
+#: ui/evolution-contact-list-editor.xml.h:11
+msgid "Send _message to group..."
+msgstr "Pošlji _sporočilo skupini..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -10378,7 +9509,7 @@ 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:40
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Actions"
 msgstr "_Dejanja"
 
@@ -10399,83 +9530,78 @@ msgid "Compose"
 msgstr "Sestavi"
 
 #: ui/evolution-mail-global.xml.h:4
-#, fuzzy
-msgid "Compose _New Message"
-msgstr "Sestavi novo sporočilo"
-
-#: ui/evolution-mail-global.xml.h:5
 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
+#: 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"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Ustvari ali uredi določitve navideznih map"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Sprazni _smeti"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail-global.xml.h:10
+#: 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:11
+#: ui/evolution-mail-global.xml.h:10
 msgid "Manage _Subscriptions..."
 msgstr "Uredi _naročnine..."
 
-#: ui/evolution-mail-global.xml.h:12
+#: 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"
 
-#: ui/evolution-mail-global.xml.h:13
+#: 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"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ui/evolution-mail-global.xml.h:15
+#: 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"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "Kaži okno predogleda sporočila"
 
-#: ui/evolution-mail-global.xml.h:17
+#: 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"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Settings..."
 msgstr "_Nastavive pošte..."
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
@@ -10500,8 +9626,7 @@ msgid "Hide _Deleted Messages"
 msgstr "Skrij _zbrisana sporočila"
 
 #: ui/evolution-mail-list.xml.h:8
-#, fuzzy
-msgid "Hide _Read Messages"
+msgid "Hide _Read messages"
 msgstr "Skrij _prebrana sporočila"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -10569,7 +9694,7 @@ msgstr "Niten seznam sporočil"
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:49
 msgid "_Folder"
 msgstr "_Mapa"
 
@@ -10577,7 +9702,7 @@ msgstr "_Mapa"
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:59
 msgid "_Properties..."
 msgstr "_Lastnosti..."
 
@@ -10670,23 +9795,19 @@ msgid "Display the previous unread message"
 msgstr "Kaži prejšnje neprebrano sporočilo"
 
 #: ui/evolution-mail-message.xml.h:24
-#, fuzzy
-msgid "Filter on Mailing _List..."
+msgid "Filter on Mailing _List"
 msgstr "Filter glede na p_oštni seznam"
 
 #: ui/evolution-mail-message.xml.h:25
-#, fuzzy
-msgid "Filter on Se_nder..."
+msgid "Filter on Se_nder"
 msgstr "Filter glede na pošilja_telja"
 
 #: ui/evolution-mail-message.xml.h:26
-#, fuzzy
-msgid "Filter on _Recipients..."
+msgid "Filter on _Recipients"
 msgstr "Filter glede na preje_mnike"
 
 #: ui/evolution-mail-message.xml.h:27
-#, fuzzy
-msgid "Filter on _Subject..."
+msgid "Filter on _Subject"
 msgstr "Filter glede na za_devo"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -10729,238 +9850,198 @@ msgstr "Nekomu posreduj izbrano sporočilo"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Nekomu posreduj izbrano sporočilo kot prilogo"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:38
 msgid "Load _Images"
 msgstr "Naloži _slike"
 
-#: ui/evolution-mail-message.xml.h:41
-#, fuzzy
-msgid "Mark as I_mportant"
-msgstr "Označi kot po_membno"
+#: ui/evolution-mail-message.xml.h:39
+msgid "Mar_k As Read"
+msgstr "Označi _kot prebrano"
 
-#: ui/evolution-mail-message.xml.h:43
-#, fuzzy
-msgid "Mark as Unimp_ortant"
+#: ui/evolution-mail-message.xml.h:40
+msgid "Mark As I_mportant"
 msgstr "Označi kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:44
+#: 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"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark the selected messages as important"
 msgstr "Označi izbrana sporočila kot pomembna"
 
-#: ui/evolution-mail-message.xml.h:46
+#: 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"
 
-#: ui/evolution-mail-message.xml.h:47
-#, fuzzy
-msgid "Mark the selected messages as unimportant"
-msgstr "Označi izbrana sporočila kot pomembna"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages for deletion"
 msgstr "Označi izbrana sporočila za brisanje"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:46
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:47
 msgid "Move selected messages to another folder"
 msgstr "Prestavi izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:51
-msgid "Next"
-msgstr "Naslednje"
-
-#: ui/evolution-mail-message.xml.h:52
-#, fuzzy
-msgid "Next Important Message"
-msgstr "Naslednje sporočilo"
-
-#: ui/evolution-mail-message.xml.h:53
-#, fuzzy
-msgid "Next Message"
-msgstr "Naslednje sporočilo"
-
-#: ui/evolution-mail-message.xml.h:54
-#, fuzzy
-msgid "Next Thread"
-msgstr "Izberi ni_t"
-
-#: ui/evolution-mail-message.xml.h:55
-#, fuzzy
-msgid "Next Unread Message"
-msgstr "Naslednje sporočilo"
-
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:49
 msgid "Open the selected message in a new window"
 msgstr "Odpri izbrano sporočilo v novem oknu"
 
-#: ui/evolution-mail-message.xml.h:57
+#: 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"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:51
 msgid "Previews the message to be printed"
 msgstr "Predogled sporočika, ki bo natisnjeno"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:52
 msgid "Previous"
 msgstr "Prejšnje"
 
-#: ui/evolution-mail-message.xml.h:60
-#, fuzzy
-msgid "Previous Important Message"
-msgstr "Prejšnje sporočilo"
-
-#: ui/evolution-mail-message.xml.h:61
-#, fuzzy
-msgid "Previous Message"
-msgstr "Prejšnje sporočilo"
-
-#: ui/evolution-mail-message.xml.h:62
-#, fuzzy
-msgid "Previous Unread Message"
-msgstr "Prejšnje sporočilo"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:54
 msgid "Print Message..."
 msgstr "Natisni sporočilo..."
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:55
 msgid "Print Preview..."
 msgstr "Predogled tiskanja..."
 
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
-msgid "Print this message"
-msgstr "Natisni sporočilo"
+#: ui/evolution-mail-message.xml.h:56
+msgid "Print message to the printer"
+msgstr "Natisni sporočilo na tiskalniku"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:57
+msgid "Redirect (FIXME: implement me)"
+msgstr "Preusmeri (FIXME: implementiraj me)"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:59
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:62
 msgid "S_earch Message"
 msgstr "_Išči v sporočilu"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:63
 msgid "Save the message as a text file"
 msgstr "Shrani sporočilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:64
 msgid "Search for text in the body of the displayed message"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:65
 msgid "Show Email _Source"
 msgstr "Kaži _izvor pošte"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:66
 msgid "Show Full _Headers"
 msgstr "Kaži celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:67
 msgid "Show message in the normal style"
 msgstr "Kaži sporočila v običajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:68
 msgid "Show message with all email headers"
 msgstr "Kaži sporočila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:69
 msgid "Show the raw email source of the message"
 msgstr "Kaži neposredno izvorno kodo sporočila"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:70
 msgid "Un-delete the selected messages"
 msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:71
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na poštni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:72
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _pošiljatelja..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:73
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:74
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:75
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:76
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:77
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:79
 msgid "_Forward Message"
 msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:80
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:81
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:82
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:83
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail-message.xml.h:93
+#: 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:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+#: 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:11
+#: 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:12
+#: 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:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Zapri"
 
 #: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:65
 msgid "_View"
 msgstr "Po_gled"
 
@@ -10968,7 +10049,11 @@ msgstr "Po_gled"
 msgid "Attach"
 msgstr "Priloži"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Priloži datoteko"
+
+#: ui/evolution-message-composer.xml.h:4
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
@@ -10993,57 +10078,50 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-#, fuzzy
-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
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert text file..."
 msgstr "Vstavi datoteko z besedilom..."
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Odpri datoteko"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "Šifriraj s PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "Podpis s PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
 msgstr "Šifriraj z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Sign"
 msgstr "Podpis z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+#: 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:22
+#: ui/evolution-message-composer.xml.h:21
 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"
 
@@ -11116,36 +10194,33 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Preklopi prikaz polja Odgovori na"
 
 #: ui/evolution-message-composer.xml.h:42
-#, fuzzy
-msgid "_Attachment..."
-msgstr "_Priloga"
-
-#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Polje _bcc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr "Polje _cc"
 
-#: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Debug"
 msgstr "_Razhroščuj"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Delete all"
 msgstr "_Zbriši vse"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "Polje _od"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
 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..."
@@ -11158,10 +10233,6 @@ msgstr "Polje _Odgovori-na:"
 msgid "_Security"
 msgstr "_Varnost"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
-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"
@@ -11203,42 +10274,40 @@ msgid "Re_fresh Task"
 msgstr "Osveži opravilo"
 
 #: ui/evolution-tasks.xml.h:2
-#, fuzzy
-msgid "Configure the task view's settings"
-msgstr "Nastavi veznik adresarja"
-
-#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiraj izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:4
 msgid "Cut selected task"
 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:9
+#: ui/evolution-tasks.xml.h:8
 msgid "Paste task from the clipboard"
 msgstr "Prilepi opravilo z odložišča"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:10
 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
-#, fuzzy
-msgid "Tasks Settings"
-msgstr "_Nastavive pošte..."
+msgid "TasksPreferences"
+msgstr "Nastavitve opravil..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -11256,179 +10325,183 @@ msgstr "Dodaj v vrstico z _bližnjicami"
 msgid "Change the name of this folder"
 msgstr "Spremeni ime te mape"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:4
+msgid "Change the properties for this folder"
+msgstr "Spremeni lastnosti te mape"
+
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopiraj mapo"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Ustvari _novo mapo..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Ustvari bližnjico na to mapo v vrstici bližnjic"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Ustvari novo mapo"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:14
 msgid "Delete this folder"
 msgstr "Zbriši to mapo"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:15
 msgid "Display a different folder"
 msgstr "Pokaži drugo mapo"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:16
 msgid "E_xit"
 msgstr "Iz_hod"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:17
 msgid "Evolution _FAQ"
 msgstr "_Pogosto zastavljena vprašanja"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Evolution _Window"
 msgstr "_Okno Evolucije"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Getting _Started"
 msgstr "Kako _začeti"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Import an external file format"
 msgstr "Uvozi datoteko zunanje oblike"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "Move this folder to another place"
 msgstr "Prestavi to mapo na drugo mesto"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "Open in New _Window"
 msgstr "Odpri v novem _oknu"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "Show information about Evolution"
 msgstr "Kaži podatke o Evoluciji"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:29
+#: 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:30
+#: ui/evolution.xml.h:31
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:34
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mrežo"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 msgid "Using the _Mailer"
 msgstr "Uporaba _pošte"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:38
 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
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:42
 msgid "_Appointment (FIXME)"
 msgstr "_Zmenek (FIXME)"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:44
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:50
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Import file..."
 msgstr "_Uvozi datoteko..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Mail message"
 msgstr "_Pošlji sporočilo"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:56
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:56
-msgid "_New"
-msgstr "_Nova"
-
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:60
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:61
 msgid "_Shortcut"
 msgstr "_Bližnjica"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:62
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bližnjicami"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:63
 msgid "_Task (FIXME)"
 msgstr "_Naloga (FIXME)"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:66
 msgid "_Work Offline"
 msgstr "_Delaj brez mreže"
 
@@ -11452,6 +10525,22 @@ 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"
@@ -11472,12 +10561,9 @@ msgstr "Sporočila"
 msgid "With Category"
 msgstr "S kategorijo"
 
-#. 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:392
+msgid "Tentative"
+msgstr "Poskusno"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -11551,6 +10637,13 @@ msgstr "Čas zaključka sestanka:"
 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"
+
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Trenutni pogled"
@@ -11561,18 +10654,19 @@ 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:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PTSČPSN"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
 msgid "Now"
 msgstr "Sedaj"
 
-#: 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:248
 msgid "OK"
 msgstr "V redu"
@@ -11659,24 +10753,19 @@ msgstr "Nabor znakov"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
-#, fuzzy
-msgid "Search Editor"
-msgstr "Urejevalnik stikov"
-
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:167
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.c:241
+#: widgets/misc/e-filter-bar.c:238
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: widgets/misc/e-filter-bar.h:102
+#: 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:104
+#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Napredno..."
 
@@ -11729,278 +10818,6 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
-#~ msgid "Set task view preferences"
-#~ msgstr "Nastavi pogled opravila"
-
-#~ msgid "TasksPreferences"
-#~ msgstr "Nastavitve opravil..."
-
-#~ msgid "???"
-#~ msgstr "???"
-
-#~ msgid "C_ontacts..."
-#~ msgstr "_Stiki..."
-
-#~ msgid "_Company:"
-#~ msgstr "_Podjetje:"
-
-#~ msgid "(none)"
-#~ msgstr "(brez)"
-
-#~ 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 "Show a dialog"
-#~ msgstr "Kaži dialog"
-
-#~ msgid "Percent complete"
-#~ msgstr "Procentov opravljeno"
-
-#~ msgid "Edit this task"
-#~ msgstr "Uredi to opravilo"
-
-#~ msgid "Go to Today"
-#~ msgstr "Pojdi na danes"
-
-#~ msgid "Delete all Occurrences"
-#~ msgstr "Zbriši vse pojavitve"
-
-#~ msgid "Summary contains"
-#~ msgstr "Povzetek vsebuje"
-
-#~ msgid "Description contains"
-#~ msgstr "Opis vsebuje"
-
-#~ msgid "Comment contains"
-#~ msgstr "Komentar vsebuje"
-
-#~ msgid "Has category"
-#~ msgstr "Ima kategorijo"
-
-#~ msgid "time-now expects 0 arguments"
-#~ msgstr "time-now ne pričakuje argumentov"
-
-#~ msgid "make-time expects 1 argument"
-#~ msgstr "make-time pričakuje 1 argument"
-
-#~ msgid "make-time expects argument 1 to be a string"
-#~ msgstr "make-time pričakuje, da je 1. argument niz"
-
-#~ 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"
-
-#~ msgid "time-add-day expects 2 arguments"
-#~ msgstr "time-add-day pričakuje 2 argumenta"
-
-#~ msgid "time-add-day expects argument 1 to be a time_t"
-#~ msgstr "time-add-day pričakuje, da je 1. argument time_t"
-
-#~ msgid "time-add-day expects argument 2 to be an integer"
-#~ msgstr "time-add-day pričakuje, da je 2. argument celo število (integer)"
-
-#~ msgid "time-day-begin expects 1 argument"
-#~ msgstr "time-day-begin pričakuje 1 argument"
-
-#~ msgid "time-day-begin expects argument 1 to be a time_t"
-#~ msgstr "time-day-begin pričakuje, da je 1. argument time_t"
-
-#~ msgid "time-day-end expects 1 argument"
-#~ msgstr "time-day-end pričakuje 1 argument"
-
-#~ msgid "time-day-end expects argument 1 to be a time_t"
-#~ msgstr "time-day-end pričakuje, da je 1. argument time_t"
-
-#~ msgid "get-vtype expects 0 arguments"
-#~ msgstr "get-vtype ne pričakuje argumentov"
-
-#~ msgid "occur-in-time-range? expects 2 arguments"
-#~ msgstr "occur-in-time-range? pričakuje 2 argumenta"
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "contains? expects 2 arguments"
-#~ msgstr "contains? pričakuje 2 argumenta"
-
-#~ msgid "contains? expects argument 1 to be a string"
-#~ msgstr "contains? pričakuje, da je 1. argument niz"
-
-#~ msgid "contains? expects argument 2 to be a string"
-#~ msgstr "contains? pričakuje, da je 2. argument niz"
-
-#~ 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\" (povzetek), \"description\"(opis)"
-
-#~ msgid "has-categories? expects at least 1 argument"
-#~ msgstr "has-categories? pričakuje vsaj 1 argument"
-
-#~ msgid "has-categories? expects all arguments to be strings"
-#~ msgstr "has-categories? pričakuje, da so vsi argumenti nizi"
-
-#~ 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)"
-
-#~ 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 "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 "[%s] (forwarded message)"
-#~ msgstr "[%s] (posredovano sporočilo)"
-
-#~ msgid "Fwd: (no subject)"
-#~ msgstr "Posreduj: (ni zadeve)"
-
-#~ 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 "<b>Error downloading Metar</b>"
-#~ msgstr "<b>Napaka ob prenašanju Metar</b>"
-
-#~ msgid "Evolution files successfully installed."
-#~ msgstr "Evolucijine datoteke so se uspešno namestile."
-
-#~ msgid "5 Days"
-#~ msgstr "5 dni"
-
-#~ msgid "Alter preferences"
-#~ msgstr "Alternativne nastavitve"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "Ustvari nov koledar"
-
-#~ msgid "Day"
-#~ msgstr "Dan"
-
-#~ msgid "Month"
-#~ msgstr "Mesec"
-
-#~ msgid "New _Event"
-#~ msgstr "Nov _dogodek"
-
-#~ msgid "Open Calendar"
-#~ msgstr "Odpri koledar"
-
-#~ msgid "Prev"
-#~ msgstr "Nazaj"
-
-#~ msgid "Save calendar as something else"
-#~ msgstr "Shrani koledar kot nekaj drugega"
-
-#~ msgid "Settings..."
-#~ msgstr "Nastavitve..."
-
-#~ msgid "Week"
-#~ msgstr "Teden"
-
-#~ msgid "_Open Calendar"
-#~ msgstr "Odpri ko_ledar"
-
-#~ 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 "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 "Save in _folder... (FIXME)"
-#~ msgstr "Shrani v _mapo... (FIXME)"
-
-#~ msgid "_Insert text file..."
-#~ msgstr "_Vstavi datoteko z besedilom..."
-
-#~ msgid "Tasks Preferences..."
-#~ msgstr "Nastavitve poslov..."
-
-#~ msgid "Change the properties for this folder"
-#~ msgstr "Spremeni lastnosti te mape"
-
 #~ msgid "As _Minicards"
 #~ msgstr "Kot _minivizitke"
 
@@ -12010,15 +10827,24 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Find..."
 #~ msgstr "Poišči..."
 
+#~ msgid "%A, %e %B %Y"
+#~ msgstr "%A, %e %B %Y"
+
 #~ 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"
+
 #~ msgid "Colors"
 #~ msgstr "Barve"
 
+#~ msgid "Display options"
+#~ msgstr "Pokaži možnosti"
+
 #~ msgid "Enable snoozing for"
 #~ msgstr "Omogoči podaljšanje spanja za"
 
@@ -12052,6 +10878,18 @@ 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"
 
@@ -12064,6 +10902,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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."
+
 #~ msgid "I couldn't open your calendar file!\n"
 #~ msgstr "Nisem mogel odpreti datoteke koledarja!\n"
 
@@ -12088,12 +10929,21 @@ 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"
 
@@ -12107,6 +10957,15 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "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: "
 
@@ -12117,6 +10976,25 @@ 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"
 
@@ -12205,6 +11083,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "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."
+
 #~ msgid "%I:%M:%S %p%n"
 #~ msgstr "%I:%M:%S %p%n"
 
@@ -12303,6 +11184,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Update automatically"
 #~ msgstr "Samodejno posodobi"
 
+#~ msgid "Update every "
+#~ msgstr "Posodobi vsakih"
+
 #~ msgid "PGP"
 #~ msgstr "PGP"
 
@@ -12321,6 +11205,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
+
 #~ msgid "Activate"
 #~ msgstr "Aktiviraj"
 
@@ -12384,6 +11274,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
 
@@ -12495,6 +11388,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
@@ -12522,6 +11418,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
+
 #~ msgid "Configure Folder..."
 #~ msgstr "Nastavi mapo..."
 
@@ -12580,9 +11479,15 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "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"
+
 #~ msgid "_Reply"
 #~ msgstr "_Odgovori"
 
@@ -12647,8 +11552,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "ČISTO"
 
 #~ msgid ""
-#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
-#~ "the server supports it."
+#~ "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."
@@ -12669,23 +11574,23 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Varni POP"
 
 #~ msgid ""
-#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
-#~ "also be used to retrieve mail from certain web mail providers and "
+#~ "For connecting to POP servers over an SSL connection. 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 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."
+#~ "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"
 
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-#~ "connection.\n"
+#~ "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 uporabo "
-#~ "SMTP preko povezave SSL.\n"
+#~ "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"
@@ -12700,12 +11605,18 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Advanced"
 #~ msgstr "Napredno"
 
+#~ msgid "Check settings"
+#~ msgstr "Preveri nastavitve"
+
 #~ msgid "Email address:"
 #~ msgstr "E-poštni naslov:"
 
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Nastavitev Evolucijine pošte"
 
+#~ msgid "Hostname:"
+#~ msgstr "Ime gostitelja:"
+
 #~ msgid "IMAP"
 #~ msgstr "IMAP"
 
@@ -12752,8 +11663,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."
@@ -12834,6 +11745,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "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 "
 
@@ -12877,8 +11791,9 @@ 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 SMTP."
+#~ "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"
@@ -12997,6 +11912,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Show the _Shortcut Bar"
 #~ msgstr "Kaži vrstico z bližnjicami"
 
+#~ msgid "Saving changes to message..."
+#~ msgstr "Shranjujem spremembe sporočila..."
+
 #~ msgid "Save changes to message..."
 #~ msgstr "Shranjujem spremembe sporočila..."
 
@@ -13027,6 +11945,9 @@ 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\""
 
@@ -13077,6 +11998,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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:"
 
@@ -13121,6 +12045,9 @@ 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"
@@ -13335,6 +12262,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
@@ -13418,8 +12348,8 @@ 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 znotraj "
-#~ "Evolucije.\n"
+#~ "Ta zmenek 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 "
 #~ "koledarja."
@@ -13511,6 +12441,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "twelfth"
 #~ msgstr "dvanajsti"
 
+#~ msgid "ago"
+#~ msgstr "nazaj"
+
 #~ msgid "Create to-do item"
 #~ msgstr "Ustvari opravilo"
 
@@ -13584,6 +12517,9 @@ 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"
 
@@ -13600,8 +12536,8 @@ 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 na "
-#~ "krajevni disk."
+#~ "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"
@@ -13631,17 +12567,20 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
 
 #~ 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."
+#~ "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"
@@ -13650,11 +12589,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Tip izvora pošte:"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
+#~ "Select the kind of mail server you have, and enter the relevant "
+#~ "information about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
+#~ "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  "
 #~ "potrebne podatke.\n"
@@ -13663,11 +12602,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
 
 #~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
+#~ "Select the kind of news server you have, and enter the relevant "
+#~ "information about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
+#~ "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  "
 #~ "potrebne podatke.\n"
@@ -13687,6 +12626,9 @@ 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"
 
@@ -13716,6 +12658,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Identities"
 #~ msgstr "Identitete"
 
+#~ msgid "News Servers"
+#~ msgstr "Novičarski strežniki"
+
 #~ msgid "News Sources"
 #~ msgstr "Viri novic"
 
@@ -13759,10 +12704,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Posreduj sporočilo \"%s\""
 
 #~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
+#~ "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\""
@@ -13809,6 +12755,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Rebuild message view"
 #~ msgstr "Obnovi pogled sporočil"
 
+#~ msgid "Threading message list"
+#~ msgstr "Nitim seznam sporočil"
+
 #~ msgid "N_ew Directory Server"
 #~ msgstr "N_ov strežnik imenikov"
 
@@ -13881,6 +12830,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "New appointment for _today..."
 #~ msgstr "Nov zmenek za _danes..."
 
+#~ msgid "Create a new appointment for today"
+#~ msgstr "Ustvari nov zmenek za danes"
+
 #~ msgid "%s%s"
 #~ msgstr "%s%s"
 
@@ -13934,6 +12886,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Običajna\n"
 #~ "Nizka\n"
 
+#~ msgid "Resources:"
+#~ msgstr "Viri:"
+
 #~ msgid "Last Modification Date"
 #~ msgstr "Datum zadnje spremembe"
 
@@ -14161,5 +13116,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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."
+
 #~ msgid "Cannot initialize the configuration system."
 #~ msgstr "Ne morem inicializirati nastavitvenega sistema."