Updated Slovenian translation

svn path=/trunk/; revision=15864
author: Andraz Tori <minmax@src.gnome.org> 2002-02-28 07:47:44 +0800
committer: Andraz Tori <minmax@src.gnome.org> 2002-02-28 07:47:44 +0800
commit: 1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795 (patch)
tree: ab2aab4d1e86d742045fb00bccf6bf770a7624cf /po
parent: e83a759e4ea8eec0615f8306cacacd620702dc2f (diff)
download: gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar
gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.gz
gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.bz2
gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.lz
gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.xz
gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.zst
gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.zip
1 files changed, 3216 insertions, 2469 deletions
diff --git a/po/sl.po b/po/sl.po
index bb198a000a..c002fc0287 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-01-26 19:46+0100\n"
+"POT-Creation-Date: 2002-02-26 15:21+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"
@@ -30,7 +30,7 @@ msgid "Imports VCard files into Evolution."
 msgstr "Uvozi datoteke vVizitk v Evolucijo. "
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:960
+#: addressbook/gui/widgets/e-addressbook-view.c:332
 msgid "File As"
 msgstr "Zavedi kot"
 
@@ -39,12 +39,12 @@ msgid "Name"
 msgstr "Ime"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:962
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "Email"
 msgstr "E-pošta"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Primary"
 msgstr "Prvi"
 
@@ -54,16 +54,16 @@ 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:994
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 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/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "Služba"
 
@@ -73,12 +73,12 @@ msgid "Bus"
 msgstr "Služ."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1648
+#: addressbook/gui/contact-editor/e-contact-editor.c:1720
 msgid "Callback"
 msgstr "Povratni klic"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1650
+#: addressbook/gui/contact-editor/e-contact-editor.c:1722
 msgid "Company"
 msgstr "Podjetje"
 
@@ -89,13 +89,13 @@ msgstr "Podj."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "Doma"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:969
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -105,19 +105,19 @@ msgstr "Org."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1649
+#: addressbook/gui/contact-editor/e-contact-editor.c:1721
 msgid "Car"
 msgstr "Avto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:974
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Business Fax"
 msgstr "Službeni faks"
 
@@ -126,13 +126,13 @@ 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:975
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Home Fax"
 msgstr "Domači faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Služba"
 
@@ -141,69 +141,69 @@ msgid "Bus 2"
 msgstr "Služba 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1652
+#: addressbook/gui/contact-editor/e-contact-editor.c:1724
 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:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 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:57
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: mail/mail-config.glade.h:58
 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:980
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 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:981
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 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:982
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 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:983
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Telex"
 msgstr "Teleks"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:984
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 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:986
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 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:987
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "Email 3"
 msgstr "E-naslov 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:988
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Web Site"
 msgstr "Spletna stran"
 
@@ -212,7 +212,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:989
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Department"
 msgstr "Oddelek"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "Odd."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:990
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Office"
 msgstr "Pisarna"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Pisar."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:991
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Title"
 msgstr "Naziv"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:992
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Profession"
 msgstr "Poklic"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Pokl."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:993
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Manager"
 msgstr "Upravljalec"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Pomoč."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:995
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Nickname"
 msgstr "Vzdevek"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Vzdevek"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:996
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Spouse"
 msgstr "Partner(ka)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:997
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Note"
 msgstr "Opomba"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "URI koledarja"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:998
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
@@ -313,302 +313,16 @@ msgstr "kategorije"
 msgid "Family Name"
 msgstr "Družinsko ime"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
-msgstr "Vizitka: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Ime: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Predpona:   "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Dano:       "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Dodatno:    "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Družinsko:     "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Pripona:    "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Datum rojstva: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Naslov:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Poštni predal:  "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Interna:     "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Ulica:       "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Mesto:       "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Regija:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Poštna številka: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Država:      "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Dostavna oznaka: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoni:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-naslov:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-naslov:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Poštni program: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Časovni pas: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geografski položaj: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Poslovna vloga: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Organizacija: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Ime:   "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Enota:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Enota2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Enota3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Enota4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorije: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Komentar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Enoličen niz:  "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Javni ključ: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2677
 msgid "Multiple VCards"
 msgstr "Več vVizitk"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2685
 #, c-format
 msgid "VCard for %s"
 msgstr "VVizitka za %s"
@@ -616,11 +330,11 @@ msgstr "VVizitka za %s"
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1721
+#: addressbook/backend/ebook/test-client.c:34
+#: addressbook/conduit/address-conduit.c:1860
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
-#: calendar/conduits/todo/todo-conduit.c:1316
+#: calendar/conduits/todo/todo-conduit.c:1385
 #: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
@@ -628,74 +342,78 @@ msgstr "VVizitka za %s"
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2272
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2364
 msgid "Searching..."
 msgstr "Iščem..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Nalagam..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:270
+#: addressbook/backend/pas/pas-backend-file.c:272
 msgid "Error in search expression."
 msgstr "Napaka v iskalnem izrazu."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
+#: addressbook/backend/pas/pas-backend-ldap.c:516
 msgid "Connecting to LDAP server..."
 msgstr "Vzpostavljam povezavo s strežnikom LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:496
+#: addressbook/backend/pas/pas-backend-ldap.c:526
 msgid "Unable to connect to LDAP server."
 msgstr "Nisem se mogel povezati s strežnikom LDAP."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:512
+#: addressbook/backend/pas/pas-backend-ldap.c:542
 msgid "Waiting for connection to LDAP server..."
 msgstr "Čakam na povezavo s strežnikom LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:963
 msgid "Adding card to LDAP server..."
 msgstr "Dodajam vizitko v strežnik LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1064
 msgid "Removing card from LDAP server..."
 msgstr "Odstranjujem vizitko iz strežnika LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1174
 msgid "Modifying card from LDAP server..."
 msgstr "Spreminjam vizitko iz strežnika LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2281
 msgid "Receiving LDAP search results..."
 msgstr "Dobivam rezultate iskanja LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
+#: addressbook/backend/pas/pas-backend-ldap.c:2287
 msgid "Restarting search."
 msgstr "Znova začenjam iskanje."
 
-#: addressbook/conduit/address-conduit.c:426
+#: addressbook/conduit/address-conduit.c:293
+msgid "Default Sync Address:"
+msgstr "Privzet usklajevalni naslov:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel naložiti\n"
 
-#: addressbook/conduit/address-conduit.c:439
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naložena\n"
 
-#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1354
 #: calendar/conduits/calendar/calendar-conduit.c:1203
-#: calendar/conduits/todo/todo-conduit.c:824
+#: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati strežnika wombat"
 
-#: addressbook/conduit/address-conduit.c:1221
+#: addressbook/conduit/address-conduit.c:1355
 #: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:825
+#: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: addressbook/conduit/address-conduit.c:1251
-#: addressbook/conduit/address-conduit.c:1254
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
@@ -742,7 +460,8 @@ msgstr "Tovarna za vzorčno kontrolo adresarja"
 
 #: 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
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Stiki"
 
@@ -758,24 +477,24 @@ msgstr "Strežnik LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Strežnik LDAP, ki vsebuje podatke o stikih"
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact"
 msgstr "Nov stik"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New _Contact"
-msgstr "Nov _stik"
+#: addressbook/gui/component/addressbook-component.c:558
+#: ui/evolution-addressbook.xml.h:34
+msgid "_Contact"
+msgstr "_Stik"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/component/addressbook-component.c:530
-msgid "New Contact _List"
-msgstr "Nov seznam _stikov"
+#: addressbook/gui/component/addressbook-component.c:561
+msgid "Contact _List"
+msgstr "Seznam _stikov"
 
-#: addressbook/gui/component/addressbook-config.c:223
+#: addressbook/gui/component/addressbook-config.c:225
 msgid "Edit Addressbook"
 msgstr "Uredi adresar"
 
@@ -897,7 +616,8 @@ msgid ""
 "This is the maximum number of cards to download.  Setting this number too "
 "large will slow down this addressbook."
 msgstr ""
-"To je največje število vizik za prenos.  Če je to nastavljeno na preveč, bo upočasnilo ta adresar."
+"To je največje število vizik za prenos.  Če je to nastavljeno na preveč, bo "
+"upočasnilo ta adresar."
 
 #: addressbook/gui/component/addressbook-config.glade.h:26
 msgid ""
@@ -905,7 +625,9 @@ msgid ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"To je način, ki ga bo Evolucija uporabila, za vašo avtentifikacijo.  Če boste to nastavili na \"E-poštni naslov\", bo potrebovan anonimni dostop do vašega strežnika LDAP"
+"To je način, ki ga bo Evolucija uporabila, za vašo avtentifikacijo.  Če "
+"boste to nastavili na \"E-poštni naslov\", bo potrebovan anonimni dostop do "
+"vašega strežnika LDAP"
 
 #: addressbook/gui/component/addressbook-config.glade.h:27
 msgid "This is the name of the server where your addressbook is located."
@@ -931,7 +653,7 @@ msgstr "Ime _računa:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:100
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -944,16 +666,17 @@ msgid "_Download Limit"
 msgstr "_Omejitev prenosov"
 
 #: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:107
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
+#: ui/evolution-addressbook.xml.h:38 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-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:18
 msgid "_Edit"
 msgstr "_Uredi"
 
 #: addressbook/gui/component/addressbook-config.glade.h:35
+#: mail/mail-config.glade.h:110
 msgid "_Email address:"
 msgstr "_E-poštni naslov:"
 
@@ -970,11 +693,15 @@ msgstr "Ime _strežnika:"
 msgid "Could not initialize gnome-vfs"
 msgstr "Nisem mogel inicializirati gnome-vfs"
 
-#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Drugo stiki"
+
+#: addressbook/gui/component/addressbook.c:525
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:534
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -983,7 +710,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:513
+#: addressbook/gui/component/addressbook.c:539
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -995,7 +722,7 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:521
+#: addressbook/gui/component/addressbook.c:547
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -1034,12 +761,12 @@ msgid "Advanced..."
 msgstr "Napredno..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
+#: addressbook/gui/component/addressbook.c:1082
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:1150
+#: addressbook/gui/component/addressbook.c:1167
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -1054,7 +781,7 @@ msgstr "(brez)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "prvi e-naslov"
 
@@ -1109,7 +836,7 @@ 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:163
-#: addressbook/gui/component/select-names/e-select-names.c:830
+#: addressbook/gui/component/select-names/e-select-names.c:849
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
 #: filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
 msgid "Remove"
@@ -1140,7 +867,7 @@ msgstr "(%d ni pokazanih)"
 msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:600
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1156,7 +883,7 @@ msgstr ""
 "Vsebuje naj podroben opis okoliščin v katerih se je ta napaka tgodila.\n"
 "Hvala."
 
-#: addressbook/gui/component/select-names/e-select-names.c:589
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -1168,7 +895,7 @@ msgstr ""
 "Za rešitev tega problema boste morali zapustiti in znova\n"
 "pognati Evolucijo."
 
-#: addressbook/gui/component/select-names/e-select-names.c:671
+#: addressbook/gui/component/select-names/e-select-names.c:690
 msgid "Select Contacts from Addressbook"
 msgstr "Izberi stike iz adresarja"
 
@@ -1228,7 +955,7 @@ msgstr "Sodelovanje"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
@@ -1301,9 +1028,9 @@ msgstr "Želi dobivati _HTML e-pošto"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1478 mail/mail-config.glade.h:105
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: mail/folder-browser.c:1492 mail/mail-config.glade.h:107
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Zbriši"
 
@@ -1331,27 +1058,1055 @@ msgstr "URL _javnega koledarja"
 msgid "_Web page address:"
 msgstr "Naslov _spletne strani:"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "Združene države amerike"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: my-evolution/Locations.h:42
+msgid "Albania"
+msgstr "Albanija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: my-evolution/Locations.h:54
+msgid "Algeria"
+msgstr "Alžirija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+msgid "American Samoa"
+msgstr "Ameriška Samoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+msgid "Andorra"
+msgstr "Andora"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+msgid "Angola"
+msgstr "Angola"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+msgid "Anguilla"
+msgstr "Angvila"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+msgid "Antarctica"
+msgstr "Antarktika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+msgid "Antigua And Barbuda"
+msgstr "Antigva in Barbuda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: my-evolution/Locations.h:120
+msgid "Argentina"
+msgstr "Argentina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+msgid "Armenia"
+msgstr "Armenija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+msgid "Aruba"
+msgstr "Aruba"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: my-evolution/Locations.h:154
+msgid "Australia"
+msgstr "Australija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: my-evolution/Locations.h:155
+msgid "Austria"
+msgstr "Avstrija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+msgid "Azerbaijan"
+msgstr "Azerbajdžan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: my-evolution/Locations.h:161
+msgid "Bahamas"
+msgstr "Bahami"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: my-evolution/Locations.h:164
+msgid "Bahrain"
+msgstr "Bahrajn"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+msgid "Bangladesh"
+msgstr "Bangladeš"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+msgid "Barbados"
+msgstr "Barbados"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+msgid "Belarus"
+msgstr "Belorusija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: my-evolution/Locations.h:216
+msgid "Belgium"
+msgstr "Belgija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: my-evolution/Locations.h:218
+msgid "Belize"
+msgstr "Belize"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+msgid "Benin"
+msgstr "Benin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+msgid "Bermuda"
+msgstr "Bermudi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+msgid "Bhutan"
+msgstr "Butan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: my-evolution/Locations.h:270
+msgid "Bolivia"
+msgstr "Bolivija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+msgid "Bosnia And Herzegowina"
+msgstr "Bosna in Hercegovina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+msgid "Botswana"
+msgstr "Bocvana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+msgid "Bouvet Island"
+msgstr "Bouvetski otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: my-evolution/Locations.h:294
+msgid "Brazil"
+msgstr "Brazilija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "British Indian Ocean Territory"
+msgstr "Britansko Indijsko oceansko območje"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: my-evolution/Locations.h:320
+msgid "Bulgaria"
+msgstr "Bolgarija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+msgid "Burundi"
+msgstr "Burundi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+msgid "Cambodia"
+msgstr "Kambodža"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: my-evolution/Locations.h:354
+msgid "Canada"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+msgid "Cape Verde"
+msgstr "Zelenortski otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: my-evolution/Locations.h:389
+msgid "Cayman Islands"
+msgstr "Kajmanski otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+msgid "Central African Republic"
+msgstr "Srednjaafriška republika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+msgid "Chad"
+msgstr "Čad"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
+msgid "Chile"
+msgstr "Čile"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+msgid "China"
+msgstr "Kitajska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: my-evolution/Locations.h:451
+msgid "Christmas Island"
+msgstr "Velikonočni otok"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+msgid "Cocos (Keeling) Islands"
+msgstr "Kokosovi otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: my-evolution/Locations.h:483
+msgid "Colombia"
+msgstr "Kolumbija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+msgid "Comoros"
+msgstr "Komori"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+msgid "Congo"
+msgstr "Kongo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+msgid "Cook Islands"
+msgstr "Cookovi otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: my-evolution/Locations.h:517
+msgid "Costa Rica"
+msgstr "Kostarika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+msgid "Cote d'Ivoire"
+msgstr "Cote d'Ivoire"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: my-evolution/Locations.h:528
+msgid "Croatia"
+msgstr "Hrvaška"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: my-evolution/Locations.h:532
+msgid "Cuba"
+msgstr "Kuba"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: my-evolution/Locations.h:545
+msgid "Cyprus"
+msgstr "Ciper"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: my-evolution/Locations.h:546
+msgid "Czech Republic"
+msgstr "Češka"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: my-evolution/Locations.h:580
+msgid "Denmark"
+msgstr "Danska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+msgid "Djibouti"
+msgstr "Džibuti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+msgid "Dominica"
+msgstr "Dominika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: my-evolution/Locations.h:608
+msgid "Dominican Republic"
+msgstr "Dominikanska republika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "East Timor"
+msgstr "Vshodni timor"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: my-evolution/Locations.h:641
+msgid "Ecuador"
+msgstr "Ekvador"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: my-evolution/Locations.h:650
+msgid "Egypt"
+msgstr "Egipt"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: my-evolution/Locations.h:666
+msgid "El Salvador"
+msgstr "Salvador"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+msgid "Equatorial Guinea"
+msgstr "Ekvatorijalna gvineja"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+msgid "Eritrea"
+msgstr "Eritreja"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: my-evolution/Locations.h:684
+msgid "Estonia"
+msgstr "Estonija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Ethiopia"
+msgstr "Etiopija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+msgid "Falkland Islands"
+msgstr "Falklandski otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+msgid "Faroe Islands"
+msgstr "Farski otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Fiji"
+msgstr "Fidži"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: my-evolution/Locations.h:716
+msgid "Finland"
+msgstr "Finska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: my-evolution/Locations.h:766
+msgid "France"
+msgstr "Francija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+msgid "French Guiana"
+msgstr "Francoska Gvajana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+msgid "French Polynesia"
+msgstr "Francoska polinezija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+msgid "French Southern Territories"
+msgstr "Francoska ju>na obmohja"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+msgid "Gabon"
+msgstr "Gabon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+msgid "Gambia"
+msgstr "Gambija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: my-evolution/Locations.h:811
+msgid "Georgia"
+msgstr "Gruzija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: my-evolution/Locations.h:812
+msgid "Germany"
+msgstr "Nemčija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+msgid "Ghana"
+msgstr "Gana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: my-evolution/Locations.h:815
+msgid "Gibraltar"
+msgstr "Gibrlaltar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
+msgid "Greece"
+msgstr "Grčija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+msgid "Greenland"
+msgstr "Grenlandija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+msgid "Grenada"
+msgstr "Grenada"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+msgid "Guam"
+msgstr "Guam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
+msgid "Guatemala"
+msgstr "Gvatemala"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+msgid "Guinea"
+msgstr "Gvineja"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+msgid "Guinea-bissau"
+msgstr "Gvineja bissau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+msgid "Guyana"
+msgstr "Gvajana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
+msgid "Haiti"
+msgstr "Haiti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Heard And McDonald Islands"
+msgstr "Heardovi in McDonaldovi otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Holy See"
+msgstr "Sveto morje"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: my-evolution/Locations.h:945
+msgid "Honduras"
+msgstr "Honduras"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: my-evolution/Locations.h:946
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
+msgid "Hungary"
+msgstr "Madžarska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: my-evolution/Locations.h:978
+msgid "Iceland"
+msgstr "Islandija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: my-evolution/Locations.h:991
+msgid "India"
+msgstr "Indija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+msgid "Indonesia"
+msgstr "Indonezija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: my-evolution/Locations.h:1007
+msgid "Ireland"
+msgstr "Irska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+msgid "Israel"
+msgstr "Izrael"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: my-evolution/Locations.h:1016
+msgid "Italy"
+msgstr "Italija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: my-evolution/Locations.h:1031
+msgid "Jamaica"
+msgstr "Jamajka"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: my-evolution/Locations.h:1035
+msgid "Japan"
+msgstr "Japonska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: my-evolution/Locations.h:1046
+msgid "Jordan"
+msgstr "Jordanija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+msgid "Kazakhstan"
+msgstr "Kazahstan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+msgid "Kenya"
+msgstr "Kenija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+msgid "Korea, Republic Of"
+msgstr "Koreja, Republika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
+msgid "Kuwait"
+msgstr "Kuvajt"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Kyrgyzstan"
+msgstr "Kirgizistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+msgid "Laos"
+msgstr "Laos"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
+msgid "Latvia"
+msgstr "Latvija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1198
+msgid "Lebanon"
+msgstr "Libanon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+msgid "Lesotho"
+msgstr "Lesoto"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
+msgid "Liberia"
+msgstr "Liberija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
+msgid "Lithuania"
+msgstr "Litvanija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
+msgid "Luxembourg"
+msgstr "Luksemburg"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+msgid "Macau"
+msgstr "Macao"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+msgid "Macedonia"
+msgstr "Makedonija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+msgid "Malawi"
+msgstr "Malavi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+msgid "Malaysia"
+msgstr "Malezija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+msgid "Maldives"
+msgstr "Maldivi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+msgid "Mali"
+msgstr "Mali"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
+msgid "Malta"
+msgstr "Malta"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+msgid "Marshall Islands"
+msgstr "Marshallovi otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+msgid "Martinique"
+msgstr "Martinik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Mauritania"
+msgstr "Mavretanija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
+msgid "Mexico"
+msgstr "Mehika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Micronesia"
+msgstr "Mikronezija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Moldova, Republic Of"
+msgstr "Moldova, Republika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+msgid "Monaco"
+msgstr "Monako"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+msgid "Mongolia"
+msgstr "Mongolija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1470
+msgid "Morocco"
+msgstr "Maroko"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Mozambique"
+msgstr "Mozambik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+msgid "Myanmar"
+msgstr "Mjanmar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Namibia"
+msgstr "Namibija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+msgid "Nauru"
+msgstr "Nauru"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Nepal"
+msgstr "Nepal"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
+msgid "Netherlands"
+msgstr "Nizozemska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Netherlands Antilles"
+msgstr "Nizozemski Antili"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+msgid "New Caledonia"
+msgstr "Nova Kaledonija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
+msgid "New Zealand"
+msgstr "Nova Zelandija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
+msgid "Nicaragua"
+msgstr "Nikaragva"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+msgid "Niger"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+msgid "Nigeria"
+msgstr "Nigerija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+msgid "Niue"
+msgstr "Niue"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
+msgid "Norfolk Island"
+msgstr "Norfolški otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Northern Mariana Islands"
+msgstr "Severni marianski otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
+msgid "Norway"
+msgstr "Norveška"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
+msgid "Oman"
+msgstr "Oman"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+msgid "Palau"
+msgstr "Paragvaj"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+msgid "Palestinian Territory"
+msgstr "Palestinsko osvobojeno ozemlje"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
+msgid "Panama"
+msgstr "Panama"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Papua New Guinea"
+msgstr "Papua Nova Gvineja"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
+msgid "Paraguay"
+msgstr "Paragvaj"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
+msgid "Peru"
+msgstr "Peru"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+msgid "Philippines"
+msgstr "Filipini"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+msgid "Pitcairn"
+msgstr "Pitcairin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
+msgid "Poland"
+msgstr "Poljska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
+msgid "Portugal"
+msgstr "Portugalska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
+msgid "Puerto Rico"
+msgstr "Portoriko"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
+msgid "Qatar"
+msgstr "Katar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+msgid "Reunion"
+msgstr "Reunion???"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
+msgid "Romania"
+msgstr "Romunija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Russian Federation"
+msgstr "Ruska federacija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+msgid "Rwanda"
+msgstr "Ruanda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Saint Kitts And Nevis"
+msgstr "St. Kitts in Nevis"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+msgid "Saint Lucia"
+msgstr "St. Lucija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Saint Vincent And The Grena-dines"
+msgstr "St. Vincent in Grenadini"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+msgid "Samoa"
+msgstr "Samoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+msgid "San Marino"
+msgstr "San Marino"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+msgid "Sao Tome And Principe"
+msgstr "Sao Tome in Principe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: my-evolution/Locations.h:2035
+msgid "Saudi Arabia"
+msgstr "Savdska Arabija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+msgid "Senegal"
+msgstr "Senegalija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+msgid "Seychelles"
+msgstr "Sejšeli"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
+msgid "Singapore"
+msgstr "Singapur"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
+msgid "Slovakia"
+msgstr "Slovaška"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
+msgid "Slovenia"
+msgstr "Slovenija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+msgid "Solomon Islands"
+msgstr "Solomonovi otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+msgid "Somalia"
+msgstr "Somalija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
+msgid "South Africa"
+msgstr "Južno afriška republika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+msgid "South Georgia And The South Sandwich Islands"
+msgstr "Južna Georgija in Južni Sandwichovi otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
+msgid "Spain"
+msgstr "Španija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+msgid "Sri Lanka"
+msgstr "Šrilanka"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+msgid "St. Helena"
+msgstr "Sv. Helena"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+msgid "St. Pierre And Miquelon"
+msgstr "Sv. Pierre in Miquelon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+msgid "Sudan"
+msgstr "Sudan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
+msgid "Suriname"
+msgstr "Surinam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "Svalbardovi in Jan Mayenovi otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+msgid "Swaziland"
+msgstr "Švica"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
+msgid "Sweden"
+msgstr "Švedska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
+msgid "Switzerland"
+msgstr "Švica"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
+msgid "Taiwan"
+msgstr "Tajvan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+msgid "Tajikistan"
+msgstr "Tadžikistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Tanzania, United Republic Of"
+msgstr "Tanzanija, Združena republika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+msgid "Thailand"
+msgstr "Tajska"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+msgid "Togo"
+msgstr "Togo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+msgid "Tonga"
+msgstr "Tongo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Trinidad And Tobago"
+msgstr "Trinidad in Tobago"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+msgid "Tunisia"
+msgstr "Tunizija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
+msgid "Turkey"
+msgstr "Turčija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+msgid "Turks And Caicos Islands"
+msgstr "Otočji Turks in Caicos"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Uganda"
+msgstr "Uganda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
+msgid "Ukraine"
+msgstr "Ukrajina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "United Arab Emirates"
+msgstr "Združeni arabski emirati"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
+msgid "United Kingdom"
+msgstr "Velika Britanija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+msgid "United States Minor Outlying Islands"
+msgstr "Ameriški zunajležeči otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2348
+msgid "Uruguay"
+msgstr "Urugvaj"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2380
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Virgin Islands, British"
+msgstr "Britanski deviški otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+msgid "Virgin Islands, U.S."
+msgstr "Ameriški deviški otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+msgid "Wallis And Futuna Islands"
+msgstr "Wallisovi in Futunini otoki"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+msgid "Western Sahara"
+msgstr "Zahodna sahara"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
+msgid "Yemen"
+msgstr "Jemen"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
+msgid "Yugoslavia"
+msgstr "Jugoslavija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+msgid "Zambia"
+msgstr "Zambija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+msgid "Zimbabwe"
+msgstr "Zimbabve"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Ste prepričani, \nda želite zbrisati ta stik?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Zbriši stik?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:757
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
 msgid "Category editor not available."
 msgstr "Urejevalnik kategorij ni na voljo."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
 msgid "Save Contact as VCard"
 msgstr "Shrani stik kot vVizitko"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2309
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisem mogel najti gradnika za polje `%s'"
@@ -1365,7 +2120,7 @@ msgid "Edit Full"
 msgstr "Uredi celoto"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:961
+#: addressbook/gui/widgets/e-addressbook-view.c:333
 msgid "Full Name"
 msgstr "Polno ime"
 
@@ -1580,253 +2335,286 @@ msgstr "Napredno iskanje"
 msgid "Search"
 msgstr "Iskanje"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:136
 msgid "No cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:139
 msgid "1 card"
 msgstr "1 vizitka"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 #, c-format
 msgid "%d cards"
 msgstr "%d vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-#: addressbook/gui/widgets/e-addressbook-view.c:1516
-#: ui/evolution-addressbook.xml.h:19
+#: addressbook/gui/widgets/e-addressbook-model.c:369
+msgid "Error getting book view"
+msgstr "Napaka ob dobivanju pogleda knjige"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: addressbook/gui/widgets/e-addressbook-view.c:1024
+#: addressbook/gui/widgets/e-addressbook-view.c:1646
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:312
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Odpri"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: ui/evolution-addressbook.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1025
+#: ui/evolution-addressbook.xml.h:13
 msgid "Forward Contact"
 msgstr "Posreduj _stik"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:836
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
+#: addressbook/gui/widgets/e-addressbook-view.c:1026
 msgid "Send Message to Contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-#: addressbook/gui/widgets/e-addressbook-view.c:837
-#: 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:67
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
+#: addressbook/gui/widgets/e-addressbook-view.c:1027
+#: ui/evolution-addressbook.xml.h:19 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:283
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
+#: addressbook/gui/widgets/e-addressbook-view.c:1029
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
+#: addressbook/gui/widgets/e-addressbook-view.c:1033
+msgid "Copy to folder..."
+msgstr "Kopiraj v mapo..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
+#: addressbook/gui/widgets/e-addressbook-view.c:1034
+msgid "Move to folder..."
+msgstr "Prestavi v mapo..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:1037
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:7
 msgid "Cut"
 msgstr "Izreži"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-#: addressbook/gui/widgets/e-addressbook-view.c:842
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
+#: addressbook/gui/widgets/e-addressbook-view.c:1038
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
+#: addressbook/gui/widgets/e-addressbook-view.c:1039
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:12
 msgid "Paste"
 msgstr "Prilepi"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
-#: mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
+#: addressbook/gui/widgets/e-addressbook-view.c:1040 filter/libfilter-i18n.h:9
+#: mail/mail-accounts.c:295 ui/evolution-addressbook.xml.h:10
 #: 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:18
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:19
 msgid "Delete"
 msgstr "Zbriši"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Napaka ob spreminjanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 #: shell/evolution-shell-component.c:1020
 msgid "Success"
 msgstr "Uspeh"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
+#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1941
 #: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Skladišče, ki ni na mreži"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:516
 #: shell/evolution-shell-component.c:1048
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Vizitka ni bila najdena"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "ID vizitke že obstaja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokol ni podprt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #: 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:610
-#: camel/camel-service.c:646
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
+#: camel/camel-service.c:610 camel/camel-service.c:646
 msgid "Cancelled"
 msgstr "preklicano"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Drugačna napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Napaka ob dodajanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Napaka ob dodajanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Napaka ob spreminjanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1444
 msgid "Error removing card"
 msgstr "Napaka ob odstranjevanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 msgid "Display Cards?"
 msgstr "Prikaži vizitke?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 msgid "Display Cards"
 msgstr "Prikaži vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
 "be\n"
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
-"Zahtevali ste prikaz %d vizitk. To bo povzročilo odprtje %d novih oken na \n vašem zaslonu. "
-"Resnično želite prikazati vse te vizitke?"
+"Zahtevali ste prikaz %d vizitk. To bo povzročilo odprtje %d novih oken na \n"
+" vašem zaslonu. Resnično želite prikazati vse te vizitke?"
 
-#. 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:404
-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,ž"
+#: addressbook/gui/widgets/e-addressbook-util.c:342
+msgid "Move card to"
+msgstr "Prestavi vizitko v"
 
-#. 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:409
-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-util.c:344
+msgid "Copy card to"
+msgstr "Kopiraj vizitko v"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:959
+#: addressbook/gui/widgets/e-addressbook-util.c:347
+msgid "Move cards to"
+msgstr "Prestavi vizitke v"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+msgid "Copy cards to"
+msgstr "Kopiraj vizitke v"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:331
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:963
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:964
+#: addressbook/gui/widgets/e-addressbook-view.c:336
 msgid "Assistant Phone"
 msgstr "Pomožni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Business Phone"
 msgstr "Službebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:966
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:967
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:968
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Home Phone"
 msgstr "Domač telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Business Address"
 msgstr "Službeni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:971
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:972
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:973
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:976
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Business Phone 2"
 msgstr "Službeni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:977
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Home Phone 2"
 msgstr "Domač telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:979
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Other Address"
 msgstr "Drug naslov"
 
+#. 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:580
+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:585
+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-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -1840,11 +2628,11 @@ msgstr "in ena druga vizitka."
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
 
-#: addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:158
 msgid ""
 "\n"
 "\n"
-"There are no items to show in this view\n"
+"There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
@@ -1852,7 +2640,17 @@ msgstr ""
 "\n"
 "V tem pogledu ni predmetov za prikaz\n"
 "\n"
-"Če želite ustvariti nov stik, dvojno kliknite tu.."
+"Če želite ustvariti nov stik, dvojno kliknite tu."
+
+#: addressbook/gui/widgets/e-minicard-view.c:161
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"V tem pogledu ni predmetov za prikaz."
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
@@ -2046,29 +2844,33 @@ 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:679
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:653
 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:678
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:652
 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:677
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:651
 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
+#: calendar/gui/e-calendar-table.c:409
 msgid "Undefined"
 msgstr "ni definirana"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:770
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s strežnikom koledarja"
 
@@ -2077,8 +2879,12 @@ msgstr "Napaka ob komuniciranju s strežnikom koledarja"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
-#: calendar/conduits/todo/todo-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/todo/todo-conduit.c:206
+msgid "Default Priority:"
+msgstr "Privzeta prioriteta:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
@@ -2134,10 +2940,22 @@ 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:216
+msgid "Starting:"
+msgstr "Pričetek ob:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Konec ob:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "neveljaven čas"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+msgid "Evolution Alarm"
+msgstr "Alarm Evolucije"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2177,7 +2995,7 @@ msgstr ""
 "prikazala običajen opozorilni dialog."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2235
+#: calendar/gui/tasks-control.c:419 mail/mail-callbacks.c:2573
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Opozorilo"
@@ -2227,40 +3045,40 @@ msgstr "Opis vsebuje"
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/calendar-commands.c:457
 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:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/calendar-commands.c:460 calendar/gui/e-day-view-top-item.c:288
 #: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
-#: calendar/gui/calendar-commands.c:458
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:469
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
-#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
 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:474
+#: calendar/gui/calendar-commands.c:485
 #: 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:820
+#: calendar/gui/calendar-commands.c:834
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -2268,14 +3086,16 @@ msgstr ""
 "in OAF-a."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "osebno"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
 msgid "Public"
 msgstr "javno"
 
@@ -2296,27 +3116,32 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Prost"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:432
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-meeting-time-sel.c:435
 #: shell/evolution-shell-component.c:1042
 msgid "Busy"
 msgstr "Zaseden"
 
 #: 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:479 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "ni pričeto"
 
 #: 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:480 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "v teku"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:329 calendar/gui/e-meeting-model.c:352
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:326
+#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "končano"
 
@@ -2332,9 +3157,9 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: 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:1494
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:55
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1512
+#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
+#: mail/mail-config.glade.h:56
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -2349,12 +3174,14 @@ msgstr "Ponovi se"
 msgid "Assigned"
 msgstr "Določena"
 
-#: 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
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "Ne"
 
@@ -2380,43 +3207,51 @@ msgstr "Tedenski pogled"
 msgid "Month View"
 msgstr "Mesečni pogled"
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Koledar"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:65
 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:240
-#: my-evolution/e-summary-tasks.c:257 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Naloge"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:70
 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:683
+msgid "New meeting"
+msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
-msgstr "Nov _sestanek"
+#: calendar/gui/component-factory.c:683
+msgid "_Meeting"
+msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Ustvari nov posel"
+#: calendar/gui/component-factory.c:687
+msgid "New task"
+msgstr "Nova naloga"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Nova _naloga"
+#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:21
+msgid "_Task"
+msgstr "_Naloga"
+
+#: calendar/gui/component-factory.c:691
+msgid "New appointment"
+msgstr "Nov sestanek"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:691
+msgid "_Appointment"
+msgstr "_Sestanek"
+
+#: calendar/gui/control-factory.c:120
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -2614,7 +3449,7 @@ msgstr "Opomnilniki"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:758 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
@@ -2643,7 +3478,7 @@ msgstr "konec sestanka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:131
 msgid "minute(s)"
 msgstr "minut"
 
@@ -2958,13 +3793,13 @@ msgstr "Vpis v dnevniku - %s"
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2015
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2226
+#: mail/mail-display.c:113
 msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2022
-#: mail/mail-display.c:106
+#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2233
+#: mail/mail-display.c:117
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3035,7 +3870,7 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Sestanek"
 
@@ -3049,13 +3884,13 @@ msgstr "Ponovitev"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:363
+#: calendar/gui/dialogs/event-editor.c:365
 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:366
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Sestanek"
 
@@ -3102,7 +3937,7 @@ msgid "Pu_blic"
 msgstr "_Javno"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Kaži čas kot"
 
@@ -3147,49 +3982,55 @@ 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"
+msgid "Click here to add an attendee"
+msgstr "Kliknite tu za dodajo udeleženca"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegirano od"
+msgid "Common Name"
+msgstr "Splošno ime"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegirano komu:"
+msgid "Delegated From"
+msgstr "Delegirano od"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Jezik"
+msgid "Delegated To"
+msgstr "Delegirano komu:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Član"
+msgid "Language"
+msgstr "Jezik"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:853
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Vloga"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:47
-#: mail/message-list.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:11
 msgid "Status"
 msgstr "Stanje"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/mail-config.glade.h:94
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:95
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Vrsta"
@@ -3204,7 +4045,7 @@ msgid "_Change Organizer"
 msgstr "_Spremeni organizatorja"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Povabi ostale..."
 
@@ -3328,7 +4169,7 @@ msgid "Progress"
 msgstr "Napredek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:755
 msgid "URL:"
 msgstr "URL:"
 
@@ -3342,13 +4183,13 @@ msgstr "_Stanje:"
 
 #: calendar/gui/dialogs/task-editor.c:190
 #: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:325
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:801
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:32
 msgid "Description:"
 msgstr "Opis:"
 
@@ -3360,35 +4201,89 @@ msgstr "Datum _pričetka:"
 msgid "_Due Date:"
 msgstr "_Do datuma:"
 
+#: calendar/gui/e-calendar-table.c:428
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:429
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:430
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:431
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:432
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:433
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:434
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:435
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:436
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:437
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:438
+msgid "100%"
+msgstr "100%"
+
 #: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 #: calendar/gui/e-week-view.c:1828
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
 #: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-week-view.c:3433 mail/folder-browser.c:1463
+#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:41
 msgid "_Open"
 msgstr "_Odpri"
 
 #: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-week-view.c:3442 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:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-week-view.c:3444 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-tasks.xml.h:16
 msgid "_Copy"
 msgstr "_Kopiraj"
 
 #: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3419
-#: calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3420
+#: calendar/gui/e-week-view.c:3446 ui/evolution-addressbook.xml.h:42
+#: ui/evolution-calendar.xml.h:41 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Prilepi"
 
@@ -3408,12 +4303,13 @@ msgstr "_Označi opravila kot opravljena"
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3928
+#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7140
+#: calendar/gui/e-week-view.c:3930
 msgid "Updating objects"
 msgstr "Posodabljam predmete"
 
 #: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
 
@@ -3421,48 +4317,48 @@ msgstr "Kliknite tu za dodajanje opravila"
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:924
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
 #: camel/camel-filter-driver.c:1026
 msgid "Complete"
 msgstr "Končano"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Do datuma"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Datum konca"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Zemljepisna lega"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioriteta"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Datum pričetka"
 
 #. 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
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483
+#: shell/e-storage-set-view.c:1498 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Povzetek"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Sortiranje opravil"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -3510,93 +4406,391 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3525
+msgid "New _Appointment"
+msgstr "Nov _sestanek"
+
+#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3415
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
-#: ui/evolution-calendar.xml.h:17
+#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3425
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
+#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3427
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
+#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3435
 msgid "_Delete this Appointment"
 msgstr "_Zbriši ta sestanek"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3460
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _prestavljivo"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
+#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3462
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
+#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3464
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:1013
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:292
-#: calendar/gui/e-meeting-model.c:357
+#: calendar/gui/e-itip-control.c:545
+msgid "Meeting begins: <b>"
+msgstr "Čas pričetka sestanka: <b>"
+
+#: calendar/gui/e-itip-control.c:550
+msgid "Task begins: <b>"
+msgstr "Čas pričetka opravila: <b>"
+
+#: calendar/gui/e-itip-control.c:555
+msgid "Free/Busy info begins: <b>"
+msgstr "Podatki o zasedenosti se pričnejo: <b>"
+
+#: calendar/gui/e-itip-control.c:559
+msgid "Begins: <b>"
+msgstr "Pričetek: <b>"
+
+#: calendar/gui/e-itip-control.c:571
+msgid "Meeting ends: <b>"
+msgstr "Čas zaključka sestanka: <b>"
+
+#: calendar/gui/e-itip-control.c:574
+msgid "Free/Busy info ends: <b>"
+msgstr "Podatki o zasedenosti se končajo: <b>"
+
+#: calendar/gui/e-itip-control.c:578
+msgid "Ends: <b>"
+msgstr "Konec: <b>"
+
+#: calendar/gui/e-itip-control.c:592
+msgid "Task Completed: <b>"
+msgstr "Opravilo končano: <b>"
+
+#: calendar/gui/e-itip-control.c:602
+msgid "Task Due: <b>"
+msgstr "Rok opravila: <b>"
+
+#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
+msgid "iCalendar Information"
+msgstr "Podatki o iKoledarju"
+
+#. Title
+#: calendar/gui/e-itip-control.c:654
+msgid "iCalendar Error"
+msgstr "Napaka iKoledarja"
+
+#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
+msgid "An unknown person"
+msgstr "neznana oseba"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:742
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega menuja."
+
+#: calendar/gui/e-itip-control.c:758
+msgid "<i>None</i>"
+msgstr "<i>Nič</i>"
+
+#: calendar/gui/e-itip-control.c:770
+msgid "Status:"
+msgstr "Stanje:"
+
+#: calendar/gui/e-itip-control.c:775 calendar/gui/e-meeting-model.c:318
+#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
+msgid "Accepted"
+msgstr "Sprejeto"
+
+#: calendar/gui/e-itip-control.c:779
+msgid "Tentatively Accepted"
+msgstr "Poskusno sprejeto"
+
+#: calendar/gui/e-itip-control.c:783 calendar/gui/e-meeting-model.c:320
+#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
+msgid "Declined"
+msgstr "Zavrnjeno"
+
+#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:986
+#: calendar/gui/e-itip-control.c:1057 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
 #: camel/providers/smtp/camel-smtp-transport.c:171
-#: camel/providers/smtp/camel-smtp-transport.c:226
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:317
+#: mail/mail-display.c:827 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:442
 msgid "Unknown"
 msgstr "neznano"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:865 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.c:904
+msgid "Choose an action:"
+msgstr "Izberi dejanje:"
+
+#: calendar/gui/e-itip-control.c:834
+msgid "Update"
+msgstr "Posodobi"
+
+#: calendar/gui/e-itip-control.c:835 calendar/gui/e-itip-control.c:854
+#: calendar/gui/e-itip-control.c:867 calendar/gui/e-itip-control.c:880
+#: calendar/gui/e-itip-control.c:893 calendar/gui/e-itip-control.c:906
+#: shell/e-shell.c:1931 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "V redu"
+
+#: calendar/gui/e-itip-control.c:850
+msgid "Accept"
+msgstr "Sprejmi"
+
+#: calendar/gui/e-itip-control.c:851
+msgid "Tentatively accept"
+msgstr "Poskusno sprejmi"
+
+#: calendar/gui/e-itip-control.c:852
+msgid "Decline"
+msgstr "Odbij"
+
+#: calendar/gui/e-itip-control.c:866
+msgid "Send Free/Busy Information"
+msgstr "Pošlji podatek o zasedenosti"
+
+#: calendar/gui/e-itip-control.c:879
+msgid "Update respondent status"
+msgstr "Osveži stanje respondenta"
+
+#: calendar/gui/e-itip-control.c:892
+msgid "Send Latest Information"
+msgstr "Pošlji zadnje podatke"
+
+#: calendar/gui/e-itip-control.c:905 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: calendar/gui/e-itip-control.c:953
+#, 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:954
+msgid "Meeting Information"
+msgstr "Podatki o sestanku"
+
+#: calendar/gui/e-itip-control.c:958
+#, 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:959
+msgid "Meeting Proposal"
+msgstr "Predlog sestanka"
+
+#: calendar/gui/e-itip-control.c:963
+#, 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:964
+msgid "Meeting Update"
+msgstr "Posodobitev sestanka"
+
+#: calendar/gui/e-itip-control.c:968
+#, 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:969
+msgid "Meeting Update Request"
+msgstr "Zahtevek za posodobitev sestanka"
+
+#: calendar/gui/e-itip-control.c:992
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
+
+#: calendar/gui/e-itip-control.c:993
+msgid "Meeting Reply"
+msgstr "Odgovor na sestanek"
+
+#: calendar/gui/e-itip-control.c:997
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> je preklical(a) sestanek."
+
+#: calendar/gui/e-itip-control.c:998
+msgid "Meeting Cancellation"
+msgstr "Preklic sestanka"
+
+#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
+#: calendar/gui/e-itip-control.c:1108
+#, 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:1003
+msgid "Bad Meeting Message"
+msgstr "Nerazumljivo sporočilo o sestanku"
+
+#: calendar/gui/e-itip-control.c:1023
+#, 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:1024
+msgid "Task Information"
+msgstr "Podatki o nalogi"
+
+#: calendar/gui/e-itip-control.c:1028
+#, 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:1029
+msgid "Task Proposal"
+msgstr "Predlog naloge"
+
+#: calendar/gui/e-itip-control.c:1033
+#, 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:1034
+msgid "Task Update"
+msgstr "Posodobitev naloge"
+
+#: calendar/gui/e-itip-control.c:1038
+#, 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:1039
+msgid "Task Update Request"
+msgstr "Zahtevek za posodobitev naloge"
+
+#: calendar/gui/e-itip-control.c:1063
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge."
+
+#: calendar/gui/e-itip-control.c:1064
+msgid "Task Reply"
+msgstr "Odgovor na nalogo"
+
+#: calendar/gui/e-itip-control.c:1068
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> je preklical(a) nalogo."
+
+#: calendar/gui/e-itip-control.c:1069
+msgid "Task Cancellation"
+msgstr "Preklic naloge"
+
+#: calendar/gui/e-itip-control.c:1074
+msgid "Bad Task Message"
+msgstr "Nerazumljivo sporočilo o nalogi"
+
+#: calendar/gui/e-itip-control.c:1093
+#, 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:1094
+msgid "Free/Busy Information"
+msgstr "Podatek o zasedenosti"
+
+#: calendar/gui/e-itip-control.c:1098
+#, 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:1099
+msgid "Free/Busy Request"
+msgstr "Zahtevek po podatkih o zasedenosti"
+
+#: calendar/gui/e-itip-control.c:1103
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
+
+#: calendar/gui/e-itip-control.c:1104
+msgid "Free/Busy Reply"
+msgstr "Odgovor zasedenosti"
+
+#: calendar/gui/e-itip-control.c:1109
+msgid "Bad Free/Busy Message"
+msgstr "Nerazumljivo sporočilo o zasedenosti"
+
+#: calendar/gui/e-itip-control.c:1182
+msgid "The message does not appear to be properly formed"
+msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
+
+#: calendar/gui/e-itip-control.c:1201
+msgid "The message contains only unsupported requests."
+msgstr "To sporočilo vsebuje le nepodprte zahtevke."
+
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1235
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Priloga ne vsebuje veljavnega sporočila koledarja"
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "The attachment has no viewable calendar items"
+msgstr "Priloga nima gledljivih predmetov koledarja"
+
+#: calendar/gui/e-itip-control.c:1338
+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.c:1369
 msgid "Calendar file could not be updated!\n"
 msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1371
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1416
 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:1370
+#: calendar/gui/e-itip-control.c:1424
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1426
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1374
+#: calendar/gui/e-itip-control.c:1428
 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:1402
+#: calendar/gui/e-itip-control.c:1456
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
+#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
+#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1648
-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
 msgid "%P %%"
@@ -3634,93 +4828,92 @@ msgstr "končni-datum"
 msgid "date-start"
 msgstr "začetni-datum"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Predsedujoči"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1640
 msgid "Required Participants"
 msgstr "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Možni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 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
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
 msgid "Individual"
 msgstr "Individualno"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:790
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:791
 msgid "Resource"
 msgstr "Vir"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr "Soba"
 
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:805
 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
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
 msgid "Required Participant"
 msgstr "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:807
 msgid "Optional Participant"
 msgstr "Možni sodelujoči"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:808
 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
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
 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:431
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Poskusno"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:838
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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:2102
+#: calendar/gui/e-meeting-time-sel.c:2088
 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:2132 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2118 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"
@@ -3732,100 +4925,100 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Iz pisarne"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Ni podatkov"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Kaži le delavne ure"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Kaži poman_jšano"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Posodobi prosto/zasedeno"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Samodeno izberi"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Vsi ljudje in vsa sredstva"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Vsi ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "_Potrebni ljudje"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Potrebni ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Čas pričetka sestanka:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:351
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Odpiram naloge v %s"
 
-#: calendar/gui/e-tasks.c:367
+#: calendar/gui/e-tasks.c:381
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel naložiti nalog v `%s'"
 
-#: calendar/gui/e-tasks.c:379
+#: calendar/gui/e-tasks.c:393
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:643
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
+#: calendar/gui/e-week-view.c:3413 calendar/gui/e-week-view.c:3451
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/gnome-cal.c:1493
+#: 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:1504
+#: 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:1859
+#: calendar/gui/gnome-cal.c:1872
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Odpiram koledar v %s"
@@ -3894,12 +5087,36 @@ msgstr "Potreben je vsaj en udeleženec"
 msgid "An organizer must be set."
 msgstr "Organizator mora biti naveden."
 
-#: calendar/gui/itip-utils.c:370
+#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:346
+msgid "Event information"
+msgstr "Podatki o dogodku"
+
+#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:348
+msgid "Task information"
+msgstr "Podatki o nalogi"
+
+#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:350
+msgid "Journal information"
+msgstr "Podatki o dnevniku"
+
+#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:367
+msgid "Free/Busy information"
+msgstr "Podatki o zasedenosti"
+
+#: calendar/gui/itip-utils.c:321
+msgid "Calendar information"
+msgstr "Podatki o kodledarju"
+
+#: calendar/gui/itip-utils.c:361
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podatki o zasedenosti (%s do %s)"
 
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:373
+msgid "iCalendar information"
+msgstr "Podatki o iKodledarju"
+
+#: calendar/gui/itip-utils.c:582
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
@@ -4092,13 +5309,41 @@ msgstr "Izbran mesec (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Izbrano leto (%Y)"
 
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Naloga"
+
+#: calendar/gui/print.c:2262
+msgid "Status: %s"
+msgstr "Stanje: %s"
+
+#: calendar/gui/print.c:2280
+msgid "Priority: %s"
+msgstr "Prioriteta: %s"
+
+#: calendar/gui/print.c:2294
+msgid "Percent Complete: %i"
+msgstr "Procentov opravljeno: %i"
+
+#: calendar/gui/print.c:2306
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2320
+msgid "Categories: %s"
+msgstr "Kategorije: %s"
+
+#: calendar/gui/print.c:2331
+msgid "Contacts: "
+msgstr "Stiki: "
+
 #: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
 #: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2512 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
+#: mail/mail-callbacks.c:2882 my-evolution/e-summary.c:605
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
@@ -4121,7 +5366,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape nalog, ki naj se kaže"
 
-#: calendar/gui/tasks-control.c:434
+#: calendar/gui/tasks-control.c:427
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -4133,7 +5378,8 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2249
+#: calendar/gui/tasks-control.c:434 mail/mail-callbacks.c:2359
+#: mail/mail-callbacks.c:2587
 msgid "Do not ask me again."
 msgstr "Ne sprašuj me več."
 
@@ -4181,11 +5427,15 @@ msgstr "NPTSČPS"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
 msgid "Factory to import iCalendar files into Evolution"
-msgstr "Tovarna uvozov datotek iCalendar v Evolucijo."
+msgstr "Tovarna uvozov datotek iCalendar v Evolucijo"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
 msgid "Imports iCalendar files into Evolution"
-msgstr "Uvozi datoteke iCalendar v Evolucijo. "
+msgstr "Uvozi datoteke iCalendar v Evolucijo."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+msgid "Imports vCalendar files into Evolution"
+msgstr "Uvozi datoteke vCalendar v Evolucijo."
 
 #: calendar/pcs/query.c:246
 msgid "time-now expects 0 arguments"
@@ -4847,7 +6097,7 @@ msgstr ""
 
 #: calendar/zones.h:143
 msgid "America/Panama"
-msgstr ""
+msgstr "Amerika/Panama"
 
 #: calendar/zones.h:144
 msgid "America/Pangnirtung"
@@ -4859,7 +6109,7 @@ msgstr ""
 
 #: calendar/zones.h:146
 msgid "America/Phoenix"
-msgstr ""
+msgstr "Amerika/Phoenix"
 
 #: calendar/zones.h:147
 msgid "America/Port-au-Prince"
@@ -4967,7 +6217,7 @@ msgstr ""
 
 #: calendar/zones.h:173
 msgid "America/Vancouver"
-msgstr ""
+msgstr "Amerika/Vancouver"
 
 #: calendar/zones.h:174
 msgid "America/Whitehorse"
@@ -5227,7 +6477,7 @@ msgstr ""
 
 #: calendar/zones.h:238
 msgid "Asia/Pyongyang"
-msgstr ""
+msgstr "Azija/Pjongjang"
 
 #: calendar/zones.h:239
 msgid "Asia/Qatar"
@@ -5243,7 +6493,7 @@ msgstr ""
 
 #: calendar/zones.h:242
 msgid "Asia/Saigon"
-msgstr ""
+msgstr "Azija/Saigon"
 
 #: calendar/zones.h:243
 msgid "Asia/Sakhalin"
@@ -5359,7 +6609,7 @@ msgstr ""
 
 #: calendar/zones.h:271
 msgid "Atlantic/St_Helena"
-msgstr ""
+msgstr "Atlantik/Sveta_Helena"
 
 #: calendar/zones.h:272
 msgid "Atlantic/Stanley"
@@ -5515,7 +6765,7 @@ msgstr "Evropa/Moskva"
 
 #: calendar/zones.h:310
 msgid "Europe/Nicosia"
-msgstr ""
+msgstr "Evropa/Nikozija"
 
 #: calendar/zones.h:311
 msgid "Europe/Oslo"
@@ -5627,7 +6877,7 @@ msgstr ""
 
 #: calendar/zones.h:338
 msgid "Indian/Comoro"
-msgstr "Indija/Komori"
+msgstr "Indijski_ocean/Komori"
 
 #: calendar/zones.h:339
 msgid "Indian/Kerguelen"
@@ -5691,7 +6941,7 @@ msgstr ""
 
 #: calendar/zones.h:354
 msgid "Pacific/Galapagos"
-msgstr ""
+msgstr "Pacifik/Galapagos"
 
 #: calendar/zones.h:355
 msgid "Pacific/Gambier"
@@ -5703,11 +6953,11 @@ msgstr ""
 
 #: calendar/zones.h:357
 msgid "Pacific/Guam"
-msgstr ""
+msgstr "Pacifik/Gvam"
 
 #: calendar/zones.h:358
 msgid "Pacific/Honolulu"
-msgstr ""
+msgstr "Pacifik/Honolulu"
 
 #: calendar/zones.h:359
 msgid "Pacific/Johnston"
@@ -5735,7 +6985,7 @@ msgstr ""
 
 #: calendar/zones.h:365
 msgid "Pacific/Midway"
-msgstr ""
+msgstr "Pacifik/Midway"
 
 #: calendar/zones.h:366
 msgid "Pacific/Nauru"
@@ -5829,11 +7079,11 @@ 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-data-cache.c:159
+#: camel/camel-data-cache.c:166
 msgid "Unable to create cache path"
 msgstr "Nisem mogel ustvariti poti predpomnilnika"
 
-#: camel/camel-data-cache.c:426
+#: camel/camel-data-cache.c:438
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nisem mogel odstraniti vnosa v predpomnilnišk: %s: %s"
@@ -6088,67 +7338,67 @@ msgstr "Prosim vpišite svoje %s geslo"
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Ne morem podpisati sporočila: osnovnega besedila ni"
 
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:763
 msgid "Cannot sign this message: no password provided"
 msgstr "Ne morem podpisati sporočila: geslo ni podano"
 
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
+#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:769
 #, c-format
 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
+#: camel/camel-pgp-context.c:756
 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
+#: camel/camel-pgp-context.c:955
 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
+#: camel/camel-pgp-context.c:961
 #, 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
+#: camel/camel-pgp-context.c:972
 #, 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:1143
+#: camel/camel-pgp-context.c:1145
 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:1153
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Ne morem zašifirati tega sporočia: geslo ni podano"
 
-#: camel/camel-pgp-context.c:1160
+#: camel/camel-pgp-context.c:1162
 #, c-format
 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:1169
+#: camel/camel-pgp-context.c:1171
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Ne morem zašifirati tega sporočila: naslovniki niso navedeni"
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1340
 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:1345
+#: camel/camel-pgp-context.c:1348
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Ne morem dešifrirati tega sporočila: geslo ni podano"
 
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1355
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -6233,7 +7483,7 @@ msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:274
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
@@ -6368,8 +7618,8 @@ msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr "Prijava na NT"
+msgid "Login"
+msgstr "Prijava"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
@@ -6381,7 +7631,7 @@ 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:149
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
 msgid "Password"
 msgstr "Geslo"
 
@@ -6653,7 +7903,7 @@ msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporočili"
 
 #: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2104
+#: camel/providers/imap/camel-imap-folder.c:2108
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
@@ -6666,7 +7916,7 @@ msgstr "Prenašam povzetke novih sporočil"
 msgid "Scanning for new messages"
 msgstr "Pregledujem za novimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:2141
+#: camel/providers/imap/camel-imap-folder.c:2145
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
@@ -6691,7 +7941,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:832
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:925
 msgid "Folders"
 msgstr "Mape"
 
@@ -6729,7 +7979,7 @@ 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:390
+#: camel/providers/smtp/camel-smtp-transport.c:393
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za način avtentifikacije %s"
@@ -6740,7 +7990,7 @@ 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/smtp/camel-smtp-transport.c:434
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
@@ -6764,31 +8014,31 @@ msgstr "Ni takšne mape %s"
 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:42
+#: camel/providers/local/camel-local-provider.c:43
 msgid "MH-format mail directories"
 msgstr "Poštni imeniki vrste MH"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:44
 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:52
+#: camel/providers/local/camel-local-provider.c:53
 msgid "Local delivery"
 msgstr "Krajevna dostava"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:54
 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:62
+#: camel/providers/local/camel-local-provider.c:63
 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:68
+#: camel/providers/local/camel-local-provider.c:69
 msgid "Maildir-format mail directories"
 msgstr "Poštni imeniki vrste maildir"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:70
 msgid "For storing local mail in maildir directories."
 msgstr "Za shranjevanje krajevne pošte v imenikih vrste maildir."
 
@@ -6801,6 +8051,21 @@ 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-provider.c:91
+msgid "Directory tree of mbox files"
+msgstr "Imeniško drevo datotek mbox"
+
+#: camel/providers/local/camel-local-provider.c:92
+msgid ""
+"For accessing mail storedin an external tree of mbox files.\n"
+"This will allow you to directly access pine and elm folders.\n"
+"NOTE: This provider is still experimental so ensure you backup any mail "
+"folders first."
+msgstr ""
+"Za dostopanje do pošte shranjene v zunanjem drevesu datotek mbox.\n"
+"To vam bo omogočilo, da neposredno dostopate do map pine in elm.\n"
+"OPOZORILO: Ta nudilnik je še vedno preizkusen, zato pred uporabo naredite varnostno kopijo mape."
+
 #: camel/providers/local/camel-local-store.c:138
 #: camel/providers/local/camel-local-store.c:227
 #: camel/providers/local/camel-spool-store.c:109
@@ -6870,7 +8135,7 @@ msgstr "Ne morem dodati sporočila v mapo vrste maildir: %s: %s"
 #: 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
+#: camel/providers/local/camel-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6882,7 +8147,7 @@ msgstr ""
 #: 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
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Ni takšnega sporočila"
 
@@ -6946,13 +8211,13 @@ 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:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:208
-#: camel/providers/local/camel-spool-folder.c:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
@@ -6969,9 +8234,9 @@ msgstr "Ne morem pripeti sporočila k datoteki vrste mbox: %s: %s"
 #: 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
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6981,12 +8246,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
@@ -7137,7 +8402,7 @@ 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:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Ne morem pripeti sporočila k datoteki vrste 'spool': %s: %s"
@@ -7217,11 +8482,19 @@ msgstr "Notranja napaka: uid ima neveljavno obliko: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:153
 #: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:439
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:512
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ne morem dobiti sporočila %s: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/pop3/camel-pop3-folder.c:278
+#: camel/providers/pop3/camel-pop3-folder.c:437
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:510
 msgid "User cancelled"
 msgstr "Uporabnik je preklical"
 
@@ -7295,65 +8568,56 @@ msgstr "Uporabite preklic"
 msgid "Operation failed: %s"
 msgstr "Operacija ni uspela: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/pop3/camel-pop3-folder.c:265
 msgid "Retrieving POP summary"
 msgstr "Prenašam povzetek POP"
 
-#: 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: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:280
+msgid "Cannot get POP summary: %s"
+msgstr "Ne morem dobiti povzetka POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:316
 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: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:367
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#. Sigh, most of the crap in this function is so that the cancel button
+#. returns the proper exception code.  Sigh.
+#: camel/providers/pop3/camel-pop3-folder.c:418
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Prenašam sporočilo POP %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-folder.c:502
+msgid "Unknown reason"
+msgstr "Neznan razlog"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Hramba sporočil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Pusti sporočila na strežniku"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Zbriši po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:60
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
+#: camel/providers/pop3/camel-pop3-provider.c:54
 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
+#: camel/providers/pop3/camel-pop3-provider.c:71
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -7361,7 +8625,7 @@ msgstr ""
 "Ta možnost narekuje povezavo s strežnikom POP z nešifriranim geslom. To je v "
 "večini edina možnost, ki jo strežniki POP podpirajo."
 
-#: camel/providers/pop3/camel-pop3-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -7371,48 +8635,13 @@ msgstr ""
 "preko protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo "
 "za strežnike, ki trdijo, da jo podpirajo."
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
-"avtentifikacijo."
-
-#: 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: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:321
+#: camel/providers/pop3/camel-pop3-store.c:172
 #, 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: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:377
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Nisem se mogel povezati s strežnikom POP.\n"
-"Napaka ob pošiljanju uporabniškega imena: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(Neznana)"
-
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/pop3/camel-pop3-store.c:316
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7420,7 +8649,23 @@ msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:229
+msgid "SASL `%s' Login failed: %s"
+msgstr "Prijava SASL `%s' ni uspela"
+
+#: camel/providers/pop3/camel-pop3-store.c:240
+msgid "SASL Protocol error"
+msgstr "Napaka protokola SASL"
+
+#: camel/providers/pop3/camel-pop3-store.c:255
+msgid "I/O Error: %s"
+msgstr "V/I napaka: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:276
+msgid "%sPlease enter the POP password for %s@%s"
+msgstr "%sProsimo vpišite geslo POP za %s@%s"
+
+#: camel/providers/pop3/camel-pop3-store.c:327
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7429,18 +8674,13 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, 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:81
+#: mail/mail-config.glade.h:82
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -7498,7 +8738,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:75
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7608,22 +8848,22 @@ msgstr "Začasna napaka avtentifikacije"
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:318
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, 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:380
+#: camel/providers/smtp/camel-smtp-transport.c:383
 #, 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:418
+#: camel/providers/smtp/camel-smtp-transport.c:421
 #, 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:439
+#: camel/providers/smtp/camel-smtp-transport.c:442
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7634,137 +8874,135 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:565
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:567
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
+#: camel/providers/smtp/camel-smtp-transport.c:591
 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:588
+#: camel/providers/smtp/camel-smtp-transport.c:598
 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:593 mail/mail-ops.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:614
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:624
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne morem poslati sporočila: eden ali več neveljavnih naslovnikov"
 
-#: camel/providers/smtp/camel-smtp-transport.c:674
+#: camel/providers/smtp/camel-smtp-transport.c:798
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:820
 #, 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:716
+#: camel/providers/smtp/camel-smtp-transport.c:840
 #, 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:748
+#: camel/providers/smtp/camel-smtp-transport.c:884
 msgid "SMTP Authentication"
 msgstr "Avtentifikacija SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:754
+#: camel/providers/smtp/camel-smtp-transport.c:890
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:769
-#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:905
+#: camel/providers/smtp/camel-smtp-transport.c:917
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:790
+#: camel/providers/smtp/camel-smtp-transport.c:926
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:974
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:864
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 #, 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:883
-#, 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:1014
+msgid "MAIL FROM response error"
+msgstr "Napaka v ogovoru na MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:908
+#: camel/providers/smtp/camel-smtp-transport.c:1039
 #, 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:927
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
+msgid "RCPT TO <%s> failed"
+msgstr "RCPT TO <%s> ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:961
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, 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:980
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Napaka v ogovoru na DATA: %s: pošta ni bila poslana"
+#. we should have gotten instructions on how to use the DATA command:
+#. * 354 Enter mail, end with "." on a line by itself
+#.
+#: camel/providers/smtp/camel-smtp-transport.c:1105
+msgid "DATA response error"
+msgstr "Napaka v odgovoru na DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1163
 #, 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:1057
-#, 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:1177
+msgid "DATA termination response error"
+msgstr "Napaka v odgovoru za končanje DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1200
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1100
-#, c-format
-msgid "RSET response error: %s"
-msgstr "Napaka v odgovoru na RSET: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+msgid "RSET response error"
+msgstr "Napaka v odgovoru na RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, 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:1142
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
+#: camel/providers/smtp/camel-smtp-transport.c:1251
+msgid "QUIT response error"
+msgstr "Napaka v odgovoru na QUIT"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7791,7 +9029,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:147
 msgid "attachment"
 msgstr "priloga"
 
@@ -7842,45 +9080,45 @@ msgstr "Kliknite tu za adresar"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:356
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:362
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:373
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:387
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporočila"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:396
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7893,7 +9131,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer.c:688
+#: composer/e-msg-composer.c:710
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7902,38 +9140,38 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:927
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:936
 msgid "Warning!"
 msgstr "Opozorilo!"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:940
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiši?"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:962
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:959
+#: composer/e-msg-composer.c:981
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:1020
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1027
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7942,7 +9180,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1034
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7951,7 +9189,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7960,7 +9198,7 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1123
+#: composer/e-msg-composer.c:1145
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7968,7 +9206,7 @@ msgstr ""
 "Evolucija je zaznala neshranjene datoteke iz prejšnjih sej.\n"
 "Jih želite poskusiti obnoviti?"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1303
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7978,23 +9216,23 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1310
 msgid "Warning: Modified Message"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/e-msg-composer.c:1311
+#: composer/e-msg-composer.c:1333
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1460
+#: composer/e-msg-composer.c:1482
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:1846 composer/e-msg-composer.c:2322
+#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2462
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2479
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -8002,7 +9240,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Nisem mogel aktivirati gradnika za izbiro naslova."
 
-#: composer/e-msg-composer.c:2362 composer/e-msg-composer.c:2417
+#: composer/e-msg-composer.c:2502 composer/e-msg-composer.c:2557
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -8010,7 +9248,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:383
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -8018,7 +9256,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
 "identitet v komponenti pošte."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:398
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega sestavljalca."
 
@@ -8079,6 +9317,14 @@ msgstr "Zapomni si geslo"
 msgid "Remember this password for the remainder of this session"
 msgstr "Pomni geslo do konca seje"
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr "Uskladi zasebne kartoteke"
+
+#: e-util/e-pilot-settings.c:105
+msgid "Sync Categories:"
+msgstr "kategorije usklajevanja:"
+
 #. 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
@@ -8440,7 +9686,7 @@ msgstr " nazaj "
 msgid "ago"
 msgstr "nazaj"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:996
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -8470,7 +9716,7 @@ msgstr ""
 "Pojdite nazaj in navedite veljavno mapo v katero naj se dostavlja pošta."
 
 #: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:834
+#: mail/mail-account-gui.c:849
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
@@ -8657,109 +9903,116 @@ msgid "Expression"
 msgstr "Izraz"
 
 #: filter/libfilter-i18n.h:23
+msgid "Follow Up"
+msgstr "Navezava"
+
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Pomembno"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:27
 msgid "is before"
 msgstr "je pred"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
+msgid "is Flagged"
+msgstr "je označeno"
+
+#: filter/libfilter-i18n.h:29
 msgid "is greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:30
 msgid "is less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:31
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:32
+msgid "is not Flagged"
+msgstr "ni označeno"
+
+#: filter/libfilter-i18n.h:33
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:34
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:35
 msgid "Message Header"
 msgstr "Glava sporočila"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:36
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:34 mail/message-list.c:671
-#: mail/message-list.etspec.h:4
-msgid "Needs Reply"
-msgstr "Potrebuje odgovor"
-
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Beri"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:8
 msgid "Score"
 msgstr "Točke"
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1486
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:10
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:932
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Zadeva"
 
@@ -8767,11 +10020,11 @@ msgstr "Zadeva"
 msgid "Rules"
 msgstr "Pravila"
 
-#: filter/rule-editor.c:284
+#: filter/rule-editor.c:287
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: filter/rule-editor.c:357
+#: filter/rule-editor.c:360
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
@@ -8939,15 +10192,15 @@ msgstr "Nisem se mogel povezati s hrambo: %s"
 msgid "This folder cannot contain messages."
 msgstr "Ta mapa ne more vsebovati sporočil."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:439
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:439
 msgid "Change this folder's properties"
 msgstr "Spremeni lastnosti te mape"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:800
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8955,210 +10208,215 @@ msgstr ""
 "Nekatere vaše nastavitve pošte se zdijo neveljavne. Prosim, preverite, če je "
 "vse v redu."
 
-#: mail/component-factory.c:952
+#: mail/component-factory.c:971
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/component-factory.c:952
-msgid "New _Mail Message"
-msgstr "Novo _poštno sporočilo"
+#: mail/component-factory.c:971 ui/evolution-mail-global.xml.h:19
+msgid "_Mail Message"
+msgstr "_Pošlji sporočilo"
 
-#: mail/component-factory.c:977
+#: mail/component-factory.c:998
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:986
+#: mail/component-factory.c:1007
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Ne morem inicializirati Evolucijine komponente za nastavitev pošte."
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1013
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ne morem inicializirati Evolucijine komponente za podatke o mapah"
 
-#: mail/component-factory.c:1208
+#: mail/component-factory.c:1229
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:327
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:329
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: mail/folder-browser.c:298 mail/mail-display.c:307
+#: mail/folder-browser.c:299 mail/mail-display.c:310 mail/mail-display.c:819
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:754
 #, c-format
 msgid "%d new"
 msgstr "%d novih"
 
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:757 mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:759
 #, c-format
 msgid "%d hidden"
 msgstr "%d skritih"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:761
 #, c-format
 msgid "%d visible"
 msgstr "%d vidnih"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:766
 #, c-format
 msgid "%d selected"
 msgstr "%d izbranih"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:771
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlanih"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d sent"
 msgstr "%d poslanih"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d total"
 msgstr "skupaj %d"
 
-#: mail/folder-browser.c:1055
+#: mail/folder-browser.c:1062
 msgid "Create vFolder from Search"
 msgstr "Ustvari vMapo iz iskanja"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1446
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1447
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1448
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1441
+#: mail/folder-browser.c:1449
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1453
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1454
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1455
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1456
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:98
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:105
+#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:109
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1466
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:108
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1472 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1465
+#: mail/folder-browser.c:1473
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:32
+msgid "Follow _Up..."
+msgstr "Nadal_jevanje..."
+
+#: mail/folder-browser.c:1478
+msgid "Flag Com_pleted"
+msgstr "Označi kot končano"
+
+#: mail/folder-browser.c:1479
+msgid "Clear Fla_g"
+msgstr "Zbriši zastavico"
+
+#. separator here?
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1485
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1486
 msgid "Mark as Unim_portant"
 msgstr "Označi kot ne_pomembno"
 
-#: mail/folder-browser.c:1471
-msgid "Mark as Needing Reply"
-msgstr "Označi kot potrebuje odgovor"
-
-#: mail/folder-browser.c:1472
-msgid "Mark as Not Needing Reply"
-msgstr "Označi kot ne potrebuje odgovora"
-
-#: mail/folder-browser.c:1476
+#: mail/folder-browser.c:1490 ui/evolution-addressbook.xml.h:40
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1491 ui/evolution-addressbook.xml.h:37
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:107
+#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:111
 msgid "_Undelete"
 msgstr "O_dbriši"
 
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:1
 msgid "Add Sender to Address Book"
 msgstr "Pošiljatelja dodaj v adresar"
 
-#: mail/folder-browser.c:1486
+#: mail/folder-browser.c:1500
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1502
 msgid "Create Ru_le From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1693
 msgid "Filter on Mailing List"
 msgstr "Filter glede na dopisni seznam"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1694
 msgid "VFolder on Mailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:1660
+#: mail/folder-browser.c:1696
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:1661
+#: mail/folder-browser.c:1697
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
@@ -9243,15 +10501,15 @@ msgstr "Urejevalnik Evolucijinih novic"
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:959
+#: mail/mail-account-gui.c:974
 msgid "Could not save signature file."
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: mail/mail-account-gui.c:1036
+#: mail/mail-account-gui.c:1051
 msgid "Save signature"
 msgstr "Shrani podpis"
 
-#: mail/mail-account-gui.c:1042
+#: mail/mail-account-gui.c:1057
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -9261,7 +10519,7 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: mail/mail-account-gui.c:1663
+#: mail/mail-account-gui.c:1681
 msgid "You may not create two accounts with the same name."
 msgstr "Ne morete ustvariti dveh računov z enakim imenom."
 
@@ -9277,32 +10535,52 @@ msgstr "Izključi"
 msgid "Enable"
 msgstr "Vključi"
 
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:292
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepričani, da želite zbrisati ta račun?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:296
 msgid "Don't delete"
 msgstr "Ne zbriši"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:299
 msgid "Really delete account?"
 msgstr "Resnično zbriši račun?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
 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:823 mail/mail-config.glade.h:49
+#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
 msgid "Mail Settings"
 msgstr "Nastavitev pošte"
 
+#: mail/mail-autofilter.c:72
+#, c-format
+msgid "Mail to %s"
+msgstr "Pošta za %s"
+
+#: mail/mail-autofilter.c:217
+#, c-format
+msgid "Subject is %s"
+msgstr "Zadeva je %s"
+
+#: mail/mail-autofilter.c:233
+#, c-format
+msgid "Mail from %s"
+msgstr "Pošta od %s"
+
+#: mail/mail-autofilter.c:289
+#, c-format
+msgid "%s mailing list"
+msgstr "%s poštnih seznamov"
+
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -9314,7 +10592,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:145
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -9322,7 +10600,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:159
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -9330,12 +10608,12 @@ msgstr ""
 "Nastaviti morate način prenosa pošte\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:189
 msgid "You have not set a mail transport method"
 msgstr "Niste nastavili postopka prenašanja pošte"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:224
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -9343,11 +10621,11 @@ msgstr ""
 "Pošiljate pošto v obliki HTML, a naslednji prejemniki ne želijo prejemati "
 "takšne pošte:\n"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:239
 msgid "Send anyway?"
 msgstr "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:281
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -9355,7 +10633,7 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:325
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -9363,11 +10641,11 @@ 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:327
+#: mail/mail-callbacks.c:329
 msgid "This message contains only Bcc recipients."
 msgstr "To sporočilo vsebuje le prejemnike bcc"
 
-#: mail/mail-callbacks.c:331
+#: mail/mail-callbacks.c:333
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -9377,19 +10655,15 @@ msgstr ""
 "To(očitno-za).\n"
 "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:461
-msgid "This message contains invalid recipients:"
-msgstr "To sporočilo vsebuje neveljavne prejemnike:"
-
-#: mail/mail-callbacks.c:496
+#: mail/mail-callbacks.c:438
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:584
+#: mail/mail-callbacks.c:527
 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:703
+#: mail/mail-callbacks.c:646
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -9397,28 +10671,28 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: mail/mail-callbacks.c:913
+#: mail/mail-callbacks.c:979
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
-#: mail/mail-callbacks.c:918
+#: mail/mail-callbacks.c:983
 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:1363 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1429 mail/message-browser.c:130
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1365 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1431 mail/message-browser.c:132
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1866
+#: mail/mail-callbacks.c:2077
 #, 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:1891
+#: mail/mail-callbacks.c:2102
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -9426,7 +10700,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1930
+#: mail/mail-callbacks.c:2141
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -9434,24 +10708,36 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1944
+#: mail/mail-callbacks.c:2155
 #, 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:1970
+#: mail/mail-callbacks.c:2181
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:2069
+#: mail/mail-callbacks.c:2280
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:2071
+#: mail/mail-callbacks.c:2282
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:2242
+#: mail/mail-callbacks.c:2344
+msgid "Go to next folder with unread messages?"
+msgstr "Pojdi v naslednjo mapo z neprebranimi sporočili?"
+
+#: mail/mail-callbacks.c:2351
+msgid ""
+"There are no more new messages in this folder.\n"
+"Would you like to go to the next folder?"
+msgstr ""
+"V tej mapi ni več novih sporočil.\n"
+"Želite iti v naslednjo mapo?"
+
+#: mail/mail-callbacks.c:2580
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9463,7 +10749,7 @@ msgstr ""
 " \n"
 "Resnično zbriši ta sporočila? "
 
-#: mail/mail-callbacks.c:2357
+#: mail/mail-callbacks.c:2690
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -9472,23 +10758,27 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2369
+#: mail/mail-callbacks.c:2702
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2453
+#: mail/mail-callbacks.c:2775
+msgid "Page %d of %d"
+msgstr "Stran %d od %d"
+
+#: mail/mail-callbacks.c:2827
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:2480
+#: mail/mail-callbacks.c:2854
 msgid "US-Letter"
 msgstr "ZDA-pismo"
 
-#: mail/mail-callbacks.c:2519
+#: mail/mail-callbacks.c:2889
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:2685
+#: mail/mail-callbacks.c:3055
 #, 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?"
@@ -9549,7 +10839,11 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#: mail/mail-config.c:1954
+#: mail/mail-config.c:356
+msgid "Account %d"
+msgstr "Račun %d"
+
+#: mail/mail-config.c:2036
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9560,11 +10854,19 @@ msgstr ""
 "%s\n"
 "Bližnjica ne bo ustvarjena."
 
-#: mail/mail-config.c:2207
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:2047
+#, c-format
+msgid "%s: Inbox"
+msgstr "%s: Dohdona pošta"
+
+#: mail/mail-config.c:2297
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:2285 mail/mail-config.c:2289
+#: mail/mail-config.c:2375 mail/mail-config.c:2379
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
@@ -9577,78 +10879,82 @@ msgid " color"
 msgstr " barvo"
 
 #: 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)"
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
 #: mail/mail-config.glade.h:4
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "(SSL v tej zgradbi Evolucije ni vgrajen)"
+
+#: mail/mail-config.glade.h:5
 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
+#: mail/mail-config.glade.h:6
 msgid "Account"
 msgstr "Račun"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Podatki o računu"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Accounts"
 msgstr "Računi"
 
-#: mail/mail-config.glade.h:9
-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"
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr "Vedno pošlji _slepe kopije (Bcc) na:"
 
 #: mail/mail-config.glade.h:11
-msgid "Always blind carbon-copy to:"
-msgstr "Vedno pošlji slepe kopije na:"
+msgid "Always _carbon-copy (Cc) to:"
+msgstr "Vedno pošlji _kopije (Cc) na:"
 
 #: mail/mail-config.glade.h:12
-msgid "Always carbon-copy to:"
-msgstr "Vedno pošlji kopije na:"
+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:13 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:13
+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:14 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Beep when new mail arrives"
 msgstr "Ob prihodu nove pošte zapiskaj"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
 msgid "Checking for New Mail"
 msgstr "Preverjam za novo pošto"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Skladatelj"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid "Composing Messages"
 msgstr "Sestavljanje sporočil"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:20
 msgid "Configuration"
 msgstr "Nastavitev"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:21
 msgid "Confirm when Expunging a folder"
 msgstr "Potrdi ob uničevanju mape"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9664,249 +10970,250 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Default Forward style is: "
 msgstr "Privzet način posredovanja naprej je: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Default character encoding: "
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Defaults"
 msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Digital IDs..."
 msgstr "Digitalni IDji..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Display"
 msgstr "Prikaz"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "Do not notify me when new mail arrives"
 msgstr "Ob prihodu nove pošte me ne obvesti"
 
-#: mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "E_nable"
 msgstr "_Vključi"
 
-#: mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Enabled"
 msgstr "Vključeno"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Execute Command..."
 msgstr "Izvrši ukaz..."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Get Digital ID..."
 msgstr "Dobi digitalni ID..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "HTML signature file:"
 msgstr "Datoteka s podpisom HTML:"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "In HTML mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Make this my _default account"
 msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "NNTP Server:"
 msgstr "Strežnik NNTP"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "New Mail Notification"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "News"
 msgstr "Novice"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:58
-msgid "PGP _Key ID:"
-msgstr "ID _ključa PGP:"
+#: mail/mail-config.glade.h:59
+msgid "PGP/GPG _Key ID:"
+msgstr "ID _ključa PGP/GPG:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Play sound file when new mail arrives"
 msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
 
-#: mail/mail-config.glade.h:63
-msgid "Pretty Good Privacy"
-msgstr "Pretty Good Privacy (precej dobra zasebnost)"
-
 #: mail/mail-config.glade.h:64
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: mail/mail-config.glade.h:65
 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:65
+#: mail/mail-config.glade.h:66
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Re_member this password"
 msgstr "Zapo_mni si to geslo"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Receiving Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Receiving Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:75
-msgid "Secure MIME"
-msgstr "Varni MIME"
-
 #: mail/mail-config.glade.h:76
+msgid "Secure MIME (S/MIME)"
+msgstr "Varni MIME (S/MIME)"
+
+#: mail/mail-config.glade.h:77
 msgid "Security"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Select Filter Log file..."
 msgstr "Izberi datoteko za dnevnik filtra..."
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Select PGP binary"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
+#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:9
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Poslano"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Sent _messages folder:"
 msgstr "Mapa _poslanih sporočil:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Server _Type: "
 msgstr "Vrs_ta strežnika:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Source Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Sources"
 msgstr "Viri"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Specify filename:"
 msgstr "Navedite ime datoteke:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Use s_ecure connection (SSL)"
 msgstr "Uporabi _varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9916,123 +11223,123 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Always load images off the net"
 msgstr "_Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 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:102
+#: mail/mail-config.glade.h:103
 msgid "_Authentication Type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
+msgid "_Authentication type: "
+msgstr "Način _avtentifikacije: "
+
+#: mail/mail-config.glade.h:105
 msgid "_Automatically check for new mail"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "_Certificate ID:"
 msgstr "ID _certifikata:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "_Drafts folder:"
 msgstr "Mapa _osnutkov:"
 
-#: mail/mail-config.glade.h:108
-msgid "_Email Address:"
-msgstr "_E-poštni naslov:"
-
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "_Empty trash folders on exit"
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:110
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:112
+msgid "_Full name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:111
-msgid "_HTML Signature:"
+#: mail/mail-config.glade.h:113
+msgid "_HTML signature:"
 msgstr "Podpis _HTML:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "_Highlight citations with"
 msgstr "_Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:116
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "_Log filter actions to:"
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "_Mark messages as Read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:119
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:120
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:121
 msgid "_Organization:"
 msgstr "_Organizacija:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:122
 msgid "_PGP binary path:"
 msgstr "Pot do izvršljive datoteke _PGP"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:123
 msgid "_Path:"
 msgstr "_Pot:"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:124
 msgid "_Remember this password"
 msgstr "_Zapomni si to geslo"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:125
 msgid "_Send mail in HTML format by default."
 msgstr "Privzeto pošiljaj pošto v _HTML obliki."
 
-#: mail/mail-config.glade.h:124
-msgid "_Server Type: "
+#: mail/mail-config.glade.h:126
+msgid "_Server type: "
 msgstr "Vrsta _strežnika: "
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:127
 msgid "_Signature file:"
 msgstr "Datoteka s _podpisom:"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:128
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:129
 msgid "_every"
 msgstr "_vsakih"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:130
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:132
 msgid "newswindow1"
 msgstr "oknonovic1"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:133
 msgid "placeholder"
 msgstr "držalec mesta"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "seconds."
 msgstr "sekund."
 
@@ -10072,53 +11379,57 @@ msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 
-#: mail/mail-display.c:252
+#: mail/mail-display.c:255
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:320
+msgid "Could not create temporary file '%s': %s"
+msgstr "Nisem mogel ustvariti začasne datoteke '%s': %s"
+
+#: mail/mail-display.c:366
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:368
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:370
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:428
+#: mail/mail-display.c:435
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:449
+#: mail/mail-display.c:456
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:1171
+#: mail/mail-display.c:1259
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1666
+#: mail/mail-display.c:1754
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1668
+#: mail/mail-display.c:1756
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1671
+#: mail/mail-display.c:1759
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1674
+#: mail/mail-display.c:1762
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
@@ -10139,7 +11450,7 @@ msgstr "Datum"
 msgid "Bad Address"
 msgstr "Slab naslov"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:910 mail/message-list.etspec.h:6
 msgid "From"
 msgstr "Od"
 
@@ -10147,7 +11458,7 @@ msgstr "Od"
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:11
+#: mail/mail-format.c:919 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Za"
 
@@ -10159,32 +11470,50 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:2022
+#: mail/mail-format.c:1767
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "To sporočilo ima elektronski podpis. Za več podatkov kliknite na ikono ključavnice."
+
+#: mail/mail-format.c:1790
+msgid "Evolution does not recognize this type of signed message."
+msgstr "Evolucija ne pozna te vrste podpisa sporočila"
+
+#: mail/mail-format.c:1798
+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:1806
+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:2049
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2036
+#: mail/mail-format.c:2063
 #, 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:2041
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2070
+#: mail/mail-format.c:2097
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2105
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2110
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
@@ -10268,104 +11597,109 @@ msgstr "Mapa filtrov"
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:498 mail/mail-ops.c:527
+#: mail/mail-ops.c:534 mail/mail-ops.c:563
 msgid "However, the message was successfully sent."
 msgstr "Sporočilo je bilo vseeno uspešno poslano."
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:599
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:683
+#: mail/mail-ops.c:719
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:702
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:704 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:740 mail/mail-send-recv.c:545
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:797
+#: mail/mail-ops.c:833
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:940
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:943
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:1017
+#: mail/mail-ops.c:1053
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#: mail/mail-ops.c:1200
+#. Fill in the new fields
+#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
+msgid "Trash"
+msgstr "Smeti"
+
+#: mail/mail-ops.c:1236
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1243
+#: mail/mail-ops.c:1279
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1315
+#: mail/mail-ops.c:1351
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1384
+#: mail/mail-ops.c:1420
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1478
+#: mail/mail-ops.c:1514
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1529
+#: mail/mail-ops.c:1565
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1601
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1614
+#: mail/mail-ops.c:1650
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1717
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1767
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1879
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -10374,7 +11708,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1907
+#: mail/mail-ops.c:1943
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -10383,11 +11717,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1981
+#: mail/mail-ops.c:2017
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:1997
+#: mail/mail-ops.c:2033
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -10396,22 +11730,22 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2028
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2097
+#: mail/mail-ops.c:2133
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2098
+#: mail/mail-ops.c:2134
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
-#: mail/mail-ops.c:2197
+#: mail/mail-ops.c:2233
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Izvajam ukaz lupine: %s"
@@ -10548,6 +11882,10 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
+#: mail/mail-vfolder.c:728
+msgid "VFolders"
+msgstr "vMape"
+
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vMape"
@@ -10574,75 +11912,87 @@ msgstr "(brez zadeve)"
 msgid "%s - Message"
 msgstr "%s - sporočilo"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:641
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:642
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:643
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:644
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:666
+#: mail/message-list.c:645
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:649
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:650
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:654
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:655
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:937
+#: mail/message-list.c:960
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:944
+#: mail/message-list.c:967
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:976
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:988
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:998
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2387
+#: mail/message-list.c:2365
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
 #: mail/message-list.etspec.h:2
+msgid "Due By"
+msgstr "Rok do"
+
+#: mail/message-list.etspec.h:3
+msgid "Flag Status"
+msgstr "Stanje zastavice"
+
+#: mail/message-list.etspec.h:4
 msgid "Flagged"
 msgstr "Označeno"
 
 #: mail/message-list.etspec.h:5
+msgid "Follow Up Flag"
+msgstr "Zastavica navezave"
+
+#: mail/message-list.etspec.h:7
 msgid "Received"
 msgstr "Sprejeto"
 
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Velikost"
 
@@ -10875,10 +12225,6 @@ msgstr "Aljaska"
 msgid "Al Baha"
 msgstr ""
 
-#: my-evolution/Locations.h:42
-msgid "Albania"
-msgstr "Albanija"
-
 #: my-evolution/Locations.h:43
 msgid "Albany"
 msgstr ""
@@ -10923,10 +12269,6 @@ msgstr ""
 msgid "Alexandroupolis"
 msgstr ""
 
-#: my-evolution/Locations.h:54
-msgid "Algeria"
-msgstr "Alžirija"
-
 #: my-evolution/Locations.h:55
 msgid "Alghero"
 msgstr ""
@@ -11187,10 +12529,6 @@ msgstr ""
 msgid "Arequipa"
 msgstr ""
 
-#: my-evolution/Locations.h:120
-msgid "Argentina"
-msgstr "Argentina"
-
 #: my-evolution/Locations.h:121
 msgid "Arica"
 msgstr ""
@@ -11323,14 +12661,6 @@ msgstr ""
 msgid "Australasia"
 msgstr ""
 
-#: my-evolution/Locations.h:154
-msgid "Australia"
-msgstr "Australija"
-
-#: my-evolution/Locations.h:155
-msgid "Austria"
-msgstr "Avstrija"
-
 #: my-evolution/Locations.h:156
 msgid "Avalon"
 msgstr ""
@@ -11351,10 +12681,6 @@ msgstr ""
 msgid "Bagotville"
 msgstr ""
 
-#: my-evolution/Locations.h:161
-msgid "Bahamas"
-msgstr "Bahami"
-
 #: my-evolution/Locations.h:162
 msgid "Bahia Blanca"
 msgstr ""
@@ -11363,10 +12689,6 @@ msgstr ""
 msgid "Bahias de Huatulco"
 msgstr ""
 
-#: my-evolution/Locations.h:164
-msgid "Bahrain"
-msgstr "Bahrajn"
-
 #: my-evolution/Locations.h:165
 msgid "Baker City"
 msgstr ""
@@ -11571,18 +12893,10 @@ msgstr ""
 msgid "Belfast/Harbour"
 msgstr ""
 
-#: my-evolution/Locations.h:216
-msgid "Belgium"
-msgstr "Belgija"
-
 #: my-evolution/Locations.h:217
 msgid "Belgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:218
-msgid "Belize"
-msgstr "Belize"
-
 #: my-evolution/Locations.h:219
 msgid "Belleville"
 msgstr ""
@@ -11787,10 +13101,6 @@ msgstr ""
 msgid "Boise"
 msgstr ""
 
-#: my-evolution/Locations.h:270
-msgid "Bolivia"
-msgstr "Bolivija"
-
 #: my-evolution/Locations.h:271
 msgid "Bologna"
 msgstr ""
@@ -11883,10 +13193,6 @@ msgstr ""
 msgid "Braunschweig"
 msgstr ""
 
-#: my-evolution/Locations.h:294
-msgid "Brazil"
-msgstr "Brazilija"
-
 #: my-evolution/Locations.h:295
 msgid "Bremen"
 msgstr "Bremen"
@@ -11987,10 +13293,6 @@ msgstr ""
 msgid "Buffalo"
 msgstr ""
 
-#: my-evolution/Locations.h:320
-msgid "Bulgaria"
-msgstr "Bolgarija"
-
 #: my-evolution/Locations.h:321
 msgid "Bullfrog"
 msgstr ""
@@ -12123,10 +13425,6 @@ msgstr ""
 msgid "Canaan"
 msgstr ""
 
-#: my-evolution/Locations.h:354
-msgid "Canada"
-msgstr "Kanada"
-
 #: my-evolution/Locations.h:355
 msgid "Canarias/Fuerteventura"
 msgstr ""
@@ -12263,10 +13561,6 @@ msgstr ""
 msgid "Catania"
 msgstr ""
 
-#: my-evolution/Locations.h:389
-msgid "Cayman Islands"
-msgstr "Kajmanski otoki"
-
 #: my-evolution/Locations.h:390
 msgid "Cayo Largo del Sur"
 msgstr ""
@@ -12459,10 +13753,6 @@ msgstr ""
 msgid "Childress"
 msgstr ""
 
-#: my-evolution/Locations.h:438
-msgid "Chile"
-msgstr "Čile"
-
 #: my-evolution/Locations.h:439
 msgid "China Lake"
 msgstr ""
@@ -12511,10 +13801,6 @@ msgstr ""
 msgid "Christchurch"
 msgstr ""
 
-#: my-evolution/Locations.h:451
-msgid "Christmas Island"
-msgstr "Velikonočni otok"
-
 #: my-evolution/Locations.h:452
 msgid "Chulitna"
 msgstr ""
@@ -12639,10 +13925,6 @@ msgstr ""
 msgid "Colmar-Meyenheim"
 msgstr ""
 
-#: my-evolution/Locations.h:483
-msgid "Colombia"
-msgstr "Kolumbija"
-
 #: my-evolution/Locations.h:484
 msgid "Colonia"
 msgstr ""
@@ -12775,10 +14057,6 @@ msgstr ""
 msgid "Corumba"
 msgstr ""
 
-#: my-evolution/Locations.h:517
-msgid "Costa Rica"
-msgstr "Kostarika"
-
 #: my-evolution/Locations.h:518
 msgid "Cotulla"
 msgstr ""
@@ -12819,10 +14097,6 @@ msgstr ""
 msgid "Crestview"
 msgstr ""
 
-#: my-evolution/Locations.h:528
-msgid "Croatia"
-msgstr "Hrvaška"
-
 #: my-evolution/Locations.h:529
 msgid "Cross City"
 msgstr ""
@@ -12835,10 +14109,6 @@ msgstr ""
 msgid "Crotone"
 msgstr ""
 
-#: my-evolution/Locations.h:532
-msgid "Cuba"
-msgstr "Kuba"
-
 #: my-evolution/Locations.h:533
 msgid "Cuba Awrs"
 msgstr ""
@@ -12887,14 +14157,6 @@ msgstr ""
 msgid "Cuzco"
 msgstr ""
 
-#: my-evolution/Locations.h:545
-msgid "Cyprus"
-msgstr "Ciper"
-
-#: my-evolution/Locations.h:546
-msgid "Czech Republic"
-msgstr "Češka"
-
 #: my-evolution/Locations.h:547
 msgid "Dagali"
 msgstr ""
@@ -13027,10 +14289,6 @@ msgstr ""
 msgid "Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:580
-msgid "Denmark"
-msgstr "Danska"
-
 #: my-evolution/Locations.h:581
 msgid "Denton"
 msgstr ""
@@ -13041,15 +14299,15 @@ msgstr "Denver"
 
 #: my-evolution/Locations.h:583
 msgid "Denver-Aurora"
-msgstr ""
+msgstr "Denver-Aurora"
 
 #: my-evolution/Locations.h:584
 msgid "Denver-Broomfield"
-msgstr ""
+msgstr "Denver-Broomfield"
 
 #: my-evolution/Locations.h:585
 msgid "Denver-Cherry Knolls"
-msgstr ""
+msgstr "Denver-Cherry Knolls"
 
 #: my-evolution/Locations.h:586
 msgid "Desert Rock"
@@ -13133,16 +14391,12 @@ msgstr ""
 
 #: my-evolution/Locations.h:606
 msgid "Doha"
-msgstr ""
+msgstr "Doha"
 
 #: my-evolution/Locations.h:607
 msgid "Dole"
 msgstr ""
 
-#: my-evolution/Locations.h:608
-msgid "Dominican Republic"
-msgstr "Dominikanska republika"
-
 #: my-evolution/Locations.h:609
 msgid "Donetsk"
 msgstr ""
@@ -13271,10 +14525,6 @@ msgstr "Vzhodni St Louis"
 msgid "Eau Claire"
 msgstr ""
 
-#: my-evolution/Locations.h:641
-msgid "Ecuador"
-msgstr "Ekvador"
-
 #: my-evolution/Locations.h:642
 msgid "Edinburgh"
 msgstr ""
@@ -13307,10 +14557,6 @@ msgstr ""
 msgid "Eglington/Londonderry"
 msgstr ""
 
-#: my-evolution/Locations.h:650
-msgid "Egypt"
-msgstr "Egipt"
-
 #: my-evolution/Locations.h:651
 msgid "Eindhoven"
 msgstr ""
@@ -13371,10 +14617,6 @@ msgstr ""
 msgid "El Paso"
 msgstr ""
 
-#: my-evolution/Locations.h:666
-msgid "El Salvador"
-msgstr "Salvador"
-
 #: my-evolution/Locations.h:667
 msgid "El Salvador Int."
 msgstr ""
@@ -13443,10 +14685,6 @@ msgstr ""
 msgid "Estherville"
 msgstr ""
 
-#: my-evolution/Locations.h:684
-msgid "Estonia"
-msgstr "Estonija"
-
 #: my-evolution/Locations.h:685
 msgid "Eugene"
 msgstr ""
@@ -13571,10 +14809,6 @@ msgstr ""
 msgid "Findlay"
 msgstr ""
 
-#: my-evolution/Locations.h:716
-msgid "Finland"
-msgstr "Finska"
-
 #: my-evolution/Locations.h:717
 msgid "Firenze"
 msgstr ""
@@ -13771,10 +15005,6 @@ msgstr ""
 msgid "Foz Do Iguacu"
 msgstr ""
 
-#: my-evolution/Locations.h:766
-msgid "France"
-msgstr "Francija"
-
 #: my-evolution/Locations.h:767
 msgid "Frankfort"
 msgstr ""
@@ -13951,14 +15181,6 @@ msgstr ""
 msgid "Georgetown"
 msgstr ""
 
-#: my-evolution/Locations.h:811
-msgid "Georgia"
-msgstr "Gruzija"
-
-#: my-evolution/Locations.h:812
-msgid "Germany"
-msgstr "Nemčija"
-
 #: my-evolution/Locations.h:813
 msgid "Ghardaia"
 msgstr ""
@@ -13967,10 +15189,6 @@ msgstr ""
 msgid "Ghedi"
 msgstr ""
 
-#: my-evolution/Locations.h:815
-msgid "Gibraltar"
-msgstr "Gibrlaltar"
-
 #: my-evolution/Locations.h:816
 msgid "Gifu Ab"
 msgstr ""
@@ -14041,7 +15259,7 @@ msgstr "Grenada"
 
 #: my-evolution/Locations.h:833
 msgid "Grand Canyon"
-msgstr ""
+msgstr "Veliki kanjon"
 
 #: my-evolution/Locations.h:834
 msgid "Grand Cayman"
@@ -14091,10 +15309,6 @@ msgstr ""
 msgid "Great Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:846
-msgid "Greece"
-msgstr "Grčija"
-
 #: my-evolution/Locations.h:847
 msgid "Greeley"
 msgstr ""
@@ -14175,10 +15389,6 @@ msgstr ""
 msgid "Guarulhos"
 msgstr ""
 
-#: my-evolution/Locations.h:867
-msgid "Guatemala"
-msgstr "Gvatemala"
-
 #: my-evolution/Locations.h:868
 msgid "Guayaquil/Simon Bolivar"
 msgstr ""
@@ -14260,10 +15470,6 @@ msgstr ""
 msgid "Haines"
 msgstr ""
 
-#: my-evolution/Locations.h:888
-msgid "Haiti"
-msgstr "Haiti"
-
 #: my-evolution/Locations.h:889
 msgid "Hakodate Airport"
 msgstr ""
@@ -14278,11 +15484,11 @@ msgstr ""
 
 #: my-evolution/Locations.h:892
 msgid "Hamburg"
-msgstr ""
+msgstr "Hamburg"
 
 #: my-evolution/Locations.h:893
 msgid "Hamburg-Finkenwerder"
-msgstr ""
+msgstr "Hamburg-Finkenwerder"
 
 #: my-evolution/Locations.h:894
 msgid "Hamilton"
@@ -14488,14 +15694,6 @@ msgstr ""
 msgid "Hondo"
 msgstr ""
 
-#: my-evolution/Locations.h:945
-msgid "Honduras"
-msgstr "Honduras"
-
-#: my-evolution/Locations.h:946
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
 #: my-evolution/Locations.h:947
 msgid "Honningsvag"
 msgstr ""
@@ -14572,10 +15770,6 @@ msgstr ""
 msgid "Humberside"
 msgstr ""
 
-#: my-evolution/Locations.h:966
-msgid "Hungary"
-msgstr "Madžarska"
-
 #: my-evolution/Locations.h:967
 msgid "Huntington"
 msgstr ""
@@ -14620,10 +15814,6 @@ msgstr ""
 msgid "Ibiza"
 msgstr ""
 
-#: my-evolution/Locations.h:978
-msgid "Iceland"
-msgstr "Islandija"
-
 #: my-evolution/Locations.h:979
 msgid "Ichikawa"
 msgstr ""
@@ -14672,10 +15862,6 @@ msgstr ""
 msgid "In Amenas"
 msgstr ""
 
-#: my-evolution/Locations.h:991
-msgid "India"
-msgstr "Indija"
-
 #: my-evolution/Locations.h:992
 msgid "Indiana"
 msgstr ""
@@ -14736,10 +15922,6 @@ msgstr ""
 msgid "Iran, Islamic Republic of"
 msgstr "Iran"
 
-#: my-evolution/Locations.h:1007
-msgid "Ireland"
-msgstr "Irska"
-
 #: my-evolution/Locations.h:1008
 msgid "Iron Mountain"
 msgstr ""
@@ -14772,10 +15954,6 @@ msgstr "Istanbul"
 msgid "Itaituba"
 msgstr ""
 
-#: my-evolution/Locations.h:1016
-msgid "Italy"
-msgstr "Italija"
-
 #: my-evolution/Locations.h:1017
 msgid "Ithaca"
 msgstr ""
@@ -14832,10 +16010,6 @@ msgstr ""
 msgid "Jaffrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1031
-msgid "Jamaica"
-msgstr "Jamajka"
-
 #: my-evolution/Locations.h:1032
 msgid "Jamestown"
 msgstr ""
@@ -14848,10 +16022,6 @@ msgstr ""
 msgid "Jan Smuts"
 msgstr ""
 
-#: my-evolution/Locations.h:1035
-msgid "Japan"
-msgstr "Japonska"
-
 #: my-evolution/Locations.h:1036
 msgid "Jeddah King Abdul Aziz International Airport"
 msgstr ""
@@ -14892,10 +16062,6 @@ msgstr ""
 msgid "Joplin"
 msgstr ""
 
-#: my-evolution/Locations.h:1046
-msgid "Jordan"
-msgstr "Jordanija"
-
 #: my-evolution/Locations.h:1047
 msgid "Juanjui"
 msgstr ""
@@ -15292,10 +16458,6 @@ msgstr ""
 msgid "Kushiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1146
-msgid "Kuwait"
-msgstr "Kuvajt"
-
 #: my-evolution/Locations.h:1147
 msgid "Kyyiv/Boryspil"
 msgstr ""
@@ -15468,10 +16630,6 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1190
-msgid "Latvia"
-msgstr "Latvija"
-
 #: my-evolution/Locations.h:1191
 msgid "Laughlin"
 msgstr ""
@@ -15500,10 +16658,6 @@ msgstr ""
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1198
-msgid "Lebanon"
-msgstr "Libanon"
-
 #: my-evolution/Locations.h:1199
 msgid "Lecce"
 msgstr ""
@@ -15580,10 +16734,6 @@ msgstr "Lexington"
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1218
-msgid "Liberia"
-msgstr "Liberija"
-
 #: my-evolution/Locations.h:1219
 msgid "Libya"
 msgstr "Libija"
@@ -15644,10 +16794,6 @@ msgstr ""
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1234
-msgid "Lithuania"
-msgstr "Litvanija"
-
 #: my-evolution/Locations.h:1235
 msgid "Little Rock"
 msgstr ""
@@ -15780,10 +16926,6 @@ msgstr ""
 msgid "Luton"
 msgstr ""
 
-#: my-evolution/Locations.h:1268
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
 #: my-evolution/Locations.h:1269
 msgid "Luxeuil"
 msgstr ""
@@ -15896,10 +17038,6 @@ msgstr ""
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1297
-msgid "Malta"
-msgstr "Malta"
-
 #: my-evolution/Locations.h:1298
 msgid "Mammoth Lakes"
 msgstr ""
@@ -16256,10 +17394,6 @@ msgstr ""
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1387
-msgid "Mexico"
-msgstr "Mehika"
-
 #: my-evolution/Locations.h:1388
 msgid "Miami"
 msgstr "Miami"
@@ -16588,10 +17722,6 @@ msgstr ""
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1470
-msgid "Morocco"
-msgstr "Maroko"
-
 #: my-evolution/Locations.h:1471
 msgid "Morristown"
 msgstr ""
@@ -16832,10 +17962,6 @@ msgstr ""
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1531
-msgid "Netherlands"
-msgstr "Nizozemska"
-
 #: my-evolution/Locations.h:1532
 msgid "Neuquen"
 msgstr ""
@@ -16948,18 +18074,10 @@ msgstr "New York-Letališče JFK"
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1560
-msgid "New Zealand"
-msgstr "Nova Zelandija"
-
 #: my-evolution/Locations.h:1561
 msgid "Niagara Falls"
 msgstr "Niagarski slapovi"
 
-#: my-evolution/Locations.h:1562
-msgid "Nicaragua"
-msgstr "Nikaragva"
-
 #: my-evolution/Locations.h:1563
 msgid "Nice-Cote d'Azur"
 msgstr ""
@@ -17004,10 +18122,6 @@ msgstr ""
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1574
-msgid "Norfolk Island"
-msgstr "Norfolški otoki"
-
 #: my-evolution/Locations.h:1575
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
@@ -17056,10 +18170,6 @@ msgstr ""
 msgid "Northwest Territories"
 msgstr "Severozahodni teritoriji"
 
-#: my-evolution/Locations.h:1587
-msgid "Norway"
-msgstr "Norveška"
-
 #: my-evolution/Locations.h:1588
 msgid "Norwich"
 msgstr "Norwich"
@@ -17236,10 +18346,6 @@ msgstr ""
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1632
-msgid "Oman"
-msgstr "Oman"
-
 #: my-evolution/Locations.h:1633
 msgid "Ominato Ab"
 msgstr ""
@@ -17396,10 +18502,6 @@ msgstr ""
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1673
-msgid "Pakistan"
-msgstr "Pakistan"
-
 #: my-evolution/Locations.h:1674
 msgid "Pa Kuei/Bakuai"
 msgstr ""
@@ -17436,10 +18538,6 @@ msgstr "Palo Alto"
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1683
-msgid "Panama"
-msgstr "Panama"
-
 #: my-evolution/Locations.h:1684
 msgid "Panama City"
 msgstr ""
@@ -17456,10 +18554,6 @@ msgstr ""
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1688
-msgid "Paraguay"
-msgstr "Paragvaj"
-
 #: my-evolution/Locations.h:1689
 msgid "Paris"
 msgstr "Pariz"
@@ -17596,10 +18690,6 @@ msgstr ""
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1723
-msgid "Peru"
-msgstr "Peru"
-
 #: my-evolution/Locations.h:1724
 msgid "Perugia"
 msgstr ""
@@ -17760,10 +18850,6 @@ msgstr ""
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1764
-msgid "Poland"
-msgstr "Poljska"
-
 #: my-evolution/Locations.h:1765
 msgid "Pompano Beach"
 msgstr ""
@@ -17868,10 +18954,6 @@ msgstr ""
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1791
-msgid "Portugal"
-msgstr "Portugalska"
-
 #: my-evolution/Locations.h:1792
 msgid "Posadas"
 msgstr ""
@@ -18000,10 +19082,6 @@ msgstr ""
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1824
-msgid "Puerto Rico"
-msgstr "Portoriko"
-
 #: my-evolution/Locations.h:1825
 msgid "Puerto Suarez"
 msgstr ""
@@ -18048,10 +19126,6 @@ msgstr ""
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
-msgid "Qatar"
-msgstr "Katar"
-
 #: my-evolution/Locations.h:1837
 msgid "Quantico"
 msgstr ""
@@ -18238,7 +19312,7 @@ msgstr "Rijeka"
 
 #: my-evolution/Locations.h:1883
 msgid "Rimini"
-msgstr ""
+msgstr "Rimini"
 
 #: my-evolution/Locations.h:1884
 msgid "Rio De Janeiro"
@@ -18352,10 +19426,6 @@ msgstr ""
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1912
-msgid "Romania"
-msgstr "Romunija"
-
 #: my-evolution/Locations.h:1913
 msgid "Roma/Urbe"
 msgstr ""
@@ -18844,10 +19914,6 @@ msgstr ""
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
-msgid "Saudi Arabia"
-msgstr "Savdska Arabija"
-
 #: my-evolution/Locations.h:2036
 msgid "Sault Ste Marie"
 msgstr ""
@@ -19064,10 +20130,6 @@ msgstr ""
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2090
-msgid "Singapore"
-msgstr "Singapur"
-
 #: my-evolution/Locations.h:2091
 msgid "Sioux City"
 msgstr ""
@@ -19116,14 +20178,6 @@ msgstr ""
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2103
-msgid "Slovakia"
-msgstr "Slovaška"
-
-#: my-evolution/Locations.h:2104
-msgid "Slovenia"
-msgstr "Slovenija"
-
 #: my-evolution/Locations.h:2105
 msgid "Smithers"
 msgstr ""
@@ -19180,10 +20234,6 @@ msgstr ""
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2119
-msgid "South Africa"
-msgstr "Južno afriška republika"
-
 #: my-evolution/Locations.h:2120
 msgid "Southampton"
 msgstr "Southampton"
@@ -19212,10 +20262,6 @@ msgstr ""
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
-msgid "Spain"
-msgstr "Španija"
-
 #: my-evolution/Locations.h:2128
 msgid "Sparrevohn"
 msgstr ""
@@ -19408,10 +20454,6 @@ msgstr ""
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2176
-msgid "Suriname"
-msgstr "Surinam"
-
 #: my-evolution/Locations.h:2177
 msgid "Sutton"
 msgstr ""
@@ -19428,18 +20470,10 @@ msgstr ""
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2181
-msgid "Sweden"
-msgstr "Švedska"
-
 #: my-evolution/Locations.h:2182
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
-msgid "Switzerland"
-msgstr "Švica"
-
 #: my-evolution/Locations.h:2184
 msgid "Sydney"
 msgstr "Sydney"
@@ -19524,10 +20558,6 @@ msgstr ""
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2205
-msgid "Taiwan"
-msgstr "Tajvan"
-
 #: my-evolution/Locations.h:2206
 msgid "Taiyuan"
 msgstr ""
@@ -19988,10 +21018,6 @@ msgstr ""
 msgid "Turin"
 msgstr ""
 
-#: my-evolution/Locations.h:2321
-msgid "Turkey"
-msgstr "Turčija"
-
 #: my-evolution/Locations.h:2322
 msgid "Turku"
 msgstr ""
@@ -20040,10 +21066,6 @@ msgstr ""
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
-msgid "Ukraine"
-msgstr "Ukrajina"
-
 #: my-evolution/Locations.h:2335
 msgid "Ulan-Ude"
 msgstr ""
@@ -20072,14 +21094,6 @@ msgstr ""
 msgid "United Arab Emirates "
 msgstr "Združeni arabski emirati "
 
-#: my-evolution/Locations.h:2342
-msgid "United Kingdom"
-msgstr "Velika Britanija"
-
-#: my-evolution/Locations.h:2343
-msgid "United States"
-msgstr "Združene države amerike"
-
 #: my-evolution/Locations.h:2344
 msgid "Unst"
 msgstr ""
@@ -20096,10 +21110,6 @@ msgstr ""
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
-msgid "Uruguay"
-msgstr "Urugvaj"
-
 #: my-evolution/Locations.h:2349
 msgid "Urumqi"
 msgstr ""
@@ -20224,10 +21234,6 @@ msgstr ""
 msgid "Venezia"
 msgstr "Benetke"
 
-#: my-evolution/Locations.h:2380
-msgid "Venezuela"
-msgstr "Venezuela"
-
 #: my-evolution/Locations.h:2381
 msgid "Venice"
 msgstr ""
@@ -20272,10 +21278,6 @@ msgstr ""
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2392
-msgid "Viet Nam"
-msgstr "Vietnam"
-
 #: my-evolution/Locations.h:2393
 msgid "Vigo"
 msgstr ""
@@ -20752,10 +21754,6 @@ msgstr ""
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2512
-msgid "Yemen"
-msgstr "Jemen"
-
 #: my-evolution/Locations.h:2513
 msgid "Yenbo"
 msgstr ""
@@ -20800,10 +21798,6 @@ msgstr ""
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
-msgid "Yugoslavia"
-msgstr "Jugoslavija"
-
 #: my-evolution/Locations.h:2525
 msgid "Yukon"
 msgstr ""
@@ -20868,27 +21862,27 @@ msgstr "Mapa, ki vsebuje povzetek Evolucije"
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Ne morem inicializirati Evolucijine komponente za povzetek."
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Sestanki"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Ni sestankovov"
 
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:395
+#: my-evolution/e-summary-calendar.c:420
 msgid "No description"
 msgstr "Brez opisa"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-mail.c:120
 msgid "Mail summary"
 msgstr "Povzetek pošte"
 
@@ -20897,32 +21891,32 @@ msgstr "Povzetek pošte"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:81
-#: my-evolution/e-summary-weather.c:606
+#: my-evolution/e-summary-preferences.c:82
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "LJLJ:LJMB:LJPZ"
 
-#: my-evolution/e-summary-preferences.c:445
+#: my-evolution/e-summary-preferences.c:453
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com beseda dneva"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:474
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:946
+#: my-evolution/e-summary-preferences.c:735
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: my-evolution/e-summary-preferences.c:954
+#: my-evolution/e-summary-preferences.c:743
 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:958
+#: my-evolution/e-summary-preferences.c:747
 msgid "Name:"
 msgstr "Ime:"
 
-#: my-evolution/e-summary-preferences.c:1504
+#: my-evolution/e-summary-preferences.c:1225
 msgid "Summary Settings"
 msgstr "Nastavitev povzetka"
 
@@ -20930,30 +21924,30 @@ msgstr "Nastavitev povzetka"
 msgid "Error downloading RDF"
 msgstr "Napaka ob prenašanju RDF"
 
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "Viri novic"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Brez nalog"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(ni opisa)"
 
-#: my-evolution/e-summary-weather.c:70
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:504
+#: my-evolution/e-summary-weather.c:279
+msgid "There was an error downloading data for"
+msgstr "Napaka ob prenašanju podatkov za"
+
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "Vreme"
 
-#: my-evolution/e-summary-weather.c:667
-msgid "Regions"
-msgstr "Območja"
-
 #: my-evolution/e-summary.c:190
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
@@ -22151,118 +23145,90 @@ msgid "Drifting dust whirls"
 msgstr "Prašni vrtinci v pasovih"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _Odstrani"
-
-#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ews feed"
 msgstr "Dodaj _nov vir novic"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "Vse _postaje:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "Vse _mape:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "Vsi viri _novic:"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "_Stopinjah"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr "Koliko dni naj koledar pokaže hkrati?"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "Na_jvečje število prikazanih predmetov:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "Nastavitve virov novic"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "En _mesec"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "En _teden"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "Čas _osvežitve (sekund):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "Čas _osvežitve (sekund):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "_Kaži celotne poti map"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "Kaži _vse naloge"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "Kaži _današnje naloge"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "Kaži temperaturo v:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Naloge "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "Nastavitve vremena"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_Kaži mape:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "_Kaži postaje:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "_Kaži novice:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_Fahrenheitih"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_pet dni"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "_Viri novic"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_En dan"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "_Načrtuj"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_Vreme"
 
@@ -22278,14 +23244,26 @@ msgstr "Tovarna za kontrolo zaznamkov"
 msgid "The Evolution shell."
 msgstr "Evolucijina lupina."
 
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:160
 msgid "Show Details"
 msgstr "Kaži podrobnosti"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:162
 msgid "Cancel Operation"
 msgstr "Prekliči operacijo"
 
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "Dohodna pošta"
+
+#: shell/e-local-storage.c:175
+msgid "Outbox"
+msgstr "Odhodna pošta"
+
+#: shell/e-local-storage.c:636
+msgid "Local Folders"
+msgstr "Krajevne mape"
+
 #: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
@@ -22402,8 +23380,8 @@ 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."
+msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
+msgstr "Avtorske pravice pridržane 1999, 2000, 2001, 20002 Ximian, Inc."
 
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
@@ -22508,7 +23486,7 @@ msgstr ""
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
+#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
@@ -22681,6 +23659,12 @@ msgstr ""
 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-user-creatable-items-handler.c:503
+#: shell/e-shell-user-creatable-items-handler.c:548
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Nov"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Ime mape ni navedeno."
@@ -22709,68 +23693,68 @@ msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 msgid "About Ximian Evolution"
 msgstr "_O Ximianovi Evoluciji..."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:427
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:428
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo želite odpreti"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:548
 msgid "Create a new shortcut"
 msgstr "Ustvari novo bližnjico"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:549
 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:577
+#: shell/e-shell-view-menu.c:580
 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:585
+#: shell/e-shell-view-menu.c:588
 #, c-format
 msgid "Error executing %s."
 msgstr "Napaka ob izvajanju %s."
 
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:691
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:704 ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:717 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:220
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1699
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1701
 msgid "(None)"
 msgstr "(brez)"
 
-#: shell/e-shell-view.c:1647
+#: shell/e-shell-view.c:1748
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolucija je trenutno na mreži.  Kliknite na ta gumb za delo brez "
 "mreže."
 
-#: shell/e-shell-view.c:1654
+#: shell/e-shell-view.c:1755
 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:1660
+#: shell/e-shell-view.c:1761
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -22781,7 +23765,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1706
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -22792,23 +23776,19 @@ msgstr ""
 "je nepričakovano zaključila. Morali boste zapreti in znova\n"
 "pognati Evolucijo, če želite dostopati do teh podatkov."
 
-#: shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "V redu"
-
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:1933
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:1935
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:1937
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:1939 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Generična napaka"
 
@@ -22933,10 +23913,6 @@ msgstr "Napaka ob shranjevanju bližnjic."
 msgid "Shortcuts"
 msgstr "Bližnjice"
 
-#: shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Dohodna pošta"
-
 #: shell/e-storage-set-view.c:658
 #, c-format
 msgid ""
@@ -23236,32 +24212,49 @@ msgstr "Ne sprašuj me več"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
 
-#: shell/main.c:83
+#: shell/main.c:88
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:89
+#: shell/main.c:94
 msgid "Evolution is now exiting ..."
 msgstr "Evolucije se sedaj zapira..."
 
-#: shell/main.c:210
+#: shell/main.c:223
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne morem dostopati do lupine Ximian Evolucije."
 
-#: shell/main.c:219
+#: shell/main.c:232
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne morem inicializirati lupine Ximian Evolucije: %s"
 
-#: shell/main.c:289
+#: shell/main.c:302
 msgid "Disable splash screen"
 msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:290
+#: shell/main.c:303
+msgid "Start in offline mode"
+msgstr "Začni v ne-mrežnem načinu"
+
+#: shell/main.c:304
+msgid "Start in online mode"
+msgstr "Začni v mrežnem načinu"
+
+#: shell/main.c:305
 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:332
+#: shell/main.c:323
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+"%s: --online in --ofline ne moreta biti uporabljena skupaj.\n"
+"  Uporabite %s --help za več podatkov.\n"
+
+#: shell/main.c:353
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
@@ -23284,125 +24277,137 @@ msgstr "Izhodna datoteka"
 msgid "No filename provided."
 msgstr "Ime datoteke ni navedeno."
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Kopiraj stik(e) v drugo mapo..."
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
+msgstr "Kopiraj v mapo..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Ustvari nov stik"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:12
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Zbriši izbrane stike"
 
 #: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Nov seznam"
+msgid "Dump"
+msgstr "Shrani"
+
+#: ui/evolution-addressbook.xml.h:14
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Prestavi stik(e) v drugo mapo..."
+
+#: ui/evolution-addressbook.xml.h:15
+msgid "Move to Folder..."
+msgstr "Prestavi v mapo..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Prilepi odložišče"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:18
 msgid "Previews the contacts to be printed"
 msgstr "Predogled stikov, ki bodo natisnjeni"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:21
 msgid "Print selected contacts"
 msgstr "Natisni izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23
 msgid "Save selected contacts as a VCard."
 msgstr "Shrani izbrane kontakte kot vVizitke"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:25
 msgid "Select all contacts"
 msgstr "Izberi vse stike"
 
-#: 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
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send a mess to the selected contacts."
 msgstr "Pošlji poročilo izbranim stikom."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send message to contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:28
 msgid "Send selected contacts to another person."
 msgstr "Pošlji izbrane stike drugi osebi."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:30
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:31
 msgid "View the current contact"
 msgstr "Poglej trenutni stik"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:32 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:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
+#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:92 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:15
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Addressbook Sources..."
 msgstr "Viri _adresarja..."
 
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Stik"
-
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Contact List"
 msgstr "Seznam _stikov"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Posreduj stik..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
+#: ui/evolution-addressbook.xml.h:43 ui/evolution-calendar.xml.h:42
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:106
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Na_tisni..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Save as VCard"
 msgstr "_Shrani kot vVizitko"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:45
 msgid "_Search for Contacts"
 msgstr "_Išči po kontaktih"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:46
 msgid "_Select All"
 msgstr "_Izberi vse"
 
+#: ui/evolution-addressbook.xml.h:47
+msgid "_Send Message to Contact..."
+msgstr "Pošlji _sporočilo stiku..."
+
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "Nastavi pogled koledarja"
@@ -23419,54 +24424,62 @@ msgstr "Ustvari novo _nalogo"
 msgid "Create a _New Appointment"
 msgstr "Ustvari _nov sestanek"
 
+#: ui/evolution-calendar.xml.h:7
+msgid "Create a _New Meeting"
+msgstr "Ustvari _nov sestanek"
+
+#: ui/evolution-calendar.xml.h:8
+msgid "Create a new appointment"
+msgstr "Ustvari nov sestanek"
+
 #: ui/evolution-calendar.xml.h:9
+msgid "Create a new meeting request"
+msgstr "Ustvari nov zahtevek za sestanek"
+
+#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
+msgid "Create a new task"
+msgstr "Ustvari nov posel"
+
+#: ui/evolution-calendar.xml.h:11
 msgid "Create an event for the whole day"
 msgstr "Ustvari sestanek, ki zavzame cel dan"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:14
 msgid "Delete the appointment"
 msgstr "Zbriši ta sestanek"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:16
 msgid "Go back"
 msgstr "Pojdi nazaj"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:17
 msgid "Go forward"
 msgstr "Pojdi naprej"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:20
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:21
 msgid "Go to today"
 msgstr "Pojdi na danes"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:22
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Nov sestanek"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-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"
@@ -23511,11 +24524,15 @@ msgstr "_Sestanek..."
 msgid "_Calendar Settings..."
 msgstr "_Nastavitve pošte..."
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:40
+msgid "_Meeting..."
+msgstr "_Sestanek..."
+
+#: ui/evolution-calendar.xml.h:43
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi podatek o zasedenosti"
 
-#: ui/evolution-calendar.xml.h:43
+#: ui/evolution-calendar.xml.h:44
 msgid "_Task..."
 msgstr "_Naloga..."
 
@@ -23594,6 +24611,10 @@ msgstr "Shrani _kot..."
 msgid "Save the contact and close the dialog box"
 msgstr "Shrani stik in zapri dialog"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Pošlji _sporočilo stiku..."
+
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
@@ -23657,10 +24678,6 @@ msgstr "Načrtuj sestanek za ta predmet"
 msgid "Customise My Evolution"
 msgstr "Prikroji Mojo Evolucijo"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Prekliči"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Prekliči trenutno operacijo pošte"
@@ -23694,58 +24711,50 @@ 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"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send queued mail and retrieve new mail"
 msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Kaži okno predogleda sporočila"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Naroči se ali prekliči naročnino na mape z oddaljenih strežnikov"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtri..."
 
 #: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "_Pošlji sporočilo"
-
-#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "_Nastavive pošte..."
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Subscribe to Folders..."
 msgstr "_Naroči se na mape..."
 
@@ -23838,7 +24847,7 @@ msgstr "Začasno skrij vsa izbrana sporočila"
 msgid "Threaded Message list"
 msgstr "Niten seznam sporočil"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
 msgid "_Expunge"
 msgstr "_Uniči"
 
@@ -23859,362 +24868,374 @@ msgid "_Threaded Message List"
 msgstr "_Niten seznam sporočil"
 
 #: ui/evolution-mail-message.xml.h:2
+msgid "Add Sender to Address _Book"
+msgstr "Pošiljatelja dodaj v _adresar"
+
+#: ui/evolution-mail-message.xml.h:3
 msgid "Apply filter rules to the selected messages"
 msgstr "Uveljavi pravila filtra na izbranih sporočilih"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Sestavi odgovor vsem prejemnikom izbranega sporočila"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sestavi odgovor na dopisni seznam izbranega sporočila"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sestavi odgovor pošiljatelju izbranega sporočila"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:8
 msgid "Copy selected messages to another folder"
 msgstr "Kopiraj izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create _Virtual Folder From Message"
 msgstr "Iz sporočila ustvari na_videzno mapo"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages from this sender"
 msgstr "Ustvari pravilo za filtriranje sporočil tega pošiljatelja"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Ustvari pravilo za filtriranje sporočil tem prejemnikom"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Ustvari pravilo za filtriranje spročil temu dopisnemu seznamu"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages with this subject"
 msgstr "Ustvari pravilo za filtriranje sporočil s tem predmetom"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for these recipients"
 msgstr "Ustvari navidezno mapo za te prejemnike"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this mailing list"
 msgstr "Ustvari navidezno mapo za ta dopisni seznam"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this sender"
 msgstr "Ustvari navidezno mapo za tega pošiljatelja"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 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:18
 msgid "Decrease the text size"
 msgstr "Zmanjšaj velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next important message"
 msgstr "Kaži naslednje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next message"
 msgstr "Kaži naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next unread message"
 msgstr "Kaži naslednje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread thread"
 msgstr "Kaži naslednjo neprebrano nit"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous important message"
 msgstr "Kaži prejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous message"
 msgstr "Kaži prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous unread message"
 msgstr "Kaži prejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on Mailing _List..."
 msgstr "Filter glede na p_oštni seznam..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on Se_nder..."
 msgstr "Filter glede na pošilja_telja"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on _Recipients..."
 msgstr "Filter glede na preje_mnike..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on _Subject..."
 msgstr "Filter glede na za_devo..."
 
-#: ui/evolution-mail-message.xml.h:30
-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:31
-msgid "Forward"
-msgstr "Posreduj naprej"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "Posreduj naprej kot"
+msgid "Flag selected message(s) for follow-up"
+msgstr "Označi izbrana sporočila za navezavo"
 
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "Posreduj _pripeto"
+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:34
-msgid "Forward _Inline"
-msgstr "Posreduj kot _del sporočila"
+msgid "Forward"
+msgstr "Posreduj naprej"
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "Posreduj kot _citirano"
-
-#: ui/evolution-mail-message.xml.h:36
 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:37
+#: 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:38
+#: 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:39
+#: 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:41
+#: ui/evolution-mail-message.xml.h:40
 msgid "Increase the text size"
 msgstr "Povečaj velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "Naloži _slike"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "Označi kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr "Označi kot _nepomembno"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as having been read"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected message(s) as having been read"
 msgstr "Označi izbrana sporočila kot prebrana"
 
-#: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as important"
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mark the selected message(s) as important"
 msgstr "Označi izbrana sporočila kot pomembna"
 
-#: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected messages as not having been read"
+#: ui/evolution-mail-message.xml.h:48
+msgid "Mark the selected message(s) as not having been read"
 msgstr "Označi izbrana sporočila kot neprebrana"
 
-#: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as unimportant"
+#: ui/evolution-mail-message.xml.h:49
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Označi izbrana sporočila kot nepomembna"
 
-#: ui/evolution-mail-message.xml.h:51
+#: 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:52
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail-message.xml.h:53
-msgid "Move selected messages to another folder"
+#: ui/evolution-mail-message.xml.h:52
+msgid "Move selected message(s) to another folder"
 msgstr "Prestavi izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "Naslednje"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr "Naslednje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr "Naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr "Naslednja nit"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:59
+#: 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:60
+#: 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:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Izvorna _velikost"
 
-#: ui/evolution-mail-message.xml.h:62
+#: 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:63
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Prejšnje"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr "Prejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr "Prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr "Prejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr "Natisni to sporočilo"
 
+#: ui/evolution-mail-message.xml.h:69
+msgid "Re_direct"
+msgstr "_Preusmeri"
+
 #: ui/evolution-mail-message.xml.h:70
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Izbrano sporočilo nekomu posreduj" 
+
+#: ui/evolution-mail-message.xml.h:71
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:72
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "Reset the text to its original size"
 msgstr "Ponastavi besedilo na njegovo izvorno velikost"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_earch Message..."
 msgstr "_Išči v sporočilu..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_maller"
 msgstr "_Manjša"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:78
 msgid "Save the message as a text file"
 msgstr "Shrani sporočilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 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:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Setup the page settings for your current printer"
 msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Email _Source"
 msgstr "Kaži _izvorno kodo pošte"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Full _Headers"
 msgstr "Kaži celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message in the normal style"
 msgstr "Kaži sporočila v običajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message with all email headers"
 msgstr "Kaži sporočila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show the raw email source of the message"
 msgstr "Kaži neposredno izvorno kodo sporočila"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Text Si_ze"
 msgstr "_Velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "Un-delete the selected messages"
 msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na poštni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _pošiljatelja..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
+msgid "_Attached"
+msgstr "_Priloženo"
+
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Forward Message"
 msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
+msgid "_Inline"
+msgstr "Kot _del sporočila"
+
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Večje"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:107
+msgid "_Quoted"
+msgstr "_Citirano"
+
+#: ui/evolution-mail-message.xml.h:110 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Orodja"
@@ -24497,18 +25518,14 @@ msgstr "Zbriši izbrana opravila"
 msgid "Mar_k as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 msgid "Paste task from the clipboard"
 msgstr "Prilepi opravilo z odložišča"
 
-#: ui/evolution-tasks.xml.h:15
+#: ui/evolution-tasks.xml.h:14
 msgid "Tasks Settings..."
 msgstr "Nastavitve nalog..."
 
-#: ui/evolution-tasks.xml.h:22
-msgid "_Task"
-msgstr "_Naloga"
-
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
 msgstr "O Ximian Evoluciji..."
@@ -24694,18 +25711,26 @@ msgid "Phone List"
 msgstr "Seznam telefonov"
 
 #: views/mail/galview.xml.h:1
+msgid "As Sent Folder"
+msgstr "Kot mapa poslanih"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr "Po zastavici navezave"
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Po pošiljatelju"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Po stanju"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Po zadevi"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Sporočila"
 
@@ -24741,11 +25766,20 @@ msgstr ""
 "pasu.\n"
 " Uporabite desni miškin gumb za pomanjšavo."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Trenutni pogled"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+msgid "Custom View"
+msgstr "Pogled po meri"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr "Shrani pogled po meri"
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Določi poglede"
 
@@ -24837,10 +25871,6 @@ msgstr "Ukrajinski"
 msgid "Visual"
 msgstr "Vidno"
 
-#: widgets/misc/e-charset-picker.c:104
-msgid "New"
-msgstr "Nov"
-
 #: widgets/misc/e-charset-picker.c:162
 #, c-format
 msgid "Unknown character set: %s"
@@ -24899,11 +25929,11 @@ msgstr "Sporočilo"
 msgid "Don't show this message again."
 msgstr "Tega sporočila ne kaži več."
 
-#: widgets/misc/e-search-bar.c:334
+#: widgets/misc/e-search-bar.c:342
 msgid "Sear_ch"
 msgstr "_Iskanje"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:468
 msgid "Find Now"
 msgstr "Išči sedaj"
 
@@ -24929,308 +25959,362 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
-#~ msgid "Email Address:"
-#~ msgstr "E-poštni naslov:"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
-
-#~ msgid "American Samoa"
-#~ msgstr "Ameriška Samoa"
-
-#~ msgid "Andorra"
-#~ msgstr "Andora"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Anguilla"
-#~ msgstr "Angvila"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antarktika"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigva in Barbuda"
-
-#~ msgid "Armenia"
-#~ msgstr "Armenija"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbajdžan"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladeš"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Belarus"
-#~ msgstr "Belorusija"
-
-#~ msgid "Benin"
-#~ msgstr "Benin"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermudi"
-
-#~ msgid "Bhutan"
-#~ msgstr "Butan"
+#~ msgid "Card: "
+#~ msgstr "Vizitka: "
 
-#~ msgid "Bosnia And Herzegowina"
-#~ msgstr "Bosna in Hercegovina"
-
-#~ msgid "Botswana"
-#~ msgstr "Bocvana"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvetski otoki"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britansko Indijsko oceansko območje"
-
-#~ msgid "British Virgin Islands"
-#~ msgstr "Britanski deviški otoki"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei Darussalam"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "Cambodia"
-#~ msgstr "Kambodža"
-
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Zelenortski otoki"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Srednjaafriška republika"
-
-#~ msgid "Chad"
-#~ msgstr "Čad"
-
-#~ msgid "China"
-#~ msgstr "Kitajska"
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ime: "
 
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokosovi otoki"
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Predpona:   "
 
-#~ msgid "Comoros"
-#~ msgstr "Komori"
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Dano:       "
 
-#~ msgid "Congo"
-#~ msgstr "Kongo"
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Dodatno:    "
 
-#~ msgid "Cook Islands"
-#~ msgstr "Cookovi otoki"
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Družinsko:     "
 
-#~ msgid "Cote d'Ivoire"
-#~ msgstr "Cote d'Ivoire"
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pripona:    "
 
-#~ msgid "Djibouti"
-#~ msgstr "Džibuti"
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Datum rojstva: "
 
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Naslov:"
 
-#~ msgid "East Timor"
-#~ msgstr "Vshodni timor"
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Poštni predal:  "
 
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Ekvatorijalna gvineja"
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Interna:     "
 
-#~ msgid "Eritrea"
-#~ msgstr "Eritreja"
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ulica:       "
 
-#~ msgid "Ethiopia"
-#~ msgstr "Etiopija"
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Mesto:       "
 
-#~ msgid "Falkland Islands"
-#~ msgstr "Falklandski otoki"
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Regija:      "
 
-#~ msgid "Faroe Islands"
-#~ msgstr "Farski otoki"
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Poštna številka: "
 
-#~ msgid "Fiji"
-#~ msgstr "Fidži"
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Država:      "
 
-#~ msgid "French Guiana"
-#~ msgstr "Francoska Gvajana"
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Dostavna oznaka: "
 
-#~ msgid "French Polynesia"
-#~ msgstr "Francoska polinezija"
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefoni:\n"
 
-#~ msgid "French Southern Territories"
-#~ msgstr "Francoska ju>na obmohja"
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
 
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-naslov:\n"
 
-#~ msgid "Gambia"
-#~ msgstr "Gambija"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-naslov:"
 
-#~ msgid "Ghana"
-#~ msgstr "Gana"
+#~ msgid ""
+#~ "\n"
+#~ "Mailer: "
+#~ msgstr ""
+#~ "\n"
+#~ "Poštni program: "
 
-#~ msgid "Greenland"
-#~ msgstr "Grenlandija"
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Časovni pas: "
 
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "Geografski položaj: "
 
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Poslovna vloga: "
 
-#~ msgid "Guam"
-#~ msgstr "Guam"
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Organizacija: "
 
-#~ msgid "Guinea"
-#~ msgstr "Gvineja"
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ime:   "
 
-#~ msgid "Guinea-bissau"
-#~ msgstr "Gvineja bissau"
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Enota:  "
 
-#~ msgid "Guyana"
-#~ msgstr "Gvajana"
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Enota2: "
 
-#~ msgid "Heard And McDonald Islands"
-#~ msgstr "Heardovi in McDonaldovi otoki"
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Enota3: "
 
-#~ msgid "Holy See"
-#~ msgstr "Sveto morje"
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Enota4: "
 
-#~ msgid "Indonesia"
-#~ msgstr "Indonezija"
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Komentar: "
 
-#~ msgid "Israel"
-#~ msgstr "Izrael"
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Enoličen niz:  "
 
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazahstan"
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Javni ključ: "
 
-#~ msgid "Kenya"
-#~ msgstr "Kenija"
+#~ msgid "New _Contact"
+#~ msgstr "Nov _stik"
 
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
+#~ msgid "New Contact _List"
+#~ msgstr "Nov seznam _stikov"
 
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgizistan"
+#~ msgid "New _Task"
+#~ msgstr "Nova _naloga"
 
-#~ msgid "Laos"
-#~ msgstr "Laos"
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Nisem mogel preveriti strežnika POP za nova sporočila: %s."
 
-#~ msgid "Lesotho"
-#~ msgstr "Lesoto"
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Nisem mogel odpreti mape: seznam sporočil je bil nepopoln."
 
-#~ msgid "Liechtenstein"
-#~ msgstr "Liechtenstein"
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Nisem mogel dobiti sporočila: %s"
 
-#~ msgid "Macau"
-#~ msgstr "Macao"
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Nisem uspel prenesti sporočila s strežnika POP %s: %s"
 
-#~ msgid "Macedonia"
-#~ msgstr "Makedonija"
+#~ msgid ""
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
+#~ msgstr ""
+#~ "To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
+#~ "avtentifikacijo."
 
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
 
-#~ msgid "Malawi"
-#~ msgstr "Malavi"
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Nisem se mogel povezati s strežnikom: %s."
 
-#~ msgid "Malaysia"
-#~ msgstr "Malezija"
+#~ msgid ""
+#~ "Unable to connect to POP server.\n"
+#~ "Error sending username: %s"
+#~ msgstr ""
+#~ "Nisem se mogel povezati s strežnikom POP.\n"
+#~ "Napaka ob pošiljanju uporabniškega imena: %s"
 
-#~ msgid "Maldives"
-#~ msgstr "Maldivi"
+#~ msgid "(Unknown)"
+#~ msgstr "(Neznana)"
 
-#~ msgid "Mali"
-#~ msgstr "Mali"
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "Nepričakovan odgovor strežnika POP: %s"
 
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallovi otoki"
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
 
-#~ msgid "Martinique"
-#~ msgstr "Martinik"
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "Napaka v ogovoru na DATA: %s: pošta ni bila poslana"
 
-#~ msgid "Mauritania"
-#~ msgstr "Mavretanija"
+#~ 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"
 
-#~ msgid "Mauritius"
-#~ msgstr "Mauritius"
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
 
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
+#~ msgid "Needs Reply"
+#~ msgstr "Potrebuje odgovor"
 
-#~ msgid "Micronesia"
-#~ msgstr "Mikronezija"
+#~ msgid "New _Mail Message"
+#~ msgstr "Novo _poštno sporočilo"
 
-#~ msgid "Monaco"
-#~ msgstr "Monako"
+#~ msgid "Mark as Not Needing Reply"
+#~ msgstr "Označi kot ne potrebuje odgovora"
 
-#~ msgid "Mongolia"
-#~ msgstr "Mongolija"
+#~ msgid "This message contains invalid recipients:"
+#~ msgstr "To sporočilo vsebuje neveljavne prejemnike:"
 
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
+#~ msgid "_Email Address:"
+#~ msgstr "_E-poštni naslov:"
 
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
+#~ msgid "Regions"
+#~ msgstr "Območja"
 
-#~ msgid "Myanmar"
-#~ msgstr "Mjanmar"
+#~ msgid " _Remove"
+#~ msgstr " _Odstrani"
 
-#~ msgid "Namibia"
-#~ msgstr "Namibija"
+#~ msgid "Al_l stations:"
+#~ msgstr "Vse _postaje:"
 
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
+#~ msgid "All _folders:"
+#~ msgstr "Vse _mape:"
 
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
+#~ msgid "All news _feeds:"
+#~ msgstr "Vsi viri _novic:"
 
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Nizozemski Antili"
+#~ msgid "_Display folders:"
+#~ msgstr "_Kaži mape:"
 
-#~ msgid "New Caledonia"
-#~ msgstr "Nova Kaledonija"
+#~ msgid "_Display stations:"
+#~ msgstr "_Kaži postaje:"
 
-#~ msgid "Niger"
-#~ msgstr "Niger"
+#~ msgid "_Displayed feeds:"
+#~ msgstr "_Kaži novice:"
 
-#~ msgid "Nigeria"
-#~ msgstr "Nigerija"
+#~ msgid "New List"
+#~ msgstr "Nov seznam"
 
-#~ msgid "Niue"
-#~ msgstr "Niue"
+#~ msgid "New Message"
+#~ msgstr "Novo sporočilo"
 
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Severni marianski otoki"
+#~ msgid "Forward As"
+#~ msgstr "Posreduj naprej kot"
 
-#~ msgid "Palau"
-#~ msgstr "Paragvaj"
+#~ msgid "Forward _Attached"
+#~ msgstr "Posreduj _pripeto"
 
-#~ msgid "Palestinian Territory"
-#~ msgstr "Palestinsko osvobojeno ozemlje"
+#~ msgid "Forward _Inline"
+#~ msgstr "Posreduj kot _del sporočila"
 
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Nova Gvineja"
+#~ msgid "Forward _Quoted"
+#~ msgstr "Posreduj kot _citirano"
 
-#~ msgid "Philippines"
-#~ msgstr "Filipini"
+#~ msgid "Email Address:"
+#~ msgstr "E-poštni naslov:"
 
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairin"
+#~ msgid "British Virgin Islands"
+#~ msgstr "Britanski deviški otoki"
 
 #~ msgid "Republic Of Korea"
 #~ msgstr "Republika Korjea"
@@ -25238,138 +26322,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Republika Moldavija"
 
-#~ msgid "Reunion"
-#~ msgstr "Reunion???"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Ruska federacija"
-
-#~ msgid "Rwanda"
-#~ msgstr "Ruanda"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "St. Kitts in Nevis"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "St. Lucija"
-
-#~ msgid "Saint Vincent And The Grena-dines"
-#~ msgstr "St. Vincent in Grenadini"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Sao Tome in Principe"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegalija"
-
-#~ msgid "Seychelles"
-#~ msgstr "Sejšeli"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Solomonovi otoki"
-
-#~ msgid "Somalia"
-#~ msgstr "Somalija"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "Južna Georgija in Južni Sandwichovi otoki"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Šrilanka"
-
-#~ msgid "St. Helena"
-#~ msgstr "Sv. Helena"
-
-#~ msgid "St. Pierre And Miquelon"
-#~ msgstr "Sv. Pierre in Miquelon"
-
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
-
-#~ msgid "Svalbard And Jan Mayen Islands"
-#~ msgstr "Svalbardovi in Jan Mayenovi otoki"
-
-#~ msgid "Swaziland"
-#~ msgstr "Švica"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tadžikistan"
-
-#~ msgid "Thailand"
-#~ msgstr "Tajska"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Tonga"
-#~ msgstr "Tongo"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad in Tobago"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunizija"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Otočji Turks in Caicos"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "U.S. Virgin Islands"
-#~ msgstr "Ameriški deviški otoki"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Združeni arabski emirati"
-
-#~ msgid "United Republic Of Tanzania"
-#~ msgstr "Združena republika Tanzanija"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Ameriški zunajležeči otoki"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Uzbekistan"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Wallis And Futuna Islands"
-#~ msgstr "Wallisovi in Futunini otoki"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Zahodna sahara"
-
-#~ msgid "Zambia"
-#~ msgstr "Zambija"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabve"
-
 #~ msgid "Pierto Rico"
 #~ msgstr "Portoriko"
 
-#~ msgid "Co_ntacts:"
-#~ msgstr "_Stiki:"
-
 #~ msgid "_Message Recipients:"
 #~ msgstr "Prejemniki _sporočila:"
 
@@ -25426,9 +26381,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "on or before"
 #~ msgstr "na ali pred"
 
-#~ msgid "Special Folders"
-#~ msgstr "Posebne mape"
-
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Strežnik vremena ni dosegljiv</b></dd>"
 
@@ -25459,9 +26411,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
 
@@ -25632,129 +26581,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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 "<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 "<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 "<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 "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"
 
@@ -25840,27 +26666,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Elm mail"
 #~ msgstr "Poštni program Elm"
 
-#~ 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"
 
@@ -25885,37 +26696,15 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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 "%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"
 
@@ -25931,9 +26720,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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."
 
@@ -26026,9 +26812,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Help"
 #~ msgstr "Pomoč"
 
-#~ msgid "Se_nd contact to other..."
-#~ msgstr "Pošlji stik drugim..."
-
 #~ msgid "See online help"
 #~ msgstr "Glej pomoč na liniji"
 
@@ -26182,9 +26965,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "minutes before they occur."
 #~ msgstr "minut preden se zgodijo."
 
-#~ msgid "Percent complete"
-#~ msgstr "Procentov opravljeno"
-
 #~ msgid "Transparency"
 #~ msgstr "Prosojnost"
 
@@ -26215,9 +26995,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "This is a reply to a task request."
 #~ msgstr "To je odgovor na zahtevek po opravilu."
 
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
-
 #~ msgid "The information contained in this attachment was not valid"
 #~ msgstr "Podatki vsebovani v tej prilogi niso veljavni"
 
@@ -26468,15 +27245,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Component successfully deleted."
 #~ msgstr "Komponenta uspešno zbrisana."
 
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "Ne preoznam te vrste komponente koledarja."
-
 #~ msgid "Add to Calendar"
 #~ msgstr "Dodaj _koledarju"
 
-#~ msgid " Tentative "
-#~ msgstr " Poskusno "
-
 #~ msgid "Update Calendar"
 #~ msgstr "Posodobi koledar"
 
@@ -26620,9 +27391,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Cop_y to Folder... (FIXME)"
 #~ msgstr "_Kopiraj v mapo... (FIXME)"
 
-#~ msgid "Dump XML"
-#~ msgstr "Shrani kot XML"
-
 #~ msgid "Dump the UI Xml description"
 #~ msgstr "Shranio Xml opis uporabniškega vmesnika"
 
@@ -26689,9 +27457,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Add a new service to the Executive Summary"
 #~ msgstr "Dodaj novo storitev v povzetek"
 
-#~ msgid "Create a new email"
-#~ msgstr "Ustvari novo e-pošto"
-
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_Vstavi datoteko z besedilom... (FIXME)"
 
@@ -26825,9 +27590,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Advanced ..."
 #~ msgstr "Napredno ..."
 
-#~ msgid "Click here to add a contact"
-#~ msgstr "Kliknite tu za dodajo stika"
-
 #~ msgid "No such host %s."
 #~ msgstr "Ni takšnega gostitelja %s."
 
@@ -26852,12 +27614,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Mark as Read"
 #~ msgstr "Označi kot prebrano"
 
-#~ msgid "Move to Folder..."
-#~ msgstr "Prestavi v mapo..."
-
-#~ msgid "Copy to Folder..."
-#~ msgstr "Kopiraj v mapo..."
-
 #~ msgid "Do you accept?"
 #~ msgstr "Sprejemate?"
 
@@ -26936,9 +27692,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Remember my password"
 #~ msgstr "Zapomni si geslo"
 
-#~ msgid "Reply address:"
-#~ msgstr "Povratni naslov:"
-
 #~ msgid "Required"
 #~ msgstr "Potrebno"
 
@@ -27081,9 +27834,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Uredi pravilo filtra"
 
-#~ msgid "Set Flag"
-#~ msgstr "Postavi označbo"
-
 #~ msgid "matches regex"
 #~ msgstr "ustreza regularnemu izrazu"
 
@@ -27700,9 +28450,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr ""
 #~ "Ne morem inicializirati Evolucijine komponente za razpršeno shrambo."
 
-#~ msgid "Custom search"
-#~ msgstr "Iskanje po meri"
-
 #~ msgid "You have no mail sources configured"
 #~ msgstr "Nimate nastavljenih izvorov pošte"
author	Andraz Tori <minmax@src.gnome.org>	2002-02-28 07:47:44 +0800
committer	Andraz Tori <minmax@src.gnome.org>	2002-02-28 07:47:44 +0800
commit	1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795 (patch)
tree	ab2aab4d1e86d742045fb00bccf6bf770a7624cf /po
parent	e83a759e4ea8eec0615f8306cacacd620702dc2f (diff)
download	gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.gz gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.bz2 gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.lz gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.xz gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.tar.zst gsoc2013-evolution-1eedef0b8672eed0b8f5bf7bf55b3ec93e4b5795.zip