From 8800aed605b808c5b894a496ad9b480d03319f7c Mon Sep 17 00:00:00 2001
From: Stano Visnovsky <stano@src.gnome.org>
Date: Thu, 12 Apr 2001 14:14:22 +0000
Subject: Updated Slovak translation

svn path=/trunk/; revision=9263
---
 po/ChangeLog |    4 +
 po/sk.po     | 4107 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 2070 insertions(+), 2041 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 154f671316..5d7840b372 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-12  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation.
+
 2001-04-12  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Fixed Swedish translation. Thanks to G�ran Uddeborg
diff --git a/po/sk.po b/po/sk.po
index 8afea49ccf..8c0bfab14e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,9 +3,9 @@
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-03-15 11:10+0100\n"
-"PO-Revision-Date: 2001-03-02 16:42CET\n"
+"Project-Id-Version: evolution 0.10\n"
+"POT-Creation-Date: 2001-04-12 11:19+0200\n"
+"PO-Revision-Date: 2001-04-12 16:02CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
 "MIME-Version: 1.0\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3269
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3271
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3272
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  Predpona:     "
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3273
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Krstn�:      "
 
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  �al�ie: "
 
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3275
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  Priezvisko:     "
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3276
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  Pr�pona:     "
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3290
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "D�tum narodenia:"
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3303
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "Po�tov� schr�nka:"
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "  Pr�p:         "
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3305
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "  Ulica:      "
 
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3306
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "   Mesto:  "
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3307
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "  Regi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3308
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "   PS�:  "
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3309
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "  Krajina:  "
 
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3322
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Dodacie ozn:"
 
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3334
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telef�ny:\n"
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 " Telef�n: "
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3361
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3364
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3383
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "Po�t.klient:"
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3389
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "�asov� z�na:"
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3397
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Miesto: "
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3401
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Poz�cia: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3413
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3414
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 " Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3415
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "  Vlastn�:"
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3416
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "  Vlastn�2: "
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3417
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "  Vlastn�3: "
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3418
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "  Vlastn�4: "
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3422
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Kateg�rie: "
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3423
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3436
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Unik�tny re�azec:"
 
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3439
 msgid ""
 "\n"
 "Public Key: "
@@ -307,15 +307,15 @@ msgstr "Vytv
 msgid "Imports GnomeCard files into Evolution."
 msgstr "Importuje s�bory GnomeCard do Evolution"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:39
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1090
+#: addressbook/gui/component/addressbook-factory.c:43
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Nie je mo�n� inicializova� Bonobo"
 
@@ -327,20 +327,20 @@ msgstr "Kurzor nie je mo
 msgid "EBook not loaded\n"
 msgstr "EBook nena��tan�\n"
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:652
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Nie je mo�n� spusti� server wombat"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:653
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nie je mo�n� spusti� wombat"
 
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:685
+#: addressbook/conduit/address-conduit.c:688
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je mo�n� pre��ta� blok aplik�cie Adresa z pilota"
 
@@ -348,7 +348,7 @@ msgstr "Nie je mo
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Prida�"
 
@@ -389,7 +389,6 @@ msgstr "Ulo
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "V�eobecn�"
 
@@ -406,7 +405,7 @@ msgid "Phone Types"
 msgstr "Typy telef�nov"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "Prim�rny e-mail"
 
@@ -419,7 +418,7 @@ msgid "Web page address:"
 msgstr "Adresa WWW str�nky:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "_Prida�"
 
@@ -444,8 +443,8 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Odstr�ni�"
 
@@ -497,129 +496,122 @@ msgstr "_Toto je e-mailov
 msgid "Delete Contact?"
 msgstr "Odstr�ni� kontakt?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patr� do t�chto kateg�ri�:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Pr�ca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "Pr�ca 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Pracovn� fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr "Sp�tn� volanie"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "Domov 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Dom�ci fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:1312
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "In�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "�al�� fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr "Prim�rny"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "R�dio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:214
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
-msgstr ""
+msgstr "R�chly kontakt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:216
-#, fuzzy
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 msgid "Edit Full"
-msgstr "Upravi� filtre"
+msgstr "Upravi� cel�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:253
-#, fuzzy
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
-msgstr "Cel� meno:"
+msgstr "Cel� meno"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:259
-#, fuzzy
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -735,25 +727,25 @@ msgstr "_Pr
 msgid "_Title:"
 msgstr "_Titul:"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "Ako _minikarty"
 
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Ako _tabu�ku"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr "Zadajte heslo pre %s"
 
-#: addressbook/gui/component/addressbook.c:440
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr "Nie je mo�n� otvori� adres�r"
 
-#: addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/component/addressbook.c:432
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -773,170 +765,170 @@ msgstr ""
 "si nain�talova� OpenLDAP a znovu skompilova� a \n"
 "nain�talova� Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:568
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr "Zobrazi� v�etko"
 
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr "Pokro�il�..."
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:587
 msgid "Any field contains"
 msgstr "�ubovo�n� pole obsahuje"
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr "Meno obsahuje"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr "E-mail obsahuje"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktor� zobraz� prehliada� prie�inku"
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 msgid "Other Contacts"
 msgstr "In� kontakty"
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
 msgstr "S�bor"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr "Nezn�my typ adres�ra"
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr "�iadny (anonymn� m�d)"
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:261
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Heslo"
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr "SASL"
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 msgid "Unknown auth type"
 msgstr "Nezn�my typ overenia"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "Base"
 msgstr "S�stava"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 msgid "Subtree"
 msgstr "Podstrom"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr "Nezn�my typ rozsahu"
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr "Prip�jacie DN:"
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Pomocn�k pre Bind DN"
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr "Ulo�i� toto heslo"
 
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Hostite�:"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
 msgstr "FIXME Pomocn�k pre Host"
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Port:"
 msgstr "Port:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr "FIXME Pomocn�k pre Port"
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "Kore�ov� DN:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr "FIXME Pomocn�k pre Root DN"
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 msgid "Search Scope:"
 msgstr "Oblas� h�adania:"
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Overenie:"
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Cesta:"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr "FIXME Pomocn�k pre Path"
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 msgid "Create path if it doesn't exist."
 msgstr "Vytvori� cestu, ak e�te neexistuje."
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 msgid "Edit Addressbook"
 msgstr "Upravi� adres�r"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 msgid "Add Addressbook"
 msgstr "Prida� adres�r"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:665
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr "Vyberte typ adres�ra, ktor� m�te, a zadajte po�adovan� inform�cie."
 
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:41
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Meno:"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr "FIXME Pomocn�k pre Name"
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: addressbook/gui/component/addressbook-config.c:674
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Popis:"
 
-#: addressbook/gui/component/addressbook-config.c:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr "FIXME Pomocn�k pre Description"
 
@@ -945,23 +937,24 @@ msgid "Addressbook Sources"
 msgstr "Zdroje adres�ra"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/widgets/e-minicard.c:673
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
+#: mail/mail-config.glade.h:19 mail/mail-view.c:156
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Odstr�ni�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "Upravi�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr "Meno"
 
@@ -969,47 +962,65 @@ msgstr "Meno"
 msgid "URI"
 msgstr "URI"
 
-#: addressbook/gui/component/e-address-widget.c:259
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
-#, fuzzy
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Zak�za� ot�zky"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Povoli� ot�zky (nebezpe�n�)"
+
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+msgid "Edit Contact Info"
+msgstr "Upravi� kontakt"
+
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:269
 msgid "Add to Contacts"
-msgstr "In� kontakty"
+msgstr "Prida� do kontaktov"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-#, fuzzy
-msgid "A Bonobo control for displaying an address."
-msgstr "Uk�kov� ovl�dac� prvok Bonobo, ktor� zobrazuje adres�r."
+msgid "A Bonobo control for an address popup."
+msgstr "Ovl�dac� prvok Bonobo pre adresy."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Ovl�dac� prvok Bonobo, ktor� zobrazuje adresy."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Uk�kov� ovl�dac� prvok Bonobo, ktor� zobrazuje adres�r."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Ovl�dac� prvok pre zobrazenie minikariet adres�ra Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Prehliada� minikariet adres�ra Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution pre pr�cu s kontaktami."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Vytv�racie rozhranie pre ovl�dac� prvok minikariet adres�ra."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
-msgstr "Vytv�racie rozhranie pre rozhranie pre v�ber mena adres�ra."
+msgstr "Vytv�racie rozhranie pre zobrazova� adries Adres�ra"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Vytv�racie rozhranie pre rozhranie adresu z Adres�ra."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Evolution addressbook component."
 msgstr "Vytv�racie rozhranie pre komponent adres�ra Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the sample Addressbook control"
 msgstr "Vytv�racie rozhranie pre uk�kov� ovl�dac� prvok Adres�r"
 
@@ -1021,20 +1032,16 @@ msgstr "Rozhranie pre v
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Vytv�racie rozhranie pre rozhranie pre v�ber mena adres�ra."
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: filter/filter-rule.c:547 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
 msgstr "Odstr�ni�"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
-#, fuzzy
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 msgid "Remove All"
-msgstr "Odstr�ni�"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr ""
+msgstr "Odstr�ni� v�etky"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
@@ -1052,7 +1059,7 @@ msgstr "V
 msgid "Select name from:"
 msgstr "Vybra� meno z:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "H�ada�"
 
@@ -1164,72 +1171,157 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: addressbook/gui/widgets/e-addressbook-view.c:513
+#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-minicard.c:466
+#: addressbook/gui/widgets/e-minicard.c:668
 msgid "Save as VCard"
 msgstr "Ulo�i� ako vKartu"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr "Posla� kontakt in�mu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+msgid "Send message to contact"
+msgstr "Posla� spr�vu kontaktu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
+#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:29
+#: ui/evolution-tasks.xml.h:4
+msgid "Print"
+msgstr "Tla�i�"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+msgid "Print Envelope"
+msgstr "Tla�i� ob�lku"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 msgid "* Click here to add a contact *"
 msgstr "* kliknut�m prid�te kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+msgid "File As"
+msgstr "Ulo�i� ako"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+msgid "Primary Phone"
+msgstr "Prim�rny telef�n"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Assistant Phone"
+msgstr "Asistentov telef�n"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+msgid "Business Phone"
+msgstr "Telef�n do zamestania"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr "Sp�tn� volanie"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+msgid "Company Phone"
+msgstr "Firemn� felef�n"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+msgid "Home Phone"
+msgstr "Telef�n domov"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organiz�cia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+msgid "Business Address"
+msgstr "Adresa zamestania"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+msgid "Home Address"
+msgstr "Adresa domov"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+msgid "Mobile Phone"
+msgstr "Mobil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr "Telef�n v aute"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+msgid "Business Phone 2"
+msgstr "Telef�n do zamestnania 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+msgid "Home Phone 2"
+msgstr "Telef�n domov 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+msgid "Other Phone"
+msgstr "In� telef�n"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+msgid "Other Address"
+msgstr "In� adresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr "WWW str�nka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr "Oddelenie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr "Pracovisko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Title"
 msgstr "Titul"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr "Povolanie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr "Ved�ci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr "Prez�vka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr "Man�el(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Note"
 msgstr "Pozn�mka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr "Vo�no/zanepr�zdnen� URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-msgid "Click here to add a contact"
-msgstr "Kliknut�m prid�te kontakt"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Ulo�i� do adres�ra"
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1243,10 +1335,9 @@ msgstr ""
 "\n"
 "Dvojit�m kliknut�m vytvor�te nov� kontakt."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
-#, fuzzy
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
-msgstr "Karta: "
+msgstr "Karta"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -1413,6 +1504,10 @@ msgstr "Typ:"
 msgid "Width:"
 msgstr "��rka:"
 
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "label26"
+msgstr "label26"
+
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1428,126 +1523,126 @@ msgstr "Nie je mo
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je mo�n� pre��ta� blok aplik�cie ToDo pilota"
 
-#: calendar/gui/calendar-commands.c:233
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "S�bor nen�jden�"
 
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Otvori� kalend�r"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Ulo�i� kalend�r"
 
-#: calendar/gui/calendar-commands.c:451
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:468
+msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie je mo�n� vytvori� kalend�rov� poh�ad. Pros�m, overte nastavenie ORBit a "
 "OAF."
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Verejn�"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "S�kromn�"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Tajn�"
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1619
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "Nezn�my"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:627
 msgid "High"
 msgstr "Vysok�"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1569
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:626
 msgid "Normal"
 msgstr "Norm�lny"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:625
 msgid "Low"
 msgstr "N�zka"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
-msgstr "Priesvitn�"
+msgstr "Prieh�adn�"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
-msgstr "Neprieh�adn�"
+msgstr "Neprieh�adn�"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Neza�al"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "Prebieha"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:428
 msgid "Completed"
 msgstr "Dokon�en�"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 msgid "Cancelled"
 msgstr "Zru�en�"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1558,24 +1653,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
+#: calendar/gui/calendar-model.c:879
+msgid "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr "Klasifik�cia mus� by� 'Verejn�', 'S�kromn�', 'Tajn�' alebo '�iadna'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
-#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
+#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:968
+#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
+#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
 msgid "None"
 msgstr "�iadna"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1585,38 +1678,38 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Percentu�lna hodnota mus� by� medzi 0 a� 100"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1048
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
+msgstr "Priorita mus� by� 'Vysok�', 'Norm�lna', 'N�zka' alebo 'Nedefinovan�'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
-msgstr "Nedefinovan�"
+msgstr "Nedefinovan�"
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+msgstr "Prieh�adnos� mus� by� 'Prieh�adn�', 'Neprieh�adn�' alebo '�iadne'."
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 msgid "Assigned"
 msgstr "Priraden�"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr "�no"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "No"
 msgstr "Nie"
 
@@ -1675,31 +1768,29 @@ msgstr "Ok"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
-msgstr ""
+msgstr "Slu�ba upozor�ovania na poplachy"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-#, fuzzy
 msgid "Factory for the alarm notification service"
-msgstr "Vytv�racie rozhranie pre editor spr�v Evolution."
+msgstr "Vytv�racie rozhranie pre slu�bu na upozornenie na poplach"
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 msgid "Could not initialize GNOME"
 msgstr "Nie je mo�n� inicializova� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
-#, fuzzy
+#: calendar/gui/alarm-notify/notify-main.c:77
 msgid "Could not create the alarm notify service factory"
-msgstr "Nie je mo�n� vytvori� do�asn� prie�inok: %s"
+msgstr "Nie je mo�n� vytvori� vytv�racie rozhranie pre slu�bu upozor�ovania"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Poplach o %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: calendar/gui/dialogs/alarm-notify-dialog.c:196
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Upozornenie na sch�dzku o %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr "S�hrn nie je k dispoz�cii."
 
@@ -1788,7 +1879,7 @@ msgid "Display options"
 msgstr "Mo�nosti zobrazenia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr "Term�n"
 
@@ -1809,7 +1900,7 @@ msgid "Fri"
 msgstr "Pia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "Piatok"
 
@@ -1838,7 +1929,7 @@ msgid "Mon"
 msgstr "Pon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -1851,11 +1942,12 @@ msgid "Overdue Items:"
 msgstr "Po term�ne:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: mail/mail-config.glade.h:45
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Priorita"
 
@@ -1873,7 +1965,7 @@ msgid "Sat"
 msgstr "So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -1898,7 +1990,7 @@ msgid "Sun"
 msgstr "Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "Nede�a"
 
@@ -1911,7 +2003,7 @@ msgid "Thu"
 msgstr "�tv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "�tvrtok"
 
@@ -1932,7 +2024,7 @@ msgid "Tue"
 msgstr "Ut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "Utorok"
 
@@ -1945,7 +2037,7 @@ msgid "Wed"
 msgstr "Str"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -1958,34 +2050,34 @@ msgid "minutes before they occur."
 msgstr "min�t predt�m, ne� nastan�."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "sek�nd."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Naozaj chcete odstr�ni� sch�dzku `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Naozaj chcete odstr�ni� t�to sch�dzku bez mena?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Naozaj chcete odstr�ni� �lohu `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Naozaj chcete odstr�ni� �lohu bez mena?"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Naozaj chcete odstr�ni� polo�ku denn�ka `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Naozaj chcete odstr�ni� polo�ku denn�ka bez mena?"
 
@@ -1999,14 +2091,13 @@ msgid "% Comp_lete:"
 msgstr "% _Hotov�ch:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Klasifik�cia"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
 msgid "Date & Time"
 msgstr "D�tum a �as"
 
@@ -2067,295 +2158,299 @@ msgstr "_Priorita:"
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "Upravi� �lohu"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "�iadny s�hrn"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sch�dzka - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr "�loha - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Polo�ka denn�ku - %s"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr "Kateg�rie"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 msgid "Completion Date"
 msgstr "D�tum dokon�enia"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 msgid "End Date"
 msgstr "D�tum konca"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 msgid "Start Date"
 msgstr "D�tum �tartu"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr "Geografick� umiestnenie"
 
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:164
 msgid "Percent complete"
 msgstr "Hotov�ch percent"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 msgid "Summary"
 msgstr "S�hrn"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
 msgstr "Priesvitnos�"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
 msgid "Click here to add a task"
 msgstr "Kliknut�m prid�te �lohu"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
-msgstr ""
+msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
-msgstr ""
+msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
-msgstr ""
+msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
-msgstr ""
+msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
-msgstr ""
+msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
-msgstr ""
+msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
-msgstr ""
+msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
-msgstr ""
+msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
-msgstr ""
+msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
-msgstr ""
+msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "Ozna�i� ako dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:551
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr "Ozna�� �lohu ako dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit this task..."
 msgstr "Upravi� t�to �lohu..."
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
 msgid "Edit the task"
 msgstr "Upravi� �lohu"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Odstr�ni� t�to �lohu"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "Odstr�ni� �lohu"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i rozdelen� min�ty"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1290
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
-#: calendar/gui/e-week-view-main-item.c:330
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1304
+#: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1317
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:302
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:305
+#: calendar/gui/print.c:616
 msgid "pm"
 msgstr "popoludn�"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
-#, fuzzy
-msgid "New Appointment..."
-msgstr "Nov� sch�dzka..."
+#: calendar/gui/e-day-view.c:3036 ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nov� sch�dzka"
 
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3242
+msgid "New All Day Event"
+msgstr "Nov� celodenn� udalos�"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3247
+msgid "Go to Today"
+msgstr "Prejs� na dne�n� d�tum"
+
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3249
+msgid "Go to Date..."
+msgstr "Prejs� na d�tum..."
+
+#: calendar/gui/e-day-view.c:3052 calendar/gui/e-week-view.c:3255
+#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otvori�"
 
-#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
-#, fuzzy
+#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3257
 msgid "Delete this Appointment"
 msgstr "Odstr�ni� t�to sch�dzku"
 
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3259
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "Napl�nova� stretnutie"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
-#, fuzzy
+#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3272
 msgid "Make this Occurrence Movable"
-msgstr "Nastavi� t�to sch�dzku ako presunute�n�"
+msgstr "Nastavi� tento v�skyt ako presunute�n�"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
-#, fuzzy
+#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3274
 msgid "Delete this Occurrence"
 msgstr "Odstr�ni� tento v�skyt"
 
-#: calendar/gui/e-day-view.c:3047
-#, fuzzy
+#: calendar/gui/e-day-view.c:3069
 msgid "Delete all Occurrences"
 msgstr "Odstr�ni� v�etky v�skyty"
 
-#: calendar/gui/e-itip-control.c:153
+#: calendar/gui/e-itip-control.c:161
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nie je mo�n� aktualizova� v� s�bor s kalend�rom!\n"
 
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
 msgid "Component successfully updated."
 msgstr "Komponent �spe�ne aktualizovan�."
 
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr "Nastala chyba po�as na��tavania s�boru s kalend�rom."
 
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
 msgstr "Nie je mo�n� otvori� v� s�bor s kalend�rom!\n"
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
 msgstr "Nie je mo�n� na��ta� v� s�bor s kalend�rom!\n"
 
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
 msgid "I couldn't read your calendar file!\n"
 msgstr "Nie je mo�n� ��ta� v� s�bor s kalend�rom!\n"
 
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr "Toto je odpove� od niekoho nepozvan�ho!"
 
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
 msgid "I couldn't update your calendar store."
 msgstr "Nie je mo�n� aktualizova� kalend�r."
 
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr "Nie je mo�n� odstr�ni� komponent kalend�ra!\n"
 
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
 msgid "Component successfully deleted."
 msgstr "Komponent �spe�ne zmazan�."
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 msgid "I don't recognize this type of calendar component."
 msgstr "Nie je mo�n� rozozna� typ komponentu kalend�ra."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
 msgid "Add to Calendar"
 msgstr "Prida� do kalend�ra"
 
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
+#: calendar/gui/e-itip-control.c:814
+msgid " Accept "
 msgstr "Akceptova�"
 
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
+#: calendar/gui/e-itip-control.c:815
+msgid " Decline "
 msgstr "Odmietnu�"
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
 msgstr "Predbe�n�"
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 msgid "Update Calendar"
 msgstr "Aktualizova� kalend�r"
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 msgid "Cancel Meeting"
 msgstr "Zru�i� stretnutie"
 
@@ -2372,7 +2467,7 @@ msgstr "--do--"
 msgid "Calendar Message"
 msgstr "Spr�va kalend�ra"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
 msgid "Date:"
 msgstr "D�tum:"
 
@@ -2384,9 +2479,9 @@ msgstr "Na
 msgid "Organizer:"
 msgstr "Organiz�tor:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
-msgid "Sender"
-msgstr "Odosielate�"
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr "Spr�va serveru:"
 
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
@@ -2476,26 +2571,26 @@ msgstr ""
 "Napl�nova�\n"
 "�as"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
-#: mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
+#: mail/message-list.c:1019
 msgid "Status"
 msgstr "Stav"
 
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr "V�etky"
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 msgid "Category:"
 msgstr "Kateg�ria:"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa na��ta� �lohy v `%s'"
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Met�dy potrebn� pre na��tanie `%s' nie je podporovan�"
@@ -2503,12 +2598,15 @@ msgstr "Met
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3255
-#, fuzzy
+#: calendar/gui/e-week-view.c:3240 calendar/gui/e-week-view.c:3263
+msgid "New Appointment..."
+msgstr "Nov� sch�dzka..."
+
+#: calendar/gui/e-week-view.c:3276
 msgid "Delete All Occurrences"
 msgstr "Odstr�ni� v�etky v�skyty"
 
@@ -2545,7 +2643,7 @@ msgid "No recurrence"
 msgstr "Neopakova�"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr "Prehra� zvuk"
 
@@ -2566,21 +2664,21 @@ msgid "Reminder"
 msgstr "Pripomenutie"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 msgid "Run a program"
 msgstr "Spusti� program"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 msgid "Send an email"
 msgstr "Posla� e-mail"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 msgid "Settings..."
 msgstr "Nastavenie..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
 msgid "Show a dialog"
 msgstr "Zobrazi� dial�g"
 
@@ -2600,12 +2698,11 @@ msgstr "
 msgid "_Starting date:"
 msgstr "D�tum _za�iatku:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
 msgid "before"
 msgstr "pred"
 
@@ -2630,120 +2727,128 @@ msgid "hour(s)"
 msgstr "hod�n"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
+msgid "label21"
+msgstr "label21"
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "label55"
+msgstr "label55"
+
+#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
 msgid "minute(s)"
 msgstr "min�t"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "month(s)"
 msgstr "mesiaca/ov"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "start of appointment"
 msgstr "za�iatok sch�dzky"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "pok�m"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "t��d�ov"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "rokov"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "Upravi� sch�dzku"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr "zapnut�"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "de�"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr " "
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 msgid "occurrences"
 msgstr "v�skytov"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "T�to sch�dzka obsahuje opakovanie, ktor� Evolution nedok�e upravi�."
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
 #, c-format
 msgid " %d days"
 msgstr " %d dn�"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 msgid " 1 day"
 msgstr " 1 de�"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, c-format
 msgid " %d weeks"
 msgstr " %d t��d�ov"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 msgid " 1 week"
 msgstr " 1 t��de�"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, c-format
 msgid " %d hours"
 msgstr " %d hod�n"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 msgid " 1 hour"
 msgstr " 1 hodina"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, c-format
 msgid " %d minutes"
 msgstr " %d min�t"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 msgid " 1 minute"
 msgstr " 1 min�ta"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, c-format
 msgid " %d seconds"
 msgstr " %d sek�nd"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 msgid " 1 second"
 msgstr " 1 sekunda"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 msgid " before start of appointment"
 msgstr " pred za�iatkom sch�dzky"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 msgid " after start of appointment"
 msgstr " po za�iatku sch�dzky"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 msgid " before end of appointment"
 msgstr " pred koncom sch�dzky"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 msgid " after end of appointment"
 msgstr " po konci sch�dzky"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -2779,12 +2884,12 @@ msgstr "Vytv
 msgid "Factory for the sample Calendar control"
 msgstr "Vytv�racie rozhranie pre uk�kov� ovl�dac� prvok Kalend�r."
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie je mo�n� otvori� prie�inok v `%s'"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Met�da nutn� k otvoreniu `%s' nie je podporovan�"
@@ -2845,201 +2950,201 @@ msgstr "Okt
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "St"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "�t"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "Pi"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "�lohy"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "Dnes (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Tento t��de� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Tento mesiac (%b - %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Tento rok (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Tla�i� kalend�r"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:32
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:30
 msgid "Print Preview"
 msgstr "Uk�ka pred tla�ou"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktor� bude zobrazova� prie�inok �loh"
 
@@ -3048,6 +3153,8 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
+"Evolution automaticky previedol �lohy z prie�inku kalend�ra do nov�ho prie�inku "
+"�loh."
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3056,6 +3163,9 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
+"Evolution sa pok�sil automaticky previes� �lohy z prie�inku kalend�ra do nov�ho "
+"prie�inku �loh.\n"
+"Niektor� �lohy nebolo mo�n� prenies�, tak�e je mo�n� sa o to pok�si� nesk�r."
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
@@ -3063,6 +3173,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
+"Nie je mo�n� otvori� `%s'; �iadne �daje z prie�inku kalend�ra nebud� preveden� "
+"do prie�inku �loh."
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
@@ -3070,27 +3182,72 @@ msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
+"Met�da pre na��tanie `%s' nie je podporovan�, �iadne polo�ky z "
+"prie�inku kalend�ra nebud� prenesen� do prie�inku �loh."
 
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "NPUS�PS"
 
-#: camel/camel-filter-driver.c:790
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+msgid "Syncing folders"
+msgstr "Synchronizujem prie�inky"
+
+#: camel/camel-filter-driver.c:643
+msgid "Unable to open spool folder"
+msgstr "Nie je mo�n� otvori� prie�inok fronty"
+
+#: camel/camel-filter-driver.c:652
+msgid "Unable to process spool folder"
+msgstr "Nie je mo�n� spracova� prie�inok fronty"
+
+#: camel/camel-filter-driver.c:666
+msgid "Getting message %d (%d%%)"
+msgstr "Z�skavam spr�vu %d (%d%%)"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, c-format
+msgid "Failed message %d"
+msgstr "Zlyhala spr�va %d"
+
+#: camel/camel-filter-driver.c:671
+msgid "Cannot open message"
+msgstr "Nie je mo�n� otvori� spr�vu"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+msgid "Syncing folder"
+msgstr "Synchronizujem prie�inok"
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+msgid "Complete"
+msgstr "Hotovo"
+
+#: camel/camel-filter-driver.c:748
+#, c-format
+msgid "Getting message %d of %d"
+msgstr "Z�skavam spr�vu %d z %d"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, c-format
+msgid "Failed at message %d of %d"
+msgstr "Zlyhanie na spr�ve %d z %d"
+
+#: camel/camel-filter-driver.c:866
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba pri spracov�van� filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:871
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykon�van� filtra: %s: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:431 camel/camel-filter-search.c:437
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykon�van� h�adania filtra: %s: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3099,7 +3256,7 @@ msgstr ""
 "Nie je mo�n� spracova� h�adac� v�raz: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3108,144 +3265,162 @@ msgstr ""
 "Chyba pri vykon�van� h�adacieho v�razu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
 msgid "(match-all) requires a single bool result"
 msgstr "(odpoved� v�etk�mu) vy�aduje jeden pravdivostn� v�sledok"
 
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonanie ot�zky na nezn�mej hlavi�ke: %s"
 
-#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neplatn� typ v body-contains, o�ak�vam re�azec"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nie je mo�n� vytvori� s�bor so z�mkom pre %s: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Vypr�al �as pri pokuse o z�skanie z�mku na %s. Sk�ste to nesk�r."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nepodarilo sa z�ska� z�mok pomocou fcntl(2): %s"
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepodarilo sa z�ska� z�mok pomocou flock(2): %s"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nie je mo�n� skontrolova� s�bor s po�tou %s: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nie je mo�n� otvori� s�bor s po�tou %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nie je mo�n� otvori� do�asn� s�bor s po�tou %s: %s"
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Nepodarilo sa otestova� s�bor so z�mkom pre %s: %s"
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Chyba pri ��tan� s�boru s po�tou: %s"
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Chyba pri z�pise po�ty do do�asn�ho s�boru: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nepodarilo sa ulo�i� po�tu v do�asnom s�bore %s: %s"
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nie je mo�n� vytvori� r�ru: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nie je mo�n� vykona� fork: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail zlyhal: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Nezn�ma chyba)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Chyba kop�rovan� do�asn�ho s�boru: po�ty %s"
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr "Nie je mo�n� na��ta� %s: Na��tavanie modulov nie je na tomto syst�me podporovan�."
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie je mo�n� na��ta� %s: %s"
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie je mo�n� na��ta� %s: V module nie je inicializa�n� k�d."
 
-#: camel/camel-remote-store.c:181
+#: camel/camel-remote-store.c:189
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:193
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s slu�ba pre %s na %s"
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:243
 msgid "Connection cancelled"
 msgstr "Spojenie zru�en�"
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:244
+#: camel/camel-remote-store.c:246
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie je mo�n� spojenie s %s (port %d): %s"
 
-#: camel/camel-remote-store.c:236
+#: camel/camel-remote-store.c:247
 msgid "(unknown host)"
 msgstr "(nezn�my hostite�)"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:448
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
+#: camel/camel-remote-store.c:461
+#: camel/providers/imap/camel-imap-command.c:264
 msgid "Operation cancelled"
 msgstr "Oper�cia zru�en�"
 
-#: camel/camel-remote-store.c:453
+#: camel/camel-remote-store.c:467
 msgid "Server unexpectedly disconnected"
 msgstr "Server neo�ak�vane zru�il spojenie"
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr "Anonymn�"
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr "T�to vo�ba pripoj� na server pomocou anonymn�ho prihl�senia."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Overenie zlyhalo."
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -3254,7 +3429,7 @@ msgstr ""
 "Neplatn� inform�cia krokovania e-mailovej adresy:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3263,7 +3438,7 @@ msgstr ""
 "Neplatn� inform�cia neprieh�adn�ho krokovania:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -3272,11 +3447,11 @@ msgstr ""
 "Neplatn� inform�cia krokovania:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -3284,54 +3459,51 @@ msgstr ""
 "T�to vo�ba v�s pripoj� k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
 "server."
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:39
-#, fuzzy
+#: camel/camel-sasl-digest-md5.c:45
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"T�to vo�ba v�s pripoj� k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
-"server."
+"T�to vo�ba v�s pripoj� k serveru pomocou bezpe�n�ho hesla DIGEST-MD5, ak ho "
+"podporuje server."
 
-#: camel/camel-sasl-digest-md5.c:761
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
-msgstr ""
+msgstr "Spr�va challenge pre server pr�li� dlh� (>2048 bajtov)\n"
 
-#: camel/camel-sasl-digest-md5.c:770
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
-msgstr ""
+msgstr "Spr�va challenge pre server neplatn�\n"
 
-#: camel/camel-sasl-digest-md5.c:776
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr ""
+msgstr "Spr�va challenge pre server obsahovala neplatn� prvok \"Kvalita ochrany\"\n"
 
-#: camel/camel-sasl-digest-md5.c:798
-#, fuzzy
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
-msgstr "Odpove� IMAP serveru neobsahovala inform�ciu %s"
+msgstr "Odpove� serveru neobsahovala inform�ciu o overen�\n"
 
-#: camel/camel-sasl-digest-md5.c:816
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
-msgstr ""
+msgstr "Odpove� serveru obsahovala ne�pln� �daje o overen�\n"
 
-#: camel/camel-sasl-digest-md5.c:826
-#, fuzzy
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
-msgstr "Odpove� serveru skon�ila pr�li� skoro."
+msgstr "Odpove� serveru neodpoved�\n"
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "T�to vo�ba v�s pripoj� na server pomocou overenia Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -3340,68 +3512,69 @@ msgstr ""
 "Nie je mo�n� z�ska� Kerberos ticket:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:381
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 msgid "Bad authentication response from server."
 msgstr "Neplatn� odpove� na overenie od serveru."
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr ""
-
-#: camel/camel-sasl-plain.c:31
-#, fuzzy
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
-msgstr ""
-"T�to vo�ba v�s pripoj� k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
-"server."
+#: camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
+msgstr "T�to vo�ba pripoj� na server pomocou hesiel pren�an�ch ako �ist� text."
 
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Preklad regul�rneho v�razu zlyhal: %s: %s"
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vy�aduje komponentu pou��vate�sk�ho mena"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vy�aduje komponentu hostite�a"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vy�aduje komponentu cesty"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
+#, c-format
+msgid "Resolving: %s"
+msgstr "Zis�ujem adresu: %s"
+
+#: camel/camel-service.c:581
+#, c-format
+msgid "Failure in name lookup: %s"
+msgstr "Zlyhalo h�adanie mena: %s"
+
+#: camel/camel-service.c:606
 #, c-format
-msgid "No such host %s."
-msgstr "Hostite� %s nen�jden�."
+msgid "Host lookup failed: %s: host not found"
+msgstr "Zlyhalo h�adanie hostite�a: %s: hostite� nen�jden�"
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:608
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Do�asne nie je mo�n� n�js� meno hostite�a %s."
+msgid "Host lookup failed: %s: unknown reason"
+msgstr "Zlyhalo h�adanie hostite�a: %s: nezn�my d�vod"
 
-#: camel/camel-session.c:54
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr "Poskytovate� po�ty pre virtu�lny prie�inok"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pre ��tanie po�ty ako ot�zky na in� mno�inu prie�inkov"
 
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pre protokol `%s' nie je k dispoz�cii poskytovate�"
 
-#: camel/camel-session.c:417
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3411,121 +3584,139 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
-#: mail/mail-ops.c:967 mail/mail-ops.c:968
-#, fuzzy
+#: camel/camel-store.c:380 mail/mail-ops.c:995 mail/mail-ops.c:1002
+#: mail/mail-ops.c:1020 mail/mail-ops.c:1021
 msgid "Trash"
-msgstr "�loha"
+msgstr "Odpadky"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:288
 #, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "Re�azec URL `%s' neobsahuje protokol"
+msgid "Could not parse URL `%s'"
+msgstr "Nie je mo�n� spracova� URL `%s'"
 
-#: camel/camel-url.c:92
+#: camel/camel-vee-folder.c:451
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "Re�azec URL `%s' obsahuje neplatn� protokol"
+msgid "No such message %s in %s"
+msgstr "Tak� spr�va neexistuje %s v %s"
 
-#: camel/camel-url.c:152
+#: camel/camel-vee-folder.c:545
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "��slo portu v URL `%s' nie je ��slo"
-
-#: camel/camel-vee-folder.c:960
-#, fuzzy, c-format
 msgid "No such message: %s"
-msgstr "Tak� spr�va neexistuje"
+msgstr "�iadna tak� spr�va: %s"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Neo�ak�van� odpove� od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP pr�kaz zlyhal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Nezn�ma chyba"
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr "Odpove� serveru skon�ila pr�li� skoro."
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpove� IMAP serveru neobsahovala inform�ciu %s"
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:490
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neo�ak�van� odpove� OK od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie je mo�n� na��ta� s�hrn pre %s"
 
-#: camel/providers/imap/camel-imap-folder.c:329
+#: camel/providers/imap/camel-imap-folder.c:351
 msgid "Scanning IMAP folder"
 msgstr "Prech�dzam prie�inok IMAP"
 
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+msgid "This message is not currently available"
+msgstr "T�to spr�va moment�lne nie je k dipoz�cii"
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je mo�n� n�js� telo spr�vy v odpovedi FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+msgid "Checking for new mail"
+msgstr "Kontrolujem nov� po�tu"
 
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Pre ��tanie a ukladanie po�ty na IMAP serveroch."
+#: camel/providers/imap/camel-imap-provider.c:45
+msgid "Check for new messages in all folders"
+msgstr "Kontrolujem nov� po�tu vo v�etk�ch prie�inkoch"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr "Prie�inky"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:50
 #, fuzzy
-msgid "Secure IMAPv4"
+msgid "Show only subscribed folders"
+msgstr "Prida� prie�inok do zoznamu prihl�sen�ch prie�inkov"
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr "Predefinova� men� prie�inkov zo serveru"
+
+#: camel/providers/imap/camel-imap-provider.c:54
+msgid "Namespace"
+msgstr "Priestor mien"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr "Aplikova� filtre na nov� spr�vy v prie�inku novej po�ty na tomto serveri"
+
+#: camel/providers/imap/camel-imap-provider.c:63
+msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:61
-#, fuzzy
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#: camel/providers/imap/camel-imap-provider.c:65
+msgid "For reading and storing mail on IMAP servers."
 msgstr "Pre ��tanie a ukladanie po�ty na IMAP serveroch."
 
-#: camel/providers/imap/camel-imap-store.c:263
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"T�to vo�ba pripoj� na IMAP server pomocou hesiel pren�an�ch ako �ist� text."
+msgstr "T�to vo�ba pripoj� na IMAP server pomocou hesiel pren�an�ch ako �ist� text."
 
-#: camel/providers/imap/camel-imap-store.c:415
+#: camel/providers/imap/camel-imap-store.c:440
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Po�adovan� sp�sob overenia nie je podporovan�."
 
-#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie nie je vy�adovan�"
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:475
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPros�m, zadajte IMAP heslo pre %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:469
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
-msgstr ""
+msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/smtp/camel-smtp-transport.c:411
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3536,89 +3727,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:772
+#: camel/providers/imap/camel-imap-store.c:858
+#, fuzzy, c-format
+msgid "%s is not a selectable folder"
+msgstr "Zobrazi� vybran� prie�inok"
+
+#: camel/providers/imap/camel-imap-store.c:872
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie je mo�n� vytvori� prie�inok %s: %s"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1373
+msgid "You must be working online to complete this operation"
+msgstr "Pre dokon�enie tejto oper�cie mus�te pracova� on-line"
+
+#: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
 msgstr "Po�tov� prie�inky vo form�te MH"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Pre ukladanie lok�lnej po�ty v po�tov�ch prie�inkoch typu MH"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr "�tandardn� Unixov� s�bor mailbox"
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in standard mbox format"
 msgstr "Pre ukladanie lok�lnej po�ty v �tandardnom form�te mbox"
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:59
 msgid "Qmail maildir-format mail files"
 msgstr "Po�tov� s�bory vo form�te Qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Pre ukladanie lok�lnej po�ty v prie�inkov vo form�te qmail"
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Kore� ukladania %s nie je absol�tna cesta"
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:136
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Kore� ukladania %s nie je norm�lny prie�inok"
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nie je mo�n� z�ska� prie�inok: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr "Lok�lne ukladanie nem� prie�inok pre nov� po�tu"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lok�lny po�tov� s�bor %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie je mo�n� premenova� prie�inok %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nie je mo�n� odstr�ni� s�bor s�hrnu prie�inku `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie je mo�n� odstr�ni� indexov� s�bor prie�inku`%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie je mo�n� prida� spr�vu do prie�inku maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-mh-folder.c:194
+#: camel/providers/local/camel-mh-folder.c:202
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3627,19 +3827,19 @@ msgstr ""
 "Nie je mo�n� z�ska� spr�vu: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 msgid "No such message"
 msgstr "Tak� spr�va neexistuje"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "Invalid message contents"
 msgstr "Neplatn� obsah spr�vy"
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3648,15 +3848,15 @@ msgstr ""
 "Nie je mo�n� otvori� prie�inok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Prie�inok `%s' neexistuje."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3665,35 +3865,40 @@ msgstr ""
 "Nie je mo�n� vytvori� prie�inok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' nie je prie�inok maildir."
 
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie je mo�n� odstr�ni� prie�inok `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:152
 msgid "not a maildir directory"
 msgstr "nie je prie�inok maildir"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Nie je mo�n� z�ska� prie�inok: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie je mo�n� otvori� po�tov� schr�nku: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie je mo�n� prida� spr�vu do s�boru mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3702,15 +3907,15 @@ msgstr ""
 "Nie je mo�n� z�ska� spr�vu: %s z prie�inku %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Prie�inok vyzer� ako nenapravite�ne po�koden�."
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvorenie spr�vy zlyhalo: Po�koden� po�tov� schr�nka?"
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3719,7 +3924,7 @@ msgstr ""
 "Nie je mo�n� otvori� s�bor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3728,14 +3933,14 @@ msgstr ""
 "Nie je mo�n� vytvori� s�bor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nie je norm�lny s�bor."
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3744,111 +3949,111 @@ msgstr ""
 "Nie je mo�n� odstr�ni� prie�inok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Prie�inok `%s' nie je pr�zdny. Neodstr�nen�."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
+#: camel/providers/local/camel-mbox-summary.c:248
 msgid "Summarising folder"
 msgstr "Vytv�ram s�hrn prie�inku"
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Nie je mo�n� otvori� prie�inok: %s: vytv�ram s�hrn od poz�cie %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:295
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Kritick� chyba spracovania spr�vy na poz�cii %ld v prie�inku %s"
 
-#: camel/providers/local/camel-mbox-summary.c:362
+#: camel/providers/local/camel-mbox-summary.c:370
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nie je mo�n� vytvori� s�hrn: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1383
 msgid "Synchronising folder"
 msgstr "Synchronizujem prie�inok"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nie je mo�n� otvori� prie�inok pre vytvorenie s�hrnu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie je mo�n� otvori� do�asn� po�tov� schr�nku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
 #: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "S�hrn a prie�inok si neodpovedaj�, ani po synchroniz�cii"
 
-#: camel/providers/local/camel-mbox-summary.c:591
+#: camel/providers/local/camel-mbox-summary.c:599
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Chyba pri z�pise do do�asnej schr�nky: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:616
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Z�pis do do�asnej schr�nky zlyhal: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie je mo�n� zatvori� zdrojov� prie�inok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie je mo�n� zatvori� do�asn� prie�inok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie je mo�n� premenova� prie�inok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nezn�ma chyba: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie je mo�n� prida� spr�vu do prie�inok mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nie je prie�inok."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Pros�m, zadajte NNTP heslo pre %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "Server odmietol pou��vate�sk� meno"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr "Nepodarilo sa posla� pou��vate�sk� meno na server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "Server odmietol pou��vate�sk� meno/heslo"
 
@@ -3872,11 +4077,11 @@ msgstr "Nie je mo
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nie je mo�n� ulo�i� s�bor so zoznamom skup�n pre %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "Diskusn� skupiny USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Toto je pr�stup k ��taniu a posielaniu do Diskusn�ch skup�n USENET."
 
@@ -3904,34 +4109,49 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nie je mo�n� otvori� alebo vytvori� s�bor .newsrc pre %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
 msgid "Retrieving POP summary"
 msgstr "Z�skavam POP s�hrn"
 
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nie je mo�n� otvori� prie�inok: zoznam spr�v nebol �pln�."
 
-#: camel/providers/pop3/camel-pop3-folder.c:282
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr "�iadna spr�va s uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Z�skavam POP spr�vu %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nie je mo�n� z�ska� spr�vu zo POP serveru %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "Hlavi�ka spr�vy"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Nech�va� po�tu na serveri"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "Odstr�ni� �lohu"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
@@ -3940,22 +4160,7 @@ msgstr ""
 "po�ty od r�znych poskytovate�ov po�ty pomocou WWW a propriet�rnymi po�tov�mi "
 "syst�mami."
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-#, fuzzy
-msgid ""
-"For connecting to POP servers over an SSL connection. The POP protocol can "
-"also be used to retrieve mail from certain web mail providers and "
-"proprietary email systems."
-msgstr ""
-"Pre spojenie s POP serverami. Protokol POP je mo�n� pou�i� aj pre z�skavanie "
-"po�ty od r�znych poskytovate�ov po�ty pomocou WWW a propriet�rnymi po�tov�mi "
-"syst�mami."
-
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3963,7 +4168,7 @@ msgstr ""
 "T�to vo�ba v�s spoj� s POP serverom pomocou hesla prenesen�ho ako �ist� "
 "text. To je �asto jedin� mo�nos�, ktor� POP servery podporuj�."
 
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3973,27 +4178,26 @@ msgstr ""
 "APOP. Nemus� to fungova� pre v�etk�ch pou��vate�ov aj ke� server tvrd�, �e "
 "tento protokol podporuje."
 
-#: camel/providers/pop3/camel-pop3-store.c:169
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-provider.c:91
+msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr "T�to vo�ba v�s spoj� s POP serverom pomocou overenia Kerberos 4."
 
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nepodarilo sa overi� na KPOP serveri: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nie je mo�n� sa spoji� s POP serverom na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPros�m, zadajte POP3 heslo pre %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4002,12 +4206,12 @@ msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Chyba pri posielan� pou��vate�sk�ho mena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Nezn�my)"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4015,7 +4219,7 @@ msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Po�adovan� sp�sob overenia nie je podporovan�."
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4024,365 +4228,351 @@ msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Chyba pri posielan� hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Prie�inok `%s' neexistuje."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "Pre doru�enie po�ty programom \"sendmail\" na tomto po��ta�i."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nie je mo�n� vytvori� r�ru do sendmailu: %s: po�ta neodoslan�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nie je mo�n� spusti� sendmail: %s: po�ta neodoslan�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nie je mo�n� posla� spr�vu: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail skon�il so sign�lom %s: po�ta neodoslan�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nie je mo�n� vykona� %s: po�ta neodoslan�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail skon�il so stavom %d: po�ta neodoslan�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
 msgstr "Nie je mo�n� n�js� v spr�ve adresu 'Od'"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos po�ty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Pre doru�enie po�ty spojen�m sa so vzdialen�m serverom pomocou SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-#, fuzzy
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr "Pre doru�enie po�ty spojen�m sa so vzdialen�m serverom pomocou SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktick� chyba, pr�kaz nezn�my"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktick� chyba v parametroch alebo argumentoch"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "Pr�kaz neimplementovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "Parameter pr�kazu neimplementovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr "Stav syst�mu alebo odpove� na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "Spr�va pomocn�ka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "Slu�ba pripraven�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "Slu�ba zatv�ra prenosov� kan�l"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr "Slu�ba nie je k dispoz�cii, zatv�ram prenosov� kan�l"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr "Po�adovan� po�tov� akcia v poriadku, dokon�en�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr "Pou��vate� nie je lok�lny, bude predan� pod�a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"Po�adovan� po�tov� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
+msgstr "Po�adovan� po�tov� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Po�adovan� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "Po�adovan� akcia zru�en�: chyba pri spracovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr "Pou��vate� nie je lok�lny, sk�ste <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Po�adovan� akcia nevykonan�: nedostatok miesta v syst�me"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Po�adovan� po�tov� akcia preru�en�: presiahnut� alok�cia miesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Po�adovan� akcia nevykonan�: meno po�tovej schr�nky nepovolen�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Spusti� vstup po�ty, kon�� <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "Prenos zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:207
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Nezadan� heslo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:209
 #, fuzzy
 msgid "Authentication mechanism is too weak"
 msgstr "Overenie zlyhalo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Po�adovan� sp�sob overenia nie je podporovan�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Overenie zlyhalo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "Authentication required"
-msgstr "Overenie nie je vy�adovan�"
+msgstr "Autentifik�cia vy�adovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:286
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Chyba priv�tanie od serveru: %s : mo�no nie kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr ""
+"Nepodarilo sa pripoji� k POP serveru.\n"
+"Po�adovan� sp�sob overenia nie je podporovan�."
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPros�m, zadajte IMAP heslo pre %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:466
-msgid "No authentication required"
-msgstr "Overenie nie je vy�adovan�"
-
-#: camel/providers/smtp/camel-smtp-transport.c:468
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"T�to vo�ba v�s pripoj� k SMTP serveru bez overenia. To je asi v poriadku pre "
-"v��inu SMTP serverov."
-
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doru�enie po�ty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr "Nie je mo�n� posla� spr�vu: adresa odosielate�a nie je definovan�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie je mo�n� posla� spr�vu: adresa odosielate�a nie je platn�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:559
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie je mo�n� posla� spr�vu: adres�ti nie s� definovan�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Vypr�al �as odpovede HELO: %s: nie je kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Chyba odpovede HELO: %s: nie je kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:719
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr "Chyba pri vytv�ran� overovacieho objektu SASL."
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypr�al �as odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:777
+#: camel/providers/smtp/camel-smtp-transport.c:798
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatn� odpove� na overenie od serveru."
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Vypr�al �as odpovede MAIL FROM: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:821
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Chyba odpovede MAIL FROM: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:846
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Vypr�al �as odpovede RCPT TO: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:865
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Chyba odpovede RCPT TO: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:896
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypr�al �as posielania DATA: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:915
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Chyba odpovede DATA: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Vypr�al �as posielania DATA: koniec spr�vy: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:967
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Chyba odpovede DATA: koniec spr�vy: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypr�al �as odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1010
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Chyba odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1033
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Vypr�al �as odpovede QUIT: %s: nie je kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Chyba odpovede QUIT: %s: nie je kritick�"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:95
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "pr�loha"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: composer/e-msg-composer-attachment-bar.c:421
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Prilo�i� s�bor"
 
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr "Odstr�ni vybran� polo�ky zo zoznamu pr�loh"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Prida� pr�lohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr "Prilo�� s�bor k spr�ve"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1019
 msgid "Attachment"
 msgstr "Pr�loha"
 
@@ -4406,52 +4596,52 @@ msgstr "Typ MIME:"
 msgid "Send as:"
 msgstr "Posla� ako:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "Kliknut�m zobraz�te adres�r"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:709
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:711
 msgid "Reply-To:"
 msgstr "Odpoveda� komu:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:633
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:713
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adres�tov spr�vy"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:715
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Zadajte adresy, ktor� dostan� k�piu spr�vy"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4459,7 +4649,7 @@ msgstr ""
 "Zadajte adresy, ktor� dostan� k�piu spr�vy bez toho, aby boli v zozname "
 "adres�tov spr�vy."
 
-#: composer/e-msg-composer.c:518
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4468,26 +4658,32 @@ msgstr ""
 "Nie je mo�n� otvori� s�bor s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Ulo�i� ako..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladan� s�boru: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri na��tavan� s�boru: %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4497,27 +4693,27 @@ msgstr ""
 "\n"
 "Chcete ulo�i� zmeny?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "Otvori� s�bor"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "S�bor neexistuje."
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr "Toto nie je norm�lny s�bor."
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr "S�bor existuje, ale ned� sa pre��ta�."
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr "S�bor vyzer� ako dostupn�, ale open(2) zlyhala."
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4525,19 +4721,19 @@ msgstr ""
 "S�bor je ve�mi ve�k� (viac ako 100K)\n"
 "Naozaj ho chcete vlo�i�?"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr "Nastala chyba po�as ��tania s�boru."
 
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Nap�sa� spr�vu"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr "Nie je mo�n� vytvori� okno editora spr�v."
 
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4545,7 +4741,7 @@ msgstr ""
 "Nie je mo�n� vytvori� okno pre p�sanie spr�v, preto�e ste e�te\n"
 "nenastavili �iadne identity pre po�tov� komponent."
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:370
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie je mo�n� inicializova� editor spr�v Evolution."
 
@@ -4557,63 +4753,89 @@ msgstr "Shell Evolution."
 #: data/evolution.keys.in.h:1
 #, fuzzy
 msgid "address card"
-msgstr "Adresa _2:"
+msgstr "karta s adresou"
 
 #: data/evolution.keys.in.h:2
 #, fuzzy
 msgid "calendar information"
-msgstr "Inform�cie o pou��vate�ovi"
+msgstr "inform�cie o kalend�ri"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:267
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: e-util/e-time-utils.c:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:274
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:283
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
+#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strftime format of a time in 24-hour format.
+#: e-util/e-time-utils.c:315
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
+#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#. strftime format of a time in 12-hour format.
+#: e-util/e-time-utils.c:323
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Komponent Evolution pre S�hrn."
@@ -4694,7 +4916,7 @@ msgstr "Presun
 msgid "Configure %s"
 msgstr "Nastavenie %s"
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4703,7 +4925,7 @@ msgstr ""
 "Nie je mo�n� otvori� s�bor HTML:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
 #, c-format
 msgid ""
 "Error reading data:\n"
@@ -4712,7 +4934,7 @@ msgstr ""
 "Chyba pri ��tan� d�t:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
 msgid "File does not have a place for the services.\n"
 msgstr "S�bor nem� miesto pre slu�by.\n"
 
@@ -4724,7 +4946,7 @@ msgstr "Vzh
 msgid "Background:"
 msgstr "Pozadie:"
 
-#: executive-summary/component/main.c:60
+#: executive-summary/component/main.c:62
 msgid ""
 "Executive summary component could not initialize Bonobo.\n"
 "If there was a warning message about the RootPOA, it probably means\n"
@@ -4758,87 +4980,87 @@ msgstr "Testovacia slu
 msgid "Test service"
 msgstr "Testovacia slu�ba"
 
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+#: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Chyba"
 
-#: executive-summary/test-service/rdf-summary.c:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr "Aktualizova� automaticky"
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr "Aktualizova�"
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 msgid "Update every "
 msgstr "Aktualizova� ka�d�ch"
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "min�t"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "roku"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "rokov"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "mesiaca"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "mesiacov"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "t��d�a"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "t��d�ov"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "dn�"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "hodiny"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "hod�n"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "min�ty"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "sekundy"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr "sek�nd"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Aj. Zabudli ste vybra� d�tum."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr "Aj. Vybrali ste neplatn� d�tum."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4848,7 +5070,7 @@ msgstr ""
 "ke� bol spusten� filter alebo ke� bol\n"
 "otvoren� vprie�inok."
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:298
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4856,7 +5078,7 @@ msgstr ""
 "D�tum spr�vy bude porovnan�\n"
 "s �asom, ktor� tu uvediete."
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4867,49 +5089,45 @@ msgstr ""
 "filter spusten�. Napr. \"pred t��d�om\".."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr "aktu�lny tento"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr "zadan� �as"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr "�as relat�vny k aktu�lnemu �asu"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr "Porovna� s"
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "teraz"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<kliknut�m vyberiete d�tum>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Pravidl� filtra"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Potom"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Prida� akciu"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Odstr�ni� akciu"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -4917,19 +5135,20 @@ msgstr ""
 "Aj, zabudli ste vybra� prie�inok.\n"
 "Pros�m, vr�te sa a zadajte platn� prie�inok, kam doru�i� po�tu."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:678
 msgid "Select Folder"
 msgstr "Vybra� prie�inok"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr "Zadajte URI prie�inku"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr "<kliknut�m vyberiete prie�inok>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4938,56 +5157,38 @@ msgstr ""
 "Chyba v regul�rnom v�raze '%s':\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:624
 msgid "Rule name: "
 msgstr "Meno pravidla: "
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:628
 msgid "Untitled"
 msgstr "Bez mena"
 
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:644
 msgid "If"
 msgstr "Ak"
 
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:662
 msgid "Execute actions"
 msgstr "Spusti� akcie"
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:666
 msgid "if all criteria are met"
 msgstr "ak odpovedaj� v�etky krit�ri�"
 
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:671
 msgid "if any criteria are met"
 msgstr "ak odpoved� niektor� krit�rium"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:682
 msgid "Add criterion"
 msgstr "Prida� krit�rium"
 
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr "Odstr�ni� krit�rium"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Odpovedan�"
-
-#. { N_("Deleted"), "Deleted" },
-#. { N_("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "D�le�it�"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Pre��tan�"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Upravi� filtre"
@@ -5004,7 +5205,7 @@ msgstr "Prijat
 msgid "Outgoing"
 msgstr "Odoslan�"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtu�lne prie�inky"
 
@@ -5019,290 +5220,306 @@ msgstr "Zdroje vprie
 
 #: filter/filter.glade.h:13
 msgid "with all active remote folders"
-msgstr ""
+msgstr "pre v�etky akt�vne vzdialen� prie�inky"
 
 #: filter/filter.glade.h:14
 msgid "with all local and active remote folders"
-msgstr ""
+msgstr "pre v�etky lok�lne a akt�vne vzdialen� prie�inky"
 
 #: filter/filter.glade.h:15
 msgid "with all local folders"
-msgstr ""
+msgstr "pre v�etky lok�lne prie�inky"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Priradi� farbu"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Priradi� sk�re"
 
-#: filter/libfilter-i18n.h:5
-#, fuzzy
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
-msgstr "Pr�loha"
+msgstr "Pr�lohy"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "obsahuje"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Kop�rova� do prie�inku"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "D�tum prijatia"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "D�tum odoslania"
 
+#: filter/libfilter-i18n.h:9
+msgid "Deleted"
+msgstr "Odstr�nen�"
+
+#: filter/libfilter-i18n.h:10
+msgid "Do Not Exist"
+msgstr "Neexistuje"
+
+#: filter/libfilter-i18n.h:11
+msgid "Draft"
+msgstr "N�vrh"
+
 #: filter/libfilter-i18n.h:12
-msgid "does not contain"
-msgstr "neobsahuje"
+msgid "Exist"
+msgstr "Existuje"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not end with"
-msgstr "nekon�� na"
+msgid "Expression"
+msgstr "V�raz"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not exist"
-msgstr "neexistuje"
+msgid "Forward to Address"
+msgstr "Preda� �alej na adresu"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not sound like"
-msgstr "nevyzer� ako"
+msgid "Important"
+msgstr "D�le�it�"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not start with"
-msgstr "neza��na na"
-
+msgid "Mailing list"
+msgstr "Konferencia"
+
 #: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "Do Not Exist"
-msgstr "neexistuje"
+msgid "Message Body"
+msgstr "Telo spr�vy"
 
 #: filter/libfilter-i18n.h:18
-msgid "ends with"
-msgstr "kon�� na"
+msgid "Message Header"
+msgstr "Hlavi�ka spr�vy"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Exist"
-msgstr "Koniec"
+msgid "Message was received"
+msgstr "Spr�va bola prijat�"
 
 #: filter/libfilter-i18n.h:20
-msgid "exists"
-msgstr "existuje"
+msgid "Message was sent"
+msgstr "Spr�va bola odoslan�"
 
 #: filter/libfilter-i18n.h:21
-msgid "Expression"
-msgstr "V�raz"
+msgid "Move to Folder"
+msgstr "Presun�� do prie�inku"
 
 #: filter/libfilter-i18n.h:22
-msgid "Forward to Address"
-msgstr "Preda� �alej na adresu"
+msgid "Read"
+msgstr "Pre��tan�"
 
 #: filter/libfilter-i18n.h:23
-msgid "is"
-msgstr "je"
+msgid "Recipients"
+msgstr "Adres�ti"
 
 #: filter/libfilter-i18n.h:24
-msgid "is greater than"
-msgstr "je viac ne�"
+msgid "Regex Match"
+msgstr "Regul. v�raz"
 
 #: filter/libfilter-i18n.h:25
-msgid "is less than"
-msgstr "je menej ne�"
+msgid "Replied to"
+msgstr "Odpovedan�"
 
-#: filter/libfilter-i18n.h:26
-msgid "is not"
-msgstr "nie je"
+#: filter/libfilter-i18n.h:26 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1019
+msgid "Score"
+msgstr "Sk�re"
 
 #: filter/libfilter-i18n.h:27
-msgid "Mailing list"
-msgstr "Konferencia"
+msgid "Sender"
+msgstr "Odosielate�"
 
 #: filter/libfilter-i18n.h:28
-msgid "Message Body"
-msgstr "Telo spr�vy"
+msgid "Set Status"
+msgstr "Nastavi� stav"
 
 #: filter/libfilter-i18n.h:29
-msgid "Message Header"
-msgstr "Hlavi�ka spr�vy"
-
-#: filter/libfilter-i18n.h:30
-msgid "Message was received"
-msgstr "Spr�va bola prijat�"
+msgid "Specific header"
+msgstr "�peci�lna hlavi�ka"
 
 #: filter/libfilter-i18n.h:31
-msgid "Message was sent"
-msgstr "Spr�va bola odoslan�"
-
-#: filter/libfilter-i18n.h:32
-msgid "Move to Folder"
-msgstr "Presun�� do prie�inku"
-
-#: filter/libfilter-i18n.h:33
-msgid "on or after"
-msgstr "d�a a po"
+msgid "Stop Processing"
+msgstr "Zastavi� spracovanie"
 
-#: filter/libfilter-i18n.h:34
-msgid "on or before"
-msgstr "d�a a pred"
+#: filter/libfilter-i18n.h:32 mail/message-list.c:1020
+msgid "Subject"
+msgstr "Predmet"
 
 #: filter/libfilter-i18n.h:35
-msgid "Recipients"
-msgstr "Adres�ti"
+msgid "contains"
+msgstr "obsahuje"
 
 #: filter/libfilter-i18n.h:36
-msgid "Regex Match"
-msgstr "Regul. v�raz"
+msgid "does not contain"
+msgstr "neobsahuje"
 
-#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
-msgid "Score"
-msgstr "Sk�re"
+#: filter/libfilter-i18n.h:37
+msgid "does not end with"
+msgstr "nekon�� na"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not exist"
+msgstr "neexistuje"
 
 #: filter/libfilter-i18n.h:39
-msgid "Set Status"
-msgstr "Nastavi� stav"
+msgid "does not sound like"
+msgstr "nevyzer� ako"
 
 #: filter/libfilter-i18n.h:40
-msgid "sounds like"
-msgstr "vyzer� ako"
+msgid "does not start with"
+msgstr "neza��na na"
 
-#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
-msgid "Source"
-msgstr "Zdroj"
+#: filter/libfilter-i18n.h:41
+msgid "ends with"
+msgstr "kon�� na"
 
 #: filter/libfilter-i18n.h:42
-msgid "Specific header"
-msgstr "�peci�lna hlavi�ka"
+msgid "exists"
+msgstr "existuje"
 
 #: filter/libfilter-i18n.h:43
-msgid "starts with"
-msgstr "za��na na"
+msgid "is greater than"
+msgstr "je viac ne�"
+
+#: filter/libfilter-i18n.h:44
+msgid "is less than"
+msgstr "je menej ne�"
 
 #: filter/libfilter-i18n.h:45
-msgid "Stop Processing"
-msgstr "Zastavi� spracovanie"
+msgid "is not"
+msgstr "nie je"
 
-#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
-msgid "Subject"
-msgstr "Predmet"
+#: filter/libfilter-i18n.h:46
+msgid "is"
+msgstr "je"
 
 #: filter/libfilter-i18n.h:47
+msgid "on or after"
+msgstr "d�a a po"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or before"
+msgstr "d�a a pred"
+
+#: filter/libfilter-i18n.h:49
+msgid "sounds like"
+msgstr "vyzer� ako"
+
+#: filter/libfilter-i18n.h:50
+msgid "starts with"
+msgstr "za��na na"
+
+#: filter/libfilter-i18n.h:51
 msgid "was after"
 msgstr "bolo po"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:52
 msgid "was before"
 msgstr "bolo pred"
 
-#: filter/score-editor.c:126
-#, fuzzy
+#: filter/score-editor.c:130
 msgid "Score Rules"
-msgstr "Upravi� pravidlo sk�re"
+msgstr "Pravidl� sk�re"
 
-#: mail/component-factory.c:306
+#: mail/component-factory.c:332
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je mo�n� inicializova� po�tov� komponent Evolution."
 
-#: mail/component-factory.c:379
+#: mail/component-factory.c:405
 msgid "Cannot register storage with shell"
 msgstr "Nie je mo�n� zaregistrova� sklad u shellu"
 
-#: mail/folder-browser-factory.c:237
-#, fuzzy, c-format
+#: mail/folder-browser-factory.c:209
+#, c-format
 msgid "Properties for \"%s\""
-msgstr "Vlastnosti"
+msgstr "Vlastnosti \"%s\""
 
-#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 msgid "Store search as vFolder"
 msgstr "Ulo�i� h�adanie ako vPrie�inok"
 
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr "Vprie�inok na predmet"
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr "Vprie�inok na odosielate�ovi"
 
-#: mail/folder-browser.c:515
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr "Vprie�inok na adres�toch"
 
-#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 msgid "VFolder on Mailing List"
 msgstr "VPrie�inok na konferenciu"
 
-#: mail/folder-browser.c:524
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr "Filter na predmet"
 
-#: mail/folder-browser.c:527
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr "Filter na odosielate�ovi"
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr "Filter na adres�toch"
 
-#: mail/folder-browser.c:533 mail/folder-browser.c:701
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:544
+#: mail/folder-browser.c:568
+#, fuzzy
+msgid "Resend"
+msgstr "sekundy"
+
+#: mail/folder-browser.c:570
 msgid "Save As..."
 msgstr "Ulo�i� ako..."
 
-#: mail/folder-browser.c:546 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Tla�i�"
-
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "Odpoveda� odosielate�ovi"
 
-#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:36
 msgid "Reply to All"
 msgstr "Odpoveda� v�etk�m"
 
-#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
 msgid "Forward"
 msgstr "Posla� �alej"
 
-#: mail/folder-browser.c:557
+#: mail/folder-browser.c:583
 msgid "Forward inline"
 msgstr "Preda� �alej v tele"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr "Ozna�i� ako pre��tan�"
 
-#: mail/folder-browser.c:562
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr "Ozna�i� ako nepre��tan�"
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:593
 msgid "Move to Folder..."
 msgstr "Presun�� do prie�inku..."
 
-#: mail/folder-browser.c:569
+#: mail/folder-browser.c:595
 msgid "Copy to Folder..."
 msgstr "Kop�rova� do prie�inku..."
 
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:599
 msgid "Undelete"
 msgstr "Obnovi� zmazan� z�znam"
 
@@ -5310,20 +5527,20 @@ msgstr "Obnovi
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:609
 msgid "Apply Filters"
 msgstr "Pou�i� filtre"
 
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr "Vytvori� pravidlo zo spr�vy"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:705
+#: mail/folder-browser.c:736
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPrie�inok na konferenciu (%s)"
@@ -5394,66 +5611,65 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (�tandard)"
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+msgid "Disable"
+msgstr "Zak�za�"
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr "Povoli�"
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 msgid "Are you sure you want to delete this account?"
 msgstr "Naozaj chcete odstr�ni� tento ��et?"
 
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 msgid "Are you sure you want to delete this news account?"
 msgstr "Naozaj chcete odstr�ni� tento ��et diskusn�ch skup�n?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr "Spr�vca ��tov Evolution"
 
-#: mail/mail-account-editor.c:307
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Jeden alebo viacero va�ich serverov nie je spr�vne nastaven�ch.\n"
-"Chcete ich aj tak ulo�i�?"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "Nevyplnili ste v�etky povinn� inform�cie."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:706
+#: mail/mail-account-editor.c:173
 msgid "Evolution Account Editor"
 msgstr "Editor ��tov Evolution"
 
-#: mail/mail-account-editor.c:727
-#, fuzzy
-msgid "Unspecified"
-msgstr "Nedefinovan�"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Po�ta pre %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Predmet je %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Po�ta od %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Prida� pravidlo filtra"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5465,7 +5681,7 @@ msgstr ""
 "posiela�, prij�ma� alebo p�sa� po�tu.\n"
 "Chcete ho nastavi� teraz?"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5473,7 +5689,7 @@ msgstr ""
 "Predt�m, ako za�nete p�sa� spr�vu,\n"
 "mus�te nastavi� identitu."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5481,11 +5697,11 @@ msgstr ""
 "Predt�m, ako za�nete p�sa� spr�vu,\n"
 "mus�te nastavi� sp�sob prenosu.."
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr "Nem�te nastaven� sp�sob prenosu po�ty"
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5493,32 +5709,32 @@ msgstr ""
 "T�to spr�va nem� predmet.\n"
 "Naozaj ju chcete posla�?"
 
-#: mail/mail-callbacks.c:294
-msgid "You must configure an account before you can send this email."
-msgstr "Mus�te nastavi� ��et pred poslan�m tejto spr�vy."
-
-#: mail/mail-callbacks.c:316
+#: mail/mail-callbacks.c:308
 msgid "You must specify recipients in order to send this message."
 msgstr "Mus�te zada� adres�tov pre poslanie tejto spr�vy."
 
-#: mail/mail-callbacks.c:579
+#: mail/mail-callbacks.c:351
+msgid "You must configure an account before you can send this email."
+msgstr "Mus�te nastavi� ��et pred poslan�m tejto spr�vy."
+
+#: mail/mail-callbacks.c:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "V %s, %s zap�san�:\n"
 
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:773
 msgid "Forwarded message:\n"
 msgstr "Predan� spr�va:\n"
 
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "Presun�� spr�vu do"
 
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr "Kop�rova� spr�vu do"
 
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5526,11 +5742,20 @@ msgstr ""
 "Upravova� m��ete iba spr�vy ulo�en�\n"
 "v prie�inku Koncepty."
 
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1056
+#, fuzzy
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Upravova� m��ete iba spr�vy ulo�en�\n"
+"v prie�inku Koncepty."
+
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "Prep�sa� s�bor?"
 
-#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5538,15 +5763,15 @@ msgstr ""
 "S�bor s t�mto menom u� existuje\n"
 "Prep�sa� ho?"
 
-#: mail/mail-callbacks.c:1088
+#: mail/mail-callbacks.c:1137
 msgid "Save Message As..."
 msgstr "Ulo�i� spr�vu ako..."
 
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1139
 msgid "Save Messages As..."
 msgstr "Ulo�i� spr�vy ako..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5555,46 +5780,54 @@ msgstr ""
 "Chyba pri na��tavan� inform�cie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1302
 msgid "Print Message"
 msgstr "Tla�i� spr�vu"
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr "Tla� spr�vy zlyhala"
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+msgid "Connecting to server..."
+msgstr "Prip�jam sa na server..."
+
 #: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr " Kontrolova� podporovan� typy"
+
+#: mail/mail-config.glade.h:2
+msgid " color"
+msgstr " farba"
+
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "��et"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Inform�cia o ��te"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Spr�va ��tu"
 
-#: mail/mail-config.glade.h:5
-msgid "Advanced"
-msgstr "Pokro�il�"
-
 #: mail/mail-config.glade.h:6
+msgid "Accounts"
+msgstr "��ty"
+
+#: mail/mail-config.glade.h:8
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:7
-msgid "Authentication Type:"
+#: mail/mail-config.glade.h:9
+msgid "Authentication Type: "
 msgstr "Typ overenia:"
 
-#: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
 msgstr "Automaticky kontrolova� po�tu ka�d�ch"
 
-#: mail/mail-config.glade.h:11
-msgid "Check settings"
-msgstr "Overi� nastavenie"
-
 #: mail/mail-config.glade.h:12
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -5611,205 +5844,166 @@ msgstr ""
 "\n"
 "Kliknut�m na \"Dokon�i�\" ulo��te va�e nastavenie."
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
+#: mail/mail-config.glade.h:18
 msgid "De_fault"
-msgstr "�tandardn�"
+msgstr "�_tandardn�"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr "E-mailov� adresa:"
+#: mail/mail-config.glade.h:21
+msgid "Drafts"
+msgstr "Koncepty"
+
+#: mail/mail-config.glade.h:22
+msgid "Drafts folder:"
+msgstr "Prie�inok konceptov:"
 
 #: mail/mail-config.glade.h:24
-#, fuzzy
-msgid "Email address:"
+msgid "Email Address:"
 msgstr "E-mailov� adresa:"
 
-#: mail/mail-config.glade.h:25
-msgid "Evolution Mail Configuration"
-msgstr "Nastavenie po�ty Evolution"
-
 #: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Cel� meno:"
 
+#: mail/mail-config.glade.h:27
+msgid "Highlight citations with "
+msgstr "Zv�razni� cit�cie pomocou"
+
 #: mail/mail-config.glade.h:29
-msgid "Hostname:"
-msgstr "Hostite�:"
+msgid "IMAPv4 "
+msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:30
-#, fuzzy
-msgid "IMAP"
-msgstr "IMAPv4"
-
-#: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Nech�va� po�tu na serveri"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Po�ta"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "Po�tov� ��et"
+#: mail/mail-config.glade.h:31
+msgid "Kerberos "
+msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "Nastavenie po�ty"
 
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Sprievodca pre nastavenie po�ty"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr "Pou�i� ho ako �tandardn� ��et"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:34
 msgid "Mark messages as \"Read\" after:"
 msgstr "Ozna�i� spr�vy ako \"Pre��tan�\" po:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:36
 msgid "News"
 msgstr "Diskusn� skupiny"
 
-#: mail/mail-config.glade.h:44
-msgid "Optional"
-msgstr "Volite�n�"
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Optional Information"
+msgstr "�iadna inform�cia"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Organiz�cia:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:41
 msgid "PGP binary path:"
 msgstr "Cesta k spustite�n�mu s�boru PGP:"
 
-#: mail/mail-config.glade.h:48
-msgid "Password:"
-msgstr "Heslo:"
-
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
-msgstr "�ist� text"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Qmail maildir "
+msgstr "maildir"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:47
 msgid "Receiving Email"
 msgstr "Pr�jem po�ty"
 
-#: mail/mail-config.glade.h:52
-msgid "Remember my password"
-msgstr "Ulo�i� heslo"
+#: mail/mail-config.glade.h:48
+msgid "Receiving Mail"
+msgstr "Prij�mam po�tu"
+
+#: mail/mail-config.glade.h:49
+msgid "Receiving Options"
+msgstr "Mo�nosti pr�jmu"
+
+#: mail/mail-config.glade.h:51
+msgid "Required Information"
+msgstr "Povinn� inform�cie"
 
 #: mail/mail-config.glade.h:53
-#, fuzzy
-msgid "Reply address:"
-msgstr "Adresa WWW str�nky:"
+msgid "Select PGP binary"
+msgstr "Vyberte program PGP"
 
 #: mail/mail-config.glade.h:54
-msgid "Required"
-msgstr "Po�adovan�"
+msgid "Send mail in HTML format by default."
+msgstr "Posiela� �tandardne ako HTML."
 
-#: mail/mail-config.glade.h:56
-msgid "Save password"
-msgstr "Ulo�i� heslo"
+#: mail/mail-config.glade.h:55
+msgid "Sending Email"
+msgstr "Posielanie po�ty"
 
-#: mail/mail-config.glade.h:57
-msgid "Select PGP binary"
-msgstr "Vyberte program PGP"
+#: mail/mail-config.glade.h:56
+msgid "Sending Mail"
+msgstr "Posielanie po�ty"
 
 #: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "Vybra� s�bor s podpisom"
+msgid "Sent"
+msgstr "Odoslan�"
 
 #: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr "Posiela� �tandardne ako HTML."
+msgid "Sent and Draft Messages"
+msgstr "Odoslan� a koncepty"
 
 #: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Posielanie po�ty"
+msgid "Sent messages folder:"
+msgstr "Prie�inok pre odoslan� spr�vy:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Server Type: "
 msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Server requires authentication"
 msgstr "Server vy�aduje overenie"
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Server type:"
-msgstr "Typ serveru:"
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "S�bor s podpisom:"
 
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Podpis:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Zdroje"
 
-#: mail/mail-config.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr "Tento server vy�aduje bezpe�n� pripojenie (SSL)"
-
-#: mail/mail-config.glade.h:71
-msgid "Transport"
-msgstr "Prenos"
+#: mail/mail-config.glade.h:66
+msgid "Special Folders"
+msgstr "�peci�lne prie�inky"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:67
 #, fuzzy
-msgid "Transport Authentication"
-msgstr "Overenie"
+msgid "Standard Unix mbox"
+msgstr "�tandardn� Unixov� s�bor mailbox"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
 msgid "Type"
 msgstr "Typ"
 
-#: mail/mail-config.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Zadajte meno, ktor�m chcete tieto servery ozna�ova�. Napr�klad:\"Doma\" "
-"alebo \"Pr�ca\"."
-
-#: mail/mail-config.glade.h:75
-msgid "User Information"
-msgstr "Inform�cie o pou��vate�ovi"
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
+msgstr "Pou�i� bezpe�n� pripojenie (SSL)"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "Meno pou��vate�a:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:71
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5819,173 +6013,195 @@ msgstr ""
 "\n"
 "Kliknut�m \"�al��\" za�neme."
 
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
 #: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
 msgid "_Edit"
 msgstr "_Upravi�"
 
-#: mail/mail-config.glade.h:83
-msgid "minutes."
-msgstr "min�t."
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
 
-#: mail/mail-config-druid.c:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
 msgstr ""
-"Nepodarilo sa overi� nastavenie prij�mania po�ty.\n"
-"Mo�no sa stretnete s probl�mami pri pr�jme va�ej po�ty z %s"
 
-#: mail/mail-config-druid.c:515
-msgid "Namespace:"
-msgstr "Priestor mien:"
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
 
-#: mail/mail-config-druid.c:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
-"Nepodarilo sa overi� nastavenie odosielania po�ty.\n"
-"Mo�no sa stretnete s probl�mami pri odosielan� va�ej po�ty z %s"
 
 #. set window title
-#: mail/mail-config-druid.c:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr "Sprievodca ��tom Evolution"
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Ulo�i� pr�lohu"
 
-#: mail/mail-display.c:229
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je mo�n� vytvori� do�asn� prie�inok: %s"
 
-#: mail/mail-display.c:290
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Ulo�i� na disk..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori� v %s..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr "Zobrazi� v texte"
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Extern� zobrazova�"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Zobrazi� v text (pomocou %s)"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Skry�"
 
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1100
+msgid "Open link in browser"
+msgstr "Otvori� odkaz v prehliada�i"
+
+#: mail/mail-display.c:1102
+msgid "Save as (FIXME)"
+msgstr "Ulo�i� ako"
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "_Kontakt"
+
+#: mail/mail-format.c:512
 #, c-format
 msgid "%s attachment"
 msgstr "%s pr�loha"
 
-#: mail/mail-format.c:704
+#: mail/mail-format.c:554
+#, fuzzy
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nie je mo�n� otvori� prie�inok: zoznam spr�v nebol �pln�."
+
+#: mail/mail-format.c:736
 msgid "Loading message content"
 msgstr "Na��tavam obsah spr�vy"
 
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1033
 msgid "Encrypted message not displayed"
 msgstr "Za�ifrovan� spr�va nie je zobrazen�"
 
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1039
 msgid "Encrypted message"
 msgstr "Za�ifrovan� spr�va"
 
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1040
 msgid "Click icon to decrypt."
 msgstr "Kliknite na ikonu pre de�ifrovanie."
 
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1109 mail/mail-format.c:1496
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "T�to spr�va je digit�lne podp�san� a podpis je platn�."
 
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1117 mail/mail-format.c:1504
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "T�to spr�va je digit�lne podp�san� ale podpis nie je platn�."
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1717
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1729
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lok�lny s�bor (%s) platn� na serveri \"%s\""
 
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1733
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lok�lny s�bor (%s)"
 
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1767
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na nezn�me extern� d�ta (typ \"%s\")"
 
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1772
 msgid "Malformed external-body part."
 msgstr "Nespr�vna �as� extern�ho tela."
 
-#: mail/mail-local.c:335
-#, fuzzy, c-format
+#: mail/mail-local.c:337
+#, c-format
 msgid "No such folder %s"
-msgstr "Prie�inok `%s' neexistuje."
+msgstr "Prie�inok %s neexistuje"
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, c-format
 msgid "Opening '%s'"
 msgstr "Otv�ram '%s'"
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Men� prie�inok \"%s\" na form�t \"%s\""
 
-#: mail/mail-local.c:790
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Zmeni� prie�inok \"%s\" na form�t \"%s\""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:815
 msgid "Reconfiguring folder"
 msgstr "Prenastavujem prie�inok"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr "Zatv�ram aktu�lny prie�inok"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr "Premenov�vam star� prie�inok a otv�ram"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr "Vytv�ram nov� prie�inok"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr "Kop�rujem spr�vy"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5994,7 +6210,7 @@ msgstr ""
 "Nie je mo�n� ulo�i� metainform�cie do prie�inku, asi zist�te,\n"
 "�e ho nie je mo�n� ani otvori�: %s"
 
-#: mail/mail-local.c:967
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6002,7 +6218,7 @@ msgstr ""
 "Ak nem��ete otvori� t�to po�tov� schr�nku, potom\n"
 "ju budete musie� opravi� ru�ne."
 
-#: mail/mail-mt.c:177
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6011,7 +6227,7 @@ msgstr ""
 "Chyba po�as '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:192
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6020,96 +6236,105 @@ msgstr ""
 "Chyba pri vykon�van� oper�cie:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 msgid "Working"
 msgstr "Pracujem"
 
-#: mail/mail-mt.c:666 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
-msgstr ""
+msgstr "S�hlas�te?"
 
-#: mail/mail-mt.c:860
+#: mail/mail-mt.c:873
 msgid "Evolution progress"
 msgstr "Priebeh Evolution"
 
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posielam \"%s\""
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:590
 msgid "Sending message"
 msgstr "Posielam spr�vu"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:705
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "Posielam spr�vu"
+
+#: mail/mail-ops.c:724
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "Uklad�m spr�vu %d z %d (uid \"%s\")"
+
+#: mail/mail-ops.c:726 mail/mail-send-recv.c:475
+msgid "Complete."
+msgstr "Dokon�en�."
+
+#: mail/mail-ops.c:812
 msgid "Saving message to folder"
 msgstr "Uklad�m spr�vu do prie�inku"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:885
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pres�vam spr�vy do %s"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:885
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kop�rujem spr�vy do %s"
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Premiest�ujem"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kop�rujem"
 
-#: mail/mail-ops.c:856
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s spr�va %d z %d (uid \"%s\")"
-
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:979
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prech�dzam prie�inky v \"%s\""
 
-#: mail/mail-ops.c:1085
+#: mail/mail-ops.c:1140
 msgid "Forwarded messages"
 msgstr "Spr�vy predan� �alej"
 
-#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1181 mail/mail-ops.c:1319
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otv�ram prie�inok %s"
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1248
 #, c-format
 msgid "Opening store %s"
 msgstr "Otv�ram sklad %s"
 
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1435
 msgid "Expunging folder"
 msgstr "�ist�m prie�inok"
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1484
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Z�skavam spr�vu %s"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1551
 msgid "Retrieving messages"
 msgstr "Z�skavam spr�vy"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1561
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Z�skavam spr�vu ��slo %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1580
+#: mail/mail-ops.c:1635
 msgid "Saving messages"
 msgstr "Uklad�m spr�vy"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1714
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6118,12 +6343,12 @@ msgstr ""
 "Nepodarilo sa vytvori� v�stupn� s�bor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1727
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Uklad�m spr�vu %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1741
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6132,11 +6357,11 @@ msgstr ""
 "Chyba pri ukladan� spr�v do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1815
 msgid "Saving attachment"
 msgstr "Uklad�m pr�lohu"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1830
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6145,260 +6370,265 @@ msgstr ""
 "Nepodarilo sa vytvori� v�stupn� s�bor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1858
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je mo�n� zap�sa� d�ta: %s"
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_N�js�"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 msgid "Cancelling ..."
 msgstr "Ru��m..."
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 msgid "Send & Receive mail"
 msgstr "Pr�jem a odoslanie po�ty"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 msgid "Receiving"
 msgstr "Pr�j�mam"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr "Aktualizujem..."
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
 msgid "Waiting ..."
 msgstr "�ak�m..."
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:306
 msgid "Sending"
 msgstr "Posielam"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 msgid "Cancelled."
 msgstr "Zru�en�."
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Dokon�en�."
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr "Do r�ry zap�san� ne�pln� spr�va!"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nie je mo�n� vytvori� do�asn� po�tov� schr�nku `%s': %s"
 
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (predan� spr�va)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (�iadny predmet)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predan� spr�va - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Predan� spr�va (bez predmetu)"
 
-#: mail/mail-tools.c:411
+#: mail/mail-tools.c:414
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
 "%s<br><b>Subject:</b> %s<br>"
 msgstr ""
+"-----Spr�va poslan� �alej-----<br><b>Od:</b> %s<br><b>Komu:</b> "
+"%s<br><b>Predmet:</b> %s<br>"
 
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr "VPrie�inky"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 msgid "New VFolder"
 msgstr "Nov� vPrie�inok"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:35
 msgid "Reply"
 msgstr "Odpoveda�"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
 msgid "Reply to the sender of this message"
 msgstr "Odpoveda� odosielate�ovi tejto spr�vy"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
 msgid "Reply to all recipients of this message"
 msgstr "Odpoveda� v�etk�m adres�tom tento spr�vy"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
 msgid "Forward this message"
 msgstr "Preda� t�to spr�vu �alej"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Tla�i� vybran� spr�vu"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
 msgid "Delete this message"
 msgstr "Odstr�ni� t�to spr�vu"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:615
 msgid "Unseen"
 msgstr "Neviden�"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:616
 msgid "Seen"
 msgstr "Viden�"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:617
 msgid "Answered"
 msgstr "Odpovedan�"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:618
 msgid "Multiple Unseen Messages"
 msgstr "Viacero nepre��tan�ch spr�v"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:619
 msgid "Multiple Messages"
 msgstr "Viacero spr�v"
 
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
+#: mail/message-list.c:623
+msgid "Lowest"
+msgstr "Najni��ia"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr "%s, a spol."
+#: mail/message-list.c:624
+msgid "Lower"
+msgstr "Ni��ia"
+
+#: mail/message-list.c:628
+msgid "Higher"
+msgstr "Vy��ia"
 
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<nezn�my>"
+#: mail/message-list.c:629
+msgid "Highest"
+msgstr "Najvy��ia"
 
-#: mail/message-list.c:1035
+#: mail/message-list.c:879
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1042
+#: mail/message-list.c:886
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:1051
+#: mail/message-list.c:895
 msgid "Yesterday %l:%M %p"
 msgstr "V�era %l:%M %p"
 
-#: mail/message-list.c:1063
+#: mail/message-list.c:907
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1071
+#: mail/message-list.c:915
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:917
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1171
+#: mail/message-list.c:1019
 msgid "Flagged"
 msgstr "Vyzna�en�"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1020
 msgid "From"
 msgstr "Od"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1020
 msgid "Date"
 msgstr "D�tum"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1020
 msgid "Received"
 msgstr "Prijat�"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1021
 msgid "To"
 msgstr "Komu"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1021
 msgid "Size"
 msgstr "Ve�kos�"
 
-#: mail/openpgp-utils.c:89
+#: mail/openpgp-utils.c:92
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Pros�m, zadajte va�e %s heslo pre %s"
 
-#: mail/openpgp-utils.c:92
+#: mail/openpgp-utils.c:95
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Pros�m, zadajte va�e %s heslo"
 
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
+#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:763
+#: mail/openpgp-utils.c:917 mail/openpgp-utils.c:1076
 msgid "No GPG/PGP program available."
 msgstr "Program GPG/PGP nie je k dispoz�cii."
 
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
+#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:770
+#: mail/openpgp-utils.c:924
 msgid "No password provided."
 msgstr "Nezadan� heslo."
 
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
+#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:776
+#: mail/openpgp-utils.c:932 mail/openpgp-utils.c:1082
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie je mo�n� vytvori� r�ru do GPG/PGP: %s"
 
-#: mail/openpgp-utils.c:588
+#: mail/openpgp-utils.c:592
 msgid "No recipients specified"
 msgstr "Neuveden� �iadni adres�ti"
 
-#: mail/openpgp-utils.c:1088
+#: mail/openpgp-utils.c:1093
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Nie je mo�n� vytvori� do�asn� s�bor: %s"
 
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Prie�inok"
 
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr "Ulo�i�"
 
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Zobrazi� prie�inky za��naj�ce na:"
 
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Z�skavam miesto pre \"%s\""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prihlasujem si prie�inok \"%s\""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:273
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z prie�inku \"%s\""
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Spr�va prihl�sen�..."
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Meno prie�inku:"
@@ -6411,9 +6641,23 @@ msgstr "Typ prie
 msgid "Specify where to create the folder:"
 msgstr "Zadajte, kde vytvori� prie�inok"
 
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Vyberte s�bor, ktor� chcete importova� do Evolution a jeho typ\n"
+"zo zoznamu.\n"
+"\n"
+"Pou�ijte \"Automaticky\" ak typ nepozn�te a Evolution sa\n"
+"ho pok�si ur�i�."
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6424,7 +6668,7 @@ msgstr ""
 "Import�r nie je pripraven�.\n"
 "�ak�m 5 sek�nd a sk�sim to znovu."
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6433,7 +6677,7 @@ msgstr ""
 "Importujem %s\n"
 "Importujem polo�ku %d."
 
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -6443,11 +6687,11 @@ msgstr ""
 "%s\n"
 "nie je k dispoz�cii import�r."
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 msgid "Importing"
 msgstr "Importujem"
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -6456,12 +6700,17 @@ msgstr ""
 "Importujem %s\n"
 "Za��nam %s"
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Chyba pri na��tavan� %s"
+
+#: shell/importer/importer.c:387
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba pri na��tavan� %s"
 
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6470,40 +6719,26 @@ msgstr ""
 "Importujem %s\n"
 "Importujem polo�ku 1."
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 msgid "Filename:"
 msgstr "Meno s�boru:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 msgid "Select a file"
 msgstr "Vyberte s�bor"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 msgid "File type:"
 msgstr "Typ s�boru:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 msgstr "Import"
 
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Vyberte s�bor, ktor� chcete importova� do Evolution a jeho typ\n"
-"zo zoznamu.\n"
-"\n"
-"Pou�ijte \"Automaticky\" ak typ nepozn�te a Evolution sa\n"
-"ho pok�si ur�i�."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknite na \"Importova\" pre spustenie importu s�boru do Evolution."
@@ -6526,11 +6761,11 @@ msgstr ""
 "Tento sprievodca v�m pom��e importova�\n"
 "extern� s�bory do Evolution."
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "In�tal�cia Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6538,28 +6773,27 @@ msgstr ""
 "T�to nov� verzia Evolution vy�aduje in�tal�ciu dodato�n�ch s�borov\n"
 "do v�ho osobn�ho prie�inku Evolution"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Pros�m, stla�te \"OK\" pre in�tal�ciu s�borov, alebo \"Zru�i�\" pre koniec."
+msgstr "Pros�m, stla�te \"OK\" pre in�tal�ciu s�borov, alebo \"Zru�i�\" pre koniec."
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "Nepodarilo sa korektne aktualizova� s�bory"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr "S�bory Evolution boli �spe�ne nain�talovan�."
 
-#: shell/e-setup.c:189
+#: shell/e-setup.c:195
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Vyzer� to, �e ste Evolution spustili prv�kr�t."
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Pros�m, stla�te \"OK\" pre in�tal�ciu s�borov Evolution do"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6570,7 +6804,7 @@ msgstr ""
 "%s\n"
 "Chyba: %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6579,7 +6813,7 @@ msgstr ""
 "Nie je mo�n� skop�rova� s�bory do\n"
 "`%s'."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6590,7 +6824,7 @@ msgstr ""
 "Pros�m, presu�te ho, aby mohli\n"
 "by� nain�talovan� s�bory Evolution."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6601,7 +6835,7 @@ msgstr ""
 "to prie�inok Evolution. Pros�m, presu�te ho,\n"
 "aby mohli by� nain�talovan� s�bory Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6610,11 +6844,11 @@ msgstr ""
 "Zadan� prie�inok sa ned� vytvori�:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "Zadan� meno prie�inku nie je platn�."
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Vytvori� nov� prie�inok"
 
@@ -6626,27 +6860,27 @@ msgstr ""
 "Typ vybran�ho prie�inku nie je platn�\n"
 "pre po�adovan� oper�ciu."
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr "Nov�..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Bez mena)"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "N�stroj pre oznamovanie ch�b nebol n�jden� v $PATH."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "Ned� sa spusti� n�stroj pre oznamovanie ch�b"
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6656,34 +6890,30 @@ msgstr ""
 "pre elektronick� po�tu, kalend�r a spr�vu kontaktov\n"
 "v r�mci prostredia GNOME."
 
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Prejs� na prie�inku..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Nezobrazen� �iadny prie�inok)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Prie�inky"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvori� lok�lny sklad -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6692,15 +6922,15 @@ msgstr ""
 "Aj! Poh�ad pre `%s' neo�ak�vane spadol. :-(\n"
 "To asi znamen�, �e komponent %s spadol."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Vytvori� nov� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Meno skupiny:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6709,73 +6939,73 @@ msgstr ""
 "Naozaj chcete odstr�ni� skupinu\n"
 "`%s' z panelu skratiek?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "Neodstra�ova�"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "_Mal� ikony"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Zobrazi� skratky ako mal� ikony"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "_Ve�k� ikony"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Zobrazi� skratky ako ve�k� ikony"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Nov� skupina..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Vytvori� nov� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "Odst_r�ni� t�to skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Odstr�ni� t�to skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skry� panel skratiek"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 msgid "Hide the shortcut bar"
 msgstr "Skry� panel skratiek"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Pou�i�"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Pou�i� t�to skratku"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstr�ni� t�to skratku z panelu skratiek"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Chyba pri ukladan� skratiek."
 
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr "_Poh�ad"
 
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "Zobrazi� vybran� prie�inok"
 
@@ -6783,47 +7013,47 @@ msgstr "Zobrazi
 msgid "(No name)"
 msgstr "(Bez mena)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "�iadna chyba"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "V�eobecn� chyba"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "Prie�inok s t�mto menom u� existuje"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "Uveden� typ prie�inku nie je platn�"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "Nedostatok miesta pre vytvorenie prie�inku"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "Uveden� prie�inok nebol n�jden�"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "Funkcia nie je v tomto sklade implementovan�"
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "Pr�stup zamietnut�"
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Oper�cia nepodporovan�"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "Uveden� typ nie je podporovan� t�mto skladom"
 
@@ -6831,7 +7061,7 @@ msgstr "Uveden
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -6870,7 +7100,7 @@ msgstr ""
 "D�fame, �e v�s pote�ia v�sledky na�ej �a�kej pr�ce a netrpezlivo\n"
 "�ak�me na v� pr�spevok!\n"
 
-#: shell/main.c:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6878,15 +7108,19 @@ msgstr ""
 "V�aka\n"
 "T�m Evolution\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "Nie je mo�n� inicializova� shell Evolution."
 
-#: shell/main.c:175
-msgid "Disable."
-msgstr "Zak�za�."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr "Zak�za� �vodn� okno"
+
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr "Posla� ladiaci v�stup zo v�etk�ch komponent od s�boru."
 
-#: shell/main.c:195
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je mo�n� inicializova� komponentov� syst�m Bonobo."
 
@@ -6910,8 +7144,7 @@ msgstr "N
 msgid "New contact"
 msgstr "Nov� kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
 msgid "Previews the message to be printed"
 msgstr "Uk�ka spr�vy pred tla�ou"
 
@@ -6919,7 +7152,7 @@ msgstr "Uk
 msgid "Print contacts"
 msgstr "Tla�i� kontakty"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
 msgid "Stop"
 msgstr "Zastavi�"
 
@@ -6945,7 +7178,7 @@ msgstr "Zdroje adres
 msgid "_Contact"
 msgstr "_Kontakty..."
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 msgid "_Print..."
 msgstr "_Tla�i�..."
@@ -6954,9 +7187,9 @@ msgstr "_Tla
 msgid "_Search for contacts"
 msgstr "_H�ada� kontakty"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:78
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
 msgid "_Tools"
 msgstr "_N�stroje"
 
@@ -6969,121 +7202,160 @@ msgid "Alter preferences"
 msgstr "Zmeni� nastavenie"
 
 #: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a new all day Event"
+msgstr "Vytvori� nov� kalend�r"
+
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new appointment"
 msgstr "Vytvori� nov� sch�dzku"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "Vytvori� nov� kalend�r"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "De�"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go To"
 msgstr "Prejs� na"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr "Prejs� dozadu"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go forward in time"
 msgstr "Prejs� dopredu"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Go to _Date"
+msgstr "Prejs� na d�tum"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Go to _Today"
+msgstr "Prejs� na dne�n� d�tum"
+
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to a specific date"
 msgstr "Prejs� na zadan� d�tum"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to present time"
 msgstr "Prejs� na aktu�lny �as"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mesiac"
 
-#: ui/evolution-calendar.xml.h:13
-#, fuzzy
-msgid "New Appointment"
-msgstr "Nov� sch�dzka"
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
+msgstr "Nov� _udalos�"
 
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Nasl"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "Otvori� kalend�r"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
 msgid "Prev"
 msgstr "Pred"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Uk�ka spr�vy pred tla�ou"
+
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Print calendar"
 msgstr "Tla�i� kalend�r"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this Calendar"
 msgstr "Tla�i� tento kalend�r"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Ulo�i� ako"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Save calendar as something else"
 msgstr "Ulo�i� kalend�r ako nie�o in�"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show 1 day"
 msgstr "Zobrazi� jeden de�"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show 1 month"
 msgstr "Zobrazi� jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show 1 week"
 msgstr "Zobrazi� jeden t��de�"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Zobrazi� pracovn� t��de�"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr "Dnes"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "W_ork Week"
+msgstr "Pracovn� t��de�"
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "T��de�"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Appointment"
 msgstr "Sch�dzka"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+#, fuzzy
+msgid "_Day"
+msgstr "De�"
+
+#: ui/evolution-calendar.xml.h:39
+#, fuzzy
+msgid "_Month"
+msgstr "Mesiac"
+
+#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Nov�"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:41
 msgid "_Open Calendar"
 msgstr "_Otvori� kalend�r"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Ulo�i� _ako..."
 
+#: ui/evolution-calendar.xml.h:45
+#, fuzzy
+msgid "_Week"
+msgstr "T��de�"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Odstr�ni t�to polo�ku"
@@ -7106,7 +7378,7 @@ msgid "Print this item"
 msgstr "Tla�i� t�to polo�ku"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:33 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Tla�i�..."
 
@@ -7139,7 +7411,7 @@ msgstr "Posla
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
 #: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
 msgid "_File"
 msgstr "_S�bor"
 
@@ -7193,7 +7465,7 @@ msgstr "Zavrie
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "_Kop�rova� do prie�inku..."
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kop�rova�"
@@ -7283,7 +7555,7 @@ msgid "Print Setup"
 msgstr "Nastavenie tla�iarne"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Ulo�i�"
 
@@ -7326,12 +7598,12 @@ msgid "_About..."
 msgstr "_O programe..."
 
 #: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
 msgid "_Close"
 msgstr "_Zavrie�"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
@@ -7345,7 +7617,7 @@ msgid "_Debug"
 msgstr "_Ladi�"
 
 #: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Pomocn�k"
 
@@ -7382,7 +7654,7 @@ msgstr "_Vlo
 msgid "_Print"
 msgstr "_Tla�i�"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
@@ -7392,7 +7664,7 @@ msgid "_Select All"
 msgstr "Vybra� _v�etko"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_Task (FIXME)"
 msgstr "�_loha"
 
@@ -7420,61 +7692,66 @@ msgstr "Nastavenie S
 msgid "New Mail"
 msgstr "Nov� spr�va"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:1
 msgid "Compose"
 msgstr "Nap�sa�"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail.xml.h:2
 msgid "Compose a new message"
 msgstr "Nap�sa� nov� spr�vu"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:4
 msgid "Copy message to a new folder"
 msgstr "Kop�rova� spr�vu do nov�ho prie�inka"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:5
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Vytvori� pravidlo zo spr�vy"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:8
 msgid "Display all of the message headers"
-msgstr ""
+msgstr "Zobraz� v�etky hlavi�ky spr�vy"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:9
 #, fuzzy
-msgid "Empty Trash"
-msgstr "Upravi� �lohu"
+msgid "Empty _Trash"
+msgstr "Vypr�zdni� _Odpadky"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:10
 #, fuzzy
 msgid "Filter on Se_nder"
 msgstr "Filter na odosielate�ovi"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:11
 #, fuzzy
 msgid "Filter on _Recipients"
 msgstr "Filter na adres�toch"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:12
 #, fuzzy
 msgid "Filter on _Subject"
 msgstr "Filter na predmet"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:13
 msgid "Forget _Passwords"
 msgstr "Zabudn�� _hesl�"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:15
 #, fuzzy
 msgid "Forward As"
 msgstr "Posla� �alej"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:17
 #, fuzzy
-msgid "Full Headers"
+msgid "Full _Headers"
 msgstr "Hlavi�ka"
 
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Hide Deleted Messages"
+msgstr "Skry� _odstr�nen� spr�vy"
+
 #: ui/evolution-mail.xml.h:19
 msgid "Hide S_elected Messages"
 msgstr "Skry� _vybran� spr�vy"
@@ -7489,190 +7766,189 @@ msgstr "Skry
 
 #: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Inline"
-msgstr "Zobrazi� v texte"
-
-#: ui/evolution-mail.xml.h:23
-#, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "Spr�va prihl�sen�..."
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:23
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Ozna�i� ako pre��tan�"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:24
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Ozna�i� ako pre��tan�"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Ozna�i� ako nepre��tan�"
 
-#: ui/evolution-mail.xml.h:27
-#, fuzzy
-msgid "Message _Display"
-msgstr "Telo spr�vy"
-
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:26
 msgid "Move"
 msgstr "Presun��"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:27
 msgid "Move message to a new folder"
 msgstr "Presun�� spr�vu do nov�ho prie�inka"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:31
 msgid "Print message to the printer"
 msgstr "Tla�i� spr�vu na tla�iarni"
 
-#: ui/evolution-mail.xml.h:36
-#, fuzzy
-msgid "Quoted"
-msgstr "Pozn�mka"
-
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:34
 msgid "Redirect (FIXME: implement me)"
-msgstr ""
+msgstr "Presmerova�"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:37
 msgid "Reply to _All"
 msgstr "Odpoveda� _v�etk�m"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:40
 msgid "S_ource"
 msgstr "_Zdroj"
 
-#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Vybra� _v�etko"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:42
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Vybra� _v�etko"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:43
 #, fuzzy
-msgid "Send and Receive"
+msgid "Send / Receive"
 msgstr "Pr�jem a odoslanie po�ty"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:44
+#, fuzzy
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr "Posla� neodoslan� po�tu a prija� nov� po�tu"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Send queued mail and retrieve new mail"
 msgstr "Posla� neodoslan� po�tu a prija� nov� po�tu"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:47
 #, fuzzy
 msgid "Show _All"
 msgstr "Zobrazi� v�etko"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:49
 msgid "Threaded Message list"
 msgstr "Zoznam vl�kien"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:50
 msgid "VFolder on Se_nder"
 msgstr "Vprie�inok na _odosielate�a"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on _Recipients"
 msgstr "Vprie�inok na _adres�tov"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Vprie�inok na predmet"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:53
 msgid "View Raw Message Source"
 msgstr "Zobrazi� �ist� k�d spr�vy"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:54
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Editor _virtu�lneho prie�inku..."
 
+#: ui/evolution-mail.xml.h:55
+msgid "_Apply Filters"
+msgstr "_Pou�i� filtre"
+
 #: ui/evolution-mail.xml.h:56
 #, fuzzy
-msgid "_Actions"
-msgstr "A_kcie"
+msgid "_Attachment"
+msgstr "Pr�loha"
 
 #: ui/evolution-mail.xml.h:57
-msgid "_Apply Filters"
-msgstr "_Pou�i� filtre"
-
-#: ui/evolution-mail.xml.h:58
 #, fuzzy
 msgid "_Compose"
 msgstr "Nap�sa�"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:58
 msgid "_Copy to Folder..."
 msgstr "_Kop�rova� do prie�inku..."
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:59
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Vytvori� pravidlo zo spr�vy"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:61
 msgid "_Expunge"
 msgstr "_Vy�isti�"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:62
 #, fuzzy
 msgid "_Filters..."
-msgstr "_Filtre po�ty..."
+msgstr "_Filtre..."
 
-#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Prie�inok"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:64
 msgid "_Forward"
 msgstr "Posla� �_alej"
 
+#: ui/evolution-mail.xml.h:65
+msgid "_Inline"
+msgstr "_V texte"
+
 #: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obr�ti� v�ber"
 
 #: ui/evolution-mail.xml.h:67
-#, fuzzy
 msgid "_Mail Message"
 msgstr "_Posla� spr�vu"
 
 #: ui/evolution-mail.xml.h:68
-#, fuzzy
 msgid "_Mail Settings..."
-msgstr "Nastavenie..."
+msgstr "Nastavenie _po�ty..."
 
 #: ui/evolution-mail.xml.h:69
-#, fuzzy
-msgid "_Message Hiding"
-msgstr "_Spr�va"
-
-#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "Pre_sun�� do prie�inka..."
 
-#: ui/evolution-mail.xml.h:71
-#, fuzzy
+#: ui/evolution-mail.xml.h:70
 msgid "_Open Selected Items"
-msgstr "Skry� _vybran� spr�vy"
+msgstr "_Otvori� vybran� polo�ky"
+
+#: ui/evolution-mail.xml.h:72
+msgid "_Quoted"
+msgstr "_Citova�"
+
+#: ui/evolution-mail.xml.h:73
+msgid "_Reply"
+msgstr "_Odpoveda�"
 
 #: ui/evolution-mail.xml.h:74
-#, fuzzy
-msgid "_Send and Receive"
-msgstr "Pr�jem a odoslanie po�ty"
+msgid "_Resend Messages"
+msgstr "_Znovu posla� spr�vy"
+
+#: ui/evolution-mail.xml.h:76
+msgid "_Send / Receive"
+msgstr "_Posla� / Prija�"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:77
 msgid "_Threaded"
 msgstr "_Vl�kna"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:79
 msgid "_Undelete"
 msgstr "Obnovi� _zmazan�"
 
@@ -7782,40 +8058,36 @@ msgid "Sign this message with your PGP key"
 msgstr "Podp�sa� t�to spr�vu k���om PGP"
 
 #: ui/evolution-message-composer.xml.h:34
-#, fuzzy
 msgid "Toggles whether the BCC field is displayed"
-msgstr "Prepne, �i sa m� zobrazova� panel prie�inkov"
+msgstr "Prepne, �i m� by� zobrazen� pole BCC"
 
 #: ui/evolution-message-composer.xml.h:35
-#, fuzzy
 msgid "Toggles whether the CC field is displayed"
-msgstr "Prepne, �i sa m� zobrazova� panel prie�inkov"
+msgstr "Prepne, �i m� by� zobrazen� pole CC"
 
 #: ui/evolution-message-composer.xml.h:36
-#, fuzzy
 msgid "Toggles whether the From chooser is displayed"
-msgstr "Prepne, �i sa m� zobrazova� panel prie�inkov"
+msgstr "Prepne, �i m� by� zobrazen� pole pre v�ber odosielate�a"
 
 #: ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
+msgstr "Prepne, �i m� by� zobrazen� pole Reply-to"
 
 #: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
-msgstr ""
+msgstr "Pole _BCC"
 
 #: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
-msgstr ""
+msgstr "Pole _CC"
 
 #: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
-msgstr ""
+msgstr "Pole _Od"
 
 #: ui/evolution-message-composer.xml.h:47
-#, fuzzy
 msgid "_Insert"
-msgstr "_Index"
+msgstr "_Vlo�i�"
 
 #: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
@@ -7826,9 +8098,8 @@ msgid "_Open..."
 msgstr "_Otvori�..."
 
 #: ui/evolution-message-composer.xml.h:50
-#, fuzzy
 msgid "_Reply-To Field"
-msgstr "Odpoveda� komu:"
+msgstr "Pole _Reply-To"
 
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
@@ -7922,7 +8193,7 @@ msgstr "Vr
 msgid "Undo the last action"
 msgstr "Vr�ti sp� posledn� akciu"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 msgid "_Appointment (FIXME)"
 msgstr "S_ch�dzka"
 
@@ -7939,9 +8210,8 @@ msgid "Create a new task"
 msgstr "Vytvori� nov� �lohu"
 
 #: ui/evolution-tasks.xml.h:3
-#, fuzzy
 msgid "New Task"
-msgstr "�loha"
+msgstr "Nov� �loha"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
@@ -7952,9 +8222,8 @@ msgid "Tasks Preferences..."
 msgstr "Nastavenie �loh..."
 
 #: ui/evolution-tasks.xml.h:9
-#, fuzzy
 msgid "_Task"
-msgstr "�loha"
+msgstr "�_loha"
 
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
@@ -7965,9 +8234,8 @@ msgid "Close this window"
 msgstr "Zavrie toto okno"
 
 #: ui/evolution.xml.h:4
-#, fuzzy
 msgid "Customi_ze Toolbars..."
-msgstr "Prisp�sobi� panely n�strojov"
+msgstr "Prisp�sobi� pa_nely n�strojov..."
 
 #: ui/evolution.xml.h:5
 msgid "Customize"
@@ -8042,128 +8310,135 @@ msgid "Using the _Mailer"
 msgstr "Pomocou _Po�ty "
 
 #: ui/evolution.xml.h:23
-#, fuzzy
 msgid "Work Offline"
-msgstr "Pracujem"
+msgstr "Pracova� off-line"
 
 #: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "O _Evolution..."
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "_Folder Bar"
-msgstr "_Prie�inok"
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "A_kcie"
 
 #: ui/evolution.xml.h:32
+msgid "_Folder Bar"
+msgstr "Pru_h prie�inkov"
+
+#: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
 msgstr "_Prejs� do prie�inku..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 msgid "_Import file..."
 msgstr "_Importova� s�bor..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 msgid "_Mail message"
 msgstr "_Posla� spr�vu"
 
-#: ui/evolution.xml.h:38
-#, fuzzy
+#: ui/evolution.xml.h:39
 msgid "_New Folder"
-msgstr "Nov� vPrie�inok"
+msgstr "Nov� _prie�inok"
 
-#: ui/evolution.xml.h:39
-#, fuzzy
+#: ui/evolution.xml.h:40
 msgid "_Shortcut Bar"
-msgstr "_Skry� panel skratiek"
+msgstr "_Panel skratiek"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "Predbe�n�"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Zanepr�zdnen�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Mimo kancel�rie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "�iadna inform�cia"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr "_Pozva� ostatn�ch..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Nastavenie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Zobrazi� _iba pracovn� hodiny"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr "Uk�za� z_men�en�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr "_Obnovi� vo�no/zanepr�zdnen�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Autov�ber"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_V�etky osoby a zdroje"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "V�etky _osoby a jeden zdroj"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "_Vy�adovan� osoby"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "Vy�adovan� osoby a _jeden zdroj"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "_Za�iatok stretnutia:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr "V�etci ��astn�ci"
 
-#: widgets/menus/gal-view-menus.c:171
-#, fuzzy
+#: widgets/menus/gal-view-menus.c:178
 msgid "_Current View"
-msgstr "aktu�lny tento"
+msgstr "_Aktu�lny poh�ad"
+
+#: widgets/menus/gal-view-menus.c:198
+msgid "Define Views"
+msgstr "Definova� poh�ady"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
@@ -8176,93 +8451,92 @@ msgstr "PUS
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "Teraz"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
-msgstr ""
-
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
+msgstr "OK"
 
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
-msgstr ""
+#: widgets/misc/e-cell-date-edit.c:723
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "�as mus� by� vo form�te: %s"
 
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:160
-#, fuzzy
+#: widgets/misc/e-filter-bar.c:166
 msgid "Save Search"
-msgstr "H�ada�"
+msgstr "Ulo�i� h�adanie"
 
-#: widgets/misc/e-filter-bar.c:231
-#, fuzzy
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
-msgstr "Pokro�il�"
+msgstr "Pokro�il� h�adanie"
 
-#: widgets/misc/e-filter-bar.c:311
-#, fuzzy
+#: widgets/misc/e-filter-bar.c:317
 msgid "Advanced ..."
 msgstr "Pokro�il�..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Inform�cia"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varovanie"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Ot�zka"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "Spr�va"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "T�to spr�vu u� nezobrazova�."
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 msgid "Sear_ch"
 msgstr "_N�js�"
 
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr "Karta adres�ra"
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr "Pod�a firmy"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr "Zoznam telef�nov"
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr "Pod�a odosielate�"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "Pod�a stavu"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "Pod�a predmetu"
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr "Spr�vy"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr "S kateg�riou"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Osobn� adres�rov� server"
@@ -8271,264 +8545,15 @@ msgstr "Osobn
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Vytv�racie rozhranie kalend�ra pre Osobn� kalend�rov� server."
 
-#: wombat/wombat.c:153
+#: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): Nie je mo�n� inicializova� GNOME"
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): Nie je mo�n� inicializova� GNOME"
 
-#: wombat/wombat.c:178
+#: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nie je mo�n� inicializova� Bonobo"
 
-#~ msgid "Disabled"
-#~ msgstr "Zak�zan�"
-
-#~ msgid "Synchronize"
-#~ msgstr "Synchronizova�"
-
-#~ msgid "Copy From Pilot"
-#~ msgstr "Kop�rova� z Pilota"
-
-#~ msgid "Copy To Pilot"
-#~ msgstr "Kop�rova� do Pilota"
-
-#~ msgid "Merge From Pilot"
-#~ msgstr "Spoji� z Pilota"
-
-#~ msgid "Merge To Pilot"
-#~ msgstr "Spoji� do Pilota"
-
-#~ msgid "JP Rosevear <jpr@helixcode.com>"
-#~ msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#~ msgid "Original Author:"
-#~ msgstr "P�vodn� autor:"
-
-#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#~ msgid "Evolution Addressbook Conduit"
-#~ msgstr "Spojka pre adres�r Evolution"
-
-#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-#~ msgstr "(C) 1998-2000 the Free Software Foundation a Helix Code"
-
-#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
-#~ msgstr "Konfigura�n� n�stroj pre spojku adres�ra Evolution.\n"
-
-#~ msgid "gnome-unknown.xpm"
-#~ msgstr "gnome-unknown.xpm"
-
-#~ msgid "Synchronize Action"
-#~ msgstr "Akcia Synchronizova�"
-
-#~ msgid "Conduit state"
-#~ msgstr "Stav spojky"
-
-#~ msgid ""
-#~ "No pilot configured, please choose the\n"
-#~ "'Pilot Link Properties' capplet first."
-#~ msgstr ""
-#~ "Nie je nastaven� �iadny pilot, pros�m,\n"
-#~ "najprv pou�ite 'Vlastnosti spojenia Pilota'."
-
-#~ msgid "Not connected to the gnome-pilot daemon"
-#~ msgstr "Nespojen� s d�monom gnome-pilot"
-
-#~ msgid ""
-#~ "An error occured when trying to fetch\n"
-#~ "pilot list from the gnome-pilot daemon"
-#~ msgstr ""
-#~ "Nastala chyba pri pokuse o z�skanie\n"
-#~ "zoznamu pilotov od d�mona gnome-pilot"
-
-#~ msgid "label26"
-#~ msgstr "label26"
-
-#~ msgid "Evolution Calendar Conduit"
-#~ msgstr "Spojka kalend�ra Evolution"
-
-#~ msgid "Configuration utility for the evolution calendar conduit.\n"
-#~ msgstr "N�stroj pre nastavenie spojky pre kalend�r Evolution.\n"
-
-#~ msgid "Evolution ToDo Conduit"
-#~ msgstr "Spojka ToDo pre Evolution"
-
-#~ msgid "Configuration utility for the evolution todo conduit.\n"
-#~ msgstr "N�stroj pre nastavenie spojky pre todo Evolution.\n"
-
-#~ msgid "The priority must be between 1 and 9, inclusive"
-#~ msgstr "Priorita mus� by� medzi 1 a� 9"
-
-#~ msgid "Schedule meeting"
-#~ msgstr "Napl�nova� stretnutie"
-
-#~ msgid "Edit this appointment..."
-#~ msgstr "Upravi� t�to sch�dzku..."
-
-#~ msgid "label21"
-#~ msgstr "label21"
-
-#~ msgid "label55"
-#~ msgstr "label55"
-
-#~ msgid ""
-#~ "This option will connect to the SMTP server using CRAM-MD5 authentication."
-#~ msgstr "T�to vo�ba v�s pripoj� k SMTP serveru pomocou overenia CRAM-MD5."
-
-#~ msgid "Enter the identity you wish to send this message from"
-#~ msgstr "Zadajte identitu, pod ktorou chcete t�to spr�vu posla�"
-
-#~ msgid "Enter the subject of the mail"
-#~ msgstr "Zadajte predmet spr�vy"
-
-#~ msgid "Edit Filter Rule"
-#~ msgstr "Upravi� pravidlo filtra"
-
-#~ msgid "incoming"
-#~ msgstr "prijat�"
-
-#~ msgid "outgoing"
-#~ msgstr "odoslan�"
-
-#~ msgid "Deleted"
-#~ msgstr "Odstr�nen�"
-
-#~ msgid "Draft"
-#~ msgstr "N�vrh"
-
-#~ msgid "Set Flag"
-#~ msgstr "Nastavi� vyzna�enie"
-
-#~ msgid "matches regex"
-#~ msgstr "odpoved� reg. v�razu"
-
-#~ msgid "Add Rule"
-#~ msgstr "Prida� pravidlo"
-
-#~ msgid "Add VFolder Rule"
-#~ msgstr "Prida� pravidlo vprie�inku"
-
-#~ msgid "Edit VFolder Rule"
-#~ msgstr "Upravi� pravidlo vprie�inku"
-
-#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
-#~ msgstr ""
-#~ "Vytv�racie rozhranie pre import s�borov Outlook Express 4 do Evolution"
-
-#~ msgid "Factory to import mbox into Evolution"
-#~ msgstr "Vytv�racie rozhranie pre import s�borov mbox do Evolution"
-
-#~ msgid "Imports Outlook Express 4 files into Evolution"
-#~ msgstr "Importuje s�bory Outlook Express 4 do Evolution"
-
-#~ msgid "Imports mbox files into Evolution"
-#~ msgstr "Importuje s�bory mbox do Evolution"
-
-#~ msgid "Account Properties"
-#~ msgstr "Vlastnosti ��tu"
-
-#~ msgid "E-Mail Address:"
-#~ msgstr "E-mailov� adresa:"
-
-#~ msgid "Include in \"Get Mail\" operations."
-#~ msgstr "Zahrn�� do oper�ci� \"Stiahnu� po�tu\"."
-
-#~ msgid "Incoming Mail Server"
-#~ msgstr "Server pre pr�jem po�ty"
-
-#~ msgid "Miscellaneous"
-#~ msgstr "R�zne"
-
-#~ msgid "Outgoing Mail Server"
-#~ msgstr "Server odosielanej po�ty"
-
-#~ msgid "Servers"
-#~ msgstr "Servery"
-
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Nastavenie _adres�ra..."
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Tla�i� kontakty..."
-
-#~ msgid "Ca_lendar"
-#~ msgstr "Ka_lend�r"
-
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Nastavenie kalend�ra..."
-
-#~ msgid "_Print this calendar"
-#~ msgstr "_Tla�i� tento kalend�r"
-
-#~ msgid "Create Rule"
-#~ msgstr "Vytvori� pravidlo"
-
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Filter na _odosielate�a"
-
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "Filter na _adres�tov"
-
-#~ msgid "Get Mail"
-#~ msgstr "Stiahnu� po�tu"
-
-#~ msgid "Mar_k As Read"
-#~ msgstr "Ozna�i� ako _pre��tan�"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Ozna�i� ako _nepre��tan�"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Uk�ka spr�vy pred tla�ou..."
-
-#~ msgid "Print message..."
-#~ msgstr "Tla�i� spr�vu..."
-
-#~ msgid "Reply to _Sender"
-#~ msgstr "Odpoveda� _odosielate�ovi"
-
-#~ msgid "Show _All Messages"
-#~ msgstr "Uk�za� _v�etky spr�vy"
-
-#~ msgid "_Configure Folder..."
-#~ msgstr "_Nastavenie prie�inku..."
-
-#~ msgid "_Edit Message"
-#~ msgstr "_Upravi� spr�vu"
-
-#~ msgid "_Filter on Subject"
-#~ msgstr "_Filter na predmet"
-
-#~ msgid "_Mail Configuration..."
-#~ msgstr "_Nastavenie po�ty..."
-
-#~ msgid "_Open in New Window"
-#~ msgstr "Otvori� v novom o_kne"
-
-#~ msgid "_Print Message"
-#~ msgstr "_Tla�i� spr�vu"
-
-#~ msgid "_Save Message As..."
-#~ msgstr "Ulo�i� spr�vu _ako..."
-
-#~ msgid "_VFolder on Subject"
-#~ msgstr "_vPrie�inok na predmete"
-
-#~ msgid "New"
-#~ msgstr "Nov�"
-
-#~ msgid "Customi_ze..."
-#~ msgstr "Pri_sp�sobi�..."
-
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Uk�za� panel _prie�inkov"
-
-#~ msgid "Show the _Shortcut Bar"
-#~ msgstr "Uk�za� panel _skratiek"
-
-#~ msgid "_Settings"
-#~ msgstr "Nas_tavenie"
-- 
cgit