Updated Slovenian translation

svn path=/trunk/; revision=14784
author: Andraz Tori <minmax@src.gnome.org> 2001-11-25 07:26:44 +0800
committer: Andraz Tori <minmax@src.gnome.org> 2001-11-25 07:26:44 +0800
commit: 206cb91300b952f007e8eaa8384198ce7030219d (patch)
tree: 2f2c58e76e7838e6186f7821d6d1ad3923ea2d8c /po
parent: f345e6dfe37004d30934c2672a23dd02b3161adc (diff)
download: gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar
gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.gz
gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.bz2
gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.lz
gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.xz
gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.zst
gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.zip
1 files changed, 5950 insertions, 3769 deletions
diff --git a/po/sl.po b/po/sl.po
index 8f1d98294a..ad46f5c16d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-08-18 20:02+0200\n"
+"POT-Creation-Date: 2001-11-24 22:47+0100\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,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Tovarna uvozov datotek LDIF v Evolucijo."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr "Uvozi datoteke LDIF v Evolucijo. "
+
 #: 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."
@@ -21,11 +29,296 @@ msgstr "Tovarna uvozov datotek eVizitk v Evolucijo."
 msgid "Imports VCard files into Evolution."
 msgstr "Uvozi datoteke eVizitk v Evolucijo. "
 
-#: addressbook/backend/ebook/e-card.c:3595
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
+msgid "File As"
+msgstr "Zavedi kot"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+msgid "Name"
+msgstr "Ime"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
+msgid "Email"
+msgstr "E-pošta"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+msgid "Primary"
+msgstr "Prvi"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "Prvi"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1644
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Assistant"
+msgstr "Pomočnik"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1645
+#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+msgid "Business"
+msgstr "Služba"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+msgid "Bus"
+msgstr "Služ."
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1648
+msgid "Callback"
+msgstr "Povratni klic"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1650
+msgid "Company"
+msgstr "Podjetje"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+msgid "Comp"
+msgstr "Podj."
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1651
+#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+msgid "Home"
+msgstr "Doma"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
+msgid "Organization"
+msgstr "Organizacija"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
+msgid "Org"
+msgstr "Org."
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+msgid "Mobile"
+msgstr "Prenosni telefon"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1649
+msgid "Car"
+msgstr "Avto"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1647
+#: addressbook/gui/widgets/e-addressbook-view.c:863
+msgid "Business Fax"
+msgstr "Službeni faks"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+msgid "Bus Fax"
+msgstr "Služb. fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1653
+#: addressbook/gui/widgets/e-addressbook-view.c:864
+msgid "Home Fax"
+msgstr "Domači faks"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1646
+msgid "Business 2"
+msgstr "Služba"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+msgid "Bus 2"
+msgstr "Služba 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1652
+msgid "Home 2"
+msgstr "Doma 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1654
+#: addressbook/gui/widgets/e-addressbook-view.c:867
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1714
+#: mail/mail-config.glade.h:49
+msgid "Other"
+msgstr "Drugo"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:869
+msgid "Other Fax"
+msgstr "Drugi faks"
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Pager"
+msgstr "Pozivnik"
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1660
+#: addressbook/gui/widgets/e-addressbook-view.c:871
+msgid "Radio"
+msgstr "Radijo"
+
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1661
+#: addressbook/gui/widgets/e-addressbook-view.c:872
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1687
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+msgid "Email 2"
+msgstr "E-naslov 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1688
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+msgid "Email 3"
+msgstr "E-naslov 3"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+msgid "Web Site"
+msgstr "Spletna stran"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+msgid "Url"
+msgstr "Url"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
+msgid "Department"
+msgstr "Oddelek"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+msgid "Dep"
+msgstr "Odd."
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+msgid "Office"
+msgstr "Pisarna"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+msgid "Off"
+msgstr "Pisar."
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+msgid "Title"
+msgstr "Naziv"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
+msgid "Profession"
+msgstr "Poklic"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+msgid "Prof"
+msgstr "Pokl."
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Manager"
+msgstr "Upravljalec"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+msgid "Man"
+msgstr "Uprav."
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+msgid "Ass"
+msgstr "Pomoč."
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+msgid "Nickname"
+msgstr "Vzdevek"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+msgid "Nick"
+msgstr "Vzdevek"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+msgid "Spouse"
+msgstr "Partner(ka)"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
+msgid "Note"
+msgstr "Opomba"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "URI koledarja"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "CALUri"
+msgstr "URI koledarja"
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
+msgid "Free-busy URL"
+msgstr "URL zasedenosti"
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+msgid "FBUrl"
+msgstr "Url zased."
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Anniversary"
+msgstr "Obletnica"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Anniv"
+msgstr "Oblet."
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Birth Date"
+msgstr "Rojstni datum"
+
+#: addressbook/backend/ebook/e-card-simple.c:104
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "kategorije"
+
+#: addressbook/backend/ebook/e-card-simple.c:105
+msgid "Family Name"
+msgstr "Družinsko ime"
+
+#: addressbook/backend/ebook/e-card-simple.c:788
+#, c-format
+msgid "%x"
+msgstr "%x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3597
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +326,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +334,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +342,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +350,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -65,7 +358,7 @@ msgstr ""
 "\n"
 "  Družinsko:     "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -73,7 +366,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3616
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -81,7 +374,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -89,7 +382,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -97,7 +390,7 @@ msgstr ""
 "\n"
 "  Poštni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -105,7 +398,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +406,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -121,7 +414,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -129,7 +422,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -137,7 +430,7 @@ msgstr ""
 "\n"
 "  Poštna številka: "
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +438,7 @@ msgstr ""
 "\n"
 "  Država:      "
 
-#: addressbook/backend/ebook/e-card.c:3648
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,7 +446,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -161,7 +454,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -169,7 +462,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -177,7 +470,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -185,7 +478,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -193,7 +486,7 @@ msgstr ""
 "\n"
 "Poštni program: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -201,7 +494,7 @@ msgstr ""
 "\n"
 "Časovni pas: "
 
-#: addressbook/backend/ebook/e-card.c:3723
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -209,7 +502,7 @@ msgstr ""
 "\n"
 "Geografski položaj: "
 
-#: addressbook/backend/ebook/e-card.c:3727
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -217,7 +510,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3739
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -225,7 +518,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -233,7 +526,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -241,7 +534,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -249,7 +542,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -257,7 +550,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -265,7 +558,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -273,7 +566,7 @@ msgstr ""
 "\n"
 "Kategorije: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -291,7 +584,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3762
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -299,7 +592,7 @@ msgstr ""
 "\n"
 "Enoličen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3765
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -307,11 +600,11 @@ msgstr ""
 "\n"
 "Javni ključ: "
 
-#: addressbook/backend/ebook/e-card.c:4037
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Več eVizitk"
 
-#: addressbook/backend/ebook/e-card.c:4045
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "eVizitka za %s"
@@ -320,36 +613,84 @@ msgstr "eVizitka za %s"
 #: 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:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
-#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+#: addressbook/conduit/address-conduit.c:1533
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1130
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
-#: addressbook/conduit/address-conduit.c:201
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2215
+msgid "Searching..."
+msgstr "Iščem..."
+
+#: addressbook/backend/pas/pas-backend-file.c:261
+msgid "Loading..."
+msgstr "Nalagam..."
+
+#. need a different error message here.
+#: addressbook/backend/pas/pas-backend-file.c:270
+msgid "Error in search expression."
+msgstr "Napaka v iskalnem izrazu."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:475
+msgid "Connecting to LDAP server..."
+msgstr "Vzpostavljam povezavo s strežnikom LDAP..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:485
+msgid "Unable to connect to LDAP server."
+msgstr "Nisem se mogel povezati s strežnikom LDAP."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:501
+msgid "Waiting for connection to LDAP server..."
+msgstr "Čakam na povezavo s strežnikom LDAP..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:870
+msgid "Adding card to LDAP server..."
+msgstr "Dodajam vizitko v strežnik LDAP..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:971
+msgid "Removing card from LDAP server..."
+msgstr "Odstranjujem vizitko iz strežnika LDAP..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
+msgid "Modifying card from LDAP server..."
+msgstr "Spreminjam vizitko iz strežnika LDAP..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2160
+msgid "Receiving LDAP search results..."
+msgstr "Dobivam rezultate iskanja LDAP..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2165
+msgid "Restarting search."
+msgstr "Znova začenjam iskanje."
+
+#: addressbook/conduit/address-conduit.c:294
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel naložiti\n"
 
-#: addressbook/conduit/address-conduit.c:214
+#: addressbook/conduit/address-conduit.c:307
 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
+#: addressbook/conduit/address-conduit.c:1089
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:694
 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
+#: addressbook/conduit/address-conduit.c:1090
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:695
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:1120
+#: addressbook/conduit/address-conduit.c:1123
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
@@ -390,14 +731,45 @@ msgid "Factory for the Addressbook's address popup"
 msgstr "Tovarna za Adresarjev vznik naslova"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Tovarna za Evolucijino komponento adresarja."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the sample Addressbook control"
 msgstr "Tovarna za vzorčno kontrolo adresarja"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-shortcuts.c:1061
+msgid "Contacts"
+msgstr "Stik"
+
+#: addressbook/gui/component/addressbook-component.c:71
+msgid "Folder containing contact information"
+msgstr "Mapa, ki vsebuje podatke o stikih"
+
+#: addressbook/gui/component/addressbook-component.c:73
+msgid "LDAP Server"
+msgstr "Strežnik LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:73
+msgid "LDAP server containing contact information"
+msgstr "Strežnik LDAP, ki vsebuje podatke o stikih"
+
+#: addressbook/gui/component/addressbook-component.c:526
+#: ui/evolution-addressbook.xml.h:11
+msgid "New Contact"
+msgstr "Nov stik"
+
+#: addressbook/gui/component/addressbook-component.c:526
+msgid "New _Contact"
+msgstr "Nov _stik"
+
+#: addressbook/gui/component/addressbook-component.c:527
+msgid "New Contact List"
+msgstr "Nov seznam stikov"
+
+#: addressbook/gui/component/addressbook-component.c:527
+msgid "New Contact _List"
+msgstr "Nov seznam _stikov"
+
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Edit Addressbook"
 msgstr "Uredi adresar"
 
@@ -426,7 +798,7 @@ msgid "Base"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:151
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Osnove"
 
@@ -435,34 +807,45 @@ msgid "De_lete"
 msgstr "Z_briši"
 
 #: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "Email Address:"
+msgstr "E-poštni naslov:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
+"strežniku"
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "One"
 msgstr "Ena"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Search _base:"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:13
 msgid "Search s_cope: "
 msgstr "_Doseg iskanja:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "Server Name"
 msgstr "Ime strežnika"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid "The information below is required in order to add an addressbook.  "
 msgstr "Podatki spodaj so potrebni za dodajanje adresarja.  "
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/addressbook-config.glade.h:17
 msgid "This information is not required for most ldap servers. "
 msgstr "Te podatki za večino strežnikov ldap niso potrebni"
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:18
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
@@ -471,7 +854,7 @@ msgstr ""
 "uporabljajo za iskanja. Za več podatkov se obrnite na svojega "
 "administratorja."
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
@@ -479,15 +862,15 @@ msgstr ""
 "To je izhodiščno vozlišče vseh vaših iskanj na strežniku ldap. Za več "
 "podatkov se obrnite na svojega administratorja."
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid "This is the name of the server where your addressbook is located."
 msgstr "To je ime strežnika, kjer se nahaja vaš adresar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "This is the port that your ldap server uses."
 msgstr "To so vrata, ki jih uporablja vaš strežnik ldap."
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:22
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
@@ -495,64 +878,50 @@ msgstr ""
 "To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
 "prikaz."
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
+#: addressbook/gui/component/addressbook-config.glade.h:23
 msgid "_Account name:"
 msgstr "Ime _računa:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:89
-#: my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-#: mail/mail-config.glade.h:94 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:47
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:40
+#: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:26
 msgid "_My server requires authentication"
 msgstr "_Moj strežnik zahteva avtentifikacijo"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:27
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/addressbook-config.glade.h:28
 msgid "_Server name:"
 msgstr "Ime _strežnika:"
 
-#: addressbook/gui/component/addressbook-storage.c:138
-msgid "Other Contacts"
-msgstr "Drugo stiki"
-
-#: addressbook/gui/component/addressbook.c:372
-#, c-format
-msgid "Please enter your email address and password for access to %s"
-msgstr "Prosim vpišite naslov svoje e-pošte in geslo za %s"
-
-#: addressbook/gui/component/addressbook.c:380
-msgid "LDAP Authentication"
-msgstr "Avtentifikacija LDAP"
-
-#: addressbook/gui/component/addressbook.c:391
-msgid "Email Address:"
-msgstr "E-poštni naslov:"
-
-#: addressbook/gui/component/addressbook.c:404
-msgid "Password:"
-msgstr "Geslo:"
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "Nisem mogel inicializirati gnome-vfs"
 
-#: addressbook/gui/component/addressbook.c:467
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -561,7 +930,7 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:479
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -573,7 +942,7 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -581,37 +950,42 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:628
+#: addressbook/gui/component/addressbook.c:623
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Vpišite geslo za %s (uporabnik %s)"
+
+#: addressbook/gui/component/addressbook.c:786
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:629
+#: addressbook/gui/component/addressbook.c:787
 msgid "Name contains"
 msgstr "Ime vsebuje"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:788
 msgid "Email contains"
 msgstr "E-naslov vsebuje"
 
-#: addressbook/gui/component/addressbook.c:631
+#: addressbook/gui/component/addressbook.c:789
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:632 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Napredno..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:821
+#: addressbook/gui/component/addressbook.c:1031
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:859
+#: addressbook/gui/component/addressbook.c:1071
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -624,63 +998,51 @@ msgstr "URI, ki naj ga prikaže brskalnik map"
 msgid "(none)"
 msgstr "(brez)"
 
-#: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1585
+#: addressbook/gui/component/e-address-popup.c:474
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor.c:1686
 msgid "Primary Email"
 msgstr "prvi e-naslov"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1586
-#: addressbook/gui/widgets/e-addressbook-view.c:801
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:802
-msgid "Email 3"
-msgstr "E-naslov 3"
-
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Izberi dejanje"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Ustvari nov stik \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, 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
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Poizvedujem v adresarju..."
 
-#: addressbook/gui/component/e-address-popup.c:916
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:310
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Uredi podatke stika"
 
-#: addressbook/gui/component/e-address-popup.c:946
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:383
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Dodaj k stikom"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Zlij E-poštne naslove"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Izključi poizvedbe"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Vključi poizvedbe (nevarno!)"
 
@@ -692,31 +1054,67 @@ msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:640
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Odstrani"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Odstrani vse"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Pošlji pošto v obliki HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:368
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
+msgid "Edit Contact List"
+msgstr "Uredi seznam stikov"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
+msgid "Unnamed Contact List"
+msgstr "Neimenovan seznam stikov"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
+#, c-format
+msgid "(%d not shown)"
+msgstr "(%d ni pokazanih)"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
-msgid "Unable to get local storage.  This should never happen."
-msgstr "Ne morem dobiti krajevne shrambe. To se nikoli ne bi smelo zgoditi."
+#: addressbook/gui/component/select-names/e-select-names.c:524
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
+msgstr ""
+"Evolucija ne more dobiti krajevne hrambe adresarja.\n"
+"To se lahko zgodi, če se komponenta evolution-addressbook sesuje.\n"
+"Da bi nam pomagali bolje razumeti in na koncu rešiti ta problem,\n"
+"prosim pošljite e-pošto na Jon Trowbridge <trow@ximian.com>.\n"
+"Vsebuje naj podroben opis okoliščin v katerih se je ta napaka tgodila.\n"
+"Hvala."
+
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+"Evolucija ne more dobiti krajevne hrambe adresarja.\n"
+"V normalnih okoliščinah se to nikoli ne bi smelo zgoditi.\n"
+"Za rešitev tega problema boste morali zapustiti in znova\n"
+"pognati Evolucijo."
 
-#: addressbook/gui/component/select-names/e-select-names.c:484
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Izberi stike iz adresarja"
 
@@ -771,117 +1169,141 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Collaboration"
+msgstr "Sodelovanje"
+
+#. Construct the app
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1293
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:156
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "F_ree/Busy URL:"
+msgstr "URL zasedenosti:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "Zavedi _kot:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Splošno"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+"Če ta oseba objavlja podatke o svoji zasedenosti ali druge koledarje \n"
+"podatkov na spletu, vnesite naslov teh podatkov tu."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
-msgstr "Nov tip telefona"
+msgstr "Nova vrsta telefona"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "Opom_be:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "Organi_zacija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
-msgstr "Tipi telefonov"
+msgstr "Vrste telefonov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Želi dobivati _HTML e-pošto"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_Naslov..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "_Ime pomočnika:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_Rojstni dan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Službeni"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Stiki..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 mail/folder-browser.c:1319
-#: mail/mail-config.glade.h:93 ui/evolution-mail-message.xml.h:88
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
+#: mail/folder-browser.c:1468 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Zbriši"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "O_ddelek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "_Polno Ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Doma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "Službeni _naziv:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "Ime _managerja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "Pi_sarna:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Poklic:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Public Calendar URL:"
+msgstr "URL _javnega koledarja"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "_Partner(ka):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_To je poštni naslov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Naslov _spletne strani:"
 
@@ -889,116 +1311,50 @@ msgstr "Naslov _spletne strani:"
 msgid "Delete Contact?"
 msgstr "Zbriši stik?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:756
+msgid "Category editor not available."
+msgstr "Urejevalnik kategorij ni na voljo."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:763
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1543
-#: addressbook/gui/widgets/e-addressbook-view.c:809
-msgid "Assistant"
-msgstr "Pomočnik"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1544
-#: addressbook/gui/contact-editor/e-contact-editor.c:1611
-msgid "Business"
-msgstr "Služba"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1545
-msgid "Business 2"
-msgstr "Služba"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1546
-#: addressbook/gui/widgets/e-addressbook-view.c:789
-msgid "Business Fax"
-msgstr "Službeni faks"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1547
-msgid "Callback"
-msgstr "Povratni klic"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1548
-msgid "Car"
-msgstr "Avto"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
-msgid "Company"
-msgstr "Podjetje"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
-msgid "Home"
-msgstr "Doma"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-msgid "Home 2"
-msgstr "Doma 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1552
-#: addressbook/gui/widgets/e-addressbook-view.c:790
-msgid "Home Fax"
-msgstr "Domači faks"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1553
-#: addressbook/gui/widgets/e-addressbook-view.c:793
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1554
-msgid "Mobile"
-msgstr "Prenosni telefon"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
-#: addressbook/gui/contact-editor/e-contact-editor.c:1613
-#: mail/mail-config.glade.h:50
-msgid "Other"
-msgstr "Drugo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/widgets/e-addressbook-view.c:795
-msgid "Other Fax"
-msgstr "Drugi faks"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
-#: addressbook/gui/widgets/e-addressbook-view.c:796
-msgid "Pager"
-msgstr "Pozivnik"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1558
-msgid "Primary"
-msgstr "Prvi"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1559
-#: addressbook/gui/widgets/e-addressbook-view.c:797
-msgid "Radio"
-msgstr "Radijo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1560
-#: addressbook/gui/widgets/e-addressbook-view.c:798
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
+#: addressbook/gui/contact-editor/e-contact-editor.c:2284
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nisem mogel najti gradnika za polje `%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Uredi celoto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr "vizitka.vcf"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+msgid "list"
+msgstr "seznam"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -1012,42 +1368,962 @@ msgid "Address _2:"
 msgstr "Naslov _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr "Albanija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr "Alžirija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr "Ameriška Samoa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr "Andora"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr "Angola"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr "Angvila"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "Antarctica"
+msgstr "Antarktika"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr "Antigva in Barbuda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "Argentina"
+msgstr "Argentina"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr "Armenija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr "Aruba"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr "Australija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+msgid "Austria"
+msgstr "Avstrija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr "Azerbajdžan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr "Bahami"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr "Bahrajn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr "Bangladeš"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr "Barbados"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+msgid "Belarus"
+msgstr "Belorusija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr "Belgija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+msgid "Belize"
+msgstr "Belize"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+msgid "Benin"
+msgstr "Benin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr "Bermudi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr "Butan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr "Bolivija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr "Bosna in Hercegovina"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr "Bocvana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr "Bouvetski otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+msgid "Brazil"
+msgstr "Brazilija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr "Britansko Indijsko oceansko območje"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr "Britanski deviški otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr "Bolgarija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr "Burundi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr "Kambodža"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr "Zelenortski otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr "Kajmanski otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr "Srednjaafriška republika"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+msgid "Chad"
+msgstr "Čad"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Preveri naslov"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+msgid "Chile"
+msgstr "Čile"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+msgid "China"
+msgstr "Kitajska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr "Velikonočni otok"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr "Kokosovi otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr "Kolumbija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+msgid "Comoros"
+msgstr "Komori"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+msgid "Congo"
+msgstr "Kongo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr "Cookovi otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr "Kostarika"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr "Cote d'Ivoire"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
-msgstr "Drža_va:"
+msgstr "Držav_a:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr "Hrvaška"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr "Kuba"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr "Ciper"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr "Češka"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr "Danska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr "Džibuti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr "Dominika"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr "Dominikanska republika"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr "Vshodni timor"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr "Ekvador"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr "Egipt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr "Salvador"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr "Ekvatorijalna gvineja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr "Eritreja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr "Estonija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr "Etiopija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr "Falklandski otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr "Farski otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr "Fidži"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "ZDA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+msgid "France"
+msgstr "Francija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr "Francoska Gvajana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr "Francoska polinezija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr "Francoska ju>na obmohja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr "Gabon"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr "Gambija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr "Gruzija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr "Nemčija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr "Gana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr "Gibrlaltar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+msgid "Greece"
+msgstr "Grčija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+msgid "Greenland"
+msgstr "Grenlandija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+msgid "Grenada"
+msgstr "Grenada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+msgid "Guam"
+msgstr "Guam"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr "Gvatemala"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+msgid "Guinea"
+msgstr "Gvineja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr "Gvineja bissau"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr "Gvajana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+msgid "Haiti"
+msgstr "Haiti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr "Heardovi in McDonaldovi otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr "Sveto morje"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+msgid "Honduras"
+msgstr "Honduras"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+msgid "Hungary"
+msgstr "Madžarska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr "Islandija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr "Indija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr "Indonezija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr "Irska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr "Izrael"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr "Italija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr "Jamajka"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr "Japonska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr "Jordanija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr "Kazahstan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr "Kenija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr "Kuvajt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr "Kirgizistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+msgid "Laos"
+msgstr "Laos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr "Latvija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr "Libanon"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+msgid "Lesotho"
+msgstr "Lesoto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr "Liberija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr "Litvanija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr "Luksemburg"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+msgid "Macau"
+msgstr "Macao"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr "Makedonija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+msgid "Malawi"
+msgstr "Malavi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr "Malezija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr "Maldivi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+msgid "Mali"
+msgstr "Mali"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+msgid "Malta"
+msgstr "Malta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr "Marshallovi otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr "Martinik"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr "Mavretanija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr "Mehika"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr "Mikronezija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+msgid "Monaco"
+msgstr "Monako"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr "Mongolija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr "Maroko"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+msgid "Mozambique"
+msgstr "Mozambik"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+msgid "Myanmar"
+msgstr "Mjanmar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr "Namibija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr "Nauru"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+msgid "Nepal"
+msgstr "Nepal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+msgid "Netherlands"
+msgstr "Nizozemska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr "Nizozemski Antili"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+msgid "New Caledonia"
+msgstr "Nova Kaledonija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr "Nova Zelandija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr "Nikaragva"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+msgid "Niger"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+msgid "Nigeria"
+msgstr "Nigerija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+msgid "Niue"
+msgstr "Niue"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr "Norfolški otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr "Severni marianski otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+msgid "Norway"
+msgstr "Norveška"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr "Oman"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr "Paragvaj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+msgid "Palestinian Territory"
+msgstr "Palestinsko osvobojeno ozemlje"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Panama"
+msgstr "Panama"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Papua New Guinea"
+msgstr "Papua Nova Gvineja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+msgid "Paraguay"
+msgstr "Paragvaj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Peru"
+msgstr "Peru"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Philippines"
+msgstr "Filipini"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+msgid "Pitcairn"
+msgstr "Pitcairin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+msgid "Poland"
+msgstr "Poljska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Portugal"
+msgstr "Portugalska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+msgid "Puerto Rico"
+msgstr "Portoriko"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Qatar"
+msgstr "Katar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Korea"
+msgstr "Republika Korjea"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+msgid "Republic Of Moldova"
+msgstr "Republika Modavija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Reunion"
+msgstr "Reunion???"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Romania"
+msgstr "Romunija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+msgid "Russian Federation"
+msgstr "Ruska federacija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Rwanda"
+msgstr "Ruanda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Kitts And Nevis"
+msgstr "St. Kitts in Nevis"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Lucia"
+msgstr "St. Lucija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+msgid "Saint Vincent And The Grena-dines"
+msgstr "St. Vincent in Grenadini"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "Samoa"
+msgstr "Samoa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "San Marino"
+msgstr "San Marino"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Sao Tome And Principe"
+msgstr "Sao Tome in Principe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+msgid "Saudi Arabia"
+msgstr "Savdska Arabija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+msgid "Senegal"
+msgstr "Senegalija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Seychelles"
+msgstr "Sejšeli"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Singapore"
+msgstr "Singapur"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovakia"
+msgstr "Slovaška"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Slovenia"
+msgstr "Slovenija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+msgid "Solomon Islands"
+msgstr "Solomonovi otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "Somalia"
+msgstr "Somalija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Africa"
+msgstr "Južno afriška republika"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+msgid "South Georgia And The South Sandwich Islands"
+msgstr "Južna Georgija in Južni Sandwichovi otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Spain"
+msgstr "Španija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "Sri Lanka"
+msgstr "Šrilanka"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Helena"
+msgstr "Sv. Helena"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+msgid "St. Pierre And Miquelon"
+msgstr "Sv. Pierre in Miquelon"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+msgid "Sudan"
+msgstr "Sudan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Suriname"
+msgstr "Surinam"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "Svalbardovi in Jan Mayenovi otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+msgid "Swaziland"
+msgstr "Švica"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Sweden"
+msgstr "Švedska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Switzerland"
+msgstr "Švica"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+msgid "Taiwan"
+msgstr "Tajvan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+msgid "Tajikistan"
+msgstr "Tadžikistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+msgid "Thailand"
+msgstr "Tajska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Togo"
+msgstr "Togo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Tonga"
+msgstr "Tongo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Trinidad And Tobago"
+msgstr "Trinidad in Tobago"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+msgid "Tunisia"
+msgstr "Tunizija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+msgid "Turkey"
+msgstr "Turčija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Turks And Caicos Islands"
+msgstr "Otočji Turks in Caicos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+msgid "U.S. Virgin Islands"
+msgstr "Ameriški deviški otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Uganda"
+msgstr "Uganda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "Ukraine"
+msgstr "Ukrajina"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Arab Emirates"
+msgstr "Združeni arabski emirati"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Kingdom"
+msgstr "Velika Britanija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+msgid "United Republic Of Tanzania"
+msgstr "Združena republika Tanzanija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States"
+msgstr "Združene države amerike"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "United States Minor Outlying Islands"
+msgstr "Ameriški zunajležeči otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uruguay"
+msgstr "Urugvaj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Wallis And Futuna Islands"
+msgstr "Wallisovi in Futunini otoki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+msgid "Western Sahara"
+msgstr "Zahodna sahara"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yemen"
+msgstr "Jemen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Yugoslavia"
+msgstr "Jugoslavija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zambia"
+msgstr "Zambija"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+msgid "Zimbabwe"
+msgstr "Zimbabve"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_Address:"
 msgstr "_Naslov:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_PO Box:"
 msgstr "_Poštni predal:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_State/Province:"
 msgstr "_Država/Provinca:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:241
 msgid "_ZIP Code:"
 msgstr "_Poštna številka:"
 
@@ -1136,7 +2412,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skrij naslove ob pošiljanju pošte na ta seznam"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -1145,7 +2421,7 @@ msgid "contact-list-editor"
 msgstr "Urejevalnik stikov"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
 msgid "Contact List Editor"
 msgstr "Urejevalnik stikov"
 
@@ -1194,371 +2470,241 @@ msgstr ""
 "Spremenjeno ime ali e-poštni naslov tega stika že\n"
 "obstaja v tej mapi. Ga želite vseeno dodati?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:260
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Iskanje"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
+#: addressbook/gui/widgets/e-addressbook-model.c:127
+msgid "No cards"
+msgstr "ni vizitk"
 
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
+#: addressbook/gui/widgets/e-addressbook-model.c:130
+msgid "1 card"
+msgstr "1 vizitka"
 
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-model.c:133
+#, c-format
+msgid "%d cards"
+msgstr "%d vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:1286
-#: ui/evolution-addressbook.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Shrani kot eVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
-#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Odpri"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send contact to other"
-msgstr "Pošlji stik drugim"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Posreduj _stik"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:674
-#: ui/evolution-addressbook.xml.h:26
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
+msgid "Send Message to Contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:675
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Natisni"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:283
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
+#: ui/evolution-tasks.xml.h:8
 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
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Napaka ob spreminjanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Uspeh"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1638
-#: shell/e-storage.c:503
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:275
+#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Skladišče, ki ni na mreži"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Vizitka ni bila najdena"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "ID vizitke že obstaja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protokol ni podprt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:607
+#: camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "preklicano"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Drugačna napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Želite shraniti spremembe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Napaka ob dodajanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Napaka ob dodajanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Napaka ob spreminjanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1159
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Napaka ob odstranjevanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:378
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,ć,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,š,t,u,v,w,x,y,z,ž"
+
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:383
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,ć,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,š,t,u,v,w,x,y,z,ž"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
-msgid "File As"
-msgstr "Zavedi kot"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:777
-msgid "Email"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Pomožni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Službebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Domač telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
-msgid "Organization"
-msgstr "Organizacija"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Službeni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Službeni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Domač telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
-msgid "TTY"
-msgstr "TTY"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Drug naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
-msgid "Web Site"
-msgstr "Spletna stran"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:804
-msgid "Department"
-msgstr "Oddelek"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:805
-msgid "Office"
-msgstr "Pisarna"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:806
-msgid "Title"
-msgstr "Naziv"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:807
-msgid "Profession"
-msgstr "Poklic"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:808
-msgid "Manager"
-msgstr "Upravljalec"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:810
-msgid "Nickname"
-msgstr "Vzdevek"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:811
-msgid "Spouse"
-msgstr "Partner(ka)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:812
-msgid "Note"
-msgstr "Opomba"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-msgid "Free-busy URL"
-msgstr "URL zasedenosti"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1156
-msgid "Done."
-msgstr "Opravljeno."
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr "in %d drugih vizitk."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1188
-msgid "Removing cards..."
-msgstr "Odstranjujem vizitke..."
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr "in ena druga vizitka."
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -1734,7 +2880,7 @@ msgstr "Zgoraj:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
-msgstr "Tip:"
+msgstr "Vrsta:"
 
 #: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
@@ -1744,71 +2890,105 @@ msgstr "Širina:"
 msgid "_Font..."
 msgstr "_Pisava..."
 
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Natisni vizitke"
 
-#: addressbook/printing/e-contact-print.c:1111
-#: addressbook/printing/e-contact-print.c:1133
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Natisni vizitko"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Natisni kuverto"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-component.c:1202
+msgid "Untitled appointment"
+msgstr "Neimenovan sestanek"
+
+#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
+#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:642
+msgid "High"
+msgstr "visoka"
+
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/gui/calendar-model.c:1711
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:641
+msgid "Normal"
+msgstr "običajna"
+
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:640
+msgid "Low"
+msgstr "nizka"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:518
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+msgid "Undefined"
+msgstr "ni definirana"
+
+#: calendar/conduits/calendar/calendar-conduit.c:937
+#: calendar/conduits/todo/todo-conduit.c:649
 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:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 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:756
+#: calendar/conduits/todo/todo-conduit.c:759
 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 Bonobo control which displays a task list."
+msgstr "Kontrola Bonobo, ki prikaže seznam nalog."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evolucijina komponenta za povzetke."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolucijin pregledovalnik iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Komponenta Evolucije za urejanje koledarja."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 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 Evolution Tasks control"
+msgstr "Tovarna za Evolucijino komponento nalog."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Tvoarna za orodje koledarja iTip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Vzorčna tovarna za kontrolo koledarja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Tovarna za centralzacijo dialogov urejevalnika komponent koledarja."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory to create a component editor factory"
+msgstr "Tovarna za ustvarjanje tovarne komponent urejevalnika."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Storitev opozorilnega alarma"
@@ -1817,47 +2997,14 @@ 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
-#, c-format
-msgid "Notification about your appointment starting on %s and ending on %s"
-msgstr "Obvestilo o vašem sestanku, ki se začne ob %s in konča ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr "Obvestilo o vašem sestanku, ki se začne ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
-#, c-format
-msgid "Notification about your appointment ending on %s"
-msgstr "Obvestilo o vašem sestanku, ki se konča ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
-msgid "Notification about your appointment"
-msgstr "Obvestilo o vašem sestanku"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
-#, c-format
-msgid "Notification about your task starting on %s and ending on %s"
-msgstr "Obvestilo o vašem opravilu, ki se konča ob %s in konča ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
-#, c-format
-msgid "Notification about your task starting on %s"
-msgstr "Obvestilo o vašem opravilu, ki se začne ob %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+msgid "invalid time"
+msgstr "neveljaven čas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, 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
-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"
+msgid "Alarm on %s"
+msgstr "Alarmi ob %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -1876,189 +3023,141 @@ msgstr "Čas podaljška spanja (minut)"
 msgid "_Edit appointment"
 msgstr "_Uredi sestanek"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:487
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:700
-#: calendar/gui/alarm-notify/alarm-queue.c:999
-#: calendar/gui/alarm-notify/alarm-queue.c:1055
-msgid "Reminder of your appointment at "
-msgstr "Opomin na sestanek ob "
-
-#: calendar/gui/alarm-notify/alarm-queue.c:991
-msgid "Snooze"
-msgstr "Podaljšek spanja"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1004
-#: calendar/gui/alarm-notify/alarm-queue.c:1059
-msgid "Ok"
-msgstr "V redu"
+#: calendar/gui/alarm-notify/alarm-queue.c:730
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+"Evolucija še ne podpira opozoril koledarja z \n"
+"obveščanjem preko e-pošte, a to opozorilo je \n"
+"bilo nastavljeno, da pošlje e-pošto. Evolucija bo\n"
+"prikazala običajen opozorilni dialog."
 
-#: calendar/gui/alarm-notify/notify-main.c:58
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
+"An Evolution Calendar reminder is about to trigger.\n"
+"This reminder is configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 msgstr ""
-"Ura je %s. Trenutni Unix čas je %ld. Mislili smo, da bi vas lahko zanimalo."
+"Opozorilo koledarja Evolucije se bo sporžilo.\n"
+"Opozorilo je nastavljeno, da požene naslednji program:\n"
+"\n"
+"         %s\n"
+"\n"
+"Ste prepričani, da želite pognati ta program?"
 
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Nisem mogel inicializirati GNOMEa"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
-msgid "Could not initialize gnome-vfs"
-msgstr "Nisem mogel inicializirati gnome-vfs"
+#: calendar/gui/alarm-notify/notify-main.c:181
+msgid "Could not create the alarm notify service"
+msgstr "Nisem mogel ustvariti storitve alarma"
 
-#: calendar/gui/alarm-notify/notify-main.c:115
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 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
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:426
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:581
+#: calendar/gui/calendar-commands.c:805
 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:355 calendar/gui/calendar-model.c:925
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "javno"
 
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
-msgid "High"
-msgstr "visoka"
-
-#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
-#: calendar/gui/calendar-model.c:1624
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
-msgid "Normal"
-msgstr "običajna"
-
-#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
-msgid "Low"
-msgstr "nizka"
-
-#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
 msgid "Free"
 msgstr "Prost"
 
-#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:427
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Zaseden"
 
-#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "ni pričeto"
 
-#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-meeting-model.c:329 calendar/gui/e-meeting-model.c:352
 msgid "Completed"
 msgstr "končano"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:316
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:847
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datum mora biti vpisan v obliki: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1011
+#: calendar/gui/calendar-model.c:1052
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2068,66 +3167,53 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1051
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
-
-#: calendar/gui/calendar-model.c:1092
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "Prioriteta mora biti 'Visoka', 'Običajna', 'Nizka' ali 'Nedefinirana'."
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1105
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "ni definirana"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1386
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:437
-#: widgets/misc/e-dateedit.c:1356 widgets/misc/e-dateedit.c:1471
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1485
+#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
+#: mail/mail-config.glade.h:47
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1487 widgets/misc/e-dateedit.c:1602
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/calendar-model.c:1626
+#: calendar/gui/calendar-model.c:1713
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1628
+#: calendar/gui/calendar-model.c:1715
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1187
-#: calendar/gui/dialogs/meeting-page.c:1283
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1284
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
 msgid "No"
 msgstr "Ne"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+msgid "Searching"
+msgstr "Iskanje"
+
+#: calendar/gui/calendar-view-factory.c:148 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
+#: calendar/gui/calendar-view-factory.c:151 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
+#: calendar/gui/calendar-view-factory.c:154 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
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Mesečni pogled"
 
@@ -2147,27 +3233,63 @@ msgstr "Komentar vsebuje"
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-shortcuts.c:1055
+msgid "Calendar"
+msgstr "Koledar"
+
+#: calendar/gui/component-factory.c:64
+msgid "Folder containing appointments and events"
+msgstr "Mapa, ki vsebuje sestanke in dogodke"
+
+#: calendar/gui/component-factory.c:68 my-evolution/e-summary-tasks.c:247
+#: my-evolution/e-summary-tasks.c:263 shell/e-shortcuts.c:1058
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Naloge"
+
+#: calendar/gui/component-factory.c:69
+msgid "Folder containing to-do items"
+msgstr "Mapa, ki vsebuje predmete za opravit"
+
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Ustvari nov sestanek"
+
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
+msgid "New _Appointment"
+msgstr "Nov _sestanek"
+
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Ustvari nov posel"
+
+#: calendar/gui/component-factory.c:649
+msgid "New _Task"
+msgstr "Nova _naloga"
+
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Možnosti zvočnega alarma"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "možnosti alrama sporočil"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Možnosti alarma pošte"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Možnosti alarma programa"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Neznane možnosti alarma"
 
@@ -2176,25 +3298,29 @@ msgid "Alarm Repeat"
 msgstr "Ponovitev alarma"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "FIXME: mail alarm options"
-msgstr "FIXME: možnosti alarma pošte"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Sporočila za prikaz"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Play sound:"
 msgstr "Predvajaj zvok:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Repeat the alarm"
 msgstr "Ponovi alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Run program:"
 msgstr "Poženi program:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid ""
+"This is an email reminder, but Evolution does not yet support this kind of "
+"reminders.  You will not be able to edit the options for this reminder."
+msgstr ""
+"To je opozorilo preko elektronske pošte, ki pa ga Evolucija še ne podpira. "
+"Ne boste mogli spremeniti možnosti za to opozorilo."
+
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "S temi argumenti:"
@@ -2215,97 +3341,113 @@ msgstr "ur"
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 dan"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d tednov"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 teden"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d ur"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 ura"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Kaži sporočilo"
 
-#: calendar/gui/dialogs/alarm-page.c:339
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Pošlji e-pošto"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Poženi program"
 
-#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/meeting-page.c:601
-#: calendar/gui/dialogs/meeting-page.c:636
-#: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1255
-#: calendar/gui/dialogs/meeting-page.c:1271
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "neznano"
+#: calendar/gui/dialogs/alarm-page.c:391
+msgid "Unknown action to be performed"
+msgstr "Izvršena bi moralo biti neznano dejanje"
 
-#: calendar/gui/dialogs/alarm-page.c:361
-msgid "before start of appointment"
-msgstr "pred pričetkom sestanka"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s pred pričetkom sestanka"
+
+#: calendar/gui/dialogs/alarm-page.c:406
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s po pričetku sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:364
-msgid "after start of appointment"
-msgstr "po pričetku sestanka"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s ob pričetku sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:374
-msgid "before end of appointment"
-msgstr "pred koncem sestanka"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s pred koncem sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:377
-msgid "after end of appointment"
-msgstr "po koncu sestanka"
+#: calendar/gui/dialogs/alarm-page.c:423
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s po koncu sestanka"
+
+#: calendar/gui/dialogs/alarm-page.c:428
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s na koncu sestanka"
+
+#: calendar/gui/dialogs/alarm-page.c:453
+#, c-format
+msgid "%s at %s"
+msgstr "%s ob %s"
+
+#: calendar/gui/dialogs/alarm-page.c:459
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s za neznano vrsto sprožilca"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
@@ -2321,42 +3463,43 @@ msgstr "Datum/ura:"
 msgid "Reminders"
 msgstr "Opomnilniki"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "_Options..."
 msgstr "_Možnosti..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "pred"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
 msgstr "konec sestanka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:114
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "pričetek sestanka"
 
@@ -2405,7 +3548,7 @@ msgid "First day of wee_k:"
 msgstr "Prvi dan ted_na:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:969
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "petek"
 
@@ -2418,260 +3561,262 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "ponedeljek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "O_verdue tasks:"
+msgstr "Naloge s p_rekoračenim rokom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Show appointment _end times in week and month views"
 msgstr "Kaži čase _koncev sestankov v tedenskih in mesečnih pogledih"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Sta_rt of day:"
 msgstr "Zače_tek dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Su_n"
 msgstr "_ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "nedeljo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "č_et"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "T_ue"
 msgstr "_tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Tas_ks due today:"
 msgstr "Nalo_ge z današnjim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "četrtek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "Čas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time _zone:"
 msgstr "Časovni _pas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Time di_visions:"
 msgstr "Časovne _delitve:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr "Oblika izpisa časa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "torek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Delavni teden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "_12 hour (am/pm)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "_12 hour (AM/PM)"
 msgstr "_12 urna (dop./pop.)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
 msgstr "_24 urna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Vprašaj za potrditev ob brisanju predmetov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Compress weekends in month view"
 msgstr "_Skrči vikende v mesečnem pogledu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Prikaz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_End of day:"
 msgstr "_Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "_pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_General"
 msgstr "_Splošno"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "_Hide completed tasks after"
+msgstr "_Skrij opravljene naloge po"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "po_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Other"
 msgstr "_Drugo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Overdue tasks:"
-msgstr "Naloge s p_rekoračenim rokom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "so_b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Task List"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Wed"
 msgstr "_sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "before the start of the appointment"
 msgstr "pred pričetkom sestanka"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Stanje sestanka se je spremenilo. Pošlji posodobljeno različico?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati to opravilo?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta dnevniški vpis?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Ta dogodek je bil zbrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "To opravilo je bilo zbrisano."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Ta dnevniški vpis je bil zbrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Naredili ste spremembe. Prekliči spremembe in zapri urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ničesar niste spremenili, zapri urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Ta dogodek je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Ta posel je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Ta dnevniški vpis je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Rok "
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Rok"
 
-#: calendar/gui/dialogs/comp-editor-util.c:273
-#: calendar/gui/dialogs/comp-editor-util.c:329 shell/e-local-storage.c:174
-#: shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Stik"
+#: calendar/gui/dialogs/comp-editor.c:303
+msgid "Could not update object!"
+msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:678
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:683
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:686
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:465
+#: calendar/gui/dialogs/comp-editor.c:689
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:479
+#: calendar/gui/dialogs/comp-editor.c:703
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:849 mail/mail-callbacks.c:1485
-#: mail/mail-display.c:99
+#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
-#: calendar/gui/dialogs/comp-editor.c:853 mail/mail-callbacks.c:1491
-#: mail/mail-display.c:103
+#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2679,53 +3824,53 @@ msgstr ""
 "Datoteka z enakim imenom že obstaja.\n"
 "Naj jo prepišem?"
 
-#: calendar/gui/dialogs/comp-editor.c:916 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1069
+#: calendar/gui/dialogs/comp-editor.c:1272
 msgid "Unable to obtain current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ste prepričani, da želite zbrisati ta sestanek `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:87
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ste prepričani, da želite izbrisati ta neimenovan dnevniški vpis?"
 
-#: calendar/gui/dialogs/delete-comp.c:120
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Ste prepričani, da želite zbrisati %d sestankov?"
 
-#: calendar/gui/dialogs/delete-comp.c:125
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Ste prepričani, da želite zbrisati %d opravil?"
 
-#: calendar/gui/dialogs/delete-comp.c:130
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
@@ -2742,42 +3887,27 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr "Izberi časovni pas"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "Izbira"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Časovni pasovi"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-" Use the right mouse button to zoom out."
-msgstr ""
-"Uporabite lev miškin gumb za povečavo območja zemljevida in izbiro časovnega "
-"pasu.\n"
-" Uporabite desni miškin gumb za pomanjšavo."
-
-#: calendar/gui/dialogs/event-editor.c:156
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:161
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Opomnilnik"
 
-#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:171
-#: calendar/gui/dialogs/event-editor.c:273
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:260
+#: calendar/gui/dialogs/event-editor.c:362
+msgid "Scheduling"
+msgstr "Načrtovanje časa"
+
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:263
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Meeting"
 msgstr "Sestanek"
 
@@ -2796,11 +3926,12 @@ msgid "Classification"
 msgstr "Uvrstitev"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_Zaupno"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Datum in ura"
 
@@ -2809,12 +3940,12 @@ msgid "F_ree"
 msgstr "P_rost"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vatno"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "_Javno"
 
@@ -2824,7 +3955,7 @@ msgid "Show Time As"
 msgstr "Kaži čas kot"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "_Povzetek:"
 
@@ -2836,166 +3967,72 @@ msgstr "_Čas konca:"
 msgid "_Start time:"
 msgstr "_Čas pričetka:"
 
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1251
-msgid "Individual"
-msgstr "Individualno"
-
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
-msgid "Group"
-msgstr "Skupina"
-
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
-msgid "Resource"
-msgstr "Vir"
-
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
-msgid "Room"
-msgstr "Soba"
-
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
-msgid "Chair"
-msgstr "Stol"
-
-#: calendar/gui/dialogs/meeting-page.c:613
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1268
-msgid "Required Participant"
-msgstr "Potrebni udeleženci"
-
-#: calendar/gui/dialogs/meeting-page.c:615
-#: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1269
-msgid "Optional Participant"
-msgstr "Možni sodelujoči"
-
-#: calendar/gui/dialogs/meeting-page.c:617
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1270
-msgid "Non-Participant"
-msgstr "Ne-sodelujoči"
-
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1193
-#: calendar/gui/dialogs/meeting-page.c:1296
-msgid "Needs Action"
-msgstr "Potrebuje dejanje"
-
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
-msgid "Accepted"
-msgstr "Sprejeto"
-
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
-msgid "Declined"
-msgstr "Zavrnjeno"
-
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1299
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Poskusno"
-
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1300
-msgid "Delegated"
-msgstr "Delegirano"
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "An organizer is required."
+msgstr "Potreben je organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
-msgid "In Process"
-msgstr "V obdelavi"
+#: calendar/gui/dialogs/meeting-page.c:446
+msgid "At least one attendee is required."
+msgstr "Potreben je vsaj en udeleženec."
 
-#: calendar/gui/dialogs/meeting-page.c:737
+#: calendar/gui/dialogs/meeting-page.c:626
 msgid "That person is already attending the meeting!"
 msgstr "Ta oseba se je že udeleženec sestanka!"
 
-#: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:842
-msgid "Chair Persons"
-msgstr "Predsedujoči"
-
-#: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:842
-#: calendar/gui/dialogs/meeting-page.c:962
-msgid "Required Participants"
-msgstr "Potrebni udeleženci"
-
-#: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:842
-msgid "Optional Participants"
-msgstr "Možni udeleženci"
-
-#: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:842
-msgid "Non-Participants"
-msgstr "Ne-udeleženci"
-
-#: calendar/gui/dialogs/meeting-page.c:920
-msgid "Sent By:"
-msgstr "Poslano od:"
-
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:701
 msgid "_Delegate To..."
 msgstr "_Delegiraj komu..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Udeležen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Common Name"
 msgstr "Splošno ime"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegirano od"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegirano komu:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Jezik"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Vloga"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 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:84
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Vrsta"
@@ -3010,39 +4047,35 @@ msgid "_Change Organizer"
 msgstr "_Spremeni organizatorja"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Povabi ostale"
+#: calendar/gui/e-meeting-time-sel.c:445
+msgid "_Invite Others..."
+msgstr "_Povabi ostale..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_Drug organizator"
 
-#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
-#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:584
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ta sestanek vsebuje ponovitve, ki jih Evolucija ne zna urejati."
 
-#: calendar/gui/dialogs/recurrence-page.c:938
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "pojavitve"
 
@@ -3106,19 +4139,15 @@ 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/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Podatki o sestanku so se spremenili. Pošlji posodobljeno različico?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "Podatki o nalogi so se spremenili. Pošlji posodobljeno različico?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "Dnevniški zapis se je spremenil. Pošlji posodobljeno različico?"
 
@@ -3137,7 +4166,7 @@ msgid "Progress"
 msgstr "Napredek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:965
 msgid "URL:"
 msgstr "URL:"
 
@@ -3149,138 +4178,112 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/dialogs/task-editor.c:161
-#: calendar/gui/dialogs/task-editor.c:239
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Datum _pričetka:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Zaupno"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Do datuma:"
 
-#: calendar/gui/e-calendar-table.c:350
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:351
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:352
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:353
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:354
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:355
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:356
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:357
-#, c-format
-msgid "70%"
-msgstr "70%"
+#: calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+msgid "Deleting selected objects"
+msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-calendar-table.c:358
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:359
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:360
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1284
+#: calendar/gui/e-calendar-table.c:941 calendar/gui/e-day-view.c:3544
+#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3553
+#: calendar/gui/e-week-view.c:3431 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:855 calendar/gui/e-day-view.c:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3555
+#: calendar/gui/e-week-view.c:3433 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3407
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
-#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3530
+#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
+#: calendar/gui/e-week-view.c:3435 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Mark as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:956
 msgid "_Delete this Task"
 msgstr "_Zbriši to opravilo"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Mark Tasks as Complete"
 msgstr "_Označi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:961
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1129
+#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
+#: calendar/gui/e-week-view.c:3918
+msgid "Updating objects"
+msgstr "Posodabljam predmete"
+
+#: calendar/gui/e-calendar-table.c:1228
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Datum mora biti vpisan v obliki: \n"
+"\n"
+"%s"
+
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:723
+#: camel/camel-filter-driver.c:837
 msgid "Complete"
 msgstr "Končano"
 
@@ -3308,8 +4311,11 @@ msgstr "Prioriteta"
 msgid "Start Date"
 msgstr "Datum pričetka"
 
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-storage-set-view.c:1465
-#: shell/e-summary-storage.c:78
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1483
 msgid "Summary"
 msgstr "Povzetek"
 
@@ -3321,246 +4327,104 @@ msgstr "Sortiranje opravil"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 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:1381
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 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:588 calendar/gui/e-week-view.c:324
-#: calendar/gui/print.c:759
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
-#: calendar/gui/print.c:761
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3400
-msgid "New _Appointment"
-msgstr "Nov _sestanek"
-
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
-#: ui/evolution-calendar.xml.h:14
+#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
+#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
 msgid "_Delete this Appointment"
 msgstr "_Zbriši ta sestanek"
 
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
+#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _prestavljivo"
 
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-itip-control.c:617
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> je izdal(a) podatke o sestanku."
-
-#: calendar/gui/e-itip-control.c:618
-msgid "Meeting Information"
-msgstr "Podatki o sestanku"
-
-#: calendar/gui/e-itip-control.c:622
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
-
-#: calendar/gui/e-itip-control.c:623
-msgid "Meeting Proposal"
-msgstr "Predlog sestanka"
-
-#: calendar/gui/e-itip-control.c:627
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> vas želi dodati k obstoječem sestanku."
-
-#: calendar/gui/e-itip-control.c:628
-msgid "Meeting Update"
-msgstr "Posodobitev sestanka"
-
-#: calendar/gui/e-itip-control.c:632
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> želi dobiti najnovejše podatke o sestanku."
-
-#: calendar/gui/e-itip-control.c:633
-msgid "Meeting Update Request"
-msgstr "Zahtevek za posodobitev sestanka"
-
-#: calendar/gui/e-itip-control.c:637
-#, c-format
-msgid "<b>%s</b> has replyed to a meeting request."
-msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
+#: calendar/gui/e-itip-control.c:1229
+msgid "Calendar file could not be updated!\n"
+msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:638
-msgid "Meeting Reply"
-msgstr "Odgovor na sestanek"
-
-#: calendar/gui/e-itip-control.c:642
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> je preklical(a) sestanek."
-
-#: calendar/gui/e-itip-control.c:643
-msgid "Meeting Cancellation"
-msgstr "Preklic sestanka"
-
-#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
-#: calendar/gui/e-itip-control.c:728
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> je poslal(a) nerazumljivo sporočilo."
-
-#: calendar/gui/e-itip-control.c:648
-msgid "Bad Meeting Message"
-msgstr "Nerazumljivo sporočilo o sestanku"
-
-#: calendar/gui/e-itip-control.c:665
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> je objavil(a) podatke o nalogi."
-
-#: calendar/gui/e-itip-control.c:666
-msgid "Task Information"
-msgstr "Podatki o nalogi"
-
-#: calendar/gui/e-itip-control.c:670
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> zahteva, da opravite nalogo."
-
-#: calendar/gui/e-itip-control.c:671
-msgid "Task Proposal"
-msgstr "Predlog naloge"
-
-#: calendar/gui/e-itip-control.c:675
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> vas želi dodati k obstoječi nalogi."
-
-#: calendar/gui/e-itip-control.c:676
-msgid "Task Update"
-msgstr "Posodobitev naloge"
-
-#: calendar/gui/e-itip-control.c:680
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> želi dobiti najnovejše podatke o nalogi."
-
-#: calendar/gui/e-itip-control.c:681
-msgid "Task Update Request"
-msgstr "Zahtevek za posodobitev naloge"
-
-#: calendar/gui/e-itip-control.c:685
-#, c-format
-msgid "<b>%s</b> has replyed to a task assignment."
-msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge"
-
-#: calendar/gui/e-itip-control.c:686
-msgid "Task Reply"
-msgstr "Odgovor na nalogo"
-
-#: calendar/gui/e-itip-control.c:690
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> je preklical(a) nalogo."
-
-#: calendar/gui/e-itip-control.c:691
-msgid "Task Cancellation"
-msgstr "Preklic naloge"
-
-#: calendar/gui/e-itip-control.c:696
-msgid "Bad Task Message"
-msgstr "Nerazumljivo sporočilo o nalogi"
-
-#: calendar/gui/e-itip-control.c:713
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> je objavil(a) podatke o zasedenosti."
-
-#: calendar/gui/e-itip-control.c:714
-msgid "Free/Busy Information"
-msgstr "Podatki o zasedenosti"
-
-#: calendar/gui/e-itip-control.c:718
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> zahteva vaše podatke o zasedenosti."
-
-#: calendar/gui/e-itip-control.c:719
-msgid "Free/Busy Request"
-msgstr "Zahtevek po podatkih o zasedenosti"
-
-#: calendar/gui/e-itip-control.c:723
-#, c-format
-msgid "<b>%s</b> has replyed to a free/busy request."
-msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
-
-#: calendar/gui/e-itip-control.c:724
-msgid "Free/Busy Reply"
-msgstr "Odgovor na zasedenost"
+#: calendar/gui/e-itip-control.c:1231
+msgid "Update complete\n"
+msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:729
-msgid "Bad Free/Busy Message"
-msgstr "Nerazumljivo sporočilo o zasedenosti"
+#: calendar/gui/e-itip-control.c:1276
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+"Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: calendar/gui/e-itip-control.c:940
-msgid "I couldn't update your calendar file!\n"
-msgstr "Nisem mogel posodobiti vašege datoteeke koledarja!\n"
+#: calendar/gui/e-itip-control.c:1284
+msgid "Attendee status ould not be updated!\n"
+msgstr "Stanja udeleženca ni bilo možno posodobiti\n"
 
-#: calendar/gui/e-itip-control.c:942
-msgid "Update complete\n"
-msgstr "Posodobitev končana\n"
+#: calendar/gui/e-itip-control.c:1286
+msgid "Attendee status updated\n"
+msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:967
-msgid "I couldn't remove the item from your calendar file!\n"
-msgstr "Nisem mogel odstraniti predmeta iz vaše datoteke koledarja!\n"
+#: calendar/gui/e-itip-control.c:1288
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Stanja udeleženca ni bilo možno posodobiti, ker predmet ne obstaja več"
 
-#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1316
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
-msgid "The item could not be send!\n"
-msgstr "Predmeta ni mogoče poslati!\n"
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+msgid "The item could not be sent!\n"
+msgstr "Predmeta ni bilo mogoče poslati!\n"
+
+#: calendar/gui/e-itip-control.c:1566
+msgid "Unable to find any of your identities in the attendees list!\n"
+msgstr "Ne morem najti nobene od vaših identitet v seznamu udeležencev!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -3599,30 +4463,205 @@ msgstr "končni-datum"
 msgid "date-start"
 msgstr "začetni-datum"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-meeting-model.c:95
+msgid "Chair Persons"
+msgstr "Predsedujoči"
+
+#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+msgid "Required Participants"
+msgstr "Potrebni udeleženci"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Optional Participants"
+msgstr "Možni udeleženci"
+
+#: calendar/gui/e-meeting-model.c:98
+msgid "Non-Participants"
+msgstr "Ne-udeleženci"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:532
+msgid "Individual"
+msgstr "Individualno"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+msgid "Group"
+msgstr "Skupina"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+msgid "Resource"
+msgstr "Vir"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+msgid "Room"
+msgstr "Soba"
+
+#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:292
+#: calendar/gui/e-meeting-model.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
+msgid "Unknown"
+msgstr "neznano"
+
+#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
+msgid "Chair"
+msgstr "Stol"
+
+#: calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:534
+msgid "Required Participant"
+msgstr "Potrebni udeleženci"
+
+#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
+msgid "Optional Participant"
+msgstr "Možni sodelujoči"
+
+#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
+msgid "Non-Participant"
+msgstr "Ne-sodelujoči"
+
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+#: calendar/gui/e-meeting-model.c:542
+msgid "Needs Action"
+msgstr "Potrebuje dejanje"
+
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
+msgid "Accepted"
+msgstr "Sprejeto"
+
+#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+msgid "Declined"
+msgstr "Zavrnjeno"
+
+#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
+#: calendar/gui/e-meeting-time-sel.c:426
+msgid "Tentative"
+msgstr "Poskusno"
+
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
+msgid "Delegated"
+msgstr "Delegirano"
+
+#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+msgid "In Process"
+msgstr "V obdelavi"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:471
+#: calendar/gui/e-meeting-time-sel.c:2083
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2113 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1611
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:428
+msgid "Out of Office"
+msgstr "Iz pisarne"
+
+#: calendar/gui/e-meeting-time-sel.c:429
+msgid "No Information"
+msgstr "Ni podatkov"
+
+#: calendar/gui/e-meeting-time-sel.c:465
+msgid "_Options"
+msgstr "_Možnosti"
+
+#: calendar/gui/e-meeting-time-sel.c:482
+msgid "Show _Only Working Hours"
+msgstr "Kaži le delavne ure"
+
+#: calendar/gui/e-meeting-time-sel.c:495
+msgid "Show _Zoomed Out"
+msgstr "Kaži poman_jšano"
+
+#: calendar/gui/e-meeting-time-sel.c:513
+msgid "_Update Free/Busy"
+msgstr "_Posodobi prosto/zasedeno"
+
+#: calendar/gui/e-meeting-time-sel.c:531
+msgid "_<<"
+msgstr "_<<"
+
+#: calendar/gui/e-meeting-time-sel.c:548
+msgid "_Autopick"
+msgstr "_Samodeno izberi"
+
+#: calendar/gui/e-meeting-time-sel.c:562
+msgid ">_>"
+msgstr ">_>"
+
+#: calendar/gui/e-meeting-time-sel.c:579
+msgid "_All People and Resources"
+msgstr "_Vsi ljudje in vsa sredstva"
+
+#: calendar/gui/e-meeting-time-sel.c:592
+msgid "All _People and One Resource"
+msgstr "Vsi ljudje in eno sredstvo"
+
+#: calendar/gui/e-meeting-time-sel.c:605
+msgid "_Required People"
+msgstr "_Potrebni ljudje"
+
+#: calendar/gui/e-meeting-time-sel.c:618
+msgid "Required People and _One Resource"
+msgstr "Potrebni ljudje in eno sredstvo"
+
+#: calendar/gui/e-meeting-time-sel.c:641
+msgid "Meeting _start time:"
+msgstr "Čas pričetka sestanka:"
+
+#: calendar/gui/e-meeting-time-sel.c:660
+msgid "Meeting _end time:"
+msgstr "Čas zaključka sestanka:"
+
+#: calendar/gui/e-tasks.c:328
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Odpiram naloge v %s"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
-msgstr "Nisem mogel naložiti poslov v `%s'"
+msgstr "Nisem mogel naložiti nalog v `%s'"
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, 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:3244 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/gnome-cal.c:1257
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1268
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
+#: calendar/gui/gnome-cal.c:1865
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "Odpiram koledar v %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -3679,333 +4718,351 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:243
+msgid "Atleast one attendee is necessary"
+msgstr "Potreben je vsaj en udeleženec"
+
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Organizator mora biti naveden."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr "Biti morate udeleženec dogodka."
+
+#: calendar/gui/main.c:91
+msgid "Could not create the component editor factory"
+msgstr "Nisem mogel ustvariti tovarne komponent urejevalnikov"
+
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "če"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-local-storage.c:179
-#: shell/e-shortcuts.c:1025 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Naloge"
-
 #. Day
-#: calendar/gui/print.c:1815
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izbrann dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1835
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1846
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Izbran teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1854
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Izbran mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Izbrano leto (%Y)"
 
-#: calendar/gui/print.c:2200
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
-#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1883 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:10
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/print.c:2317
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
-msgstr "URI mape poslov, ki naj se kaže"
+msgstr "URI mape nalog, ki naj se kaže"
+
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Nisem mogel ustvariti pogleda nalog. Prosim preverite nastavitve ORBit-a in "
+"OAF-a."
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolucija je vzela posle, ki so bili v vaši mapi koledarja in jih samodejno "
-"prenesla v novo mapo poslov."
+"Evolucija je vzela naloge, ki so bile v vaši mapi koledarja in jih samodejno "
+"prenesla v novo mapo nalog."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolucija je poskušala vzeti vse posle, ki so bili v vaši mapi koledarja in "
-"jih prenesti v novo mapo poslov.\n"
-"Nekaterih poslov ni bilo mogoče prenesti, zato bo ta proces v prihodnosti še "
+"Evolucija je poskušala vzeti vse naloge, ki so bile v vaši mapi koledarja in "
+"jih prenesti v novo mapo nalog.\n"
+"Nekaterih nalog ni bilo mogoče prenesti, zato bo ta proces v prihodnosti še "
 "ponovljen."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 "Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prenešen v mapo "
-"poslov."
+"nalog."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 "Metoda potrebna za naložitev `%s' ni podprta; predmeti iz mape koledarja ne "
-"bodo prenešeni v mapo poslov."
+"bodo prenešeni v mapo nalog."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "NPTSČPS"
 
-#: calendar/pcs/query.c:218
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:242
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time pričakuje 1 argument"
 
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:263
 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
+#: calendar/pcs/query.c:271
 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:284
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:289
+#: calendar/pcs/query.c:305
 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:296
+#: calendar/pcs/query.c:312
 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:323
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin pričakuje 1 argument"
 
-#: calendar/pcs/query.c:328
+#: calendar/pcs/query.c:344
 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:355
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end pričakuje 1 argument"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:376
 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:396
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:492
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:497
+#: calendar/pcs/query.c:513
 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:504
+#: calendar/pcs/query.c:520
 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:634
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:639
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:646
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? pričakuje, da je 2. argument niz"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -4013,11 +5070,11 @@ msgstr ""
 "contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
 "\" (povzetek), \"description\"(opis)"
 
-#: calendar/pcs/query.c:705
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? pričakuje vsaj 1 argument"
 
-#: calendar/pcs/query.c:717
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -4025,7 +5082,19 @@ msgstr ""
 "has-categories? pričakuje, da so vsi argumenti nizi ali da je natanko en "
 "argument boolean neresničen (#f)"
 
-#: calendar/pcs/query.c:967
+#: calendar/pcs/query.c:821
+msgid "is-completed? expects 0 arguments"
+msgstr "is-completed? ne pričakuje argumentov"
+
+#: calendar/pcs/query.c:866
+msgid "completed-before? expects 1 argument"
+msgstr "completed-before? pričakuje 1 argument"
+
+#: calendar/pcs/query.c:871
+msgid "completed-before? expects argument 1 to be a time_t"
+msgstr "completed-before? pričakuje, da je 1. argument time_t"
+
+#: calendar/pcs/query.c:1159
 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)"
@@ -4050,7 +5119,7 @@ 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
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -4061,7 +5130,7 @@ msgstr ""
 "Nadalnje operacije na tem strežniku ne bodo pomnjene, ko se boste\n"
 "znova povezali v mrežo."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -4072,70 +5141,89 @@ msgstr ""
 "%s\n"
 "Spremembe storjene v tej mapi ne bodo sinhronizirane."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Sinhroniziram s strežnikom"
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:343
 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:553 camel/camel-filter-driver.c:562
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:664
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:653
+#: camel/camel-filter-driver.c:673
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:688
 #, 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:692
+msgid "Cannot open message"
+msgstr "Ne morem dobiti sporočila"
+
+#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:672
-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:719 camel/camel-filter-driver.c:832
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:766
+#: camel/camel-filter-driver.c:789
 #, 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:794 camel/camel-filter-driver.c:812
 #, 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:921
 #, 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:927
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
+#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 
-#: camel/camel-folder-search.c:328
+#: camel/camel-folder.c:471
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nepodprto dejanje: dodaj sporočilo: za %s"
+
+#: camel/camel-folder.c:1040
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nepodprto dejanje: iskanje z izrazom: za %s"
+
+#: camel/camel-folder.c:1080
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nepodprto dejanje: iskanje po uid-jih: za %s"
+
+#: camel/camel-folder.c:1262
+msgid "Moving messages"
+msgstr "Prestavljam sporočila"
+
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -4144,7 +5232,7 @@ msgstr ""
 "Nisem mogel razčleniti iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -4153,112 +5241,112 @@ msgstr ""
 "Napaka ob izvajanju iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) zahteva enojen booleanov rezultat"
 
-#: camel/camel-folder-search.c:563
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
 
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neveljaven tip v body-contains, pričakovan niz"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Nisem mogel ustvariti cevi za pomoč pri zaklepanju: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Ne morem razvejiti pomočnika za zaklepanje: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Nisem mogel zakleniti '%s': napaka v protokolu s programom lock-helper"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Nisem se mogel zakleniti '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Ob pridobivanju ključavnice na %s je pretekla časovna omejitev. Poskusite "
 "znova kasneje."
 
-#: camel/camel-lock.c:201
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 
-#: camel/camel-lock.c:255
+#: camel/camel-lock.c:266
 #, c-format
 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:107
 #, 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:121
 #, 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:129
 #, 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:158
 #, 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:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Napaka ob branju poštne datoteke: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, 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:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
@@ -4273,95 +5361,128 @@ msgstr "Prosim vpišite svoje %s geslo za %s"
 msgid "Please enter your %s passphrase"
 msgstr "Prosim vpišite svoje %s geslo"
 
-#: camel/camel-pgp-context.c:518
-msgid "No plaintext to sign."
-msgstr "Ni besedila za podpis."
+#: camel/camel-pgp-context.c:575
+msgid "Cannot sign this message: no plaintext to sign"
+msgstr "Ne morem podpisati sporočila: osnovnega besedila ni"
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
-msgid "No password provided."
-msgstr "Geslo ni bilo dano."
+#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+msgid "Cannot sign this message: no password provided"
+msgstr "Ne morem podpisati sporočila: geslo ni podano"
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
-#: camel/camel-pgp-context.c:1302
+#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
+msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+"Ne morem podpisati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:755
+msgid "Cannot sign this message: no plaintext to clearsign"
+msgstr "Ne morem podpisati tega sporočila: ni osnovnega besedila"
+
+#: camel/camel-pgp-context.c:953
+msgid "Cannot verify this message: no plaintext to verify"
+msgstr "Ne morem preveriti tega sporočila: ni osnovnega besedila za preverbo"
+
+#: camel/camel-pgp-context.c:959
+#, c-format
+msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: "
+"%s"
+
+#: camel/camel-pgp-context.c:970
+#, c-format
+msgid "Cannot verify this message: couldn't create temp file: %s"
+msgstr ""
+"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
+"datoteke: %s"
 
-#: camel/camel-pgp-context.c:693
-msgid "No plaintext to clearsign."
-msgstr "Ni besedila za čisti podpis."
+#: camel/camel-pgp-context.c:1143
+msgid "Cannot encrypt this message: no plaintext to encrypt"
+msgstr "Ne morem zašifirati tega sporočila: ni besedila za zašifriranje"
 
-#: camel/camel-pgp-context.c:886
-msgid "No plaintext to verify."
-msgstr "Ni besedila za preverbo."
+#: camel/camel-pgp-context.c:1153
+msgid "Cannot encrypt this message: no password provided"
+msgstr "Ne morem zašifirati tega sporočia: geslo ni podano"
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:1160
 #, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Nisem mogel ustvariti začasne datoteke: %s"
+msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+"Ne morem zašifirati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1070
-msgid "No plaintext to encrypt."
-msgstr "Ni besedila za šifriranje."
+#: camel/camel-pgp-context.c:1169
+msgid "Cannot encrypt this message: no recipients specified"
+msgstr "Ne morem zašifirati tega sporočila: naslovniki niso navedeni"
 
-#: camel/camel-pgp-context.c:1096
-msgid "No recipients specified"
-msgstr "Prejemniki niso navedeni"
+#: camel/camel-pgp-context.c:1337
+msgid "Cannot decrypt this message: no ciphertext to decrypt"
+msgstr ""
+"Ne morem dešifrirati tega sporočila: ni zašifriranega besedila za "
+"dekodiranje."
 
-#: camel/camel-pgp-context.c:1287
-msgid "No ciphertext to decrypt."
-msgstr "Ni šifriranega besedila za dešifriranje."
+#: camel/camel-pgp-context.c:1345
+msgid "Cannot decrypt this message: no password provided"
+msgstr "Ne morem dešifrirati tega sporočila: geslo ni podano"
 
-#: camel/camel-provider.c:131
+#: camel/camel-pgp-context.c:1352
+#, c-format
+msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+"Ne morem dešifrirati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %"
+"s"
+
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nisem mogel naložiti %s: Nalaganje modulov na tem sistemu ni podprto."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nisem mogel naložiti %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nisem mogel naložiti %s: V modulu ni inicializacijske kode."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s server %s"
 msgstr "strežnik %s %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:207
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "storitev %s za %s na %s"
 
-#: camel/camel-remote-store.c:252
+#: camel/camel-remote-store.c:264
 msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
-#: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/camel-remote-store.c:267
+#: 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"
 
-#: camel/camel-remote-store.c:256
+#: camel/camel-remote-store.c:268
 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:386
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:481
+#: camel/providers/imap/camel-imap-command.c:228
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
-#: camel/camel-remote-store.c:489
-msgid "Server unexpectedly disconnected"
-msgstr "Povezava s strežnikom je bila nepričakovano prekinjena"
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:274
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
 
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
@@ -4471,7 +5592,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:495
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -4488,8 +5609,8 @@ msgid "Unknown authentication state."
 msgstr "Neznano stanje avtentifikacije."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:53
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Geslo"
 
@@ -4513,60 +5634,60 @@ msgstr "Avtentifikacija POP pred SMTP z uporabo neznanega transporta"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Avtentifikacija POP pred SMTP z uporabo ne-pop vira"
 
-#: camel/camel-search-private.c:111
+#: camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniškega imena"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Razvozlujem: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Napaka ob poizvedbi imena: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
-#: camel/camel-session.c:68
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Nuditelj virutalne mape e-pošte"
 
-#: camel/camel-session.c:70
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
 
-#: camel/camel-session.c:297 camel/camel-session.c:366
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:483
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4594,25 +5715,33 @@ msgstr "Podpisni certifikat za \"%s\" ne obstaja."
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Šifrirni certifikat za \"%s\" ne obstaja."
 
-#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
-#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Nisem mogel najti certifikata za \"%s\"."
 
-#: camel/camel-smime-context.c:545
+#: camel/camel-smime-context.c:556
 msgid "Failed to find a common bulk algorithm."
 msgstr "Nisem mogel najti skupnega algoritma."
 
-#: camel/camel-smime-context.c:799
+#: camel/camel-smime-context.c:810
 msgid "Failed to decode message."
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/camel-smime-context.c:844
+#: camel/camel-smime-context.c:855
 msgid "Failed to verify certificates."
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-store.c:220
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Ne morem dobiti mape: neveljavno dejanje na tej shrambi"
+
+#: camel/camel-store.c:282
+msgid "Cannot create folder: Invalid operation on this store"
+msgstr "Ne morem ustvariti mape: neveljavno dejanje na tej shrambi"
+
+#: camel/camel-tcp-stream-openssl.c:519
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4622,7 +5751,7 @@ msgstr ""
 "Zadeva: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4637,7 +5766,7 @@ msgstr ""
 "\n"
 "Ga želite vseeno sprejeti?"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-ssl.c:422
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -4656,92 +5785,120 @@ msgstr ""
 "Regija/Zvezna država: %s\n"
 "Država: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, 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:588
 #, 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:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Ni takšnega sporočila: %s"
 
-#: camel/camel-vtrash-folder.c:109
+#: camel/camel-vee-store.c:258
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
+
+#: camel/camel-vee-store.c:293
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
+
+#: camel/camel-vee-store.c:306
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
+
+#: camel/camel-vee-store.c:314
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
+
+#: camel/camel-vtrash-folder.c:117
 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:329
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:339
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:394
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "Odgovor strežnika se je prehitro končal."
 
-#: camel/providers/imap/camel-imap-command.c:586
+#: camel/providers/imap/camel-imap-command.c:608
 #, 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:622
+#: camel/providers/imap/camel-imap-command.c:644
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan OK odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:190
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:209
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:273
+#: camel/providers/imap/camel-imap-folder.c:277
 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:435
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1478
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1566
+#: camel/providers/imap/camel-imap-folder.c:1978
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1620
-#: camel/providers/imap/camel-imap-folder.c:1701
+#: camel/providers/imap/camel-imap-folder.c:1717
+#: camel/providers/imap/camel-imap-folder.c:1798
 msgid "Fetching summary information for new messages"
 msgstr "Prenašam povzetke novih sporočil"
 
-#: camel/providers/imap/camel-imap-folder.c:1626
+#: camel/providers/imap/camel-imap-folder.c:1723
 msgid "Scanning for new messages"
 msgstr "Pregledujem za novimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1935
+#: camel/providers/imap/camel-imap-folder.c:2015
 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
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, 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:14
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
+#, c-format
+msgid "Failed to cache message %s: %s"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
 
@@ -4749,7 +5906,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:655
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Mape"
 
@@ -4770,8 +5927,8 @@ msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Uveljavi filtre na novih sporočiliv v mapi INBOX tega strežnika"
 
 #: camel/providers/imap/camel-imap-provider.c:63
-msgid "IMAPv4"
-msgstr "IMAPv4"
+msgid "IMAP"
+msgstr "IMAP"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
@@ -4781,28 +5938,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:518
 #, 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:388
+#: camel/providers/imap/camel-imap-store.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, 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:552
 #, 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:432
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:430
 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:596
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4813,106 +5970,122 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:837 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:899
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1037
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
-msgstr "Poštni imeniki tipa MH"
+msgstr "Poštni imeniki vrste MH"
 
-#: camel/providers/local/camel-local-provider.c:41
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Za shranjevanje krajevne pošte v imenikih tipa MH"
+#: camel/providers/local/camel-local-provider.c:43
+msgid "For storing local mail in MH-like mail directories."
+msgstr "Za shranjevanje krajevne pošte v imenikih vrste MH."
 
-#: camel/providers/local/camel-local-provider.c:50
-msgid "Standard Unix mailbox file"
-msgstr "Običajna Unix datoteka poštnega predala"
+#: camel/providers/local/camel-local-provider.c:52
+msgid "Local delivery"
+msgstr "Krajevna dostava"
 
-#: camel/providers/local/camel-local-provider.c:51
-msgid "For storing local mail in standard mbox format"
-msgstr "Za shranjevanje krajevne pošte v datoteki tipa mbox"
+#: camel/providers/local/camel-local-provider.c:53
+msgid "For retrieving local mail from standard mbox formated spools."
+msgstr "Za pobiranje krajevne pošte iz datotek vrste mbox."
 
-#: camel/providers/local/camel-local-provider.c:60
-msgid "Qmail maildir-format mail files"
-msgstr "Poštne datoteke tipa Qmail"
+#: camel/providers/local/camel-local-provider.c:62
+msgid "Apply filters to new messages in INBOX"
+msgstr "Uveljavi filtre na novih sporočilih v mapi INBOX tega strežnika"
 
-#: camel/providers/local/camel-local-provider.c:61
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Za shranjevanje krajevne pošte v imenikih tipa qmail"
+#: camel/providers/local/camel-local-provider.c:68
+msgid "Maildir-format mail directories"
+msgstr "Poštni imeniki vrste maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "Unix mbox spool-format mail files"
-msgstr "Poštne datoteke tipa 'spool'"
+#: camel/providers/local/camel-local-provider.c:69
+msgid "For storing local mail in maildir directories."
+msgstr "Za shranjevanje krajevne pošte v imenikih vrste maildir."
 
-#: camel/providers/local/camel-local-provider.c:71
-msgid "For storing local mail in standard Unix spool directories"
-msgstr "Za shranjevanje krajevne pošte v običajnih Unix 'spool' imenikih"
+#: camel/providers/local/camel-local-provider.c:80
+msgid "Standard Unix mbox spools"
+msgstr "Običajni Unix poštni predali mbox"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:111
+#: camel/providers/local/camel-local-provider.c:81
+msgid "For reading and storing local mail in standard mbox spool files."
+msgstr ""
+"Za branje in shranjevanje krajevne pošte v običajnih Unix mbox datotekah"
+
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Korenski imenik shrambe %s ni absolutna pot"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Krajevno shrambe nimajo vhodnega predala"
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 
-#: camel/providers/local/camel-local-store.c:279
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 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:367
+#, c-format
+msgid "Could not save summary: %s: %s"
+msgstr "Nisem mogel odpreti povzetka: %s: %s"
+
+#: camel/providers/local/camel-local-summary.c:423
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
-#: camel/providers/local/camel-maildir-folder.c:176
+#: camel/providers/local/camel-maildir-folder.c:181
+msgid "Maildir append message cancelled"
+msgstr "Dodajanje sporočila v mailidr preklicano"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Ne morem dodati sporočila v mapo tipa maildir: %s: %s"
+msgstr "Ne morem dodati sporočila v mapo vrste maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:209
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-mh-folder.c:204
-#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4921,20 +6094,20 @@ msgstr ""
 "Ne morem dobiti sporočila: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Ni takšnega sporočila"
 
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:231
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:103
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -4943,15 +6116,15 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:107
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, 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-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -4960,23 +6133,23 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:129
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
-msgstr "`%s' ni imenik tipa maildir."
+msgstr "`%s' ni imenik vrste maildir."
 
-#: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-maildir-store.c:202
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, 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:167
 msgid "not a maildir directory"
-msgstr "ni imenik tipa maildir"
+msgstr "ni imenik vrste maildir"
 
-#: camel/providers/local/camel-maildir-store.c:276
+#: camel/providers/local/camel-maildir-store.c:331
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisem mogel prebrati mape `%s': %s"
@@ -4987,29 +6160,33 @@ msgstr "Nisem mogel prebrati mape `%s': %s"
 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
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, 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:209
-#: camel/providers/local/camel-spool-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+msgid "Mail append cancelled"
+msgstr "Dodajanje sporočila razveljavljeno"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Ne morem pripeti sporočila k datoteki tipa mbox: %s: %s"
+msgstr "Ne morem pripeti sporočila k datoteki vrste mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:344
-#: camel/providers/local/camel-mbox-folder.c:376
-#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:548
-#: camel/providers/local/camel-spool-folder.c:580
-#: camel/providers/local/camel-spool-folder.c:593
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:391
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:639
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -5018,17 +6195,17 @@ msgstr ""
 "Ne morem dobiti sporočila: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:581
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 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:390
-#: camel/providers/local/camel-spool-folder.c:594
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:640
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -5037,7 +6214,7 @@ msgstr ""
 "Ne morem odpreti datoteke '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -5046,14 +6223,14 @@ msgstr ""
 "Nisem mogel ustvariti datoteke `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni običajna datoteka."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -5062,107 +6239,110 @@ msgstr ""
 "Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 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 "Summarizing folder"
-msgstr "Delam povzetek mape"
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
+msgid "Storing folder"
+msgstr "Shranjujem mapo"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
-msgid "Could not open folder: %s: summarizing from position %ld: %s"
-msgstr "Nisem mogel odpreti mape: %s: povzetek delam od položaja %ld dalje: %s"
+msgid "Could not open folder: %s: %s"
+msgstr "Nisem mogel odpreti imenika %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, 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-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
-msgid "Cannot summarize folder: %s: %s"
-msgstr "Ne morem narediti povzetka mape: %s: %s"
+msgid "Cannot check folder: %s: %s"
+msgstr "Ne morem preveriti 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:1549
-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:648
 #, c-format
-msgid "Could not open folder to summarize: %s: %s"
-msgstr "Nisem mogel odpreti mape za izdelavo povzetka: %s: %s"
+msgid "Could not open file: %s: %s"
+msgstr "Nisem mogel odpreti datoteke: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:524
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
-#: camel/providers/local/camel-mbox-summary.c:557
-#: camel/providers/local/camel-mbox-summary.c:746
-#: camel/providers/local/camel-mbox-summary.c:754
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:974
-#: camel/providers/local/camel-spool-summary.c:982
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 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
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, 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
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, 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
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 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:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+msgid "MH append message cancelled"
+msgstr "Dodajanje sporočila v MH preklicano"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Ne morem dodati sporočila v mapo tipa mh: %s: %s"
+msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ni imenik."
@@ -5172,64 +6352,49 @@ 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
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Ne morem pripeti sporočila k datoteki vrste 'spool': %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:132
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mapa `%s/%s' ne obstaja."
 
-#: camel/providers/local/camel-spool-store.c:176
-msgid "Spool stores do not have an inbox"
-msgstr "Shramba vrste 'Spool' nima dohodnega predala"
-
-#: camel/providers/local/camel-spool-store.c:186
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Datoteka vrste 'spool' s pošto %s"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Map vrste 'spool' ni možno preimenovati"
 
-#: camel/providers/local/camel-spool-store.c:230
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Map vrste 'spool' ni možno zbrisati."
 
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Ne morem narediti povzetka mape %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:649
-#: camel/providers/local/camel-spool-summary.c:936
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:784
-#: camel/providers/local/camel-spool-summary.c:793
-#: camel/providers/local/camel-spool-summary.c:802
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nisem mogel uskladiti začasne mape %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:817
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nisem mogel uskladiti mape vrste 'spool' %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:847
-#: camel/providers/local/camel-spool-summary.c:865
-#: camel/providers/local/camel-spool-summary.c:877
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -5238,112 +6403,121 @@ msgstr ""
 "Nisem mogel uskladiti mape vrste 'spool' %s: %s\n"
 "Mapa je morda pokvarjena, kopija shranjena v `%s'"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/local/camel-spool-summary.c:940
+#, c-format
+msgid "Could not file: %s: %s"
+msgstr "Nisem mogel shraniti: %s: %s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Prosim vpišite geslo NNTP za %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Strežnik je zavrnil uporabniško ime"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Nisem uspel poslati uporabniškega imena strežniku"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Strežnik je zavrnil uporabniško ime/geslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 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:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, 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:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET novičke"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 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:230
 #, 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:296
 #, 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:303
 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:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Prenašam povzetek POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nisem mogel preveriti strežnika POP za nova sporočila: %s."
 
-#: camel/providers/pop3/camel-pop3-folder.c:239
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nisem mogel odpreti mape: seznam sporočil je bil nepopoln."
 
-#: camel/providers/pop3/camel-pop3-folder.c:332
+#: camel/providers/pop3/camel-pop3-folder.c:252
+msgid "Expunging deleted messages"
+msgstr "Uničujem zbrisana sporočila"
+
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nisem mogel dobiti sporočila: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:348
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nisem uspel prenesti sporočila s strežnika POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:375
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Prenašam sporočilo POP %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Hramba sporočil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Pusti sporočila na strežniku"
 
@@ -5352,18 +6526,13 @@ 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:52
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:50
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Za povezovanje s strežniki POP. Protokol POP se lahko uporabi tudi za "
-"prenašanje pošte iz nekaterih spletnih nuditeljev pošte in zaprtih sistemov "
-"e-pošte."
+#: camel/providers/pop3/camel-pop3-provider.c:52
+msgid "For connecting to and downloading mail from POP servers."
+msgstr "Za povezovanje in prenašanje pošte s strežnikov POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
@@ -5390,27 +6559,27 @@ msgstr ""
 "To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
 "avtentifikacijo."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nisem se mogel povezati s strežnikom: %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nisem se mogel povezati s strežnikom POP na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sProsim vpišite POP3 geslo za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -5419,12 +6588,12 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju uporabniškega imena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Neznana)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -5432,7 +6601,7 @@ msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -5441,192 +6610,197 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:71
+#: camel/providers/pop3/camel-pop3-store.c:566
+#, c-format
+msgid "Unexpected response from POP server: %s"
+msgstr "Nepričakovan odgovor strežnika POP: %s"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Program sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "Za dostavljanjem pošte preko programa \"sendmail\" na krajevnem sistemu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Nisem mogel ustvariti cevi do programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nisem mogel vejiti programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nisem mogel poslati sporočila: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "program sendmail je zaključil s signalom %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nisem mogel izvršiti %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "program sendmail je zaključil s stanjem %d: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "V sporočilu nisem našel naslova 'From' (pošiljatelja)."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "program sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:64
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: 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:173
+#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: 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:179
+#: 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:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Sporčilo pomoči"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: 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:187
+#: 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:189
+#: 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:191
+#: 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:193
+#: 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:195
+#: 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:197
+#: 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:199
+#: 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:201
+#: 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:203
+#: 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:205
+#: 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:207
+#: 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:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: 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:215
+#: 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:217
+#: 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:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Začasna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: 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:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, 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:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, 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:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5637,175 +6811,186 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 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:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 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:595 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, 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:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, 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:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "Avtentifikacija SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, 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:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, 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:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, 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:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, 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:1006
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, 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:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1086
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Napaka v odgovoru na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, 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:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:478
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:509
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:510
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Ne morem pripeti datoteke %s: %s"
+
+#: composer/e-msg-composer-attachment.c:176
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Ne morem pripeti datoteke %s: ni običajna datoteka"
+
 #: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Lastnosti priloge"
@@ -5816,7 +7001,7 @@ msgstr "Ime datoteke:"
 
 #: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
-msgstr "Tip MIME:"
+msgstr "Vrsta MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
 #: composer/e-msg-composer-select-file.c:135
@@ -5881,16 +7066,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer.c:670
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti datoteke: %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:683
+#: composer/e-msg-composer.c:700
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5899,29 +7075,29 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:898
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:907
 msgid "Warning!"
 msgstr "Opozorilo!"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:911
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiši?"
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:933
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:952
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:1023
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5929,16 +7105,16 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1073
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1081
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1088
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5947,7 +7123,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1095
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5956,7 +7132,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1104
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5965,15 +7141,15 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1206
 msgid ""
-"Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Ximian Evolution has found unsaved files from a previous session.\n"
+"Would you like to try to recover them?"
 msgstr ""
-"Evolucija je zaznala neshranjene datoteke iz prejšnje seje.\n"
-"Želite poskusiti obnovitev?"
+"Evolucija je zaznala neshranjene datoteke iz prejšnjih sej.\n"
+"Jih želite poskusiti obnoviti?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1360
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5983,28 +7159,39 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1331 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:216
-msgid "Evolution"
-msgstr "Evolucija"
+#: composer/e-msg-composer.c:1367
+msgid "Warning: Modified Message"
+msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/e-msg-composer.c:1354
+#: composer/e-msg-composer.c:1390
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1503
+#: composer/e-msg-composer.c:1539
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:1877 composer/e-msg-composer.c:2318
+#: composer/e-msg-composer.c:1922 composer/e-msg-composer.c:2375
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2408
-msgid "Could not create composer window."
-msgstr "Nisem mogel ustvariti okna skladatelja."
+#: composer/e-msg-composer.c:2392
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Nisem mogel ustvariti okna skladatelja:\n"
+"Nisem mogel aktivirati gradnika za izbiro naslova."
 
-#: composer/evolution-composer.c:359
+#: composer/e-msg-composer.c:2415 composer/e-msg-composer.c:2470
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nisem mogel ustvariti okna skladatelja:\n"
+"Ne morem aktivirati komponente urejevalnika HTML."
+
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -6012,10 +7199,14 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
 "identitet v komponenti pošte."
 
-#: composer/evolution-composer.c:374
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega sestavljalca."
 
+#: data/evolution.desktop.in.h:1 shell/main.c:83
+msgid "Evolution"
+msgstr "Evolucija"
+
 #: data/evolution.desktop.in.h:2
 msgid "The Evolution groupware suite"
 msgstr "Evolucijino programje za delo v skupini"
@@ -6041,86 +7232,119 @@ msgid "Body or subject contains"
 msgstr "Telo ali zadeva vsebuje"
 
 #: default_user/searches.xml.h:4
+msgid "Message contains"
+msgstr "Sporočilo vsebuje"
+
+#: default_user/searches.xml.h:5
 msgid "Recipients contain"
 msgstr "Prejemniki vsebujejo"
 
-#: default_user/searches.xml.h:5
+#: default_user/searches.xml.h:6
 msgid "Sender contains"
 msgstr "Pošiljatelj vsebuje"
 
-#: default_user/searches.xml.h:6
+#: default_user/searches.xml.h:7
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
-#: default_user/searches.xml.h:7
+#: default_user/searches.xml.h:8
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#. 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
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
+#. Remember the password?
+#: e-util/e-passwords.c:360 mail/mail-session.c:267
+msgid "Remember this password"
+msgstr "Zapomni si geslo"
+
+#: e-util/e-passwords.c:362 mail/mail-session.c:268
+msgid "Remember this password for the remainder of this session"
+msgstr "Pomni geslo do konca seje"
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:178
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%a %d/%m/%Y %I %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:183
+msgid "%a %m/%d/%Y %H"
+msgstr "%a %d/%m/%Y %H"
+
+#. strptime format of a date and a time, in 12-hour format.
+#: e-util/e-time-utils.c:194
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format.
+#: e-util/e-time-utils.c:198
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%d/%m/%Y %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:203
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%d/%m/%Y %I:%M %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:208
+msgid "%m/%d/%Y %H:%M"
+msgstr "%d/%m/%Y %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:213
+msgid "%m/%d/%Y %I %p"
+msgstr "%d/%m/%Y %I %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:218
+msgid "%m/%d/%Y %H"
+msgstr "%d/%m/%Y %H"
 
 #. 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:303 e-util/e-time-utils.c:402
 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:307 e-util/e-time-utils.c:394
 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
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1419 widgets/misc/e-dateedit.c:1646
 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:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1643
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
-msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
-
-#: e-util/e-time-utils.c:241
-msgid "%Y/%m/%d"
-msgstr "%d/%m/%Y"
-
-#: e-util/e-time-utils.c:242
-#, c-format
-msgid "%x"
-msgstr "%x"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-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
-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
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+#. strptime format for hour and AM/PM, 12-hour format.
+#: e-util/e-time-utils.c:320
+msgid "%I %p"
+msgstr "%I %p"
 
 #: filter/filter-datespec.c:80
 msgid "year"
@@ -6163,12 +7387,12 @@ msgid "seconds"
 msgstr " sekund"
 
 #: filter/filter-datespec.c:194
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Opa. Pozabili ste izbrati datum."
+msgid "You have forgotten to choose a date."
+msgstr "Pozabili ste izbrati datum."
 
 #: filter/filter-datespec.c:196
-msgid "Oops. You have chosen an invalid date."
-msgstr "Opa. Izbrali ste neveljaven datum."
+msgid "You have chosen an invalid date."
+msgstr "Izbrali ste neveljaven datum."
 
 #: filter/filter-datespec.c:271
 msgid ""
@@ -6211,6 +7435,11 @@ msgstr "čas, ki ga navedete"
 msgid "a time relative to the current time"
 msgstr "čas, relatievn trenutnemu"
 
+#. The dialog
+#: filter/filter-datespec.c:394
+msgid "Select a time to compare against"
+msgstr "Izberi čas s katerim naj se primerja"
+
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
@@ -6228,7 +7457,7 @@ msgstr " nazaj "
 msgid "ago"
 msgstr "nazaj"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:936
+#: filter/filter-datespec.c:711 mail/message-list.c:930
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -6236,41 +7465,41 @@ msgstr "%d %b %l:%M %p"
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Pravila filtriranja"
 
 #. and now for the action area
-#: filter/filter-filter.c:452
+#: filter/filter-filter.c:487
 msgid "Then"
 msgstr "Potem"
 
-#: filter/filter-filter.c:466
+#: filter/filter-filter.c:501
 msgid "Add action"
 msgstr "Dodaj dejanje"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
-"Oops, you forgot to choose a folder.\n"
+"You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
-"Opa, pozabili ste izbrati mapo.\n"
-"Prosim pojdite nazaj in navedite veljavno mapo kamor naj se pošta dostavi."
+"Pozabili ste izbrati mapo.\n"
+"Pojdite nazaj in navedite veljavno mapo v katero naj se dostavlja pošta."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:808
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
+#: mail/mail-account-gui.c:837
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Vnesite URI mape"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter-input.c:197
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6283,67 +7512,63 @@ msgstr ""
 msgid "Test"
 msgstr "Preizkus"
 
-#: filter/filter-rule.c:626
+#: filter/filter-rule.c:217
+msgid "You must name this filter."
+msgstr "Filtru morate dati ime."
+
+#: filter/filter-rule.c:720
 msgid "Rule name: "
 msgstr "Ime pravila: "
 
-#: filter/filter-rule.c:630
+#: filter/filter-rule.c:724
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:741
 msgid "If"
 msgstr "Če"
 
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:759
 msgid "Execute actions"
 msgstr "Izvrši dejanja"
 
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:763
 msgid "if all criteria are met"
 msgstr "če je zadoščeno vsem pogojem"
 
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:768
 msgid "if any criteria are met"
 msgstr "če je zadoščeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:779
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:864
 msgid "incoming"
 msgstr "dohodna"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:864
 msgid "outgoing"
 msgstr "odhodna"
 
 #: filter/filter.glade.h:1
-msgid "Add"
-msgstr "Dodaj"
-
-#: filter/filter.glade.h:3
-msgid "Edit"
-msgstr "Uredi"
-
-#: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Uredi filtre"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Uredi vMape"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Dohodna"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Odhodna"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
@@ -6367,193 +7592,192 @@ msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
 msgid "with all local folders"
 msgstr "z vsemi krajevnimi mapami"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Dodeli barvo"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Dodeli točke"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Priloge"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "vsebuje"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Zbrisano"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "ne vsebuje"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "se ne konča z"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "ne obstaja"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "ne zveni kot"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "se ne začne z"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Osnutek"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "se konča z"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "obstaja"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Pomembno"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "je"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "je večje"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "je manjše"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "ni"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Glava sporočila"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Sporočilo je bilo sprejeto"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Sporočilo je bilo poslano"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "na ali po"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "na ali pred"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Beri"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Točke"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "zveni kot"
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "se začne z"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:908
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "vsebuje"
-
-#: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "ne vsebuje"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "se ne konča z"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "ne obstaja"
-
-#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "ne zveni kot"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "se ne začne z"
-
-#: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "se konča z"
-
-#: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "obstaja"
-
-#: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "je večje"
-
-#: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "je manjše"
-
-#: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "ni"
-
-#: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "na ali po"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "na ali pred"
-
-#: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "zveni kot"
-
-#: filter/libfilter-i18n.h:51
-msgid "starts with"
-msgstr "se začne z"
-
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "je bilo po"
@@ -6562,15 +7786,15 @@ msgstr "je bilo po"
 msgid "was before"
 msgstr "je bilo pred"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Pravila"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
@@ -6578,22 +7802,46 @@ 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 "Opa. Kot vir morate navesti vsaj eno mapo."
+#: filter/vfolder-rule.c:204
+msgid "You must name this vfolder."
+msgstr "vMapi morate dati ime."
 
-#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:814 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:651 shell/importer/intelligent.c:194
-msgid "Import"
-msgstr "Uvozi"
+#: filter/vfolder-rule.c:213
+msgid "You need to to specify at least one folder as a source."
+msgstr "Kot vir morate navesti vsaj eno mapo."
+
+#: importers/elm-importer.c:95
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolucija uvaža vašo staro pošto Elm."
+
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
+msgid "Importing..."
+msgstr "Uvažam..."
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
+msgid "Please wait"
+msgstr "Prosim pokačajte"
+
+#: importers/elm-importer.c:169 importers/netscape-importer.c:689
+#: importers/pine-importer.c:365
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Uvažam %s kot %s"
+
+#: importers/elm-importer.c:375 importers/netscape-importer.c:782
+#: importers/pine-importer.c:471
+#, c-format
+msgid "Scanning %s"
+msgstr "Pregledujem %s"
+
+#: importers/elm-importer.c:525 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Pošta"
 
-#: importers/elm-importer.c:498
+#: importers/elm-importer.c:545
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -6601,15 +7849,15 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Elm.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/elm-importer.c:527
-msgid "Elm mail"
-msgstr "Poštni program Elm"
+#: importers/elm-importer.c:574
+msgid "Elm"
+msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adresar"
 
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6617,11 +7865,23 @@ msgstr ""
 "Evolucija je našla datoteke GnomeCard-a.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:106
+msgid "Evolution is importing your old Netscape data"
+msgstr "Evolucija uvaža vaše podatke iz Netscapea"
+
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+msgid "Scanning directory"
+msgstr "Pregledujem mapo"
+
+#: importers/netscape-importer.c:897
+msgid "Starting import"
+msgstr "Pričenjam uvoz"
+
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6629,6 +7889,10 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Netscape.\n"
 "Jih želite uvoziti v Evolucijo?"
 
+#: importers/pine-importer.c:100
+msgid "Evolution is importing your old Pine data"
+msgstr "Evolucija uvaža vaše podatke iz Pinea"
+
 #: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
@@ -6638,8 +7902,8 @@ msgstr ""
 "Jih želite uvoziti v Evolucijo?"
 
 #: importers/pine-importer.c:691
-msgid "Pine mail"
-msgstr "Poštni program Pine"
+msgid "Pine"
+msgstr "Program Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
@@ -6666,183 +7930,254 @@ 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
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Mail configuration interface"
 msgstr "Vmesnik za nastavitev pošte"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:100
+msgid "Folder containing mail"
+msgstr "Mapa, ki vsebuje pošto"
+
+#: mail/component-factory.c:101
+msgid "Mail storage folder (internal)"
+msgstr "Mapa v kateri se hrani pošta (notranja)"
+
+#: mail/component-factory.c:102
+msgid "Virtual Trash"
+msgstr "Navidezne smeti"
+
+#: mail/component-factory.c:102
+msgid "Virtual Trash folder"
+msgstr "Mapa navideznih smeti"
+
+#: mail/component-factory.c:129
+#, c-format
+msgid "Cannot connect to store: %s"
+msgstr "Nisem se mogel povezati s hrambo: %s"
+
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Ta mapa ne more vsebovati sporočil."
 
-#: mail/component-factory.c:331
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: mail/component-factory.c:331
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Spremeni lastnosti te mape"
 
-#: mail/component-factory.c:738
+#: mail/component-factory.c:783
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+"Nekatere vaše nastavitve pošte se zdijo neveljavne. Prosim, preverite, če je "
+"vse v redu."
+
+#: mail/component-factory.c:951
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/component-factory.c:738
+#: mail/component-factory.c:951
 msgid "New _Mail Message"
 msgstr "Novo _poštno sporočilo"
 
-#: mail/component-factory.c:770
+#: mail/component-factory.c:975
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:907
+#: mail/component-factory.c:984
+msgid "Cannot initialize Evolution's mail config component."
+msgstr "Ne morem inicializirati Evolucijine komponente za nastavitev pošte."
+
+#: mail/component-factory.c:990
+msgid "Cannot initialize Evolution's folder info component."
+msgstr "Ne morem inicializirati Evolucijine komponente za podatke o mapah"
+
+#: mail/component-factory.c:1206
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-ui.c:258
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: mail/folder-browser.c:233 mail/mail-display.c:281
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/folder-browser.c:906
+#: mail/folder-browser.c:731
+#, c-format
+msgid "%d new"
+msgstr "%d novih"
+
+#: mail/folder-browser.c:734 mail/folder-browser.c:739
+#: mail/folder-browser.c:761
+msgid ", "
+msgstr ", "
+
+#: mail/folder-browser.c:735
+#, c-format
+msgid "%d hidden"
+msgstr "%d skritih"
+
+#: mail/folder-browser.c:740
+#, c-format
+msgid "%d selected"
+msgstr "%d izbranih"
+
+#: mail/folder-browser.c:763
+#, c-format
+msgid "%d unsent"
+msgstr "%d neposlanih"
+
+#: mail/folder-browser.c:765
+#, c-format
+msgid "%d sent"
+msgstr "%d poslanih"
+
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d total"
+msgstr "skupaj %d"
+
+#: mail/folder-browser.c:1049
 msgid "Create vFolder from Search"
 msgstr "Ustvari vMapo iz iskanja"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1430
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1431
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1432
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1433
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1437
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1438
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1439
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1440
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:96
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:1290
+#: mail/folder-browser.c:1450
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1301
+#: mail/folder-browser.c:1457
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1306 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1308
+#: mail/folder-browser.c:1461
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/folder-browser.c:1310
+#: mail/folder-browser.c:1462
 msgid "Mark as Unim_portant"
 msgstr "Označi kot ne_pomembno"
 
-#: mail/folder-browser.c:1315
+#: mail/folder-browser.c:1466
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:1317
+#: mail/folder-browser.c:1467
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "O_dbriši"
 
-#: mail/folder-browser.c:1326
+#: mail/folder-browser.c:1473
 msgid "Add Sender to Address Book"
 msgstr "Pošiljatelja dodaj v adresar"
 
-#: mail/folder-browser.c:1331
+#: mail/folder-browser.c:1476
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1335
+#: mail/folder-browser.c:1478
 msgid "Create Ru_le From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1628
 msgid "Filter on Mailing List"
 msgstr "Filter glede na dopisni seznam"
 
-#: mail/folder-browser.c:1494
+#: mail/folder-browser.c:1629
 msgid "VFolder on Mailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1631
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1632
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
 
-#: mail/folder-info.c:60
+#: mail/folder-browser.h:26
+msgid "Default"
+msgstr "Privzeto"
+
+#: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Dobivam podatke o mapi"
 
@@ -6863,18 +8198,26 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
 
 #: mail/local-config.glade.h:1
+msgid "Body contents"
+msgstr "Telo vsebuje"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Trenutna oblika hranjenja:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+msgid "Indexing:"
+msgstr "Ustvarjanje kazala:"
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
-msgstr "Tip poštnega predala"
+msgstr "Vrsta poštnega predala"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "Nova oblika hranjenja:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -6884,15 +8227,15 @@ msgstr ""
 "napaka (na primer pomanjkanje prosotra na disku) ni nujno samodejno\n"
 " odpravljiva. Prosimo to možnost uprabljajte pazljivo."
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -6906,15 +8249,19 @@ msgid "Evolution News Editor"
 msgstr "Urejevalnik Evolucijinih novic"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:160
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:998
+#: mail/mail-account-gui.c:962
+msgid "Could not save signature file."
+msgstr "Nisem mogel shraniti datoteke s podpisom."
+
+#: mail/mail-account-gui.c:1039
 msgid "Save signature"
 msgstr "Shrani podpis"
 
-#: mail/mail-account-gui.c:1004
+#: mail/mail-account-gui.c:1045
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6924,64 +8271,48 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: mail/mail-accounts.c:145
+#: mail/mail-account-gui.c:1654
+msgid "You may not create two accounts with the same name."
+msgstr "Ne morete ustvariti dveh računov z enakim imenom."
+
+#: mail/mail-accounts.c:149
 msgid " (default)"
 msgstr " (privzeto)"
 
-#: mail/mail-accounts.c:190
+#: mail/mail-accounts.c:194
 msgid "Disable"
 msgstr "Izključi"
 
-#: mail/mail-accounts.c:192
+#: mail/mail-accounts.c:196
 msgid "Enable"
 msgstr "Vključi"
 
-#: mail/mail-accounts.c:280
+#: mail/mail-accounts.c:293
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepričani, da želite zbrisati ta račun?"
 
-#: mail/mail-accounts.c:284
+#: mail/mail-accounts.c:297
 msgid "Don't delete"
 msgstr "Ne zbriši"
 
-#: mail/mail-accounts.c:287
+#: mail/mail-accounts.c:300
 msgid "Really delete account?"
 msgstr "Resnično zbriši račun?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
 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:757 mail/mail-config.glade.h:41
+#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-autofilter.c:70
-#, c-format
-msgid "Mail to %s"
-msgstr "Pošta za %s"
-
-#: mail/mail-autofilter.c:213
-#, c-format
-msgid "Subject is %s"
-msgstr "Zadeva je %s"
-
-#: mail/mail-autofilter.c:229
-#, c-format
-msgid "Mail from %s"
-msgstr "Pošta od %s"
-
-#: mail/mail-autofilter.c:285
-#, c-format
-msgid "%s mailing list"
-msgstr "%s poštnih seznamov"
-
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6993,7 +8324,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -7001,7 +8332,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -7009,11 +8340,24 @@ msgstr ""
 "Nastaviti morate način prenosa pošte\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Niste nastavili postopka prenašanja pošte"
 
-#: mail/mail-callbacks.c:217
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:265
+msgid ""
+"You are sending an HTML-formatted message, but the following recipients do "
+"not want HTML-formatted mail:\n"
+msgstr ""
+"Pošiljate pošto v obliki HTML, a naslednji prejemniki ne želijo prejemati "
+"takšne pošte:\n"
+
+#: mail/mail-callbacks.c:280
+msgid "Send anyway?"
+msgstr "Vseeno pošlji?"
+
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -7021,49 +8365,62 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:366
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Ker je seznam kontaktov, ki mu pošiljate, nastavljen, da skrije seznam "
+"naslovov, bo to sporočilo vsebovalo le naslovnike bcc."
+
+#: mail/mail-callbacks.c:370
+msgid "This message contains only Bcc recipients."
+msgstr "To sporočilo vsebuje le prejemnike bcc"
+
+#: mail/mail-callbacks.c:374
 msgid ""
-"This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"To sporočilo vsebuje le prejemnike bcc.\n"
 "Možno je, da poštni strežnik razkrije prejemnike z dodatkom glave Apparenlty-"
-"To (Očitno-za).\n"
+"To(očitno-za).\n"
 "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:469
+msgid "This message contains invalid recipients:"
+msgstr "To sporočilo vsebuje neveljavne prejemnike:"
+
+#: mail/mail-callbacks.c:504
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:600
 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:632
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "Na %s, je %s zapisal(a):"
+#: mail/mail-callbacks.c:838
+msgid "an unknown sender"
+msgstr "neznan pošiljatelj"
 
-#: mail/mail-callbacks.c:893
-msgid "Forwarded message:\n"
-msgstr "Posredovano sporočilo:\n"
+#: mail/mail-callbacks.c:843
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "Na %s, %Y-%m-%d ob %H:%M, je %%s napisal(a):"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1753
 #, 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:1383
+#: mail/mail-callbacks.c:1778
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -7071,7 +8428,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1417
+#: mail/mail-callbacks.c:1817
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -7079,40 +8436,44 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1429
+#: mail/mail-callbacks.c:1831
 #, 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:1450
+#: mail/mail-callbacks.c:1857
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:1535
+#: mail/mail-callbacks.c:1951
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:1537
+#: mail/mail-callbacks.c:1953
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:1679 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: mail/mail-callbacks.c:1686
+#: mail/mail-callbacks.c:2129
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages. \n"
-" \n"
-" Really erase these messages? "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Ta operacija bo trajno zbrisala vsa sporočila označena kot zbrisana. Če "
-"boste nadaljevali ne boste mogli več do teh sporočil. \n"
+"To dejanje bo trajno zbrisalo vsa sporočila označena kot zbrisana. Če boste "
+"nadaljevali, ne boste mogli več do teh sporočil. \n"
 " \n"
-" Resnično zbriši ta sporočila? "
+"Resnično zbriši ta sporočila? "
+
+#: mail/mail-callbacks.c:2136
+msgid "Do not ask me again."
+msgstr "Ne sprašuj me več."
 
-#: mail/mail-callbacks.c:1788
+#: mail/mail-callbacks.c:2244
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -7121,146 +8482,163 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1798
+#: mail/mail-callbacks.c:2256
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:1844
+#: mail/mail-callbacks.c:2319
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:1890
+#: mail/mail-callbacks.c:2365
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:1974
+#: mail/mail-callbacks.c:2467
 #, 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-druid.c:99
+#: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Prosimo spodaj vpišite svoje ime in e-poštni naslov. Polj \"po želji\" ni "
 "potrebno izpolniti, razen, če ne želite vključiti te podatke v e-pošto, ki "
 "jo boste pošiljali."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:148
 msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
-"Prosimo spodaj vpišite podatke o vašem strežniku dohodne pošte. Če ne veste "
-"katero vrsto strežnika uporabljate se obrnite na vašega sistemskega "
-"administratorja ali ponudnika internet dostopa."
+"Prosim, spodaj vpišite podatke o vašem strežniku dohodne pošte. Če jih ne "
+"veste se obrnite na vašega sistemskega administratorja ali ponudnika dostopa "
+"do interneta."
+
+#: mail/mail-config-druid.c:150
+msgid "Please select among the following options"
+msgstr "Prosim, izberite med naslednjimi možnostmi"
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:152
 msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
-"Prosimo spodaj vpišite podatke o vašem strežniku odhodne pošte. Če ne veste "
-"kater protokol uporabljatie se obrnite na vašega sistemskega administratorja "
-"ali ponudnika internet dostopa."
+"Prosim, spodaj vpišite podatke o načinu odpošiljanja pošte. Če jih ne veste "
+"se obrnite na vašega sistemskega administratorja ali ponudnika dostopa do "
+"interneta."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "S procesom nastavljanja pošte ste skoraj pri koncu. Identiteta, strežnik "
-"prihajajoče pošte in metoda pošiljanja pošte bodo združene skupaj in tako bo "
-"ustvarjen račun pošte Evolucija. Prosimo v prostor spodaj vpišite ime za ta "
-"račun. Ime bo uporabljeno le za prikaz."
+"prihajajoče pošte\n"
+"in način odpošiljanja pošte bodo združene skupaj in tako bo ustvarjen račun "
+"pošte Evolucija. \n"
+"Prosim, v prostor spodaj vpišite ime za ta račun. Ime bo uporabljeno le za "
+"prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:464
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
-#: mail/mail-config.c:1534
+#: mail/mail-config.c:1859
 #, c-format
-msgid "%s: Inbox"
-msgstr "%s: Dohdona pošta"
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+"Nisem mogel dobiti vhodnega predala za novo hrambo pošte:\n"
+"%s\n"
+"Bližnjica ne bo ustvarjena."
 
-#: mail/mail-config.c:1764
+#: mail/mail-config.c:2112
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:1835 mail/mail-config.c:1838
+#: mail/mail-config.c:2183 mail/mail-config.c:2187
 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 vrste  "
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " barvo"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL v tej različici Evolucije ni podprt)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Račun"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Podatki o računu"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Računi"
 
-#: mail/mail-config.glade.h:7
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
-
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypyed mail"
-msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
-
 #: mail/mail-config.glade.h:9
-msgid "Always sign outgoing messages when using this account"
-msgstr "Ob uporabi tega računa vedno podpiši odhodno pošto"
+msgid "Always _encrypt to myself when sending encrypted mail"
+msgstr "Kadar pošiljam ši_frirano pošto, vedno šifriraj sebi"
+
+#: mail/mail-config.glade.h:10
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Ob uporabi tega računa vedno _podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:10 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:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:12
-msgid "Authentication Type: "
-msgstr "Način avtentifikacije: "
-
 #: mail/mail-config.glade.h:13
-msgid "Certificate ID:"
-msgstr "ID certifikata:"
+msgid "Checking for New Mail"
+msgstr "Preverjam za novo pošto"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Composer"
 msgstr "Skladatelj"
 
+#: mail/mail-config.glade.h:15
+msgid "Configuration"
+msgstr "Nastavitev"
+
 #: mail/mail-config.glade.h:16
+msgid "Confirm when Expunging a folder"
+msgstr "Potrdi ob uničevanju mape"
+
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7276,123 +8654,116 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr "Privzet način posredovanja naprej je: "
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "Digitalni IDji..."
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Prikaz"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:175
+#: mail/mail-config.glade.h:30
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: mail/mail-config.glade.h:29
-msgid "Drafts folder:"
-msgstr "Mapa osnutkov:"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "_Vključi"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Vključeno"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Dobi digitalni ID..."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "Datoteka s podpisom HTML:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:44
-msgid "Message _preview should be displayed by default"
-msgstr "Privzet naj bo _predogled sporočila"
-
 #: mail/mail-config.glade.h:45
-msgid "Message list should display in a _threaded fashion by default"
-msgstr "Seznam sporočil naj bo privzeto prikazan _niteno"
-
-#: mail/mail-config.glade.h:46
 msgid "NNTP Server:"
 msgstr "Strežnik NNTP"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "Novice"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:51
-msgid "PGP Key ID:"
-msgstr "ID ključa PGP:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
+msgstr "ID _ključa PGP:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy (precej dobra zasebnost)"
 
+#: mail/mail-config.glade.h:55
+msgid "Prompt when sending HTML messages to contacts that don't want them"
+msgstr ""
+"Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
+
 #: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
@@ -7410,99 +8781,102 @@ msgid "Quoted"
 msgstr "Citirano"
 
 #: mail/mail-config.glade.h:60
+msgid "Re_member this password"
+msgstr "Zapo_mni si to geslo"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "Varni MIME"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Izberi datoteko za dnevnik filtra..."
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:72 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:178
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Poslano"
 
-#: mail/mail-config.glade.h:73
-msgid "Sent and Draft Messages"
-msgstr "Poslana sporočila in osnutki"
-
 #: mail/mail-config.glade.h:74
-msgid "Sent messages folder:"
-msgstr "Mapa poslanih sporočil:"
+msgid "Sent _messages folder:"
+msgstr "Mapa _poslanih sporočil:"
 
 #: mail/mail-config.glade.h:75
-msgid "Server Configuration"
-msgstr "Nastavitev strežnika"
+msgid "Sent and Draft Messages"
+msgstr "Poslana sporočila in osnutki"
 
 #: mail/mail-config.glade.h:76
-msgid "Server Type: "
-msgstr "Vrsta strežnika:"
+msgid "Ser_ver requires authentication"
+msgstr "St_režnik zahteva avtentifikacijo"
 
 #: mail/mail-config.glade.h:77
-msgid "Server requires _authentication"
-msgstr "Strežnik zahteva _avtentifikacijo"
+msgid "Server Configuration"
+msgstr "Nastavitev strežnika"
 
 #: mail/mail-config.glade.h:78
+msgid "Server _Type: "
+msgstr "Vrs_ta strežnika:"
+
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Viri"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Posebne mape"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:85
-msgid "Use secure connection (_SSL)"
-msgstr "Uporabi varno povezavo (_SSL)"
-
 #: mail/mail-config.glade.h:86
+msgid "Use s_ecure connection (SSL)"
+msgstr "Uporabi _varno povezavo (SSL)"
+
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -7512,329 +8886,312 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "_Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:91
-msgid "_Automatically check for new mail every"
-msgstr "_Samodejno preveri za novo pošto vsakih"
-
 #: mail/mail-config.glade.h:92
-msgid "_Check for supported types"
-msgstr "_Preveri za podprte tipe"
+msgid "_Always sign outgoing messages when using this account"
+msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
+
+#: mail/mail-config.glade.h:93
+msgid "_Authentication Type: "
+msgstr "Način _avtentifikacije: "
+
+#: mail/mail-config.glade.h:94
+msgid "_Automatically check for new mail"
+msgstr "_Samodejno preveri za novo pošto"
 
 #: mail/mail-config.glade.h:95
+msgid "_Certificate ID:"
+msgstr "ID _certifikata:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Drafts folder:"
+msgstr "Mapa _osnutkov:"
+
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr "_E-poštni naslov:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "Podpis _HTML:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr "_Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:107
 msgid "_Mark messages as Read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "_Organizacija:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "Pot do izvršljive datoteke _PGP"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr "_Pot:"
 
-#: mail/mail-config.glade.h:109
-msgid "_Remember PGP Passphrase until exit"
-msgstr "Do izhoda pomni geslo PGP"
-
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr "_Zapomni si to geslo"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr "Privzeto pošiljaj pošto v _HTML obliki."
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
+msgid "_Server Type: "
+msgstr "Vrsta _strežnika: "
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr "Datoteka s _podpisom:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
+msgid "_every"
+msgstr "_vsakih"
+
+#: mail/mail-config.glade.h:119
+msgid "description"
+msgstr "opis"
+
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr "oknonovic1"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr "držalec mesta"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:123
 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:222
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:343
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:345
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:402
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:406
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:427
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:1051
+#: mail/mail-display.c:1133
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1407
+#: mail/mail-display.c:1592
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1409
+#: mail/mail-display.c:1594
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1597
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1413
+#: mail/mail-display.c:1600
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
-#: mail/mail-folder-cache.c:147
-#, c-format
-msgid "%d new"
-msgstr "%d novih"
-
-#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
-#: mail/mail-folder-cache.c:167
-msgid ", "
-msgstr ", "
-
-#: mail/mail-folder-cache.c:154
-#, c-format
-msgid "%d hidden"
-msgstr "%d skritih"
-
-#: mail/mail-folder-cache.c:161
-#, c-format
-msgid "%d selected"
-msgstr "%d izbranih"
-
-#: mail/mail-folder-cache.c:170
-#, c-format
-msgid "%d unsent"
-msgstr "%d neposlanih"
-
-#: mail/mail-folder-cache.c:172
-#, c-format
-msgid "%d total"
-msgstr "skupaj %d"
-
-#: mail/mail-format.c:623
+#: mail/mail-format.c:635
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: mail/mail-format.c:676
+#: mail/mail-format.c:684
 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:760
+#: mail/mail-format.c:767
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:850
 msgid "Bad Address"
 msgstr "Slab naslov"
 
-#: mail/mail-format.c:878 mail/message-list.etspec.h:3
+#: mail/mail-format.c:890 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:881
+#: mail/mail-format.c:893
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:884 mail/message-list.etspec.h:10
+#: mail/mail-format.c:897 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:887
+#: mail/mail-format.c:901
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1306
-msgid "No GPG/PGP program configured."
-msgstr "Program GPG/PGP ni nastavljen."
-
-#: mail/mail-format.c:1322
-msgid "Encrypted message not displayed"
-msgstr "Šifrirano sporočilo ni prikazano"
-
-#: mail/mail-format.c:1333
-msgid "Encrypted message"
-msgstr "Šifrirano sporočilo"
-
-#: mail/mail-format.c:1334
-msgid "Click icon to decrypt."
-msgstr "Kliknite ikono za dešifriranje."
-
-#: mail/mail-format.c:1392
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
-
-#: mail/mail-format.c:1403
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
+#: mail/mail-format.c:905
+msgid "Bcc"
+msgstr "Bcc:"
 
-#: mail/mail-format.c:2061
+#: mail/mail-format.c:2072
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2075
+#: mail/mail-format.c:2086
 #, 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:2080
+#: mail/mail-format.c:2091
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2109
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
+msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2133
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:466
+#: mail/mail-local.c:626
+msgid "Reconfiguring folder"
+msgstr "Prenastavljam mapo"
+
+#: mail/mail-local.c:707
 #, c-format
-msgid "Opening '%s'"
-msgstr "Odpiram '%s'"
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s: %s"
+msgstr ""
+"Ne morem shraniti meta podatkov mape; verjetno te mape ne boste mogli več "
+"odpreti: %s: %s"
+
+#: mail/mail-local.c:763
+#, c-format
+msgid "Cannot save folder metainfo to %s: %s"
+msgstr "Ne morem shraniti meta podatkov mape v %s: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
+#, c-format
+msgid "Cannot delete folder metadata %s: %s"
+msgstr "Ne morem zbrisati meta podatkov mape %s: %s"
+
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:1296
 #, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
-"te mape: %s"
+msgid "%s may not be reconfigured because it is not a local folder"
+msgstr "%s se ne da nasatviti, saj ni krajevna mapa"
 
-#: mail/mail-local.c:914
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7842,16 +9199,16 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#: mail/mail-local.c:1007
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
 
-#: mail/mail-local.c:1018
+#: mail/mail-local.c:1416
 #, c-format
-msgid "Reconfigure %s"
-msgstr "Znova nastavi %s"
+msgid "Reconfigure /%s"
+msgstr "Znova nastavi /%s"
 
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7860,7 +9217,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7869,117 +9226,116 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:439
-msgid "Remember this password"
-msgstr "Zapomni si geslo"
-
-#: mail/mail-mt.c:796
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Mapa filtrov"
 
-#: mail/mail-ops.c:227
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
+msgid "However, the message was successfully sent."
+msgstr "Sporočilo je bilo vseeno uspešno poslano."
+
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:709
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:823
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:180
-msgid "Trash"
-msgstr "Smeti"
-
-#: mail/mail-ops.c:1211
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1599
+#: mail/mail-ops.c:1472
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Odstranjujem mapo %s"
+
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1684
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1751
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7988,7 +9344,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7997,11 +9353,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -8010,168 +9366,224 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
+#: mail/mail-ops.c:2092
+#, c-format
+msgid "Reconnecting to %s"
+msgstr "Znova se povezujem z %s"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "I_skanje"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Neimenovano sporočilo)"
 
-#: mail/mail-search.c:237
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Neimenovano sporočilo"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Prazno sporočilo"
 
-#: mail/mail-search.c:288
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Poišči v sporočilu"
 
-#: mail/mail-search.c:318
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Razlikuj velike in male črke"
 
-#: mail/mail-search.c:320
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Išči naprej"
 
-#: mail/mail-search.c:340
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Poišči"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Ustreza:"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Preklicujem..."
 
-#: mail/mail-send-recv.c:257
-msgid "Send & Receive mail"
-msgstr "Oddaja in sprejem pošte"
+#: mail/mail-send-recv.c:245
+#, c-format
+msgid "Server: %s, Type: %s"
+msgstr "Strežnik: %s, vrsta: %s:"
+
+#: mail/mail-send-recv.c:247
+#, c-format
+msgid "Path: %s, Type: %s"
+msgstr "Pot: %s, vrsta: %s"
+
+#: mail/mail-send-recv.c:249
+#, c-format
+msgid "Type: %s"
+msgstr "Vrsta: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:286
+msgid "Send & Receive Mail"
+msgstr "Pošlji in spreji pošto"
+
+#: mail/mail-send-recv.c:288
+msgid "Cancel All"
+msgstr "Prekliči vse"
+
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Posodabljam..."
 
-#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: mail/mail-session.c:182
+#: mail/mail-session.c:220
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-tools.c:173
+#: mail/mail-session.c:319
 #, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Nisem mogel ustvariti začasnega poštnega predala `%s': %s"
+msgid "Enter Password for %s"
+msgstr "Vpišite geslo za %s"
+
+#: mail/mail-session.c:322
+msgid "Enter Password"
+msgstr "Vpišite geslo"
 
-#: mail/mail-tools.c:241
+#: mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:259
 msgid "Forwarded message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-tools.c:471
+#: mail/mail-tools.c:393
 msgid "Forwarded Message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-vfolder.c:282
-msgid "VFolders"
-msgstr "vMape"
+#: mail/mail-vfolder.c:85
+#, c-format
+msgid "Setting up vfolder: %s"
+msgstr "Nastavljam vMapo: %s"
+
+#: mail/mail-vfolder.c:203
+#, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Posodabljam vmape za uri: %s"
+
+#: mail/mail-vfolder.c:419
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"Sledeče vMape:\n"
+"%s so uporabljale odstranjeno mapo:\n"
+"    '%s'\n"
+"in so bile posodobljene."
+
+#: mail/mail-vfolder.c:824
+msgid "Edit VFolder"
+msgstr "Uredi VMapo"
+
+#: mail/mail-vfolder.c:840
+#, c-format
+msgid "Trying to edit a vfolder '%s' which doesn't exist."
+msgstr "Poskus ureditve vmape '%s', ki ne obstaja."
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-browser.c:125
+#: mail/message-browser.c:212
 msgid "(No subject)"
 msgstr "(brez zadeve)"
 
-#: mail/message-browser.c:127
+#: mail/message-browser.c:214
 #, c-format
 msgid "%s - Message"
 msgstr "%s - sporočilo"
 
-#: mail/message-list.c:636
+#: mail/message-list.c:630
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:637
+#: mail/message-list.c:631
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:632
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:633
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:634
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:638
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:639
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:643
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:644
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:894
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:901
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:910
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:922
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:938
+#: mail/message-list.c:932
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2314
+#: mail/message-list.c:2325
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
@@ -8187,36 +9599,36 @@ msgstr "Sprejeto"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/subscribe-dialog.c:166
+#: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Pregledujem mape pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:221
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Pregledujem korenske mape na \"%s\""
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapa"
 
-#: mail/subscribe-dialog.c:1432
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Strežnik ni bil izbran"
 
-#: mail/subscribe-dialog.c:1489
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Prosimo izberite strežnik."
 
@@ -8256,105 +9668,124 @@ msgstr "_Prekliči naročnino"
 msgid "Evolution component for the executive summary."
 msgstr "Evolucijina komponenta za povzetke."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Tovarna za Evolucijine komponente za povzetke."
+#: my-evolution/component-factory.c:44
+msgid "Folder containing the Evolution Summary"
+msgstr "Mapa, ki vsebuje povzetek Evolucije"
 
-#: my-evolution/component-factory.c:141
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
+#: my-evolution/component-factory.c:153
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Ne morem inicializirati Evolucijine komponente za povzetek."
 
-#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Sestanki"
 
-#: my-evolution/e-summary-calendar.c:183
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Ni sestankovov"
 
-#: my-evolution/e-summary-calendar.c:236
-msgid "%l:%M%p"
-msgstr "%l:%M%p"
+#: my-evolution/e-summary-calendar.c:377
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:238
-msgid "%a %l:%M%p"
-msgstr "%a %l:%M%p"
+#: my-evolution/e-summary-calendar.c:379
+msgid "%l:%M %d %B"
+msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Povzetek pošte"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
+#. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr "LJLJ:LJMB:LJPZ"
+
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com beseda dneva"
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:466
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:945
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:953
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Vpišite vir novic, ki ga želite dodati"
 
-#: my-evolution/e-summary-preferences.c:881
+#: my-evolution/e-summary-preferences.c:957
 msgid "Name:"
 msgstr "Ime:"
 
-#: my-evolution/e-summary-preferences.c:1403
+#: my-evolution/e-summary-preferences.c:1503
 msgid "Summary Settings"
 msgstr "Nastavitev povzetka"
 
-#: my-evolution/e-summary-rdf.c:281
-msgid "There was an error downloading news feed"
-msgstr "Napaka ob prenašanju vira novic."
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
+#: my-evolution/e-summary-rdf.c:415
+msgid "Error downloading RDF"
+msgstr "Napaka ob prenašanju RDF"
 
-#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
-msgid "<b>Error downloading RDF</b>"
-msgstr "<b>Napaka ob prenašanju RDF</b>"
+#: my-evolution/e-summary-rdf.c:528
+msgid "News Feed"
+msgstr "Viri novic"
 
-#: my-evolution/e-summary-tasks.c:213
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Brez nalog"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-tasks.c:287
+msgid "(No Description)"
+msgstr "(ni opisa)"
+
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Strežnik vremena ni dosegljiv</b></dd>"
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:559
+msgid "Weather"
+msgstr "Vreme"
+
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Območja"
 
-#: my-evolution/e-summary.c:145
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Natisni povzetek"
 
-#: my-evolution/e-summary.c:518
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Tiskanje povzetka ni uspelo"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\n"
 
 #: my-evolution/metar.c:29
-msgid "°F"
-msgstr "°F"
+msgid "F"
+msgstr "F"
 
 #: my-evolution/metar.c:29
-msgid "°C"
-msgstr "°C"
+msgid "C"
+msgstr "C"
 
 #: my-evolution/metar.c:33
 msgid "knots"
@@ -8400,7 +9831,7 @@ msgstr "Pretežno jasno"
 msgid "Overcast"
 msgstr "Oblačno"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr "Neveljavno"
 
@@ -8472,1063 +9903,1060 @@ msgstr "severozahod"
 msgid "North - Northwest"
 msgstr "sever - severozahod"
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr "Pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr "Pršenje v okolici"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr "Rahlo pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr "Zmerno pršenje"
 
 # @ Hmmm...
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr "Močno pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr "Plitvo pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr "Ponekod prši"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr "Prši s presledki"
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr "Nevihta"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr "Pršenje z vetrom"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr "Pršenje v pasovih"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr "Zmrzujoče pršenje"
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr "Dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr "Dež v okolici"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr "Rahel dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr "Zmeren dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr "Močan dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr "Plitev dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr "Ponekod dežuje"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr "Dežuje s presledki"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr "Dež z vetrom"
 
 # @ Hmmm....
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr "Dež v pasovih"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr "Zmrzujoč dež"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr "Sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr "Sneži v okolici"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr "Rahlo sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr "Zmerno sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr "Močno sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr "Plitvo sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr "Ponekod sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr "Sneži s presledki"
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr "Snežna nevihta"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr "Sneži z vetrom"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr "Snežne plohe"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr "Sneži v pasovih"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr "Zmrzujoče sneži"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr "Zrnat sneg"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr "Zrnato sneži v okolici"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr "Rahlo zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr "Zmerno zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr "Močno zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr "Plitvo zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr "Ponekod zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr "Zrnato sneži s presledki"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr "Zrnato sneži z vetrom"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr "Plohe zrnatega snega"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr "Zrnato sneži v pasovih"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr "Zmrzujoče zrnato sneži"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr "Ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr "Ledene iglice v okolici"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr "Malo ledenih iglic"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr "Zmerne ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr "Močne ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr "Ponekod ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr "Ledene iglice s presledki"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr "Nevihta ledenih iglic"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr "Ledene iglice z vetrom"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr "Plohe ledenih iglic"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr "Ledene iglice v pasovih"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr "Zmrzujoče ledene iglice"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr "Babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr "Babje pšeno v okolici"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr "Nekaj babjega pšena"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr "Zmerno babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr "Močno babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr "Plitvo babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr "Ponekod babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr "Babje pšeno s presledki"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr "Nevihta babjega pšena"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr "Babje pšeno z vetrom"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr "Plohe babjega pšena"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr "Babje pšeno v pasovih"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr "Zmrzujoče babje pšeno"
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 msgid "Hail"
 msgstr "Toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Toča v okolici"
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr "Rahla toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr "Zmerna toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr "Močna toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr "Plitva toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr "Ponekod toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr "Toča s presledki"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr "Nevihta toče"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr "Toča z vetrom"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr "Ploha toče"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr "Toča v pasovih"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr "Zmrzujoča toča"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr "Sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr "Sodra v okolici"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr "Zmerna sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr "Močna sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr "Plitva sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr "Ponekod sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr "Sodra s presledki"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr "Nevihta sodre"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr "Sodra z vetrom"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr "Ploha sodre"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr "Sodra v pasovih"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr "Zmrzujoča sodra"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr "Neznane padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr "Padavine v okolici"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr "Rahle padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr "Zmerne padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr "Močne padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr "Plitve padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr "Ponekod padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr "Padavine s presledki"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr "Nevihta neznanih padavin"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr "Padavine z vetrom"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr "Ploha neznanih padavin"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr "Padavine v pasovih"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr "Zmrzujoče padavine"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr "Meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr "Meglice v okolici"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr "Rahle meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr "Zmerne meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr "Goste meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr "Plitve meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr "Ponekod meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr "Meglice s presledki"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr "Meglice z vetrom"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr "Meglice v pasovih"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr "Zmrzujoče meglice"
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr "Megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr "Megla v okolici"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr "Rahla megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr "Zmerna megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr "Gosta megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr "Plitva megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr "Ponekod megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr "Megla s presledki"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr "Megla z vetrom"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr "Megla v pasovih"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr "Zmrzujoča megla"
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr "Dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr "Dim v okolici"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr "Redek dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr "Zmeren dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr "Gost dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr "Plitev dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr "Ponekod dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr "Dim s presledki"
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
-msgstr "Dim z grmenjem"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
+msgstr "Nevihtni dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr "Dim z vetrom"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr "Dim v pasovih"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr "Vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkanski pepel v okolici"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr "Zmeren vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr "Gost vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr "Plitev vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr "Ponekod vulkanski dim"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr "Vulkanski dim s presledki"
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr "Vulkanski dim z grmenjem"
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
+msgstr "Nevihtni vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr "Vulkanski dim z vetrom"
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
-msgstr "Plohe vulkanskega dima"
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
+msgstr "Plohe vulkanskega pepela"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr "Vulkanski dim v pasovih"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr "Zmrzujoč vulkanski dim"
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr "Pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr "Pesek v okolici"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr "Rahel pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr "Zmeren pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr "Močan pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr "Ponekod pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr "Pesek s presledki"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr "Pesek z vetrom"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr "Pesek v pasovih"
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr "Suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr "Suha motnost v okolici"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr "Rahla suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr "Zmerna suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr "Gosta suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr "Plitva suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr "Ponekod suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr "Suha motnost s presledki"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr "Suha motnost z vetrom"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr "Suhta motnost v pasovih"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr "Zmrzujoča suha motnost"
 
 #. SPRAY
-#: my-evolution/metar.c:115
-msgid "Sprays"
+#: my-evolution/metar.c:352
+msgid "Spray"
 msgstr "Pršec"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr "Pršec v okolici"
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr "Rahel pršec"
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
+#: my-evolution/metar.c:355
+msgid "Moderate spray"
 msgstr "Zmeren pršec"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr "Močan pršec"
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
+#: my-evolution/metar.c:357
+msgid "Shallow spray"
 msgstr "Plitev pršec"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr "Ponekod pršec"
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
+#: my-evolution/metar.c:359
+msgid "Partial spray"
 msgstr "Pršec s presledki"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr "Pršec z vetrom"
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
 msgstr "Pršec v pasovih"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
+#: my-evolution/metar.c:364
+msgid "Freezing spray"
 msgstr "Zmrzujoč pršec"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr "Prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr "Prah v okolici"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr "Rahel prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr "Zmeren prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr "Gost prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr "Ponekod prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr "Prah s presledki"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr "Prah z vetrom"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr "Prah v pasovih"
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr "Piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr "Piš vetra v okolici"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr "Rahel piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr "Zmeren piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr "Močan piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr "Piš vetra s presledki"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr "Piš vetra z grmenjem"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr "Nôšen piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr "Piš vetra v pasovih"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr "Zmrzujoč piš vetra"
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr "Peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr "Peščeni vihar v okolici"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr "Rahel peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr "Zmeren peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr "Močan peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr "Plitev peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr "Peščeni vihar s presledki"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr "Peščeni vihar z grmenjem"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr "Nôsen peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr "Peščeni vihar v pasovih"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr "Zmrzujoč peščeni vihar"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr "Prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr "Prašni vihar v okolici"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr "Rahel prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr "Zmeren prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr "Močan prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr "Plitev prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr "Prašni vihar s presledki"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr "Prašni vihar z grmenjem"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr "Nôsen prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr "Prašni vihar v pasovih"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr "Zmrzujoč prašni vihar"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr "Tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr "Tromba v okolici"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr "Rahla tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr "Zmerna tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr "Gosta tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr "Plitva tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr "Ponekod trombe"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr "Trombe s presledki"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr "Tromba z vetrom"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr "Tromba v pasovih"
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr "Tornado v okolici"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr "Zmeren tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr "Hud tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr "Tornado s presledki"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr "Tornado z grmenjem"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr "Tornado v pasovih"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr "Zmrzujoč tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr "Prašni vrtinec"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr "Prašni vrtinci v okolici"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr "Rahli prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr "Zmerni prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr "Močni prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr "Plitvi prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr "Ponekod prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr "Prašni vrtinci s presledki"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr "Prašni vrtinci z vetrom"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr "Prašni vrtinci v pasovih"
 
@@ -9537,7 +10965,7 @@ msgid " _Remove"
 msgstr " _Odstrani"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr "Dodaj _nov vir novic"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -9552,138 +10980,119 @@ msgstr "Vse _mape:"
 msgid "All news _feeds:"
 msgstr "Vsi viri _novic:"
 
-#: my-evolution/my-evolution.glade.h:6 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1024
-msgid "Calendar"
-msgstr "Koledar"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elsius"
+msgstr "_Stopinjah"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "How many days should the calendar display at once?"
 msgstr "Koliko dni naj koledar pokaže hkrati?"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "Ma_x number of items shown:"
 msgstr "Na_jvečje število prikazanih predmetov:"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "News Feed Settings"
 msgstr "Nastavitve virov novic"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "One mont_h"
 msgstr "En _mesec"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "One w_eek"
 msgstr "En _teden"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
+msgid "R_efresh time (seconds):"
+msgstr "Čas _osvežitve (sekund):"
+
+#: my-evolution/my-evolution.glade.h:14
 msgid "Refresh _time (seconds):"
 msgstr "Čas _osvežitve (sekund):"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:15
+msgid "S_how full path for folders"
+msgstr "_Kaži celotne poti map"
+
+#: my-evolution/my-evolution.glade.h:16
 msgid "Show _all tasks"
 msgstr "Kaži _vse naloge"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:17
 msgid "Show _today's tasks"
 msgstr "Kaži _današnje naloge"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:18
+msgid "Show temperatures in:"
+msgstr "Kaži temperaturo v:"
+
+#: my-evolution/my-evolution.glade.h:19
 msgid "Tasks "
 msgstr "Naloge "
 
-#: my-evolution/my-evolution.glade.h:16
-msgid "Units: "
-msgstr "Enote: "
-
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
 msgstr "Nastavitve vremena"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Display folders:"
 msgstr "_Kaži mape:"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Display stations:"
 msgstr "_Kaži postaje:"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Displayed feeds:"
 msgstr "_Kaži novice:"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:25
+msgid "_Fahrenheit"
+msgstr "_Fahrenheitih"
+
+#: my-evolution/my-evolution.glade.h:26
 msgid "_Five days"
 msgstr "_pet dni"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:28
 msgid "_News Feeds"
 msgstr "_Viri novic"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:29
 msgid "_One day"
 msgstr "_En dan"
 
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Refresh time (seconds):"
-msgstr "_Čas osvežitve (sekund):"
-
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:30
 msgid "_Schedule"
 msgstr "_Načrtuj"
 
-#: my-evolution/my-evolution.glade.h:28
-msgid "_Show full path for folders"
-msgstr "Kaži celotne poti map"
-
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:31
 msgid "_Weather"
 msgstr "_Vreme"
 
-#: my-evolution/my-evolution.glade.h:30
-msgid "_imperial"
-msgstr "_imperijski"
-
-#: my-evolution/my-evolution.glade.h:31
-msgid "m_etric"
-msgstr "_metrični"
-
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Evolucijina lupina."
 
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "Kaži podrobnosti"
 
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "Prekliči operacijo"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1023
-msgid "Inbox"
-msgstr "Dohodna pošta"
-
-#: shell/e-local-storage.c:177
-msgid "Outbox"
-msgstr "Odhodna pošta"
-
-#: shell/e-local-storage.c:591
-msgid "Local Folders"
-msgstr "Krajevne mape"
-
-#: shell/e-setup.c:125 shell/e-setup.c:196
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -9691,26 +11100,16 @@ msgstr ""
 "Ta različica Evolucije mora namestiti dodatne datoteke\n"
 "v vaš osebni imenik Evolucije"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev datotek ali \"Prekliči\" za izhod."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno posodobiti datotek"
 
-#: shell/e-setup.c:200
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Kaže, da je to vaš prvi zagon Evolucije."
-
-#: shell/e-setup.c:201
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških datotek "
-"pod"
-
-#: shell/e-setup.c:220
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -9721,7 +11120,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:235
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -9731,7 +11130,7 @@ msgstr ""
 "`%s'\n"
 " se je zgodila napaka."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9742,7 +11141,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9756,7 +11155,7 @@ msgstr ""
 "lahko Evolucija požene.\n"
 "Želite, da odstranim ta imenik?"
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9767,37 +11166,49 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-about-box.c:40
+msgid "Evolution "
+msgstr "Evolucija "
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Avtorske pravice pridržane 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr "K vam prinešeno od"
+
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Ne morem prestaviti mape nase."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "Ne morem kopirati mape nase."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Ne morem kopirati mape v eno od naslednic."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:307
 #, 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:289
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "Kopiraj mapo"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:354
 #, 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:332
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "Prestavi mapo"
 
-#: shell/e-shell-folder-commands.c:357
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -9806,33 +11217,40 @@ msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:401
 #, c-format
-msgid "Delete folder '%s'"
-msgstr "Zbriši mapo '%s'"
+msgid "Delete \"%s\""
+msgstr "Zbriši \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:411
+#, 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:488
 #, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
-msgstr "Ste prepričani, da želite zbrisati mapo '%s'?"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Nisem mogel preimenovati mape:\n"
+"%s"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:458
+#: shell/e-shell-folder-commands.c:536
 #, c-format
-msgid "Rename folder '%s'"
-msgstr "Preimenuj mapo '%s'"
+msgid "Rename the \"%s\" folder to:"
+msgstr "Preimenuj mapo \"%s\" v:"
 
-#: shell/e-shell-folder-commands.c:462 shell/e-shortcuts-view.c:383
-msgid "Rename"
-msgstr "Preimenuj"
+#: shell/e-shell-folder-commands.c:542
+msgid "Rename folder"
+msgstr "Preimenuj mapo"
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:470
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Ime mape:"
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Izbrano ime mape ni veljavno: %s"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -9843,11 +11261,7 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:168
-msgid "The specified folder name is not valid."
-msgstr "Izbrano ime mape ni veljavno."
-
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
@@ -9856,18 +11270,22 @@ msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
-"Tip izbrane mape ni veljaven za zahtevano\n"
+"Vrsta izbrane mape ni veljavna za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
-#: shell/e-shell-importer.c:97
+#: shell/e-shell-importer.c:142
+msgid "Choose the type of importer to run:"
+msgstr "Izberite  vrsto uvoznika, ki naj se požene:"
+
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -9881,9 +11299,13 @@ msgstr ""
 "Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
 "ugotoviti."
 
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+msgid "Please select the information that you would like to import:"
+msgstr "Prosim, izberite podatke, ki jih želite uvoziti:"
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:192
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -9894,7 +11316,7 @@ msgstr ""
 "Uvoznik ni pripravljen.\n"
 "Čakam 5 sekund na nov poskus."
 
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -9903,7 +11325,16 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:397
+#, c-format
+msgid "File %s does not exist"
+msgstr "Mapa %s ne obstaja"
+
+#: shell/e-shell-importer.c:409
+msgid "You may only import to local folders"
+msgstr "Uvažate lahko le v krajevne mape"
+
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9912,11 +11343,11 @@ msgstr ""
 "Ni uvoznika, ki bi lahko obravnaval\n"
 " %s"
 
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Uvažam"
 
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -9925,17 +11356,17 @@ msgstr ""
 "Uvažam %s.\n"
 "Pričenjam %s"
 
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Napaka ob zagonu %s"
 
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Napaka ob nalaganju %s"
 
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -9944,151 +11375,216 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet 1."
 
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: shell/e-shell-importer.c:538
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:652
+msgid "Import data and settings from older programs"
+msgstr "Uvozi podatke in nastavitve iz starejših programov"
+
+#: shell/e-shell-importer.c:656
+msgid "Import a single file"
+msgstr "Uvozi eno samo datoteko"
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Prosim počakajte...\n"
+"Iščem že obstoječe namestitve"
+
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
+msgid "Starting Intelligent Importers"
+msgstr "Poganjam pametne uvoznike"
+
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
+#, c-format
+msgid "From %s:"
+msgstr "Od: %s:"
+
+#: shell/e-shell-importer.c:1014
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:1015
 msgid "Select a destination folder for importing this data"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: shell/e-shell-offline-handler.c:564
+#: shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
+msgid "Import"
+msgstr "Uvozi"
+
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-view-menu.c:182
+#: shell/e-shell-startup-wizard.c:159
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr ""
+"Nisem mogel pognati Evolucijinega vmesnika za pomoč pri pošti\n"
+"(%s)"
+
+#: shell/e-shell-startup-wizard.c:169
+msgid "Could not start the Evolution Mailer Assistant interface\n"
+msgstr "Nisem mogel pognati Evolucijinega vmesnika za pomoč pri pošti\n"
+
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Ime mape ni navedeno."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Ime mape ne more vsebovati znaka return"
+
+#: shell/e-shell-utils.c:127
+msgid "Folder name cannot contain slashes."
+msgstr "Ime mape ne more vsebovati poševnic"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' in '..' sta rezervirana za imena map."
+
+#: shell/e-shell-view-menu.c:165
 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:190
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:218
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Avtorske pravice pridržane 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:220
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolucija je zbirka programov okolja \n"
-"GNOME za delo v skupinah, za pošto, koledar in \n"
-"urejanje stikov."
+#: shell/e-shell-view-menu.c:215
+msgid "About Ximian Evolution"
+msgstr "_O Ximianovi Evoluciji..."
 
-#: shell/e-shell-view-menu.c:436
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo želite odpreti"
 
-#: shell/e-shell-view-menu.c:582
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "Ustvari novo bližnjico"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:531
 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:701
-msgid "Work Online"
-msgstr "Delaj na mreži"
+#: shell/e-shell-view-menu.c:562
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "Orodja GNOME Pilot niso nameščena na vašem sistemu."
+
+#: shell/e-shell-view-menu.c:570
+#, c-format
+msgid "Error executing %s."
+msgstr "Napaka ob izvajanju %s."
+
+#: shell/e-shell-view-menu.c:672
+msgid "_Work Online"
+msgstr "Delaj na _mreži"
+
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "Delaj _brez mreže"
 
-#: shell/e-shell-view-menu.c:714 shell/e-shell-view-menu.c:727
-#: ui/evolution.xml.h:35
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: shell/e-shell-view.c:178
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:1391
+#: shell/e-shell-view.c:1574
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolucija %s"
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1393
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolucija %s [%s]"
+#: shell/e-shell-view.c:1576
+msgid "(None)"
+msgstr "(brez)"
 
-#: shell/e-shell-view.c:1431
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1623
+msgid ""
+"Ximian 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."
+"Ximian Evolucija je trenutno na mreži.  Kliknite na ta gumb za delo brez "
+"mreže."
 
-#: shell/e-shell-view.c:1438
-msgid "Evolution is in the process of going offline."
-msgstr "Evolucija je v procesu odklapljanja z mreže."
+#: shell/e-shell-view.c:1630
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolucija je v procesu odklapljanja od mreže."
 
-#: shell/e-shell-view.c:1444
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
+#: shell/e-shell-view.c:1636
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
 
-#: shell/e-shell.c:508
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1424
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
 msgstr ""
-"Opa!  Pogled `%s' je nepričakovano umru.  :-(\n"
-"To verjetno pomeni, da se je komponenta %s sesula."
+"Komponenta Evolucije, ki obravnava mape vrste \"%s\"\n"
+"je nepričakovano zaključila. Morali boste zapreti in znova\n"
+"pognati Evolucijo, če želite dostopati do teh podatkov."
 
-#: shell/e-shell.c:1628 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "V redu"
 
-#: shell/e-shell.c:1630
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:1632
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:1634
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:1636 shell/e-storage.c:481
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Generična napaka"
 
-#: shell/e-shortcuts-view.c:72
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:73
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:171
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -10097,156 +11593,286 @@ msgstr ""
 "Zares želite odstraniti skupino\n"
 "`%s' iz vrstice bližnjic?"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:204
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Preimenuj skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Preimenuj izbrano skupino bližnjic v:"
 
-#: shell/e-shortcuts-view.c:218
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:219
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Kaži bližnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:221
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:222
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Kaži bližnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "_Preimenuj to skupino..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Preimenuj to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:365
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Preimenuj bližnjico"
 
-#: shell/e-shortcuts-view.c:366
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Preimenuj izbrano bližnjico v:"
 
-#: shell/e-shortcuts-view.c:378
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Odpri mapo povezano s to bližnjico"
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
-msgid "Open in New Window"
-msgstr "Odpri v novem oknu"
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+msgid "Open in New _Window"
+msgstr "Odpri v novem _oknu"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:386
 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:383
+#: shell/e-shortcuts-view.c:389
+msgid "_Rename"
+msgstr "P_reimenuj"
+
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Preimenuj to bližnjico"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:391
+msgid "Re_move"
+msgstr "_Odstrani"
+
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
-#: shell/e-shortcuts.c:620
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-shortcuts.c:1019
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Bližnjice"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "Dohodna pošta"
+
+#: shell/e-storage-set-view.c:658
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Nisem mogel prenesti mape:\n"
+"%s"
+
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
-msgstr "Izbran tip mape ni veljaven"
+msgstr "Izbrana vrsta mape ni veljavna"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr "Mapa ni prazna"
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
-msgstr "Izbran tip ni podprt v tem hranilniku"
+msgstr "Izbrana vrsta ni podprta v tem hranilniku"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "Izbrane mape ni možno spremeniti ali odstraniti"
 
-#: shell/e-task-widget.c:170
+#: shell/e-storage.c:524
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Mapa ne more postati otrok svojih potomcev"
+
+#: shell/e-storage.c:526
+msgid "Cannot create a folder with that name"
+msgstr "Ne morem ustvariti mape s takšnim imenom"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:175
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
+#: shell/evolution-shell-component.c:1009
+msgid "CORBA error"
+msgstr "Napaka CORBA"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr "Prekinjen"
+
+#: shell/evolution-shell-component.c:1013
+msgid "Invalid argument"
+msgstr "Neveljaven argument"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr "Že ima lastnika"
+
+#: shell/evolution-shell-component.c:1017
+msgid "No owner"
+msgstr "Brez lastnika"
+
+#: shell/evolution-shell-component.c:1019
+msgid "Not found"
+msgstr "Ni bil(a) najden(a)"
+
+#: shell/evolution-shell-component.c:1021
+msgid "Unsupported type"
+msgstr "Nepodprta vrsta"
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr "Nepodprta shema"
+
+#: shell/evolution-shell-component.c:1025
+msgid "Unsupported operation"
+msgstr "Nepodprto dejanje"
+
+#: shell/evolution-shell-component.c:1027
+msgid "Internal error"
+msgstr "Notranja napaka"
+
+#: shell/evolution-shell-component.c:1031
+msgid "Exists"
+msgstr "Obstaja"
+
+#: shell/evolution-shell-component.c:1033
+msgid "Invalid URI"
+msgstr "Neveljaven URI"
+
+#: shell/evolution-shell-component.c:1037
+msgid "Has subfolders"
+msgstr "Ima podmape"
+
+#: shell/evolution-shell-component.c:1039
+msgid "No space left"
+msgstr "Ni več prostora"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr "Star lastnik je umru"
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Neznana napaka."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Napaka iz komponentnega sistema je:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Napaka iz aktivacijskega sistema je:\n"
+"%s"
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr "Aktivne povezave"
@@ -10263,6 +11889,10 @@ msgstr "Gostitelj"
 msgid "The following connections are currently active:"
 msgstr "Sledeče povezave so trenutno aktivne:"
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Ime mape:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Vrsta mape:"
@@ -10271,6 +11901,47 @@ msgstr "Vrsta mape:"
 msgid "Specify where to create the folder:"
 msgstr "Navedi kje naj se ustvarimapa:"
 
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "Evolution Setup Assistant"
+msgstr "Evolucijin druid za nastavitev"
+
+#: shell/glade/evolution-startup-wizard.glade.h:5
+msgid "Importing Files"
+msgstr "Uvažam datoteke"
+
+#: shell/glade/evolution-startup-wizard.glade.h:8
+msgid "Timezone "
+msgstr "Časovni pas "
+
+#: shell/glade/evolution-startup-wizard.glade.h:9
+msgid "Welcome"
+msgstr "Dobrodošli"
+
+#: shell/glade/evolution-startup-wizard.glade.h:10
+msgid ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Next\" button to continue. "
+msgstr ""
+"Dobrodošli v Evolucijo. Naslednjih nekaj zaslonov bo\n"
+"omogočilo Evoluciji, da se poveže z vašimi računi e-pošte\n"
+"in uvozi datoteke iz drugih programov. \n"
+"\n"
+"Prosim, za nadaljevanje kliknite gumb \"Naprej\". "
+
+#: shell/glade/evolution-startup-wizard.glade.h:15
+msgid ""
+"You have successfully entered all of the information\n"
+"needed to setup Evolution. \n"
+"\n"
+"Click the \"Finish\" button to save your settings. "
+msgstr ""
+"Uspešno ste vnesli vse podatke potrebne za \n"
+"nastavitev Evolucije. \n"
+"Kliknite gumb \"Končaj\" za shranitev vaših nastavitev. "
+
 #: 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. "
@@ -10284,14 +11955,22 @@ msgid "Evolution Importer Assistant"
 msgstr "Evolucijin uvozni druid"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr "Uvozi datoteko (2. korak od 2)"
+msgid "Import File (step 3 of 3)"
+msgstr "Uvozi datoteko (korak 3 od 3)"
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "Izberi datoteko (1. korak od 2)"
+msgid "Importer Type (step 1 of 3)"
+msgstr "Vrsta uvoznika (korak 1 od 3)"
 
 #: shell/importer/import.glade.h:6
+msgid "Select Importers (step 2 of 3)"
+msgstr "Izberite uvoznike (korak 2 od 3)"
+
+#: shell/importer/import.glade.h:7
+msgid "Select a File (step 2 of 3)"
+msgstr "Izberi datoteko (korak 2 od 3)"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -10301,82 +11980,66 @@ msgstr ""
 "S tem druidom boste vodeni skozi proces uvoza\n"
 "zunanjih datotek v Evolucijo."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Uvozniki"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Ne uvozi"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Ne sprašuj me več"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
 
-#: shell/main.c:95
-#, no-c-format
-msgid ""
-"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"
-"\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Pozdrav.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
-"programja za delovne skupine Evolucija.\n"
-"\n"
-"Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka ali\n"
-"deluje le polovično.\n"
-"\n"
-"Če najdete hrošča, ga prosimo sporočite na bugzilla.ximian.com.\n"
-"Ta izdelek prihaja brez kakršnihkoli zagotovil in ni primeren za\n"
-"osebe, ki doživljajo nasilne napade jeze.\n"
-"\n"
-"Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
-"pričakujemo vaše prispevke!\n"
+#: shell/main.c:89
+msgid "Evolution is now exiting ..."
+msgstr "Evolucije se sedaj zapira..."
 
-#: shell/main.c:116
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Hvala,\n"
-"skupina Evolucije\n"
+#: shell/main.c:210
+msgid "Cannot access the Ximian Evolution shell."
+msgstr "Ne morem dostopati do lupine Ximian Evolucije."
 
-#: shell/main.c:173
-msgid "Cannot access the Evolution shell."
-msgstr "Ne morem dostopati do lupine Evolucije."
-
-#: shell/main.c:184
+#: shell/main.c:219
 #, c-format
-msgid "Cannot initialize the Evolution shell: %s"
-msgstr "Ne morem inicializirati lupine Evolucije: %s"
+msgid "Cannot initialize the Ximian Evolution shell: %s"
+msgstr "Ne morem inicializirati lupine Ximian Evolucije: %s"
 
-#: shell/main.c:228
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:229
+#: shell/main.c:290
 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:271
+#: shell/main.c:332
 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
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
+msgstr "Napaka ob nalaganju privzetega adresarja."
+
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "Izhodna datoteka"
+
+#: tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr "Vhodna datoteka"
+
+#: tools/evolution-addressbook-import.c:80
+msgid "No filename provided."
+msgstr "Ime datoteke ni navedeno."
+
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopiraj"
 
@@ -10392,11 +12055,11 @@ 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
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 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:10
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
@@ -10404,216 +12067,221 @@ msgstr "Izreži izbrano"
 msgid "Delete selected contacts"
 msgstr "Zbriši izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Nov stik"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+msgid "New List"
 msgstr "Nov seznam"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Prilepi"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Prilepi odložišče"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Predogled stikov, ki bodo natisnjeni"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Natisni izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Shrani izbrane kontakte kot eVizitke"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Izberi vse stike"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Send _contact to other"
-msgstr "Pošlji _stik drugim"
-
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send _message to contact"
-msgstr "Stiku pošlji _sporočilo"
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Pošlji _sporočilo stiku..."
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
 msgstr "Pošlji poročilo izbranim stikom."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Stiku pošlji sporočilo"
+
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr "Pošlji izbrane stike drugi osebi."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:31
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "Viri _adresarja..."
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Stik"
 
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "Seznam _stikov"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
-#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:7
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
+msgid "_Forward Contact..."
+msgstr "_Posreduj stik..."
+
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Na_tisni..."
 
-#: ui/evolution-addressbook.xml.h:37
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Save as VCard"
 msgstr "_Shrani kot eVizitko"
 
-#: ui/evolution-addressbook.xml.h:38
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:39
+msgid "_Search for Contacts"
 msgstr "_Išči po kontaktih"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:20
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Orodja"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "Nastavi pogled koledarja"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Ustvari nov celodnevni _dogodek"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a _New Appointment"
-msgstr "Ustvari _nov sestanek"
+msgid "Create a New _Task"
+msgstr "Ustvari novo _nalogo"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Ustvari nov sestanek"
+msgid "Create a _New Appointment"
+msgstr "Ustvari _nov sestanek"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Ustvari sestanek, ki zavzame cel dan"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:10 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:12
+msgid "Delete the appointment"
+msgstr "Zbriši ta sestanek"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
 msgstr "Pojdi nazaj"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
 msgstr "Pojdi naprej"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
 msgstr "Pojdi na danes"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nov sestanek"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Nova naloga"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:21 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Publish Free/Busy Information"
-msgstr "Objavi podatek o zasedenosti"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatek o zasedenosti za ta koledar"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Kaži en dan"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Kaži en mesec"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Kaži en teden"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show work week"
-msgstr "Kaži en delovni teden"
+#: ui/evolution-calendar.xml.h:31
+msgid "Show the working week"
+msgstr "Pokaži delavni teden"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Teden"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "_Sestanek..."
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "_Nastavitve pošte..."
 
+#: ui/evolution-calendar.xml.h:42
+msgid "_Publish Free/Busy Information"
+msgstr "_Objavi podatek o zasedenosti"
+
+#: ui/evolution-calendar.xml.h:43
+msgid "_Task..."
+msgstr "_Naloga..."
+
 #: 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
@@ -10623,15 +12291,15 @@ msgid "Close"
 msgstr "Zapri"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Zapri ta sestanek"
+msgid "Close this item"
+msgstr "Zapri ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Zbriši ta sestanek"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Zbriši ta predmet"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
@@ -10639,87 +12307,59 @@ msgstr "Glavna orodna vrstica"
 msgid "Preview the printed item"
 msgstr "Predogled natisnjenega predmeta"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr "Nastavitev t_iskanja"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Natisni ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Natisni..."
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
+msgid "Save"
+msgstr "Shrani"
+
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Shrani in zapri"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
-msgstr "Shrani sestanek in zapri dialog"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save the item and close the dialog box"
+msgstr "Shrani predmet in zapri dialog"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Shrani ta predmet na disk"
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Zbriši ta predmet"
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Pomoč"
-
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Natisni kuverto..."
 
-#: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
-msgid "Save"
-msgstr "Shrani"
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Shrani _kot..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Shrani stik in zapri dialog"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Pošlji stik drugim..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Glej pomoč na liniji"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Pošlji _sporočilo stiku..."
-
-#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Shrani"
@@ -10748,19 +12388,19 @@ msgstr "Pošlji _sporočilo na seznam..."
 msgid "Cancel Mee_ting"
 msgstr "Prekliči ses_tanek"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Prekliči sestanek za ta predmet"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Posreduj naprej preko e-pošte"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "Dobi osvežene podatke o sestanku"
 
@@ -10772,7 +12412,7 @@ msgstr "Osveži sestanek"
 msgid "Schedule _Meeting"
 msgstr "_Načrtuj sestanek"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Načrtuj sestanek za ta predmet"
 
@@ -10789,37 +12429,37 @@ msgid "Cancel the current mail operation"
 msgstr "Prekliči trenutno operacijo pošte"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Sestavi"
-
-#: ui/evolution-mail-global.xml.h:4
 msgid "Compose _New Message"
 msgstr "Sestavi _novo sporočilo"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
 
-#: 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:10
+msgid "New Message"
+msgstr "Novo sporočilo"
+
 #: 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"
@@ -10876,84 +12516,88 @@ msgstr "_Naroči se na mape..."
 msgid "Change the properties of this folder"
 msgstr "Spremeni lastnosti te mape"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Kopiraj izbrana sporočila"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+msgid "Cu_t"
+msgstr "_Izreži"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Izreži izbrana sporočila"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skrij _izbrana sporočila"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Skrij _zbrisana sporočila"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Skrij _prebrana sporočila"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Raje skrij zbrisana sporočila kot, da so prikazana prečrtana"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Označi vs_e kot prebrano"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Označi vsa vidna sporočila kot prebrana"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Prilepi sporočilo na odložišče"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno odstrani vsa zbrisana sporočila iz te mape"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Izberi _vse"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Izberi ni_t"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Izberi vse in le tista sporočila, ki trenutno niso izbrana"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Izberi vsa sporočila iz iste niti kot izbrano sporočilo"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Izberi vsa vidna sporočila"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "K_aži skrita sporočila"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Kaži sporočila, ki so bila začasno skrita"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Začasno skrij vsa že prebrana sporočila"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Začasno skrij vsa izbrana sporočila"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Niten seznam sporočil"
 
@@ -10961,7 +12605,7 @@ msgstr "Niten seznam sporočil"
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
 msgstr "_Mapa"
 
@@ -10969,11 +12613,11 @@ msgstr "_Mapa"
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_Lastnosti..."
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "_Niten seznam sporočil"
 
@@ -11033,295 +12677,324 @@ msgstr "Ustvari navidezno mapo za tega pošiljatelja"
 msgid "Create a virtual folder for this subject"
 msgstr "Ustvari navidezno mapo za ta predmet"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr "Zmanjšaj velikost besedila"
+
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "Kaži naslednje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "Kaži naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "Kaži naslednje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "Kaži naslednjo neprebrano nit"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "Kaži prejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "Kaži prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "Kaži prejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "Filter glede na p_oštni seznam..."
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "Filter glede na pošilja_telja"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "Filter glede na preje_mnike..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "Filter glede na za_devo..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisili, da bodo slike v HTML pošti naložene"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "Posreduj naprej kot"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr "Posreduj _pripeto"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr "Posreduj kot _del sporočila"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward _Quoted"
 msgstr "Posreduj kot _citirano"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr "Posreduj naprej izbrano sporočilo v telesu novega sporočila"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr "Posreduj izbrano sporočilo citirano kot odgovor"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr "Nekomu posreduj izbrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 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:40
+msgid "Increase the text size"
+msgstr "Povečaj velikost besedila"
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "Naloži _slike"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "Označi kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr "Označi kot _nepomembno"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 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:47
 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:48
 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
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr "Označi izbrana sporočila kot nepomembna"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 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:51
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "Prestavi izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "Naslednje"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr "Naslednje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr "Naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr "Naslednja nit"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 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:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Odpri izbrano sporočilo v skladatelju za vnovično pošiljanje"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
-msgstr "Predogled sporočika, ki bo natisnjeno"
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr "Izvorna _velikost"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
+msgid "Preview the message to be printed"
+msgstr "Predogled sporočila, ki bo natisnjeno"
+
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Prejšnje"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr "Prejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr "Prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr "Prejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "Natisni sporočilo..."
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "Predogled tiskanja..."
-
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr "Natisni to sporočilo"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "S_earch Message"
-msgstr "_Išči v sporočilu"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr "Ponastavi besedilo na njegovo izvorno velikost"
+
+#: ui/evolution-mail-message.xml.h:74
+msgid "S_earch Message..."
+msgstr "_Išči v sporočilu..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr "_Manjša"
+
+#: ui/evolution-mail-message.xml.h:76
 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:77
 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:78
+msgid "Setup the page settings for your current printer"
+msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
+
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr "Kaži _izvorno kodo pošte"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "Kaži celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 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:82
 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:83
 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:84
+msgid "Text Si_ze"
+msgstr "_Velikost besedila"
+
+#: ui/evolution-mail-message.xml.h:85
 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:86
 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:87
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _pošiljatelja..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+msgid "_Larger"
+msgstr "_Večje"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Orodja"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zapri to okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Zapri"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "Po_gled"
 
@@ -11346,12 +13019,12 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Šifriraj to sporočilo z S/MIME šifrirnim certifikatom"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "O_blikuj izpis"
+msgid "For_mat"
+msgstr "O_blika"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
-msgstr "HTML"
+msgid "H_TML"
+msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
 msgid "Inline Text _File..."
@@ -11398,7 +13071,7 @@ msgid "Save in folder..."
 msgstr "Shrani v mapo..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
@@ -11483,36 +13156,31 @@ msgid "_Cc Field"
 msgstr "Polje _cc"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Razhroščuj"
-
-#: ui/evolution-message-composer.xml.h:47
 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-message-composer.xml.h:50
 #: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Odpri..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Polje o_dgovori-na:"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Varnost"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Pomoč"
 
@@ -11545,14 +13213,26 @@ msgid "Unsubscribe"
 msgstr "Prekini naročnino"
 
 #: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr "Dodeli nalogo"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr "Dodeli nalogo drugim"
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Prekliči opravilo"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "Delegiraj opravilo"
+#: ui/evolution-task-editor.xml.h:4
+msgid "Cancel this task"
+msgstr "Prekliči to nalogo"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr "Dobi osvežene podatke o nalogi"
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "Osveži opravilo"
 
@@ -11560,49 +13240,33 @@ msgstr "Osveži opravilo"
 msgid "Configure the task view's settings"
 msgstr "Nastavi pogled nalog"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Kopiraj izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Ustvari nov posel"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Izreži izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 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:12
 msgid "Paste task from the clipboard"
 msgstr "Prilepi opravilo z odložišča"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "Shrani posel kot nekaj drugega"
-
 #: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings"
-msgstr "Nastavitve nalog"
-
-#: ui/evolution-tasks.xml.h:17
-msgid "_Print Task..."
-msgstr "Na_tisni nalogo..."
+msgid "Tasks Settings..."
+msgstr "Nastavitve nalog..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:18
 msgid "_Task"
 msgstr "_Naloga"
 
 #: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "_O Evoluciji..."
+msgid "About Ximian Evolution..."
+msgstr "O Ximian Evoluciji..."
 
 #: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
@@ -11641,137 +13305,117 @@ msgid "E_xit"
 msgstr "Iz_hod"
 
 #: ui/evolution.xml.h:13
-msgid "Evolution _FAQ"
-msgstr "_Pogosto zastavljena vprašanja"
-
-#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Okno Evolucije"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:16
-msgid "Getting _Started"
-msgstr "Kako _začeti"
+#: ui/evolution.xml.h:15
+msgid "Import data from other programs"
+msgstr "Uvozi podatke iz drugih programov"
 
 #: ui/evolution.xml.h:17
-msgid "Import an external file format"
-msgstr "Uvozi datoteko zunanje oblike"
-
-#: ui/evolution.xml.h:19
 msgid "Move this folder to another place"
 msgstr "Prestavi to mapo na drugo mesto"
 
-#: ui/evolution.xml.h:21
-msgid "Open in New _Window"
-msgstr "Odpri v novem _oknu"
+#: ui/evolution.xml.h:18
+msgid "Open in New Window"
+msgstr "Odpri v novem oknu"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
-#: ui/evolution.xml.h:23
-msgid "Show information about Evolution"
-msgstr "Kaži podatke o Evoluciji"
+#: ui/evolution.xml.h:21
+msgid "Show information about Ximian Evolution"
+msgstr "Kaži podatke o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mrežo"
 
+#: ui/evolution.xml.h:29
+msgid "View the selected folder"
+msgstr "Poglej izbrane mape"
+
 #: ui/evolution.xml.h:31
-msgid "Using the C_ontact Manager"
-msgstr "Uporaba upravljalnika _stikov"
+msgid "Ximian Evolution _FAQ"
+msgstr "_Pogosto zastavljena vprašanja"
 
 #: ui/evolution.xml.h:32
-msgid "Using the _Calendar"
-msgstr "Uporaba _koledarja"
-
-#: ui/evolution.xml.h:33
-msgid "Using the _Mailer"
-msgstr "Uporaba _pošte"
+msgid "_About Ximian Evolution..."
+msgstr "_O Ximian Evoluciji..."
 
 #: ui/evolution.xml.h:34
-msgid "View the selected folder"
-msgstr "Poglej izbrane mape"
-
-#: ui/evolution.xml.h:36
-msgid "_About Evolution..."
-msgstr "_O Evoluciji..."
-
-#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:38
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:39
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:46
-msgid "_Import file..."
-msgstr "_Uvozi datoteko..."
-
-#: ui/evolution.xml.h:47
-msgid "_Index"
-msgstr "_Kazalo"
+#: ui/evolution.xml.h:41
+msgid "_Import..."
+msgstr "_Uvozi..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:42
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:43
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:45
+msgid "_Pilot Settings..."
+msgstr "_Nastavive pilota..."
+
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Bližnjica"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bližnjicami"
 
-#: ui/evolution.xml.h:55
-msgid "_Work Offline"
-msgstr "_Delaj brez mreže"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Spremeni nastavitve povzetka"
@@ -11824,195 +13468,146 @@ 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:394
-msgid "Out of Office"
-msgstr "Iz pisarne"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr "Ni podatkov"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "_Povabi ostale..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
-msgid "_Options"
-msgstr "_Možnosti"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
-msgid "Show _Only Working Hours"
-msgstr "Kaži le delavne ure"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
-msgid "Show _Zoomed Out"
-msgstr "Kaži poman_jšano"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
-msgid "_Update Free/Busy"
-msgstr "_Posodobi prosto/zasedeno"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
-msgid "_Autopick"
-msgstr "_Samodeno izberi"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
-msgid "_All People and Resources"
-msgstr "_Vsi ljudje in vsa sredstva"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
-msgid "All _People and One Resource"
-msgstr "Vsi ljudje in eno sredstvo"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
-msgid "_Required People"
-msgstr "_Potrebni ljudje"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
-msgid "Required People and _One Resource"
-msgstr "Potrebni ljudje in eno sredstvo"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Izberi časovni pas"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
-msgid "Meeting _start time:"
-msgstr "Čas pričetka sestanka:"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Izbira"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
-msgid "Meeting _end time:"
-msgstr "Čas zaključka sestanka:"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Časovni pasovi"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
-msgid "All Attendees"
-msgstr "Vsi udeleženi"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Uporabite lev miškin gumb za povečavo območja zemljevida in izbiro časovnega "
+"pasu.\n"
+" Uporabite desni miškin gumb za pomanjšavo."
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "_Trenutni pogled"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 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"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Sedaj"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Danes"
 
-#: widgets/misc/e-cell-date-edit.c:732
+#: widgets/misc/e-cell-date-edit.c:797
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datum mora biti v obliki: %s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltski"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Srednjeevropski"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Kitajski"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cirilični"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grški"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japonski"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Korejski"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turški"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Zahodnoevropski"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Tradicionalen"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Poenostavljen"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Nov"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznan nabor znakov: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Vpišite nabor znakov, ki naj se uporablja"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Drugo..."
 
-#: widgets/misc/e-charset-picker.c:394
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Nabor znakov"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Urejevalnik iskanja"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
@@ -12049,34 +13644,738 @@ msgstr "Sporočilo"
 msgid "Don't show this message again."
 msgstr "Tega sporočila ne kaži več."
 
-#: widgets/misc/e-search-bar.c:333
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_Iskanje"
 
-#: widgets/misc/e-search-bar.c:459
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Išči sedaj"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Strežnik osebnega adresarja"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Strežnik osebnega koledarja; tovarna koledarjal"
 
-#: wombat/wombat.c:173
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nisem mogel inicializirati GNOME-VFS"
 
-#: wombat/wombat.c:185
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 
-#: wombat/wombat.c:198
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid "Brunei"
+#~ msgstr "Brunej"
+
+#~ msgid "Diego Garcia"
+#~ msgstr "Diego Garcia"
+
+#~ msgid "Former Yugoslavia"
+#~ msgstr "ZRJ"
+
+#~ msgid "Federated States of Micronesia"
+#~ msgstr "Federalne države Mikronezije"
+
+#~ msgid "French Antilles"
+#~ msgstr "Francoski Antili"
+
+#~ msgid "Guantanomo Bay"
+#~ msgstr "Zaliv Guantanomo"
+
+#~ msgid "INMARSAT"
+#~ msgstr "INMARSAT"
+
+#~ msgid "INMARSAT Atlantic East"
+#~ msgstr "INMARSAT vzhodni Atlantik"
+
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Iraq"
+#~ msgstr "Irak"
+
+#~ msgid "Ivory Coast"
+#~ msgstr "Slonokoščena obala"
+
+#~ msgid "South Korea"
+#~ msgstr "Južna Koreja"
+
+#~ msgid "Libya"
+#~ msgstr "Libija"
+
+#~ msgid "Russia"
+#~ msgstr "Rusija"
+
+#~ msgid "Saipan"
+#~ msgstr "Saipan"
+
+#~ msgid "Tanzania"
+#~ msgstr "Tanzanija"
+
+#~ msgid "UK"
+#~ msgstr "VB"
+
+#~ msgid "Vatican City"
+#~ msgstr "Vatikan"
+
+#~ msgid "Zaire"
+#~ msgstr "Zaire"
+
+#~ msgid "Factory for the Evolution addressbook component."
+#~ msgstr "Tovarna za Evolucijino komponento adresarja."
+
+#~ msgid "Other Contacts"
+#~ msgstr "Drugo stiki"
+
+#~ msgid "Please enter your email address and password for access to %s"
+#~ msgstr "Prosim vpišite naslov svoje e-pošte in geslo za %s"
+
+#~ msgid "LDAP Authentication"
+#~ msgstr "Avtentifikacija LDAP"
+
+#~ msgid "Password:"
+#~ msgstr "Geslo:"
+
+#~ msgid "Unable to get local storage.  This should never happen."
+#~ msgstr "Ne morem dobiti krajevne shrambe. To se nikoli ne bi smelo zgoditi."
+
+#~ msgid "USA"
+#~ msgstr "ZDA"
+
+#~ msgid "123"
+#~ msgstr "123"
+
+#~ msgid "a"
+#~ msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "Send contact to other"
+#~ msgstr "Pošlji stik drugim"
+
+#~ msgid "Done."
+#~ msgstr "Opravljeno."
+
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Tovarna komponent Evolucije za urejanje koledarja."
+
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr "Obvestilo o vašem sestanku, ki se začne ob %s in konča ob %s"
+
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "Obvestilo o vašem sestanku, ki se začne ob %s"
+
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "Obvestilo o vašem sestanku, ki se konča ob %s"
+
+#~ msgid "Notification about your appointment"
+#~ msgstr "Obvestilo o vašem sestanku"
+
+#~ 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"
+
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "Obvestilo o vašem opravilu, ki se začne ob %s"
+
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "Obvestilo o vašem opravilu, ki se konča ob %s"
+
+#~ msgid "Notification about your task"
+#~ msgstr "Obvestilo o vašem opravilu"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Alarm na %A %d %b %Y ob %H:%M"
+
+#~ msgid "Reminder of your appointment at "
+#~ msgstr "Opomin na sestanek ob "
+
+#~ msgid "Snooze"
+#~ msgstr "Podaljšek spanja"
+
+#~ msgid "Ok"
+#~ msgstr "V redu"
+
+#~ msgid ""
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
+#~ "to know."
+#~ msgstr ""
+#~ "Ura je %s. Trenutni Unix čas je %ld. Mislili smo, da bi vas lahko "
+#~ "zanimalo."
+
+#~ msgid "%d"
+#~ msgstr "%d"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr ""
+#~ "Prioriteta mora biti 'Visoka', 'Običajna', 'Nizka' ali 'Nedefinirana'."
+
+#~ msgid "FIXME: mail alarm options"
+#~ msgstr "FIXME: možnosti alarma pošte"
+
+#~ msgid "before start of appointment"
+#~ msgstr "pred pričetkom sestanka"
+
+#~ msgid "after start of appointment"
+#~ msgstr "po pričetku sestanka"
+
+#~ msgid "before end of appointment"
+#~ msgstr "pred koncem sestanka"
+
+#~ msgid "_12 hour (am/pm)"
+#~ msgstr "_12 urna (dop./pop.)"
+
+#~ msgid "Sent By:"
+#~ msgstr "Poslano od:"
+
+#~ msgid "_Invite Others"
+#~ msgstr "_Povabi ostale"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Zaupno"
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> je izdal(a) podatke o sestanku."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Podatki o sestanku"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Predlog sestanka"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> vas želi dodati k obstoječem sestanku."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Posodobitev sestanka"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> želi dobiti najnovejše podatke o sestanku."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Zahtevek za posodobitev sestanka"
+
+#~ msgid "<b>%s</b> has replyed to a meeting request."
+#~ msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Odgovor na sestanek"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> je preklical(a) sestanek."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Preklic sestanka"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> je poslal(a) nerazumljivo sporočilo."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Nerazumljivo sporočilo o sestanku"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> je objavil(a) podatke o nalogi."
+
+#~ msgid "Task Information"
+#~ msgstr "Podatki o nalogi"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> zahteva, da opravite nalogo."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Predlog naloge"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> vas želi dodati k obstoječi nalogi."
+
+#~ msgid "Task Update"
+#~ msgstr "Posodobitev naloge"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> želi dobiti najnovejše podatke o nalogi."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Zahtevek za posodobitev naloge"
+
+#~ msgid "<b>%s</b> has replyed to a task assignment."
+#~ msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge"
+
+#~ msgid "Task Reply"
+#~ msgstr "Odgovor na nalogo"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> je preklical(a) nalogo."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Preklic naloge"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Nerazumljivo sporočilo o nalogi"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> je objavil(a) podatke o zasedenosti."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Podatki o zasedenosti"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> zahteva vaše podatke o zasedenosti."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Zahtevek po podatkih o zasedenosti"
+
+#~ msgid "<b>%s</b> has replyed to a free/busy request."
+#~ msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Odgovor na zasedenost"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Nerazumljivo sporočilo o zasedenosti"
+
+#~ msgid "I couldn't update your calendar file!\n"
+#~ msgstr "Nisem mogel posodobiti vašege datoteeke koledarja!\n"
+
+#~ msgid "I couldn't remove the item from your calendar file!\n"
+#~ msgstr "Nisem mogel odstraniti predmeta iz vaše datoteke koledarja!\n"
+
+#~ msgid "No plaintext to sign."
+#~ msgstr "Ni besedila za podpis."
+
+#~ msgid "No plaintext to clearsign."
+#~ msgstr "Ni besedila za čisti podpis."
+
+#~ msgid "No plaintext to verify."
+#~ msgstr "Ni besedila za preverbo."
+
+#~ msgid "No plaintext to encrypt."
+#~ msgstr "Ni besedila za šifriranje."
+
+#~ msgid "No ciphertext to decrypt."
+#~ msgstr "Ni šifriranega besedila za dešifriranje."
+
+#~ msgid "IMAPv4"
+#~ msgstr "IMAPv4"
+
+#~ msgid "Standard Unix mailbox file"
+#~ msgstr "Običajna Unix datoteka poštnega predala"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Poštne datoteke vrste Qmail"
+
+#~ msgid "Unix mbox spool-format mail files"
+#~ msgstr "Poštne datoteke vrste 'spool'"
+
+#~ msgid "Summarizing folder"
+#~ msgstr "Delam povzetek mape"
+
+#~ msgid "Could not open folder: %s: summarizing from position %ld: %s"
+#~ msgstr ""
+#~ "Nisem mogel odpreti mape: %s: povzetek delam od položaja %ld dalje: %s"
+
+#~ msgid "Cannot summarize folder: %s: %s"
+#~ msgstr "Ne morem narediti povzetka mape: %s: %s"
+
+#~ msgid "Synchronising folder"
+#~ msgstr "Uskljajujem mapo %s"
+
+#~ msgid "Could not open folder to summarize: %s: %s"
+#~ msgstr "Nisem mogel odpreti mape za izdelavo povzetka: %s: %s"
+
+#~ msgid "Spool stores do not have an inbox"
+#~ msgstr "Shramba vrste 'Spool' nima dohodnega predala"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "Ne morem narediti povzetka mape %s: %s"
+
+#~ msgid "Could not open folder to summarise: %s: %s"
+#~ msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
+
+#~ msgid ""
+#~ "For connecting to POP servers. The POP protocol can also be used to "
+#~ "retrieve mail from certain web mail providers and proprietary email "
+#~ "systems."
+#~ msgstr ""
+#~ "Za povezovanje s strežniki POP. Protokol POP se lahko uporabi tudi za "
+#~ "prenašanje pošte iz nekaterih spletnih nuditeljev pošte in zaprtih "
+#~ "sistemov e-pošte."
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Nisem mogel ustvariti okna skladatelja."
+
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%d/%m/%Y"
+
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%d/%m/%Y"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Edit"
+#~ msgstr "Uredi"
+
+#~ msgid "Elm mail"
+#~ msgstr "Poštni program Elm"
+
+#~ msgid "Pine mail"
+#~ msgstr "Poštni program Pine"
+
+#~ msgid "Mail to %s"
+#~ msgstr "Pošta za %s"
+
+#~ msgid "Subject is %s"
+#~ msgstr "Zadeva je %s"
+
+#~ msgid "Mail from %s"
+#~ msgstr "Pošta od %s"
+
+#~ msgid "%s mailing list"
+#~ msgstr "%s poštnih seznamov"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "Na %s, je %s zapisal(a):"
+
+#~ msgid "Forwarded message:\n"
+#~ msgstr "Posredovano sporočilo:\n"
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Dohdona pošta"
+
+#~ msgid "Always encrypt to myself when sending encrypyed mail"
+#~ msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
+
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "Privzet naj bo _predogled sporočila"
+
+#~ msgid "Message list should display in a _threaded fashion by default"
+#~ msgstr "Seznam sporočil naj bo privzeto prikazan _niteno"
+
+#~ msgid "_Remember PGP Passphrase until exit"
+#~ msgstr "Do izhoda pomni geslo PGP"
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "Program GPG/PGP ni nastavljen."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Šifrirano sporočilo ni prikazano"
+
+#~ msgid "Encrypted message"
+#~ msgstr "Šifrirano sporočilo"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "Kliknite ikono za dešifriranje."
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid "Opening '%s'"
+#~ msgstr "Odpiram '%s'"
+
+#~ msgid "Trash"
+#~ msgstr "Smeti"
+
+#~ msgid "Couldn't create temporary mbox `%s': %s"
+#~ msgstr "Nisem mogel ustvariti začasnega poštnega predala `%s': %s"
+
+#~ msgid "VFolders"
+#~ msgstr "vMape"
+
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Tovarna za Evolucijine komponente za povzetke."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
+
+#~ msgid "%l:%M%p"
+#~ msgstr "%l:%M%p"
+
+#~ msgid "%a %l:%M%p"
+#~ msgstr "%a %l:%M%p"
+
+#~ msgid "There was an error downloading news feed"
+#~ msgstr "Napaka ob prenašanju vira novic."
+
+#~ msgid "Smoke w/ thunders"
+#~ msgstr "Dim z grmenjem"
+
+#~ msgid "Volcanic ash w/ thunders"
+#~ msgstr "Vulkanski dim z grmenjem"
+
+#~ msgid "Units: "
+#~ msgstr "Enote: "
+
+#~ msgid "_Refresh time (seconds):"
+#~ msgstr "_Čas osvežitve (sekund):"
+
+#~ msgid "m_etric"
+#~ msgstr "_metrični"
+
+#~ msgid "Outbox"
+#~ msgstr "Odhodna pošta"
+
+#~ msgid "This seems to be the first time you are running Evolution."
+#~ msgstr "Kaže, da je to vaš prvi zagon Evolucije."
+
+#~ msgid "Please click \"OK\" to install the Evolution user files under"
+#~ msgstr ""
+#~ "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških "
+#~ "datotek pod"
+
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Zbriši mapo '%s'"
+
+#~ msgid ""
+#~ "Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "Evolucija je zbirka programov okolja \n"
+#~ "GNOME za delo v skupinah, za pošto, koledar in \n"
+#~ "urejanje stikov."
+
+#~ msgid "%s - Evolution %s"
+#~ msgstr "%s - Evolucija %s"
+
+#~ msgid "%s - Evolution %s [%s]"
+#~ msgstr "%s - Evolucija %s [%s]"
+
+#~ 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."
+
+#~ msgid ""
+#~ "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"
+#~ "\n"
+#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Pozdrav.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
+#~ "programja za delovne skupine Evolucija.\n"
+#~ "\n"
+#~ "Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka "
+#~ "ali\n"
+#~ "deluje le polovično.\n"
+#~ "\n"
+#~ "Če najdete hrošča, ga prosimo sporočite na bugzilla.ximian.com.\n"
+#~ "Ta izdelek prihaja brez kakršnihkoli zagotovil in ni primeren za\n"
+#~ "osebe, ki doživljajo nasilne napade jeze.\n"
+#~ "\n"
+#~ "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
+#~ "pričakujemo vaše prispevke!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Evolution Team\n"
+#~ msgstr ""
+#~ "Hvala,\n"
+#~ "skupina Evolucije\n"
+
+#~ msgid "New contact"
+#~ msgstr "Nov stik"
+
+#~ msgid "Send _contact to other"
+#~ msgstr "Pošlji _stik drugim"
+
+#~ msgid "Send _message to contact"
+#~ msgstr "Stiku pošlji _sporočilo"
+
+#~ msgid "Show work week"
+#~ msgstr "Kaži en delovni teden"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Zapri ta sestanek"
+
+#~ msgid "Print S_etup"
+#~ msgstr "Nastavitev t_iskanja"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Shrani sestanek in zapri dialog"
+
+#~ msgid "Help"
+#~ msgstr "Pomoč"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Pošlji stik drugim..."
+
+#~ msgid "See online help"
+#~ msgstr "Glej pomoč na liniji"
+
+#~ msgid "Compose"
+#~ msgstr "Sestavi"
+
+#~ msgid "Print Message..."
+#~ msgstr "Natisni sporočilo..."
+
+#~ msgid "Print Preview..."
+#~ msgstr "Predogled tiskanja..."
+
+#~ msgid "F_ormat"
+#~ msgstr "O_blikuj izpis"
+
+#~ msgid "_Debug"
+#~ msgstr "_Razhroščuj"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Delegiraj opravilo"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Shrani posel kot nekaj drugega"
+
+#~ msgid "_Print Task..."
+#~ msgstr "Na_tisni nalogo..."
+
+#~ msgid "Getting _Started"
+#~ msgstr "Kako _začeti"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uporaba upravljalnika _stikov"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uporaba _koledarja"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uporaba _pošte"
+
+#~ msgid "All Attendees"
+#~ msgstr "Vsi udeleženi"
+
 #~ msgid "???"
 #~ msgstr "???"
 
@@ -12086,20 +14385,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Company:"
 #~ msgstr "_Podjetje:"
 
-#~ msgid "Enter password for %s"
-#~ msgstr "Vpišite geslo za %s"
-
 #~ msgid "Category contains"
 #~ msgstr "Kategorija vsebuje"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Strežnik LDAP"
-
-#~ msgid "File"
-#~ msgstr "Datoteka"
-
 #~ msgid "Unknown addressbook type"
-#~ msgstr "Neznan tip adresarja"
+#~ msgstr "Neznana vrsta adresarja"
 
 #~ msgid "None (anonymous mode)"
 #~ msgstr "Brez (anonimni način)"
@@ -12111,7 +14401,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Poddrevo"
 
 #~ msgid "Unknown scope type"
-#~ msgstr "Neznan tip dosega"
+#~ msgstr "Neznana vrsta dosega"
 
 #~ msgid "Bind DN:"
 #~ msgstr "Povezan z domeno:"
@@ -12147,7 +14437,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "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."
+#~ "Izberite vrsto adresarja, ki ga imate in vnestite potrebne podatke o njem."
 
 #~ msgid "FIXME Name help text here"
 #~ msgstr "FIXME Name help text here"
@@ -12155,9 +14445,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME Description help text here"
 #~ msgstr "FIXME Description help text here"
 
-#~ msgid "Name"
-#~ msgstr "Ime"
-
 #~ msgid "URI"
 #~ msgstr "URI"
 
@@ -12178,9 +14465,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
 
@@ -12224,9 +14508,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "minutes before they occur."
 #~ msgstr "minut preden se zgodijo."
 
-#~ msgid "No one"
-#~ msgstr "Nikomur"
-
 #~ msgid "Task"
 #~ msgstr "Naloga"
 
@@ -12266,9 +14547,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "The message does not appear to be properly formed"
 #~ msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
 
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "To sporočilo vsebuje le nepodprte zahtevke"
-
 #~ msgid "The information contained in this attachment was not valid"
 #~ msgstr "Podatki vsebovani v tej prilogi niso veljavni"
 
@@ -12278,9 +14556,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Has category"
 #~ msgstr "Ima kategorijo"
 
-#~ msgid "Scanning IMAP folder"
-#~ msgstr "Pregledujem mapo IMAP"
-
 #~ msgid "Error opening file: %s"
 #~ msgstr "Napaka ob odpiranju datoteke: %s"
 
@@ -12305,9 +14580,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
 
@@ -12317,9 +14589,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Creating new folder"
 #~ msgstr "Ustvari novo mapo"
 
-#~ msgid "Copying messages"
-#~ msgstr "Kopiram sporočilo"
-
 #~ msgid "Evolution progress"
 #~ msgstr "Napredek evolucije"
 
@@ -12332,9 +14601,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Receiving"
 #~ msgstr "Sprejemam"
 
-#~ msgid "Sending"
-#~ msgstr "Pošiljam"
-
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (posredovano sporočilo)"
 
@@ -12399,12 +14665,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Save calendar as something else"
 #~ msgstr "Shrani koledar kot nekaj drugega"
 
-#~ msgid "Settings..."
-#~ msgstr "Nastavitve..."
-
-#~ msgid "Show the working week"
-#~ msgstr "Pokaži delavni teden"
-
 #~ msgid "W_ork Week"
 #~ msgstr "_Delavni teden"
 
@@ -12495,9 +14755,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Task (FIXME)"
 #~ msgstr "_Naloga (FIXME)"
 
-#~ msgid "_My Evolution Settings..."
-#~ msgstr "_Nastavive Moje Evolucije..."
-
 #~ msgid "As _Minicards"
 #~ msgstr "Kot _minivizitke"
 
@@ -12513,9 +14770,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Alarms timeout after"
 #~ msgstr "Alarmi pretečejo čez"
 
-#~ msgid "Colors"
-#~ msgstr "Barve"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Omogoči podaljšanje spanja za"
 
@@ -12549,9 +14803,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit the task"
 #~ msgstr "Uredi opravilo"
 
-#~ msgid "Schedule Meeting"
-#~ msgstr "Načrtuj sestanek"
-
 #~ msgid "Component successfully updated."
 #~ msgstr "Komponenta je bila uspešno posodobljena."
 
@@ -12585,9 +14836,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Update Calendar"
 #~ msgstr "Posodobi koledar"
 
-#~ msgid "Attendee address"
-#~ msgstr "Naslov udeleženca"
-
 #~ msgid "Attendees: "
 #~ msgstr "Udeleženi:"
 
@@ -12611,9 +14859,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Appointment Basics"
 #~ msgstr "Osnove sestankov"
 
-#~ msgid "_Starting date:"
-#~ msgstr "Datum _pričetka:"
-
 #~ msgid "Could not test lock file for %s: %s"
 #~ msgstr "Nisem mogel preveriti ključavnične datoteke %s: %s"
 
@@ -12673,16 +14918,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "encrypt"
 #~ msgstr "šifriranje"
 
-#~ msgid ""
-#~ "Could not open signature file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisem mogel odpreti datoteke s podpisom %s:\n"
-#~ "%s"
-
-#~ msgid "That is not a regular file."
-#~ msgstr "To ni običajna datoteka."
-
 #~ msgid "That file exists but is not readable."
 #~ msgstr "Ta datoteka obstaja a ni berljiva."
 
@@ -12876,7 +15111,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nas_tavitev tiskanja..."
 
 #~ msgid "Schedule some sort of a meeting"
-#~ msgstr "Načrtuj nek tip sestanka"
+#~ msgstr "Načrtuj neko vrsto sestanka"
 
 #~ msgid "Select everything"
 #~ msgstr "Izberi vse"
@@ -12917,9 +15152,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Create a new email"
 #~ msgstr "Ustvari novo e-pošto"
 
-#~ msgid "New Mail"
-#~ msgstr "Nova pošta"
-
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_Vstavi datoteko z besedilom... (FIXME)"
 
@@ -12968,9 +15200,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Evolution bar _shortcut"
 #~ msgstr "Evolucijina vrstica z _bližnjicami"
 
-#~ msgid "Remove the selected folder"
-#~ msgstr "Odstrani izbrano mapo"
-
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either\n"
 #~ "means you have entered an incorrect URI, or have tried\n"
@@ -13022,9 +15251,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr "Posreduj to sporočilo kot del vaše pošte, da ga lahko uredite"
 
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Skrij zbrisana sporočila"
-
 #~ msgid "Invert Selection"
 #~ msgstr "Obrni izbor"
 
@@ -13173,9 +15399,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Nastavitev Evolucijine pošte"
 
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
 #~ msgid "Include this account when receiving mail"
 #~ msgstr "Vključi ta račun ob sprejemanju pošte"
 
@@ -13471,12 +15694,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Copy messages from \"%s\" into \"%s\""
 #~ msgstr "Kopiraj sporočilo iz \"%s\" v \"%s\""
 
-#~ msgid "(No description)"
-#~ msgstr "(ni opisa)"
-
-#~ msgid "Opening Trash folder for %s"
-#~ msgstr "Odpiram mapo Smeti za %s"
-
 #~ msgid "Loading %s Folder for %s"
 #~ msgstr "Nalagam mapo %s za %s"
 
@@ -13575,9 +15792,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Click \"Next\" to begin. "
 #~ msgstr "Kliknite \"Naprej\" za začetek. "
 
-#~ msgid "FIXME: Assig_n Task"
-#~ msgstr "FIXME: Dodali _nalogo"
-
 #~ msgid "FIXME: Ch_oose Form..."
 #~ msgstr "FIXME: Izberi izmed..."
 
@@ -13719,9 +15933,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Undo"
 #~ msgstr "_Razveljavi"
 
-#~ msgid "S_ummary"
-#~ msgstr "_Povzetek"
-
 #~ msgid "task-editor-dialog"
 #~ msgstr "dialog-urejevalnik-dogodkov"
 
@@ -13771,9 +15982,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Send queue"
 #~ msgstr "Pošlji vrsto"
 
-#~ msgid "Examining %s"
-#~ msgstr "Preučujem %s"
-
 #~ msgid ""
 #~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
 #~ msgstr ""
@@ -13835,9 +16043,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Vendar se bo sestanek ponovil pravočasno in bo  pravilno prikazan v "
 #~ "pogledu koledarja."
 
-#~ msgid "may"
-#~ msgstr "maj"
-
 #~ msgid "sept"
 #~ msgstr "sept"
 
@@ -13952,9 +16157,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Time format"
 #~ msgstr "Oblika izpisa časa"
 
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 urna (dop./pop.)"
-
 #~ msgid "24-hour"
 #~ msgstr "24 urna"
 
@@ -14017,18 +16219,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj že obstaja"
 
-#~ msgid "Could not open summary %s"
-#~ msgstr "Nisem mogel odpreti povzetka %s"
-
 #~ msgid "Summary mismatch, X-Evolution header missing"
 #~ msgstr "Povzetek se ne ujema, X-Evolucije glava manjka"
 
 #~ msgid "Cannot copy data to output file: %s"
 #~ msgstr "Ne morem kopirati podatkov v izhodno datoteko: %s"
 
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Nisem mogel preimenovati mape `%s': %s že obstaja"
-
 #~ msgid "MH folders may not be nested."
 #~ msgstr "MH mape ne morejo biti gnezdene"
 
@@ -14058,7 +16254,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Datoteka s podpisom"
 
 #~ msgid "Mail source type:"
-#~ msgstr "Tip izvora pošte:"
+#~ msgstr "Vrsta izvora pošte:"
 
 #~ msgid ""
 #~ "Select the kind of mail server you have, and enter the relevant "
@@ -14071,7 +16267,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "potrebne podatke.\n"
 #~ "\n"
 #~ "Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
-#~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
+#~ "podprte vrste...\" potem, ko boste vnesli ostale podatke."
 
 #~ msgid ""
 #~ "Select the kind of news server you have, and enter the relevant "
@@ -14084,10 +16280,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "potrebne podatke.\n"
 #~ "\n"
 #~ "Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
-#~ "podprte tipe...\", po tem ko boste vnesli ostale podatke."
+#~ "podprte vrste...\", po tem ko boste vnesli ostale podatke."
 
 #~ msgid "Mail transport type:"
-#~ msgstr "Tip prenosa pošte:"
+#~ msgstr "Vrsta prenosa pošte:"
 
 #~ msgid "Add Identity"
 #~ msgstr "Dodaj identiteto"
@@ -14290,9 +16486,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "New appointment for _today..."
 #~ msgstr "Nov sestanek za _danes..."
 
-#~ msgid "%s%s"
-#~ msgstr "%s%s"
-
 #~ msgid "'s calendar"
 #~ msgstr " koledar"
 
@@ -14314,9 +16507,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME: Assign Task..."
 #~ msgstr "FIXME: _Dodeli nalogo..."
 
-#~ msgid "Assign the task to someone"
-#~ msgstr "Nekomu dodeli nalogo"
-
 #~ msgid "FIXME: Delete"
 #~ msgstr "FIXME: Zbriši"
 
@@ -14379,9 +16569,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Ur\n"
 #~ "Dni\n"
 
-#~ msgid "Daily"
-#~ msgstr "Dnevne"
-
 #~ msgid "Weekly"
 #~ msgstr "Tedenske"
 
@@ -14451,9 +16638,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Hour"
 #~ msgstr "Ura"
 
-#~ msgid "Minute"
-#~ msgstr "Minuta"
-
 #~ msgid "Second"
 #~ msgstr "Sekunda"
 
@@ -14548,9 +16732,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Discard this message?"
 #~ msgstr "Zavrzi to sporočilo"
 
-#~ msgid "Finish"
-#~ msgstr "Končaj"
-
 #~ msgid "Apply"
 #~ msgstr "Uporabi"
author	Andraz Tori <minmax@src.gnome.org>	2001-11-25 07:26:44 +0800
committer	Andraz Tori <minmax@src.gnome.org>	2001-11-25 07:26:44 +0800
commit	206cb91300b952f007e8eaa8384198ce7030219d (patch)
tree	2f2c58e76e7838e6186f7821d6d1ad3923ea2d8c /po
parent	f345e6dfe37004d30934c2672a23dd02b3161adc (diff)
download	gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.gz gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.bz2 gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.lz gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.xz gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.tar.zst gsoc2013-evolution-206cb91300b952f007e8eaa8384198ce7030219d.zip