I like monkeys - Federico

svn path=/trunk/; revision=6981

1 files changed, 2728 insertions, 2398 deletions

diff --git a/po/sl.po b/po/sl.po
index aba65ed74a..0cca635b01 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2000-11-13 19:14+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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=iso8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3044
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3048
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3047
+#: addressbook/backend/ebook/e-card.c:3049
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3050
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  Družinsko:     "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3065
+#: addressbook/backend/ebook/e-card.c:3067
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3076
+#: addressbook/backend/ebook/e-card.c:3078
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3080
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "  Poštni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3079
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3082
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "  Poštna številka: "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "  Država:      "
 
-#: addressbook/backend/ebook/e-card.c:3097
+#: addressbook/backend/ebook/e-card.c:3099
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3109
+#: addressbook/backend/ebook/e-card.c:3111
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3112
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3136
+#: addressbook/backend/ebook/e-card.c:3138
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3139
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3158
+#: addressbook/backend/ebook/e-card.c:3160
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "Poštni program: "
 
-#: addressbook/backend/ebook/e-card.c:3164
+#: addressbook/backend/ebook/e-card.c:3166
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Časovna cona: "
 
-#: addressbook/backend/ebook/e-card.c:3172
+#: addressbook/backend/ebook/e-card.c:3174
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Geografski položaj: "
 
-#: addressbook/backend/ebook/e-card.c:3176
+#: addressbook/backend/ebook/e-card.c:3178
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3188
+#: addressbook/backend/ebook/e-card.c:3190
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3189
+#: addressbook/backend/ebook/e-card.c:3191
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3192
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Categorije: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Enoličen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Public Key: "
@@ -303,10 +303,10 @@ msgstr ""
 #: 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:910
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1091
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
@@ -429,28 +429,28 @@ msgstr ""
 "Ob prenašanju seznama pilotov s gnome-pilot\n"
 "daemona se je zgodila napaka"
 
-#: addressbook/conduit/address-conduit.c:193
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel naložiti\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naložena\n"
 
-#: addressbook/conduit/address-conduit.c:490
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati strežnika wombat"
 
-#: addressbook/conduit/address-conduit.c:491
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
@@ -471,113 +471,11 @@ msgstr "Predmet(i) pripada(jo) tem kategorijam:"
 msgid "Available Categories:"
 msgstr "Dostopne kategorije:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr "Pomočnik"
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr "Služba"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr "Služba"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr "Službeni faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr "Povratni klic"
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr "Avto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr "Podjetje"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr "Doma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr "Doma 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr "Domači faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr "Prenosni telefon"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "Drugo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr "Drugi faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr "Pozivnik"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr "Prvi"
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr "Radijo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-msgstr "E-naslov 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ste prepričani, da \n"
-"želite izbrisati ta stik?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Zbriši stik?"
 
@@ -591,7 +489,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.h:72 ui/evolution-mail.h:48
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Zbriši"
 
@@ -604,11 +502,13 @@ msgstr "Tipi telefonov"
 msgid "New phone type"
 msgstr "Nov tip telefona"
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:71 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Dodaj"
 
@@ -648,6 +548,11 @@ msgstr "Službeni _faks"
 msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "prvi e-naslov"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "V sl_užbi"
@@ -661,7 +566,7 @@ msgid "C_ontacts..."
 msgstr "_Stiki..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
@@ -678,7 +583,7 @@ msgid "_Address..."
 msgstr "_Naslov..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Splošno"
 
@@ -723,59 +628,146 @@ msgid "No_tes:"
 msgstr "Opom_be:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Podrobnosti"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Pomočnik"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Služba"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Služba"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Službeni faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Povratni klic"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Avto"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Podjetje"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Doma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Doma 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Domači faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+msgid "Mobile"
+msgstr "Prenosni telefon"
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
+msgid "Other"
+msgstr "Drugo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Drugi faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Pozivnik"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Prvi"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radijo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E-naslov 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E-naslov 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "Naslov _2:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Kanada"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Preveri naslov"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Drža_va:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Finska"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "ZDA"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Naslov:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Poštni predal:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "Naslov _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Država/Provinca:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "ZDA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Finska"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Poštna številka:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "Drža_va:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -835,18 +827,16 @@ msgstr "_Priimek:"
 msgid "_Suffix:"
 msgstr "P_ripona:"
 
-#: addressbook/gui/component/addressbook.c:265
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Kot _minivizitke"
 
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:271 ui/evolution-addressbook.h:9
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Kot tabelo"
 
@@ -855,6 +845,7 @@ msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
 #: addressbook/gui/component/addressbook.c:391
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -863,7 +854,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Adresarja ni bilo mogoče odpreti. To lahko pomeni ali\n"
 "da ste vnesli napačen URI, ali pa poskušali dostopati \n"
@@ -873,7 +864,32 @@ msgstr ""
 "strežnika. Če želite dostopati do LDAP morate naložiti in \n"
 "namestiti OpenLDAP in ponovno prevesti in namestiti evolution. \n"
 
-#: addressbook/gui/component/addressbook.c:574
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#, fuzzy
+msgid "Show All"
+msgstr "Kaži"
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#, fuzzy
+msgid "Advanced..."
+msgstr "Dodaj..."
+
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "Telo vsebuje"
+
+#: addressbook/gui/component/addressbook.c:534
+#, fuzzy
+msgid "Name contains"
+msgstr "vsebuje"
+
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "vsebuje"
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -882,172 +898,169 @@ msgid "External Directories"
 msgstr "Zunanji imeniki"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Opis:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "LDAP strežnik:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "Ime:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Številka vrat:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr "Korenski DN:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-msgstr "Ime:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Izberi imena"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Poišči..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "Prejemniki sporočila"
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "Izberi imena"
+
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Izberi ime s seznama:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Prejemniki sporočila"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Išči"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "okno2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
@@ -1069,197 +1082,187 @@ msgstr ""
 "\n"
 "Če želite ustvariti nov stik, dvojno kliknite tu.."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:643 mail/mail-search-dialogue.c:101
-msgid "Search"
-msgstr "Išči"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Nastavitev strani:"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Ime stila:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "Predogled:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 pik Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Možnosti"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 pik Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "Vključi:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "Prazni obrazci na koncu:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "Sekcije:"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Telo"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "Si sledijo takoj"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Spodaj:"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "Uhlji črk ob strani"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Mere:"
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "Zaglavja za vsako črko"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Pisava..."
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "Začni na novi strani"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "Pisave"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "Število stolpcev:"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "Noga:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "Prazni obrazci na koncu:"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Oblika izpisa"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "Pisave"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "Glava"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Pisava..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "Glava/noga"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Zaglavja"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 pik Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "Zaglavja za vsako črko"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Telo"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "Višina:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 pik Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr "Si sledijo takoj"
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "Senčenje"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "Vključi:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "Tiskaj z uporabo sivinskega senčenja"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Ležeče"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Oblika izpisa"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Levo:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Papir"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "Uhlji črk ob strani"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Tip:"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Robovi"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "label26"
-msgstr "označba26"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "Število stolpcev:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Mere:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Možnosti"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Širina:"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Usmerjenost"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "Višina:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Stran"
+
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "Nastavitev strani:"
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Papir"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Izvor papirja:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Robovi"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "Pokončno"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "Zgoraj:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "Predogled:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Spodaj:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "Tiskaj z uporabo sivinskega senčenja"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Levo:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "Obratno na sodih straneh"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Desno:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Stran"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "Sekcije:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "Senčenje"
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Velikost:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Usmerjenost"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Pokončno"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "Začni na novi strani"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Ležeče"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Ime stila:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "Glava"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Zgoraj:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "Noga:"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Tip:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "Obratno na sodih straneh"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Širina:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "Glava/noga"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "označba26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "dop"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pop"
 
@@ -1271,13 +1274,13 @@ msgstr "Evolucijin koledarski veznik"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Nastavitveno orodje za Evolucijin koledarski veznik.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s koledarskim strežnikom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
@@ -1289,8 +1292,8 @@ msgstr "Evolucijin veznik za-opravit"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Nastavitveno orodje za Evolucijin za-opravit veznik.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama za-opravit"
 
@@ -1334,49 +1337,46 @@ msgstr "Predmet za-opravit, ki je na vrsti danes:"
 msgid "To-Do item that is overdue:"
 msgstr "Predmet za-opravit, ki je že pretekel:"
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Odpri koledar"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Shrani koledar"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Javno"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Osebno"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Zaupno"
 
@@ -1408,7 +1408,7 @@ msgstr "Prozorno"
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1420,36 +1420,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 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.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1459,15 +1458,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 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:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteta mora biti med vključno 1 in 9"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -1484,477 +1483,460 @@ msgid "No summary available."
 msgstr "Povzetek ni na voljo."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-event-editor.h:19
-#: ui/evolution-subscribe.h:10
+#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:8
+#: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Zapri"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Podaljšek spanja"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Uredi zmenek"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Podaljšek spanja"
+
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Čas podaljška spanja (minut)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "Nastavitve koledarja"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Delavni teden"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "pon"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "tor"
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "sre"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "čet"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 urna (dop./pop.)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "pet"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "sob"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 urna"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "ned"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "Prvi dan tedna:"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "ponedeljek"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr "Alarmi pretečejo po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Tuesday"
-msgstr "torek"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "Zvočni alarmi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Wednesday"
-msgstr "sreda"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr "Pozvoni, ko se pokažejo okna alarmov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "Thursday"
-msgstr "četrtek"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Koledar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "Friday"
-msgstr "petek"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "Nastavitve koledarja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "Saturday"
-msgstr "sobota"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Barve"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "nedeljo"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr "Skrči vikende"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "Začetek dneva:"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr "Možnosti navigatorja datumov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Konec dneva:"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "Privzeto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Pokaži možnosti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "Časovne delitve"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "Oblika izpisa časa"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "Do datuma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
-msgstr "Kaži čase koncev zmenkov"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr "Omogoči podaljšanje spanja za"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
-msgstr "Skrči vikende"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 urna (dop./pop.)"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "Prvi dan tedna:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 urna"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 minut"
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "petek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr "Osvetlji:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr "Predmeti z današnjim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr "Predmeti z rokom danes:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr "Predmeti z rokom v prihodnosti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Date navigator options"
-msgstr "Možnosti navigatorja datumov"
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
+msgstr "Predmeti z rokom v prihodnosti:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
-msgstr "Kaži številke tednov"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Koledar"
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "ponedeljek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
-msgstr "Kaži"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr "Predmeti s prekoračenim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Do datuma"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr "Predmeti s prekoračenim rokom:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr "Čas do preteka"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "Izberi barvo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Prioriteta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr "Osvetlji:"
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr "Opomni me na vse zmenke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
-msgstr "Predmeti s prekoračenim rokom"
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr "Opozorila"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Items Due Today"
-msgstr "Predmeti z današnjim rokom"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
-msgstr "Predmeti z rokom v prihodnosti"
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Barve"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr "Kaži"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "Izberi barvo"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr "Kaži čase koncev zmenkov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Items Not Yet Due:"
-msgstr "Predmeti z rokom v prihodnosti:"
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "Kaži številke tednov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
-msgstr "Predmeti z rokom danes:"
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "Začetek dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Overdue Items:"
-msgstr "Predmeti s prekoračenim rokom:"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "nedeljo"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Naloge"
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Privzeto"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Remind me of all appointments"
-msgstr "Opomni me na vse zmenke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
-msgstr "minut preden se zgodijo"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "čet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr "Vidni alarmi"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "četrtek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr "Pozvoni, ko se pokažejo okna alarmov"
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr "Čas do preteka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
-msgstr "Zvočni alarmi"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr "Časovne delitve"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
-msgstr "Alarmi pretečejo po"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr "Oblika izpisa časa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "seconds."
-msgstr "sekundah."
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr "Omogoči podaljšanje spanja za"
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "torek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
-msgstr "Opozorila"
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
+msgstr "Vidni alarmi"
 
-#: calendar/gui/dialogs/task-editor.c:655
-msgid "Edit Task"
-msgstr "Uredi nalogo"
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "sre"
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:303
-msgid "No summary"
-msgstr "Ni povzetka"
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "sreda"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:309
-#, c-format
-msgid "Appointment - %s"
-msgstr "Zmenek - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "Delavni teden"
 
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:312
-#, c-format
-msgid "Task - %s"
-msgstr "Naloga - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr "minut preden se zgodijo"
 
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:315
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Vpis v dnevniku - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
+msgstr "sekundah."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr "dialog-urejevalnik-dogodkov"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
-msgstr "_Povzetek"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
-msgstr "Datum _pričetka:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
-msgstr "_Do datuma:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% konča_no:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "_Stanje:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Ni pričeto"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "_Uvrstitev"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "V teku"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "Preklicano"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Končano"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Preklicano"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "_Prioriteta:"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "Končano dne:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Visoka"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Običajna"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "V teku"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Nizka"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "_Uvrstitev"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: shell/e-shell-view.c:1017 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
+#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
+#: widgets/misc/e-dateedit.c:1446
 msgid "None"
 msgstr "Brez"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Stiki..."
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Običajna"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Ni pričeto"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr "_Povzetek"
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr "Datum _pričetka:"
+
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Naloga"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "Končano dne:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:294
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "_Stiki..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr "_Do datuma:"
+
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "_Prioriteta:"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "_Stanje:"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr "dialog-urejevalnik-dogodkov"
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Uredi nalogo"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Ni povzetka"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Zmenek - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Naloga - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Vpis v dnevniku - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#, fuzzy
+msgid "Do you want to save changes?"
+msgstr "Shranil bom spremembe sporočila"
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Odpri..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Odpri nalogo"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Označi nalogo kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:73 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:8
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:165
-#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-event-editor.h:13
-#: ui/evolution-mail.h:13
+#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:479 mail/mail-view.c:165
+#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
+#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
 msgid "Delete"
 msgstr "Zbriši"
 
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Zbriši nalogo"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:265 calendar/gui/e-day-view.c:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:269 calendar/gui/e-day-view.c:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
+#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
+#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
 msgid "New appointment..."
 msgstr "Nov zmenek..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
+#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
 msgid "Edit this appointment..."
 msgstr "Uredi ta zmenek..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
-#: ui/evolution-event-editor.h:14
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Zbriši ta zmenek"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Naredi zmenek prestavljiv"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Zbriši to pojavitev"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Zbriši vse pojavitve"
 
@@ -1965,247 +1947,203 @@ msgstr "Zbriši vse pojavitve"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:297
-msgid "Edit Appointment"
-msgstr "Uredi zmenek"
-
-#: calendar/gui/event-editor.c:342
-msgid "on"
-msgstr "na"
-
-#: calendar/gui/event-editor.c:470
-msgid "ocurrences"
-msgstr "pojavitve"
-
-#: calendar/gui/event-editor.c:2399 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
 #.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "dialog-urejevalec-dogodkov"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "Su_mmary:"
-msgstr "_Povzetek:"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "Čas"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "_Čas pričetka:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "_Čas konca"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "_Celodnevni dogodek"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "Osnove zmenkov"
+
+#: po/tmp/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Uvrstitev"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "_Javno"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "Ponovitev po meri"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Pri_vatno"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Dni"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
-msgstr "_Zaupno"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Vsak"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minut"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Izjeme"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: po/tmp/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Ur"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "Dni"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Pošlji pošto _za:"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Display"
-msgstr "_Prikaz"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minut"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr "_Program"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "Spremeni"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Mail"
-msgstr "_Pošlji pošto"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Ni ponovitev"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
-msgstr "Pošlji pošto _za:"
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "Predogled:"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Run program:"
-msgstr "_Poženi program:"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Pri_vatno"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "_Zvok"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "_Javno"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "Ponovitev"
+
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr "Pravilo ponovitev"
+
+#: po/tmp/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Opozorilo"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Recur on the"
-msgstr "Ponovitev na"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr "Enostavna ponovitev"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "th day of the month"
-msgstr "dan v mesecu"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr "_Povzetek:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
-msgid "1st"
-msgstr "1."
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Čas"
 
-#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2."
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "_Zvok"
 
-#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3."
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "_Zaupno"
 
-#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
-msgid "4th"
-msgstr "4."
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr "_Prikaz"
 
-#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
-msgid "5th"
-msgstr "5."
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "_Čas konca"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Every"
-msgstr "Vsak"
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "_Pošlji pošto"
 
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid "month(s)"
-msgstr "mesec"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Program"
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Recurrence"
-msgstr "Ponovitev"
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "_Poženi program:"
 
-#: calendar/gui/event-editor-dialog.glade.h:55
-msgid "Appointment Basics"
-msgstr "Osnove zmenkov"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "_Čas pričetka:"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Datum _pričetka:"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence Rule"
-msgstr "Pravilo ponovitev"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "dni"
 
-#: calendar/gui/event-editor-dialog.glade.h:59
-msgid "No recurrence"
-msgstr "Ni ponovitev"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "dialog-urejevalec-dogodkov"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "Simple recurrence"
-msgstr "Enostavna ponovitev"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
+msgstr "za"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-msgid "Custom recurrence"
-msgstr "Ponovitev po meri"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr "vseskozi"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "day(s)"
-msgstr "dni"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "označba21"
+
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "mesec"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "do"
 
-#: calendar/gui/event-editor-dialog.glade.h:64
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "tednov"
 
-#: calendar/gui/event-editor-dialog.glade.h:66
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/event-editor-dialog.glade.h:67
-msgid "for"
-msgstr "za"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Uredi zmenek"
 
-#: calendar/gui/event-editor-dialog.glade.h:68
-msgid "until"
-msgstr "do"
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "na"
 
-#: calendar/gui/event-editor-dialog.glade.h:69
-msgid "forever"
-msgstr "vseskozi"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dan"
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid "Exceptions"
-msgstr "Izjeme"
+#: calendar/gui/event-editor.c:559
+#, fuzzy
+msgid "on the"
+msgstr "mesec"
 
-#: calendar/gui/event-editor-dialog.glade.h:72
-msgid "Modify"
-msgstr "Spremeni"
+#: calendar/gui/event-editor.c:566
+#, fuzzy
+msgid "th"
+msgstr "4."
 
-#: calendar/gui/event-editor-dialog.glade.h:74
-msgid "label21"
-msgstr "označba21"
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
+msgstr "pojavitve"
 
-#: calendar/gui/event-editor-dialog.glade.h:75
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
-"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."
+
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2319,10 +2257,6 @@ msgstr "štirinajst dni"
 msgid "week"
 msgstr "teden"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dan"
-
 #: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "ura"
@@ -2421,53 +2355,29 @@ msgstr "dvanajsti"
 msgid "ago"
 msgstr "nazaj"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "Ustvari predmet za-opravit"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "Uredi predemet za-opravit"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Povzetek:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "Do datuma:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Prioriteta:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "Komentarji predmeta:"
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
+#: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
 msgstr "Opomin na zmenek ob "
 
-#: calendar/gui/gnome-cal.c:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Nisem mogel naložiti koledarja v `%s'"
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Nisem mogel ustvariti koledarja v `%s'"
 
-#: calendar/gui/gnome-cal.c:1166
+#: calendar/gui/gnome-cal.c:1174
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda potrebna za naložitev `%s' ni podprta"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
-#: mail/mail-search-dialogue.c:101
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "V redu"
 
@@ -2494,6 +2404,26 @@ msgstr ""
 msgid "Go to today"
 msgstr "Pojdi na danes"
 
+#: calendar/gui/print.c:288
+msgid "1st"
+msgstr "1."
+
+#: calendar/gui/print.c:288
+msgid "2nd"
+msgstr "2."
+
+#: calendar/gui/print.c:288
+msgid "3rd"
+msgstr "3."
+
+#: calendar/gui/print.c:288
+msgid "4th"
+msgstr "4."
+
+#: calendar/gui/print.c:288
+msgid "5th"
+msgstr "5."
+
 #: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6."
@@ -2662,190 +2592,95 @@ msgstr "Trenutno leto (%Y)"
 msgid "Print Calendar"
 msgstr "Natisni _koledar"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:834
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "Prikaz časa"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Oblika izpisa časa"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 urna (dop./pop.)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 urna"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "Tedni se začnejo v"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Razpon dni"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"Prosim izberite ure začetka in konca dneva, ki naj\n"
-"bodo prikazane v dnevnem in tedenskem pogledu.\n"
-"Časi izven tega razpona ne bodo samodejno prikazani"
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "Začetek dneva:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "Konec dneva:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "Barve za prikaz"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "Pokaži v seznamu za-opravit:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "Slog seznama za-opravit:"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "Osvetli pretečene predmete"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "Osvetli še nepretečene predmete"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "Osvetli predmete z današnjim rokom"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "Lastnosti seznama Za-opravit"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "Seznam Za-opravit"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Nastavitve"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmi"
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "Lastnosti alarma"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "Piskaj ob zaslonskih alarmih"
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "Zvočni alarmi pretečejo po"
-
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " sekundah"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "Omogoči podaljšanje spanja za "
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "PTSČPSN"
 
-#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "PTSČPSN"
 
-#: camel/camel-movemail.c:96
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Nisem mogel preverti poštne datoteke %s: %s"
-
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#. 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
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
 
-#: camel/camel-movemail.c:143
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"Časovna omejitev je pretekla ob pridobivanju ključavnice na %s. Poskusi "
+"znova kasneje."
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Nisem mogel preverti poštne datoteke %s: %s"
+
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, 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:194
+#: camel/camel-movemail.c:197
 #, 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:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Časovna omejitev je pretekla ob pridobivanju ključavnice na %s. Poskusi "
-"znova kasneje."
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Napaka ob branju poštne datoteke: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Napak ob pisanju v začasno poštno datoteko: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, 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:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
@@ -2878,6 +2713,10 @@ msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -2903,12 +2742,12 @@ msgstr "Ni takšnega gostitelja %s."
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2917,21 +2756,33 @@ msgstr ""
 "Ne morem ustvariti imenika %s:\n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL niz '%s' ne vsebuje protokola"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL niz '%s' vsebuje neveljaven protokol"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:154
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Številka vrat v URL '%s' ni numerična"
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "Nisem mogel ustvariti cevi: %s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Nepričakovan odgovor strežnika IMAP: %s"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2942,16 +2793,21 @@ msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+#, fuzzy
+msgid "Server response ended too soon."
+msgstr "odgovor IMAP strežnika ni vseboval podatkov %s"
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, 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:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan OK odgovor strežnika IMAP: %s"
@@ -2961,7 +2817,7 @@ msgstr "Nepričakovan OK odgovor strežnika IMAP: %s"
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v FETCH odgovoru."
 
@@ -3014,50 +2870,200 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "Nisem mogel ustvariti povzetka"
+#: camel/providers/local/camel-local-provider.c:36
+#, fuzzy
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "UNIX MH-oblika poštnih imenikov"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "Za shranjevanje krajevne pošte v poštnih imenikih enakih MH-jevim"
+
+#: camel/providers/local/camel-local-provider.c:47
+#, fuzzy
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX mbox-oblikovane poštne datoteke"
+
+#: camel/providers/local/camel-local-provider.c:48
+#, fuzzy
+msgid "For storing local mail in standard mbox format"
+msgstr "Za shranjevanje krajevne pošte v poštnih imenikih enakih MH-jevim"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+#, fuzzy
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Za shranjevanje krajevne pošte v poštnih imenikih enakih MH-jevim"
 
-#: camel/providers/mbox/camel-mbox-folder.c:389
-#: camel/providers/mbox/camel-mbox-folder.c:392
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Ne morem pripeti sporočila mbox datoteki: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "`%s' ni običajna datoteka."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Ne morem razvejiti %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+#, fuzzy
+msgid "Local folders may not be nested."
+msgstr "Mbox map ni mogoče gnezditi."
 
-#: camel/providers/mbox/camel-mbox-folder.c:496
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Ne morem dobiti sporočila: %s"
+msgid "Local mail file %s"
+msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX mbox-oblikovane poštne datoteke"
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Nisem mogel preimenovati mape `%s': %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Nisem mogel zbrisati mape `%s': %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Nisem mogel zbrisati 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
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "Ne morem dodati sporočila v mh mapo: %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:204
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Ne morem dobiti sporočila: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#, fuzzy
+msgid "No such message"
+msgstr "Ni takšnega gostitelja %s."
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
 msgstr ""
-"Za branje pošte dostavljene na krajevni sistem in za shranjevanje pošte na "
-"krajevni disk."
 
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Ne morem odpreti datoteke '%s':\n"
+"Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/mbox/camel-mbox-store.c:134
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nisem mogel ustvariti mape `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' ni imenik."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Nisem mogel zbrisati mape `%s': %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Krajevni poštni imenik %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, fuzzy, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Ne morem pripeti sporočila mbox datoteki: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Ne morem dobiti sporočila: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Ne morem odpreti datoteke '%s':\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3066,14 +3072,14 @@ msgstr ""
 "Nisem mogel ustvariti datoteke `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni običajna datoteka."
 
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3082,151 +3088,89 @@ msgstr ""
 "Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Nisem mogel preimenovati mape %s v %s: cilj že obstaja"
-
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox map ni mogoče gnezditi."
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Nisem mogel odpreti mape: seznam sporočil je bil nepopoln."
 
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Local mail file %s"
-msgstr "Krajevna datoteka s pošto %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
-#, c-format
-msgid "Could not open summary %s"
-msgstr "Nisem mogel odpreti povzetka %s"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Ne morem razvejiti %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+"Nisem mogel odpreti imenika `%s':\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:688
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
+#: camel/providers/local/camel-mbox-summary.c:512
+#: camel/providers/local/camel-mbox-summary.c:520
+#: camel/providers/local/camel-mbox-summary.c:691
+#: camel/providers/local/camel-mbox-summary.c:699
+#, fuzzy
+msgid "Summary and folder mismatch, even after a sync"
 msgstr "Povzetek se ne ujema, prekinjam sinhronizacijo"
 
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Povzetek se ne ujema, X-Evolution glava manjka"
-
-#: camel/providers/mbox/camel-mbox-summary.c:776
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Napaka ob pisanju v začasni poštni predal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Ne morem kopirati podatkov v izhodno datoteko: %s"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Napaka ob pisanju v začasni poštni predal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:832
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:841
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:849
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:861
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "Nisem mogel naložiti ali ustvariti povzetka"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mh mapo: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Ne morem dobiti sporočila: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "UNIX MH-oblika poštnih imenikov"
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Za shranjevanje krajevne pošte v poštnih imenikih enakih MH-jevim"
-
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti imenika `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:127
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel ustvariti mape `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:136
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ni imenik."
 
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Nisem mogel zbrisati mape `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Nisem mogel preimenovati mape `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Nisem mogel preimenovati mape `%s': %s že obstaja"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH mape ne morejo biti gnezdene"
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Krajevni poštni imenik %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3244,7 +3188,7 @@ msgstr "Nisem uspel poslati uporabniškega imena strežniku"
 msgid "Server rejected username/password"
 msgstr "Strežnik je zavrnil uporabniško ime/geslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Sporočilo %s ni bilo najdeno."
@@ -3295,16 +3239,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 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:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nisem uspel prenesti sporočila z POP strežnika %s: %s"
@@ -3393,7 +3337,7 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
@@ -3462,108 +3406,107 @@ msgstr "Nuditelj virutalne mape e-pošte"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
 
-#: composer/e-msg-composer-attachment-bar.c:86
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:88
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer-attachment-bar.c:443 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Odstrani"
 
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Lastnosti priloge"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "MIME tip:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Ime datoteke:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
-#: mail/mail-format.c:589
+#: po/tmp/e-msg-composer-attachment.glade.h:9
+msgid "MIME type:"
+msgstr "MIME tip:"
+
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 msgid "Enter the identity you wish to send this message from"
 msgstr "Vnesite identiteto s katero želite poslati to sporočilo"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:602
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:609
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 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:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3571,15 +3514,15 @@ msgstr ""
 "Vnesite naslove, ki bodo prejeli karbonske kopije sporočila, a  se ne bodo "
 "pojavili v seznamu prejemnikov sporočila."
 
-#: composer/e-msg-composer-hdrs.c:318 mail/mail-format.c:614
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Vnesite zadevo spročila"
 
-#: composer/e-msg-composer.c:302
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3588,38 +3531,38 @@ msgstr ""
 "Nisem mogel odpreti datoteke s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:458
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:469
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napak ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:489
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:511
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Shranjujem spremembe sporočila..."
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Shranjujem spremembe sporočila..."
 
-#: composer/e-msg-composer.c:554
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Napaka ob shranjevanju kompozicije v 'Osnutki': %s"
 
-#: composer/e-msg-composer.c:598 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:604
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3629,27 +3572,27 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Datoteka ne obstaja."
 
-#: composer/e-msg-composer.c:762
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "To ni običajna datoteka."
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Ta datoteka obstaja a ni berljiva."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:923
 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:804
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3657,15 +3600,15 @@ msgstr ""
 "Datoteka je zelo velika (čez 100K).\n"
 "Ste prepričani,da jo želite vstaviti?"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: composer/e-msg-composer.c:1197
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
@@ -3673,6 +3616,11 @@ msgstr "Nisem mogel ustvariti okna skladatelja."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega skladatelja."
 
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Išči"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "let"
@@ -3759,8 +3707,8 @@ msgstr "Primerjaj z"
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:338
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
@@ -3768,12 +3716,17 @@ msgstr "Filtru dodaj pravilo"
 msgid "Edit Filter Rule"
 msgstr "Uredi pravilo filtra"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:456 filter/filter.glade.h:7
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr "Grupiranje"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Uredi filtre"
 
@@ -3798,19 +3751,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:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Vnesite URI mape"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3819,7 +3772,12 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Preizkus"
 
@@ -3831,238 +3789,228 @@ msgstr "Ime pravila: "
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Če"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Izvrši dejanja"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "če je zadoščeno vsem pogojem"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "če je zaddoščeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Odstrani pogoj"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Prihodna\n"
-"Odhodna\n"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Pravila filtriranja"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Uredi"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Uredi vMape"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "Pravila filtriranja"
+
+#: po/tmp/filter.glade.h:12
+#, fuzzy
+msgid "Incoming"
+msgstr ""
+"Prihodna\n"
+"Odhodna\n"
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "Obroba:"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Viri vMap"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:511
-msgid "Answered"
-msgstr "Odgovorjeno"
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Pripiši barvo"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Pripiši točke"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Zbrisano"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr "Osnutek"
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr "Označeno"
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "Posreduj na naslove"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Jedro sporočila"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Sporočilo je bilo sprejeto"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Sporočilo je bilo poslano"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Prejemniki"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:508
-msgid "Seen"
-msgstr "Videno"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:22
-msgid "Set Flag"
-msgstr "Postavi označbo"
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Stanje priklopa"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Vir"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "_Stanje:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "po"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "pred"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "vsebuje"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "ne vsebuje"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "se ne konča z"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr "ne ustreza z regularnemu izrazu"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "ne zveni kot"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "se ne začne z"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "se konča z"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr "ustreza regularnemu izrazu"
-
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "na ali po"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "na ali pred"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "je bilo pred"
 
@@ -4086,161 +4034,156 @@ msgstr "Dodaj pravilo vMape"
 msgid "Edit VFolder Rule"
 msgstr "Uredi pravilo vMape"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolution komponente za pošto."
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Ne morem inicializirati Evolution komponente za povzemanje pošte."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Ne morem inicializirati Evolution komponente za razpršeno shrambo."
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser.c:143
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
+msgstr "Shrani"
+
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "Telo ali zadeva vsebuje"
 
-#: mail/folder-browser.c:144
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Telo vsebuje"
 
-#: mail/folder-browser.c:145
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
-#: mail/folder-browser.c:146
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Telo ne vsebuje"
 
-#: mail/folder-browser.c:147
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#: mail/folder-browser.c:148
-msgid "Custom search"
-msgstr "Iskanje po meri"
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr "vMapa glede na Zadevo"
 
-#: mail/folder-browser.c:320
-msgid "Custom"
-msgstr "Po meri"
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr "vMapa glede na Pošiljatelja"
 
-#: mail/folder-browser.c:478
-msgid "Open in New Window"
-msgstr "Odpri v novem oknu"
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr "vMapa glede na Prejemnika"
 
-#: mail/folder-browser.c:479
-msgid "Edit Message"
-msgstr "Uredi sporočilo"
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr "Filter glede na Zadevo"
 
-#: mail/folder-browser.c:480 mail/mail-callbacks.c:794
-msgid "Print Message"
-msgstr "Natisni sporočilo"
+#: mail/folder-browser.c:458
+msgid "Filter on Sender"
+msgstr "Filter glede na Pošiljatelja"
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr "Filter glede na Prejemnike"
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr "Filter glede na Poštni seznam"
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "_Odpri"
 
-#: mail/folder-browser.c:482
+#: mail/folder-browser.c:466
+#, fuzzy
+msgid "Save As..."
+msgstr "Shrani _kot..."
+
+#: mail/folder-browser.c:467 mail/mail-view.c:163
+#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
+#: po/tmp/evolution-mail.xml.h:28
+msgid "Print"
+msgstr "Natisni"
+
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:483 mail/mail-view.c:156 ui/evolution-mail.h:35
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: mail/folder-browser.c:484
-msgid "Forward Message"
-msgstr "Sporočilo posreduj naprej"
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr "Posreduj naprej"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Pojdi po času naprej"
 
-#: mail/folder-browser.c:486
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "Označi kot prebrano"
 
-#: mail/folder-browser.c:487
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Označi kot neprebrano"
 
-#: mail/folder-browser.c:488
-msgid "Delete Message"
-msgstr "Zbriši sporčilo"
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Prestavi v mapo"
 
-#: mail/folder-browser.c:489
-msgid "Move Message"
-msgstr "Prestavi sporočilo"
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Kopiraj v mapo"
 
-#: mail/folder-browser.c:490
-msgid "Copy Message"
-msgstr "Kopiraj sporočilo"
+#: mail/folder-browser.c:480
+#, fuzzy
+msgid "Undelete"
+msgstr "Zbriši"
 
-#: mail/folder-browser.c:491
+#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
+#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:493
-msgid "VFolder on Subject"
-msgstr "vMapa glede na Zadevo"
-
-#: mail/folder-browser.c:494
-msgid "VFolder on Sender"
-msgstr "vMapa glede na Pošiljatelja"
-
-#: mail/folder-browser.c:495
-msgid "VFolder on Recipients"
-msgstr "vMapa glede na Prejemnika"
-
-#: mail/folder-browser.c:497
-msgid "Filter on Subject"
-msgstr "Filter glede na Zadevo"
-
-#: mail/folder-browser.c:498
-msgid "Filter on Sender"
-msgstr "Filter glede na Pošiljatelja"
-
-#: mail/folder-browser.c:499
-msgid "Filter on Recipients"
-msgstr "Filter glede na Prejemnike"
-
-#: mail/folder-browser.c:500 mail/folder-browser.c:523
-msgid "Filter on Mailing List"
-msgstr "Filter glede na Poštni seznam"
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
 
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Poštni seznam (%s)"
 
-#: mail/folder-browser.c:641
-msgid "Full Search"
-msgstr "Polno iskanje"
-
-#.
-#. *  This file is autogenerated from evolution-event-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: mail/folder-browser.c:646 ui/evolution-event-editor.h:9
-msgid "Save"
-msgstr "Shrani"
-
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
 #: mail/mail-autofilter.c:214
+#, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:232
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:334
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
@@ -4297,15 +4240,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:533
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4313,7 +4256,29 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:749
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "Prepiši datoteko?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Mapa z enakim imenom že obstaja.\n"
+"Naj jo prepišem?"
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Shrani kot..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Shrani kot..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4322,11 +4287,47 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 " %s"
 
-#: mail/mail-callbacks.c:841
+#: mail/mail-callbacks.c:922
+msgid "Print Message"
+msgstr "Natisni sporočilo"
+
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/mail-config-druid.glade.h:6
+msgid "Identity"
+msgstr "Identiteta"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "Nastavitev _pošte"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "Izvor pošte"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Prenos Pošte"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"Nastavljanje vaše e-pošte je sedaj gotovo.\n"
+"Kliknite \"Končaj\" za shranitev nastavitev"
+
+#: mail/mail-config-gui.c:433
 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 "
@@ -4336,59 +4337,63 @@ msgstr ""
 "želji lahko vnesete tudi ime vaše organizacije in ime datoteke iz katere naj "
 "se prebere vaš podpis."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Polno ime:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "E-poštni naslov:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Datoteka s podpisom"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Strežnik:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Pot:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Avtentikacija:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Ugotovi podprte tipe..."
 
-#: mail/mail-config-gui.c:967
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr ""
+
+#: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Ne zbriši sporočil s strežnika"
 
-#: mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Preveri nastavitve"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Tip izvora pošte:"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4402,11 +4407,11 @@ msgstr ""
 "Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
 "podprte tipe...\" potem, ko boste vnesli ostale podatke."
 
-#: mail/mail-config-gui.c:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "Tip izvora novičk:"
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4420,186 +4425,112 @@ msgstr ""
 "Če strežnik potrebuje avtentikacijo, lako kliknete na gumb \"Ugotovi podprte "
 "tipe...\", po tem ko boste vnesli ostale podatke."
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "Tip prenosa pošte:"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Dodaj identiteto"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "Uredi identiteto"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Dodaj izvor"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Uredi izbor"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Dodaj novičarski strežnik"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Uredi novičarski strežnik"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Preizkušam \"%s\""
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Preizkusi povezavo z \"%s\""
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "Povezava je bila uspešna!"
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Poizvedujem o možnostih avtentifikacije pri \"%s\""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "Poizvedi o možnostih avtentifikacije pri \"%s\""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "Nastavitev _pošte"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Dobrodošli v nastavitvenem čarovniku pošte!\n"
-"Z vpisom nekaterih podatkov o vaših nastavitvah e-pošte\n"
-"lahko takoj pričnete pošiljati in sprejemati pošto\n"
-"Kliknite naprej za nadaljevanje."
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Identiteta"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Izvor pošte"
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "Prenos Pošte"
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"Nastavljanje vaše e-pošte je sedaj gotovo.\n"
-"Kliknite \"Končaj\" za shranitev nastavitev"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr "Identitete"
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Naslov"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Organizacija"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Viri"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr "Identitete"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Izvori pošte"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
+msgstr "Označi sporočilo kot viden [ms]:"
+
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Novičarski strežniki"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Viri novic"
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "Organizacija"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Pošiljaj sporočila v HTML obliki"
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
-msgstr "Označi sporočilo kot viden [ms]:"
-
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Nisem mogel ustvariti cevi do %s: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Nisem mogel izvršiti %s: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Ne morem razvejiti %s: %s"
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Viri"
 
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Prosim vpišite svojo PGP/GPG geslo za dostop do ključa"
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Geslo ni bilo dano."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP program ni na voljo."
 
-#: mail/mail-display.c:66
-msgid "Overwrite file?"
-msgstr "Prepiši datoteko?"
-
-#: mail/mail-display.c:70
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Mapa z enakim imenom že obstaja.\n"
-"Naj jo prepišem?"
-
-#: mail/mail-display.c:84
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4608,122 +4539,127 @@ msgstr ""
 "Nisem mogel odpreti datoteke: %s:\n"
 "%s"
 
-#: mail/mail-display.c:96
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Zunanji pregledovalec"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:595
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:835
+#: mail/mail-format.c:845
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "V tej različici Evolucije GPG/PGP podpora ni prisotna."
 
-#: mail/mail-format.c:847
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "Šifrirano sporočilo ni prikazano"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "Šifrirano sporočilo"
 
-#: mail/mail-format.c:854
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za dešifriranje."
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1468
+#: mail/mail-format.c:1482
 #, 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:1472
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1506
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1511
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Zapiram trenutno mapo"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Preimenujem in odpiram staro mapo"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopiram sporočilo"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4732,7 +4668,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:443
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4740,281 +4676,306 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX neprebran)"
+#: mail/mail-local.c:781
+#, fuzzy
+msgid "Registering local folder"
+msgstr "Ustvari novo mapo"
+
+#: mail/mail-local.c:783
+#, fuzzy
+msgid "Register local folder"
+msgstr "Ustvari novo mapo"
 
-#: mail/mail-ops.c:69
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Pobiram pošto iz %s"
 
-#: mail/mail-ops.c:71
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Poberi pošto iz %s"
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ni nove pošte na %s."
 
-#: mail/mail-ops.c:366
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtriram pošto na zahtevo"
 
-#: mail/mail-ops.c:368
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Fitriraj pošto na zahtevo"
 
-#: mail/mail-ops.c:500
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:505
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "Pošiljam sporočilo brez navedene zadeve"
 
-#: mail/mail-ops.c:508
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "Pošlji \"%s\""
 
-#: mail/mail-ops.c:511
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Pošlji sporočilo brez navedene zadeve"
 
-#: mail/mail-ops.c:682
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "Pošiljam vrsto"
 
-#: mail/mail-ops.c:684
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Pošlji vrsto"
 
-#: mail/mail-ops.c:820 mail/mail-ops.c:827
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Dodajam \"%s\""
 
-#: mail/mail-ops.c:824 mail/mail-ops.c:830
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "Dodajam sporočilo brez navedene zadeve"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Uničujem \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Uniči \"%s\""
 
-#: mail/mail-ops.c:963
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Prestavljam sporočila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiram sporočila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Prestavi sporočilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:970
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiraj sporočilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:1024
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s sporočilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1103
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Izbiram sporočila v mapi \"%s\""
 
-#: mail/mail-ops.c:1106
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Izberi sporočila v mapi \"%s\""
 
-#: mail/mail-ops.c:1137
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Izbiram sporočilo %d od %d"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osvežujem mape v \"%s\""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Osveži mape v \"%s\""
 
-#: mail/mail-ops.c:1331 mail/subscribe-dialog.c:324
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(ni opisa)"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Prilagam sporočilo iz mape \"%s\""
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Priloži sporočilo iz mape \"%s\""
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Posredujem sporočilo \"%s\""
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Posredujem sporočilo brez navedene zadeve"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Posreduj sporočilo \"%s\""
 
-#: mail/mail-ops.c:1511
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Posreduj sporočilo brez navedene zadeve"
 
-#: mail/mail-ops.c:1548
+#: mail/mail-ops.c:1593
 #, 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:1565
+#: mail/mail-ops.c:1610
 msgid ""
 "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."
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "Posredovano sporočilo %s"
+
+#: mail/mail-ops.c:1679
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Posredovano sporočilo %s"
+
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Nalagam \"%s\""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Naloži \"%s\""
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Ustvarjam \"%s\""
 
-#: mail/mail-ops.c:1757
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Ustvari \"%s\""
 
-#: mail/mail-ops.c:1805
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr "Izjema med sporočanjem rezultatov lupini"
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Uskljajujem \"%s\""
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Uskladi \"%s\""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Prikazujem sporočilo z UID \"%s\""
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "Čistim prikazano sporočilo"
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Prikaži sporočilo z UID \"%s\""
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "Čisti prikaz sporočila"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Odpiram sporočila iz  mape \"%s\""
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Odpri sporočilo iz \"%s\""
 
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Nalagam mapo %s "
 
-#: mail/mail-ops.c:2148
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "Naloži mapo %s"
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Gledam sporočilo iz mape \"%s\""
 
-#: mail/mail-ops.c:2218
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Glej sporočilo iz \"%s\""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Prenašam sporočilo %d od %d (uid \"%s\")"
 
-#: mail/mail-search-dialogue.c:101
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Prilagam sporočilo iz mape \"%s\""
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Odpiram sporočila iz  mape \"%s\""
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Prenašam sporočilo %d od %d (uid \"%s\")"
+
+#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: mail/mail-summary.c:97 mail/mail-threads.c:703
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "V cev je bilo zapisano nepopolno sporočilo!"
 
-#: mail/mail-summary.c:370
-msgid "Mailbox summary"
-msgstr "Povzetek poštnega predala"
-
 #: mail/mail-threads.c:301
 #, c-format
 msgid ""
@@ -5024,7 +4985,7 @@ msgstr ""
 "Napaka ob pripravljanju na %s:\n"
 "%s"
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5033,34 +4994,34 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr "Napaka ob branju ukazov iz razpošiljalne niti."
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "Prispelo pokvarjeno sporočilo iz razpošiljalne niti?"
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Nisem mogel ustvariti dialoga."
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "Uporabnik je preklical poizvedbo."
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nisem mogel ustvariti začasnega poštnega predala `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:264
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "Preučujem %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5069,46 +5030,41 @@ msgstr ""
 "dobilipodvojeno sporočilo."
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Prenašam sporočilo %d od %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Pišem sporočilo %d od %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Shranjujem spremembe pri %s"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (posredovano sporočilo)"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Posreduj: (ni zadeve)"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "Posredovano sporočilo (brez navedene zadeve)"
 
-#: mail/mail-tools.c:510
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "Ne poznam protokola za odpiranje URIja `%s'"
-
-#: mail/mail-tools.c:539
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5121,65 +5077,72 @@ msgstr ""
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 ui/evolution-mail.h:34
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/mail-view.c:153 ui/evolution-mail.h:39
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Odgovori pošiljatelju tega sporočila"
 
-#: mail/mail-view.c:156 ui/evolution-mail.h:38
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Odgovori vsem prejemnikom tega sporočila"
 
-#: mail/mail-view.c:159 ui/evolution-mail.h:19
-msgid "Forward"
-msgstr "Posreduj naprej"
-
-#: mail/mail-view.c:159 ui/evolution-mail.h:20
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Sporočilo posreduj naprej"
 
-#: mail/mail-view.c:163 ui/evolution-addressbook.h:16
-#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
-msgid "Print"
-msgstr "Natisni"
-
-#: mail/mail-view.c:163 ui/evolution-mail.h:33
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Natisni izbrano sporočilo"
 
-#: mail/mail-view.c:165 ui/evolution-mail.h:14
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Zbriši to sporčilo"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:2043
+#: mail/message-list.c:575
+msgid "Seen"
+msgstr "Videno"
+
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr "Odgovorjeno"
+
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
+msgstr ""
+
+#. well, we could scan more children, build up a (more accurate) list, but this should do ok
+#: mail/message-list.c:858 mail/message-list.c:873
+#, c-format
+msgid "%s, et al."
+msgstr ""
+
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "Neznano"
+
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "Obnavljam pogled sporočil"
 
-#: mail/message-list.c:2045
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Obnovi pogled sporočil"
 
-#: mail/message-thread.c:582
-msgid "Threading message list"
-msgstr "Nitim seznam sporočil"
-
-#: mail/message-thread.c:584
-msgid "Thread message list"
-msgstr "Niten seznam sporočil"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr "Prikaži mape, ki se začnejo z:"
@@ -5194,27 +5157,31 @@ msgstr "Dobivam shrambo za \"%s\""
 msgid "Get store for \"%s\""
 msgstr "Dobi shrambo za \"%s\""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:282
+#, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:286
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Preklicujem naročnino na mapo \"%s\""
+
+#: mail/subscribe-dialog.c:290
+#, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Naroči se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:387
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Preklicujem naročnino na mapo \"%s\""
-
-#: mail/subscribe-dialog.c:390
-msgid "Unsubscribe to folder \"%s\""
+#: mail/subscribe-dialog.c:293
+#, fuzzy, c-format
+msgid "Unsubscribe from folder \"%s\""
 msgstr "Prekliči naročnono na mapo \"%s\""
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5222,30 +5189,30 @@ msgstr ""
 "Ta različica Evolucije mora namestiti dodatne datoteke\n"
 "v vaš osebni imenik Evolucije"
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 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:152
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno prenoviti datotek"
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Evolucijine datoteke so se uspešno namestile."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "Izgleda, da je tokrat vaš prvi zagon Evolucije."
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:188
 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:197
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5256,7 +5223,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5265,7 +5232,7 @@ msgstr ""
 "Ne morem kopirati datotek v\n"
 "`%s'."
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5276,7 +5243,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5332,11 +5299,11 @@ msgstr "Program 'Bug buddy' ni bil najden v vaši poti ($PATH)."
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Avtorske pravice pridržane 1999,2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5346,37 +5313,37 @@ msgstr ""
 "GNOME za delo v skupinah, za pošto, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Mape"
 
-#: shell/e-shell-view.c:1021
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1167
+#: 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:1208
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Opa!  Pogled za `%s' je nepričakovano umru.  :-(\n"
 "To verjetno pomeni, da se je sesula komponenta %s."
 
-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
-
 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
@@ -5446,64 +5413,65 @@ msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-storage.c:128
+#: po/tmp/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
+#: shell/e-storage-set-view.c:235
+msgid "_View"
+msgstr "_Pogled"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Poglej izbrane mape"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Generična napaka"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Izbran tip mape ni veljaven"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.h:91
-#: ui/evolution.h:39
-msgid "_View"
-msgstr "_Pogled"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Poglej izbrane mape"
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5543,7 +5511,7 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5551,990 +5519,1151 @@ msgstr ""
 "Hvala!\n"
 "Skupina Evolution\n"
 
-#: shell/main.c:123
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Ne morem inicializirati lupine Evolution."
 
-#: shell/main.c:162
+#: shell/main.c:178
+#, fuzzy
+msgid "Disable."
+msgstr "Izključeno"
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "N_ov strežnik imenikov"
 
-#: ui/evolution-addressbook-ldap.h:10
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ui/evolution-addressbook.h:10
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Ustvari nov stik"
 
-#: ui/evolution-addressbook.h:12
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Zbriši stik"
 
-#: ui/evolution-addressbook.h:13 ui/evolution-event-editor.h:33
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Poišči"
 
-#: ui/evolution-addressbook.h:14
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Poišči stik"
 
-#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Nov"
 
-#: ui/evolution-addressbook.h:17
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Natisni stike"
 
-#: ui/evolution-addressbook.h:18
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.h:19
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.h:20
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Glej vse"
 
-#: ui/evolution-addressbook.h:21
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Glej vse stike"
 
-#: ui/evolution-addressbook.h:22
-msgid "_New Contact"
-msgstr "_Nov stik"
-
-#: ui/evolution-addressbook.h:23
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "_Natisni stike..."
 
-#: ui/evolution-addressbook.h:24
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_Išči po kontaktih"
 
-#: ui/evolution-addressbook.h:25 ui/evolution-event-editor.h:113
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Orodja"
 
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.h:9
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 dni"
 
-#: ui/evolution-calendar.h:10
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Alternativne nastavitve"
 
-#: ui/evolution-calendar.h:11
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Koledar"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Nastavitve koledarja..."
 
-#: ui/evolution-calendar.h:12
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Ustvari nov zmenek"
 
-#: ui/evolution-calendar.h:13
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: ui/evolution-calendar.h:14
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.h:15
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Pojdi po času nazaj"
 
-#: ui/evolution-calendar.h:16
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Pojdi po času naprej"
 
-#: ui/evolution-calendar.h:17
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.h:18
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.h:19
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Pojdi na sedanjost"
 
-#: ui/evolution-calendar.h:20
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.h:22
-msgid "New Ca_lendar"
-msgstr "Nov Ko_ledar"
-
-#: ui/evolution-calendar.h:23 ui/evolution-event-editor.h:45
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Naprej"
 
-#: ui/evolution-calendar.h:24
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Odpri koledar"
 
-#: ui/evolution-calendar.h:25
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Nazaj"
 
-#: ui/evolution-calendar.h:27
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.h:28
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Save calendar as something else"
 msgstr "Shrani koledar kot nekaj drugega"
 
-#: ui/evolution-calendar.h:29
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Kaži en dan"
 
-#: ui/evolution-calendar.h:30
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Kaži en mesec"
 
-#: ui/evolution-calendar.h:31
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Kaži en teden"
 
-#: ui/evolution-calendar.h:32
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Pokaži delavni teden"
 
-#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:365
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Danes"
 
-#: ui/evolution-calendar.h:34
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Teden"
 
-#: ui/evolution-calendar.h:35 ui/evolution.h:35
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution-calendar.h:36
-msgid "_New appointment..."
-msgstr "_Nov zmenek..."
-
-#: ui/evolution-calendar.h:37
-msgid "_Open"
-msgstr "_Odpri"
-
-#: ui/evolution-calendar.h:38
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "Odpri ko_ledar"
 
-#: ui/evolution-calendar.h:39
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Natisni ta koledar"
 
-#: ui/evolution-calendar.h:40
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "_Shrani koledar kot"
 
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-event-editor.h:55
-#: ui/evolution-subscribe.h:19 ui/evolution.h:29
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ui/evolution-contact-editor.h:10 ui/evolution-event-editor.h:69
-msgid "_Save"
-msgstr "_Shrani"
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Zbriši ta predmet"
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "Shrani _kot"
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "Zbriši"
 
-#: ui/evolution-contact-editor.h:13 ui/evolution-event-editor.h:66
-msgid "_Print"
-msgstr "_Natisni"
+#: po/tmp/evolution-contact-editor.xml.h:9
+#, fuzzy
+msgid "Help"
+msgstr "_Pomoč"
 
-#: ui/evolution-contact-editor.h:15 ui/evolution-event-editor.h:11
-msgid "Save and Close"
-msgstr "Shrani in zapri"
+#: po/tmp/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "Nas_tavi tiskanje..."
 
-#: ui/evolution-contact-editor.h:16
-msgid "Save the contact and close the dialog box"
-msgstr "Shrani stik in zapri dialog"
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
+msgid "Print this item"
+msgstr "Natisni ta predmet"
 
-#: ui/evolution-contact-editor.h:17 ui/evolution-event-editor.h:15
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Natisni..."
 
-#: ui/evolution-contact-editor.h:18 ui/evolution-event-editor.h:16
-msgid "Print this item"
-msgstr "Natisni ta predmet"
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Shrani _kot..."
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "Zbriši ta predmet"
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr "Shrani in zapri"
 
-#: ui/evolution-event-editor.h:10
-msgid "Save the current file"
-msgstr "Shrani trenutno datoteko"
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
+msgstr "Shrani stik in zapri dialog"
 
-#: ui/evolution-event-editor.h:12
-msgid "Save the appointment and close the dialog box"
-msgstr "Shrani zmenek in zapri dialog"
+#: po/tmp/evolution-contact-editor.xml.h:16
+msgid "Se_nd contact to other..."
+msgstr ""
 
-#: ui/evolution-event-editor.h:17
-msgid "Print Setup"
-msgstr "Nastavitev tiskanja"
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
+msgid "See online help"
+msgstr "Glej pomoč na liniji"
 
-#: ui/evolution-event-editor.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
+#: po/tmp/evolution-contact-editor.xml.h:18
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "FIXME: Novo sporočilo za stik"
 
-#: ui/evolution-event-editor.h:20
-msgid "Close this appointment"
-msgstr "Zapri ta zmenek"
+#: po/tmp/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:110
+#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ui/evolution-event-editor.h:21
-msgid "Cut"
-msgstr "Izreži"
+#: po/tmp/evolution-contact-editor.xml.h:20
+#, fuzzy
+msgid "_Print..."
+msgstr "Natisni..."
 
-#: ui/evolution-event-editor.h:22
-msgid "Cut the selection"
-msgstr "Izreži izbrano"
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
+msgid "_Save"
+msgstr "_Shrani"
 
-#: ui/evolution-event-editor.h:23 ui/evolution-mail.h:11
-msgid "Copy"
-msgstr "Kopiraj"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-event-editor.xml.h:6
+msgid "About this application"
+msgstr "O tem programu"
 
-#: ui/evolution-event-editor.h:24
-msgid "Copy the selection"
-msgstr "Kopiraj izbrano"
+#: po/tmp/evolution-event-editor.xml.h:7
+msgid "About..."
+msgstr "O..."
 
-#: ui/evolution-event-editor.h:25
-msgid "Paste"
-msgstr "Prilepi"
+#: po/tmp/evolution-event-editor.xml.h:8
+msgid "Actio_ns"
+msgstr "_Dejanja"
 
-#: ui/evolution-event-editor.h:26
-msgid "Paste the clipboard"
-msgstr "Prilepi odložišče"
+#: po/tmp/evolution-event-editor.xml.h:9
+msgid "C_lear"
+msgstr "Č_isti"
 
-#: ui/evolution-event-editor.h:27
+#: po/tmp/evolution-event-editor.xml.h:10
+msgid "C_ut"
+msgstr "_Izreži"
+
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Počisti"
 
-#: ui/evolution-event-editor.h:28
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Počisti izbiro"
 
-#: ui/evolution-event-editor.h:29
-msgid "Undo"
-msgstr "Razveljavi"
+#: po/tmp/evolution-event-editor.xml.h:14
+msgid "Close this appointment"
+msgstr "Zapri ta zmenek"
 
-#: ui/evolution-event-editor.h:30
-msgid "Undo the last action"
-msgstr "Razveljavi zadnje dejanje"
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+msgid "Copy"
+msgstr "Kopiraj"
 
-#: ui/evolution-event-editor.h:31
-msgid "Redo"
-msgstr "Obnovi"
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr "Kopiraj izbrano"
 
-#: ui/evolution-event-editor.h:32
-msgid "Redo the undone action"
-msgstr "Obnovi razveljavljeno dejanje"
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "Izreži"
 
-#: ui/evolution-event-editor.h:34
-msgid "Search for a string"
-msgstr "Išči niz"
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr "Izreži izbrano"
 
-#: ui/evolution-event-editor.h:35
-msgid "Find Again"
-msgstr "Poišči znova"
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr "Shrani kot XML"
 
-#: ui/evolution-event-editor.h:36
-msgid "Search again for the same string"
-msgstr "Išči enak niz znova"
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr "Shranio Xml opis uporabniškega vmesnika"
 
-#: ui/evolution-event-editor.h:37
-msgid "Replace"
-msgstr "Zamenjaj"
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr "FIXME: A_dresar..."
 
-#: ui/evolution-event-editor.h:38
-msgid "Replace a string"
-msgstr "Zamenjaj niz"
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Izberi izmed..."
 
-#: ui/evolution-event-editor.h:39
-msgid "Select All"
-msgstr "Izberi vse"
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr "FIXME: Preve_ri imena"
 
-#: ui/evolution-event-editor.h:40
-msgid "Select everything"
-msgstr "Izberi vse"
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Kopiraj v mapo..."
 
-#: ui/evolution-event-editor.h:41
-msgid "Properties"
-msgstr "Lastnosti"
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: _Oblikuj obrazec..."
 
-#: ui/evolution-event-editor.h:42
-msgid "Modify the file's properties"
-msgstr "Spremeni lastnosti datoteke"
+#: po/tmp/evolution-event-editor.xml.h:28
+msgid "FIXME: Define Print _Styles"
+msgstr "FIXME: Določi _sloge tiskanja"
 
-#: ui/evolution-event-editor.h:43
-msgid "Previous"
-msgstr "Prejšnji"
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Obli_kuj ta obrazec"
 
-#: ui/evolution-event-editor.h:44
-msgid "Go to the previous item"
-msgstr "Pojdi na prejšnji predmet"
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: P_rvi predmet v mapi"
 
-#: ui/evolution-event-editor.h:46
-msgid "Go to the next item"
-msgstr "Pojdi na naslednji predmet"
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
+msgstr "FIXME: _Posreduj naprej"
 
-#: ui/evolution-event-editor.h:47
-msgid "FIXME: Schedule Meeting"
-msgstr "FIXME: Načrtuj sestanek"
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr "FIXME: Posreduj naprej kot v_Koledar"
 
-#: ui/evolution-event-editor.h:48
-msgid "Schedule some sort of a meeting"
-msgstr "Načrtuj nek tip sestanka"
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr "FIXME: Pomoč"
 
-#: ui/evolution-event-editor.h:49
-msgid "About..."
-msgstr "O..."
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr "FIXME: Do_končana naloga"
 
-#: ui/evolution-event-editor.h:50
-msgid "About this application"
-msgstr "O tem programu"
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr "FIXME: Vstavi datoteko"
 
-#: ui/evolution-event-editor.h:51
-msgid "FIXME: Help"
-msgstr "FIXME: Pomoč"
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr "FIXME: Pr_edmet..."
 
-#: ui/evolution-event-editor.h:52
-msgid "See online help"
-msgstr "Glej pomoč na liniji"
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr "FIXME: Prilepi po_sebno..."
 
-#: ui/evolution-event-editor.h:53
-msgid "Dump XML"
-msgstr "Shrani kot XML"
+#: po/tmp/evolution-event-editor.xml.h:38
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Predogled tiskanja"
 
-#: ui/evolution-event-editor.h:54
-msgid "Dump the UI Xml description"
-msgstr "Shranio Xml opis uporabniškega vmesnika"
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: O_bjavi obrazec kot..."
 
-#: ui/evolution-event-editor.h:56
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Pošlji sporočilo"
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Ob_javi obrazec..."
 
-#: ui/evolution-event-editor.h:57
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Stik"
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr "FIXME: Ponovitve..."
 
-#: ui/evolution-event-editor.h:58
-msgid "FIXME: _Task"
-msgstr "FIXME: _Naloga"
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr "FIXME: Pošlji"
 
-#: ui/evolution-event-editor.h:59
+#: po/tmp/evolution-event-editor.xml.h:43
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Dodaj prilogo..."
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Razhroščevalnik skript"
+
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Zahteva po _nalogi"
 
-#: ui/evolution-event-editor.h:60
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Vpis v dnevniku"
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Stik"
 
-#: ui/evolution-event-editor.h:61
-msgid "FIXME: _Note"
-msgstr "FIXME: _Opomba"
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _Po meri..."
 
-#: ui/evolution-event-editor.h:62 ui/evolution-event-editor.h:118
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Izberi izmed..."
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr "FIXME: _Datoteka..."
 
-#: ui/evolution-event-editor.h:63
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: V slogu zabeležka"
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Pisava..."
 
-#: ui/evolution-event-editor.h:64
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Določi _sloge tiskanja"
+#: po/tmp/evolution-event-editor.xml.h:50
+msgid "FIXME: _Formatting"
+msgstr "FIXME: _Oblikovanje"
 
-#: ui/evolution-event-editor.h:65
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Predogled tiskanja"
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr "FIXME: _Predmet"
 
-#: ui/evolution-event-editor.h:67
-msgid "Print S_etup..."
-msgstr "Nas_tavi tiskanje..."
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: _Vpis v dnevniku"
 
-#: ui/evolution-event-editor.h:68
-msgid "FIXME: S_end"
-msgstr "FIXME: Pošlji"
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Zadnji predmet v mapi"
 
-#: ui/evolution-event-editor.h:70
-msgid "Save _As..."
-msgstr "Shrani _kot..."
+#: po/tmp/evolution-event-editor.xml.h:54
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: _Pošlji sporočilo"
 
-#: ui/evolution-event-editor.h:71
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Dodaj prilogo..."
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: V slogu zabeležka"
 
-#: ui/evolution-event-editor.h:73
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Prestavi v mapo..."
 
-#: ui/evolution-event-editor.h:74
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Kopiraj v mapo..."
-
-#: ui/evolution-event-editor.h:75
-msgid "_Properties..."
-msgstr "_Lastnosti..."
+#: po/tmp/evolution-event-editor.xml.h:57
+msgid "FIXME: _New Appointment"
+msgstr "FIXME: _Nov zmenek"
 
-#: ui/evolution-event-editor.h:76
-msgid "_Close"
-msgstr "_Zapri"
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr "FIXME: _Opomba"
 
-#: ui/evolution-event-editor.h:77 ui/evolution-subscribe.h:18
-#: ui/evolution.h:28
-msgid "_Edit"
-msgstr "_Uredi"
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Zadeva..."
 
-#: ui/evolution-event-editor.h:78
-msgid "_Undo"
-msgstr "_Razveljavi"
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _Odstavek..."
 
-#: ui/evolution-event-editor.h:79
-msgid "_Redo"
-msgstr "Obnovi"
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _Črkovanje..."
 
-#: ui/evolution-event-editor.h:80
-msgid "C_ut"
-msgstr "_Izreži"
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr "FIXME: _Običajno"
 
-#: ui/evolution-event-editor.h:81
-msgid "_Copy"
-msgstr "_Kopiraj"
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr "FIXME: _Naloga"
 
-#: ui/evolution-event-editor.h:82
-msgid "_Paste"
-msgstr "_Prilepi"
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: _Neprebran predmet"
 
-#: ui/evolution-event-editor.h:83
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Prilepi po_sebno..."
+#: po/tmp/evolution-event-editor.xml.h:65
+msgid "FIXME: what goes here?"
+msgstr "FIXME: kaj pride sem?"
 
-#: ui/evolution-event-editor.h:84 ui/evolution-event-editor.h:85
-msgid "C_lear"
-msgstr "Č_isti"
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
+msgid "F_ormat"
+msgstr "O_blikuj izpis"
 
-#: ui/evolution-event-editor.h:86
-msgid "_Find..."
-msgstr "_Poišči"
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr "Poišči znova"
 
-#: ui/evolution-event-editor.h:87
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Poišči znova"
 
-#: ui/evolution-event-editor.h:88
-msgid "_Replace..."
-msgstr "_Zamenjaj..."
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr "Pojdi na naslednji predmet"
 
-#: ui/evolution-event-editor.h:89
-msgid "_Object"
-msgstr "_Predmet"
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr "Pojdi na prejšnji predmet"
 
-#: ui/evolution-event-editor.h:90
-msgid "FIXME: what goes here?"
-msgstr "FIXME: kaj pride sem?"
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr "Spremeni lastnosti datoteke"
+
+#: po/tmp/evolution-event-editor.xml.h:73
+msgid "N_ext"
+msgstr "Napr_ej"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "Prilepi"
 
-#: ui/evolution-event-editor.h:92
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr "Prilepi odložišče"
+
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "P_rejšnji"
 
-#: ui/evolution-event-editor.h:93 ui/evolution-event-editor.h:98
-msgid "FIXME: _Item"
-msgstr "FIXME: _Predmet"
+#: po/tmp/evolution-event-editor.xml.h:78
+msgid "Previous"
+msgstr "Prejšnji"
 
-#: ui/evolution-event-editor.h:94 ui/evolution-event-editor.h:99
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Neprebran predmet"
+#: po/tmp/evolution-event-editor.xml.h:79
+msgid "Print S_etup..."
+msgstr "Nas_tavi tiskanje..."
 
-#: ui/evolution-event-editor.h:95 ui/evolution-event-editor.h:100
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Do_končana naloga"
+#: po/tmp/evolution-event-editor.xml.h:80
+msgid "Print Setup"
+msgstr "Nastavitev tiskanja"
 
-#: ui/evolution-event-editor.h:96
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: P_rvi predmet v mapi"
+#: po/tmp/evolution-event-editor.xml.h:83
+msgid "Properties"
+msgstr "Lastnosti"
 
-#: ui/evolution-event-editor.h:97
-msgid "N_ext"
-msgstr "Napr_ej"
+#: po/tmp/evolution-event-editor.xml.h:84
+msgid "Redo"
+msgstr "Obnovi"
 
-#: ui/evolution-event-editor.h:101
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Zadnji predmet v mapi"
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr "Obnovi razveljavljeno dejanje"
 
-#: ui/evolution-event-editor.h:102
-msgid "_Toolbars"
-msgstr "_Orodjarne"
+#: po/tmp/evolution-event-editor.xml.h:86
+msgid "Replace"
+msgstr "Zamenjaj"
 
-#: ui/evolution-event-editor.h:103
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Običajno"
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr "Zamenjaj niz"
 
-#: ui/evolution-event-editor.h:104
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Oblikovanje"
+#: po/tmp/evolution-event-editor.xml.h:91
+msgid "Save the appointment and close the dialog box"
+msgstr "Shrani zmenek in zapri dialog"
 
-#: ui/evolution-event-editor.h:105
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Po meri..."
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
+msgid "Save the current file"
+msgstr "Shrani trenutno datoteko"
 
-#: ui/evolution-event-editor.h:106
-msgid "_Insert"
-msgstr "Vstavi"
+#: po/tmp/evolution-event-editor.xml.h:93
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "FIXME: Načrtuj sestanek"
 
-#: ui/evolution-event-editor.h:107
-msgid "FIXME: _File..."
-msgstr "FIXME: _Datoteka..."
+#: po/tmp/evolution-event-editor.xml.h:94
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "FIXME: _Načrtuj sestanek"
 
-#: ui/evolution-event-editor.h:108
-msgid "FIXME: It_em..."
-msgstr "FIXME: Pr_edmet..."
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr "Načrtuj nek tip sestanka"
 
-#: ui/evolution-event-editor.h:109
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Zadeva..."
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr "Išči enak niz znova"
 
-#: ui/evolution-event-editor.h:110
-msgid "F_ormat"
-msgstr "O_blikuj izpis"
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr "Išči niz"
 
-#: ui/evolution-event-editor.h:111
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Pisava..."
+#: po/tmp/evolution-event-editor.xml.h:99
+msgid "Select All"
+msgstr "Izberi vse"
 
-#: ui/evolution-event-editor.h:112
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Odstavek..."
+#: po/tmp/evolution-event-editor.xml.h:100
+msgid "Select everything"
+msgstr "Izberi vse"
 
-#: ui/evolution-event-editor.h:114
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Črkovanje..."
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
 
-#: ui/evolution-event-editor.h:115
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Preve_ri imena"
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr "Razveljavi"
 
-#: ui/evolution-event-editor.h:116
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: A_dresar..."
+#: po/tmp/evolution-event-editor.xml.h:103
+msgid "Undo the last action"
+msgstr "Razveljavi zadnje dejanje"
 
-#: ui/evolution-event-editor.h:117
-msgid "_Forms"
-msgstr "_Obrazci"
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
+msgid "_About..."
+msgstr "_O..."
 
-#: ui/evolution-event-editor.h:119
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Obli_kuj ta obrazec"
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+msgid "_Close"
+msgstr "_Zapri"
 
-#: ui/evolution-event-editor.h:120
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Oblikuj obrazec..."
+#: po/tmp/evolution-event-editor.xml.h:106
+msgid "_Copy"
+msgstr "_Kopiraj"
 
-#: ui/evolution-event-editor.h:121
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Ob_javi obrazec..."
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
+msgid "_Debug"
+msgstr "_Razhroščuj"
 
-#: ui/evolution-event-editor.h:122
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: O_bjavi obrazec kot..."
+#: po/tmp/evolution-event-editor.xml.h:109
+#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
+msgid "_Edit"
+msgstr "_Uredi"
 
-#: ui/evolution-event-editor.h:123
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Razhroščevalnik skript"
+#: po/tmp/evolution-event-editor.xml.h:111
+msgid "_Find..."
+msgstr "_Poišči"
 
-#: ui/evolution-event-editor.h:124
-msgid "Actio_ns"
-msgstr "_Dejanja"
+#: po/tmp/evolution-event-editor.xml.h:112
+msgid "_Forms"
+msgstr "_Obrazci"
 
-#: ui/evolution-event-editor.h:125
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nov zmenek"
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+msgid "_Help"
+msgstr "_Pomoč"
 
-#: ui/evolution-event-editor.h:126
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Ponovitve..."
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr "Vstavi"
 
-#: ui/evolution-event-editor.h:127
-msgid "FIXME: Schedule _Meeting"
-msgstr "FIXME: _Načrtuj sestanek"
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr "_Predmet"
 
-#: ui/evolution-event-editor.h:128
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Posreduj naprej kot v_Koledar"
+#: po/tmp/evolution-event-editor.xml.h:116
+msgid "_Paste"
+msgstr "_Prilepi"
 
-#: ui/evolution-event-editor.h:129
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Posreduj naprej"
+#: po/tmp/evolution-event-editor.xml.h:117
+msgid "_Print"
+msgstr "_Natisni"
 
-#: ui/evolution-event-editor.h:130 ui/evolution.h:32
-msgid "_Help"
-msgstr "_Pomoč"
+#: po/tmp/evolution-event-editor.xml.h:118
+msgid "_Properties..."
+msgstr "_Lastnosti..."
 
-#: ui/evolution-event-editor.h:131
-msgid "_About..."
-msgstr "_O..."
+#: po/tmp/evolution-event-editor.xml.h:119
+msgid "_Redo"
+msgstr "Obnovi"
 
-#: ui/evolution-event-editor.h:132
-msgid "_Debug"
-msgstr "_Razhroščuj"
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr "_Zamenjaj..."
 
-#: ui/evolution-event-editor.h:133
-msgid "FIXME: Insert File"
-msgstr "FIXME: Vstavi datoteko"
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
+msgstr "_Orodjarne"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
+msgstr "_Razveljavi"
 
 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.h:9
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Sestavi"
 
-#: ui/evolution-mail.h:10
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Sestavi novo sporočilo"
 
-#: ui/evolution-mail.h:12
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Prestavi sporočilo v novo mapo"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "_Mapa"
 
-#: ui/evolution-mail.h:16
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Filtriraj glede na Pošiljatelja"
 
-#: ui/evolution-mail.h:17
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtriraj glede na Prejemnike"
 
-#: ui/evolution-mail.h:18
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail.h:21
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Poberi pošto"
 
-#: ui/evolution-mail.h:22
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "Pošlji _filtre ..."
 
-#: ui/evolution-mail.h:23
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
 msgstr "Uredi naročnine..."
 
-#: ui/evolution-mail.h:24
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "Označi _kot prebrano"
 
-#: ui/evolution-mail.h:25
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: ui/evolution-mail.h:26
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Prestavi sporočilo v novo mapo"
 
-#: ui/evolution-mail.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Predogled sporočika, ki bo natisnjeno"
 
-#: ui/evolution-mail.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Predogled tiskanja sporočila"
 
-#: ui/evolution-mail.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Natisni sporočilo na tiskalniku"
 
-#: ui/evolution-mail.h:32
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Natisni sporočilo..."
 
-#: ui/evolution-mail.h:36
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: ui/evolution-mail.h:37
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Odgovori pošiljatelju"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Izberi vse"
 
-#: ui/evolution-mail.h:41
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
 
-#: ui/evolution-mail.h:42
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "_Niten seznam sporočil"
 
-#: ui/evolution-mail.h:43
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _Pošiljatelja"
 
-#: ui/evolution-mail.h:44
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na _Sprejemnike"
 
-#: ui/evolution-mail.h:45
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail.h:46
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "_Nastavi mapo"
 
-#: ui/evolution-mail.h:47
-msgid "_Copy to Folder"
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail.h:49
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "_Uredi sporočilo"
 
-#: ui/evolution-mail.h:50
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: ui/evolution-mail.h:51
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "Filtriraj glede na _Zadevo"
 
-#: ui/evolution-mail.h:52
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "Posreduj _naprej"
 
-#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail.h:54
-msgid "_Mail Configuration..."
-msgstr "Nastavitev _Pošte..."
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "Nastavitev _pošte"
 
-#: ui/evolution-mail.h:55
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_Sporočilo"
 
-#: ui/evolution-mail.h:56
-msgid "_Move to Folder"
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail.h:57
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "_Odpri v novem oknu"
 
-#: ui/evolution-mail.h:58
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "_Natisni sporočilo"
 
-#: ui/evolution-mail.h:59
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Shrani kot..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Vir"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "_Niteno"
 
-#: ui/evolution-mail.h:60
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Zbriši"
+
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "vMapa glede na _Zadevo"
 
-#: ui/evolution-mail.h:61
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "Urejevalnik _virtualnih map..."
 
 #.
-#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.h:9
+#: po/tmp/evolution-message-composer.xml.h:6
+msgid "Attach"
+msgstr "Priloži"
+
+#: po/tmp/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "Close the current file"
+msgstr "Shrani trenutno datoteko"
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr "HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:12
+msgid "Insert a file as text into the message"
+msgstr "Vstavi datoteko v sporočilo kot besedilo"
+
+#: po/tmp/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Insert text file..."
+msgstr "_Vstavi datoteko z besedilom... (FIXME)"
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "Odpri datoteko"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "Shrani _kot"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "Shrani v _mapo..."
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Shrani v _mapo..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save the current file with a different name"
+msgstr "Shrani trenutno datoteko"
+
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "Shrani sporočilo v izbrano mapo"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send"
+msgstr "Pošiljatelj"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "Pošiljatelj"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "Pošiljatelj"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send the mail in HTML format"
+msgstr "Pošlji pošto v HTML obliki"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Pošlji to sporočilo"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "Pošlji to sporočilo"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Pošlji to sporočilo"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Kaži/skrij priloge"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+msgid "Show _attachments"
+msgstr "Kaži priloge"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "Kaži priloge"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr "_Vstavi datoteko z besedilom... (FIXME)"
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "Odpri..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaj mapo na seznam naročenih map"
 
-#: ui/evolution-subscribe.h:12
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Osveži seznam"
 
-#: ui/evolution-subscribe.h:13
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Osveži seznam map"
 
-#: ui/evolution-subscribe.h:14
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Odstrani mapo iz seznama naročenih map"
 
-#: ui/evolution-subscribe.h:16
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Naroči"
 
-#: ui/evolution-subscribe.h:17
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Prekini naročnino"
 
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.h:9
-msgid "Create a new folder"
-msgstr "Ustvari novo mapo"
-
-#: ui/evolution.h:10
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Pokaži drugo mapo"
 
-#: ui/evolution.h:11
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Izhod"
 
-#: ui/evolution.h:12
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution vrstica z bližnjicami"
 
-#: ui/evolution.h:13
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.h:14
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Kako _začeti"
 
-#: ui/evolution.h:15
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Kaži podatke o Evoluciji"
 
-#: ui/evolution.h:16
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Kaži vrstico z _mapami"
 
-#: ui/evolution.h:17
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Kaži vrstico z bližnjicami"
 
-#: ui/evolution.h:18
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "_Pošlji poročilo o hrošču"
+
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.h:19
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.h:20
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.h:21
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: ui/evolution.h:22
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: ui/evolution.h:23
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Uporaba _pošte"
 
-#: ui/evolution.h:24
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.h:25
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Zmenek (FIXME)"
 
-#: ui/evolution.h:26
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.h:27
-msgid "_Create New Folder..."
-msgstr "_Ustvari novo mapo..."
-
-#: ui/evolution.h:30
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Mapa"
 
-#: ui/evolution.h:31
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.h:33
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: ui/evolution.h:34
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Pošlji sporočilo (FIXME)"
 
-#: ui/evolution.h:36
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Nastavitve"
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "_Pošlji poročilo o hrošču"
-
-#: ui/evolution.h:38
+#: po/tmp/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Naloga (FIXME)"
 
+#. 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:2470
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Poskusno"
@@ -6611,13 +6740,6 @@ msgstr "Čas zaključka sestanka:"
 msgid "All Attendees"
 msgstr "Vsi udeleženi"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6627,29 +6749,285 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "Sedaj"
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "Sedaj"
-
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Skupina %i"
 
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Ste prepričani, da \n"
+#~ "želite izbrisati ta stik?"
+
+#~ msgid "window2"
+#~ msgstr "okno2"
+
+#~ msgid "Recur on the"
+#~ msgstr "Ponovitev na"
+
+#~ msgid "th day of the month"
+#~ msgstr "dan v mesecu"
+
+#~ msgid ""
+#~ "This appointment has custom recurrence rules that cannot be edited by "
+#~ "Evolution.\n"
+#~ "\n"
+#~ "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"
+#~ "\n"
+#~ "Vendar se bo zmenek ponovil pravočasno in bo  pravilno prikazan v pogledu "
+#~ "koledarja."
+
+#~ msgid "Create to-do item"
+#~ msgstr "Ustvari predmet za-opravit"
+
+#~ msgid "Edit to-do item"
+#~ msgstr "Uredi predemet za-opravit"
+
+#~ msgid "Summary:"
+#~ msgstr "Povzetek:"
+
+#~ msgid "Due Date:"
+#~ msgstr "Do datuma:"
+
+#~ msgid "Priority:"
+#~ msgstr "Prioriteta:"
+
+#~ msgid "Item Comments:"
+#~ msgstr "Komentarji predmeta:"
+
+#~ msgid "Time display"
+#~ msgstr "Prikaz časa"
+
+#~ msgid "Time format"
+#~ msgstr "Oblika izpisa časa"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 urna (dop./pop.)"
+
+#~ msgid "24-hour"
+#~ msgstr "24 urna"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Tedni se začnejo v"
+
+#~ msgid "Day range"
+#~ msgstr "Razpon dni"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "Prosim izberite ure začetka in konca dneva, ki naj\n"
+#~ "bodo prikazane v dnevnem in tedenskem pogledu.\n"
+#~ "Časi izven tega razpona ne bodo samodejno prikazani"
+
+#~ msgid "Day start:"
+#~ msgstr "Začetek dneva:"
+
+#~ msgid "Day end:"
+#~ msgstr "Konec dneva:"
+
+#~ msgid "Colors for display"
+#~ msgstr "Barve za prikaz"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "Pokaži v seznamu za-opravit:"
+
+#~ msgid "To Do List style options:"
+#~ msgstr "Slog seznama za-opravit:"
+
+#~ msgid "Highlight overdue items"
+#~ msgstr "Osvetli pretečene predmete"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "Osvetli še nepretečene predmete"
+
+#~ msgid "Highlight items due today"
+#~ msgstr "Osvetli predmete z današnjim rokom"
+
+#~ msgid "To Do List Properties"
+#~ msgstr "Lastnosti seznama Za-opravit"
+
+#~ msgid "To Do List"
+#~ msgstr "Seznam Za-opravit"
+
+#~ msgid "Preferences"
+#~ msgstr "Nastavitve"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmi"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "Lastnosti alarma"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "Piskaj ob zaslonskih alarmih"
+
+#~ msgid "Audio alarms timeout after"
+#~ msgstr "Zvočni alarmi pretečejo po"
+
+#~ msgid " seconds"
+#~ msgstr " sekundah"
+
+#~ msgid "Enable snoozing for "
+#~ msgstr "Omogoči podaljšanje spanja za "
+
+#~ 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."
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj že obstaja"
+
+#~ msgid "Could not open summary %s"
+#~ msgstr "Nisem mogel odpreti povzetka %s"
+
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Povzetek se ne ujema, X-Evolution glava manjka"
+
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Ne morem kopirati podatkov v izhodno datoteko: %s"
+
+#~ msgid "Could not load or create summary"
+#~ msgstr "Nisem mogel naložiti ali ustvariti povzetka"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Nisem mogel preimenovati mape `%s': %s že obstaja"
+
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH mape ne morejo biti gnezdene"
+
+#~ msgid "Deleted"
+#~ msgstr "Zbrisano"
+
+#~ msgid "Draft"
+#~ msgstr "Osnutek"
+
+#~ msgid "Flagged"
+#~ msgstr "Označeno"
+
+#~ msgid "Set Flag"
+#~ msgstr "Postavi označbo"
+
+#~ msgid "does not match regex"
+#~ msgstr "ne ustreza z regularnemu izrazu"
+
+#~ msgid "matches regex"
+#~ msgstr "ustreza regularnemu izrazu"
+
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr "Ne morem inicializirati Evolution komponente za povzemanje pošte."
+
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr "Ne morem inicializirati Evolution komponente za razpršeno shrambo."
+
+#~ msgid "Custom search"
+#~ msgstr "Iskanje po meri"
+
+#~ msgid "Custom"
+#~ msgstr "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"
+
+#~ msgid "Delete Message"
+#~ msgstr "Zbriši sporčilo"
+
+#~ msgid "Move Message"
+#~ msgstr "Prestavi sporočilo"
+
+#~ msgid "Copy Message"
+#~ msgstr "Kopiraj sporočilo"
+
+#~ msgid "Full Search"
+#~ msgstr "Polno iskanje"
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail configuration wizard!\n"
+#~ "By filling in some information about your email\n"
+#~ "settings, you can start sending and receiving email\n"
+#~ "right away. Click Next to continue."
+#~ msgstr ""
+#~ "Dobrodošli v nastavitvenem čarovniku pošte!\n"
+#~ "Z vpisom nekaterih podatkov o vaših nastavitvah e-pošte\n"
+#~ "lahko takoj pričnete pošiljati in sprejemati pošto\n"
+#~ "Kliknite naprej za nadaljevanje."
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Nisem mogel ustvariti cevi do %s: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Nisem mogel izvršiti %s: %s\n"
+
+#~ msgid " (XXX unread)"
+#~ msgstr " (XXX neprebran)"
+
+#~ msgid "Mailbox summary"
+#~ msgstr "Povzetek poštnega predala"
+
+#~ msgid "Don't know protocol to open URI `%s'"
+#~ msgstr "Ne poznam protokola za odpiranje URIja `%s'"
+
+#~ msgid "Threading message list"
+#~ msgstr "Nitim seznam sporočil"
+
+#~ msgid "Thread message list"
+#~ msgstr "Niten seznam sporočil"
+
+#~ msgid "_New Contact"
+#~ msgstr "_Nov stik"
+
+#~ msgid "New Ca_lendar"
+#~ msgstr "Nov Ko_ledar"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Nov zmenek..."
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Nastavitev _Pošte..."
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "_Ustvari novo mapo..."
+
 #~ msgid "Quick Search"
 #~ msgstr "Hitro iskanje"
 
@@ -6677,9 +7055,6 @@ msgstr "Skupina %i"
 #~ msgid "FIXME: New _Letter to Contact"
 #~ msgstr "FIXME: Novo _pismo za stik"
 
-#~ msgid "FIXME: New _Message to Contact"
-#~ msgstr "FIXME: Novo sporočilo za stik"
-
 #~ msgid "FIXME: New Meetin_g with Contact"
 #~ msgstr "FIXME: Nov sestanek s stikom"
 
@@ -6943,9 +7318,6 @@ msgstr "Skupina %i"
 #~ msgid "To-do list"
 #~ msgstr "Seznam za opravit"
 
-#~ msgid "Add..."
-#~ msgstr "Dodaj..."
-
 #~ msgid "Edit..."
 #~ msgstr "Uredi..."
 
@@ -7006,51 +7378,15 @@ msgstr "Skupina %i"
 #~ msgid "label8"
 #~ msgstr "oznaka8"
 
-#~ msgid "About to save changes to message..."
-#~ msgstr "Shranil bom spremembe sporočila"
-
 #~ msgid "Load a previously saved message"
 #~ msgstr "Naloži prej shranjeno sporočilo"
 
-#~ msgid "_Save as..."
-#~ msgstr "Shrani kot..."
-
-#~ msgid "Save in _folder..."
-#~ msgstr "Shrani v _mapo..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Shrani sporočilo v izbrano mapo"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Vstavi datoteko z besedilom... (FIXME)"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Vstavi datoteko v sporočilo kot besedilo"
-
 #~ msgid "_Close..."
 #~ msgstr "_Zapri..."
 
 #~ msgid "_Format"
 #~ msgstr "_Oblika izpisa"
 
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Pošlji pošto v HTML obliki"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Kaži priloge"
-
-#~ msgid "Show/hide attachments"
-#~ msgstr "Kaži/skrij priloge"
-
-#~ msgid "Send this message"
-#~ msgstr "Pošlji to sporočilo"
-
-#~ msgid "Attach"
-#~ msgstr "Priloži"
-
 #~ msgid "Check for new mail"
 #~ msgstr "Preveri za novo pošto"
 
@@ -7066,9 +7402,6 @@ msgstr "Skupina %i"
 #~ msgid "Waiting for user to enter data"
 #~ msgstr "Čakam na uporabnika, da vpiše podatek"
 
-#~ msgid "Online Status"
-#~ msgstr "Stanje priklopa"
-
 #~ msgid "From"
 #~ msgstr "Od"
 
@@ -7090,9 +7423,6 @@ msgstr "Skupina %i"
 #~ msgid "Fields"
 #~ msgstr "Polja"
 
-#~ msgid "Grouping"
-#~ msgstr "Grupiranje"
-
 #~ msgid "Sort"
 #~ msgstr "Sortiranje"