Updated Slovenian translation

svn path=/trunk/; revision=9645

1 files changed, 2507 insertions, 1913 deletions

diff --git a/po/sl.po b/po/sl.po
index 139be22a46..a9f2d0e490 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-03-28 18:56+0200\n"
+"POT-Creation-Date: 2001-05-02 11:34+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=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3255
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3257
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3258
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3259
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3260
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3261
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  Družinsko:     "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3287
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3289
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "  Poštni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3291
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3292
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3293
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3294
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "  Poštna številka: "
 
-#: addressbook/backend/ebook/e-card.c:3295
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "  Država:      "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3347
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3369
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "Poštni program: "
 
-#: addressbook/backend/ebook/e-card.c:3375
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Časovni pas: "
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Geografski položaj: "
 
-#: addressbook/backend/ebook/e-card.c:3387
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3399
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3400
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3402
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3403
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3404
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3408
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Kategorije: "
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Enoličen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -299,6 +299,10 @@ msgstr ""
 "\n"
 "Javni ključ: "
 
+#: addressbook/backend/ebook/e-destination.c:232
+msgid "???"
+msgstr "???"
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
 msgid "Factory to import GnomeCard files into Evolution."
 msgstr "Tovarna uvozov datotek GnomeVizitka v Evolucijo."
@@ -307,15 +311,15 @@ msgstr "Tovarna uvozov datotek GnomeVizitka v Evolucijo."
 msgid "Imports GnomeCard files into Evolution."
 msgstr "Uvozi GnomeVizitka datoteke v Evolucijo. "
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:40
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:42
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
@@ -327,20 +331,20 @@ msgstr "Kazalec se ni mogel naložiti\n"
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naložena\n"
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: 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:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
@@ -405,7 +409,7 @@ msgid "Phone Types"
 msgstr "Tipi telefonov"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "prvi e-naslov"
 
@@ -443,8 +447,9 @@ msgid "_Company:"
 msgstr "_Podjetje:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:59 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/folder-browser.c:639 mail/mail-config.glade.h:75
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
+#: ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Zbriši"
 
@@ -492,130 +497,126 @@ msgstr "_Partner(ka):"
 msgid "_This is the mailing address"
 msgstr "_To je poštni naslov"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Zbriši stik?"
-
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Pomočnik"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:608
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Služba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "Služba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Službeni faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Avto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Podjetje"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:609
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:616
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "Doma 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Domači faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:618
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:1312
+#: mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:620
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Email 2"
 msgstr "E-naslov 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:621
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 msgstr "E-naslov 3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:215
+#: addressbook/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
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:217
+#: addressbook/contact-editor/e-contact-quick-add.c:235
 msgid "Edit Full"
 msgstr "Uredi celoto"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:254
+#: addressbook/contact-editor/e-contact-quick-add.c:276
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:260
+#: addressbook/contact-editor/e-contact-quick-add.c:282
 msgid "E-mail"
 msgstr "E-pošta"
 
@@ -731,25 +732,25 @@ msgstr "P_ripona:"
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "Kot _minivizitke"
 
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Kot tabelo"
 
-#: addressbook/gui/component/addressbook.c:413
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: addressbook/gui/component/addressbook.c:441
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:446
+#: addressbook/gui/component/addressbook.c:432
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -768,171 +769,167 @@ msgstr ""
 "strežnika. Če želite uporabljalti LDAP morate naložiti in \n"
 "namestiti OpenLDAP in ponovno prevesti in namestiti Evolucijo. \n"
 
-#: addressbook/gui/component/addressbook.c:569
+#: addressbook/gui/component/addressbook.c:555 widgets/misc/e-filter-bar.h:95
 msgid "Show All"
 msgstr "Kaži vse"
 
-#: addressbook/gui/component/addressbook.c:571
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr "Ime vsebuje"
 
-#: addressbook/gui/component/addressbook.c:603
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr "E-naslov vsebuje"
 
-#: addressbook/gui/component/addressbook.c:746
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Drugo stiki"
-
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "LDAP strežnik"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
 msgstr "Datoteka"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr "Neznan tip adresarja"
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr "Brez (anonimni način)"
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/camel-sasl-plain.c:29 camel/providers/imap/camel-imap-provider.c:77
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:64 mail/mail-config.glade.h:43
+#: 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:43
 msgid "Password"
 msgstr "Geslo"
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr "SASL"
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 msgid "Unknown auth type"
 msgstr "Neznan način avtentifikacije"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "Base"
 msgstr "Osnovno"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr "Ena"
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 msgid "Subtree"
 msgstr "Poddrevo"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr "Neznan tip dosega"
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr "Povezan z domeno:"
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Bind DN Help text here"
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
 #: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr "Zapomni si geslo"
 
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Gostitelj:"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 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:409
 msgid "Port:"
 msgstr "Vrata:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr "FIXME Port help text here."
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "Kornsko ime domene:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr "FIXME Root DN help text here."
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 msgid "Search Scope:"
 msgstr "Doseg iskanja:"
 
-#: addressbook/gui/component/addressbook-config.c:484
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Avtentifikacija:"
 
-#: addressbook/gui/component/addressbook-config.c:502
+#: addressbook/gui/component/addressbook-config.c:507
 #: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Pot:"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr "FIXME Path help text here"
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 msgid "Create path if it doesn't exist."
 msgstr "Če pot ne obstaja jo ustvari."
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 msgid "Edit Addressbook"
 msgstr "Uredi adresar"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 msgid "Add Addressbook"
 msgstr "Dodaj adresar"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:665
 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:666
+#: addressbook/gui/component/addressbook-config.c:671
 #: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Ime:"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr "FIXME Name help text here"
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: addressbook/gui/component/addressbook-config.c:674
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Opis:"
 
-#: addressbook/gui/component/addressbook-config.c:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr "FIXME Description help text here"
 
@@ -941,12 +938,14 @@ msgid "Addressbook Sources"
 msgstr "Viri adresarja"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/widgets/e-minicard.c:673
 #: 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/folder-browser.c:574
-#: mail/mail-config.glade.h:19 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
+#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Zbriši"
 
@@ -957,7 +956,6 @@ msgid "Edit"
 msgstr "Uredi"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Name"
 msgstr "Ime"
 
@@ -965,6 +963,10 @@ msgstr "Ime"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/addressbook-storage.c:99
+msgid "Other Contacts"
+msgstr "Drugo stiki"
+
 #: addressbook/gui/component/e-address-widget.c:365
 msgid "Disable Queries"
 msgstr "Izključi poizvedbe"
@@ -974,12 +976,12 @@ msgid "Enable Queries (Dangerous!)"
 msgstr "Vključi poizvedbe (nevarno!)"
 
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+#: addressbook/gui/component/select-names/e-select-names-popup.c:210
 msgid "Edit Contact Info"
 msgstr "Uredi podatke stika"
 
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:269
 msgid "Add to Contacts"
 msgstr "Dodaj k stikom"
 
@@ -1027,6 +1029,17 @@ 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
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
+msgid "Remove"
+msgstr "Odstrani"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+msgid "Remove All"
+msgstr "Odstrani vse"
+
 #: 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."
@@ -1035,16 +1048,6 @@ msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Odstrani"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
-msgid "Remove All"
-msgstr "Odstrani vse"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Poišči..."
@@ -1061,7 +1064,7 @@ msgstr "Izberi imena"
 msgid "Select name from:"
 msgstr "Izberi ime iz:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Iskanje"
 
@@ -1173,72 +1176,156 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#: addressbook/gui/widgets/e-minicard.c:450
+#: addressbook/gui/widgets/e-addressbook-view.c:513
+#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-minicard.c:466
+#: addressbook/gui/widgets/e-minicard.c:668
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr "Pošlji stik drugim"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+msgid "Send message to contact"
+msgstr "Stiku pošlji sporočilo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+msgid "Print"
+msgstr "Natisni"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+msgid "Print Envelope"
+msgstr "Natisni kuverto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+msgid "File As"
+msgstr "Zavedi kot"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+msgid "Primary Phone"
+msgstr "Osnovni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Assistant Phone"
+msgstr "Pomožni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+msgid "Business Phone"
+msgstr "Službebni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr "Povratni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+msgid "Company Phone"
+msgstr "Telefon podjetja"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+msgid "Home Phone"
+msgstr "Domač telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+msgid "Business Address"
+msgstr "Službeni naslov"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+msgid "Home Address"
+msgstr "Domači naslov"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+msgid "Mobile Phone"
+msgstr "Prenosni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr "Telefon v avtu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+msgid "Business Phone 2"
+msgstr "Službeni telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+msgid "Home Phone 2"
+msgstr "Domač telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+msgid "Other Phone"
+msgstr "Drug telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+msgid "Other Address"
+msgstr "Drug naslov"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr "Oddelek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:631
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:632
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:633
-msgid "Click here to add a contact"
-msgstr "Kliknite tu za dodajo stika"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1252,7 +1339,7 @@ msgstr ""
 "\n"
 "Če želite ustvariti nov stik, dvojno kliknite tu.."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Pogled vizitke"
 
@@ -1436,126 +1523,168 @@ msgstr "Nisem mogel prebrati Pilotovega koledarja"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama za-opravit"
 
-#: calendar/gui/calendar-commands.c:258
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+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
+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
+msgid "Ok"
+msgstr "V redu"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Storitev opozorilnega alarma"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "Tovarna za storitev opozorlinega alarma"
+
+#: calendar/gui/alarm-notify/notify-main.c:56
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+"Ura je %s. Trenutni Unix čas je %ld. Mislili smo, da bi vas lahko zanimalo."
+
+#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+msgid "Could not initialize GNOME"
+msgstr "Nisem mogel inicializirati GNOMEa"
+
+#: calendar/gui/alarm-notify/notify-main.c:108
+msgid "Could not create the alarm notify service factory"
+msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
+
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: calendar/gui/calendar-commands.c:282
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Odpri koledar"
 
-#: calendar/gui/calendar-commands.c:324
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Shrani koledar"
 
-#: calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:468
 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:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
 #: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "javno"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
 #: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
 #: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
+#: calendar/gui/event-editor.c:1633
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "neznano"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: 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:626
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
 msgid "High"
 msgstr "visoka"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1572
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
 msgid "Normal"
 msgstr "običajna"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: 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:624
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
 msgid "Low"
 msgstr "nizka"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
 #: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Prozorno"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
 #: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: 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
 msgid "Not Started"
 msgstr "ni pričeto"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: 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
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: 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
 msgid "Completed"
 msgstr "končano"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: 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
+#: calendar/gui/e-calendar-table.c:429 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:797 e-util/e-time-utils.c:277
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
 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:800 e-util/e-time-utils.c:286
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:802
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1566,22 +1695,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:882
 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:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-accounts.c:116
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1119
-#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: 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:973
+#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
+#: 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
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:970
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1591,71 +1721,83 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1010
 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:1054
+#: calendar/gui/calendar-model.c:1051
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-"Prioriteta mora biti 'Visoka', 'Običajna', 'Nizka' ali 'Nedefinirana'."
+msgstr "Prioriteta mora biti 'Visoka', 'Običajna', 'Nizka' ali 'Nedefinirana'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:1064
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 #: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1105
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Prosojnost mora biti 'Prozorno', 'Prosojno' ali 'Brez'."
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1574
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1576
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1582
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1582
 msgid "No"
 msgstr "Ne"
 
-#: calendar/gui/calendar-summary.c:196
+#: calendar/gui/calendar-summary.c:198
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
+#: calendar/gui/calendar-summary.c:207
+msgid "Appointments"
+msgstr "Zmeneki"
+
+#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:437
+#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Naloge"
+
+#: calendar/gui/calendar-summary.c:443
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Napaka ob nalaganju koledarja</b>"
 
-#: calendar/gui/calendar-summary.c:449
+#: 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/calendar-summary.c:616
+#: calendar/gui/calendar-summary.c:622
 msgid "Display"
 msgstr "Prikaz"
 
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/calendar-summary.c:627
 msgid "Show appointments"
 msgstr "Kaži zmenke"
 
-#: calendar/gui/calendar-summary.c:629
+#: calendar/gui/calendar-summary.c:635
 msgid "Show tasks"
 msgstr "Kaži posle"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:690
+msgid "Things to do"
+msgstr "Stvari za opravit"
+
+#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Nalagam koledar"
 
@@ -1663,39 +1805,6 @@ msgstr "Nalagam koledar"
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-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
-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
-msgid "Ok"
-msgstr "V redu"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Storitev opozorilnega alarma"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "Tovarna za storitev opozorlinega alarma"
-
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Nisem mogel inicializirati GNOMEa"
-
-#: calendar/gui/alarm-notify/notify-main.c:77
-msgid "Could not create the alarm notify service factory"
-msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
-
 #: 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"
@@ -1814,7 +1923,7 @@ msgid "Fri"
 msgstr "pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:484
 msgid "Friday"
 msgstr "petek"
 
@@ -1843,7 +1952,7 @@ msgid "Mon"
 msgstr "pon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:480
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -1879,7 +1988,7 @@ msgid "Sat"
 msgstr "sob"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:485
 msgid "Saturday"
 msgstr "sobota"
 
@@ -1904,7 +2013,7 @@ msgid "Sun"
 msgstr "ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:486
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -1917,7 +2026,7 @@ msgid "Thu"
 msgstr "čet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:483
 msgid "Thursday"
 msgstr "četrtek"
 
@@ -1938,7 +2047,7 @@ msgid "Tue"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:481
 msgid "Tuesday"
 msgstr "torek"
 
@@ -1951,7 +2060,7 @@ msgid "Wed"
 msgstr "sre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:482
 msgid "Wednesday"
 msgstr "sreda"
 
@@ -1968,30 +2077,30 @@ msgstr "minut preden se zgodijo."
 msgid "seconds."
 msgstr "sekund."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, 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:71
+#: calendar/gui/dialogs/delete-comp.c:73
 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:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, 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:80
+#: calendar/gui/dialogs/delete-comp.c:82
 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:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, 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:89
+#: calendar/gui/dialogs/delete-comp.c:91
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ste prepričani, da želite izbrisati ta neimenovan dnevniški vpis?"
 
@@ -1999,6 +2108,29 @@ msgstr "Ste prepričani, da želite izbrisati ta neimenovan dnevniški vpis?"
 msgid "Do you want to save changes?"
 msgstr "Želite shraniti spremembe"
 
+#: calendar/gui/dialogs/task-editor.c:707
+msgid "Edit Task"
+msgstr "Uredi nalogo"
+
+#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
+msgid "No summary"
+msgstr "Ni povzetka"
+
+#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
+#, c-format
+msgid "Appointment - %s"
+msgstr "Zmenek - %s"
+
+#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
+#, c-format
+msgid "Task - %s"
+msgstr "Naloga - %s"
+
+#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Vpis v dnevniku - %s"
+
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #, no-c-format
 msgid "% Comp_lete:"
@@ -2072,29 +2204,6 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Uredi nalogo"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
-msgid "No summary"
-msgstr "Ni povzetka"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
-#, c-format
-msgid "Appointment - %s"
-msgstr "Zmenek - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
-#, c-format
-msgid "Task - %s"
-msgstr "Naloga - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Vpis v dnevniku - %s"
-
 #: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr "kategorije"
@@ -2219,87 +2328,86 @@ msgstr "Zbriši to nalogo"
 msgid "Delete the task"
 msgstr "Zbriši nalogo"
 
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i deljenj minute"
+#. 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
+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
+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:271 calendar/gui/e-day-view.c:1281
-#: calendar/gui/e-week-view-main-item.c:321
+#: 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
 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:275 calendar/gui/e-day-view.c:1295
-#: calendar/gui/e-week-view-main-item.c:330
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
+#: 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:279 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:563 calendar/gui/e-week-view.c:297
-#: calendar/gui/print.c:613
-msgid "am"
-msgstr "dop"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:566 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:612
-msgid "pm"
-msgstr "pop"
-
-#: calendar/gui/e-day-view.c:3027 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Nov zmenek"
 
-#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
 msgid "New All Day Event"
 msgstr "Nov celodnevni dogodek"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
 msgid "Go to Today"
 msgstr "Pojdi na danes"
 
-#: calendar/gui/e-day-view.c:3036 calendar/gui/e-week-view.c:3244
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
 msgid "Go to Date..."
 msgstr "Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3250
-#: mail/folder-browser.c:543 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Odpri"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 msgid "Delete this Appointment"
 msgstr "Zbriši ta zmenek"
 
-#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "Načrtuj sestanek"
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3267
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 msgid "Make this Occurrence Movable"
 msgstr "Naredi to pojavitev prestavljivo"
 
-#: calendar/gui/e-day-view.c:3058 calendar/gui/e-week-view.c:3269
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 msgid "Delete this Occurrence"
 msgstr "Zbriši to pojavitev"
 
-#: calendar/gui/e-day-view.c:3060
+#: calendar/gui/e-day-view.c:3179
 msgid "Delete all Occurrences"
 msgstr "Zbriši vse pojavitve"
 
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i deljenj minute"
+
 #: calendar/gui/e-itip-control.c:161
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nisem mogel posodobiti vašege datoteeke koledarja!\n"
@@ -2349,17 +2457,16 @@ msgid "Add to Calendar"
 msgstr "Dodaj _koledarju"
 
 #: calendar/gui/e-itip-control.c:814
-msgid "Accept"
-msgstr "Sprejmi"
+msgid " Accept "
+msgstr " Sprejmi "
 
 #: calendar/gui/e-itip-control.c:815
-msgid "Decline"
-msgstr "Zavrni"
+msgid " Decline "
+msgstr " Zavrni "
 
 #: calendar/gui/e-itip-control.c:816
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Poskusno"
+msgid " Tentative "
+msgstr " Poskusno "
 
 #: calendar/gui/e-itip-control.c:860
 msgid "Update Calendar"
@@ -2382,7 +2489,7 @@ msgstr "--za--"
 msgid "Calendar Message"
 msgstr "Sporočilo koledarja"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:599
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
 msgid "Date:"
 msgstr "Datum:"
 
@@ -2450,7 +2557,7 @@ msgstr "Možni sodelujoči"
 msgid "Organizer: "
 msgstr "Organizator: "
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
+#: calendar/gui/e-meeting-dialog.glade.h:14
 msgid ""
 "Publish\n"
 "Event"
@@ -2458,11 +2565,11 @@ msgstr ""
 "Objavi\n"
 "dogodek"
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
+#: calendar/gui/e-meeting-dialog.glade.h:16
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
+#: calendar/gui/e-meeting-dialog.glade.h:17
 msgid ""
 "Request\n"
 "Meeting"
@@ -2470,15 +2577,15 @@ msgstr ""
 "Zahtevaj\n"
 "sestanek"
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
+#: calendar/gui/e-meeting-dialog.glade.h:19
 msgid "Required Participant"
 msgstr "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/e-meeting-dialog.glade.h:20
 msgid "Role"
 msgstr "Vloga"
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
+#: calendar/gui/e-meeting-dialog.glade.h:21
 msgid ""
 "Schedule\n"
 "Time"
@@ -2486,8 +2593,8 @@ msgstr ""
 "Načrtuj\n"
 "čas"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
-#: mail/message-list.c:1014
+#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
+#: mail/message-list.c:1082
 msgid "Status"
 msgstr "Stanje"
 
@@ -2510,20 +2617,119 @@ msgstr "Nisem mogel naložiti poslov v `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#. 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:338
-msgid "%d %B"
-msgstr "%d %B"
+#: calendar/gui/event-editor.c:376
+msgid "Edit Appointment"
+msgstr "Uredi zmenek"
 
-#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
-msgid "New Appointment..."
-msgstr "Nov zmenek..."
+#: calendar/gui/event-editor.c:454
+msgid "on"
+msgstr "na"
 
-#: calendar/gui/e-week-view.c:3271
-msgid "Delete All Occurrences"
-msgstr "Zbriši vse pojavitve"
+#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
+msgid "day"
+msgstr "dan"
+
+#: calendar/gui/event-editor.c:606
+msgid "on the"
+msgstr "na"
+
+#: calendar/gui/event-editor.c:613
+msgid "th"
+msgstr "4."
+
+#: calendar/gui/event-editor.c:759
+msgid "occurrences"
+msgstr "pojavitve"
+
+#: calendar/gui/event-editor.c:876
+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:1548
+#, c-format
+msgid " %d days"
+msgstr " %d dni"
+
+#: calendar/gui/event-editor.c:1550
+msgid " 1 day"
+msgstr " 1 dan"
+
+#: calendar/gui/event-editor.c:1553
+#, c-format
+msgid " %d weeks"
+msgstr " %d tedenov"
+
+#: calendar/gui/event-editor.c:1555
+msgid " 1 week"
+msgstr " 1 teden"
+
+#: calendar/gui/event-editor.c:1558
+#, c-format
+msgid " %d hours"
+msgstr " %d ur"
+
+#: calendar/gui/event-editor.c:1560
+msgid " 1 hour"
+msgstr " 1 ura"
+
+#: calendar/gui/event-editor.c:1563
+#, c-format
+msgid " %d minutes"
+msgstr " %d minut"
+
+#: calendar/gui/event-editor.c:1565
+msgid " 1 minute"
+msgstr " 1 minuta"
+
+#: calendar/gui/event-editor.c:1568
+#, c-format
+msgid " %d seconds"
+msgstr " %d sekund"
+
+#: calendar/gui/event-editor.c:1570
+msgid " 1 second"
+msgstr " 1 sekunda"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1593
+msgid "Play a sound"
+msgstr "Predvajaj zvok"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1596
+msgid "Show a dialog"
+msgstr "Kaži dialog"
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1599
+msgid "Send an email"
+msgstr "Pošlji e-pošto"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1602
+msgid "Run a program"
+msgstr "Poženi program"
+
+#: calendar/gui/event-editor.c:1617
+msgid " before start of appointment"
+msgstr " pred pričetkom zmenka"
+
+#: calendar/gui/event-editor.c:1619
+msgid " after start of appointment"
+msgstr " po pričetku zmenka"
+
+#: calendar/gui/event-editor.c:1627
+msgid " before end of appointment"
+msgstr " pred koncem zmenka"
+
+#: calendar/gui/event-editor.c:1629
+msgid " after end of appointment"
+msgstr " po koncu zmenka"
+
+#: calendar/gui/event-editor.c:3137 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"
@@ -2557,11 +2763,6 @@ msgstr "Spremeni"
 msgid "No recurrence"
 msgstr "Ni ponovitev"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
-msgid "Play a sound"
-msgstr "Predvajaj zvok"
-
 #: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Preview"
 msgstr "Predogled"
@@ -2578,25 +2779,10 @@ msgstr "Pravilo ponovitev"
 msgid "Reminder"
 msgstr "Opozorilo"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
-msgid "Run a program"
-msgstr "Poženi program"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
-msgid "Send an email"
-msgstr "Pošlji e-pošto"
-
 #: 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:25
-#: calendar/gui/event-editor.c:1580
-msgid "Show a dialog"
-msgstr "Kaži dialog"
-
 #: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Simple recurrence"
 msgstr "Enostavna ponovitev"
@@ -2666,99 +2852,50 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/event-editor.c:371
-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:65
-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/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+msgid "New Appointment..."
+msgstr "Nov zmenek..."
 
-#: 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/e-week-view.c:3314
+msgid "Delete All Occurrences"
+msgstr "Zbriši vse pojavitve"
 
-#: calendar/gui/event-editor.c:1532
-#, c-format
-msgid " %d days"
-msgstr " %d dni"
+#. 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
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:1534
-msgid " 1 day"
-msgstr " 1 dan"
+#: calendar/gui/gnome-cal.c:223
+msgid "Show all "
+msgstr "Kaži vse "
 
-#: calendar/gui/event-editor.c:1537
-#, c-format
-msgid " %d weeks"
-msgstr " %d tedenov"
+#: calendar/gui/gnome-cal.c:237
+msgid "Summary contains"
+msgstr "Povzetek vsebuje"
 
-#: calendar/gui/event-editor.c:1539
-msgid " 1 week"
-msgstr " 1 teden"
+#: calendar/gui/gnome-cal.c:238
+msgid "Description contains"
+msgstr "Opis vsebuje"
 
-#: calendar/gui/event-editor.c:1542
-#, c-format
-msgid " %d hours"
-msgstr " %d ur"
+#: calendar/gui/gnome-cal.c:239
+msgid "Comment contains"
+msgstr "Komentar vsebuje"
 
-#: calendar/gui/event-editor.c:1544
-msgid " 1 hour"
-msgstr " 1 ura"
+#: calendar/gui/gnome-cal.c:240
+msgid "Has category"
+msgstr "Ima kategorijo"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/gnome-cal.c:843
 #, c-format
-msgid " %d minutes"
-msgstr " %d minut"
-
-#: calendar/gui/event-editor.c:1549
-msgid " 1 minute"
-msgstr " 1 minuta"
+msgid "Could not open the folder in `%s'"
+msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/gnome-cal.c:854
 #, c-format
-msgid " %d seconds"
-msgstr " %d sekund"
-
-#: calendar/gui/event-editor.c:1554
-msgid " 1 second"
-msgstr " 1 sekunda"
-
-#: calendar/gui/event-editor.c:1601
-msgid " before start of appointment"
-msgstr " pred pričetkom zmenka"
-
-#: calendar/gui/event-editor.c:1603
-msgid " after start of appointment"
-msgstr " po pričetku zmenka"
-
-#: calendar/gui/event-editor.c:1611
-msgid " before end of appointment"
-msgstr " pred koncem zmenka"
-
-#: calendar/gui/event-editor.c:1613
-msgid " after end of appointment"
-msgstr " po koncu zmenka"
-
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
+msgid "The method required to open `%s' is not supported"
+msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
 msgid "A sample Bonobo control which displays an calendar."
@@ -2792,16 +2929,6 @@ msgstr "Tvoarna za orodje koledarja iTip"
 msgid "Factory for the sample Calendar control"
 msgstr "Vzorčna tovarna za kontrolo koledarja"
 
-#: calendar/gui/gnome-cal.c:695
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Nisem mogel odpreti imenika v `%s'"
-
-#: calendar/gui/gnome-cal.c:706
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Postopek potreben za naložitev `%s' ni podprt"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -2858,197 +2985,193 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "če"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:944
-msgid "Tasks"
-msgstr "Naloge"
-
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "Trenuten dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Trenutni teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Trenutni mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Trenutno leto (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1333
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:57
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
@@ -3071,10 +3194,10 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolucija je poskušala vzeti vse posle, ki so bili v vaši mapi koledarja "
-"in jih prenesti v novo mapo poslov.\n"
-"Nekaterih poslov ni bilo mogoče prenesti, zato bo ta proces v prihodnosti "
-"še ponovljen."
+"Evolucija je poskušala vzeti vse posle, ki so bili v vaši mapi koledarja in "
+"jih prenesti v novo mapo poslov.\n"
+"Nekaterih poslov ni bilo mogoče prenesti, zato bo ta proces v prihodnosti še "
+"ponovljen."
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
@@ -3082,8 +3205,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prenešen v "
-"mapo poslov."
+"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prenešen v mapo "
+"poslov."
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
@@ -3098,22 +3221,83 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "NPTSČPS"
 
-#: camel/camel-filter-driver.c:860
+#: camel/camel-cipher-context.c:169
+msgid "Signing is not supported by this cipher"
+msgstr "Podpisovanje v tem kodirniku ni podprto"
+
+#: camel/camel-cipher-context.c:209
+msgid "Clearsigning is not supported by this cipher"
+msgstr "Čisto podpisovanje v tem kodirniku ni podprto"
+
+#: camel/camel-cipher-context.c:249
+msgid "Verifying is not supported by this cipher"
+msgstr "Preverjanje v tem kodirniku ni podprta"
+
+#: camel/camel-cipher-context.c:292
+msgid "Encryption is not supported by this cipher"
+msgstr "Šifriranje v tem kodirniku ni podprto"
+
+#: camel/camel-cipher-context.c:334
+msgid "Decryption is not supported by this cipher"
+msgstr "Dešifriranje v tem kodirniku ni podprto"
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+msgid "Syncing folders"
+msgstr "Uskljajujem mape"
+
+#: camel/camel-filter-driver.c:643
+msgid "Unable to open spool folder"
+msgstr "Ne morem odpreti čakalne mape"
+
+#: camel/camel-filter-driver.c:652
+msgid "Unable to process spool folder"
+msgstr ""
+"Nisem mogel obdelati čakalne mape"
+
+#: camel/camel-filter-driver.c:666
+msgid "Getting message %d (%d%%)"
+msgstr "Dobivam sporočilo %d (%d%%)"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+msgid "Failed message %d"
+msgstr "Nauspelo sporočilo %s"
+
+#: camel/camel-filter-driver.c:671
+msgid "Cannot open message"
+msgstr "Ne morem dobiti sporočila"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+msgid "Syncing folder"
+msgstr "Uskljajujem mapo"
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+msgid "Complete"
+msgstr "Končano"
+
+#: camel/camel-filter-driver.c:748
+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
+msgid "Failed at message %d of %d"
+msgstr "Neuspeh pri sporočilu %d od %d"
+
+#: camel/camel-filter-driver.c:866
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:871
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3122,7 +3306,7 @@ msgstr ""
 "Nisem mogel razčleniti iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3131,113 +3315,173 @@ msgstr ""
 "Napaka ob izvajanju iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) zahteva enojen booleanov rezultat"
 
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
 
-#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
 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:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, 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:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Ob pridobivanju ključavnice na %s je pretekla časovna omejitev. Poskusite "
 "znova kasneje."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nisem mogel preverti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, 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:197
+#: 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:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Napaka ob branju poštne datoteke: %s"
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Napaka ob pisanju v začasno poštno datoteko: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, 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:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+msgid "Error copying mail temp file: %s"
+msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
+
+#: camel/camel-pgp-context.c:188
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Prosim vpišite svoje %s geslo za %s"
+
+#: camel/camel-pgp-context.c:191
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Prosim vpišite svoje %s geslo"
+
+#: camel/camel-pgp-context.c:509
+msgid "No plaintext to sign."
+msgstr "Ni besedila za podpis."
+
+#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
+#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+msgid "No password provided."
+msgstr "Geslo ni bilo dano."
+
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
+#: camel/camel-pgp-context.c:1274
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr "Ni besedila za čisti podpis."
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr "Ni besedila za preverbo."
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Nisem mogel ustvariti začasne datoteke: %s"
+
+#: camel/camel-pgp-context.c:1045
+msgid "No plaintext to encrypt."
+msgstr "Ni besedila za šifriranje."
+
+#: camel/camel-pgp-context.c:1071
+msgid "No recipients specified"
+msgstr "Prejemniki niso navedeni"
+
+#: camel/camel-pgp-context.c:1259
+msgid "No ciphertext to decrypt."
+msgstr "Ni šifriranega besedila za dešifriranje."
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr "Nisem mogel naložiti %s: Nalaganje modulov na tem sistemu ni podprto."
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nisem mogel naložiti %s: %s"
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nisem mogel naložiti %s: V modulu ni inicializacijske kode."
 
-#: camel/camel-remote-store.c:187
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "strežnik %s %s"
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "storitev %s za %s na %s"
@@ -3247,7 +3491,7 @@ msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
 #: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
@@ -3258,7 +3502,7 @@ msgstr "(neznan gostitelj)"
 
 #: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
 #: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:263
+#: camel/providers/imap/camel-imap-command.c:287
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
@@ -3266,11 +3510,19 @@ msgstr "Operacija razveljavljena"
 msgid "Server unexpectedly disconnected"
 msgstr "Povezava s strežnikom je bila nepričakovano prekinjena"
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr "Anonimno"
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr "Ta možnost narekuje povezavo s strežnikom z uporabo anonimne prijave."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Avtentifikacija ni usplea."
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -3279,7 +3531,7 @@ msgstr ""
 "Neveljavni podatki o izvoru e-poštnega naslova:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3288,7 +3540,7 @@ msgstr ""
 "Neveljavni podatki sledenja:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -3297,23 +3549,23 @@ msgstr ""
 "Neveljavni podati sledenja:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom z uporabo varnega CRAM-MD5 "
-"gesla, če to podpira strežnik."
+"Ta možnost narekuje povezavo s strežnikom z uporabo varnega CRAM-MD5 gesla, "
+"če to podpira strežnik."
 
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:41
+#: camel/camel-sasl-digest-md5.c:45
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -3321,43 +3573,42 @@ msgstr ""
 "Ta možnost narekuje povezavo s strežnikom z uporabo varnega DIGEST-MD5 "
 "gesla, če to podpira strežnik."
 
-#: camel/camel-sasl-digest-md5.c:799
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Strežnikov izziv predolg (>2048 oktetov)\n"
 
-#: camel/camel-sasl-digest-md5.c:808
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr "Strežnikov izziv ni veljaven\n"
 
-#: camel/camel-sasl-digest-md5.c:814
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Strežnikov izziv je vseboval neveljaven člen \"Quality of Protection\" "
-"(kvaliteta zaščite)\n"
+"Strežnikov izziv je vseboval neveljaven člen \"Quality of Protection"
+"\" (kvaliteta zaščite)\n"
 
-#: camel/camel-sasl-digest-md5.c:836
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr "Odziv strežnika ni vseboval podatkov o avtorizaciji\n"
 
-#: camel/camel-sasl-digest-md5.c:854
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Odziv strežnika je vseboval nepopolne podatke o avtorizaciji\n"
 
-#: camel/camel-sasl-digest-md5.c:864
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr "Odziv strežnika ne ustreza\n"
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom z uporabo avtentikacije Kerberos "
-"4."
+"Ta možnost narekuje povezavo s strežnikom z uporabo avtentikacije Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -3366,60 +3617,76 @@ msgstr ""
 "Nisem mogel dobiti Kerberos vstopniice:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:422
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:429
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
-#: camel/camel-sasl-plain.c:31
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr "Prijava na NT"
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr ""
-"Ta možnost narekuje povezavo s strežnikom z uporabo enostavnega gesla."
+msgstr "Ta možnost narekuje povezavo s strežnikom z uporabo enostavnega gesla."
 
-#: camel/camel-search-private.c:105
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr "Neznano stanje avtentifikacije."
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
 
-#: camel/camel-service.c:139
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniškega imena"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:478
+#: camel/camel-service.c:548
+msgid "Resolving: %s"
+msgstr "RazvozlujemČ %s"
+
+#: camel/camel-service.c:575
+#, c-format
+msgid "Failure in name lookup: %s"
+msgstr "Napaka ob poizvedbi imena: %s"
+
+#: camel/camel-service.c:600
 #, c-format
-msgid "No such host %s."
-msgstr "Ni takšnega gostitelja %s."
+msgid "Host lookup failed: %s: host not found"
+msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:481
+#: camel/camel-service.c:602
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
+msgid "Host lookup failed: %s: unknown reason"
+msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
-#: camel/camel-session.c:54
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Nuditelj virutalne mape e-pošte"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
 
-#: camel/camel-session.c:271 camel/camel-session.c:361
+#: camel/camel-session.c:294 camel/camel-session.c:363
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:459
+#: camel/camel-session.c:478
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3429,228 +3696,283 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:379 mail/mail-ops.c:959 mail/mail-ops.c:966
-#: mail/mail-ops.c:984 mail/mail-ops.c:985
+#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
+#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
 msgid "Trash"
 msgstr "Smeti"
 
-#: camel/camel-url.c:285
-msgid "Could not parse URL `%s'"
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Ne morem odpreti razčleniti URLja '%s'"
+"E-pošta: %s\n"
+"Običajno ime: %s\n"
+"Organizacijska enota: %s\n"
+"Organizacija: %s\n"
+"Krajevnost: %s\n"
+"Regija/Zvezna država: %s\n"
+"Država: %s"
 
-#: camel/camel-vee-folder.c:513
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Slab certifikat od %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Ga želite vseeno sprejeti?"
+
+#: camel/camel-url.c:289
+#, c-format
+msgid "Could not parse URL `%s'"
+msgstr "Ne morem odpreti razčleniti URLja '%s'"
+
+#: camel/camel-vee-folder.c:451
+msgid "No such message %s in %s"
+msgstr "Ni takšnega sporočila %s v %s"
+
+#: camel/camel-vee-folder.c:546
 #, c-format
 msgid "No such message: %s"
 msgstr "Ni takšnega sporočila: %s"
 
-#: camel/providers/imap/camel-imap-command.c:208
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"Ne morete kopirati sporočil iz te mape smeti."
+
+#: camel/providers/imap/camel-imap-message-cache.c:150
+msgid "Could not open cache directory: %s"
+msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
+
+#: camel/providers/imap/camel-imap-command.c:232
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:240
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:295
 msgid "Server response ended too soon."
 msgstr "Odgovor strežnika se je prehitro končal."
 
-#: camel/providers/imap/camel-imap-command.c:455
+#: camel/providers/imap/camel-imap-command.c:487
 #, 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:489
+#: camel/providers/imap/camel-imap-command.c:524
 #, 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:171
+#: camel/providers/imap/camel-imap-folder.c:170
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:350
+#: camel/providers/imap/camel-imap-folder.c:352
 msgid "Scanning IMAP folder"
 msgstr "Pregledujem mapo IMAP"
 
-#: camel/providers/imap/camel-imap-folder.c:972
-#: camel/providers/imap/camel-imap-folder.c:1176
+#: camel/providers/imap/camel-imap-folder.c:1020
+#: camel/providers/imap/camel-imap-folder.c:1240
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1002
-#: camel/providers/imap/camel-imap-folder.c:1210
+#: camel/providers/imap/camel-imap-folder.c:1048
+#: camel/providers/imap/camel-imap-folder.c:1272
 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:40 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
 msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
 
-#: camel/providers/imap/camel-imap-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/providers/imap/camel-imap-provider.c:45 shell/e-shell-view.c:474
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
 msgid "Folders"
 msgstr "Mape"
 
-#: camel/providers/imap/camel-imap-provider.c:47
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
 msgstr "Kaži le naročene mape"
 
-#: camel/providers/imap/camel-imap-provider.c:49
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
 msgstr "Povozi imenski prostor map, ki ga nudi strežnik"
 
-#: camel/providers/imap/camel-imap-provider.c:51
+#: camel/providers/imap/camel-imap-provider.c:54
 msgid "Namespace"
 msgstr "Imenski prostor"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Uveljavi filtre na novih sporočiliv v mapi INBOX tega strežnika"
 
-#: camel/providers/imap/camel-imap-provider.c:60
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:62
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:79
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
+msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:445
+#: camel/providers/imap/camel-imap-store.c:452
 #, 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:455
+#: camel/providers/imap/camel-imap-store.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:486
 #, 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:495
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/imap/camel-imap-store.c:501
+#: camel/providers/smtp/camel-smtp-transport.c:402
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:523
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/imap/camel-imap-store.c:527
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Nisem se mogel avtentificirati na strežniku IMAP.\n"
+"Strežniku IMAP se nisem mogel avtentificirati.\n"
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:877
+#: camel/providers/imap/camel-imap-store.c:864
+msgid "%s is not a selectable folder"
+msgstr "%s ni mogoče izbrati kot mapo"
+
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1352
+#: camel/providers/imap/camel-imap-store.c:1364
 msgid "You must be working online to complete this operation"
 msgstr "Za dokončanje te operacije morate delati z mrežo"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
 msgstr "Poštni imeniki tipa MH"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 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:46
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr "Običajna Unix datoteka poštnega predala"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:50
 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:56
+#: camel/providers/local/camel-local-provider.c:59
 msgid "Qmail maildir-format mail files"
 msgstr "Poštne datoteke tipa Qmail"
 
-#: camel/providers/local/camel-local-provider.c:57
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Za shranjevanje krajevne pošte v imenikih tipa qmail"
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Korenski imenik shrambe %s ni absolutna pot"
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:136
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr "Krajevno shrambe nimajo vhodnega predala"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-local-summary.c:404
+msgid "Unable to add message to summary: unknown reason"
+msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
+
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, 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:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: 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
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3659,19 +3981,19 @@ msgstr ""
 "Ne morem dobiti sporočila: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 msgid "No such message"
 msgstr "Ni takšnega sporočila"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3680,15 +4002,15 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:100
+#: 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:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3697,35 +4019,44 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ni imenik tipa maildir."
 
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: 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:150
+#: camel/providers/local/camel-maildir-store.c:152
 msgid "not a maildir directory"
 msgstr "ni imenik tipa maildir"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Ne morem odpreti poštnega imenika maildir: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:152
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 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:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3734,15 +4065,15 @@ msgstr ""
 "Ne morem dobiti sporočila: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 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:379
+#: camel/providers/local/camel-mbox-folder.c:381
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3751,7 +4082,7 @@ msgstr ""
 "Ne morem odpreti datoteke '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3760,14 +4091,14 @@ msgstr ""
 "Nisem mogel ustvariti datoteke `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni običajna datoteka."
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3776,111 +4107,115 @@ msgstr ""
 "Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
+#: camel/providers/local/camel-mbox-summary.c:249
 msgid "Summarising folder"
 msgstr "Delam povzetek mape"
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:254
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Nisem mogel odpreti mape: %s: povzetek delam od %ld dalje: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:296
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Usodna napaka razčlenjevanja pošte na mestu %ld v mapi %s"
 
-#: camel/providers/local/camel-mbox-summary.c:362
+#: camel/providers/local/camel-mbox-summary.c:371
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne morem narediti povzetka mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1345
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1395
 msgid "Synchronising folder"
 msgstr "Uskljajujem mapo %s"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:524
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
 
-#: camel/providers/local/camel-mbox-summary.c:591
+#: camel/providers/local/camel-mbox-summary.c:600
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Napaka ob pisanju v začasni poštni predal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:617
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:879
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo tipa mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ni imenik."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/local/camel-mh-summary.c:218
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Ne morem odpreti poštnega imenika MH: %s: %s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Prosim vpišite geslo NNTP za %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "Strežnik je zavrnil uporabniško ime"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr "Nisem uspel poslati uporabniškega imena strežniku"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "Strežnik je zavrnil uporabniško ime/geslo"
 
@@ -3904,33 +4239,33 @@ msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "USENET novičke"
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "To je nuditelj za branje in pisanje v novičkarske skupine USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:224
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nisem mogel odpreti imenika za novičkarski strežnik: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:286
 #, c-format
 msgid "USENET News via %s"
 msgstr "USNET Novičke preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:293
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Ta možnost se bo avtentificirala pri strežniku NNTP z nešifriranim geslom."
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:325
+#: camel/providers/nntp/camel-nntp-store.c:488
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
@@ -3939,59 +4274,68 @@ msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
 msgid "Retrieving POP summary"
 msgstr "Prenašam povzetek POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+msgid "Could not check POP server for new messages: %s"
+msgstr "Nisem mogel preveriti strežnika POP za nova sporočila: %s."
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nisem mogel odpreti mape: seznam sporočil je bil nepopoln."
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:290
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Prenašam sporočilo POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:303
+msgid "Could not fetch message: %s"
+msgstr "Nisem mogel dobiti sporočila: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nisem uspel prenesti sporočila s strežnika POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Hramba sporočil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Leave messages on server"
 msgstr "Pusti sporočila na strežniku"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, c-format
 msgid "Delete after %s day(s)"
 msgstr "Zbriši po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:45 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:47
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 "Za povezovanje s strežniki POP. Protokol POP se lahko uporabi tudi za "
-"prenašanje pošte iz nekaterih spletnih nuditeljev pošte in zaprtih "
-"sistemov e-pošte."
+"prenašanje pošte iz nekaterih spletnih nuditeljev pošte in zaprtih sistemov "
+"e-pošte."
 
-#: camel/providers/pop3/camel-pop3-provider.c:66
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom POP z nešifriranim geslom. To "
-"je v večini edina možnost, ki jo strežniki POP podpirajo."
+"Ta možnost narekuje povezavo s strežnikom POP z nešifriranim geslom. To je v "
+"večini edina možnost, ki jo strežniki POP podpirajo."
 
-#: camel/providers/pop3/camel-pop3-provider.c:76
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4001,29 +4345,33 @@ msgstr ""
 "preko protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo "
 "za strežnike, ki trdijo, da jo podpirajo."
 
-#: camel/providers/pop3/camel-pop3-provider.c:88
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
 "avtentifikacijo."
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:209
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
-msgstr "Nisem se mogel avtentificirati do strežnika KPOP: %s"
+msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:300
+#: camel/providers/pop3/camel-pop3-store.c:225
+msgid "Could not connect to server: %s"
+msgstr "Nisem se mogel povezati s strežnikom: %s."
+
+#: camel/providers/pop3/camel-pop3-store.c:329
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nisem se mogel povezati s strežnikom POP na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:339
+#: camel/providers/pop3/camel-pop3-store.c:368
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sProsim vpišite POP3 geslo za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:386
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4032,12 +4380,12 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju uporabniškega imena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:361
-#: camel/providers/pop3/camel-pop3-store.c:398
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:426
 msgid "(Unknown)"
 msgstr "(Neznana)"
 
-#: camel/providers/pop3/camel-pop3-store.c:388
+#: camel/providers/pop3/camel-pop3-store.c:416
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4045,7 +4393,7 @@ msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:396
+#: camel/providers/pop3/camel-pop3-store.c:424
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4054,342 +4402,359 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:497
+#: camel/providers/pop3/camel-pop3-store.c:491
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
 #: mail/mail-config.glade.h:57
 msgid "Sendmail"
 msgstr "Program sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "Za dostavljanjem pošte preko programa \"sendmail\" na krajevnem sistemu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Nisem mogel ustvariti cevi do programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nisem mogel vejiti programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nisem mogel poslati sporočila: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "program sendmail je zaključil s signalom %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nisem mogel izvršiti %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "program sendmail je zaključil s stanjem %d: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
 msgstr "V sporočilu nisem našel naslova 'From' (pošiljatelja)."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "program sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaktična napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaktična napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr "Stanje sistema ali odgvor na pomoč"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "Sporčilo pomoči"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:185
 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:185
+#: camel/providers/smtp/camel-smtp-transport.c:187
 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:189
 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:189
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:195
 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:195
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Zahtevano dejanje preklicano: prekoračena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:199
 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:201
 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizem avtentifikacije je prešibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Za zahtevan mehanizem avtentifikacije je potrebno šifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr "Začasna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, 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:374
+#: camel/providers/smtp/camel-smtp-transport.c:348
+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:387
 #, 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:509
+#: camel/providers/smtp/camel-smtp-transport.c:410
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Strežniku SMTP se nisem mogel avtentificirati.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:526
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:528
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:553
 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:543
+#: camel/providers/smtp/camel-smtp-transport.c:560
 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:557
+#: camel/providers/smtp/camel-smtp-transport.c:574
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:651
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, 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:670
+#: camel/providers/smtp/camel-smtp-transport.c:687
 #, 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:705
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:720
+msgid "Error creating SASL authentication object."
+msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
+
+#: camel/providers/smtp/camel-smtp-transport.c:735
+#: camel/providers/smtp/camel-smtp-transport.c:747
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:775
+#: camel/providers/smtp/camel-smtp-transport.c:797
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:823
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
-"Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila "
-"poslana"
+"Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:819
+#: camel/providers/smtp/camel-smtp-transport.c:842
 #, 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:844
+#: camel/providers/smtp/camel-smtp-transport.c:867
 #, 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:863
+#: camel/providers/smtp/camel-smtp-transport.c:886
 #, 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:894
+#: camel/providers/smtp/camel-smtp-transport.c:917
 #, 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:913
+#: camel/providers/smtp/camel-smtp-transport.c:936
 #, 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:928
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:969
 #, 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"
+"Zahtevek DATA je prekoračil časovno omejitev: konec sporočila: %s: pošta ni "
+"bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:965
+#: camel/providers/smtp/camel-smtp-transport.c:988
 #, 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:989
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1031
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Napaka v odgovoru na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1054
 #, 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:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1073
 #, 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:87
+#: composer/e-msg-composer-attachment-bar.c:95
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: 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:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1014
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
 msgid "Attachment"
 msgstr "Priloga"
 
@@ -4413,60 +4778,7 @@ msgstr "Tip MIME:"
 msgid "Send as:"
 msgstr "Pošlji kot:"
 
-#: composer/e-msg-composer-hdrs.c:314
-msgid "Click here for the address book"
-msgstr "Kliknite tu za adresar"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:695
-msgid "From:"
-msgstr "Od:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:697
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:619
-msgid "Subject:"
-msgstr "Zadeva:"
-
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:699
-msgid "To:"
-msgstr "Za:"
-
-#: composer/e-msg-composer-hdrs.c:377
-msgid "Enter the recipients of the message"
-msgstr "Vnesite prejemnike sporočila"
-
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:701
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:381
-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:384
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:385
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Vnesite naslove, ki bodo prejeli karbonske kopije sporočila, a  se ne bodo "
-"pojavili v seznamu prejemnikov sporočila."
-
-#: composer/e-msg-composer.c:518
+#: composer/e-msg-composer.c:529
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4475,26 +4787,34 @@ msgstr ""
 "Nisem mogel odpreti datoteke s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:699
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:710
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:730
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:193
+#: composer/e-msg-composer.c:802
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Ni mogoče odpreti mape osnutkov za ta račun.\n"
+"Želite uporabiti privzeto mapo osnutkov?"
+
+#: composer/e-msg-composer.c:860 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:866
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4504,27 +4824,27 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:891
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1017
 msgid "That file does not exist."
 msgstr "Datoteka ne obstaja."
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1027
 msgid "That is not a regular file."
 msgstr "To ni običajna datoteka."
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1037
 msgid "That file exists but is not readable."
 msgstr "Ta datoteka obstaja a ni berljiva."
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1047
 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:1027
+#: composer/e-msg-composer.c:1069
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4532,19 +4852,72 @@ msgstr ""
 "Datoteka je zelo velika (čez 100K).\n"
 "Ste prepričani,da jo želite vstaviti?"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1090
 msgid "An error occurred while reading the file."
 msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1391 composer/e-msg-composer.c:1734
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:1770
+#: composer/e-msg-composer.c:1825
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
-#: composer/evolution-composer.c:352
+#: composer/e-msg-composer-hdrs.c:323
+msgid "Click here for the address book"
+msgstr "Kliknite tu za adresar"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+msgid "Reply-To:"
+msgstr "Odgovori-na:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+msgid "Subject:"
+msgstr "Zadeva:"
+
+#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+msgid "To:"
+msgstr "Za:"
+
+#: composer/e-msg-composer-hdrs.c:386
+msgid "Enter the recipients of the message"
+msgstr "Vnesite prejemnike sporočila"
+
+#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:390
+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
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Vnesite naslove, ki bodo prejeli karbonske kopije sporočila, a  se ne bodo "
+"pojavili v seznamu prejemnikov sporočila."
+
+#: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4552,7 +4925,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
 "identitet v komponenti pošte."
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:370
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega skladatelja."
 
@@ -4569,89 +4942,103 @@ msgid "calendar information"
 msgstr "podatki o kodledarju"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
 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:86 e-util/e-time-utils.c:197
+#: 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"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. 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:93 e-util/e-time-utils.c:204
+#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:268
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: e-util/e-time-utils.c:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:273
+#: e-util/e-time-utils.c:274
 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:282
+#: e-util/e-time-utils.c:283
 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:311 widgets/misc/e-dateedit.c:1248
-#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
+#: 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:314
+#: 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:319 widgets/misc/e-dateedit.c:1251
-#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
+#: 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:322
+#: e-util/e-time-utils.c:323
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: 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/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:924
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Nisem mogel odpreti HTML datoteke:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:938
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"Napaka ob branju podatkov:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:956
+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:290
 msgid ""
 "You can select a different HTML page for the background of the Executive "
@@ -4720,28 +5107,6 @@ msgstr "Premakni %s v naslednjo vrstico"
 msgid "Configure %s"
 msgstr "Nastavi %s"
 
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti HTML datoteke:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Napaka ob branju podatkov:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr "Datoteka nima mesta za storitve.\n"
-
 #: executive-summary/component/executive-summary-config.glade.h:1
 msgid "Appearance"
 msgstr "Videz"
@@ -4750,7 +5115,7 @@ msgstr "Videz"
 msgid "Background:"
 msgstr "Ozadje:"
 
-#: executive-summary/component/main.c:60
+#: 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"
@@ -4760,6 +5125,14 @@ msgstr ""
 "Č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."
@@ -4784,87 +5157,87 @@ msgstr "Preizkusi storitev bonobo"
 msgid "Test service"
 msgstr "Preizkusi storitev"
 
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
+#: 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:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr "Samodejno posodobi"
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr "Posodobi sedaj"
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 msgid "Update every "
 msgstr "Posodobi vsakih"
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minut"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "leto"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "let"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "mesec"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "mesecev"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "teden"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "tedenov"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "dni"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "ura"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "ur"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "sekunda"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr " sekund"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Opa. Pozabili ste izbrati datum."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr "Opa. Izbrali ste neveljaven datum."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:276
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4874,7 +5247,7 @@ msgstr ""
 "časom ob katerem se bo pognal filter\n"
 "ali vmapa odprta."
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:299
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4882,7 +5255,7 @@ msgstr ""
 "Datum tega sporočila bo primerjan s časom,\n"
 "ki ga navedete tu."
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:339
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4893,49 +5266,45 @@ msgstr ""
 ".na primer \"teden dni nazaj\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:374
 msgid "the current time"
 msgstr "trenutni čas"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:374
 msgid "a time you specify"
 msgstr "čas, ki ga navedete"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:375
 msgid "a time relative to the current time"
 msgstr "čas, relatievn trenutnemu"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:433
 msgid "Compare against"
 msgstr "Primerjaj z"
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
 msgid "now"
 msgstr "sedaj"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:707
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Pravila filtriranja"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Potem"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Dodaj dejanje"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Odstrani dejanje"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -4943,63 +5312,19 @@ msgstr ""
 "Opa, pozabili ste izbrati mapo.\n"
 "Prosim pojdite nazaj in navedite veljavno mapo kamor naj se pošta dostavi."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Vnesite URI mape"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Napaka v regularnem izrazu '%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Preizkus"
-
-#: filter/filter-rule.c:598
-msgid "Rule name: "
-msgstr "Ime pravila: "
-
-#: filter/filter-rule.c:602
-msgid "Untitled"
-msgstr "Neimenovan"
-
-#: filter/filter-rule.c:618
-msgid "If"
-msgstr "Če"
-
-#: filter/filter-rule.c:635
-msgid "Execute actions"
-msgstr "Izvrši dejanja"
-
-#: filter/filter-rule.c:639
-msgid "if all criteria are met"
-msgstr "če je zadoščeno vsem pogojem"
-
-#: filter/filter-rule.c:644
-msgid "if any criteria are met"
-msgstr "če je zadoščeno kateremukoli pogoju"
-
-#: filter/filter-rule.c:655
-msgid "Add criterion"
-msgstr "Dodaj pogoj"
-
-#: filter/filter-rule.c:661
-msgid "Remove criterion"
-msgstr "Odstrani pogoj"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Uredi filtre"
@@ -5016,7 +5341,7 @@ msgstr "Dohodna"
 msgid "Outgoing"
 msgstr "Odhodna"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
@@ -5040,6 +5365,55 @@ msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
 msgid "with all local folders"
 msgstr "z vsemi krajevnimi mapami"
 
+#: filter/filter-input.c:193
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Napaka v regularnem izrazu '%s':\n"
+"%s"
+
+#: filter/filter-part.c:488
+msgid "Test"
+msgstr "Preizkus"
+
+#: filter/filter-rule.c:626
+msgid "Rule name: "
+msgstr "Ime pravila: "
+
+#: filter/filter-rule.c:630
+msgid "Untitled"
+msgstr "Neimenovan"
+
+#: filter/filter-rule.c:646
+msgid "If"
+msgstr "Če"
+
+#: filter/filter-rule.c:664
+msgid "Execute actions"
+msgstr "Izvrši dejanja"
+
+#: filter/filter-rule.c:668
+msgid "if all criteria are met"
+msgstr "če je zadoščeno vsem pogojem"
+
+#: filter/filter-rule.c:673
+msgid "if any criteria are met"
+msgstr "če je zadoščeno kateremukoli pogoju"
+
+#: filter/filter-rule.c:684
+msgid "Add criterion"
+msgstr "Dodaj pogoj"
+
+#: filter/filter-rule.c:770
+msgid "incoming"
+msgstr "dohodna"
+
+#: filter/filter-rule.c:770
+msgid "outgoing"
+msgstr "odhodna"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Pripiši barvo"
@@ -5188,8 +5562,8 @@ msgstr "Regularni izraz"
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1014
+#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.c:1082
 msgid "Score"
 msgstr "Točke"
 
@@ -5206,159 +5580,187 @@ msgid "sounds like"
 msgstr "zveni kot"
 
 #: filter/libfilter-i18n.h:46
+msgid "Source Account"
+msgstr "Izvorni račun"
+
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:50 mail/message-list.c:1015
+#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "je bilo pred"
 
-#: filter/score-editor.c:126
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr "Pravila"
+
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "Dodaj pravilo"
+
+#: filter/rule-editor.c:299
+msgid "Edit Rule"
+msgstr "Uredi pravilo"
+
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Točke pravil"
 
-#: mail/component-factory.c:319
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:392
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-factory.c:244
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Lastnosti za \"%s\""
-
-#: mail/folder-browser-factory.c:246 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:267
 msgid "Store search as vFolder"
 msgstr "Shrani iskanje kot vMapo"
 
-#: mail/folder-browser.c:510
-msgid "VFolder on Subject"
-msgstr "vMapa glede na Zadevo"
+#: mail/folder-browser.c:575 ui/evolution-mail.xml.h:91
+msgid "VFolder on _Subject"
+msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:513
-msgid "VFolder on Sender"
-msgstr "vMapa glede na Pošiljatelja"
+#: mail/folder-browser.c:578 ui/evolution-mail.xml.h:89
+msgid "VFolder on Se_nder"
+msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:516
-msgid "VFolder on Recipients"
-msgstr "vMapa glede na Prejemnika"
+#: mail/folder-browser.c:581 ui/evolution-mail.xml.h:90
+msgid "VFolder on _Recipients"
+msgstr "vMapa glede na _sprejemnike"
 
-#: mail/folder-browser.c:519 mail/folder-browser.c:710
-msgid "VFolder on Mailing List"
-msgstr "vMapa glede na Poštni seznam"
+#: mail/folder-browser.c:584 ui/evolution-mail.xml.h:88
+msgid "VFolder on Mailing _List"
+msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:525
-msgid "Filter on Subject"
-msgstr "Filter glede na Zadevo"
+#: mail/folder-browser.c:590
+msgid "Filter on Sub_ject"
+msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:528
-msgid "Filter on Sender"
-msgstr "Filter glede na Pošiljatelja"
+#: mail/folder-browser.c:593
+msgid "Filter on Sen_der"
+msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:531
-msgid "Filter on Recipients"
-msgstr "Filter glede na Prejemnike"
+#: mail/folder-browser.c:596
+msgid "Filter on Re_cipients"
+msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:534 mail/folder-browser.c:709
-msgid "Filter on Mailing List"
-msgstr "Filter glede na Poštni seznam"
+#: mail/folder-browser.c:599
+msgid "Filter on _Mailing List"
+msgstr "Filter glede na p_oštni seznam"
+
+#: mail/folder-browser.c:608
+msgid "_Open"
+msgstr "_Odpri"
 
-#: mail/folder-browser.c:545
+#: mail/folder-browser.c:610
 msgid "Resend"
 msgstr "Znova pošlji"
 
-#: mail/folder-browser.c:547
-msgid "Save As..."
-msgstr "Shrani kot..."
+#: mail/folder-browser.c:612 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
+msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:549 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:28 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Natisni"
+#: mail/folder-browser.c:614 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "Na_tisni"
 
-#: mail/folder-browser.c:554
-msgid "Reply to Sender"
-msgstr "Odgovori pošiljatelju"
+#: mail/folder-browser.c:619
+msgid "_Reply to Sender"
+msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:556 mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to All"
-msgstr "Odgovori vsem"
+#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:66
+msgid "Reply to _All"
+msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:558 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward"
-msgstr "Posreduj naprej"
+#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:102
+msgid "_Forward"
+msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:560
-msgid "Forward inline"
-msgstr "Posreduj naprej kot del sporočila"
+#: mail/folder-browser.c:625
+msgid "Forward _inline"
+msgstr "Posreduj naprej kot _del sporočila"
 
-#: mail/folder-browser.c:563
-msgid "Mark as Read"
-msgstr "Označi kot prebrano"
+#: mail/folder-browser.c:628 ui/evolution-mail.xml.h:40
+msgid "Mar_k as Read"
+msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:565
-msgid "Mark as Unread"
-msgstr "Označi kot neprebrano"
+#: mail/folder-browser.c:630 ui/evolution-mail.xml.h:44
+msgid "Mark as U_nread"
+msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:570
-msgid "Move to Folder..."
-msgstr "Prestavi v mapo..."
+#: mail/folder-browser.c:635 ui/evolution-mail.xml.h:107
+msgid "_Move to Folder..."
+msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:572
-msgid "Copy to Folder..."
-msgstr "Kopiraj v mapo..."
+#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:96
+msgid "_Copy to Folder..."
+msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:576
-msgid "Undelete"
-msgstr "Odbriši"
+#: mail/folder-browser.c:641 ui/evolution-mail.xml.h:118
+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:586
+#: mail/folder-browser.c:651 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:590
-msgid "Create Rule From Message"
-msgstr "Iz sporočila ustvari pravilo"
+#: mail/folder-browser.c:655
+msgid "Create Ru_le From Message"
+msgstr "Iz sporočila ustvari _pravilo"
+
+#: mail/folder-browser.c:794
+msgid "Filter on Mailing List"
+msgstr "Filter glede na Poštni seznam"
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:795
+msgid "VFolder on Mailing List"
+msgstr "vMapa glede na Poštni seznam"
+
+#: mail/folder-browser.c:797
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Poštni seznam (%s)"
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:798
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na Poštni seznam (%s)"
 
+#: mail/folder-browser-factory.c:213
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Lastnosti za \"%s\""
+
+#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Lastnosti"
+
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
 msgstr "Evolucijina komponenta za obravnavo pošte."
@@ -5391,6 +5793,55 @@ msgstr "Tovarna za Evolucijino komponento pošte."
 msgid "Factory for the Mail Summary component."
 msgstr "Tovarna za komponento povzetka pošte."
 
+#: mail/importers/elm-importer.c:420
+msgid ""
+"Evolution has found Elm mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolucija je našla poštne datoteke programa Elm.\n"
+"Jih želite uvoziti v Evolucijo?"
+
+#: mail/importers/elm-importer.c:430
+msgid "Elm mail"
+msgstr "Poštni program Elm"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr "Uvozi mbox daoteke v Evolucijo"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Tovarna za uvoz pošte Outlook Express 4 v Evolucijo"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
+
+#: mail/importers/netscape-importer.c:440
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolucija je našla poštne datoteke programa Netscape.\n"
+"Jih želite uvoziti v Evolucijo?"
+
+#: mail/importers/pine-importer.c:385
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolucija je našla poštne datoteke programa Pine.\n"
+"Jih želite uvoziti v Evolucijo?"
+
+
+#: mail/importers/pine-importer.c:395
+msgid "Pine mail"
+msgstr "Poštni program Pine"
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Trenutna oblika hranjenja:"
@@ -5425,65 +5876,65 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:117
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "Niste vpisali vseh potrebnih podatkov."
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:173
+msgid "Evolution Account Editor"
+msgstr "Urejevalnik Evolucijinih računov"
+
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (privzeto)"
 
-#: mail/mail-accounts.c:157
+#: mail/mail-accounts.c:197
 msgid "Disable"
 msgstr "Izključi"
 
-#: mail/mail-accounts.c:159 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
 msgid "Enable"
-msgstr "Vkluči"
+msgstr "Vključi"
 
-#: mail/mail-accounts.c:240 mail/mail-accounts.c:244
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepričani, da želite zbrisati ta račun?"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:373
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 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:487
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr "Upravljalnik Evolucijinih računov"
 
-#: mail/mail-account-editor.c:98
-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:168
-msgid "Evolution Account Editor"
-msgstr "Urejevalnik Evolucijinih računov"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5495,7 +5946,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5503,7 +5954,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5511,11 +5962,11 @@ msgstr ""
 "Nastaviti morate način prenosa pošte\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:194
+#: 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:227
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5523,32 +5974,35 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:296
-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:318
+#: mail/mail-callbacks.c:311
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:583
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Na %s, je %s zapisal:\n"
+#: mail/mail-callbacks.c:354
+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:765
+#: mail/mail-callbacks.c:593
+msgid "On %s, %s wrote:"
+msgstr "Na %s, je %s zapisal(a):"
+
+#: mail/mail-callbacks.c:774
 msgid "Forwarded message:\n"
 msgstr "Posredovano sporočilo:\n"
 
-#: mail/mail-callbacks.c:868
+#: mail/mail-callbacks.c:877
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:870
+#: mail/mail-callbacks.c:879
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:1156
+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:1170
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5556,7 +6010,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1048
+#: mail/mail-callbacks.c:1202
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5564,27 +6018,31 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1081 mail/mail-display.c:86
+#: mail/mail-callbacks.c:1224
+msgid "No Message Selected"
+msgstr "Izbrano ni nilo nobeno sporočilo"
+
+#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
-#: mail/mail-callbacks.c:1085 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
-"Mapa z enakim imenom že obstaja.\n"
+"Datoteka z enakim imenom že obstaja.\n"
 "Naj jo prepišem?"
 
-#: mail/mail-callbacks.c:1129
+#: mail/mail-callbacks.c:1298
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:1131
+#: mail/mail-callbacks.c:1300
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1435
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5593,14 +6051,70 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1293
+#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:1340
+#: mail/mail-callbacks.c:1531
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
+#: mail/mail-callbacks.c:1609
+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:1121 mail/mail-config.c:1124
+msgid "Connecting to server..."
+msgstr "Vzpostavljam povezavo s strežnikom..."
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Prosimo spodaj vpišite svoje ime in e-poštni naslov. Polj \"po želji\" ni "
+"potrebno izpolniti, razen, če ne želite vključiti te podatke v e-pošto, ki "
+"jo boste pošiljali."
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"Prosimo spodaj vpišite podatke o vašem strežniku dohodne pošte. Če ne veste "
+"katero vrsto strežnika uporabljate se obrnite na vašega sistemskega "
+"administratorja ali ponudnika internet dostopa."
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"Prosimo spodaj vpišite podatke o vašem strežniku odhodne pošte. Če ne veste "
+"kater protokol uporabljatie se obrnite na vašega sistemskega administratorja "
+"ali ponudnika internet dostopa."
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"Skoraj ste že končali z procesom nastavljanja pošte. Identiteta, strežnik "
+"prihajajoče pošte in metoda pošiljanja pošte bodo združene skupaj in tako bo "
+"ustvarjen račun pošte Evolucija. Prosimo v prostor spodaj vpišite ime za ta "
+"račun. Ime bo uporabljeno le za prikaz."
+
+#. set window title
+#: mail/mail-config-druid.c:445
+msgid "Evolution Account Wizard"
+msgstr "Evolucijin čarovnik za račune"
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Preveri za podprte tipe"
@@ -5821,208 +6335,170 @@ msgstr ""
 
 #: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
 #: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: mail/mail-config-druid.c:94
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Prosimo spodaj vpišite svoje ime in e-poštni naslov. Polj \"po želji\" "
-"ni potrebno izpolniti, razen, če ne želite vključiti te podatke v "
-"e-pošto, ki jo boste pošiljali."
-
-#: mail/mail-config-druid.c:96
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
-"Prosimo spodaj vpišite podatke o vašem strežniku dohodne pošte. Če ne veste "
-"katero vrsto strežnika uporabljate se obrnite na vašega sistemskega administratorja ali ponudnika internet dostopa."
-
-#: mail/mail-config-druid.c:100
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
-"Prosimo spodaj vpišite podatke o vašem strežniku odhodne pošte. Če ne veste "
-"kater protokol uporabljatie se obrnite na vašega sistemskega administratorja ali ponudnika internet dostopa."
-
-#: mail/mail-config-druid.c:102
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"Skoraj ste že končali z procesom nastavljanja pošte. Identiteta, "
-"strežnik prihajajoče pošte in metoda pošiljanja pošte bodo združene skupaj "
-"in tako bo ustvarjen račun pošte Evolucija. Prosimo v prostor spodaj "
-"vpišite ime za ta račun. Ime bo uporabljeno le za prikaz."
-
-#. set window title
-#: mail/mail-config-druid.c:439
-msgid "Evolution Account Wizard"
-msgstr "Evolucijin čarovnik za račune"
-
-#: mail/mail-display.c:192
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/mail-display.c:293
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:349
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:353
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:1071
-msgid "Open link in browser (FIXME)"
-msgstr "Odpri povezavo v brskalniku (FIXME)"
+#: mail/mail-display.c:1107
+msgid "Open link in browser"
+msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1073
+#: mail/mail-display.c:1109
 msgid "Save as (FIXME)"
 msgstr "Shrani kot (FIXME)"
 
-#: mail/mail-display.c:1075
+#: mail/mail-display.c:1111
 msgid "Copy location (FIXME)"
 msgstr "Kopiraj mesto (FIXME)"
 
-#: mail/mail-format.c:507
+#: mail/mail-format.c:522
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:722
+#: mail/mail-format.c:564
+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:771
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-format.c:1011
+#: mail/mail-format.c:1078
+msgid "No GPG/PGP program configured."
+msgstr "Program GPG/PGP ni nastavljen."
+
+#: mail/mail-format.c:1093
 msgid "Encrypted message not displayed"
 msgstr "Šifrirano sporočilo ni prikazano"
 
-#: mail/mail-format.c:1017
+#: mail/mail-format.c:1099
 msgid "Encrypted message"
 msgstr "Šifrirano sporočilo"
 
-#: mail/mail-format.c:1018
+#: mail/mail-format.c:1100
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za dešifriranje."
 
-#: mail/mail-format.c:1087 mail/mail-format.c:1474
+#: mail/mail-format.c:1190 mail/mail-format.c:1578
 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:1095 mail/mail-format.c:1482
+#: mail/mail-format.c:1198 mail/mail-format.c:1586
 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:1695
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1707
+#: mail/mail-format.c:1811
 #, 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:1711
+#: mail/mail-format.c:1815
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1745
+#: mail/mail-format.c:1849
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1750
+#: mail/mail-format.c:1854
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: mail/mail-local.c:507
+#: mail/mail-local.c:509
 #, c-format
 msgid "Opening '%s'"
 msgstr "Odpiram '%s'"
 
-#: mail/mail-local.c:785
+#: mail/mail-local.c:787
 #, 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:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:813
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "Prenastavljam mapo"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:842
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Zapiram trenutno mapo"
 
-#: mail/mail-local.c:874
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Preimenujem in odpiram staro mapo"
 
-#: mail/mail-local.c:892
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-local.c:906
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Kopiram sporočilo"
 
-#: mail/mail-local.c:923
+#: mail/mail-local.c:924
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
-"Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli "
-"odpreti te mape: %s"
+"Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
+"te mape: %s"
 
-#: mail/mail-local.c:962
+#: mail/mail-local.c:963
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6030,7 +6506,7 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#: mail/mail-mt.c:181
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6039,7 +6515,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:183
+#: mail/mail-mt.c:193
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6048,91 +6524,99 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-mt.c:670 mail/session.c:91
-msgid "Do you accept?"
-msgstr "Sprejemate?"
-
-#: mail/mail-mt.c:864
+#: mail/mail-mt.c:862
 msgid "Evolution progress"
 msgstr "Napredek evolucije"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:599
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:540
+#: mail/mail-ops.c:603
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: mail/mail-ops.c:777
+#: mail/mail-ops.c:718
+msgid "Sending message %d of %d"
+msgstr "Pošiljam sporočilo %d od %d"
+
+#: mail/mail-ops.c:737
+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
+msgid "Complete."
+msgstr "Končano."
+
+#: mail/mail-ops.c:825
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:850
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:850
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočia v %s"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:914
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:917
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osvežujem mape v \"%s\""
 
-#: mail/mail-ops.c:1102
+#: mail/mail-ops.c:1152
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1143 mail/mail-ops.c:1281
+#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1210
+#: mail/mail-ops.c:1260
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1397
+#: mail/mail-ops.c:1447
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1446
+#: mail/mail-ops.c:1496
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1563
 msgid "Retrieving messages"
 msgstr "Prenašam sporočilo"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1573
 #, 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:1597
+#: mail/mail-ops.c:1647
 msgid "Saving messages"
 msgstr "Shranjujem sporočila"
 
-#: mail/mail-ops.c:1676
+#: mail/mail-ops.c:1726
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6141,12 +6625,12 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1739
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Shranjujem sporočilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1703
+#: mail/mail-ops.c:1753
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6155,11 +6639,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1777
+#: mail/mail-ops.c:1827
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:1792
+#: mail/mail-ops.c:1842
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6168,84 +6652,84 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1820
+#: mail/mail-ops.c:1870
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "I_skanje"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 msgid "Cancelling ..."
 msgstr "Preklicujem ..."
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 msgid "Send & Receive mail"
 msgstr "Oddaja in sprejem pošte"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 msgid "Receiving"
 msgstr "Sprejemam"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr "Posodabljam ..."
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
 msgid "Waiting ..."
 msgstr "Čakam ..."
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:306
 msgid "Sending"
 msgstr "Pošiljam"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Končano."
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:110
 msgid "Incomplete message written on pipe!"
 msgstr "V cev je bilo zapisano nepopolno sporočilo!"
 
-#: mail/mail-tools.c:138
+#: mail/mail-summary.c:468
+msgid "Mail Summary"
+msgstr "Povzetek pošte"
+
+#: mail/mail-tools.c:141
 #, 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:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (posredovano sporočilo)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Posreduj: (ni zadeve)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Posredovano sporočilo (brez navedene zadeve)"
 
-#: mail/mail-tools.c:411
+#: mail/mail-tools.c:415
 #, c-format
 msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+"s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"-----Posredovano sporočilo-----<br><b>Od:</b> %s<br><b>Za:</b> "
-"%s<br><b>Predmet:</b> %s<br>"
+"-----Posredovano sporočilo-----<br><b>Od:</b> %s<br><b>Za:</b> %"
+"s<br><b>Predmet:</b> %s<br>"
 
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr "vMape"
 
@@ -6255,307 +6739,182 @@ msgstr "Nova vMapa"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:34
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
 msgid "Reply to the sender of this message"
 msgstr "Odgovori pošiljatelju tega sporočila"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:37
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
+msgid "Reply to All"
+msgstr "Odgovori vsem"
+
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
 msgid "Reply to all recipients of this message"
 msgstr "Odgovori vsem prejemnikom tega sporočila"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
+msgid "Forward"
+msgstr "Posreduj naprej"
+
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
 msgid "Forward this message"
 msgstr "Sporočilo posreduj naprej"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
+#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
 msgid "Print the selected message"
 msgstr "Natisni izbrano sporočilo"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Zbriši to sporčilo"
 
-#: mail/message-list.c:614
+#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr "Prejšnji"
+
+#: mail/message-browser.c:208
+msgid "Previous message"
+msgstr "Prejšnje sporočilo"
+
+#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr "Naprej"
+
+#: mail/message-browser.c:211
+msgid "Next message"
+msgstr "Naslednje sporočilo"
+
+#: mail/message-list.c:678
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:679
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:680
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:681
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:682
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:686
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:623
+#: mail/message-list.c:687
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:691
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:692
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:878
+#: mail/message-list.c:942
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:885
+#: mail/message-list.c:949
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:894
+#: mail/message-list.c:958
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:970
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:978
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:980
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1082
 msgid "Flagged"
 msgstr "Označeno"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1083
 msgid "From"
 msgstr "Od"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1083
 msgid "Date"
 msgstr "Datum"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1083
 msgid "Received"
 msgstr "Sprejeto"
 
-#: mail/message-list.c:1016
+#: mail/message-list.c:1084
 msgid "To"
 msgstr "Za"
 
-#: mail/message-list.c:1016
+#: mail/message-list.c:1084
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/openpgp-utils.c:89
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Prosim vpišite svoje %s geslo za %s"
+#: mail/mail-session.c:161
+msgid "User canceled operation."
+msgstr "Uporabnik je dejanje preklical."
 
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Prosim vpišite svoje %s geslo"
-
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP program ni na voljo."
-
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
-msgid "No password provided."
-msgstr "Geslo ni bilo dano."
-
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr "Prejemniki niso navedeni"
-
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Nisem mogel ustvariti začasne datoteke: %s"
-
-#: mail/subscribe-dialog.c:73 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
 msgid "Folder"
 msgstr "Mapa"
 
-#: mail/subscribe-dialog.c:74
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr "Shramba"
 
-#: mail/subscribe-dialog.c:156
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Prikaži mape, ki se začnejo z:"
 
-#: mail/subscribe-dialog.c:186
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Dobivam shrambo za \"%s\""
 
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:273
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%s\""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Ime mape:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Vrsta mape:"
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+msgid "Manage Subscriptions"
+msgstr "Uredi naročnine"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Navedi kje naj se ustvarimapa:"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:167
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Uvažam %s\n"
-"Uvoznik ni pripravljen.\n"
-"Čakam 5 sekund na nov poskus."
-
-#: shell/importer/importer.c:187 shell/importer/importer.c:218
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Uvažam %s\n"
-"Uvažam predmet %d."
-
-#: shell/importer/importer.c:326
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Ni uvoznika, ki bi lahko obravnaval\n"
-" %s"
-
-#: shell/importer/importer.c:336
-msgid "Importing"
-msgstr "Uvažam"
-
-#: shell/importer/importer.c:344
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Uvažam %s.\n"
-"Pričenjam %s"
-
-#: shell/importer/importer.c:360
-#, c-format
-msgid "Error loading %s"
-msgstr "Napaka ob nalaganju %s"
-
-#: shell/importer/importer.c:375
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Uvažam %s\n"
-"Uvažam predmet 1."
-
-#: shell/importer/importer.c:446
-msgid "Automatic"
-msgstr "Samodeno"
-
-#: shell/importer/importer.c:496
-msgid "Filename:"
-msgstr "Ime datoteke:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:501
-msgid "Select a file"
-msgstr "Izberi datoteko"
-
-#: shell/importer/importer.c:511
-msgid "File type:"
-msgstr "Vrsta datoteke:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:592
-msgid "Import"
-msgstr "Uvozi"
-
-#: shell/importer/importer.c:627
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Izberite datoteko, ki jo želite uvoziti v Evolucijo in izberite vrsto "
-"datoteke s seznama\n"
-"\n"
-"Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
-"ugotoviti."
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Kliknite \"Uvozi\" za pričetek uvoza datoteke v Evolucijo. "
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolucijino uvozno orodje"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolucijino uvozno orodje"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Dobrodošli v Evolucijinem uvnoznem orodju.\n"
-"S tem druidom boste vodeni skozi proces uvoza\n"
-"zunanjih datotek v Evolucijo."
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6563,30 +6922,30 @@ msgstr ""
 "Ta različica Evolucije mora namestiti dodatne datoteke\n"
 "v vaš osebni imenik Evolucije"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
 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:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno prenoviti datotek"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr "Evolucijine datoteke so se uspešno namestile."
 
-#: shell/e-setup.c:189
+#: shell/e-setup.c:195
 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:190
+#: shell/e-setup.c:196
 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:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6597,7 +6956,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6606,7 +6965,7 @@ msgstr ""
 "Ne morem kopirati datotek v\n"
 "`%s'."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6617,7 +6976,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6628,7 +6987,21 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell.c:379
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+
+#: shell/e-shell.c:1249
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Opa!  Pogled `%s' je nepričakovano umru.  :-(\n"
+"To verjetno pomeni, da se je komponenta %s sesula."
+
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6637,11 +7010,11 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "Izbrano ime mape ni veljavno."
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:263
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
@@ -6653,27 +7026,41 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:321
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
-#: shell/e-shell-view-menu.c:160
+#: shell/e-shell-view.c:148
+msgid "(No folder displayed)"
+msgstr "(Nobena mapa ni prikazana)"
+
+#: shell/e-shell-view.c:1184
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolucija %s"
+
+#: shell/e-shell-view.c:1186
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolucija %s [%s]"
+
+#: shell/e-shell-view-menu.c:173
 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:166
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:195
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Avtorske pravice pridržane 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:197
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6683,47 +7070,23 @@ msgstr ""
 "GNOME za delo v skupinah, za pošto, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:361
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Nobena mapa ni prikazana)"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolucija %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolucija %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
-
-#: shell/e-shell.c:1242
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Opa!  Pogled `%s' je nepričakovano umru.  :-(\n"
-"To verjetno pomeni, da se je komponenta %s sesula."
+#: shell/e-shortcuts.c:381
+msgid "Error saving shortcuts."
+msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6732,76 +7095,62 @@ msgstr ""
 "Zares želite odstraniti skupino\n"
 "`%s' iz vrstice bližnjic?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Kaži bližnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Kaži bližnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Aktiviraj"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Aktiviraj to bližnjico"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Napaka ob shranjevanju bližnjic."
-
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
-msgstr "Po_gled"
-
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Poglej izbrane mape"
-
 #: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Brez imena)"
@@ -6850,11 +7199,155 @@ msgstr "Operacija ni podprta"
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
+#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
+msgid "_View"
+msgstr "Po_gled"
+
+#: shell/e-storage-set-view.c:650
+msgid "View the selected folder"
+msgstr "Poglej izbrane mape"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Ime mape:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Vrsta mape:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "Navedi kje naj se ustvarimapa:"
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Evolucijina lupina."
 
-#: shell/main.c:73
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Izberite datoteko, ki jo želite uvoziti v Evolucijo in izberite vrsto "
+"datoteke s seznama\n"
+"\n"
+"Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
+"ugotoviti."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:182
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Uvažam %s\n"
+"Uvoznik ni pripravljen.\n"
+"Čakam 5 sekund na nov poskus."
+
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Uvažam %s\n"
+"Uvažam predmet %d."
+
+#: shell/importer/importer.c:341
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Ni uvoznika, ki bi lahko obravnaval\n"
+" %s"
+
+#: shell/importer/importer.c:351
+msgid "Importing"
+msgstr "Uvažam"
+
+#: shell/importer/importer.c:359
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Uvažam %s.\n"
+"Pričenjam %s"
+
+#: shell/importer/importer.c:372
+msgid "Error starting %s"
+msgstr "Napaka ob zagonu %s"
+
+#: shell/importer/importer.c:387
+#, c-format
+msgid "Error loading %s"
+msgstr "Napaka ob nalaganju %s"
+
+#: shell/importer/importer.c:402
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Uvažam %s\n"
+"Uvažam predmet 1."
+
+#: shell/importer/importer.c:473
+msgid "Automatic"
+msgstr "Samodejno"
+
+#: shell/importer/importer.c:523
+msgid "Filename:"
+msgstr "Ime datoteke:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+msgid "Select a file"
+msgstr "Izberi datoteko"
+
+#: shell/importer/importer.c:538
+msgid "File type:"
+msgstr "Vrsta datoteke:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
+msgid "Import"
+msgstr "Uvozi"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Kliknite \"Uvozi\" za pričetek uvoza datoteke v Evolucijo. "
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Evolucijino uvozno orodje"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Evolucijino uvozno orodje"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"Dobrodošli v Evolucijinem uvnoznem orodju.\n"
+"S tem druidom boste vodeni skozi proces uvoza\n"
+"zunanjih datotek v Evolucijo."
+
+#: shell/importer/intelligent.c:143
+msgid "Don't ask me again"
+msgstr "Ne sprašuj me več"
+
+#: shell/main.c:82
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -6877,13 +7370,11 @@ msgstr ""
 "Zdravo.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
 "programja za delovne skupine Evolucija.\n"
 "\n"
-"Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka "
-"ali\n"
+"Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka ali\n"
 "deluje le polovično. Če ne morete ugotoviti kako nekaj narediti, je to\n"
 "verjetno zato, ker tega zaenkrat še ni možno narediti. :-)\n"
 "\n"
-"Upamo, da vam bo Evolucija uporabna, a še vedno vas moramo opozoriti, da "
-"se\n"
+"Upamo, da vam bo Evolucija uporabna, a še vedno vas moramo opozoriti, da se\n"
 "lahko: sesuje, izgubi vašo pošto, pusti teči mrtve procese, porabi 100% "
 "vašega\n"
 "procesorskega časa, pošlje neveljavne ukaze na vaše strežnike in vas na\n"
@@ -6893,7 +7384,7 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:98
+#: shell/main.c:107
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6901,15 +7392,19 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:129
+#: shell/main.c:138
 msgid "Cannot initialize the Evolution shell."
 msgstr "Ne morem inicializirati lupine Evolucije."
 
-#: shell/main.c:175
-msgid "Disable."
-msgstr "Izključeno."
+#: shell/main.c:184
+msgid "Disable splash screen"
+msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:195
+#: shell/main.c:185
+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
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
@@ -6933,8 +7428,7 @@ msgstr "Poišči stik"
 msgid "New contact"
 msgstr "Nov stik"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:22
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
 msgid "Previews the message to be printed"
 msgstr "Predogled sporočika, ki bo natisnjeno"
 
@@ -6942,7 +7436,7 @@ msgstr "Predogled sporočika, ki bo natisnjeno"
 msgid "Print contacts"
 msgstr "Natisni stike"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:47
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
 msgid "Stop"
 msgstr "Ustavi"
 
@@ -6976,8 +7470,8 @@ 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-mail.xml.h:77
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
 msgid "_Tools"
 msgstr "_Orodja"
 
@@ -7041,11 +7535,6 @@ msgstr "Mesec"
 msgid "New _Event"
 msgstr "Nov _dogodek"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Naprej"
-
 #: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "Odpri koledar"
@@ -7054,6 +7543,10 @@ msgstr "Odpri koledar"
 msgid "Prev"
 msgstr "Nazaj"
 
+#: ui/evolution-calendar.xml.h:22
+msgid "Previews the calendar to be printed"
+msgstr "Predogled koledarja, ki bo natisnjen"
+
 #: ui/evolution-calendar.xml.h:25
 msgid "Print calendar"
 msgstr "Natisni koledar"
@@ -7086,8 +7579,8 @@ msgstr "Kaži en teden"
 msgid "Show the working week"
 msgstr "Pokaži delavni teden"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
+#: widgets/misc/e-dateedit.c:424
 msgid "Today"
 msgstr "Danes"
 
@@ -7112,7 +7605,7 @@ 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:38
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
 msgid "_New"
 msgstr "_Nova"
 
@@ -7120,11 +7613,6 @@ msgstr "_Nova"
 msgid "_Open Calendar"
 msgstr "Odpri ko_ledar"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:74
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Shrani kot..."
-
 #: ui/evolution-calendar.xml.h:45
 msgid "_Week"
 msgstr "_Teden"
@@ -7151,7 +7639,7 @@ msgid "Print this item"
 msgstr "Natisni ta predmet"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:32 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Natisni..."
 
@@ -7184,7 +7672,7 @@ 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:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -7238,7 +7726,7 @@ msgstr "Zapri ta zmenek"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "_Kopiraj v mapo... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopiraj"
@@ -7311,10 +7799,6 @@ msgstr "Prilepi odložišče"
 msgid "Pre_vious"
 msgstr "P_rejšnji"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Prejšnji"
-
 #: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
@@ -7328,7 +7812,7 @@ msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:236
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Shrani"
 
@@ -7349,7 +7833,8 @@ msgstr "_Načrtuj sestanek"
 msgid "Schedule some sort of a meeting"
 msgstr "Načrtuj nek tip sestanka"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
+#: ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Izberi vse"
 
@@ -7371,12 +7856,12 @@ msgid "_About..."
 msgstr "_O..."
 
 #: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Zapri"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
@@ -7390,7 +7875,7 @@ msgid "_Debug"
 msgstr "_Razhroščuj"
 
 #: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
 msgid "_Help"
 msgstr "_Pomoč"
 
@@ -7422,12 +7907,7 @@ msgstr "_Opomba (FIXME)"
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "Na_tisni"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:70
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Lastnosti..."
@@ -7437,7 +7917,7 @@ msgid "_Select All"
 msgstr "_Izberi vse"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:42
 msgid "_Task (FIXME)"
 msgstr "_Naloga (FIXME)"
 
@@ -7465,119 +7945,235 @@ msgstr "Nastaviteve povzetka..."
 msgid "New Mail"
 msgstr "Nova pošta"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr "Uveljavi vse nove filtre pošti tega predala"
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr "Spremeni lastnosti te mape"
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Sestavi"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Sestavi novo sporočilo"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:6
+msgid "Configure Folder..."
+msgstr "Nastavi mapo..."
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Prestavi sporočilo v novo mapo"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:9
+msgid "Copy selected messages to another folder"
+msgstr "Kopiraj izbrana sporočila v drugo mapo"
+
+#: ui/evolution-mail.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Iz sporočila ustvari na_videzno mapo"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail.xml.h:12
+msgid "Delete the selected messages"
+msgstr "Zbriši izbrana sporočila"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr "Kaži vse glave sporočil"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:15
+msgid "Edit Message"
+msgstr "Uredi sporočilo"
+
+#: ui/evolution-mail.xml.h:16
+msgid "Edit the current message"
+msgstr "Uredi trenutno sporočilo"
+
+#: ui/evolution-mail.xml.h:17
 msgid "Empty _Trash"
 msgstr "Sprazni smeti"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
+msgstr "Uniči"
+
+#: ui/evolution-mail.xml.h:19
+msgid "Filter on Mailing _List"
+msgstr "Filter glede na p_oštni seznam"
+
+#: ui/evolution-mail.xml.h:20
 msgid "Filter on Se_nder"
-msgstr "Filter glede na _pošiljatelja"
+msgstr "Filter glede na pošilja_telja"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:21
 msgid "Filter on _Recipients"
-msgstr "Filter glede na _prejemnike"
+msgstr "Filter glede na preje_mnike"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:22
 msgid "Filter on _Subject"
-msgstr "Filter glede na _zadevo"
+msgstr "Filter glede na za_devo"
+
+#: ui/evolution-mail.xml.h:23
+msgid "Finaly remove all mails tagged for deletion"
+msgstr "Dokončno odstrani vso pošto označeno za izbris"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:24
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:26
 msgid "Forward As"
 msgstr "Posreduj kot"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:27
+msgid "Forward inline"
+msgstr "Posreduj naprej kot del sporočila"
+
+#: ui/evolution-mail.xml.h:28
+msgid "Forward the selected mail to someone"
+msgstr "Nekomu posreduj izbrano pošto"
+
+#: ui/evolution-mail.xml.h:30
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr "Posreduj to sporočilo kot del vaše pošte, da ga lahko uredite"
+
+#: ui/evolution-mail.xml.h:31
 msgid "Full _Headers"
 msgstr "Celotne _glave"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:32
+msgid "Go to the next message"
+msgstr "Pojdi na naslednje sporočilo"
+
+#: ui/evolution-mail.xml.h:33
+msgid "Go to the previous message"
+msgstr "Pojdi na prejšnje sporočilo"
+
+#: ui/evolution-mail.xml.h:34
+msgid "Hide Deleted Messages"
+msgstr "Skrij zbrisana sporočila"
+
+#: ui/evolution-mail.xml.h:35
 msgid "Hide S_elected Messages"
 msgstr "Skrij _izbrana sporočila"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:36
 msgid "Hide _Deleted Messages"
 msgstr "Skrij _zbrisana sporočila"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:37
 msgid "Hide _Read messages"
 msgstr "Skrij _prebrana sporočila"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:38
+msgid "Invert Selection"
+msgstr "Obrni izbor"
+
+#: ui/evolution-mail.xml.h:39
 msgid "Manage _Subscriptions..."
 msgstr "Uredi _naročnine..."
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mar_k as Read"
-msgstr "Označi kot _prebrano"
-
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:41
 msgid "Mark All as R_ead"
 msgstr "Označi _vse kot prebrano"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Mark as U_nread"
+#: ui/evolution-mail.xml.h:42
+msgid "Mark As Read"
+msgstr "Označi kot prebrano"
+
+#: ui/evolution-mail.xml.h:43
+msgid "Mark As U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:45
+msgid "Mark the selected messages as having been read"
+msgstr "Označi izbrana sporočila kot prebrana"
+
+#: ui/evolution-mail.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr "Označi izbrana sporočila kot neprebrana"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:48
 msgid "Move message to a new folder"
 msgstr "Prestavi sporočilo v novo mapo"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:49
+msgid "Move selected messages to another folder"
+msgstr "Prestavi izbrana sporočila v drugo mapo"
+
+#: ui/evolution-mail.xml.h:51
+msgid "Open in New Window"
+msgstr "Odpri v novem oknu"
+
+#: ui/evolution-mail.xml.h:52
+msgid "Open the current message in a new window"
+msgstr "Odpri trenutno sporočilo v novem oknu"
+
+#: ui/evolution-mail.xml.h:58
+msgid "Print Preview of message..."
+msgstr "Predogled tiskanja sporočila..."
+
+#: ui/evolution-mail.xml.h:59
 msgid "Print message to the printer"
 msgstr "Natisni sporočilo na tiskalniku"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:60
+msgid "Print message..."
+msgstr "Natisni sporočilo..."
+
+#: ui/evolution-mail.xml.h:63
 msgid "Redirect (FIXME: implement me)"
 msgstr "Preusmeri (FIXME: implementiraj me)"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Reply to _All"
-msgstr "Odgovori _vsem"
+#: ui/evolution-mail.xml.h:67
+msgid "Reply to all"
+msgstr "Odgovori vsem"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:69
+msgid "Reply to sender"
+msgstr "Odgovori pošiljatelju"
+
+#: ui/evolution-mail.xml.h:71
+msgid "S_earch Message"
+msgstr "_Išči sporočilo"
+
+#: ui/evolution-mail.xml.h:72
 msgid "S_ource"
 msgstr "_Vir"
 
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:73
+msgid "Save the message into a new file"
+msgstr "Shrani sporočilo v novo datoteko"
+
+#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Izberi _vse"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:76
 msgid "Select _Thread"
 msgstr "Izberi _nit"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:77
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:78
+msgid "Send a reply to the person who sent you this mail"
+msgstr "Pošlji odgovor osebi, ki vam je poslala to pošto"
+
+#: ui/evolution-mail.xml.h:79
+msgid "Send a single mail in reply to all the selected mail"
+msgstr "Pošlji en sam odgovor na vso izbrano pošto"
+
+#: ui/evolution-mail.xml.h:80
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -7585,122 +8181,102 @@ msgstr ""
 "Pošlji čakajočo pošto\n"
 "    in sprejmi novo"
 
-#: ui/evolution-mail.xml.h:45
+#: 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:46
+#: ui/evolution-mail.xml.h:83
 msgid "Show _All"
 msgstr "Kaži _vse"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:85
 msgid "Threaded Message list"
 msgstr "Niten seznam sporočil"
 
-#: ui/evolution-mail.xml.h:49
-msgid "VFolder on Se_nder"
-msgstr "vMapa glede na _pošiljatelja"
-
-#: ui/evolution-mail.xml.h:50
-msgid "VFolder on _Recipients"
-msgstr "vMapa glede na _sprejemnike"
+#: ui/evolution-mail.xml.h:86
+msgid "Un-delete the selected messages"
+msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail.xml.h:51
-msgid "VFolder on _Subject"
-msgstr "vMapa glede na _predmet"
+#: ui/evolution-mail.xml.h:87
+msgid "Undelete"
+msgstr "Odbriši"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:92
 msgid "View Raw Message Source"
 msgstr "Glej izvorno obliko sporočila"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:93
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:94
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:95
 msgid "_Attachment"
 msgstr "_Priloga"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Compose"
-msgstr "_Sestavi"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Copy to Folder..."
-msgstr "_Kopiraj v mapo..."
-
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:97
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:99
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:100
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail.xml.h:62 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
 msgid "_Folder"
 msgstr "_Mapa"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Forward"
-msgstr "_Posreduj naprej"
-
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:103
 msgid "_Inline"
 msgstr "_Kot del sporočila"
 
-#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:105
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:106
 msgid "_Mail Settings..."
 msgstr "_Nastavive pošte..."
 
-#: ui/evolution-mail.xml.h:68
-msgid "_Move to Folder..."
-msgstr "Prestavi v _mapo..."
-
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:108
 msgid "_Open Selected Items"
 msgstr "Odpri izbrane predmete"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:110
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:111
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:112
 msgid "_Resend Messages"
 msgstr "_Znova pošlji sporočila"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:114
+msgid "_Save Message As..."
+msgstr "_Shrani sporočilo kot..."
+
+#: ui/evolution-mail.xml.h:115
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:116
 msgid "_Threaded"
 msgstr "_Niteno"
 
-#: ui/evolution-mail.xml.h:78
-msgid "_Undelete"
-msgstr "_Odbriši"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
@@ -7942,7 +8518,7 @@ msgstr "Razveljavi"
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
 msgid "_Appointment (FIXME)"
 msgstr "_Zmenek (FIXME)"
 
@@ -8003,246 +8579,298 @@ msgid "E_xit"
 msgstr "_Izhod"
 
 #: ui/evolution.xml.h:9
+msgid "Evolution _Window"
+msgstr "_Okno Evolucije"
+
+#: ui/evolution.xml.h:10
 msgid "Evolution bar _shortcut"
 msgstr "Evolucijina vrstica z _bližnjicami"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:12
 msgid "Getting _Started"
 msgstr "Kako _začeti"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:13
 msgid "Import an external file format"
 msgstr "Uvozi datoteko zunanje oblike"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:14
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:15
 msgid "Show information about Evolution"
 msgstr "Kaži podatke o Evoluciji"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Submit bug report using Bug Buddy."
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy."
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "Using the _Mailer"
 msgstr "Uporaba _pošte"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:24
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:34
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Import file..."
 msgstr "_Uvozi datoteko..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:38
 msgid "_Mail message"
 msgstr "_Pošlji sporočilo"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bljižnjicami"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr "Vizitke"
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr "Po podjetju"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr "Seznam telefonov"
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr "Po pošiljatelju"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "Po stanju"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "Po zadevi"
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr "Sporočila"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr "S kategorijo"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Poskusno"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Zaseden"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Iz pisarne"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Ni podatkov"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Povabi ostale..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Kaži le delavne ure"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Kaži poman_jšano"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Posodobi prosto/zasedeno"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Samodeno izberi"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Vsi ljudje in vsa sredstva"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Vsi ljudje in eno sredstvo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "_Potrebni ljudje"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Potrebni ljudje in eno sredstvo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Čas pričetka sestanka:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Vsi udeleženi"
 
-#: widgets/menus/gal-view-menus.c:171
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
+#: widgets/menus/gal-view-menus.c:177
 msgid "_Current View"
 msgstr "_Trenutni pogled"
 
+#: widgets/menus/gal-view-menus.c:196
+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:421
+#: widgets/misc/e-calendar-item.c:422
 msgid "MTWTFSS"
 msgstr "PTSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
 msgid "Now"
 msgstr "Sedaj"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:245
 msgid "OK"
 msgstr "V redu"
 
-#: widgets/misc/e-cell-date-edit.c:720
+#: widgets/misc/e-cell-date-edit.c:726
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datum mora biti v obliki: %s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:163
+#: widgets/misc/e-filter-bar.c:166
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.c:234
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: widgets/misc/e-filter-bar.c:314
+#: widgets/misc/e-filter-bar.c:317 widgets/misc/e-filter-bar.h:97
 msgid "Advanced ..."
 msgstr "Napredno ..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-filter-bar.h:94
+msgid "Save As ..."
+msgstr "Shrani kot ..."
+
+#: widgets/misc/e-filter-bar.h:96
+msgid "Edit ..."
+msgstr "Uredi ..."
+
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Podatki"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Vprašanje"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "Sporočilo"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "Tega sporočila ne kaži več."
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 msgid "Sear_ch"
 msgstr "_Iskanje"
 
@@ -8266,12 +8894,57 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid "Click here to add a contact"
+#~ msgstr "Kliknite tu za dodajo stika"
+
+#~ msgid "No such host %s."
+#~ msgstr "Ni takšnega gostitelja %s."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
+
+#~ msgid "Remove action"
+#~ msgstr "Odstrani dejanje"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Odstrani pogoj"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "vMapa glede na Zadevo"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "vMapa glede na Pošiljatelja"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "vMapa glede na Prejemnika"
+
+#~ msgid "Mark as Read"
+#~ msgstr "Označi kot prebrano"
+
+#~ msgid "Mark as Unread"
+#~ msgstr "Označi kot neprebrano"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Prestavi v mapo..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Kopiraj v mapo..."
+
+#~ msgid "Do you accept?"
+#~ msgstr "Sprejemate?"
+
+#~ msgid "Disable."
+#~ msgstr "Izključeno."
+
+#~ msgid "_Compose"
+#~ msgstr "_Sestavi"
+
 #~ msgid "PLAIN"
 #~ msgstr "ČISTO"
 
 #~ msgid ""
-#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
-#~ "the server supports it."
+#~ "This option will connect to the server using a the PLAIN SASL mechanism "
+#~ "if the server supports it."
 #~ msgstr ""
 #~ "Ta možnost narekuje povezavo s strežnikom z uporabo ČISTEGA SASL "
 #~ "mehanizma,če strežnik to podpira."
@@ -8289,15 +8962,14 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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."
+#~ msgstr "Za branje in hranjenje pošte na IMAP strežnikih preko povezave SSL."
 
 #~ msgid "Secure POP"
 #~ msgstr "Varni POP"
 
 #~ msgid ""
-#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
-#~ "also be used to retrieve mail from certain web mail providers and "
+#~ "For connecting to POP servers over an SSL connection. The POP protocol "
+#~ "can also be used to retrieve mail from certain web mail providers and "
 #~ "proprietary email systems."
 #~ msgstr ""
 #~ "Za povezovanje s strežniki POP preko povezave SSL. Protokol POP se lahko "
@@ -8308,11 +8980,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Varni SMTP"
 
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-#~ "connection.\n"
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
+#~ "SSL connection.\n"
 #~ msgstr ""
-#~ "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
-#~ "SMTP preko povezave SSL.\n"
+#~ "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z "
+#~ "uporabo SMTP preko povezave SSL.\n"
 
 #~ msgid ""
 #~ "One or more of your servers are not configured correctly.\n"
@@ -8403,8 +9075,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Type the name by which you would like to refer to these servers. For "
 #~ "example: \"Work\" or \"Home\"."
 #~ msgstr ""
-#~ "Vpišite ime s katerimi želite nazivati te strežnike. Na "
-#~ "primer:\"službeni\" ali \"domači\"."
+#~ "Vpišite ime s katerimi želite nazivati te strežnike. Na primer:\"službeni"
+#~ "\" ali \"domači\"."
 
 #~ msgid "minutes."
 #~ msgstr "minut."
@@ -8547,27 +9219,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "matches regex"
 #~ msgstr "ustreza regularnemu izrazu"
 
-#~ msgid "Add Rule"
-#~ msgstr "Dodaj pravilo"
-
 #~ msgid "Add VFolder Rule"
 #~ msgstr "Dodaj pravilo vMape"
 
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "Uredi pravilo vMape"
 
-#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
-#~ msgstr "Tovarna za uvoz pošte Outlook Express 4 v Evolucijo"
-
-#~ msgid "Factory to import mbox into Evolution"
-#~ msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
-
-#~ msgid "Imports Outlook Express 4 files into Evolution"
-#~ msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
-
-#~ msgid "Imports mbox files into Evolution"
-#~ msgstr "Uvozi mbox daoteke v Evolucijo"
-
 #~ msgid "[ %s ]"
 #~ msgstr "[ %s ]"
 
@@ -8601,12 +9258,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "Vnesite zadevo spročila"
 
-#~ msgid "incoming"
-#~ msgstr "dohodna"
-
-#~ msgid "outgoing"
-#~ msgstr "odhodna"
-
 #~ msgid "Account Properties"
 #~ msgstr "Lastnosti računa"
 
@@ -8655,27 +9306,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Get Mail"
 #~ msgstr "Poberi pošto"
 
-#~ msgid "Mar_k As Read"
-#~ msgstr "Označi _kot prebrano"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Označi kot _neprebrano"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Predogled tiskanja sporočila..."
-
-#~ msgid "Print message..."
-#~ msgstr "Natisni sporočilo..."
-
 #~ msgid "Reply to _Sender"
 #~ msgstr "Odgovori _pošiljatelju"
 
 #~ msgid "Show _All Messages"
 #~ msgstr "Kaži vsa sporočila"
 
-#~ msgid "_Configure Folder..."
-#~ msgstr "_Nastavi mapo..."
-
 #~ msgid "_Filter on Subject"
 #~ msgstr "Filtriraj glede na _Zadevo"
 
@@ -8688,9 +9324,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Print Message"
 #~ msgstr "Na_tisni sporočilo"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "_Shrani sporočilo kot..."
-
 #~ msgid "_VFolder on Subject"
 #~ msgstr "vMapa glede na _Zadevo"
 
@@ -8736,22 +9369,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Sender contains"
 #~ msgstr "Pošiljatelj vsebuje"
 
-#~ msgid "Connecting to server"
-#~ msgstr "Vzpostavljam povezavo s strežnikom"
-
 #~ msgid "Connect to server"
 #~ msgstr "Poveži se s strežnikom"
 
 #~ msgid "Registering local folder"
 #~ msgstr "Registriam krajevno mapo"
 
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisem mogel registriati mape '%s':\n"
-#~ "%s"
-
 #~ msgid "Appending \"%s\""
 #~ msgstr "Dodajam \"%s\""
 
@@ -8805,9 +9428,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Could not create dialog box."
 #~ msgstr "Nisem mogel ustvariti dialoga."
 
-#~ msgid "User cancelled query."
-#~ msgstr "Uporabnik je preklical poizvedbo."
-
 #~ msgid ""
 #~ "Cannot open location `%s':\n"
 #~ "%s"
@@ -9153,9 +9773,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "Prenašam sporočilo %d od %d"
 
-#~ msgid "Writing message %d of %d"
-#~ msgstr "Pišem sporočilo %d od %d"
-
 #~ msgid "Saving changes to %s"
 #~ msgstr "Shranjujem spremembe pri %s"
 
@@ -9208,8 +9825,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "However, the appointment will recur at the appropriate time and will be "
 #~ "displayed properly in the calendar views."
 #~ msgstr ""
-#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana znotraj "
-#~ "Evolucije.\n"
+#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana "
+#~ "znotraj Evolucije.\n"
 #~ "\n"
 #~ "Vendar se bo zmenek ponovil pravočasno in bo  pravilno prikazan v pogledu "
 #~ "koledarja."
@@ -9229,9 +9846,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "tuesday"
 #~ msgstr "torek"
 
-#~ msgid "tues"
-#~ msgstr "tor"
-
 #~ msgid "wednesday"
 #~ msgstr "sreda"
 
@@ -9410,15 +10024,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Could not create summary"
 #~ msgstr "Nisem mogel ustvariti povzetka"
 
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Ne morem dobiti sporočila: %s"
-
 #~ msgid ""
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "Za branje pošte dostavljene na krajevni sistem in za shranjevanje pošte na "
-#~ "krajevni disk."
+#~ "Za branje pošte dostavljene na krajevni sistem in za shranjevanje pošte "
+#~ "na krajevni disk."
 
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj že obstaja"
@@ -9451,12 +10062,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Custom search"
 #~ msgstr "Iskanje po meri"
 
-#~ msgid "Open in New Window"
-#~ msgstr "Odpri v novem oknu"
-
-#~ msgid "Edit Message"
-#~ msgstr "Uredi sporočilo"
-
 #~ msgid "Forward Message"
 #~ msgstr "Sporočilo posreduj naprej"
 
@@ -9467,9 +10072,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nimate nastavljenih izvorov pošte"
 
 #~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may "
+#~ "also, optionally, enter the name of your organization, and the name of a "
+#~ "file to read your signature from."
 #~ msgstr ""
 #~ "Vnesite svoje ime in e-poštni naslov, ki naj se uporablja v izhodni pošti "
 #~ "Po želji lahko vnesete tudi ime vaše organizacije in ime datoteke iz "
@@ -9482,11 +10087,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Tip izvora pošte:"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
+#~ "Select the kind of mail server you have, and enter the relevant "
+#~ "information about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect "
+#~ "supported types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
@@ -9495,11 +10100,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
 
 #~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
+#~ "Select the kind of news server you have, and enter the relevant "
+#~ "information about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect "
+#~ "supported types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
@@ -9525,9 +10130,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit News Server"
 #~ msgstr "Uredi novičarski strežnik"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "Preizkušam \"%s\""
-
 #~ msgid "The connection was successful!"
 #~ msgstr "Povezava je bila uspešna!"
 
@@ -9590,9 +10192,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Izberi sporočila v mapi \"%s\""
 
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Izbiram sporočilo %d od %d"
-
 #~ msgid "Scan folders in \"%s\""
 #~ msgstr "Osveži mape v \"%s\""
 
@@ -9611,11 +10210,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Forward message \"%s\""
 #~ msgstr "Posreduj sporočilo \"%s\""
 
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Posreduj sporočilo brez navedene zadeve"
-
 #~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
+#~ "Failed to generate mime part from message while generating forwarded "
+#~ "message."
 #~ msgstr ""
 #~ "Nisem uspel generirati mime dela iz sporočila med generiranjem "
 #~ "posredovanega sporočila."
@@ -9907,9 +10504,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "To-do list"
 #~ msgstr "Seznam za opravit"
 
-#~ msgid "Edit..."
-#~ msgstr "Uredi..."
-
 #~ msgid "Weeks"
 #~ msgstr "Tednov"