Updated Slovenian translation

svn path=/trunk/; revision=10795

1 files changed, 4779 insertions, 2878 deletions

diff --git a/po/sl.po b/po/sl.po
index 443255c094..793579697a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-05-18 11:45+0200\n"
+"POT-Creation-Date: 2001-07-03 23:49+0200\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/e-card.c:3546
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3548
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3549
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3550
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3319
+#: addressbook/backend/ebook/e-card.c:3551
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3552
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  Družinsko:     "
 
-#: addressbook/backend/ebook/e-card.c:3321
+#: addressbook/backend/ebook/e-card.c:3553
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3335
+#: addressbook/backend/ebook/e-card.c:3567
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3578
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3348
+#: addressbook/backend/ebook/e-card.c:3580
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "  Poštni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3349
+#: addressbook/backend/ebook/e-card.c:3581
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3582
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3351
+#: addressbook/backend/ebook/e-card.c:3583
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3352
+#: addressbook/backend/ebook/e-card.c:3584
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3585
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "  Poštna številka: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3586
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "  Država:      "
 
-#: addressbook/backend/ebook/e-card.c:3367
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3382
+#: addressbook/backend/ebook/e-card.c:3614
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3638
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3428
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "Poštni program: "
 
-#: addressbook/backend/ebook/e-card.c:3434
+#: addressbook/backend/ebook/e-card.c:3666
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Časovni pas: "
 
-#: addressbook/backend/ebook/e-card.c:3442
+#: addressbook/backend/ebook/e-card.c:3674
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Geografski položaj: "
 
-#: addressbook/backend/ebook/e-card.c:3446
+#: addressbook/backend/ebook/e-card.c:3678
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3458
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3459
+#: addressbook/backend/ebook/e-card.c:3691
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3460
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3461
+#: addressbook/backend/ebook/e-card.c:3693
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3462
+#: addressbook/backend/ebook/e-card.c:3694
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3463
+#: addressbook/backend/ebook/e-card.c:3695
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3467
+#: addressbook/backend/ebook/e-card.c:3699
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Kategorije: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3481
+#: addressbook/backend/ebook/e-card.c:3713
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Enoličen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3484
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "Public Key: "
@@ -299,15 +299,16 @@ msgstr ""
 "\n"
 "Javni ključ: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3978
 msgid "Multiple VCards"
 msgstr "Več eVizitk"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3986
+#, c-format
 msgid "VCard for %s"
 msgstr "eVizitka za %s"
 
-#: addressbook/backend/ebook/e-destination.c:232
+#: addressbook/backend/ebook/e-destination.c:344
 msgid "???"
 msgstr "???"
 
@@ -325,9 +326,9 @@ msgstr "Uvozi datoteke eVizitk v Evolucijo. "
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
 #: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/calendar/calendar-conduit.c:1150
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
@@ -340,13 +341,13 @@ msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naložena\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:730
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati strežnika wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
@@ -356,408 +357,403 @@ msgstr "Nisem mogel pognati programa wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
 #: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Dodaj"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "Anni_versary:"
 msgstr "Ob_letnica:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "B_usiness"
 msgstr "V sl_užbi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Business _Fax"
 msgstr "Službeni _faks"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "C_ontacts..."
 msgstr "_Stiki..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Zavedi kot:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Splošno"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "New phone type"
 msgstr "Nov tip telefona"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "No_tes:"
 msgstr "Opom_be:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Phone Types"
 msgstr "Tipi telefonov"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/e-contact-editor.c:1476
 msgid "Primary Email"
 msgstr "prvi e-naslov"
 
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "Želi dobivati _HTML e-pošto"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Web page address:"
 msgstr "Naslov spletne strani:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:84
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:100
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_Naslov..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Assistant's name:"
 msgstr "_Ime pomočnika:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Birthday:"
 msgstr "_Rojstni dan:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Business"
 msgstr "_Službeni"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_Podjetje:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:715 mail/mail-config.glade.h:85
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: mail/folder-browser.c:1237 mail/mail-config.glade.h:101
+#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Zbriši"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "O_ddelek:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Full Name..."
 msgstr "_Polno Ime..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Home"
 msgstr "_Doma"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Job title:"
 msgstr "Službeni _naziv:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Manager's Name:"
 msgstr "Ime _managerja:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "Pi_sarna:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "_Poklic:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "_Partner(ka):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_This is the mailing address"
 msgstr "_To je poštni naslov"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:663
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:688
+#: addressbook/gui/contact-editor/e-contact-editor.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Assistant"
 msgstr "Pomočnik"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1435
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Business"
 msgstr "Služba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1436
 msgid "Business 2"
 msgstr "Služba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/contact-editor/e-contact-editor.c:1437
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Business Fax"
 msgstr "Službeni faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1438
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1439
 msgid "Car"
 msgstr "Avto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1440
 msgid "Company"
 msgstr "Podjetje"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1441
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1442
 msgid "Home 2"
 msgstr "Doma 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/contact-editor/e-contact-editor.c:1443
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Home Fax"
 msgstr "Domači faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/contact-editor/e-contact-editor.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1445
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
+#: addressbook/gui/contact-editor/e-contact-editor.c:1446
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: mail/mail-config.glade.h:59
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/contact-editor/e-contact-editor.c:1448
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1449
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1450
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/contact-editor/e-contact-editor.c:1451
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1452
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1477
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Email 2"
 msgstr "E-naslov 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:681
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1478
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 3"
 msgstr "E-naslov 3"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Zbriši stik?"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Uredi celoto"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Naslov _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Preveri naslov"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Drža_va:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finska"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "ZDA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Naslov:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Poštni predal:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Država/Provinca:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Poštna številka:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Preveri polno ime"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Ssq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Ml."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Gdč."
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "G."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Ga."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ga."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "St."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Ime:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Priimek:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Drugo ime:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "P_ripona:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: addressbook/gui/component/addressbook.c:242
-msgid "As _Minicards"
-msgstr "Kot _minivizitke"
-
-#: addressbook/gui/component/addressbook.c:248
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Kot tabelo"
-
-#: addressbook/gui/component/addressbook.c:408
+#: addressbook/gui/component/addressbook.c:345
 #, c-format
 msgid "Enter password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: addressbook/gui/component/addressbook.c:436
+#: addressbook/gui/component/addressbook.c:373
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:443
+#: addressbook/gui/component/addressbook.c:380
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -766,7 +762,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:448
+#: addressbook/gui/component/addressbook.c:385
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -777,8 +773,8 @@ msgstr ""
 "Če želite v Evoluciji uporabljati LDAP, morate po tem,\n"
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
- 
-#: addressbook/gui/component/addressbook.c:456
+
+#: addressbook/gui/component/addressbook.c:393
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -786,25 +782,29 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:616 calendar/gui/gnome-cal.c:233
+#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:617
+#: addressbook/gui/component/addressbook.c:555
 msgid "Name contains"
 msgstr "Ime vsebuje"
 
-#: addressbook/gui/component/addressbook.c:618
+#: addressbook/gui/component/addressbook.c:556
 msgid "Email contains"
 msgstr "E-naslov vsebuje"
 
-#: addressbook/gui/component/addressbook.c:761
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr "Kategorija vsebuje"
+
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
 #: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
-msgstr "LDAP strežnik"
+msgstr "Strežnik LDAP"
 
 #: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
@@ -821,7 +821,7 @@ msgstr "Brez (anonimni način)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
 msgid "Password"
 msgstr "Geslo"
 
@@ -854,91 +854,91 @@ msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Bind DN Help text here"
 
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:72
 msgid "Remember this password"
 msgstr "Zapomni si geslo"
 
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:33
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:42
 msgid "Host:"
 msgstr "Gostitelj:"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:404
 msgid "FIXME Host help text here."
 msgstr "FIXME Host help text here."
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:406
 msgid "Root DN:"
 msgstr "Kornsko ime domene:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Root DN help text here."
 msgstr "FIXME Root DN help text here."
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:411
 msgid "Port:"
 msgstr "Vrata:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:412
 msgid "FIXME Port help text here."
 msgstr "FIXME Port help text here."
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:432
 msgid "Search Scope:"
 msgstr "Doseg iskanja:"
 
-#: addressbook/gui/component/addressbook-config.c:477
+#: addressbook/gui/component/addressbook-config.c:479
 msgid "Authentication:"
 msgstr "Avtentifikacija:"
 
-#: addressbook/gui/component/addressbook-config.c:499
+#: addressbook/gui/component/addressbook-config.c:501
 msgid "Advanced LDAP Options"
 msgstr "Napredne možnosti LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:520
-#: mail/mail-config.glade.h:53
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:64
 msgid "Path:"
 msgstr "Pot:"
 
-#: addressbook/gui/component/addressbook-config.c:521
+#: addressbook/gui/component/addressbook-config.c:523
 msgid "FIXME Path Help text here"
 msgstr "FIXME Path help text here"
 
-#: addressbook/gui/component/addressbook-config.c:526
+#: addressbook/gui/component/addressbook-config.c:528
 msgid "Create path if it doesn't exist."
 msgstr "Če pot ne obstaja jo ustvari."
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:662
 msgid "Edit Addressbook"
 msgstr "Uredi adresar"
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:664
 msgid "Add Addressbook"
 msgstr "Dodaj adresar"
 
-#: addressbook/gui/component/addressbook-config.c:680
+#: addressbook/gui/component/addressbook-config.c:682
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 "Izberite tip adresarja, ki ga imate in vnestite potrebne podatke o njem."
 
-#: addressbook/gui/component/addressbook-config.c:686
-#: mail/mail-config.glade.h:43
+#: addressbook/gui/component/addressbook-config.c:688
+#: mail/mail-config.glade.h:53
 msgid "Name:"
 msgstr "Ime:"
 
-#: addressbook/gui/component/addressbook-config.c:687
+#: addressbook/gui/component/addressbook-config.c:689
 msgid "FIXME Name help text here"
 msgstr "FIXME Name help text here"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:691
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
+#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Opis:"
 
-#: addressbook/gui/component/addressbook-config.c:690
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Description help text here"
 msgstr "FIXME Description help text here"
 
@@ -948,19 +948,17 @@ msgstr "Viri adresarja"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
-#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
-#: ui/evolution-task-editor-dialog.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
 msgid "Delete"
 msgstr "Zbriši"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:28
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
 msgid "Edit"
 msgstr "Uredi"
 
@@ -976,24 +974,56 @@ msgstr "URI"
 msgid "Other Contacts"
 msgstr "Drugo stiki"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Izključi poizvedbe"
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(brez)"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Vključi poizvedbe (nevarno!)"
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Izberi dejanje"
+
+#: addressbook/gui/component/e-address-popup.c:585
+msgid "Create a new contact \"%s\""
+msgstr "Ustvari nov stik \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj naslov k obstoječemu stiku \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
+msgstr "Poizvedujem v adresarju..."
 
+#: addressbook/gui/component/e-address-popup.c:916
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+#: addressbook/gui/component/select-names/e-select-names-popup.c:276
 msgid "Edit Contact Info"
 msgstr "Uredi podatke stika"
 
+#: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+#: addressbook/gui/component/select-names/e-select-names-popup.c:342
 msgid "Add to Contacts"
 msgstr "Dodaj k stikom"
 
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "Zlij E-poštne naslove"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Izključi poizvedbe"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Vključi poizvedbe (nevarno!)"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
 msgid "A Bonobo control for an address popup."
 msgstr "Kontrola Bonobo za vznik naslova."
@@ -1038,17 +1068,21 @@ msgstr "Tovarna za Evolucijino komponento adresarja."
 msgid "Factory for the sample Addressbook control"
 msgstr "Tovarna za vzorčno kontrolo adresarja"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:267 shell/e-shortcuts-view.c:470
 msgid "Remove"
 msgstr "Odstrani"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
 msgid "Remove All"
 msgstr "Odstrani vse"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "Pošlji pošto v obliki HTML?"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
@@ -1058,20 +1092,70 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Poišči..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Message Recipients"
 msgstr "Prejemniki sporočila"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Select Names"
 msgstr "Izberi imena"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
+msgstr "Izberi ime iz _mape:"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Izberi ime iz:"
+msgid "_Category:"
+msgstr "_Kategorija:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "I_skanje"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr "Vseeno dodaj"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid "Duplicate Contact Detected"
+msgstr "Zaznan podvojen stik"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+msgid "New Contact:"
+msgstr "Nov stik:"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+msgid "Original Contact:"
+msgstr "Prvotni stik:"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Ime ali e-poštni naslov tega stika že obstaja v tej mapi.\n"
+"Ga želite vseeno dodati?"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Change Anyway"
+msgstr "Vseeno spremeni"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Changed Contact:"
+msgstr "Spremenjen stik:"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Conflicting Contact:"
+msgstr "Konfliktni stik:"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Spremenjeno ime ali e-poštni naslov tega stika že\n"
+"obstaja v tej mapi. Ga želite vseeno dodati?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
 #: mail/mail-search.c:242
@@ -1188,154 +1272,172 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:525
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Shrani kot eVizitko"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Pošlji stik drugim"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Stiku pošlji sporočilo"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:588 mail/message-browser.c:199
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
+#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Natisni"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Assistant Phone"
 msgstr "Pomožni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Business Phone"
 msgstr "Službebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Home Phone"
 msgstr "Domač telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Business Address"
 msgstr "Službeni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Business Phone 2"
 msgstr "Službeni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Home Phone 2"
 msgstr "Domač telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "Other Address"
 msgstr "Drug naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:682
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:683
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Department"
 msgstr "Oddelek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:684
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:685
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:686
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Profession"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:687
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:689
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:690
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:692
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
+msgid "Done."
+msgstr "Opravljeno."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+msgid "Error removing card"
+msgstr ""
+"Napaka ob odstranjevanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1114
+msgid "Removing cards..."
+msgstr "Odstranjujem vizitke..."
+
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
 
-#: addressbook/gui/widgets/e-minicard-view.c:216
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1438,7 +1540,6 @@ msgid "Margins"
 msgstr "Robovi"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Število stolpcev:"
 
@@ -1518,35 +1619,35 @@ msgstr "Tip:"
 msgid "Width:"
 msgstr "Širina:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/calendar/calendar-conduit.c:686
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s strežnikom koledarja"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
-msgstr "Nisem mogel prebrati Pilotovega seznama za-opravit"
+msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
+#: calendar/gui/alarm-notify/alarm-queue.c:623
+#: calendar/gui/alarm-notify/alarm-queue.c:922
+#: calendar/gui/alarm-notify/alarm-queue.c:978
 msgid "Reminder of your appointment at "
 msgstr "Opomin na zmenek ob "
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify/alarm-queue.c:914
 msgid "Snooze"
 msgstr "Podaljšek spanja"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
+#: calendar/gui/alarm-notify/alarm-queue.c:927
+#: calendar/gui/alarm-notify/alarm-queue.c:982
 msgid "Ok"
 msgstr "V redu"
 
@@ -1558,7 +1659,86 @@ msgstr "Storitev opozorilnega alarma"
 msgid "Factory for the alarm notification service"
 msgstr "Tovarna za storitev opozorlinega alarma"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Obvestilo o vašem zmenku, ki se začne ob %s in konča ob %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+msgid "Notification about your appointment starting on %s"
+msgstr "Obvestilo o vašem zmenku, ki se začne ob %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Obvestilo o vašem zmenku, ki se konča ob %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+msgid "Notification about your appointment"
+msgstr "Obvestilo o vašem zmenku"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Obvestilo o vašem opravilu, ki se konča ob %s in konča ob %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Obvestilo o vašem opravilu, ki se začne ob %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Obvestilo o vašem opravilu, ki se konča ob %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+msgid "Notification about your task"
+msgstr "Obvestilo o vašem opravilu"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
+#, c-format
+msgid "Notification about your journal entry starting on %s and ending on %s"
+msgstr "Obvestilo o vašem dnevniškem vpisu, ki se začne ob %s in konča ob %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
+#, c-format
+msgid "Notification about your journal entry starting on %s"
+msgstr "Obvestilo o vašem dnevniškem vpisu, ki se začne ob %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
+#, c-format
+msgid "Notification about your journal entry ending on %s"
+msgstr "Obvestilo o vašem dnevniškem vpisu, ki se konča ob %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
+msgid "Notification about your journal entry"
+msgstr "Obvestilo o vašem dnevniškem vpisu"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarm na %A %d %b %Y ob %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
+msgid "No summary available."
+msgstr "Povzetek ni na voljo."
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution.xml.h:5
+msgid "Close"
+msgstr "Zapri"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr "Uredi zmenek"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr "Čas podaljška spanja (minut)"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
@@ -1566,135 +1746,140 @@ msgid ""
 msgstr ""
 "Ura je %s. Trenutni Unix čas je %ld. Mislili smo, da bi vas lahko zanimalo."
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Nisem mogel inicializirati GNOMEa"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+msgid "Could not initialize gnome-vfs"
+msgstr "Nisem mogel inicializirati gnome-vfs"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/calendar-commands.c:266
+#: calendar/gui/calendar-commands.c:277
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: calendar/gui/calendar-commands.c:290
+#: calendar/gui/calendar-commands.c:301
 msgid "Open calendar"
 msgstr "Odpri koledar"
 
-#: calendar/gui/calendar-commands.c:332
+#: calendar/gui/calendar-commands.c:343
 msgid "Save calendar"
 msgstr "Shrani koledar"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:545
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a "
 "in OAF-a."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:974
+#: calendar/gui/e-calendar-table.c:426
 msgid "Public"
 msgstr "javno"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
+#: calendar/gui/e-calendar-table.c:427
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
+#: calendar/gui/e-calendar-table.c:428
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:370
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "neznano"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:479
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:479
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:481
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:481
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:620
 msgid "High"
 msgstr "visoka"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
+#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:619
 msgid "Normal"
 msgstr "običajna"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:687
+#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:618
 msgid "Low"
 msgstr "nizka"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
+#: calendar/gui/e-calendar-table.c:502
 msgid "Transparent"
 msgstr "Prozorno"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
+#: calendar/gui/e-calendar-table.c:501
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:522
 msgid "Not Started"
 msgstr "ni pričeto"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:523
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:524
 msgid "Completed"
 msgstr "končano"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "preklicano"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:878
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1705,23 +1890,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:958
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "Uvrstitev mora biti 'Javno', 'Zastebno', 'Zaupno' ali 'Brez'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:976
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
+#: calendar/gui/calendar-model.c:1258 calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:500 mail/mail-account-gui.c:1295
+#: mail/mail-accounts.c:129 mail/mail-accounts.c:380
+#: mail/mail-config.glade.h:56 shell/e-shell-view.c:1397
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-dateedit.c:1369 widgets/misc/e-dateedit.c:1484
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1054
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1731,116 +1916,186 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1094
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1135
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteta mora biti 'Visoka', 'Običajna', 'Nizka' ali 'Nedefinirana'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1148
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:451
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1189
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Prosojnost mora biti 'Prozorno', 'Prosojno' ali 'Brez'."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1677
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1679
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1685
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1685
 msgid "No"
 msgstr "Ne"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Zmeneki"
+#: calendar/gui/dialogs/alarm-page.c:269
+msgid "%d days"
+msgstr "%d dni"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/dialogs/alarm-page.c:271
+msgid "1 day"
+msgstr "1 dan"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Naloge"
+#: calendar/gui/dialogs/alarm-page.c:274
+#, c-format
+msgid "%d weeks"
+msgstr "%d tednov"
+
+#: calendar/gui/dialogs/alarm-page.c:276
+msgid "1 week"
+msgstr "1 teden"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Napaka ob nalaganju koledarja</b>"
+#: calendar/gui/dialogs/alarm-page.c:279
+#, c-format
+msgid "%d hours"
+msgstr "%d ur"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Napaka ob nalaganju koledarja: <br>Postopek ni podprt"
+#: calendar/gui/dialogs/alarm-page.c:281
+msgid "1 hour"
+msgstr "1 ura"
 
-#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
-msgid "Display"
-msgstr "Prikaz"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, c-format
+msgid "%d minutes"
+msgstr "%d minut"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Kaži zmenke"
+#: calendar/gui/dialogs/alarm-page.c:286
+msgid "1 minute"
+msgstr "1 minuta"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Kaži posle"
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund"
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Stvari za opravit"
+#: calendar/gui/dialogs/alarm-page.c:291
+msgid "1 second"
+msgstr "1 sekunda"
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Nalagam koledar"
+#: calendar/gui/dialogs/alarm-page.c:316
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Play a sound"
+msgstr "Predvajaj zvok"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, ki naj ga prikaže brskalnik map"
+#: calendar/gui/dialogs/alarm-page.c:320
+msgid "Show a dialog"
+msgstr "Kaži dialog"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm na %A %d %b %Y ob %H:%M"
+#: calendar/gui/dialogs/alarm-page.c:324
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+msgid "Send an email"
+msgstr "Pošlji e-pošto"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Obvestilo o vašem zmenku na %A %d %b %Y ob %H:%M"
+#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+msgid "Run a program"
+msgstr "Poženi program"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Povzetek ni na voljo."
+#: calendar/gui/dialogs/alarm-page.c:346
+msgid " before start of appointment"
+msgstr " pred pričetkom zmenka"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Zapri"
+#: calendar/gui/dialogs/alarm-page.c:349
+msgid " after start of appointment"
+msgstr " po pričetku zmenka"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Uredi zmenek"
+#: calendar/gui/dialogs/alarm-page.c:359
+msgid " before end of appointment"
+msgstr " pred koncem zmenka"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Čas podaljška spanja (minut)"
+#: calendar/gui/dialogs/alarm-page.c:362
+msgid " after end of appointment"
+msgstr " po koncu zmenka"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
+msgstr "Osnove"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:293
+msgid "Date/Time:"
+msgstr "Datum/ura:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+msgid "Display a message"
+msgstr "Kaži sporočilo"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Options..."
+msgstr "Možnosti..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Opozorila"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Povzetek:"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "po"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "pred"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dni"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "konec zmenka"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "ur"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:103
+msgid "minute(s)"
+msgstr "minut"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "pričetek zmenka"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1871,545 +2126,641 @@ msgid "60 minutes"
 msgstr "60 minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarmi pretečejo čez"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Zvočni alarmi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Pozvoni, ko se pokažejo okna alarmov."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9 shell/e-shortcuts.c:1001
+#: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "Koledar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Nastavitve koledarja"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr "Barva za opravila, katerim je rok že pretekel"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr "Barva za opravila, ki so na vrsti danes"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Barve"
+msgid "Colors for Tasks"
+msgstr "Barve za opravila"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Skrči vikende"
+msgid "Compress weekends in month view"
+msgstr "Skrči vikende v mesečnem pogledu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Možnosti navigatorja datumov"
+msgid "Date Navigator"
+msgstr "Navigator po datumih"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Privzeto"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Pokaži možnosti"
+#: mail/mail-config.glade.h:29
+msgid "Display"
+msgstr "Prikaz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Do datuma"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Omogoči podaljšanje spanja za"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Prvi dan tedna:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "petek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Osvetli"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Predmeti z današnjim rokom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Predmeti z rokom danes:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Predmeti z rokom v prihodnosti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Predmeti z rokom v prihodnosti:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Predmeti s prekoračenim rokom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Predmeti s prekoračenim rokom:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:54
-msgid "Pick a color"
-msgstr "Izberi barvo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr "Možnosti obveščanja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioriteta"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
+msgstr "Predmeti s prekoračenim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Opomni me na vse zmenke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Opozorila"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Kaži"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Kaži čase koncev zmenkov"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Show appointment end times in week and month views"
+msgstr "Kaži čase koncev zmenkov v tedenskih in mesečnih pogledih"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Kaži številke tednov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Začetek dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "nedeljo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Naloge"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Task List"
+msgstr "Seznam nalog"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
+msgstr "Naloge z današnjim rokom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "čet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "četrtek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Čas do preteka"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Time"
+msgstr "Čas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Časovne delitve:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Oblika izpisa časa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Time zone:"
+msgstr "Časovni pas:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "torek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Vidni alarmi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Work Week"
 msgstr "Delavni teden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minut preden se zgodijo."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:88
-msgid "seconds."
-msgstr "sekund."
-
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ste prepričani, da želite zbrisati ta zmenek `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ste prepričani, želite zbrisati ta neimenovan zmenek?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ste prepričani, da želite izbrisati ta neimenovan dnevniški vpis?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Želite shraniti spremembe"
-
-#: calendar/gui/dialogs/task-editor.c:709
-msgid "Edit Task"
-msgstr "Uredi nalogo"
-
-#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
-msgid "Appointment - %s"
-msgstr "Zmenek - %s"
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Ste prepričani, da želite zbrisati %d zmenkov?"
 
-#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
-msgid "Task - %s"
-msgstr "Naloga - %s"
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Ste prepričani, da želite zbrisati %d opravil?"
 
-#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
-msgid "Journal entry - %s"
-msgstr "Vpis v dnevniku - %s"
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
 
-#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "Ni povzetka"
+#: calendar/gui/dialogs/event-editor.c:136
+msgid "Appointment"
+msgstr "Zmenek"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% konča_no:"
+#: calendar/gui/dialogs/event-editor.c:141
+msgid "Reminder"
+msgstr "Opozorilo"
+
+#: calendar/gui/dialogs/event-editor.c:146
+msgid "Recurrence"
+msgstr "Ponovitev"
+
+#: calendar/gui/dialogs/event-editor.c:151
+#: calendar/gui/dialogs/event-editor.c:223
+msgid "Meeting"
+msgstr "Srečanje"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "_Celodnevni dogodek"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:248
 msgid "Classification"
 msgstr "Uvrstitev"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Datum in ura"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Končano dne:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vatno"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Napredek"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Datum _pričetka:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "_Povzetek:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Naloga"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Zaupno"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
 msgid "_Contacts..."
 msgstr "_Stiki..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "_Čas konca:"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Čas pričetka:"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "Custom recurrence"
+msgstr "Ponovitev po meri"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Every"
+msgstr "Vsak"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Exceptions"
+msgstr "Izjeme"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Modify"
+msgstr "Spremeni"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "No recurrence"
+msgstr "Ni ponovitev"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+msgid "Preview"
+msgstr "Predogled"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "Recurrence Rule"
+msgstr "Pravilo ponovitev"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
+msgid "Simple recurrence"
+msgstr "Enostavna ponovitev"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "za"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "vseskozi"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mesec"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "do"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "tednov"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "let"
+
+#: calendar/gui/dialogs/recurrence-page.c:412 calendar/gui/print.c:1978
+#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:560
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
+
+#: calendar/gui/dialogs/recurrence-page.c:932
+msgid "on"
+msgstr "na"
+
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:81
+msgid "day"
+msgstr "dan"
+
+#: calendar/gui/dialogs/recurrence-page.c:1088
+msgid "on the"
+msgstr "na"
+
+#: calendar/gui/dialogs/recurrence-page.c:1096
+msgid "th"
+msgstr "4."
+
+#: calendar/gui/dialogs/recurrence-page.c:1266
+msgid "occurrences"
+msgstr "pojavitve"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Želite shraniti spremembe"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Končano dne:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+msgid "Delegated From:"
+msgstr "Delegirano od:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Delegated To:"
+msgstr "Delegirano komu:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+msgid "No one"
+msgstr "Nikomur"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Naloga"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% konča_no:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Napredek"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Datum _pričetka:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
 msgid "_Due Date:"
 msgstr "_Do datuma:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-page.glade.h:22
 msgid "_Priority:"
 msgstr "_Prioriteta:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-page.glade.h:23
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:247
 msgid "Categories"
 msgstr "kategorije"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:249
 msgid "Completion Date"
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:250
 msgid "End Date"
 msgstr "Datum konca"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:251
 msgid "Start Date"
 msgstr "Datum pričetka"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:252
+msgid "Due Date"
+msgstr "Do datuma"
+
+#: calendar/gui/e-calendar-table.c:253
 msgid "Geographical Position"
 msgstr "Zemljepisna lega"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:254
 msgid "Percent complete"
 msgstr "Procentov opravljeno"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:255
+msgid "Priority"
+msgstr "Prioriteta"
+
+#: calendar/gui/e-calendar-table.c:256
 msgid "Summary"
 msgstr "Povzetek"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:257
 msgid "Transparency"
 msgstr "Prosojnost"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:258
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:259
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.c:170
+#: calendar/gui/e-calendar-table.c:260
 msgid "Click here to add a task"
 msgstr "Kliknite tu za dodajo opravila"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:470
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:471
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:472
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:473
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:474
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:475
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:476
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:477
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:478
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:479
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:480
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Označi kot opravljeno"
+#: calendar/gui/e-calendar-table.c:957
+msgid "Edit this task"
+msgstr "Uredi to opravilo"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Označi nalogo kot opravljeno"
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3315 calendar/gui/e-week-view.c:3158
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
+#: ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Izreži"
+
+#: calendar/gui/e-calendar-table.c:959 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3317 calendar/gui/e-week-view.c:3160
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Uredi to opravilo..."
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-day-view.c:3290 calendar/gui/e-day-view.c:3319
+#: calendar/gui/e-week-view.c:3134 calendar/gui/e-week-view.c:3162
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
+#: ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Prilepi"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Uredi opravilo"
+#: calendar/gui/e-calendar-table.c:962
+msgid "Mark as complete"
+msgstr "Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/e-calendar-table.c:963
 msgid "Delete this task"
 msgstr "Zbriši to nalogo"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "Zbriši nalogo"
+#: calendar/gui/e-calendar-table.c:972
+msgid "Mark tasks as complete"
+msgstr "Označi opravila kot opravljena"
+
+#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
+msgid "Delete selected tasks"
+msgstr "Zbriši izbrana opravila"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:574 calendar/gui/e-week-view.c:307
+#: calendar/gui/print.c:785
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:577 calendar/gui/e-week-view.c:310
+#: calendar/gui/print.c:787
 msgid "pm"
 msgstr "pop"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1327
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
+#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1341
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nov zmenek"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3279
+#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
 msgid "New All Day Event"
 msgstr "Nov celodnevni dogodek"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3284
+#: calendar/gui/e-day-view.c:3302 calendar/gui/e-week-view.c:3146
 msgid "Go to Today"
 msgstr "Pojdi na danes"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3286
+#: calendar/gui/e-day-view.c:3304 calendar/gui/e-week-view.c:3148
 msgid "Go to Date..."
 msgstr "Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3292
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:11
+#: calendar/gui/e-day-view.c:3311 calendar/gui/e-week-view.c:3154
+#: shell/e-shortcuts-view.c:463 ui/evolution-calendar.xml.h:24
+#: ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "Odpri"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3294
+#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3156
 msgid "Delete this Appointment"
 msgstr "Zbriši ta zmenek"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3296
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Načrtuj sestanek"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3309
+#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3176
 msgid "Make this Occurrence Movable"
 msgstr "Naredi to pojavitev prestavljivo"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3311
+#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3178
 msgid "Delete this Occurrence"
 msgstr "Zbriši to pojavitev"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/e-day-view.c:3332
 msgid "Delete all Occurrences"
 msgstr "Zbriši vse pojavitve"
 
@@ -2418,73 +2769,106 @@ msgstr "Zbriši vse pojavitve"
 msgid "%02i minute divisions"
 msgstr "%02i deljenj minute"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Nisem mogel posodobiti vašege datoteeke koledarja!\n"
+#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
+msgid " (Completed "
+msgstr " (Končano "
+
+#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
+msgid "Completed "
+msgstr "končano "
+
+#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
+msgid " (Due "
+msgstr " (Rok "
+
+#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
+msgid "Due "
+msgstr "Rok"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Komponenta je bila uspešno posodobljena."
+#: calendar/gui/e-itip-control.c:613
+msgid "This is an event that can be added to your calendar."
+msgstr "To je dogodek, ki je lahko dodan vašemu koledarju."
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Napaka ob nalaganju datoteke koledarja."
+#: calendar/gui/e-itip-control.c:616
+msgid "This is a meeting request."
+msgstr "To je zahtevek po srečanju."
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Nisem mogel odpreti datoteke koledarja!\n"
+#: calendar/gui/e-itip-control.c:619
+msgid "This is one or more additions to a current meeting."
+msgstr "To so en ali več dodatkov k trenutnemu srečanju."
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Nisem mogel naložiti vašege datoteke koledarja!\n"
+#: calendar/gui/e-itip-control.c:622
+msgid "This is a request for the latest event information."
+msgstr "To je zahtevek za sveže podatke o dogodku."
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Nisem mogel prebrati datoteke vašega koledarja!\n"
+#: calendar/gui/e-itip-control.c:625
+msgid "This is a reply to a meeting request."
+msgstr "To je odgovor na zahtevek po srečanju."
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "To je odgovor nekoga, ki ni bil povabljen!"
+#: calendar/gui/e-itip-control.c:628
+msgid "This is an event cancellation."
+msgstr "To je preklic dogodka."
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Nisem mogel posodobiti vaše shrambe koledarja."
+#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:698
+msgid "The message is not understandable."
+msgstr "To sporočilo ni razumljivo."
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Nisem mogel zbriati komponente koledarja!\n"
+#: calendar/gui/e-itip-control.c:655
+msgid "This is an task that can be added to your calendar."
+msgstr "To je opravilo, ki je lahko dodano v vaš koledar."
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Komponenta uspešno zbrisana."
+#: calendar/gui/e-itip-control.c:658
+msgid "This is a task request."
+msgstr "To je zahtevek po opravilu."
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Ne preoznam te vrste komponente koledarja."
+#: calendar/gui/e-itip-control.c:661
+msgid "This is a request for the latest task information."
+msgstr "To je zahtevek za sveže podatke o opravilu."
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Dodaj _koledarju"
+#: calendar/gui/e-itip-control.c:664
+msgid "This is a reply to a task request."
+msgstr "To je odgovor na zahtevek po opravilu."
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Sprejmi "
+#: calendar/gui/e-itip-control.c:667
+msgid "This is an task cancellation."
+msgstr "To je preklic opravila."
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Zavrni "
+#: calendar/gui/e-itip-control.c:689
+msgid "This is freebusy information."
+msgstr "To je podatek o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr " Poskusno "
+#: calendar/gui/e-itip-control.c:692
+msgid "This is a request for freebusy information."
+msgstr "To je zahtevek za podatk o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Posodobi koledar"
+#: calendar/gui/e-itip-control.c:695
+msgid "This is a reply to a freebusy request."
+msgstr "To je odgovor na podatek o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Prekliči sestanek"
+#: calendar/gui/e-itip-control.c:718
+msgid "The message does not appear to be properly formed"
+msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
+
+#: calendar/gui/e-itip-control.c:737
+msgid "The message contains only unsupported requests."
+msgstr "To sporočilo vsebuje le nepodprte zahtevke"
+
+#: calendar/gui/e-itip-control.c:753
+msgid "The information contained in this attachment was not valid"
+msgstr "Podatki vsebovani v tej prilogi niso veljavni"
+
+#: calendar/gui/e-itip-control.c:869
+msgid "I couldn't update your calendar file!\n"
+msgstr "Nisem mogel posodobiti vašege datoteeke koledarja!\n"
+
+#: calendar/gui/e-itip-control.c:894
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Nisem mogel odstraniti predmeta iz vaše datoteke koledarja!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2503,22 +2887,18 @@ msgstr "Sporočilo koledarja"
 msgid "Date:"
 msgstr "Datum:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Nalagam koledar"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Nalagam koledar..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Sporočilo strežnika:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Povzetek:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "končni-datum"
@@ -2527,378 +2907,62 @@ msgstr "končni-datum"
 msgid "date-start"
 msgstr "začetni-datum"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Udeležen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Naslov udeleženca"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Udeleženi:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Prekliči\n"
-"sestanek"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Stol"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Povabila na sestanek"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Ne-sodelujoči"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Možni sodelujoči"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizator: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Objavi\n"
-"dogodek"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Zahtevaj\n"
-"sestanek"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "Potrebni udeleženci"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Vloga"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Načrtuj\n"
-"čas"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1081
-msgid "Status"
-msgstr "Stanje"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:555
 msgid "All"
 msgstr "Vse"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:191
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:330
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel naložiti poslov v `%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:342
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "Uredi zmenek"
-
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr "na"
-
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dan"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
-msgstr "na"
-
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
-msgstr "pojavitve"
-
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
-
-#: calendar/gui/event-editor.c:1543
-#, c-format
-msgid " %d days"
-msgstr " %d dni"
-
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr " 1 dan"
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr " %d tedenov"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr " 1 teden"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d hours"
-msgstr " %d ur"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr " 1 ura"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr " %d minut"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr " 1 minuta"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekund"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 second"
-msgstr " 1 sekunda"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1588
-msgid "Play a sound"
-msgstr "Predvajaj zvok"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1591
-msgid "Show a dialog"
-msgstr "Kaži dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1594
-msgid "Send an email"
-msgstr "Pošlji e-pošto"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "Poženi program"
-
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr " pred pričetkom zmenka"
-
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr " po pričetku zmenka"
-
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
-msgstr " pred koncem zmenka"
-
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
-msgstr " po koncu zmenka"
-
-#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Celodnevni dogodek"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Zmenek"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Osnove zmenkov"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Ponovitev po meri"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Vsak"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Izjeme"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Spremeni"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Ni ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Predogled"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Pravilo ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Opozorilo"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Nastavitve..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Enostavna ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "_Čas konca:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Čas pričetka:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Datum _pričetka:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "po"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "pred"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dni"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "konec zmenka"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "za"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "vseskozi"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "ur"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
-msgid "minute(s)"
-msgstr "minut"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mesec"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "pričetek zmenka"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "do"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "tednov"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "let"
-
-#: calendar/gui/e-week-view.c:3277 calendar/gui/e-week-view.c:3300
+#: calendar/gui/e-week-view.c:3139 calendar/gui/e-week-view.c:3167
 msgid "New Appointment..."
 msgstr "Nov zmenek..."
 
-#: calendar/gui/e-week-view.c:3313
+#: calendar/gui/e-week-view.c:3180
 msgid "Delete All Occurrences"
 msgstr "Zbriši vse pojavitve"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1586
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:234
+#: calendar/gui/gnome-cal.c:219
 msgid "Summary contains"
 msgstr "Povzetek vsebuje"
 
-#: calendar/gui/gnome-cal.c:235
+#: calendar/gui/gnome-cal.c:220
 msgid "Description contains"
 msgstr "Opis vsebuje"
 
-#: calendar/gui/gnome-cal.c:236
+#: calendar/gui/gnome-cal.c:221
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: calendar/gui/gnome-cal.c:237
+#: calendar/gui/gnome-cal.c:222
 msgid "Has category"
 msgstr "Ima kategorijo"
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:1054
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1065
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
@@ -2991,196 +3055,211 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:457
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:516
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:516
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:516
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:516
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:517
 msgid "Th"
 msgstr "če"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:517
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:517
 msgid "Sa"
 msgstr "so"
 
+#: calendar/gui/print.c:1847 shell/e-shortcuts.c:1002
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Naloge"
+
 #. Day
-#: calendar/gui/print.c:1078
+#: calendar/gui/print.c:1954
 msgid "Current day (%a %b %d %Y)"
 msgstr "Trenuten dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1974
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1985
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Trenutni teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1993
 msgid "Current month (%b %Y)"
 msgstr "Trenutni mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
+#: calendar/gui/print.c:2000
 msgid "Current year (%Y)"
 msgstr "Trenutno leto (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2321
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1447
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
+#: mail/mail-callbacks.c:1781 my-evolution/e-summary.c:452
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2438
+msgid "Print Item"
+msgstr "Natisni predmet"
+
+#: calendar/gui/print.c:2519
+msgid "Print Setup"
+msgstr "Nastavitev tiskanja"
+
+#: calendar/gui/tasks-control.c:122
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape poslov, ki naj se kaže"
 
@@ -3274,48 +3353,50 @@ msgstr "time-day-end pričakuje, da je 1. argument time_t"
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:472
+#: calendar/pcs/query.c:485
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:477
+#: calendar/pcs/query.c:490
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:484
+#: calendar/pcs/query.c:497
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 2. argument time_t"
 
-#: calendar/pcs/query.c:611
+#: calendar/pcs/query.c:627
 msgid "contains? expects 2 arguments"
 msgstr "contains? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:616
+#: calendar/pcs/query.c:632
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:623
+#: calendar/pcs/query.c:639
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? pričakuje, da je 2. argument niz"
 
-#: calendar/pcs/query.c:640
+#: calendar/pcs/query.c:656
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
-"contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary\" (povzetek), \"description\"(opis)"
+"contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
+"\" (povzetek), \"description\"(opis)"
 
-#: calendar/pcs/query.c:678
+#: calendar/pcs/query.c:694
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? pričakuje vsaj 1 argument"
 
-#: calendar/pcs/query.c:684
+#: calendar/pcs/query.c:700
 msgid "has-categories? expects all arguments to be strings"
 msgstr "has-categories? pričakuje, da so vsi argumenti nizi"
 
-#: calendar/pcs/query.c:932
+#: calendar/pcs/query.c:948
 msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr "Izračun iskalnega izraza ni podal vrednosti resnično/neresnično (boolean)"
+msgstr ""
+"Izračun iskalnega izraza ni podal vrednosti resnično/neresnično (boolean)"
 
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
@@ -3337,65 +3418,65 @@ msgstr "Šifriranje v tem šifrirniku ni podprto"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifriranje v tem šifrirniku ni podprto"
 
-#: camel/camel-disco-store.c:271
+#: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "Za dokončanje te operacije morate delati z mrežo"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:635
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti čakalne mape"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:644
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati čakalne mape"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:658
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
 #, c-format
-msgid "Failed message %d"
-msgstr "Nauspelo sporočilo %s"
+msgid "Failed on message %d"
+msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:663
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporočila"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
 msgid "Complete"
 msgstr "Končano"
 
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:753
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:876
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:882
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
@@ -3432,13 +3513,12 @@ msgid "Invalid type in body-contains, expecting string"
 msgstr "Neveljaven tip v body-contains, pričakovan niz"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3455,61 +3535,56 @@ msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nisem mogel preverti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:118
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:126
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nisem mogel odpreti začasne poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Nisem mogel preveriti ključavnične datoteke %s: %s"
-
-#: camel/camel-movemail.c:245
+#: camel/camel-movemail.c:151
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Napaka ob branju poštne datoteke: %s"
 
-#: camel/camel-movemail.c:256
+#: camel/camel-movemail.c:162
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Napaka ob pisanju v začasno poštno datoteko: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:181
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:211
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:223
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:262
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:492
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
@@ -3595,7 +3670,7 @@ msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
@@ -3606,7 +3681,7 @@ msgstr "(neznan gostitelj)"
 
 #: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
 #: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
@@ -3722,7 +3797,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:433
+#: camel/providers/imap/camel-imap-store.c:438
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -3800,61 +3875,46 @@ msgstr ""
 "Nisem mogel ustvariti imenika %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:194
+#: camel/camel-smime-context.c:173
+#, c-format
 msgid "Please enter your password for %s"
 msgstr "Prosim vpišite svoje geslo za %s"
 
-#: camel/camel-smime-context.c:210
-msgid "Error hashing password."
-msgstr "Napaka ob razprševanju gesla."
-
-#: camel/camel-smime-context.c:219
-msgid "Invalid password."
-msgstr "Neveljavno geslo.7"
-
-#: camel/camel-smime-context.c:327
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Nisem mogel podpisati: certifikat za \"%s\" ni bil najden."
-
-#: camel/camel-smime-context.c:343
-msgid "Could not sign: failed to create content info."
-msgstr "Nisem mogel podpisati: nisem uspel ustvariti podatkov o vsebini."
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr "Prosim navedite vzdevek certifikata s katerim se želite podpisati."
 
-#: camel/camel-smime-context.c:350
-msgid "Could not sign: failed to create signing context."
-msgstr "Nisem mogel podpisati: nisem uspel ustvariti podpisovalnega konteksta"
-
-#: camel/camel-smime-context.c:356
-msgid "Could not sign: failed to create signature."
-msgstr "Nisem mogel podpisati: nisem uspel ustvariti podpisa"
-
-#: camel/camel-smime-context.c:383
-msgid "'clearsign' is not supported by S/MIME."
-msgstr "'čisto podpisovanje' v S/MIME ni podprto."
+#: camel/camel-smime-context.c:209
+#, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Podpisni certifikat za \"%s\" ne obstaja."
 
-#: camel/camel-smime-context.c:528
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Nisem mogel šifrirati: nisem uspel ustvariti podatkovne ovojnice."
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Šifrirni certifikat za \"%s\" ne obstaja."
 
-#: camel/camel-smime-context.c:535
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Nisem mogel šifrirati: nisem uspel ustvariti konteksta šifriranja"
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Nisem mogel najti certifikata za \"%s\"."
 
-#: camel/camel-smime-context.c:570
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Nisem mogel šifrirati podatkov: neveljaven ključ uporabnika \"%s\"."
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr "Nisem mogel najti skupnega algoritma."
 
-#: camel/camel-smime-context.c:576
-msgid "Could not encrypt: encoding failed."
-msgstr "Nisem mogel šifirirati: enkodiranje ni uspelo."
+#: camel/camel-smime-context.c:799
+msgid "Failed to decode message."
+msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/camel-smime-context.c:626
-msgid "Failed to decrypt: Unknown"
-msgstr "Nisem uspel dešifirati: vzrok neznan"
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr "Nisem mogel preveriti certifikatov."
 
 #. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
+#: camel/camel-store.c:378 mail/mail-ops.c:971 mail/mail-ops.c:978
+#: mail/mail-ops.c:996 mail/mail-ops.c:997
 msgid "Trash"
 msgstr "Smeti"
 
@@ -3921,64 +3981,67 @@ msgstr "Ni takšnega sporočila: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Ne morete kopirati sporočil iz te mape smeti."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
 
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "Odgovor strežnika se je prehitro končal."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:489
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "odgovor IMAP strežnika ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:526
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan OK odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:364
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
+
+#: camel/providers/imap/camel-imap-folder.c:430
 msgid "Scanning IMAP folder"
 msgstr "Pregledujem mapo IMAP"
 
-#: camel/providers/imap/camel-imap-folder.c:1047
-#: camel/providers/imap/camel-imap-folder.c:1281
+#: camel/providers/imap/camel-imap-folder.c:1483
+#: camel/providers/imap/camel-imap-folder.c:1763
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1075
-#: camel/providers/imap/camel-imap-folder.c:1314
+#: camel/providers/imap/camel-imap-folder.c:1796
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
 msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
 
@@ -3986,7 +4049,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:552
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
 msgid "Folders"
 msgstr "Mape"
 
@@ -4018,28 +4081,28 @@ msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Strežnik IMAP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:466
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:471
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/imap/camel-imap-store.c:495
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpišite geslo IMAP za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:505
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:411
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:531
+#: camel/providers/imap/camel-imap-store.c:536
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4050,35 +4113,43 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
+#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Poštni imeniki tipa MH"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Za shranjevanje krajevne pošte v imenikih tipa MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Običajna Unix datoteka poštnega predala"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Za shranjevanje krajevne pošte v datoteki tipa mbox"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Poštne datoteke tipa Qmail"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Za shranjevanje krajevne pošte v imenikih tipa qmail"
 
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr "Poštne datoteke tipa mbox spool"
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Za shranjevanje krajevne pošte v običajnih Unix spool imenikih"
+
 #: camel/providers/local/camel-local-store.c:127
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -4123,20 +4194,18 @@ msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo tipa maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4145,18 +4214,18 @@ msgstr ""
 "Ne morem dobiti sporočila: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
 msgid "No such message"
 msgstr "Ni takšnega sporočila"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:101
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4166,14 +4235,14 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:105
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:112
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4183,22 +4252,27 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:127
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ni imenik tipa maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:156
+#: camel/providers/local/camel-maildir-store.c:193
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisem mogel zbrisati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:157
 msgid "not a maildir directory"
 msgstr "ni imenik tipa maildir"
 
+#: camel/providers/local/camel-maildir-store.c:267
+#, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr "Nisem mogel prebrati mape `%s': %s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4220,9 +4294,9 @@ msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne morem pripeti sporočila k datoteki tipa mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4231,11 +4305,11 @@ msgstr ""
 "Ne morem dobiti sporočila: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
 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:381
+#: camel/providers/local/camel-mbox-folder.c:384
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
@@ -4300,7 +4374,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne morem narediti povzetka mape %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1445
 msgid "Synchronising folder"
 msgstr "Uskljajujem mapo %s"
 
@@ -4353,8 +4427,7 @@ msgstr "Nisem mogel preimenovati mape: %s"
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo tipa mh: %s: %s"
@@ -4374,19 +4447,19 @@ msgstr "Ne morem odpreti poštnega imenika MH: %s: %s"
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Prosim vpišite geslo NNTP za %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Strežnik je zavrnil uporabniško ime"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Nisem uspel poslati uporabniškega imena strežniku"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Strežnik je zavrnil uporabniško ime/geslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Sporočilo %s ni bilo najdeno."
@@ -4395,13 +4468,13 @@ msgstr "Sporočilo %s ni bilo najdeno."
 msgid "Could not get group list from server."
 msgstr "Nisem mogel dobiti seznama skupin s strežnika."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
@@ -4431,8 +4504,8 @@ msgid ""
 msgstr ""
 "Ta možnost se bo avtentificirala pri strežniku NNTP z nešifriranim geslom."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:323
+#: camel/providers/nntp/camel-nntp-store.c:485
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
@@ -4483,7 +4556,7 @@ msgstr "Pusti sporočila na strežniku"
 msgid "Delete after %s day(s)"
 msgstr "Zbriši po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
 msgid "POP"
 msgstr "POP"
 
@@ -4578,7 +4651,7 @@ msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:81
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -4632,7 +4705,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:74
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4642,122 +4715,122 @@ msgstr ""
 "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaktična napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaktična napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Stanje sistema ali odgvor na pomoč"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Sporčilo pomoči"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Uporabnik ni krajeven; bom posredoval na <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Zahtevano poštno dejanje ni bilo izvedeno: poštni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Zahtevano dejanje ni bilo izvedeno: poštni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Zahtevano dejanje ni bilo izvedeno: premalo prostora na disku"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Zahtevano dejanje preklicano: prekoračena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Zahtevano dejanje ni bilo izvedeno: ime poštnega predala ni dovoljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Začni z vpisom pošte; končaj z <ENTER>.<ENTER>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizem avtentifikacije je prešibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Za zahtevan mehanizem avtentifikacije je potrebno šifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Začasna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Napaka pri pozdravu: %s: morda ni usodna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:396
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsim vpišite geslo SMTP za %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:419
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4768,238 +4841,212 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:535
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:537
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:562
 msgid "Cannot send message: sender address not defined."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:569
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:696
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:744
+#: camel/providers/smtp/camel-smtp-transport.c:756
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:765
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:836
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:855
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na MAIL FROM: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek RCPT TO je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:899
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:930
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek DATA je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:984
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zahtevek DATA je prekoračil časovno omejitev: konec sporočila: %s: pošta ni "
 "bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1003
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: konec sporočila: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1027
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1046
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Napaka v odgovoru na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:122
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Priloži datoteko"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
-#: mail/message-list.c:1081
-msgid "Attachment"
-msgstr "Priloga"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Lastnosti priloge"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Ime datoteke:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Priloga kot del sporočila"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tip MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Pošlji kot:"
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer.c:546
+#: composer/e-msg-composer.c:667
 #, c-format
 msgid ""
-"This version of Evolution was not built with support for S/MIME.\n"
-"You may wish to instead use PGP to %s your document."
+"Could not open file %s:\n"
+"%s"
 msgstr ""
-"Ta različica Evolucije ni bila zgrajena s podporo za S/MIME.\n"
-"Morda želite uporabiti PGP za %s vašega dokumenta."
-
-#: composer/e-msg-composer.c:548
-msgid "sign and encrypt"
-msgstr "podpis in šifriranje"
-
-#: composer/e-msg-composer.c:549
-msgid "sign"
-msgstr "podpis"
-
-#: composer/e-msg-composer.c:549
-msgid "encrypt"
-msgstr "šifriranje"
+"Nisem mogel odpreti datoteke: %s:\n"
+"%s"
 
-#: composer/e-msg-composer.c:601
+#: composer/e-msg-composer.c:680
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Error while reading file %s:\n"
 "%s"
 msgstr ""
-"Nisem mogel odpreti datoteke s podpisom %s:\n"
+"Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:876
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:896
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:877
+#: composer/e-msg-composer.c:967
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5007,12 +5054,47 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: composer/e-msg-composer.c:935 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:224
+#: composer/e-msg-composer.c:1015
+#, c-format
+msgid "Error opening file: %s"
+msgstr "Napaka ob odpiranju datoteke: %s"
+
+#: composer/e-msg-composer.c:1023
+msgid "Unable to retrieve message from editor"
+msgstr "Od urejevalnika nisem uspel dobiti sporočila"
+
+#: composer/e-msg-composer.c:1029
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Nisem mogel odsekati datoteke: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1038
+#, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Napaka ob samodejnem shranjevanju sporočila: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1103
+msgid ""
+"Evolution has detected an editor buffer from a previous session.\n"
+"Would you like to recover this buffer?"
+msgstr ""
+"Evolucija je zaznala medpomnilnik urejevalnika iz prejšnje seje.\n"
+"Želite znova uporabiti ta medpomnilnik?"
+
+#: composer/e-msg-composer.c:1228 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:231
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:1234
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5022,92 +5104,68 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:1259
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1092
-msgid "That file does not exist."
-msgstr "Datoteka ne obstaja."
-
-#: composer/e-msg-composer.c:1102
-msgid "That is not a regular file."
-msgstr "To ni običajna datoteka."
-
-#: composer/e-msg-composer.c:1112
-msgid "That file exists but is not readable."
-msgstr "Ta datoteka obstaja a ni berljiva."
+#: composer/e-msg-composer.c:1408
+msgid "Insert File"
+msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:1122
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Datoteka se je zdela dostopna a open(2) ni uspel."
-
-#: composer/e-msg-composer.c:1144
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Datoteka je zelo velika (čez 100K).\n"
-"Ste prepričani,da jo želite vstaviti?"
-
-#: composer/e-msg-composer.c:1165
-msgid "An error occurred while reading the file."
-msgstr "Ob branju datoteke se je zgodila napaka."
-
-#: composer/e-msg-composer.c:1526 composer/e-msg-composer.c:1871
+#: composer/e-msg-composer.c:1765 composer/e-msg-composer.c:2138
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:1962
+#: composer/e-msg-composer.c:2232
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:325
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354
+#: composer/e-msg-composer-hdrs.c:356
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360
+#: composer/e-msg-composer-hdrs.c:362
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371
+#: composer/e-msg-composer-hdrs.c:373
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:387
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: 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:389
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: 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:393
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: 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."
@@ -5115,7 +5173,7 @@ msgstr ""
 "Vnesite naslove, ki bodo prejeli karbonske kopije sporočila, a  se ne bodo "
 "pojavili v seznamu prejemnikov sporočila."
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -5123,7 +5181,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
 "identitet v komponenti pošte."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega skladatelja."
 
@@ -5140,36 +5198,40 @@ msgid "calendar information"
 msgstr "podatki o kodledarju"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:312
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:304
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
+#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
+#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
+#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+msgid "%H:%M"
+msgstr "%H:%M"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:258
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5177,212 +5239,16 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:263
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:272
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
-
-#: executive-summary/component/e-summary.c:926
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti HTML datoteke:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:940
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Napaka ob branju podatkov:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr "Datoteka nima mesta za storitve.\n"
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Izberi storitev"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
-"\n"
-"Pustite pravno za privzete nastavitve"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Odpri %s s privzetim GNOMEovim programom"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Pošlji e-pošto %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Spremeni pogled na %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Poženi %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Zapri %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Premakni %s na levo"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Premakni %s na desno"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Premakni %s v prešnjo vrstico"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Premakni %s v naslednjo vrstico"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Nastavi %s"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Videz"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Ozadje:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
-"Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
-"da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Tovarna za Evolucijine komponente za povzetke."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Tovarna za povzetke RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Povzetek RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Tovarna za preizkusno komponento bonobo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Tovarna za preizkusno komponento."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Preizkusi storitev bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Preizkusi storitev"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Napaka"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Samodejno posodobi"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Posodobi sedaj"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Posodobi vsakih"
-
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minut"
-
 #: filter/filter-datespec.c:78
 msgid "year"
 msgstr "leto"
@@ -5423,6 +5289,10 @@ msgstr "ur"
 msgid "minute"
 msgstr "minuta"
 
+#: filter/filter-datespec.c:83
+msgid "minutes"
+msgstr "minut"
+
 #: filter/filter-datespec.c:84
 msgid "second"
 msgstr "sekunda"
@@ -5514,8 +5384,8 @@ msgstr ""
 "Opa, pozabili ste izbrati mapo.\n"
 "Prosim pojdite nazaj in navedite veljavno mapo kamor naj se pošta dostavi."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
+#: mail/mail-account-gui.c:701
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
@@ -5608,11 +5478,11 @@ msgstr "če je zadoščeno kateremukoli pogoju"
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:769
 msgid "incoming"
 msgstr "dohodna"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:769
 msgid "outgoing"
 msgstr "odhodna"
 
@@ -5765,11 +5635,11 @@ msgid "Replied to"
 msgstr "Odgovorjeno na"
 
 #: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1081
+#: mail/message-list.etspec.h:6
 msgid "Score"
 msgstr "Točke"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1049
 msgid "Sender"
 msgstr "Pošiljatelj"
 
@@ -5778,34 +5648,43 @@ msgid "Set Status"
 msgstr "Nastavi stanje"
 
 #: filter/libfilter-i18n.h:45
+msgid "Size (kB)"
+msgstr "Velikost (kB)"
+
+#: filter/libfilter-i18n.h:46
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:50 mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Stanje"
+
+#: filter/libfilter-i18n.h:51
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:767 mail/message-list.c:1082
+#: filter/libfilter-i18n.h:52 mail/mail-format.c:776
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "was before"
 msgstr "je bilo pred"
 
@@ -5825,27 +5704,29 @@ msgstr "Uredi pravilo"
 msgid "Score Rules"
 msgstr "Točke pravil"
 
-#: importers/elm-importer.c:512 importers/netscape-importer.c:780
-#: importers/pine-importer.c:646 shell/e-shell-importer.c:655
-#: shell/importer/import.glade.h:4
+#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:224
+#: importers/netscape-importer.c:769 importers/pine-importer.c:638
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Uvozi"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:506 importers/netscape-importer.c:774
+#: importers/pine-importer.c:643
 msgid "Mail"
 msgstr "Pošta"
 
-#: importers/elm-importer.c:521
+#: importers/elm-importer.c:510
 msgid "Elm Aliases"
 msgstr "Vzdevki programa Elm"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:807
-#: importers/pine-importer.c:668
+#: importers/elm-importer.c:517 importers/evolution-gnomecard-importer.c:236
+#: importers/netscape-importer.c:796 importers/pine-importer.c:660
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Ne sprašuj me več"
 
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:550
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5857,19 +5738,31 @@ msgstr ""
 msgid "Elm mail"
 msgstr "Poštni program Elm"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
+msgid "Addressbook"
+msgstr "Adresar"
+
+#: importers/evolution-gnomecard-importer.c:261
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolucija je našla datoteke GnomeCard-a.\n"
+"Jih želite uvoziti v Evolucijo?"
+
+#: importers/netscape-importer.c:779 importers/pine-importer.c:648
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1359
+#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1693
 msgid "Filters"
 msgstr "Filtri"
 
-#: importers/netscape-importer.c:800
+#: importers/netscape-importer.c:789
 msgid "Addressbooks"
 msgstr "Adresarji"
 
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:836
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5877,11 +5770,7 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Netscape.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:661
-msgid "Addressbook"
-msgstr "Adresar"
-
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:697
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5889,141 +5778,148 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Pine.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:725
 msgid "Pine mail"
 msgstr "Poštni program Pine"
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:666
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:410
+#: mail/component-factory.c:800
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser.c:329
+#: mail/folder-browser.c:211 mail/mail-display.c:268
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nisem mogel ustvariti začasnega imenika: %s"
+
+#: mail/folder-browser.c:830
 msgid "Store search as vFolder"
 msgstr "Shrani iskanje kot vMapo"
 
-#: mail/folder-browser.c:653
+#: mail/folder-browser.c:1173
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:1176
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:659
+#: mail/folder-browser.c:1179
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:662
+#: mail/folder-browser.c:1182
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:1188
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:1191
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:1194
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:677
+#: mail/folder-browser.c:1197
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:1206
 msgid "_Open"
 msgstr "_Odpri"
 
-#: mail/folder-browser.c:688
+#: mail/folder-browser.c:1208
 msgid "Resend"
 msgstr "Znova pošlji"
 
-#: mail/folder-browser.c:690 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1210 ui/evolution-calendar.xml.h:54
+#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:692 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1212 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:697 ui/evolution-mail.xml.h:117
+#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:699 ui/evolution-mail.xml.h:72
+#: mail/folder-browser.c:1219 ui/evolution-mail-message.xml.h:61
+msgid "Reply to _List"
+msgstr "Odgovori na _seznam"
+
+#: mail/folder-browser.c:1221 ui/evolution-mail-message.xml.h:60
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:701
+#: mail/folder-browser.c:1223
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:1226
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:706
+#: mail/folder-browser.c:1228
 msgid "Mark as U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:711
+#: mail/folder-browser.c:1233
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:1235
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:717 ui/evolution-mail.xml.h:121
+#: mail/folder-browser.c:1239 ui/evolution-mail-message.xml.h:87
 msgid "_Undelete"
 msgstr "_Odbriši"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:727
+#: mail/folder-browser.c:1244
+msgid "Add Sender to Address Book"
+msgstr "Pošiljatelja dodaj v adresar"
+
+#: mail/folder-browser.c:1249
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:1253
 msgid "Create Ru_le From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:870
+#: mail/folder-browser.c:1392
 msgid "Filter on Mailing List"
 msgstr "Filter glede na Poštni seznam"
 
-#: mail/folder-browser.c:871
+#: mail/folder-browser.c:1393
 msgid "VFolder on Mailing List"
 msgstr "vMapa glede na Poštni seznam"
 
-#: mail/folder-browser.c:873
+#: mail/folder-browser.c:1395
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Poštni seznam (%s)"
 
-#: mail/folder-browser.c:874
+#: mail/folder-browser.c:1396
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na Poštni seznam (%s)"
 
-#: mail/folder-browser-factory.c:196
+#: mail/folder-browser-ui.c:252
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:254
 msgid "Properties"
 msgstr "Lastnosti"
 
@@ -6118,32 +6014,46 @@ msgid "You have not filled in all of the required information."
 msgstr "Niste vpisali vseh potrebnih podatkov."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor.c:154
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:891
+msgid "Save signature"
+msgstr "Shrani podpis"
+
+#: mail/mail-account-gui.c:897
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Podpis je bil spremenjen, a ni bil shranjen.\n"
+"\n"
+"Želite shraniti spremembe?"
+
+#: mail/mail-accounts.c:130
 msgid " (default)"
 msgstr " (privzeto)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:169
 msgid "Disable"
 msgstr "Izključi"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
 msgid "Enable"
 msgstr "Vključi"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepričani, da želite zbrisati ta račun?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:568
+#: mail/mail-accounts.c:697
 msgid "Evolution Account Manager"
 msgstr "Upravljalnik Evolucijinih računov"
 
@@ -6171,7 +6081,7 @@ msgstr "%s poštnih seznamov"
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6183,7 +6093,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6191,7 +6101,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6199,11 +6109,11 @@ msgstr ""
 "Nastaviti morate način prenosa pošte\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Niste nastavili postopka prenašanja pošte"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6211,37 +6121,49 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"To sporočilo vsebuje le prejemnike bcc.\n"
+"Možno je, da poštni strežnik razkrije prejemnike z dodatkom glave "
+"Apparenlty-To (Očitno-za).\n"
+"Vseeno pošlji?"
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 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:594
+#: mail/mail-callbacks.c:655
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Na %s, je %s zapisal(a):"
 
-#: mail/mail-callbacks.c:756
+#: mail/mail-callbacks.c:874
 msgid "Forwarded message:\n"
 msgstr "Posredovano sporočilo:\n"
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:968
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:852
+#: mail/mail-callbacks.c:970
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1017
+#: mail/mail-callbacks.c:1325
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ste prepričani, da želite urediti vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:1039
+#: mail/mail-callbacks.c:1347
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6249,7 +6171,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1073
+#: mail/mail-callbacks.c:1381
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6257,19 +6179,20 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1085
+#: mail/mail-callbacks.c:1393
+#, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:1106
+#: mail/mail-callbacks.c:1414
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:1140 mail/mail-display.c:92
+#: mail/mail-callbacks.c:1448 mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
-#: mail/mail-callbacks.c:1144 mail/mail-display.c:96
+#: mail/mail-callbacks.c:1452 mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6277,15 +6200,15 @@ msgstr ""
 "Datoteka z enakim imenom že obstaja.\n"
 "Naj jo prepišem?"
 
-#: mail/mail-callbacks.c:1188
+#: mail/mail-callbacks.c:1496
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:1190
+#: mail/mail-callbacks.c:1498
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1683
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6294,20 +6217,20 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1741
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:1454
+#: mail/mail-callbacks.c:1788
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:1549
+#: mail/mail-callbacks.c:1883
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
 
-#: mail/mail-config.c:1213 mail/mail-config.c:1216
+#: mail/mail-config.c:1561 mail/mail-config.c:1564
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
@@ -6384,26 +6307,42 @@ msgid "Accounts"
 msgstr "Računi"
 
 #: mail/mail-config.glade.h:8
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
+
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
+
+#: mail/mail-config.glade.h:10
 msgid "Always load images off the net"
 msgstr "Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Priloga"
+
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Način avtentifikacije: "
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "Automatically check for new mail every"
 msgstr "Samodejno preveri za novo pošto vsakih"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
+msgid "Certificate ID:"
+msgstr "ID certifikata:"
+
+#: mail/mail-config.glade.h:17
 msgid "Composer"
 msgstr "Skladatelj"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:18
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6419,191 +6358,244 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:24
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "Default \"Forward\" style is: "
 msgstr "Privzet način \"Posreduj naprej\" je: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
+msgid "Default character set: "
+msgstr "Privzet nabor znakov: "
+
+#: mail/mail-config.glade.h:28
+msgid "Digital IDs..."
+msgstr "Digitalni IDji..."
+
+#: mail/mail-config.glade.h:30
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:32
 msgid "Drafts folder:"
 msgstr "Mapa osnutkov:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Uredi..."
+
+#: mail/mail-config.glade.h:35
 msgid "Email Address:"
 msgstr "E-poštni naslov:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
+msgid "Empty trash folders on exit"
+msgstr "Ob izhodu sprazni mapo smeti"
+
+#: mail/mail-config.glade.h:38
 msgid "Full Name:"
 msgstr "Polno ime:"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:39
+msgid "Get Digital ID..."
+msgstr "Dobi digitalni ID..."
+
+#: mail/mail-config.glade.h:40
+msgid "HTML Signature:"
+msgstr "Podpis HTML:"
+
+#: mail/mail-config.glade.h:41
 msgid "Highlight citations with"
 msgstr "Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:43
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:44
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:45
 msgid "In HTML mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:46
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:48
 msgid "Load images if sender is in addressbook"
 msgstr "Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:49
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:50
 msgid "Make this my default account"
 msgstr "Naj bo to moj privzet račun"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:51
 msgid "Mark messages as \"Read\" after:"
 msgstr "Označi sporočila kot \"Prebrana\" po:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:52
+msgid "NNTP Server:"
+msgstr "Strežnik NNTP"
+
+#: mail/mail-config.glade.h:54
 msgid "Never load images off the net"
 msgstr "Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:55
 msgid "News"
 msgstr "Novice"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:57
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:58
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: mail/mail-config.glade.h:49
-msgid "PGP"
-msgstr "PGP"
+#: mail/mail-config.glade.h:60
+msgid "PGP Key ID:"
+msgstr "ID ključa PGP:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:61
 msgid "PGP binary path:"
 msgstr "Pot do izvršljive datoteke PGP"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:65
+msgid "Pick a color"
+msgstr "Izberi barvo"
+
+#: mail/mail-config.glade.h:66
+msgid "Pretty Good Privacy"
+msgstr "Pretty Good Privac (precej dobra zasebnost)"
+
+#: mail/mail-config.glade.h:67
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:68
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:69
 msgid "Receiving Email"
 msgstr "Sprejemanje e-pošte"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:70
 msgid "Receiving Mail"
 msgstr "Sprejemam pošto"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:71
 msgid "Receiving Options"
 msgstr "Sprejemam možnosti"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:73
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:75
+msgid "Secure MIME"
+msgstr "Varni MIME"
+
+#: mail/mail-config.glade.h:76
+msgid "Security"
+msgstr "Varnost"
+
+#: mail/mail-config.glade.h:77
 msgid "Select PGP binary"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:78
 msgid "Send mail in HTML format by default."
 msgstr "Privzeto pošlji pošto v HTML obliki."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:79
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:80
 msgid "Sending Mail"
 msgstr "Pošiljam pošto"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:82
 msgid "Sent"
 msgstr "Poslano"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:83
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:84
 msgid "Sent messages folder:"
 msgstr "Mapa poslanih sporočil:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:85
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:86
 msgid "Server Type: "
 msgstr "Vrsta strežnika:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:87
 msgid "Server requires authentication"
 msgstr "Strežnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:88
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:89
+msgid "Source"
+msgstr "Izvorna koda"
+
+#: mail/mail-config.glade.h:90
+msgid "Source Information"
+msgstr "Podatki o izvorni kodi"
+
+#: mail/mail-config.glade.h:91
 msgid "Sources"
 msgstr "Viri"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:92
 msgid "Special Folders"
 msgstr "Posebne mape"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:93
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:94
 msgid "Type"
 msgstr "Vrsta"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:95
 msgid "Use secure connection (SSL)"
 msgstr "Uporabi varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:96
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:97
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6613,12 +6605,25 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:45 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:36
+#: mail/mail-config.glade.h:102 ui/evolution-comp-editor.xml.h:20
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:47
 msgid "_Edit"
 msgstr "_Uredi"
 
+#: mail/mail-config.glade.h:104
+msgid "newswindow1"
+msgstr "oknonovic1"
+
+#: mail/mail-config.glade.h:105
+msgid "placeholder"
+msgstr "držalec mesta"
+
+#: mail/mail-config.glade.h:106
+msgid "seconds."
+msgstr "sekund."
+
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
@@ -6635,188 +6640,191 @@ msgstr "Nisem mogel ustvariti konteksta šifiranja PGP."
 msgid "Could not create a PGP decryption context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja PGP."
 
-#: mail/mail-crypto.c:169
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisa S/MIME"
 
-#: mail/mail-crypto.c:195
-msgid "Could not create a S/MIME verification context."
-msgstr "Nisem mogel ustvariti konteksta preverjanja S/MIME."
+#: mail/mail-crypto.c:205
+msgid "Could not create a S/MIME certsonly context."
+msgstr "Nisem mogel ustvariti konteksta certifikatov S/MIME."
 
-#: mail/mail-crypto.c:225
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nisem mogel ustvariti konteksta šifriranja S/MIME."
 
-#: mail/mail-crypto.c:251
-msgid "Could not create a S/MIME decryption context."
+#: mail/mail-crypto.c:267
+msgid "Could not create a S/MIME envelope context."
+msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
+
+#: mail/mail-crypto.c:297
+msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 
-#: mail/mail-display.c:196
+#: mail/mail-display.c:220
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:236
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nisem mogel ustvariti začasnega imenika: %s"
-
-#: mail/mail-display.c:297
+#: mail/mail-display.c:330
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:332
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:301
+#: mail/mail-display.c:334
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:336
+#: mail/mail-display.c:369
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:962
+#: mail/mail-display.c:1028
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1256
-msgid "Open link in browser"
+#: mail/mail-display.c:1371
+msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1258
-msgid "Save as (FIXME)"
-msgstr "Shrani kot (FIXME)"
+#: mail/mail-display.c:1373
+msgid "Copy Link Location"
+msgstr "Kopiraj lokacijo povezave"
+
+#: mail/mail-display.c:1375
+msgid "Save Link as (FIXME)"
+msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1260
-msgid "Copy location (FIXME)"
-msgstr "Kopiraj mesto (FIXME)"
+#: mail/mail-display.c:1377
+msgid "Save Image as"
+msgstr "Shrani sliko kot"
 
-#: mail/mail-format.c:527
+#: mail/mail-format.c:532
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:573
+#: mail/mail-format.c:580
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/mail-format.c:640 mail/message-list.c:1082
+#: mail/mail-format.c:649 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:756 mail/message-list.c:1082
+#: mail/mail-format.c:765 mail/message-list.etspec.h:4
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:759
+#: mail/mail-format.c:768
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:762 mail/message-list.c:1083
+#: mail/mail-format.c:771 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:774
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1075
+#: mail/mail-format.c:1096
 msgid "No GPG/PGP program configured."
 msgstr "Program GPG/PGP ni nastavljen."
 
-#: mail/mail-format.c:1090
+#: mail/mail-format.c:1111
 msgid "Encrypted message not displayed"
 msgstr "Šifrirano sporočilo ni prikazano"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1117
 msgid "Encrypted message"
 msgstr "Šifrirano sporočilo"
 
-#: mail/mail-format.c:1097
+#: mail/mail-format.c:1118
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za dešifriranje."
 
-#: mail/mail-format.c:1153
+#: mail/mail-format.c:1174
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
 
-#: mail/mail-format.c:1161
+#: mail/mail-format.c:1182
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/mail-format.c:1787
+#: mail/mail-format.c:1833
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1845
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/mail-format.c:1803
+#: mail/mail-format.c:1849
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1837
+#: mail/mail-format.c:1883
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:1888
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:505
+#: mail/mail-local.c:455
 #, c-format
 msgid "Opening '%s'"
 msgstr "Odpiram '%s'"
 
-#: mail/mail-local.c:785
+#: mail/mail-local.c:755
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:789
+#: mail/mail-local.c:759
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:812
+#: mail/mail-local.c:782
 msgid "Reconfiguring folder"
 msgstr "Prenastavljam mapo"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:841
+#: mail/mail-local.c:811
 msgid "Closing current folder"
 msgstr "Zapiram trenutno mapo"
 
-#: mail/mail-local.c:873
+#: mail/mail-local.c:838
 msgid "Renaming old folder and opening"
 msgstr "Preimenujem in odpiram staro mapo"
 
-#: mail/mail-local.c:891
+#: mail/mail-local.c:856
 msgid "Creating new folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-local.c:905
+#: mail/mail-local.c:870
 msgid "Copying messages"
 msgstr "Kopiram sporočilo"
 
-#: mail/mail-local.c:922
+#: mail/mail-local.c:887
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6825,7 +6833,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:961
+#: mail/mail-local.c:926
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6833,6 +6841,11 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
+#: mail/mail-local.c:1012
+#, c-format
+msgid "Reconfigure %s"
+msgstr "Znova nastavi %s"
+
 #: mail/mail-mt.c:190
 #, c-format
 msgid ""
@@ -6851,101 +6864,110 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:867
 msgid "Evolution progress"
 msgstr "Napredek evolucije"
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:547
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:551
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:662
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:681
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:683 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:768
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:846
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:846
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočia v %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:863
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:866
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:956
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osvežujem mape v \"%s\""
 
-#: mail/mail-ops.c:1154
+#: mail/mail-ops.c:1118
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1159 mail/mail-ops.c:1297
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1226
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1365
+#, c-format
+msgid "Removing folder %s"
+msgstr "Odstranjujem mapo %s"
+
+#: mail/mail-ops.c:1497
+msgid "Refreshing folder"
+msgstr "Osvežujem mapo"
+
+#: mail/mail-ops.c:1533
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1582
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1649
 msgid "Retrieving messages"
 msgstr "Prenašam sporočilo"
 
-#: mail/mail-ops.c:1575
+#: mail/mail-ops.c:1659
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Prenašam sporočilo številka %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1649
+#: mail/mail-ops.c:1733
 msgid "Saving messages"
 msgstr "Shranjujem sporočila"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1812
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6954,12 +6976,12 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1825
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Shranjujem sporočilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1839
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6968,11 +6990,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1913
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6981,12 +7003,13 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:1956
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:1939
+#: mail/mail-ops.c:2023
+#, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
@@ -7014,70 +7037,58 @@ msgstr "Poišči"
 msgid "Matches:"
 msgstr "Ustreza:"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "I_skanje"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Preklicujem..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Oddaja in sprejem pošte"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Sprejemam"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Posodabljam..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Pošiljam"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "V cev je bilo zapisano nepopolno sporočilo!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Povzetek pošte"
-
-#: mail/mail-tools.c:145
+#: mail/mail-tools.c:159
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nisem mogel ustvariti začasnega poštnega predala `%s': %s"
 
-#: mail/mail-tools.c:192
+#: mail/mail-tools.c:207
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (posredovano sporočilo)"
 
-#: mail/mail-tools.c:202
+#: mail/mail-tools.c:217
 msgid "Fwd: (no subject)"
 msgstr "Posreduj: (ni zadeve)"
 
-#: mail/mail-tools.c:219
+#: mail/mail-tools.c:234
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:221
+#: mail/mail-tools.c:236
 msgid "Forwarded message (no subject)"
 msgstr "Posredovano sporočilo (brez navedene zadeve)"
 
-#: mail/mail-tools.c:428
+#: mail/mail-tools.c:457
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
@@ -7094,137 +7105,83 @@ msgstr "vMape"
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:188 ui/evolution-mail.xml.h:70
-msgid "Reply"
-msgstr "Odgovori"
-
-#: mail/message-browser.c:188
-msgid "Reply to the sender of this message"
-msgstr "Odgovori pošiljatelju tega sporočila"
-
-#: mail/message-browser.c:191 ui/evolution-mail.xml.h:71
-msgid "Reply to All"
-msgstr "Odgovori vsem"
-
-#: mail/message-browser.c:191
-msgid "Reply to all recipients of this message"
-msgstr "Odgovori vsem prejemnikom tega sporočila"
-
-#: mail/message-browser.c:194 ui/evolution-mail.xml.h:33
-msgid "Forward"
-msgstr "Posreduj naprej"
-
-#: mail/message-browser.c:194
-msgid "Forward this message"
-msgstr "Sporočilo posreduj naprej"
-
-#: mail/message-browser.c:199
-msgid "Print the selected message"
-msgstr "Natisni izbrano sporočilo"
-
-#: mail/message-browser.c:202
-msgid "Delete this message"
-msgstr "Zbriši to sporčilo"
-
-#: mail/message-browser.c:207 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Prejšnji"
-
-#: mail/message-browser.c:207
-msgid "Previous message"
-msgstr "Prejšnje sporočilo"
-
-#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Naprej"
-
-#: mail/message-browser.c:210
-msgid "Next message"
-msgstr "Naslednje sporočilo"
-
-#: mail/message-list.c:677
+#: mail/message-list.c:608
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:678
+#: mail/message-list.c:609
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:610
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:611
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:612
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:616
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:617
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:621
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:622
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:872
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:879
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:957
+#: mail/message-list.c:888
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:969
+#: mail/message-list.c:900
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:977
+#: mail/message-list.c:908
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:910
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1081
+#: mail/message-list.etspec.h:3
 msgid "Flagged"
 msgstr "Označeno"
 
-#: mail/message-list.c:1082
+#: mail/message-list.etspec.h:5
 msgid "Received"
 msgstr "Sprejeto"
 
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/mail-session.c:161
+#: mail/mail-session.c:170
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
-#: ui/evolution.xml.h:13
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapa"
 
@@ -7252,15 +7209,1233 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Uredi naročnine"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Evolucijina komponenta za povzetke."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Tovarna za Evolucijine komponente za povzetke."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
+
+#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+msgid "Appointments"
+msgstr "Zmeneki"
+
+#: my-evolution/e-summary-calendar.c:159
+msgid "No appointments"
+msgstr "Ni zmenkov"
+
+#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
+msgid "%I:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-mail.c:100
+msgid "Mail summary"
+msgstr "Povzetek pošte"
+
+#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Napaka ob prenašanju RDF</b>"
+
+#: my-evolution/e-summary-weather.c:56
+msgid "My Weather"
+msgstr "Moje vreme"
+
+#: my-evolution/e-summary-weather.c:296
+msgid "<b>Error downloading Metar</b>"
+msgstr "<b>Napaka ob prenašanju Metar</b>"
+
+#: my-evolution/e-summary-weather.c:612
+msgid "Regions"
+msgstr "Območja"
+
+#: my-evolution/e-summary.c:413 ui/my-evolution.xml.h:3
+msgid "Print My Evolution"
+msgstr "Natisni Mojo evolucijo"
+
+#: my-evolution/e-summary.c:459
+msgid "Printing of My Evolution failed"
+msgstr "Tiskanje Moje evolucije ni uspelo"
+
+#: my-evolution/main.c:52
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Komponenta povzetka ni mogla inicializirati Bonoba"
+
+#: my-evolution/metar.c:43
+msgid "Clear sky"
+msgstr "Jasno"
+
+#: my-evolution/metar.c:44
+msgid "Broken clouds"
+msgstr "Pretežno oblačno"
+
+#: my-evolution/metar.c:45
+msgid "Scattered clouds"
+msgstr "Delno oblačno"
+
+#: my-evolution/metar.c:46
+msgid "Few clouds"
+msgstr "Pretežno jasno"
+
+#: my-evolution/metar.c:47
+msgid "Overcast"
+msgstr "Oblačno"
+
+#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+msgid "Invalid"
+msgstr "Neveljavno"
+
+#: my-evolution/metar.c:62
+msgid "Variable"
+msgstr "Spremenljivo"
+
+#: my-evolution/metar.c:63
+msgid "North"
+msgstr "sever"
+
+#: my-evolution/metar.c:63
+msgid "North - NorthEast"
+msgstr "sever - severovzhod"
+
+#: my-evolution/metar.c:63
+msgid "Northeast"
+msgstr "severovzhod"
+
+#: my-evolution/metar.c:63
+msgid "East - NorthEast"
+msgstr "vzhod - severovzhod"
+
+#: my-evolution/metar.c:64
+msgid "East"
+msgstr "vzhod"
+
+#: my-evolution/metar.c:64
+msgid "East - Southeast"
+msgstr "vzhod - jugovzhod"
+
+#: my-evolution/metar.c:64
+msgid "Southeast"
+msgstr "jugovzhod"
+
+#: my-evolution/metar.c:64
+msgid "South - Southeast"
+msgstr "jug - jugovzhod"
+
+#: my-evolution/metar.c:65
+msgid "South"
+msgstr "jug"
+
+#: my-evolution/metar.c:65
+msgid "South - Southwest"
+msgstr "jug - jugozahod"
+
+#: my-evolution/metar.c:65
+msgid "Southwest"
+msgstr "jugozahod"
+
+#: my-evolution/metar.c:65
+msgid "West - Southwest"
+msgstr "zahod - jugozahod"
+
+#: my-evolution/metar.c:66
+msgid "West"
+msgstr "zahod"
+
+#: my-evolution/metar.c:66
+msgid "West - Northwest"
+msgstr "zahod - severozahod"
+
+#: my-evolution/metar.c:66
+msgid "Northwest"
+msgstr "severozahod"
+
+#: my-evolution/metar.c:66
+msgid "North - Northwest"
+msgstr "sever - severozahod"
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+
+msgid "Drizzle"
+msgstr "Pršenje"
+
+#: gweather/weather.c:179
+msgid "Drizzle in the vicinity"
+msgstr "Pršenje v okolici"
+
+#: gweather/weather.c:179
+msgid "Light drizzle"
+msgstr "Rahlo pršenje"
+
+#: gweather/weather.c:179
+msgid "Moderate drizzle"
+msgstr "Zmerno pršenje"
+#@ Hmmm...
+
+#: gweather/weather.c:179
+msgid "Heavy drizzle"
+msgstr "Močno pršenje"
+
+#: gweather/weather.c:179
+msgid "Shallow drizzle"
+msgstr "Plitvo pršenje"
+
+
+#: gweather/weather.c:179
+msgid "Patches of drizzle"
+msgstr "Ponekod prši"
+
+#: gweather/weather.c:179
+msgid "Partial drizzle"
+msgstr "Prši s presledki"
+
+#: gweather/weather.c:179 gweather/weather.c:180
+msgid "Thunderstorm"
+msgstr "Nevihta"
+
+#: gweather/weather.c:179
+msgid "Windy drizzle"
+msgstr "Pršenje z vetrom"
+#: gweather/weather.c:179
+msgid "Showers"
+msgstr "Plohe"
+
+#: gweather/weather.c:179
+msgid "Drifting drizzle"
+msgstr "Pršenje v pasovih"
+
+#: gweather/weather.c:179
+msgid "Freezing drizzle"
+msgstr "Zmrzujoče pršenje"
+
+#. RAIN
+#: gweather/weather.c:180
+msgid "Rain "
+msgstr "Dež"
+
+#: gweather/weather.c:180
+msgid "Rain in the vicinity"
+msgstr "Dež v okolici"
+
+#: gweather/weather.c:180
+msgid "Light rain"
+msgstr "Rahel dež"
+
+#: gweather/weather.c:180
+msgid "Moderate rain"
+msgstr "Zmeren dež"
+
+#: gweather/weather.c:180
+msgid "Heavy rain"
+msgstr "Močan dež"
+
+
+#: gweather/weather.c:180
+msgid "Shallow rain"
+msgstr "Plitev dež"
+
+#: gweather/weather.c:180
+msgid "Patches of rain"
+msgstr "Ponekod dežuje"
+
+#: gweather/weather.c:180
+msgid "Partial rainfall"
+msgstr "Dežuje s presledki"
+
+#: gweather/weather.c:180
+msgid "Blowing rainfall"
+msgstr "Dež z vetrom"
+#@ Hmmm....
+
+#: gweather/weather.c:180
+msgid "Rain showers"
+msgstr "Plohe"
+
+#: gweather/weather.c:180
+msgid "Drifting rain"
+msgstr "Dež v pasovih"
+
+
+#: gweather/weather.c:180
+msgid "Freezing rain"
+msgstr "Zmrzujoč dež"
+
+#. SNOW
+#: gweather/weather.c:181
+msgid "Snow"
+msgstr "Sneži"
+
+#: gweather/weather.c:181
+msgid "Snow in the vicinity"
+msgstr "Sneži v okolici"
+
+#: gweather/weather.c:181
+msgid "Light snow"
+msgstr "Rahlo sneži"
+
+#: gweather/weather.c:181
+msgid "Moderate snow"
+msgstr "Zmerno sneži"
+
+#: gweather/weather.c:181
+msgid "Heavy snow"
+msgstr "Močno sneži"
+
+#: gweather/weather.c:181
+msgid "Shallow snow"
+msgstr "Plitvo sneži"
+
+#: gweather/weather.c:181
+msgid "Patches of snow"
+msgstr "Ponekod sneži"
+
+#: gweather/weather.c:181
+msgid "Partial snowfall"
+msgstr "Sneži s presledki"
+
+#: gweather/weather.c:181 gweather/weather.c:182
+msgid "Snowstorm"
+msgstr "Snežna nevihta"
+
+#: gweather/weather.c:181
+msgid "Blowing snowfall"
+msgstr "Sneži z vetrom"
+
+#: gweather/weather.c:181
+msgid "Snow showers"
+msgstr "Snežne plohe"
+
+#: gweather/weather.c:181
+msgid "Drifting snow"
+msgstr "Sneži v pasovih"
+
+#: gweather/weather.c:181
+msgid "Freezing snow"
+msgstr "Zmrzujoče sneži"
+
+#. SNOW_GRAINS
+#: gweather/weather.c:182
+msgid "Snow grains"
+msgstr "Zrnat sneg"
+
+#: gweather/weather.c:182
+msgid "Snow grains in the vicinity"
+msgstr "Zrnato sneži v okolici"
+
+#: gweather/weather.c:182
+msgid "Light snow grains"
+msgstr "Rahlo zrnato sneži"
+
+#: gweather/weather.c:182
+msgid "Moderate snow grains"
+msgstr "Zmerno zrnato sneži"
+
+#: gweather/weather.c:182
+msgid "Heavy snow grains"
+msgstr "Močno zrnato sneži"
+
+#: gweather/weather.c:182
+msgid "Shallow snow grains"
+msgstr "Plitvo zrnato sneži"
+
+#: gweather/weather.c:182
+msgid "Patches of snow grains"
+msgstr "Ponekod zrnato sneži"
+
+#: gweather/weather.c:182
+msgid "Partial snow grains"
+msgstr "Zrnato sneži s presledki"
+
+#: gweather/weather.c:182
+msgid "Blowing snow grains"
+msgstr "Zrnato sneži z vetrom"
+
+#: gweather/weather.c:182
+msgid "Snow grain showers"
+msgstr "Plohe zrnatega snega"
+
+#: gweather/weather.c:182
+msgid "Drifting snow grains"
+msgstr "Zrnato sneži v pasovih"
+
+#: gweather/weather.c:182
+msgid "Freezing snow grains"
+msgstr "Zmrzujoče zrnato sneži"
+
+#. ICE_CRYSTALS
+#: gweather/weather.c:183
+msgid "Ice crystals"
+msgstr "Ledene iglice"
+
+#: gweather/weather.c:183
+msgid "Ice crystals in the vicinity"
+msgstr "Ledene iglice v okolici"
+
+#: gweather/weather.c:183
+msgid "Few ice crystals"
+msgstr "Malo ledenih iglic"
+
+#: gweather/weather.c:183
+msgid "Moderate ice crystals"
+msgstr "Zmerne ledene iglice"
+
+#: gweather/weather.c:183
+msgid "Heavy ice crystals"
+msgstr "Močne ledene iglice"
+
+#: gweather/weather.c:183
+msgid "Patches of ice crystals"
+msgstr "Ponekod ledene iglice"
+
+#: gweather/weather.c:183
+msgid "Partial ice crystals"
+msgstr "Ledene iglice s presledki"
+
+#: gweather/weather.c:183
+msgid "Ice crystal storm"
+msgstr "Nevihta ledenih iglic"
+
+#: gweather/weather.c:183
+msgid "Blowing ice crystals"
+msgstr "Ledene iglice z vetrom"
+
+#: gweather/weather.c:183
+msgid "Showers of ice crystals"
+msgstr "Plohe ledenih iglic"
+
+#: gweather/weather.c:183
+msgid "Drifting ice crystals"
+msgstr "Ledene iglice v pasovih"
+
+#: gweather/weather.c:183
+msgid "Freezing ice crystals"
+msgstr "Zmrzujoče ledene iglice"
+
+#. ICE_PELLETS
+#: gweather/weather.c:184
+msgid "Ice pellets"
+msgstr "Babje pšeno"
+
+#: gweather/weather.c:184
+msgid "Ice pellets in the vicinity"
+msgstr "Babje pšeno v okolici"
+
+#: gweather/weather.c:184
+msgid "Few ice pellets"
+msgstr "Nekaj babjega pšena"
+
+#: gweather/weather.c:184
+msgid "Moderate ice pellets"
+msgstr "Zmerno babje pšeno"
+
+#: gweather/weather.c:184
+msgid "Heavy ice pellets"
+msgstr "Močno babje pšeno"
+
+#: gweather/weather.c:184
+msgid "Shallow ice pellets"
+msgstr "Plitvo babje pšeno"
+
+#: gweather/weather.c:184
+msgid "Patches of ice pellets"
+msgstr "Ponekod babje pšeno"
+
+#: gweather/weather.c:184
+msgid "Partial ice pellets"
+msgstr "Babje pšeno s presledki"
+
+#: gweather/weather.c:184
+msgid "Ice pellet storm"
+msgstr "Nevihta babjega pšena"
+
+#: gweather/weather.c:184
+msgid "Blowing ice pellets"
+msgstr "Babje pšeno z vetrom"
+
+#: gweather/weather.c:184
+msgid "Showers of ice pellets"
+msgstr "Plohe babjega pšena"
+
+#: gweather/weather.c:184
+msgid "Drifting ice pellets"
+msgstr "Babje pšeno v pasovih"
+
+#: gweather/weather.c:184
+msgid "Freezing ice pellets"
+msgstr "Zmrzujoče babje pšeno"
+
+#. HAIL
+#: gweather/weather.c:185
+msgid "Hail"
+msgstr "Toča"
+
+#: gweather/weather.c:185
+msgid "Hail in the vicinity"
+msgstr "Toča v okolici"
+
+#: gweather/weather.c:185 gweather/weather.c:186
+msgid "Light hail"
+msgstr "Rahla toča"
+
+#: gweather/weather.c:185
+msgid "Moderate hail"
+msgstr "Zmerna toča"
+
+#: gweather/weather.c:185
+msgid "Heavy hail"
+msgstr "Močna toča"
+
+#: gweather/weather.c:185
+msgid "Shallow hail"
+msgstr "Plitva toča"
+
+#: gweather/weather.c:185
+msgid "Patches of hail"
+msgstr "Ponekod toča"
+
+#: gweather/weather.c:185
+msgid "Partial hail"
+msgstr "Toča s presledki"
+
+#: gweather/weather.c:185
+msgid "Hailstorm"
+msgstr "Nevihta toče"
+
+#: gweather/weather.c:185
+msgid "Blowing hail"
+msgstr "Toča z vetrom"
+
+#: gweather/weather.c:185
+msgid "Hail showers"
+msgstr "Ploha toče"
+
+#: gweather/weather.c:185
+msgid "Drifting hail"
+msgstr "Toča v pasovih"
+
+#: gweather/weather.c:185
+msgid "Freezing hail"
+msgstr "Zmrzujoča toča"
+
+#. SMALL_HAIL
+#: gweather/weather.c:186
+msgid "Small hail"
+msgstr "Sodra"
+
+#: gweather/weather.c:186
+msgid "Small hail in the vicinity"
+msgstr "Sodra v okolici"
+
+#: gweather/weather.c:186
+msgid "Moderate small hail"
+msgstr "Zmerna sodra"
+
+#: gweather/weather.c:186
+msgid "Heavy small hail"
+msgstr "Močna sodra"
+
+#: gweather/weather.c:186
+msgid "Shallow small hail"
+msgstr "Plitva sodra"
+
+#: gweather/weather.c:186
+msgid "Patches of small hail"
+msgstr "Ponekod sodra"
+
+#: gweather/weather.c:186
+msgid "Partial small hail"
+msgstr "Sodra s presledki"
+
+#: gweather/weather.c:186
+msgid "Small hailstorm"
+msgstr "Nevihta sodre"
+
+#: gweather/weather.c:186
+msgid "Blowing small hail"
+msgstr "Sodra z vetrom"
+
+#: gweather/weather.c:186
+msgid "Showers of small hail"
+msgstr "Ploha sodre"
+
+#: gweather/weather.c:186
+msgid "Drifting small hail"
+msgstr "Sodra v pasovih"
+
+#: gweather/weather.c:186
+msgid "Freezing small hail"
+msgstr "Zmrzujoča sodra"
+
+#. PRECIPITATION
+#: gweather/weather.c:187
+msgid "Unknown precipitation"
+msgstr "Neznane padavine"
+
+#: gweather/weather.c:187
+msgid "Precipitation in the vicinity"
+msgstr "Padavine v okolici"
+
+#: gweather/weather.c:187
+msgid "Light precipitation"
+msgstr "Rahle padavine"
+
+#: gweather/weather.c:187
+msgid "Moderate precipitation"
+msgstr "Zmerne padavine"
+
+#: gweather/weather.c:187
+msgid "Heavy precipitation"
+msgstr "Močne padavine"
+
+#: gweather/weather.c:187
+msgid "Shallow precipitation"
+msgstr "Plitve padavine"
+
+#: gweather/weather.c:187
+msgid "Patches of precipitation"
+msgstr "Ponekod padavine"
+
+#: gweather/weather.c:187
+msgid "Partial precipitation"
+msgstr "Padavine s presledki"
+
+#: gweather/weather.c:187
+msgid "Unknown thunderstorm"
+msgstr "Nevihta neznanih padavin"
+
+#: gweather/weather.c:187
+msgid "Blowing precipitation"
+msgstr "Padavine z vetrom"
+
+#: gweather/weather.c:187
+msgid "Showers, type unknown"
+msgstr "Ploha neznanih padavin"
+
+#: gweather/weather.c:187
+msgid "Drifting precipitation"
+msgstr "Padavine v pasovih"
+
+#: gweather/weather.c:187
+msgid "Freezing precipitation"
+msgstr "Zmrzujoče padavine"
+
+#. MIST
+#: gweather/weather.c:188
+msgid "Mist"
+msgstr "Meglice"
+
+#: gweather/weather.c:188
+msgid "Mist in the vicinity"
+msgstr "Meglice v okolici"
+
+#: gweather/weather.c:188
+msgid "Light mist"
+msgstr "Rahle meglice"
+
+#: gweather/weather.c:188
+msgid "Moderate mist"
+msgstr "Zmerne meglice"
+
+#: gweather/weather.c:188
+msgid "Thick mist"
+msgstr "Goste meglice"
+
+#: gweather/weather.c:188
+msgid "Shallow mist"
+msgstr "Plitve meglice"
+
+#: gweather/weather.c:188
+msgid "Patches of mist"
+msgstr "Ponekod meglice"
+
+#: gweather/weather.c:188
+msgid "Partial mist"
+msgstr "Meglice s presledki"
+
+#: gweather/weather.c:188
+msgid "Mist with wind"
+msgstr "Meglice z vetrom"
+
+#: gweather/weather.c:188
+msgid "Drifting mist"
+msgstr "Meglice v pasovih"
+
+#: gweather/weather.c:188
+msgid "Freezing mist"
+msgstr "Zmrzujoče meglice"
+
+#. FOG
+#: gweather/weather.c:189
+msgid "Fog"
+msgstr "Megla"
+
+#: gweather/weather.c:189
+msgid "Fog in the vicinity"
+msgstr "Megla v okolici"
+
+#: gweather/weather.c:189
+msgid "Light fog"
+msgstr "Rahla megla"
+
+#: gweather/weather.c:189
+msgid "Moderate fog"
+msgstr "Zmerna megla"
+
+#: gweather/weather.c:189
+msgid "Thick fog"
+msgstr "Gosta megla"
+
+#: gweather/weather.c:189
+msgid "Shallow fog"
+msgstr "Plitva megla"
+
+#: gweather/weather.c:189
+msgid "Patches of fog"
+msgstr "Ponekod megla"
+
+#: gweather/weather.c:189
+msgid "Partial fog"
+msgstr "Megla s presledki"
+
+#: gweather/weather.c:189
+msgid "Fog with wind"
+msgstr "Megla z vetrom"
+
+#: gweather/weather.c:189
+msgid "Drifting fog"
+msgstr "Megla v pasovih"
+
+#: gweather/weather.c:189
+msgid "Freezing fog"
+msgstr "Zmrzujoča megla"
+
+#. SMOKE
+#: gweather/weather.c:190
+msgid "Smoke"
+msgstr "Dim"
+
+#: gweather/weather.c:190
+msgid "Smoke in the vicinity"
+msgstr "Dim v okolici"
+
+#: gweather/weather.c:190
+msgid "Thin smoke"
+msgstr "Redek dim"
+
+#: gweather/weather.c:190
+msgid "Moderate smoke"
+msgstr "Zmeren dim"
+
+#: gweather/weather.c:190
+msgid "Thick smoke"
+msgstr "Gost dim"
+
+#: gweather/weather.c:190
+msgid "Shallow smoke"
+msgstr "Plitev dim"
+
+#: gweather/weather.c:190
+msgid "Patches of smoke"
+msgstr "Ponekod dim"
+
+#: gweather/weather.c:190
+msgid "Partial smoke"
+msgstr "Dim s presledki"
+
+#: gweather/weather.c:190
+msgid "Smoke w/ thunders"
+msgstr "Dim z grmenjem"
+
+#: gweather/weather.c:190
+msgid "Smoke with wind"
+msgstr "Dim z vetrom"
+
+#: gweather/weather.c:190
+msgid "Drifting smoke"
+msgstr "Dim v pasovih"
+
+#. VOLCANIC_ASH
+#: gweather/weather.c:191
+msgid "Volcanic ash"
+msgstr "Vulkanski pepel"
+
+#: gweather/weather.c:191
+msgid "Volcanic ash in the vicinity"
+msgstr "Vulkanski pepel v okolici"
+
+#: gweather/weather.c:191
+msgid "Moderate volcanic ash"
+msgstr "Zmeren vulkanski pepel"
+
+#: gweather/weather.c:191
+msgid "Thick volcanic ash"
+msgstr "Gost vulkanski pepel"
+
+#: gweather/weather.c:191
+msgid "Shallow volcanic ash"
+msgstr "Plitev vulkanski pepel"
+
+#: gweather/weather.c:191
+msgid "Patches of volcanic ash"
+msgstr "Ponekod vulkanski dim"
+
+#: gweather/weather.c:191
+msgid "Partial volcanic ash"
+msgstr "Vulkanski dim s presledki"
+
+#: gweather/weather.c:191
+msgid "Volcanic ash w/ thunders"
+msgstr "Vulkanski dim z grmenjem"
+
+#: gweather/weather.c:191
+msgid "Blowing volcanic ash"
+msgstr "Vulkanski dim z vetrom"
+
+#: gweather/weather.c:191
+msgid "Showers of volcanic ash "
+msgstr "Plohe vulkanskega dima"
+
+#: gweather/weather.c:191
+msgid "Drifting volcanic ash"
+msgstr "Vulkanski dim v pasovih"
+
+#: gweather/weather.c:191
+msgid "Freezing volcanic ash"
+msgstr "Zmrzujoč vulkanski dim"
+
+#. SAND
+#: gweather/weather.c:192
+msgid "Sand"
+msgstr "Pesek"
+
+#: gweather/weather.c:192
+msgid "Sand in the vicinity"
+msgstr "Pesek v okolici"
+
+#: gweather/weather.c:192
+msgid "Light sand"
+msgstr "Rahel pesek"
+
+#: gweather/weather.c:192
+msgid "Moderate sand"
+msgstr "Zmeren pesek"
+
+#: gweather/weather.c:192
+msgid "Heavy sand"
+msgstr "Močan pesek"
+
+#: gweather/weather.c:192
+msgid "Patches of sand"
+msgstr "Ponekod pesek"
+
+#: gweather/weather.c:192
+msgid "Partial sand"
+msgstr "Pesek s presledki"
+
+#: gweather/weather.c:192
+msgid "Blowing sand"
+msgstr "Pesek z vetrom"
+
+#: gweather/weather.c:192
+msgid "Drifting sand"
+msgstr "Pesek v pasovih"
+
+#. HAZE
+#: gweather/weather.c:193
+msgid "Haze"
+msgstr "Suha motnost"
+
+#: gweather/weather.c:193
+msgid "Haze in the vicinity"
+msgstr "Suha motnost v okolici"
+
+#: gweather/weather.c:193
+msgid "Light haze"
+msgstr "Rahla suha motnost"
+
+#: gweather/weather.c:193
+msgid "Moderate haze"
+msgstr "Zmerna suha motnost"
+
+#: gweather/weather.c:193
+msgid "Thick haze"
+msgstr "Gosta suha motnost"
+
+#: gweather/weather.c:193
+msgid "Shallow haze"
+msgstr "Plitva suha motnost"
+
+#: gweather/weather.c:193
+msgid "Patches of haze"
+msgstr "Ponekod suha motnost"
+
+#: gweather/weather.c:193
+msgid "Partial haze"
+msgstr "Suha motnost s presledki"
+
+#: gweather/weather.c:193
+msgid "Haze with wind"
+msgstr "Suha motnost z vetrom"
+
+#: gweather/weather.c:193
+msgid "Drifting haze"
+msgstr "Suhta motnost v pasovih"
+
+#: gweather/weather.c:193
+msgid "Freezing haze"
+msgstr "Zmrzujoča suha motnost"
+
+#. SPRAY
+#: gweather/weather.c:194
+msgid "Sprays"
+msgstr "Pršec"
+
+#: gweather/weather.c:194
+msgid "Sprays in the vicinity"
+msgstr "Pršec v okolici"
+
+#: gweather/weather.c:194
+msgid "Light sprays"
+msgstr "Rahel pršec"
+
+#: gweather/weather.c:194
+msgid "Moderate sprays"
+msgstr "Zmeren pršec"
+
+#: gweather/weather.c:194
+msgid "Heavy sprays"
+msgstr "Močan pršec"
+
+#: gweather/weather.c:194
+msgid "Shallow sprays"
+msgstr "Plitev pršec"
+
+#: gweather/weather.c:194
+msgid "Patches of sprays"
+msgstr "Ponekod pršec"
+
+#: gweather/weather.c:194
+msgid "Partial sprays"
+msgstr "Pršec s presledki"
+
+#: gweather/weather.c:194
+msgid "Blowing sprays"
+msgstr "Pršec z vetrom"
+
+#: gweather/weather.c:194
+msgid "Drifting sprays"
+msgstr "Pršec v pasovih"
+
+#: gweather/weather.c:194
+msgid "Freezing sprays"
+msgstr "Zmrzujoč pršec"
+
+#. DUST
+#: gweather/weather.c:195
+msgid "Dust"
+msgstr "Prah"
+
+#: gweather/weather.c:195
+msgid "Dust in the vicinity"
+msgstr "Prah v okolici"
+
+#: gweather/weather.c:195
+msgid "Light dust"
+msgstr "Rahel prah"
+
+#: gweather/weather.c:195
+msgid "Moderate dust"
+msgstr "Zmeren prah"
+
+#: gweather/weather.c:195
+msgid "Heavy dust"
+msgstr "Gost prah"
+
+#: gweather/weather.c:195
+msgid "Patches of dust"
+msgstr "Ponekod prah"
+
+#: gweather/weather.c:195
+msgid "Partial dust"
+msgstr "Prah s presledki"
+
+#: gweather/weather.c:195
+msgid "Blowing dust"
+msgstr "Prah z vetrom"
+
+#: gweather/weather.c:195
+msgid "Drifting dust"
+msgstr "Prah v pasovih"
+
+#. SQUALL
+#: gweather/weather.c:196
+msgid "Squall"
+msgstr "Piš vetra"
+
+#: gweather/weather.c:196
+msgid "Squall in the vicinity"
+msgstr "Piš vetra v okolici"
+
+#: gweather/weather.c:196
+msgid "Light squall"
+msgstr "Rahel piš vetra"
+
+#: gweather/weather.c:196
+msgid "Moderate squall"
+msgstr "Zmeren piš vetra"
+
+#: gweather/weather.c:196
+msgid "Heavy squall"
+msgstr "Močan piš vetra"
+
+#: gweather/weather.c:196
+msgid "Partial squall"
+msgstr "Piš vetra s presledki"
+
+#: gweather/weather.c:196
+msgid "Thunderous squall"
+msgstr "Piš vetra z grmenjem"
+
+#: gweather/weather.c:196
+msgid "Blowing squall"
+msgstr "Nôšen piš vetra"
+
+#: gweather/weather.c:196
+msgid "Drifting squall"
+msgstr "Piš vetra v pasovih"
+
+#: gweather/weather.c:196
+msgid "Freezing squall"
+msgstr "Zmrzujoč piš vetra"
+
+#. SANDSTORM
+#: gweather/weather.c:197
+msgid "Sandstorm"
+msgstr "Peščeni vihar"
+
+#: gweather/weather.c:197
+msgid "Sandstorm in the vicinity"
+msgstr "Peščeni vihar v okolici"
+
+#: gweather/weather.c:197
+msgid "Light standstorm"
+msgstr "Rahel peščeni vihar"
+
+#: gweather/weather.c:197
+msgid "Moderate sandstorm"
+msgstr "Zmeren peščeni vihar"
+
+#: gweather/weather.c:197
+msgid "Heavy sandstorm"
+msgstr "Močan peščeni vihar"
+
+#: gweather/weather.c:197
+msgid "Shallow sandstorm"
+msgstr "Plitev peščeni vihar"
+
+#: gweather/weather.c:197
+msgid "Partial sandstorm"
+msgstr "Peščeni vihar s presledki"
+
+#: gweather/weather.c:197
+msgid "Thunderous sandstorm"
+msgstr "Peščeni vihar z grmenjem"
+
+#: gweather/weather.c:197
+msgid "Blowing sandstorm"
+msgstr "Nôsen peščeni vihar"
+
+#: gweather/weather.c:197
+msgid "Drifting sandstorm"
+msgstr "Peščeni vihar v pasovih"
+
+#: gweather/weather.c:197
+msgid "Freezing sandstorm"
+msgstr "Zmrzujoč peščeni vihar"
+
+#. DUSTSTORM
+#: gweather/weather.c:198
+msgid "Duststorm"
+msgstr "Prašni vihar"
+
+#: gweather/weather.c:198
+msgid "Duststorm in the vicinity"
+msgstr "Prašni vihar v okolici"
+
+#: gweather/weather.c:198
+msgid "Light duststorm"
+msgstr "Rahel prašni vihar"
+
+#: gweather/weather.c:198
+msgid "Moderate duststorm"
+msgstr "Zmeren prašni vihar"
+
+#: gweather/weather.c:198
+msgid "Heavy duststorm"
+msgstr "Močan prašni vihar"
+
+#: gweather/weather.c:198
+msgid "Shallow duststorm"
+msgstr "Plitev prašni vihar"
+
+#: gweather/weather.c:198
+msgid "Partial duststorm"
+msgstr "Prašni vihar s presledki"
+
+#: gweather/weather.c:198
+msgid "Thunderous duststorm"
+msgstr "Prašni vihar z grmenjem"
+
+#: gweather/weather.c:198
+msgid "Blowing duststorm"
+msgstr "Nôsen prašni vihar"
+
+#: gweather/weather.c:198
+msgid "Drifting duststorm"
+msgstr "Prašni vihar v pasovih"
+
+#: gweather/weather.c:198
+msgid "Freezing duststorm"
+msgstr "Zmrzujoč prašni vihar"
+
+#. FUNNEL_CLOUD
+#: gweather/weather.c:199
+msgid "Funnel cloud"
+msgstr "Tromba"
+
+#: gweather/weather.c:199
+msgid "Funnel cloud in the vicinity"
+msgstr "Tromba v okolici"
+
+#: gweather/weather.c:199
+msgid "Light funnel cloud"
+msgstr "Rahla tromba"
+
+#: gweather/weather.c:199
+msgid "Moderate funnel cloud"
+msgstr "Zmerna tromba"
+
+#: gweather/weather.c:199
+msgid "Thick funnel cloud"
+msgstr "Gosta tromba"
+
+#: gweather/weather.c:199
+msgid "Shallow funnel cloud"
+msgstr "Plitva tromba"
+
+#: gweather/weather.c:199
+msgid "Patches of funnel clouds"
+msgstr "Ponekod trombe"
+
+#: gweather/weather.c:199
+msgid "Partial funnel clouds"
+msgstr "Trombe s presledki"
+
+#: gweather/weather.c:199
+msgid "Funnel cloud w/ wind"
+msgstr "Tromba z vetrom"
+
+#: gweather/weather.c:199
+msgid "Drifting funnel cloud"
+msgstr "Tromba v pasovih"
+
+#. TORNADO
+#: gweather/weather.c:200
+msgid "Tornado"
+msgstr "Tornado"
+
+#: gweather/weather.c:200
+msgid "Tornado in the vicinity"
+msgstr "Tornado v okolici"
+
+#: gweather/weather.c:200
+msgid "Moderate tornado"
+msgstr "Zmeren tornado"
+
+#: gweather/weather.c:200
+msgid "Raging tornado"
+msgstr "Hud tornado"
+
+#: gweather/weather.c:200
+msgid "Partial tornado"
+msgstr "Tornado s presledki"
+
+#: gweather/weather.c:200
+msgid "Thunderous tornado"
+msgstr "Tornado z grmenjem"
+
+#: gweather/weather.c:200
+msgid "Drifting tornado"
+msgstr "Tornado v pasovih"
+
+#: gweather/weather.c:200
+msgid "Freezing tornado"
+msgstr "Zmrzujoč tornado"
+
+#. DUST_WHIRLS
+#: gweather/weather.c:201
+msgid "Dust whirls"
+msgstr "Prašni vrtinec"
+
+#: gweather/weather.c:201
+msgid "Dust whirls in the vicinity"
+msgstr "Prašni vrtinci v okolici"
+
+#: gweather/weather.c:201
+msgid "Light dust whirls"
+msgstr "Rahli prašni vrtinci"
+
+#: gweather/weather.c:201
+msgid "Moderate dust whirls"
+msgstr "Zmerni prašni vrtinci"
+
+#: gweather/weather.c:201
+msgid "Heavy dust whirls"
+msgstr "Močni prašni vrtinci"
+
+#: gweather/weather.c:201
+msgid "Shallow dust whirls"
+msgstr "Plitvi prašni vrtinci"
+
+#: gweather/weather.c:201
+msgid "Patches of dust whirls"
+msgstr "Ponekod prašni vrtinci"
+
+#: gweather/weather.c:201
+msgid "Partial dust whirls"
+msgstr "Prašni vrtinci s presledki"
+
+#: gweather/weather.c:201
+msgid "Blowing dust whirls"
+msgstr "Prašni vrtinci z vetrom"
+
+#: gweather/weather.c:201
+msgid "Drifting dust whirls"
+msgstr "Prašni vrtinci v pasovih"
+
+#: shell/e-activity-handler.c:198
+msgid "Show Details"
+msgstr "Kaži podrobnosti"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr "Prekliči operacijo"
+
+#: shell/e-setup.c:125 shell/e-setup.c:198
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7268,30 +8443,30 @@ msgstr ""
 "Ta različica Evolucije mora namestiti dodatne datoteke\n"
 "v vaš osebni imenik Evolucije"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev datotek ali \"Prekliči\" za izhod."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno prenoviti datotek"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
+#: shell/e-setup.c:173 shell/e-setup.c:241
 msgid "Evolution files successfully installed."
 msgstr "Evolucijine datoteke so se uspešno namestile."
 
-#: shell/e-setup.c:195
+#: shell/e-setup.c:202
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Kaže, da je to vaš prvi zagon Evolucije."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:203
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških datotek "
 "pod"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:222
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7302,7 +8477,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:237
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -7311,7 +8486,7 @@ msgstr ""
 "Ne morem kopirati datotek v\n"
 "`%s'."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:304
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7322,7 +8497,21 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:318
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+"Evolucija je zaznala star imenik\n"
+"povzetka.\n"
+"Ta mora biti odstranjen preden se\n"
+"lahko Evolucija požene.\n"
+"Želite, da odstranim ta imenik?"
+
+#: shell/e-setup.c:343
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7333,12 +8522,12 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-shell.c:388
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1268
+#: shell/e-shell.c:1308
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7347,6 +8536,41 @@ msgstr ""
 "Opa!  Pogled `%s' je nepričakovano umru.  :-(\n"
 "To verjetno pomeni, da se je komponenta %s sesula."
 
+#: shell/e-shell-folder-commands.c:242
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr "Navedite mapo kamor naj se skopira mapa \"%s\":"
+
+#: shell/e-shell-folder-commands.c:247
+msgid "Copy folder"
+msgstr "Kopiraj mapo"
+
+#: shell/e-shell-folder-commands.c:285
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr "Navedite mapo, kamor naj se prestavi mapa \"%s\":"
+
+#: shell/e-shell-folder-commands.c:290
+msgid "Move folder"
+msgstr "Prestavi mapo"
+
+#. Popup a dialog asking if they are sure they want to delete
+#. the folder
+#: shell/e-shell-folder-commands.c:324
+#, c-format
+msgid "Delete folder '%s'"
+msgstr "Zbriši mapo '%s'"
+
+#: shell/e-shell-folder-commands.c:332
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Ste prepričani, da želite zbrisati mapo '%s'?"
+
+#: shell/e-shell-folder-commands.c:390
+#, c-format
+msgid "Rename folder '%s'"
+msgstr "Preimenuj mapo '%s'"
+
 #: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
@@ -7364,7 +8588,7 @@ msgstr "Izbrano ime mape ni veljavno."
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7372,11 +8596,11 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:332
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
@@ -7416,7 +8640,7 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet %d."
 
-#: shell/e-shell-importer.c:353
+#: shell/e-shell-importer.c:352
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -7425,11 +8649,11 @@ msgstr ""
 "Ni uvoznika, ki bi lahko obravnaval\n"
 " %s"
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:362
 msgid "Importing"
 msgstr "Uvažam"
 
-#: shell/e-shell-importer.c:371
+#: shell/e-shell-importer.c:370
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -7438,17 +8662,17 @@ msgstr ""
 "Uvažam %s.\n"
 "Pričenjam %s"
 
-#: shell/e-shell-importer.c:384
+#: shell/e-shell-importer.c:383
 #, c-format
 msgid "Error starting %s"
 msgstr "Napaka ob zagonu %s"
 
-#: shell/e-shell-importer.c:404
+#: shell/e-shell-importer.c:402
 #, c-format
 msgid "Error loading %s"
 msgstr "Napaka ob nalaganju %s"
 
-#: shell/e-shell-importer.c:419
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -7457,57 +8681,78 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet 1."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:488
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:538
 msgid "Filename:"
 msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:553
 msgid "File type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:601
+#: shell/e-shell-importer.c:599
 msgid "Select folder"
 msgstr "Izberi mapo"
 
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr "Izberite ciljno mapo za uvoz teh podatkov"
+
 #: shell/e-shell-offline-handler.c:554
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-view.c:149
+#: shell/e-shell-view.c:173
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:1203
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1386 shell/e-storage-set-view.c:1441
+msgid "My Evolution"
+msgstr "Moja Evolucija"
+
+#: shell/e-shell-view.c:1403
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolucija %s"
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-view.c:1405
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolucija %s [%s]"
 
-#: shell/e-shell-view-menu.c:175
+#: shell/e-shell-view.c:1443
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolucija je trenutno na mereži.  Kliknite na ta gumb za delo brez mreže."
+
+#: shell/e-shell-view.c:1450
+msgid "Evolution is in the process of going offline."
+msgstr "Evolucija je v procesu odklapljanja z mreže."
+
+#: shell/e-shell-view.c:1456
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
+
+#: shell/e-shell-view-menu.c:182
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Program 'Bug buddy' ni bil najden v vaši poti ($PATH)."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-view-menu.c:188
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:226
+#: shell/e-shell-view-menu.c:233
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Avtorske pravice pridržane 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:228
+#: shell/e-shell-view-menu.c:235
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7517,31 +8762,55 @@ msgstr ""
 "GNOME za delo v skupinah, za pošto, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:392
+#: shell/e-shell-view-menu.c:464
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:576
+#: shell/e-shell-view-menu.c:465
+msgid "Select the folder that you want to open"
+msgstr "Izberite mapo, ki jo želite odpreti"
+
+#: shell/e-shell-view-menu.c:610
+msgid "Create a new shortcut"
+msgstr "Ustvari novo bližnjico"
+
+#: shell/e-shell-view-menu.c:611
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Izberite mapo na katero naj kaže bližnjica:"
+
+#: shell/e-shell-view-menu.c:718
 msgid "Work online"
 msgstr "Delaj na mreži"
 
-#: shell/e-shell-view-menu.c:588 shell/e-shell-view-menu.c:600
+#: shell/e-shell-view-menu.c:730 shell/e-shell-view-menu.c:742
 msgid "Work offline"
 msgstr "Delaj brez mreže"
 
-#: shell/e-shortcuts.c:381
+#: shell/e-shortcuts.c:601
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts.c:998
+msgid "Shortcuts"
+msgstr "Bližnjice"
+
+#: shell/e-shortcuts.c:1000
+msgid "Inbox"
+msgstr "Dohodna pošta"
+
+#: shell/e-shortcuts.c:1003
+msgid "Contacts"
+msgstr "Stik"
+
+#: shell/e-shortcuts-view.c:136
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:139
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:262
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7550,59 +8819,95 @@ msgstr ""
 "Zares želite odstraniti skupino\n"
 "`%s' iz vrstice bližnjic?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:267
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:292
+msgid "Rename Shortcut Group"
+msgstr "Preimenuj skupino bližnjic"
+
+#: shell/e-shortcuts-view.c:293
+msgid "Rename selected shortcut group to:"
+msgstr "Preimenuj izbrano skupino bližnjic v:"
+
+#: shell/e-shortcuts-view.c:303
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:304
 msgid "Show the shortcuts as small icons"
 msgstr "Kaži bližnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:306
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:307
 msgid "Show the shortcuts as large icons"
 msgstr "Kaži bližnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:318
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:319
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:294
+#: shell/e-shortcuts-view.c:321
 msgid "_Remove This Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:322
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:324
+msgid "Re_name This Group..."
+msgstr "_Preimenuj to skupino..."
+
+#: shell/e-shortcuts-view.c:325
+msgid "Rename this shortcut group"
+msgstr "Preimenuj to skupino bližnjic"
+
+#: shell/e-shortcuts-view.c:330
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:331
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Aktiviraj"
+#: shell/e-shortcuts-view.c:450
+msgid "Rename shortcut"
+msgstr "Preimenuj bližnjico"
+
+#: shell/e-shortcuts-view.c:451
+msgid "Rename selected shortcut to:"
+msgstr "Preimenuj izbrano bližnjico v:"
+
+#: shell/e-shortcuts-view.c:463
+msgid "Open the folder linked to this shortcut"
+msgstr "Odpri mapo povezano s to bližnjico"
+
+#: shell/e-shortcuts-view.c:465 ui/evolution.xml.h:24
+msgid "Open in New Window"
+msgstr "Odpri v novem oknu"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Aktiviraj to bližnjico"
+#: shell/e-shortcuts-view.c:465
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Odpri mapo povezano s to bližnjico v novem oknu"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:468
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: shell/e-shortcuts-view.c:468
+msgid "Rename this shortcut"
+msgstr "Preimenuj to bližnjico"
+
+#: shell/e-shortcuts-view.c:470
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
@@ -7654,6 +8959,16 @@ msgstr "Operacija ni podprta"
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
+#: shell/e-task-widget.c:167
+#, c-format
+msgid "%s (...)"
+msgstr "%s (...)"
+
+#: shell/e-task-widget.c:172
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% končano)"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ime mape:"
@@ -7692,11 +9007,15 @@ msgstr ""
 "S tem druidom boste vodeni skozi proces uvoza\n"
 "zunanjih datotek v Evolucijo."
 
-#: shell/importer/intelligent.c:186
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "Uvozniki"
 
-#: shell/main.c:82
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr "Ne uvozi"
+
+#: shell/main.c:89
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7733,7 +9052,7 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:107
+#: shell/main.c:114
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7741,86 +9060,121 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
-msgstr "Ne morem inicializirati lupine Evolucije."
+#: shell/main.c:152
+msgid "Cannot access the Evolution shell."
+msgstr "Ne morem dostopati do lupine Evolucije."
 
-#: shell/main.c:184
+#: shell/main.c:212
 msgid "Disable splash screen"
 msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:185
+#: shell/main.c:213
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
 
-#: shell/main.c:217
+#: shell/main.c:248
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_Izreži"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+msgid "Copy the selection"
+msgstr "Kopiraj izbrano"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Ustvari nov stik"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Zbriši stik"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Create new contact list"
+msgstr "Ustvari nov seznam stikov"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Poišči"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+msgid "Cut the selection"
+msgstr "Izreži izbrano"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Poišči stik"
+#: ui/evolution-addressbook.xml.h:9
+msgid "Delete selected contacts"
+msgstr "Zbriši izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Nov stik"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:63
-msgid "Previews the message to be printed"
-msgstr "Predogled sporočika, ki bo natisnjeno"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
-msgstr "Natisni stike"
+msgid "New list"
+msgstr "Nov seznam"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+msgid "Paste the clipboard"
+msgstr "Prilepi odložišče"
+
+#: ui/evolution-addressbook.xml.h:14
+msgid "Previews the contacts to be printed"
+msgstr "Predogled stikov, ki bodo natisnjeni"
+
+#: ui/evolution-addressbook.xml.h:17
+msgid "Print selected contacts"
+msgstr "Natisni izbrane stike"
+
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Izberi vse"
+
+#: ui/evolution-addressbook.xml.h:19
+msgid "Select all contacts"
+msgstr "Izberi vse stike"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Glej vse"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Glej vse stike"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "Viri _adresarja..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Stik"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:24
+msgid "_Contact Group"
+msgstr "Skupina _stikov"
+
+#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
+#: ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopiraj"
+
+#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
+#: ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Prilepi"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
 #: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Na_tisni..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Išči po kontaktih"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
-#: ui/evolution.xml.h:50
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_Izberi vse"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:64
 msgid "_Tools"
 msgstr "_Orodja"
 
@@ -7828,149 +9182,242 @@ msgstr "_Orodja"
 msgid "5 Days"
 msgstr "5 dni"
 
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+#: ui/evolution-calendar.xml.h:2
 msgid "Alter preferences"
 msgstr "Alternativne nastavitve"
 
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:7
 msgid "Create a new all day Event"
 msgstr "Ustvari nov celodnevni dogodek"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:8
 msgid "Create a new appointment"
 msgstr "Ustvari nov zmenek"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:9
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:13
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back in time"
 msgstr "Pojdi po času nazaj"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward in time"
 msgstr "Pojdi po času naprej"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to present time"
 msgstr "Pojdi na sedanjost"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:22
 msgid "New _Event"
 msgstr "Nov _dogodek"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
+msgid "Next"
+msgstr "Naprej"
+
+#: ui/evolution-calendar.xml.h:25
 msgid "Open Calendar"
 msgstr "Odpri koledar"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:28
 msgid "Prev"
 msgstr "Nazaj"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:29
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:32
 msgid "Print calendar"
 msgstr "Natisni koledar"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:33
 msgid "Print this Calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:18
+#: ui/evolution-calendar.xml.h:34
+msgid "Publish Free/Busy Information"
+msgstr "Objavi podatek o zasedenosti"
+
+#: ui/evolution-calendar.xml.h:35
+msgid "Publish Free/Busy information for this calendar"
+msgstr "Objavi podatek o zasedenosti za ta koledar"
+
+#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Shrani kot"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:37
 msgid "Save calendar as something else"
 msgstr "Shrani koledar kot nekaj drugega"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:38
+msgid "Settings..."
+msgstr "Nastavitve..."
+
+#: ui/evolution-calendar.xml.h:39
 msgid "Show 1 day"
 msgstr "Kaži en dan"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:40
 msgid "Show 1 month"
 msgstr "Kaži en mesec"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:41
 msgid "Show 1 week"
 msgstr "Kaži en teden"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:42
 msgid "Show the working week"
 msgstr "Pokaži delavni teden"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
+#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
+#: widgets/misc/e-dateedit.c:431
 msgid "Today"
 msgstr "Danes"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:44
 msgid "W_ork Week"
 msgstr "_Delavni teden"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:45
 msgid "Week"
 msgstr "Teden"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:46
 msgid "_Appointment"
 msgstr "_Zmenek"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:48
 msgid "_Day"
 msgstr "_Dan"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:49
 msgid "_Month"
 msgstr "_Mesec"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:45
+#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:57
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:51
 msgid "_Open Calendar"
 msgstr "Odpri ko_ledar"
 
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:56
 msgid "_Week"
 msgstr "_Teden"
 
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Zapri"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Zapri ta zmenek"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Zbriši ta zmenek"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:22
+msgid "Main toolbar"
+msgstr "Glavna orodna vrstica"
+
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
+msgstr "Predogled natisnjenega predmeta"
+
+#: ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Predogled _tiskanja"
+
+#: ui/evolution-comp-editor.xml.h:11
+msgid "Print S_etup"
+msgstr "Nastavitev t_iskanja"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Print this item"
+msgstr "Natisni ta predmet"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Print..."
+msgstr "Natisni..."
+
+#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Shrani kot..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Save and Close"
+msgstr "Shrani in zapri"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Shrani zmenek in zapri dialog"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr "Shrani ta predmet na disk"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
+
+#: ui/evolution-comp-editor.xml.h:19
+msgid "_Action"
+msgstr "_Dejanje"
+
+#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:48
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:52
+msgid "_Help"
+msgstr "_Pomoč"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Zbriši ta predmet"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Zbriši..."
 
@@ -7979,30 +9426,16 @@ msgid "Help"
 msgstr "Pomoč"
 
 #: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "Natisni kuverto..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Natisni ta predmet"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Natisni..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "Shrani _kot..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Shrani in zapri"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Shrani stik in zapri dialog"
@@ -8019,872 +9452,782 @@ msgstr "Glej pomoč na liniji"
 msgid "Send _message to contact..."
 msgstr "Pošlji _sporočilo stiku..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:46 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:37
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "O tem programu"
+#: ui/evolution-contact-list-editor.xml.h:2
+msgid "Delete this group"
+msgstr "Zbriši to skupino"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "O programu..."
+#: ui/evolution-contact-list-editor.xml.h:9
+msgid "Save the group and close the dialog box"
+msgstr "Shrani skupino in zapri pogovorno okno"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "_Dejanja"
+#: ui/evolution-contact-list-editor.xml.h:10
+msgid "Se_nd group to other..."
+msgstr "_Pošlji skupino drugim..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "A_dresar... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:11
+msgid "Send _message to group..."
+msgstr "Pošlji _sporočilo skupini..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "Poč_isti"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
+msgstr "Prekliči ses_tanek"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "_Izreži"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "_Preveri imena (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Počisti"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr "Prekliči sestanek za ta predmet"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Počisti izbiro"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+msgid "Forward as i_Calendar"
+msgstr "Posreduj naprej kot i_Koledar"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Zapri ta zmenek"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+msgid "Forward this item via email"
+msgstr "Posreduj naprej preko e-pošte"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "_Kopiraj v mapo... (FIXME)"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr "Dobi osvežene podatke o sestanku"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopiraj"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
+msgstr "Osveži sestanek"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopiraj izbrano"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "_Načrtuj sestanek"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Izreži"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
+msgstr "Načrtuj sestanek za ta predmet"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Izreži izbrano"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:41
+msgid "_Actions"
+msgstr "_Dejanja"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Zbriši ta zmenek"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
+msgstr "Prikroji Mojo Evolucijo"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Shrani kot XML"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Prekliči"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Shranio Xml opis uporabniškega vmesnika"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "Prekliči trenutno operacijo pošte"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rvi predmet v mapi (FIXME)"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Sestavi"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Posreduj (FIXME)"
+#: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit mail accounts and other preferences"
+msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Posreduj naprej kot v_Koledar (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit rules for filtering new mail"
+msgstr "Ustvari ali uredi pravila za filtriranje nove pošte"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Pojdi na naslednji predmet"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit virtual folder definitions"
+msgstr "Ustvari ali uredi določitve navideznih map"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Pojdi na prejšnji predmet"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Empty _Trash"
+msgstr "Sprazni _smeti"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Ne_popolna naloga (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Forget _Passwords"
+msgstr "Pozabi _gesla"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Spremeni lastnosti datoteke"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Pozabi pomnjena gesla tako, da boste zanje znova vprašani"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Napr_ej"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Manage _Subscriptions..."
+msgstr "Uredi _naročnine..."
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Prilepi"
+#: 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-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Prilepi odložišče"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "P_rejšnji"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Send / Receive"
+msgstr "Oddaja / sprejem"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Predogled _tiskanja"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send queued mail and retrieve new mail"
+msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Nas_tavitev tiskanja..."
+#: ui/evolution-mail-global.xml.h:15
+msgid "Show message preview window"
+msgstr "Kaži okno predogleda sporočila"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Nastavitev tiskanja"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Naroči se ali prekliči naročnino na mape z oddaljenih strežnikov"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:17
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "Shrani"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Virtual Folder _Editor..."
+msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Shrani zmenek in zapri dialog"
+#: ui/evolution-mail-global.xml.h:18
+msgid "_Filters..."
+msgstr "_Filtri..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:23
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Shrani trenutno datoteko"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Mail Message"
+msgstr "_Pošlji sporočilo"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Načrtuj sestanek"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Settings..."
+msgstr "_Nastavive pošte..."
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Načrtuj nek tip sestanka"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Preview Pane"
+msgstr "Pano _predogleda"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Izberi vse"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Send / Receive"
+msgstr "_Oddaja / sprejem"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Izberi vse"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Spremeni lastnosti te mape"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
+#: ui/evolution-mail-list.xml.h:3
+msgid "Copy selected messages"
+msgstr "Kopiraj izbrana sporočila"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Zahtevek opravila (FIXME)"
+#: ui/evolution-mail-list.xml.h:5
+msgid "Cut selected messages"
+msgstr "Izreži izbrana sporočila"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_O programu..."
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Skrij _izbrana sporočila"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:43
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:34
-msgid "_Close"
-msgstr "_Zapri"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Skrij _zbrisana sporočila"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:35
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
+#: ui/evolution-mail-list.xml.h:8
+msgid "Hide _Read messages"
+msgstr "Skrij _prebrana sporočila"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopiraj"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "Raje skrij zbrisana sporočila kot, da jih prikažeš prečrtana"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Razhroščuj"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Označi _vse kot prebrano"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:48
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:41
-msgid "_Help"
-msgstr "_Pomoč"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr "Označi vsa vidna sporočila kot prebrana"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Predmet (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+msgid "Paste message in the clipboard"
+msgstr "Prilepi sporočilo na odložišče"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Dnevniški zapis (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Trajno odstrani vsa zbrisana sporočila iz te mape"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Zadnji predmet v mapi (FIXME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Izberi _vse"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "Pošlji _sporočilo (FIXME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Izberi _nit"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Prestavi v mapo... (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr "Izberi vse in le tista sporočila, ki trenutno niso izbrana"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Opomba (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Izberi vsa sporočila iz iste niti kot izbrano sporočilo"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Prilepi"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
+msgstr "Izberi vsa vidna sporočila"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Lastnosti..."
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Kaži _vse"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Izberi vse"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr "Kaži sporočila, ki so bila začasno skrita"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:49
-msgid "_Task (FIXME)"
-msgstr "_Naloga (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Začasno skrij vsa že prebrana sporočila"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Predmet neprebran(FIXME)"
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
+msgstr "Začasno skrij vsa izbrana sporočila"
 
-#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:55
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:51
-msgid "_View"
-msgstr "Po_gled"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Niten seznam sporočil"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Dodaj storitev"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Uniči"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Dodaj novo storitev v povzetek"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:49
+msgid "_Folder"
+msgstr "_Mapa"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Ustvari novo e-pošto"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Obrni izbor"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Nastaviteve povzetka..."
+#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:59
+msgid "_Properties..."
+msgstr "_Lastnosti..."
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nova pošta"
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
+msgstr "_Niten seznam sporočil"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail-message.xml.h:1
 msgid "Apply filter rules to the selected messages"
 msgstr "Uveljavi pravila filtra na izbranih sporočilih"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: ui/evolution-mail.xml.h:3
-msgid "Cancel the current mail operation"
-msgstr "Prekliči trenutno operacijo pošte"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Change the properties of this folder"
-msgstr "Spremeni lastnosti te mape"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "Sestavi"
-
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Sestavi odgovor vsem prejemnikom izbranega sporočila"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Sestavi odgovor na dopisni seznam izbranega sporočila"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sestavi odgovor pošiljatelju izbranega sporočila"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Kopiraj izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Iz sporočila ustvari na_videzno mapo"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "Ustvari pravilo za filtriranje sporočil tega pošiljatelja"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Ustvari pravilo za filtriranje sporočil tem prejemnikom"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Ustvari pravilo za filtriranje spročil temu dopisnemu seznamu"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "Ustvari pravilo za filtriranje sporočil s tem predmetom"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "Ustvari navidezno mapo za te prejemnike"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "Ustvari navidezno mapo za ta poštni seznam"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "Ustvari navidezno mapo za tega pošiljatelja"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "Ustvari navidezno mapo za ta predmet"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Display the next important message"
+msgstr "Kaži naslednje pomembno sporočilo"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Create or edit rules for filtering new mail"
-msgstr "Ustvari ali uredi pravila za filtriranje nove pošte"
-
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit virtual folder definitions"
-msgstr "Ustvari ali uredi določitve navideznih map"
-
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
 msgstr "Kaži naslednje sporočilo"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:19
+msgid "Display the next unread message"
+msgstr "Kaži naslednje neprebrano sporočilo"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr "Kaži naslednjo neprebrano nit"
+
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr "Kaži prejšnje pomembno sporočilo"
+
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
 msgstr "Kaži prejšnje sporočilo"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Empty _Trash"
-msgstr "Sprazni _smeti"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr "Kaži prejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:24
 msgid "Filter on Mailing _List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Se_nder"
 msgstr "Filter glede na pošilja_telja"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on _Recipients"
 msgstr "Filter glede na preje_mnike"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Subject"
 msgstr "Filter glede na za_devo"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisili, da bodo slike v HTML pošti naložene"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Forget _Passwords"
-msgstr "Pozabi _gesla"
-
-#: ui/evolution-mail.xml.h:32
-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-message.xml.h:29
+msgid "Forward"
+msgstr "Posreduj naprej"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Posreduj naprej kot"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "Posreduj _pripeto"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "Posreduj kot _del sporočila"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "Posreduj kot _citirano"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
 msgstr "Posreduj naprej izbrano sporočilo v telesu novega sporočila"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
 msgstr "Posreduj izbrano sporočilo citirano kot odgovor"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
 msgstr "Nekomu posreduj izbrano sporočilo"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Nekomu posreduj izbrano sporočilo kot prilogo"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Hide S_elected Messages"
-msgstr "Skrij _izbrana sporočila"
-
-#: ui/evolution-mail.xml.h:43
-msgid "Hide _Deleted Messages"
-msgstr "Skrij _zbrisana sporočila"
-
-#: ui/evolution-mail.xml.h:44
-msgid "Hide _Read messages"
-msgstr "Skrij _prebrana sporočila"
-
-#: ui/evolution-mail.xml.h:45
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Raje skrij zbrisana sporočila kot, da jih prikažeš prečrtana"
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:38
 msgid "Load _Images"
 msgstr "Naloži _slike"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Manage _Subscriptions..."
-msgstr "Uredi _naročnine..."
-
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:39
 msgid "Mar_k As Read"
 msgstr "Označi _kot prebrano"
 
-#: ui/evolution-mail.xml.h:49
-msgid "Mark All as R_ead"
-msgstr "Označi _vse kot prebrano"
+#: ui/evolution-mail-message.xml.h:40
+msgid "Mark As I_mportant"
+msgstr "Označi kot po_membno"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark As U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Mark all visible messages as read"
-msgstr "Označi vsa vidna sporočila kot prebrana"
-
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail-message.xml.h:42
 msgid "Mark the selected messages as having been read"
 msgstr "Označi izbrana sporočila kot prebrana"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark the selected messages as important"
+msgstr "Označi izbrana sporočila kot pomembna"
+
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as not having been read"
 msgstr "Označi izbrana sporočila kot neprebrana"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages for deletion"
 msgstr "Označi izbrana sporočila za brisanje"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail-message.xml.h:46
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail-message.xml.h:47
 msgid "Move selected messages to another folder"
 msgstr "Prestavi izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Open a window for composing a mail message"
-msgstr "Odpri okno za sestavljanje novega poštnega sporočila"
-
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:49
 msgid "Open the selected message in a new window"
 msgstr "Odpri izbrano sporočilo v novem oknu"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:50
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Odpri izbrano sporočilo v skladatelju za vnovično pošiljanje"
 
-#: ui/evolution-mail.xml.h:61
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Previews the message to be printed"
+msgstr "Predogled sporočika, ki bo natisnjeno"
 
-#: ui/evolution-mail.xml.h:62
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Trajno odstrani vsa zbrisana sporočila iz te mape"
+#: ui/evolution-mail-message.xml.h:52
+msgid "Previous"
+msgstr "Prejšnji"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:54
 msgid "Print Message..."
 msgstr "Natisni sporočilo..."
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:55
 msgid "Print Preview..."
 msgstr "Predogled tiskanja..."
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail-message.xml.h:56
 msgid "Print message to the printer"
 msgstr "Natisni sporočilo na tiskalniku"
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail-message.xml.h:57
 msgid "Redirect (FIXME: implement me)"
 msgstr "Preusmeri (FIXME: implementiraj me)"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail-message.xml.h:58
+msgid "Reply"
+msgstr "Odgovori"
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Reply to All"
+msgstr "Odgovori vsem"
+
+#: ui/evolution-mail-message.xml.h:62
 msgid "S_earch Message"
 msgstr "_Išči sporočilo"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:63
 msgid "Save the message as a text file"
 msgstr "Shrani sporočilo kot datoteko z besedilom"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail-message.xml.h:64
 msgid "Search for text in the body of the displayed message"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Izberi _vse"
-
-#: ui/evolution-mail.xml.h:77
-msgid "Select _Thread"
-msgstr "Izberi _nit"
-
-#: ui/evolution-mail.xml.h:78
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Izberi vse in le tista sporočila, ki trenutno niso izbrana"
-
-#: ui/evolution-mail.xml.h:79
-msgid "Select all messages in the same thread as the selected message"
-msgstr "Izberi vsa sporočila iz iste niti kot izbrano sporočilo"
-
-#: ui/evolution-mail.xml.h:80
-msgid "Select all visible messages"
-msgstr "Izberi vsa vidna sporočila"
-
-#: ui/evolution-mail.xml.h:81
-msgid "Send / Receive"
-msgstr "Oddaja / sprejem"
-
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
-
-#: ui/evolution-mail.xml.h:83
+#: ui/evolution-mail-message.xml.h:65
 msgid "Show Email _Source"
 msgstr "Kaži _izvor pošte"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:66
 msgid "Show Full _Headers"
 msgstr "Kaži celotne _glave"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Show _All"
-msgstr "Kaži _vse"
-
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:67
 msgid "Show message in the normal style"
 msgstr "Kaži sporočila v običajnem slogu"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:68
 msgid "Show message with all email headers"
 msgstr "Kaži sporočila s celotnimi glavami"
 
-#: ui/evolution-mail.xml.h:88
-msgid "Show messages that have been temporarily hidden"
-msgstr "Kaži sporočila, ki so bila začasno skrita"
-
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:69
 msgid "Show the raw email source of the message"
 msgstr "Kaži neposredno izvorno kodo sporočila"
 
-#: ui/evolution-mail.xml.h:90
-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.xml.h:91
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Začasno skrij vsa že prebrana sporočila"
-
-#: ui/evolution-mail.xml.h:92
-msgid "Temporarily hide the selected messages"
-msgstr "Začasno skrij vsa izbrana sporočila"
-
-#: ui/evolution-mail.xml.h:93
-msgid "Threaded Message list"
-msgstr "Niten seznam sporočil"
-
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:70
 msgid "Un-delete the selected messages"
 msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail-message.xml.h:71
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na poštni se_znam..."
 
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:72
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _pošiljatelja..."
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:73
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:74
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail.xml.h:99
-msgid "Virtual Folder _Editor..."
-msgstr "Urejevalnik _virtualnih map..."
-
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:75
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:76
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:77
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail.xml.h:104
-msgid "_Expunge"
-msgstr "_Uniči"
-
-#: ui/evolution-mail.xml.h:105
-msgid "_Filters..."
-msgstr "_Filtri..."
-
-#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:38
-msgid "_Folder"
-msgstr "_Mapa"
-
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:79
 msgid "_Forward Message"
 msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Obrni izbor"
-
-#: ui/evolution-mail.xml.h:109
-msgid "_Mail Message"
-msgstr "_Pošlji sporočilo"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Mail Settings..."
-msgstr "_Nastavive pošte..."
-
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail-message.xml.h:80
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail-message.xml.h:81
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail.xml.h:113
+#: ui/evolution-mail-message.xml.h:82
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail.xml.h:114
+#: ui/evolution-mail-message.xml.h:83
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Re-send Message"
 msgstr "_Znova pošlji sporočilo"
 
-#: ui/evolution-mail.xml.h:119
-msgid "_Send / Receive"
-msgstr "_Oddaja / sprejem"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Zapri to okno"
 
-#: ui/evolution-mail.xml.h:120
-msgid "_Threaded Message List"
-msgstr "_Niten seznam sporočil"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+msgid "Customi_ze Toolbars..."
+msgstr "_Prilagodi orodne vrstice..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:12
+msgid "Customize"
+msgstr "Prilagodi"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:13
+msgid "Customize toolbars"
+msgstr "Prliagodi orodne vrstice"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Zapri"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:65
+msgid "_View"
+msgstr "Po_gled"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Priloži datoteko"
+
 #: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
 #: ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr "Zbriši vse razen podpisa"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Šifriraj to sporočilo s PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Šifriraj to sporočilo z S/MIME šifrirnim certifikatom"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "O_blikuj izpis"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:10
 msgid "Insert a file as text into the message"
 msgstr "Vstavi datoteko v sporočilo kot besedilo"
 
-#: ui/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert text file..."
 msgstr "Vstavi datoteko z besedilom..."
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Odpri datoteko"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "Šifriraj s PGP"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "Podpis s PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
 msgstr "Šifriraj z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Sign"
 msgstr "Podpis z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:240
+msgid "Save"
+msgstr "Shrani"
+
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _Draft"
 msgstr "Shrani _osnutek"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "Shrani v _mapo... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Shrani v mapo..."
 
 #: ui/evolution-message-composer.xml.h:24
+msgid "Save the current file"
+msgstr "Shrani trenutno datoteko"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Shrani trenutno datoteko pod drugim imenom"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Shrani sporočilo v izbrano mapo"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Pošlji"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Pošilji _kaseneje"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Pošlji _kasneje"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Pošlji pošto v HTML obliki"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Pošlji sporočilo kasneje"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Takoj pošlji to sporočilo"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Kaži / skrij priloge"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Kaži priloge"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Kaži priloge"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Podpiši to sporočilo s svojim PGP ključem"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpiši to sporočilo s svojim S/MIME podpisnim certifikatom"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Preklopi prikaz polja BCC"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Preklopi prikaz polja CC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Preklopi prikaz izbirnika Od"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Preklopi prikaz polja Odgovori na"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "Polje _bcc"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr "Polje _cc"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:45
+msgid "_Debug"
+msgstr "_Razhroščuj"
+
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Delete all"
+msgstr "_Zbriši vse"
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "Polje _od"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ui/evolution-message-composer.xml.h:50
-msgid "_Insert text file... (FIXME)"
-msgstr "_Vstavi datoteko z besedilom... (FIXME)"
-
 #: ui/evolution-message-composer.xml.h:51
+msgid "_Insert text file..."
+msgstr "_Vstavi datoteko z besedilom..."
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Odpri..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Polje _Odgovori-na:"
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Varnost"
 
@@ -8892,119 +10235,79 @@ msgstr "_Varnost"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaj mapo na seznam naročenih map"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Mapa"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Osveži seznam"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Osveži seznam map"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Odstrani mapo iz seznama naročenih map"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Naroči"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Prekini naročnino"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Dodali _nalogo (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Poišči znova"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Za_htevek po sestanku (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Obnovi"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Obnovi razveljavljeno dejanje"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Zamenjaj"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Zamenjaj niz"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Odgovori _vsem (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Pošlji poročilo stanja (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Preskoči ponovitev (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Shrani posel in zapri dialog"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Išči enak niz znova"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Cancel Task"
+msgstr "Prekliči opravilo"
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Išči niz"
+#: ui/evolution-task-editor.xml.h:3
+msgid "Delegate Task"
+msgstr "Delegiraj opravilo"
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Razveljavi"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Razveljavi zadnje dejanje"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:33
-msgid "_Appointment (FIXME)"
-msgstr "_Zmenek (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Označi kot opravljeno (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Odgovori (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
+msgstr "Osveži opravilo"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Copy selected task"
+msgstr "Kopiraj izbrano opravilo"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
+msgid "Cut selected task"
+msgstr "Izreži izbrano opravilo"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "New Task"
 msgstr "Nova naloga"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:8
+msgid "Paste task from the clipboard"
+msgstr "Prilepi opravilo z odložišča"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Save task as something else"
 msgstr "Shrani posel kot nekaj drugega"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:11
+msgid "Set task view preferences"
+msgstr "Nastavi pogled opravila"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Tasks Preferences..."
 msgstr "Nastavitve poslov..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:13
+msgid "TasksPreferences"
+msgstr "Nastavitve opravil..."
+
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Naloga"
 
@@ -9012,160 +10315,204 @@ msgstr "_Naloga"
 msgid "About Evolution..."
 msgstr "_O Evoluciji..."
 
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
+msgstr "Dodaj v vrstico z _bližnjicami"
+
 #: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Zapri to okno"
+msgid "Change the name of this folder"
+msgstr "Spremeni ime te mape"
 
 #: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "_Prilagodi orodne vrstice..."
+msgid "Change the properties for this folder"
+msgstr "Spremeni lastnosti te mape"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Prilagodi"
+#: ui/evolution.xml.h:7
+msgid "Copy this folder"
+msgstr "Kopiraj mapo"
 
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Prliagodi orodne vrstice"
+#: ui/evolution.xml.h:8
+msgid "Create _New Folder..."
+msgstr "Ustvari _novo mapo..."
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:9
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Ustvari bližnjico na to mapo v vrstici bližnjic"
+
+#: ui/evolution.xml.h:10
+msgid "Create a new folder"
+msgstr "Ustvari novo mapo"
+
+#: ui/evolution.xml.h:14
+msgid "Delete this folder"
+msgstr "Zbriši to mapo"
+
+#: ui/evolution.xml.h:15
 msgid "Display a different folder"
 msgstr "Pokaži drugo mapo"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:16
 msgid "E_xit"
 msgstr "Iz_hod"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:17
 msgid "Evolution _FAQ"
 msgstr "_Pogosto zastavljena vprašanja"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Evolution _Window"
 msgstr "_Okno Evolucije"
 
-#: ui/evolution.xml.h:11
-msgid "Evolution bar _shortcut"
-msgstr "Evolucijina vrstica z _bližnjicami"
-
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:20
 msgid "Getting _Started"
 msgstr "Kako _začeti"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:21
 msgid "Import an external file format"
 msgstr "Uvozi datoteko zunanje oblike"
 
-#: ui/evolution.xml.h:16
-msgid "Main toolbar"
-msgstr "Glavna orodna vrstica"
+#: ui/evolution.xml.h:23
+msgid "Move this folder to another place"
+msgstr "Prestavi to mapo na drugo mesto"
 
-#: ui/evolution.xml.h:17
-msgid "Remove the selected folder"
-msgstr "Odstrani izbrano mapo"
+#: ui/evolution.xml.h:25
+msgid "Open in New _Window"
+msgstr "Odpri v novem _oknu"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:26
+msgid "Open this folder in an other window"
+msgstr "Odpri to mapo v drugem oknu"
+
+#: ui/evolution.xml.h:27
 msgid "Show information about Evolution"
 msgstr "Kaži podatke o Evoluciji"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:29
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:30
 msgid "Submit bug report using Bug Buddy."
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy."
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:31
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:33
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:34
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mrežo"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:35
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:36
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:37
 msgid "Using the _Mailer"
 msgstr "Uporaba _pošte"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:40
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.xml.h:32
-msgid "_Actions"
-msgstr "_Dejanja"
+#: ui/evolution.xml.h:42
+msgid "_Appointment (FIXME)"
+msgstr "_Zmenek (FIXME)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:44
+msgid "_Contact (FIXME)"
+msgstr "_Kontakt (FIXME)"
+
+#: ui/evolution.xml.h:45
+msgid "_Copy..."
+msgstr "_Kopiraj..."
+
+#: ui/evolution.xml.h:50
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:53
 msgid "_Import file..."
 msgstr "_Uvozi datoteko..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:54
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:55
 msgid "_Mail message"
 msgstr "_Pošlji sporočilo"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:56
+msgid "_Move..."
+msgstr "_Prestavi..."
+
+#: ui/evolution.xml.h:58
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:47
-msgid "_Remove"
-msgstr "_Odstrani"
+#: ui/evolution.xml.h:60
+msgid "_Rename..."
+msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:61
+msgid "_Shortcut"
+msgstr "_Bližnjica"
+
+#: ui/evolution.xml.h:62
 msgid "_Shortcut Bar"
-msgstr "_Vrstica z bljižnjicami"
+msgstr "_Vrstica z bližnjicami"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:63
+msgid "_Task (FIXME)"
+msgstr "_Naloga (FIXME)"
+
+#: ui/evolution.xml.h:66
 msgid "_Work Offline"
 msgstr "_Delaj brez mreže"
 
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr "Spremeni nastavitve za Mojo Evolucijo"
+
+#: ui/my-evolution.xml.h:4
+msgid "_My Evolution Settings..."
+msgstr "_Nastavive Moje Evolucije..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+msgid "Address Cards"
 msgstr "Vizitke"
 
 #: views/addressbook/galview.xml.h:2
@@ -9176,6 +10523,22 @@ msgstr "Po podjetju"
 msgid "Phone List"
 msgstr "Seznam telefonov"
 
+#: views/calendar/galview.xml.h:1
+msgid "Day View"
+msgstr "Dnevni pogled"
+
+#: views/calendar/galview.xml.h:2
+msgid "Month View"
+msgstr "Mesečni pogled"
+
+#: views/calendar/galview.xml.h:3
+msgid "Week View"
+msgstr "Tedenski pogled"
+
+#: views/calendar/galview.xml.h:4
+msgid "Work Week View"
+msgstr "Pogled delavnega tedna"
+
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "Po pošiljatelju"
@@ -9279,62 +10642,127 @@ msgstr "Vsi udeleženi"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Trenutni pogled"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Določi poglede"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PTSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
+#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
 msgid "Now"
 msgstr "Sedaj"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "V redu"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datum mora biti v obliki: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr "Baltski"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr "Srednjeevropski"
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr "Kitajski"
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr "Cirilični"
+
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
+msgstr "Grški"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr "Japonski"
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr "Korejski"
+
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr "Turški"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr "Unicode"
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr "Zahodnoevropski"
+
+#: widgets/misc/e-charset-picker.c:85
+msgid "Traditional"
+msgstr "Tradicionalen"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr "Poenostavljen"
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr "Ukrajinski"
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Nov"
+
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
+msgstr "Neznan nabor znakov: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr "Vpišite nabor znakov, ki naj se uporablja"
+
+#: widgets/misc/e-charset-picker.c:277
+msgid "Other..."
+msgstr "Drugo..."
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr "Nabor znakov"
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:167
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:238
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Shrani kot..."
-
 #: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Kaži vse"
 
-#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Uredi..."
-
 #: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Napredno..."
@@ -9347,6 +10775,10 @@ msgstr "Podatki"
 msgid "Warning"
 msgstr "Opozorilo"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Napaka"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Vprašanje"
@@ -9384,6 +10816,579 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid "As _Minicards"
+#~ msgstr "Kot _minivizitke"
+
+#~ msgid "As _Table"
+#~ msgstr "Kot tabelo"
+
+#~ msgid "Find..."
+#~ msgstr "Poišči..."
+
+#~ msgid "%A, %e %B %Y"
+#~ msgstr "%A, %e %B %Y"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Napaka ob nalaganju koledarja: <br>Postopek ni podprt"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarmi pretečejo čez"
+
+#~ msgid "Audio Alarms"
+#~ msgstr "Zvočni alarmi"
+
+#~ msgid "Colors"
+#~ msgstr "Barve"
+
+#~ msgid "Display options"
+#~ msgstr "Pokaži možnosti"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Omogoči podaljšanje spanja za"
+
+#~ msgid "Highlight"
+#~ msgstr "Osvetli"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Predmeti z rokom danes:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Predmeti z rokom v prihodnosti"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Predmeti z rokom v prihodnosti:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Predmeti s prekoračenim rokom:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Naloge"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Čas do preteka"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Vidni alarmi"
+
+#~ msgid "Work week"
+#~ msgstr "Delavni teden"
+
+#~ msgid "Edit Task"
+#~ msgstr "Uredi nalogo"
+
+#~ msgid "Appointment - %s"
+#~ msgstr "Zmenek - %s"
+
+#~ msgid "Task - %s"
+#~ msgstr "Naloga - %s"
+
+#~ msgid "Journal entry - %s"
+#~ msgstr "Vpis v dnevniku - %s"
+
+#~ msgid "No summary"
+#~ msgstr "Ni povzetka"
+
+#~ msgid "Mark Complete"
+#~ msgstr "Označi kot opravljeno"
+
+#~ msgid "Edit the task"
+#~ msgstr "Uredi opravilo"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Načrtuj sestanek"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Komponenta je bila uspešno posodobljena."
+
+#~ msgid "There was an error loading the calendar file."
+#~ msgstr "Napaka ob nalaganju datoteke koledarja."
+
+#~ msgid "I couldn't open your calendar file!\n"
+#~ msgstr "Nisem mogel odpreti datoteke koledarja!\n"
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Nisem mogel naložiti vašege datoteke koledarja!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "To je odgovor nekoga, ki ni bil povabljen!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Nisem mogel posodobiti vaše shrambe koledarja."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Nisem mogel zbriati komponente koledarja!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Komponenta uspešno zbrisana."
+
+#~ 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 " Accept "
+#~ msgstr " Sprejmi "
+
+#~ msgid " Decline "
+#~ msgstr " Zavrni "
+
+#~ msgid " Tentative "
+#~ msgstr " Poskusno "
+
+#~ msgid "Update Calendar"
+#~ msgstr "Posodobi koledar"
+
+#~ msgid "Attendee"
+#~ msgstr "Udeležen"
+
+#~ msgid "Attendee address"
+#~ msgstr "Naslov udeleženca"
+
+#~ msgid "Attendees: "
+#~ msgstr "Udeleženi:"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Prekliči\n"
+#~ "sestanek"
+
+#~ msgid "Chair"
+#~ msgstr "Stol"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Ne-sodelujoči"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Možni sodelujoči"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizator: "
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Objavi\n"
+#~ "dogodek"
+
+#~ msgid "RSVP"
+#~ msgstr "RSVP"
+
+#~ msgid "Required Participant"
+#~ msgstr "Potrebni udeleženci"
+
+#~ msgid "Role"
+#~ msgstr "Vloga"
+
+#~ msgid ""
+#~ "Schedule\n"
+#~ "Time"
+#~ msgstr ""
+#~ "Načrtuj\n"
+#~ "čas"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "Uredi zmenek"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Osnove zmenkov"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Datum _pričetka:"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Nisem mogel preveriti ključavnične datoteke %s: %s"
+
+#~ msgid "Error hashing password."
+#~ msgstr "Napaka ob razprševanju gesla."
+
+#~ msgid "Invalid password."
+#~ msgstr "Neveljavno geslo.7"
+
+#~ msgid "Could not sign: failed to create content info."
+#~ msgstr "Nisem mogel podpisati: nisem uspel ustvariti podatkov o vsebini."
+
+#~ msgid "Could not sign: failed to create signing context."
+#~ msgstr ""
+#~ "Nisem mogel podpisati: nisem uspel ustvariti podpisovalnega konteksta"
+
+#~ msgid "Could not sign: failed to create signature."
+#~ msgstr "Nisem mogel podpisati: nisem uspel ustvariti podpisa"
+
+#~ msgid "'clearsign' is not supported by S/MIME."
+#~ msgstr "'čisto podpisovanje' v S/MIME ni podprto."
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Nisem mogel šifrirati: nisem uspel ustvariti podatkovne ovojnice."
+
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "Nisem mogel šifrirati: nisem uspel ustvariti konteksta šifriranja"
+
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Nisem mogel šifrirati podatkov: neveljaven ključ uporabnika \"%s\"."
+
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Nisem mogel šifirirati: enkodiranje ni uspelo."
+
+#~ msgid "Failed to decrypt: Unknown"
+#~ msgstr "Nisem uspel dešifirati: vzrok neznan"
+
+#~ msgid "Inline attachment"
+#~ msgstr "Priloga kot del sporočila"
+
+#~ msgid "Send as:"
+#~ msgstr "Pošlji kot:"
+
+#~ msgid ""
+#~ "This version of Evolution was not built with support for S/MIME.\n"
+#~ "You may wish to instead use PGP to %s your document."
+#~ msgstr ""
+#~ "Ta različica Evolucije ni bila zgrajena s podporo za S/MIME.\n"
+#~ "Morda želite uporabiti PGP za %s vašega dokumenta."
+
+#~ msgid "sign and encrypt"
+#~ msgstr "podpis in šifriranje"
+
+#~ msgid "sign"
+#~ msgstr "podpis"
+
+#~ msgid "encrypt"
+#~ msgstr "šifriranje"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel odpreti datoteke s podpisom %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "To ni običajna datoteka."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Ta datoteka obstaja a ni berljiva."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Datoteka se je zdela dostopna a open(2) ni uspel."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Datoteka je zelo velika (čez 100K).\n"
+#~ "Ste prepričani,da jo želite vstaviti?"
+
+#~ msgid "An error occurred while reading the file."
+#~ msgstr "Ob branju datoteke se je zgodila napaka."
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel odpreti HTML datoteke:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Datoteka nima mesta za storitve.\n"
+
+#~ msgid "Select a service"
+#~ msgstr "Izberi storitev"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
+#~ "\n"
+#~ "Pustite pravno za privzete nastavitve"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Odpri %s s privzetim GNOMEovim programom"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Pošlji e-pošto %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Poženi %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Zapri %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Premakni %s na levo"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Premakni %s na desno"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Premakni %s v prešnjo vrstico"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Premakni %s v naslednjo vrstico"
+
+#~ msgid "Appearance"
+#~ msgstr "Videz"
+
+#~ msgid "Background:"
+#~ msgstr "Ozadje:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
+#~ "Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
+#~ "da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Tovarna za povzetke RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Povzetek RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Tovarna za preizkusno komponento bonobo."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Tovarna za preizkusno komponento."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Preizkusi storitev bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Preizkusi storitev"
+
+#~ msgid "Update automatically"
+#~ msgstr "Samodejno posodobi"
+
+#~ msgid "Update every "
+#~ msgstr "Posodobi vsakih"
+
+#~ msgid "PGP"
+#~ msgstr "PGP"
+
+#~ msgid "Could not create a S/MIME verification context."
+#~ msgstr "Nisem mogel ustvariti konteksta preverjanja S/MIME."
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "V cev je bilo zapisano nepopolno sporočilo!"
+
+#~ msgid "Reply to the sender of this message"
+#~ msgstr "Odgovori pošiljatelju tega sporočila"
+
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "Odgovori vsem prejemnikom tega sporočila"
+
+#~ msgid "Delete this message"
+#~ msgstr "Zbriši to sporčilo"
+
+#~ msgid "Previous message"
+#~ msgstr "Prejšnje sporočilo"
+
+#~ msgid "Next message"
+#~ msgstr "Naslednje sporočilo"
+
+#~ msgid "Activate"
+#~ msgstr "Aktiviraj"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Aktiviraj to bližnjico"
+
+#~ msgid "Find"
+#~ msgstr "Poišči"
+
+#~ msgid "Find a contact"
+#~ msgstr "Poišči stik"
+
+#~ msgid "View All"
+#~ msgstr "Glej vse"
+
+#~ msgid "View all contacts"
+#~ msgstr "Glej vse stike"
+
+#~ msgid "About this application"
+#~ msgstr "O tem programu"
+
+#~ msgid "About..."
+#~ msgstr "O programu..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "_Dejanja"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "A_dresar... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "Poč_isti"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_Preveri imena (FIXME)"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Počisti izbiro"
+
+#~ 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"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "P_rvi predmet v mapi (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Posreduj (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Pojdi na naslednji predmet"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Pojdi na prejšnji predmet"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Ne_popolna naloga (FIXME)"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Spremeni lastnosti datoteke"
+
+#~ msgid "N_ext"
+#~ msgstr "Napr_ej"
+
+#~ msgid "Pre_vious"
+#~ msgstr "P_rejšnji"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Nas_tavitev tiskanja..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Načrtuj nek tip sestanka"
+
+#~ msgid "Select everything"
+#~ msgstr "Izberi vse"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Zahtevek opravila (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "_O programu..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Predmet (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Dnevniški zapis (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Zadnji predmet v mapi (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "Pošlji _sporočilo (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Prestavi v mapo... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Opomba (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Predmet neprebran(FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Dodaj storitev"
+
+#~ 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 "Executive Summary Settings..."
+#~ msgstr "Nastaviteve povzetka..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nova pošta"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Vstavi datoteko z besedilom... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Dodali _nalogo (FIXME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Za_htevek po sestanku (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Obnovi"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Obnovi razveljavljeno dejanje"
+
+#~ msgid "Replace"
+#~ msgstr "Zamenjaj"
+
+#~ msgid "Replace a string"
+#~ msgstr "Zamenjaj niz"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Odgovori _vsem (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "Pošlji poročilo stanja (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "Preskoči ponovitev (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Išči enak niz znova"
+
+#~ msgid "Search for a string"
+#~ msgstr "Išči niz"
+
+#~ msgid "Undo"
+#~ msgstr "Razveljavi"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Razveljavi zadnje dejanje"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Označi kot opravljeno (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Odgovori (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolucijina vrstica z _bližnjicami"
+
+#~ msgid "Remove the selected folder"
+#~ msgstr "Odstrani izbrano mapo"
+
+#~ msgid "_Remove"
+#~ msgstr "_Odstrani"
+
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either\n"
 #~ "means you have entered an incorrect URI, or have tried\n"
@@ -9396,7 +11401,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr ""
 #~ "Adresarja ni bilo mogoče odpreti. To lahko pomeni ali\n"
 #~ "da ste vnesli napačen URI, ali pa poskušali dostopati \n"
-#~ "do LDAP strežnika brez prevedene LDAP podpore. Če ste \n"
+#~ "do strežnika LDAP brez prevedene podpore LDAP. Če ste \n"
 #~ "vnesli URI, preverite njegovo pravilnost in ga znova \n"
 #~ "vnesite. Če ne, ste verjetno poskušali dostopati do LDAP \n"
 #~ "strežnika. Če želite uporabljalti LDAP morate naložiti in \n"
@@ -9405,9 +11410,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "SASL"
 #~ msgstr "SASL"
 
-#~ msgid "Show all "
-#~ msgstr "Kaži vse "
-
 #~ msgid "%s is not a selectable folder"
 #~ msgstr "%s ni mogoče izbrati kot mapo"
 
@@ -9450,9 +11452,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Move message to a new folder"
 #~ msgstr "Prestavi sporočilo v novo mapo"
 
-#~ msgid "Open in New Window"
-#~ msgstr "Odpri v novem oknu"
-
 #~ msgid "Print Preview of message..."
 #~ msgstr "Predogled tiskanja sporočila..."
 
@@ -9487,9 +11486,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Attachment"
 #~ msgstr "_Priloga"
 
-#~ msgid "_Open Selected Items"
-#~ msgstr "Odpri izbrane predmete"
-
 #~ msgid "_Reply"
 #~ msgstr "_Odgovori"
 
@@ -9569,9 +11565,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Port number in URL `%s' is non-numeric"
 #~ msgstr "Številka vrat v URL '%s' ni numerična"
 
-#~ msgid "Secure IMAPv4"
-#~ msgstr "Varni IMAPv4"
-
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
 #~ msgstr "Za branje in hranjenje pošte na IMAP strežnikih preko povezave SSL."
 
@@ -9640,9 +11633,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Mail Configuration Druid"
 #~ msgstr "Druid za nastavitev pošte"
 
-#~ msgid "Optional"
-#~ msgstr "Dodatno"
-
 #~ msgid "Password:"
 #~ msgstr "Geslo:"
 
@@ -9658,18 +11648,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Required"
 #~ msgstr "Potrebno"
 
-#~ msgid "Select signature file"
-#~ msgstr "Izberi datoteko s podpisom"
-
 #~ msgid "Server type:"
 #~ msgstr "Vrsta strežnika:"
 
-#~ msgid "Signature:"
-#~ msgstr "Podpis:"
-
-#~ msgid "Source"
-#~ msgstr "Izvorna koda"
-
 #~ msgid "Transport"
 #~ msgstr "Prenos"
 
@@ -9724,9 +11705,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "JP Rosevear <jpr@helixcode.com>"
 #~ msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#~ msgid "Original Author:"
-#~ msgstr "Prvotni avtor:"
-
 #~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 #~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
@@ -9787,16 +11765,16 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Evolucijin veznik Koledarja"
 
 #~ msgid "Configure the todo conduit"
-#~ msgstr "Nastavi veznik za-opravit"
+#~ msgstr "Nastavi veznik opravil"
 
 #~ msgid "Evolution ToDo conduit "
-#~ msgstr "Evolucijin veznik za-opravit"
+#~ msgstr "Evolucijin veznik opravil"
 
 #~ msgid "Evolution ToDo Conduit"
-#~ msgstr "Evolucijin veznik za-opravit"
+#~ msgstr "Evolucijin veznik opravil"
 
 #~ msgid "Configuration utility for the evolution todo conduit.\n"
-#~ msgstr "Nastavitveno orodje za Evolucijin za-opravit veznik.\n"
+#~ msgstr "Nastavitveno orodje za Evolucijin veznik opravil.\n"
 
 #~ msgid "label21"
 #~ msgstr "označba21"
@@ -9848,9 +11826,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "Prioriteta mora biti med vključno 1 in 9"
 
-#~ msgid "Schedule meeting"
-#~ msgstr "Načrtuj sestanek"
-
 #~ msgid "Edit this appointment..."
 #~ msgstr "Uredi ta zmenek..."
 
@@ -9863,9 +11838,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Account Properties"
 #~ msgstr "Lastnosti računa"
 
-#~ msgid "E-Mail Address:"
-#~ msgstr "E-poštni naslov:"
-
 #~ msgid "Include in \"Get Mail\" operations."
 #~ msgstr "Vključuj v operacije \"Dobi pošto\"."
 
@@ -9929,9 +11901,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_VFolder on Subject"
 #~ msgstr "vMapa glede na _Zadevo"
 
-#~ msgid "New"
-#~ msgstr "Nov"
-
 #~ msgid "Customi_ze..."
 #~ msgstr "_Prilagodi..."
 
@@ -9953,9 +11922,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Body or subject contains"
 #~ msgstr "Telo ali zadeva vsebuje"
 
-#~ msgid "Body contains"
-#~ msgstr "Telo vsebuje"
-
 #~ msgid "Subject contains"
 #~ msgstr "Zadeva vsebuje"
 
@@ -10005,13 +11971,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Naloži mapo %s za %s"
 
 #~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Napaka ob pripravljanju na %s:\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error while `%s':\n"
 #~ "%s"
 #~ msgstr ""
@@ -10106,9 +12065,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "You are now ready to send and receive email \n"
 #~ msgstr "Sedaj ste pripravljeni za sprejemanje e-pošte \n"
 
-#~ msgid "using Evolution. \n"
-#~ msgstr "z Evolucijo. \n"
-
 #~ msgid "Click \"Finish\" to save your settings."
 #~ msgstr "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
@@ -10145,9 +12101,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME: In_complete Task"
 #~ msgstr "FIXME: Do_končana naloga"
 
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: Vstavi datoteko"
-
 #~ msgid "FIXME: It_em..."
 #~ msgstr "FIXME: Pr_edmet..."
 
@@ -10259,9 +12212,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Redo"
 #~ msgstr "Obnovi"
 
-#~ msgid "_Replace..."
-#~ msgstr "_Zamenjaj..."
-
 #~ msgid "_Toolbars"
 #~ msgstr "_Orodjarne"
 
@@ -10280,9 +12230,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Open..."
 #~ msgstr "Odpri..."
 
-#~ msgid "Days"
-#~ msgstr "Dni"
-
 #~ msgid "Hours"
 #~ msgstr "Ur"
 
@@ -10292,9 +12239,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Minutes"
 #~ msgstr "Minut"
 
-#~ msgid "Time"
-#~ msgstr "Čas"
-
 #~ msgid "_Audio"
 #~ msgstr "_Zvok"
 
@@ -10307,13 +12251,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "event-editor-dialog"
 #~ msgstr "dialog-urejevalec-dogodkov"
 
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisem mogel odpreti datoteke: %s:\n"
-#~ "%s"
-
 #~ msgid "Open a calendar"
 #~ msgstr "Odpri koledar"
 
@@ -10391,13 +12328,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Številka trenutnega dne:"
 
 #~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Predmet za-opravit, ki še ni na vrsti:"
-
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Predmet za-opravit, ki je na vrsti danes:"
+#~ msgstr "Opravilo, ki še ni na vrsti:"
 
 #~ msgid "To-Do item that is overdue:"
-#~ msgstr "Predmet za-opravit, ki je že pretekel:"
+#~ msgstr "Opravilo, ki je že pretekel:"
 
 #~ msgid "Recur on the"
 #~ msgstr "Ponovitev na"
@@ -10472,9 +12406,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "today"
 #~ msgstr "danes"
 
-#~ msgid "last"
-#~ msgstr "zadnji"
-
 #~ msgid "this"
 #~ msgstr "ta"
 
@@ -10487,9 +12418,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "third"
 #~ msgstr "tretji"
 
-#~ msgid "fourth"
-#~ msgstr "četrti"
-
 #~ msgid "fifth"
 #~ msgstr "peti"
 
@@ -10499,9 +12427,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "seventh"
 #~ msgstr "sedmi"
 
-#~ msgid "eighth"
-#~ msgstr "osmi"
-
 #~ msgid "ninth"
 #~ msgstr "deveti"
 
@@ -10518,10 +12443,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "nazaj"
 
 #~ msgid "Create to-do item"
-#~ msgstr "Ustvari predmet za-opravit"
+#~ msgstr "Ustvari opravilo"
 
 #~ msgid "Edit to-do item"
-#~ msgstr "Uredi predemet za-opravit"
+#~ msgstr "Uredi opravilo"
 
 #~ msgid "Due Date:"
 #~ msgstr "Do datuma:"
@@ -10556,9 +12481,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Weeks start on"
 #~ msgstr "Tedni se začnejo v"
 
-#~ msgid "Day range"
-#~ msgstr "Razpon dni"
-
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -10572,14 +12494,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Day end:"
 #~ msgstr "Konec dneva:"
 
-#~ msgid "Colors for display"
-#~ msgstr "Barve za prikaz"
-
 #~ msgid "Show on TODO List:"
-#~ msgstr "Pokaži v seznamu za-opravit:"
+#~ msgstr "Pokaži v seznamu opravil:"
 
 #~ msgid "To Do List style options:"
-#~ msgstr "Slog seznama za-opravit:"
+#~ msgstr "Slog seznama opravil:"
 
 #~ msgid "Highlight overdue items"
 #~ msgstr "Osvetli pretečene predmete"
@@ -10588,10 +12507,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Osvetli še nepretečene predmete"
 
 #~ msgid "To Do List Properties"
-#~ msgstr "Lastnosti seznama Za-opravit"
+#~ msgstr "Lastnosti seznama opravil"
 
 #~ msgid "To Do List"
-#~ msgstr "Seznam Za-opravit"
+#~ msgstr "Seznam opravil"
 
 #~ msgid "Preferences"
 #~ msgstr "Nastavitve"
@@ -10846,9 +12765,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Shrani koledar kot"
 
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Ustvari novo mapo..."
-
 #~ msgid "Quick Search"
 #~ msgstr "Hitro iskanje"
 
@@ -10977,9 +12893,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Location"
 #~ msgstr "Lega"
 
-#~ msgid "% Complete"
-#~ msgstr "% končano"
-
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "FIXME: Ko_kedar..."
 
@@ -11068,7 +12981,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Datum zaključka"
 
 #~ msgid "Add to-do item..."
-#~ msgstr "Dodaj predmet za-opravit..."
+#~ msgstr "Dodaj opravilo..."
 
 #~ msgid "Time Left"
 #~ msgstr "Preostalo časa"
@@ -11089,7 +13002,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Sekunda"
 
 #~ msgid "TODO Items"
-#~ msgstr "Predmeti za-opravit"
+#~ msgstr "Opravila"
 
 #~ msgid "%a"
 #~ msgstr "%b"
@@ -11133,9 +13046,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Load a previously saved message"
 #~ msgstr "Naloži prej shranjeno sporočilo"
 
-#~ msgid "_Close..."
-#~ msgstr "_Zapri..."
-
 #~ msgid "_Format"
 #~ msgstr "_Oblika izpisa"
 
@@ -11170,15 +13080,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Da bi dodali stolpec k vaši tabeli, ga potegnite\n"
 #~ "do mesta kjer želite, da se pojavi."
 
-#~ msgid "window1"
-#~ msgstr "okno1"
-
 #~ msgid "Available fields"
 #~ msgstr "Polja na voljo"
 
-#~ msgid "Show in this order"
-#~ msgstr "Kaži v tem vrstnem redu"
-
 #~ msgid "label2"
 #~ msgstr "label2"
 
@@ -11191,9 +13095,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Discard this message?"
 #~ msgstr "Zavrzi to sporočilo"
 
-#~ msgid "Back"
-#~ msgstr "Prejšnji"
-
 #~ msgid "Finish"
 #~ msgstr "Končaj"