Updated Slovak translation.

2001-09-07  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>

	* sk.po: Updated Slovak translation.

svn path=/trunk/; revision=12672

2 files changed, 3910 insertions, 3662 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index bb78746c10..f7a701818c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-07  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation.
+
 2001-09-07  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/sk.po b/po/sk.po
index 1e40e82140..48f5db33b9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,29 +3,301 @@
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 0.12.99\n"
-"POT-Creation-Date: 2001-08-19 16:47+0200\n"
-"PO-Revision-Date: 2001-09-03 14:32CET\n"
+"Project-Id-Version: evolution 0.13.99\n"
+"POT-Creation-Date: 2001-09-07 10:26+0200\n"
+"PO-Revision-Date: 2001-09-07 10:57CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
-msgstr "Vytváracie rozhranie pre import súborov VCard do Evolution."
+msgstr "Vytv�racie rozhranie pre import s�borov VCard do Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
 msgid "Imports VCard files into Evolution."
-msgstr "Importuje súbory VCard do Evolution."
+msgstr "Importuje s�bory VCard do Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3595
+#: addressbook/backend/ebook/e-card-simple.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:868
+msgid "File As"
+msgstr "Ulo�i� ako"
+
+#: addressbook/backend/ebook/e-card-simple.c:59
+msgid "Name"
+msgstr "Meno"
+
+#: addressbook/backend/ebook/e-card-simple.c:60
+msgid "Family Name"
+msgstr "Priezvisko"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1581
+msgid "Primary"
+msgstr "Prim�rny"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+msgid "Prim"
+msgstr "Prim"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+msgid "Assistant"
+msgstr "Asistent"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1634
+msgid "Business"
+msgstr "Zamestnanie"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+msgid "Bus"
+msgstr "Zam"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+msgid "Callback"
+msgstr "Sp�tn� volanie"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+msgid "Comp"
+msgstr "Firma"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1635
+msgid "Home"
+msgstr "Domov"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+msgid "Organization"
+msgstr "Organiz�cia"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+msgid "Org"
+msgstr "Org"
+
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+msgid "Mobile"
+msgstr "Mobil"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+msgid "Car"
+msgstr "Auto"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Business Fax"
+msgstr "Pracovn� fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+msgid "Bus Fax"
+msgstr "Prac. fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Home Fax"
+msgstr "Dom�ci fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+msgid "Business 2"
+msgstr "Zamestnanie 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+msgid "Bus 2"
+msgstr "Zam 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+msgid "Home 2"
+msgstr "Domov 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+#: addressbook/gui/widgets/e-addressbook-view.c:886
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: mail/mail-config.glade.h:51
+msgid "Other"
+msgstr "In�"
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+msgid "Other Fax"
+msgstr "�al�� fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1580
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1582
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Radio"
+msgstr "R�dio"
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1583
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:896
+msgid "Web Site"
+msgstr "WWW str�nka"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+msgid "Url"
+msgstr "Url"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Department"
+msgstr "Oddelenie"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+msgid "Dep"
+msgstr "Odd"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Office"
+msgstr "Pracovisko"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+msgid "Off"
+msgstr "Prac."
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Title"
+msgstr "Titul"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Profession"
+msgstr "Povolanie"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+msgid "Prof"
+msgstr "Pov."
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+msgid "Manager"
+msgstr "Ved�ci"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+msgid "Man"
+msgstr "Ved."
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+msgid "Ass"
+msgstr "Asist."
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+msgid "Nickname"
+msgstr "Prez�vka"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+msgid "Nick"
+msgstr "Prez."
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+msgid "Spouse"
+msgstr "Man�el(ka)"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+msgid "Note"
+msgstr "Pozn�mka"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+msgid "Free-busy URL"
+msgstr "Vo�no/zanepr�zdnen� URL"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "FBUrl"
+msgstr "Url v/z"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniversary"
+msgstr "V�ro�ie"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniv"
+msgstr "V�r."
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+msgid "Birth Date"
+msgstr "D�tum narodenia"
+
+#: addressbook/backend/ebook/e-card-simple.c:102
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kateg�rie"
+
+#: addressbook/backend/ebook/e-card.c:3684
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:3597
+#: addressbook/backend/ebook/e-card.c:3686
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +305,7 @@ msgstr ""
 "\n"
 "Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,23 +313,23 @@ msgstr ""
 "\n"
 "  Predpona:     "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3688
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 "\n"
-"  Krstné:      "
+"  Krstn�:      "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3689
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 "\n"
-"  Ďalšie: "
+"  �al�ie: "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "  Family:     "
@@ -65,23 +337,23 @@ msgstr ""
 "\n"
 "  Priezvisko:     "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3691
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 "\n"
-"  Prípona:     "
+"  Pr�pona:     "
 
-#: addressbook/backend/ebook/e-card.c:3616
+#: addressbook/backend/ebook/e-card.c:3705
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 "\n"
-"Dátum narodenia:"
+"D�tum narodenia:"
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "Address:"
@@ -89,23 +361,23 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 "\n"
-"Poštová schránka:"
+"Po�tov� schr�nka:"
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 "\n"
-"  Príp:         "
+"  Pr�p:         "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3720
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +385,7 @@ msgstr ""
 "\n"
 "  Ulica:      "
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3721
 msgid ""
 "\n"
 "  City:        "
@@ -121,23 +393,23 @@ msgstr ""
 "\n"
 "   Mesto:  "
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3722
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 "\n"
-"  Región:      "
+"  Regi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 "\n"
-"   PSČ:  "
+"   PS�:  "
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3724
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +417,7 @@ msgstr ""
 "\n"
 "  Krajina:  "
 
-#: addressbook/backend/ebook/e-card.c:3648
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,23 +425,23 @@ msgstr ""
 "\n"
 "Dodacie ozn:"
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 "\n"
-"Telefóny:\n"
+"Telef�ny:\n"
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 "\n"
-" Telefón: "
+" Telef�n: "
 
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3776
 msgid ""
 "\n"
 "E-mail:\n"
@@ -177,7 +449,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3779
 msgid ""
 "\n"
 "E-mail:"
@@ -185,23 +457,23 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3798
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 "\n"
-"Pošt.klient:"
+"Po�t.klient:"
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 "\n"
-"Časová zóna:"
+"�asov� z�na:"
 
-#: addressbook/backend/ebook/e-card.c:3723
+#: addressbook/backend/ebook/e-card.c:3812
 msgid ""
 "\n"
 "Geo Location: "
@@ -209,15 +481,15 @@ msgstr ""
 "\n"
 "Miesto: "
 
-#: addressbook/backend/ebook/e-card.c:3727
+#: addressbook/backend/ebook/e-card.c:3816
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 "\n"
-"Pozícia: "
+"Poz�cia: "
 
-#: addressbook/backend/ebook/e-card.c:3739
+#: addressbook/backend/ebook/e-card.c:3828
 msgid ""
 "\n"
 "Org: "
@@ -225,7 +497,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3829
 msgid ""
 "\n"
 "  Name:  "
@@ -233,53 +505,53 @@ msgstr ""
 "\n"
 " Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3830
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 "\n"
-"  Vlastné:"
+"  Vlastn�:"
 
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3831
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 "\n"
-"  Vlastné2: "
+"  Vlastn�2: "
 
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 "\n"
-"  Vlastné3: "
+"  Vlastn�3: "
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3833
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 "\n"
-"  Vlastné4: "
+"  Vlastn�4: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3837
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 "\n"
-"Kategórie: "
+"Kateg�rie: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3838
 msgid ""
 "\n"
 "Comment: "
 msgstr ""
 "\n"
-"Poznámka "
+"Pozn�mka "
 
 #. if (crd->sound.prop.used) {
 #. if (crd->sound.type != SOUND_PHONETIC)
@@ -291,27 +563,27 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3762
+#: addressbook/backend/ebook/e-card.c:3851
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 "\n"
-"Unikátny reťazec:"
+"Unik�tny re�azec:"
 
-#: addressbook/backend/ebook/e-card.c:3765
+#: addressbook/backend/ebook/e-card.c:3854
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 "\n"
-"Verejný kľúč:"
+"Verejn� k���:"
 
-#: addressbook/backend/ebook/e-card.c:4037
+#: addressbook/backend/ebook/e-card.c:4204
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/backend/ebook/e-card.c:4045
+#: addressbook/backend/ebook/e-card.c:4212
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -320,103 +592,117 @@ msgstr "VKartapre %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/conduit/address-conduit.c:1100
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
-#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
-msgstr "Nie je možné inicializovať Bonobo"
+msgstr "Nie je mo�n� inicializova� Bonobo"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
-msgstr "Kurzor nie je možné načítať\n"
+msgstr "Kurzor nie je mo�n� na��ta�\n"
 
 #: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
-msgstr "EBook nenačítaný\n"
+msgstr "EBook nena��tan�\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: calendar/conduits/calendar/calendar-conduit.c:778
 #: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
-msgstr "Nie je možné spustiť server wombat"
+msgstr "Nie je mo�n� spusti� server wombat"
 
-#: addressbook/conduit/address-conduit.c:655
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
-msgstr "Nie je možné spustiť wombat"
+msgstr "Nie je mo�n� spusti� wombat"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
-msgstr "Nie je možné prečítať blok aplikácie Adresa z pilota"
+msgstr "Nie je mo�n� pre��ta� blok aplik�cie Adresa z pilota"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
 msgid "A Bonobo control for an address popup."
-msgstr "Ovládací prvok Bonobo pre adresy."
+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."
+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."
+msgstr "Uk�kov� ovl�dac� prvok Bonobo, ktor� zobrazuje adres�r."
 
 #: 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."
+msgstr "Ovl�dac� prvok pre zobrazenie minikariet adres�ra Evolution."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution Addressbook minicard viewer"
-msgstr "Prehliadač minikariet adresára Evolution"
+msgstr "Prehliada� minikariet adres�ra Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
-msgstr "Komponent Evolution pre prácu s kontaktami."
+msgstr "Komponent Evolution pre pr�cu s kontaktami."
 
 #: 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."
+msgstr "Vytv�racie rozhranie pre ovl�dac� prvok minikariet adres�ra."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
-msgstr "Vytváracie rozhranie pre zobrazovač adries Adresára"
+msgstr "Vytv�racie rozhranie pre zobrazova� adries Adres�ra"
 
 #: 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."
+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:11
 msgid "Factory for the sample Addressbook control"
-msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Adresár"
+msgstr "Vytv�racie rozhranie pre uk�kov� ovl�dac� prvok Adres�r"
 
-#: addressbook/gui/component/addressbook-component.c:385
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-shortcuts.c:1063
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "Folder containing contact information"
+msgstr "Prie�inok obsahuj�ci inform�cie o kontaktoch"
+
+#: addressbook/gui/component/addressbook-component.c:70
+msgid "LDAP Server"
+msgstr "LDAP Server"
+
+#: addressbook/gui/component/addressbook-component.c:70
+msgid "LDAP server containing contact information"
+msgstr "LDAP server obsahuj�ci inform�cie o kontaktoch"
+
+#: addressbook/gui/component/addressbook-component.c:388
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
-msgstr "Nový kontakt"
+msgstr "Nov� kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:385
+#: addressbook/gui/component/addressbook-component.c:388
 msgid "New _Contact"
-msgstr "Nový _kontakt"
+msgstr "Nov� _kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:389
 msgid "New Contact List"
-msgstr "Nový zoznam kontaktov"
+msgstr "Nov� zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:389
 msgid "New Contact _List"
-msgstr "Nový _zoznam kontaktov"
+msgstr "Nov� _zoznam kontaktov"
 
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
-msgstr "Upraviť adresár"
+msgstr "Upravi� adres�r"
 
 #: addressbook/gui/component/addressbook-config.glade.h:1
 msgid "389"
@@ -424,32 +710,32 @@ msgstr "389"
 
 #: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Account Name"
-msgstr "Meno účtu"
+msgstr "Meno ��tu"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
 msgid "Add Addressbook"
-msgstr "Pridať adresár"
+msgstr "Prida� adres�r"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 msgid "Addressbook Sources"
-msgstr "Zdroje adresára"
+msgstr "Zdroje adres�ra"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Advanced"
-msgstr "Pokročilé"
+msgstr "Pokro�il�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
-msgstr "Sústava"
+msgstr "S�stava"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
 #: calendar/gui/dialogs/task-editor.c:151
 msgid "Basic"
-msgstr "Základné"
+msgstr "Z�kladn�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
-msgstr "O_dstrániť"
+msgstr "O_dstr�ni�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:9
 msgid "One"
@@ -457,11 +743,11 @@ msgstr "Jeden"
 
 #: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Search _base:"
-msgstr "_Oblasť hľadania:"
+msgstr "_Oblas� h�adania:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "Search s_cope: "
-msgstr "_Rozsah hľadania:"
+msgstr "_Rozsah h�adania:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Server Name"
@@ -473,68 +759,69 @@ msgstr "Sub"
 
 #: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
-msgstr "Údaje uvedené dole sú nutné pre pridanie adresára."
+msgstr "�daje uveden� dole s� nutn� pre pridanie adres�ra."
 
 #: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "This information is not required for most ldap servers. "
-msgstr "Táto informácia nie je pre väčšinu serverov LDAP nutná."
+msgstr "T�to inform�cia nie je pre v��inu serverov LDAP nutn�."
 
 #: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
 msgstr ""
-"Túto informáciu používa váš server LDAP pre určenie, ktoré uzly použiť pre "
-"hľadanie. Detaily by vám mal poskytnúť váš systémový administrátor."
+"T�to inform�ciu pou��va v� server LDAP pre ur�enie, ktor� uzly pou�i� pre "
+"h�adanie. Detaily by v�m mal poskytn�� v� syst�mov� administr�tor."
 
 #: addressbook/gui/component/addressbook-config.glade.h:17
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
 msgstr ""
-"Toto je základný uzol pre všetky hľadania na serveri LDAP. Detaily by ste "
-"mali získať od vášho systémového administrátora."
+"Toto je z�kladn� uzol pre v�etky h�adania na serveri LDAP. Detaily by ste "
+"mali z�ska� od v�ho syst�mov�ho administr�tora."
 
 #: addressbook/gui/component/addressbook-config.glade.h:18
 msgid "This is the name of the server where your addressbook is located."
-msgstr "Toto je meno serveru, kde je umiestnený adresár."
+msgstr "Toto je meno serveru, kde je umiestnen� adres�r."
 
 #: addressbook/gui/component/addressbook-config.glade.h:19
 msgid "This is the port that your ldap server uses."
-msgstr "Toto je port, ktorý používa váš server LDAP."
+msgstr "Toto je port, ktor� pou��va v� server LDAP."
 
 #: addressbook/gui/component/addressbook-config.glade.h:20
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
 msgstr ""
-"Toto meno sa bude identifikovať váš účet, ale používať sa bude iba pre "
+"Toto meno sa bude identifikova� v� ��et, ale pou��va� sa bude iba pre "
 "zobrazenie."
 
 #: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
-msgstr "Meno úč_tu:"
+msgstr "Meno ��_tu:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:89 my-evolution/my-evolution.glade.h:18
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
-msgstr "_Pridať"
+msgstr "_Prida�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:94
-#: ui/evolution-mail-messagedisplay.xml.h:6
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:36
+#: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
-msgstr "_Upraviť"
+msgstr "_Upravi�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:24
 msgid "_My server requires authentication"
-msgstr "Server _vyžaduje overenie"
+msgstr "Server _vy�aduje overenie"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
 msgid "_Port:"
@@ -544,92 +831,88 @@ msgstr "_Port:"
 msgid "_Server name:"
 msgstr "_Meno serveru:"
 
-#: addressbook/gui/component/addressbook-storage.c:138
-msgid "Other Contacts"
-msgstr "Iné kontakty"
-
-#: addressbook/gui/component/addressbook.c:375
+#: addressbook/gui/component/addressbook.c:393
 #, c-format
 msgid "Please enter your email address and password for access to %s"
-msgstr "Prosím, zadajte vašu e-mailovú adresu a heslo pre %s"
+msgstr "Pros�m, zadajte va�u e-mailov� adresu a heslo pre %s"
 
-#: addressbook/gui/component/addressbook.c:383
+#: addressbook/gui/component/addressbook.c:401
 msgid "LDAP Authentication"
 msgstr "Overenie LDAP"
 
-#: addressbook/gui/component/addressbook.c:394
+#: addressbook/gui/component/addressbook.c:412
 msgid "Email Address:"
-msgstr "E-mailová adresa:"
+msgstr "E-mailov� adresa:"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:425
 msgid "Password:"
 msgstr "Heslo:"
 
-#: addressbook/gui/component/addressbook.c:470
+#: addressbook/gui/component/addressbook.c:488
 msgid "Unable to open addressbook"
-msgstr "Nie je možné otvoriť adresár"
+msgstr "Nie je mo�n� otvori� adres�r"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
-"Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
-"zadali neplatné URI, alebo LDAP server nefunguje."
+"Nebolo mo�n� otvori� tento adres�r. To bu� znamen�, �e ste\n"
+"zadali neplatn� URI, alebo LDAP server nefunguje."
 
-#: addressbook/gui/component/addressbook.c:482
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
 "you must compile the program from the CVS sources after\n"
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
-"Táto verzia Evolution nemá zakompilovanú podporu LDAP.\n"
-"Ak chcete LDAP v Evolution používať, musíte ho prekompilovať\n"
-"z CVS po získaní OpenLDAP z tohto odkazu.\n"
+"T�to verzia Evolution nem� zakompilovan� podporu LDAP.\n"
+"Ak chcete LDAP v Evolution pou��va�, mus�te ho prekompilova�\n"
+"z CVS po z�skan� OpenLDAP z tohto odkazu.\n"
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:508
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
-"Nebolo možné otvoriť tento adresár. Prosím, overte, že cesta\n"
-"existuje a že máte dostatočné práva."
+"Nebolo mo�n� otvori� tento adres�r. Pros�m, overte, �e cesta\n"
+"existuje a �e m�te dostato�n� pr�va."
 
-#: addressbook/gui/component/addressbook.c:631
+#: addressbook/gui/component/addressbook.c:649
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
-msgstr "Ľubovoľné pole obsahuje"
+msgstr "�ubovo�n� pole obsahuje"
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:650
 msgid "Name contains"
 msgstr "Meno obsahuje"
 
-#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:651
 msgid "Email contains"
 msgstr "E-mail obsahuje"
 
-#: addressbook/gui/component/addressbook.c:634
+#: addressbook/gui/component/addressbook.c:652
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
-msgstr "Kategória je"
+msgstr "Kateg�ria je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:635 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
-msgstr "Pokročilé..."
+msgstr "Pokro�il�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:827
+#: addressbook/gui/component/addressbook.c:883
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
-msgstr "Ľubovoľná kategória"
+msgstr "�ubovo�n� kateg�ria"
 
-#: addressbook/gui/component/addressbook.c:865
+#: addressbook/gui/component/addressbook.c:921
 msgid "The URI that the Folder Browser will display"
-msgstr "URI, ktoré zobrazí prehliadač priečinku"
+msgstr "URI, ktor� zobraz� prehliada� prie�inku"
 
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
@@ -638,25 +921,13 @@ msgstr "URI, ktoré zobrazí prehliadač priečinku"
 #.
 #: addressbook/gui/component/e-address-popup.c:178
 msgid "(none)"
-msgstr "(nič)"
+msgstr "(ni�)"
 
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
 msgid "Primary Email"
-msgstr "Primárny e-mail"
-
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
-#: addressbook/gui/widgets/e-addressbook-view.c:801
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/widgets/e-addressbook-view.c:802
-msgid "Email 3"
-msgstr "E-mail 3"
+msgstr "Prim�rny e-mail"
 
 #: addressbook/gui/component/e-address-popup.c:579
 msgid "Select an Action"
@@ -665,76 +936,75 @@ msgstr "Vyberte akciu"
 #: addressbook/gui/component/e-address-popup.c:585
 #, c-format
 msgid "Create a new contact \"%s\""
-msgstr "Vytvoriť nový kontakt \"%s\""
+msgstr "Vytvori� nov� kontakt \"%s\""
 
 #: addressbook/gui/component/e-address-popup.c:597
 #, c-format
 msgid "Add address to existing contact \"%s\""
-msgstr "Pridať adresu do existujúceho kontaktu \"%s\""
+msgstr "Prida� adresu do existuj�ceho kontaktu \"%s\""
 
 #: addressbook/gui/component/e-address-popup.c:859
 msgid "Querying Addressbook..."
-msgstr "Otázka pre adresár..."
+msgstr "Ot�zka pre adres�r..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
-msgstr "Upraviť kontakt"
+msgstr "Upravi� kontakt"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
-msgstr "Pridať do kontaktov"
+msgstr "Prida� do kontaktov"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
-msgstr "Zliať e-mailovú adresu"
+msgstr "Zlia� e-mailov� adresu"
 
 #: addressbook/gui/component/e-address-widget.c:365
 msgid "Disable Queries"
-msgstr "Zakázať otázky"
+msgstr "Zak�za� ot�zky"
 
 #: addressbook/gui/component/e-address-widget.c:365
 msgid "Enable Queries (Dangerous!)"
-msgstr "Povoliť otázky (nebezpečné)"
+msgstr "Povoli� ot�zky (nebezpe�n�)"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
-msgstr "Rozhranie pre výber mena adresára Evolution."
+msgstr "Rozhranie pre v�ber mena adres�ra Evolution."
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
 msgid "Factory for the Addressbook's name selection interface"
-msgstr "Vytváracie rozhranie pre rozhranie pre výber mena adresára."
+msgstr "Vytv�racie rozhranie pre rozhranie pre v�ber mena adres�ra."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:661
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
-#: shell/e-shortcuts-view.c:385
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:181
 msgid "Remove"
-msgstr "Odstrániť"
+msgstr "Odstr�ni�"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:171
 msgid "Remove All"
-msgstr "Odstrániť všetky"
+msgstr "Odstr�ni� v�etky"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:195
 msgid "Send HTML Mail?"
-msgstr "Poslať poštu HTML?"
+msgstr "Posla� po�tu HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:368
 msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
-#: addressbook/gui/component/select-names/e-select-names.c:430
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
-msgstr "Nepodarilo sa získať lokálny sklad. To by sa nikdy nemalo stať."
+msgstr "Nepodarilo sa z�ska� lok�lny sklad. To by sa nikdy nemalo sta�."
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names.c:560
 msgid "Select Contacts from Addressbook"
-msgstr "Vyberte kontakty z adresára"
+msgstr "Vyberte kontakty z adres�ra"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "C_ontaining:"
@@ -746,47 +1016,49 @@ msgstr "_Kontakty:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "F_ind"
-msgstr "_Nájsť"
+msgstr "_N�js�"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Select Names"
-msgstr "Výber mien"
+msgstr "V�ber mien"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show contacts matching the following criteria:"
-msgstr "Zobraziť kontakty odpovedajúce týmto kritériám:"
+msgstr "Zobrazi� kontakty odpovedaj�ce t�mto krit�ri�m:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
-msgstr "_Kategória:"
+msgstr "_Kateg�ria:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
-msgstr "_Priečinok:"
+msgstr "_Prie�inok:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Message Recipients:"
-msgstr "_Adresáti správy:"
+msgstr "_Adres�ti spr�vy:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
-msgstr "_Výročie:"
+msgstr "_V�ro�ie:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
-msgstr "Do _práce"
+msgstr "Do _pr�ce"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
-msgstr "_Fax do práce"
+msgstr "_Fax do pr�ce"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
-msgstr "Ka_tegórie..."
+msgstr "Ka_teg�rie..."
 
+#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor.c:1213
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
@@ -797,31 +1069,31 @@ msgstr "Detaily"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File A_s:"
-msgstr "Uložiť _ako:"
+msgstr "Ulo�i� _ako:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "General"
-msgstr "Všeobecné"
+msgstr "V�eobecn�"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
-msgstr "Nový typ telefónu"
+msgstr "Nov� typ telef�nu"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
-msgstr "_Poznámky:"
+msgstr "_Pozn�mky:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "Organi_zation:"
-msgstr "Or_ganizácia:"
+msgstr "Or_ganiz�cia:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
-msgstr "Typy telefónov"
+msgstr "Typy telef�nov"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
-msgstr "Chce prijímať poštu ako _HTML"
+msgstr "Chce prij�ma� po�tu ako _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
@@ -833,11 +1105,11 @@ msgstr "Meno _asistenta:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
-msgstr "Dátum na_rodenia:"
+msgstr "D�tum na_rodenia:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
-msgstr "_Práca"
+msgstr "_Pr�ca"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: calendar/gui/dialogs/event-page.glade.h:12
@@ -847,12 +1119,12 @@ msgstr "_Kontakty..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1319 mail/mail-config.glade.h:93
-#: ui/evolution-mail-message.xml.h:88 ui/evolution-tasks.xml.h:12
-#: ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:1483 filter/filter.glade.h:8
+#: mail/folder-browser.c:1318 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
-msgstr "_Odstrániť"
+msgstr "_Odstr�ni�"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
@@ -860,7 +1132,7 @@ msgstr "O_ddelenie:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
-msgstr "_Celé meno..."
+msgstr "_Cel� meno..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
@@ -868,11 +1140,11 @@ msgstr "_Domov"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
-msgstr "Činnosť/po_zícia:"
+msgstr "�innos�/po_z�cia:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
-msgstr "Meno _vedúceho:"
+msgstr "Meno _ved�ceho:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
@@ -880,7 +1152,7 @@ msgstr "_Mobil"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
-msgstr "Pre_zývka:"
+msgstr "Pre_z�vka:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
@@ -892,126 +1164,47 @@ msgstr "_Povolanie:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
-msgstr "Ma_nžel(ka):"
+msgstr "Ma_n�el(ka):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
-msgstr "_Toto je e-mailová adresa"
+msgstr "_Toto je e-mailov� adresa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Web page address:"
-msgstr "Adresa _WWW stránky:"
+msgstr "Adresa _WWW str�nky:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
-msgstr "Odstrániť kontakt?"
+msgstr "Odstr�ni� kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:730
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "This contact belongs to these categories:"
-msgstr "Tento kontakt patrí do týchto kategórií:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
-#: addressbook/gui/widgets/e-addressbook-view.c:809
-msgid "Assistant"
-msgstr "Asistent"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/contact-editor/e-contact-editor.c:1623
-msgid "Business"
-msgstr "Práca"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
-msgid "Business 2"
-msgstr "Práca 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1558
-#: addressbook/gui/widgets/e-addressbook-view.c:789
-msgid "Business Fax"
-msgstr "Pracovný fax"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1559
-msgid "Callback"
-msgstr "Spätné volanie"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1560
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1624
-msgid "Home"
-msgstr "Domov"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
-msgid "Home 2"
-msgstr "Domov 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/widgets/e-addressbook-view.c:790
-msgid "Home Fax"
-msgstr "Domáci fax"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
-#: addressbook/gui/widgets/e-addressbook-view.c:793
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-#: addressbook/gui/contact-editor/e-contact-editor.c:1625
-#: mail/mail-config.glade.h:50
-msgid "Other"
-msgstr "Iné"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
-#: addressbook/gui/widgets/e-addressbook-view.c:795
-msgid "Other Fax"
-msgstr "Ďalší fax"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-#: addressbook/gui/widgets/e-addressbook-view.c:796
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
-msgid "Primary"
-msgstr "Primárny"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
-#: addressbook/gui/widgets/e-addressbook-view.c:797
-msgid "Radio"
-msgstr "Rádio"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
-#: addressbook/gui/widgets/e-addressbook-view.c:798
-msgid "Telex"
-msgstr "Telex"
+msgstr "Tento kontakt patr� do t�chto kateg�ri�:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1584
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
+#: addressbook/gui/contact-editor/e-contact-editor.c:2203
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nie je mo�n� n�js� prvok pre pole: `%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
 msgid "Contact Quick-Add"
-msgstr "Rýchly kontakt"
+msgstr "R�chly kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
 msgid "Edit Full"
-msgstr "Upraviť celé"
+msgstr "Upravi� cel�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Full Name"
-msgstr "Celé meno"
+msgstr "Cel� meno"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -1021,8 +1214,8 @@ msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
-"%s už existuje.\n"
-"Chcete ho prepísať?"
+"%s u� existuje.\n"
+"Chcete ho prep�sa�?"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
@@ -1034,15 +1227,15 @@ msgstr "Afganistan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Albania"
-msgstr "Albánsko"
+msgstr "Alb�nsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Algeria"
-msgstr "Alžírsko"
+msgstr "Al��rsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "American Samoa"
-msgstr "Americká Samoa"
+msgstr "Americk� Samoa"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "Andorra"
@@ -1058,7 +1251,7 @@ msgstr "Anguilla"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "Antarctica"
-msgstr "Antarktída"
+msgstr "Antarkt�da"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "Antigua And Barbuda"
@@ -1066,11 +1259,11 @@ msgstr "Antigua a Barbuda"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "Argentina"
-msgstr "Argentína"
+msgstr "Argent�na"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:12
 msgid "Armenia"
-msgstr "Arménsko"
+msgstr "Arm�nsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:13
 msgid "Aruba"
@@ -1078,15 +1271,15 @@ msgstr "Aruba"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:14
 msgid "Australia"
-msgstr "Austrália"
+msgstr "Austr�lia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:15
 msgid "Austria"
-msgstr "Rakúsko"
+msgstr "Rak�sko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:16
 msgid "Azerbaijan"
-msgstr "Azerbajdžán"
+msgstr "Azerbajd��n"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:17
 msgid "Bahamas"
@@ -1098,7 +1291,7 @@ msgstr "Bahrajn"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:19
 msgid "Bangladesh"
-msgstr "Bangladéš"
+msgstr "Banglad�"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:20
 msgid "Barbados"
@@ -1126,11 +1319,11 @@ msgstr "Bermudy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:26
 msgid "Bhutan"
-msgstr "Bhután"
+msgstr "Bhut�n"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:27
 msgid "Bolivia"
-msgstr "Bolívia"
+msgstr "Bol�via"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:28
 msgid "Bosnia And Herzegowina"
@@ -1146,15 +1339,15 @@ msgstr "Bouvet Island"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:31
 msgid "Brazil"
-msgstr "Brazília"
+msgstr "Braz�lia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:32
 msgid "British Indian Ocean Territory"
-msgstr "Britské teritórium Indický oceán"
+msgstr "Britsk� terit�rium Indick� oce�n"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:33
 msgid "British Virgin Islands"
-msgstr "Britské panenské ostrovy"
+msgstr "Britsk� panensk� ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:34
 msgid "Brunei Darussalam"
@@ -1174,7 +1367,7 @@ msgstr "Burundi"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:38
 msgid "Cambodia"
-msgstr "Kambodža"
+msgstr "Kambod�a"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:39
 msgid "Cameroon"
@@ -1190,19 +1383,19 @@ msgstr "Kapverdy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:42
 msgid "Cayman Islands"
-msgstr "Kajmanské ostrovy"
+msgstr "Kajmansk� ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:43
 msgid "Central African Republic"
-msgstr "Stredoafrická Republika"
+msgstr "Stredoafrick� Republika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:44
 msgid "Chad"
-msgstr "Čad"
+msgstr "�ad"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
-msgstr "Skontrolovať adresu"
+msgstr "Skontrolova� adresu"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:46
 msgid "Chile"
@@ -1210,15 +1403,15 @@ msgstr "Chile"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:47
 msgid "China"
-msgstr "Čína"
+msgstr "��na"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:48
 msgid "Christmas Island"
-msgstr "Vianočné ostrovy"
+msgstr "Viano�n� ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:49
 msgid "Cocos (Keeling) Islands"
-msgstr "Kokosové ostrovy"
+msgstr "Kokosov� ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:50
 msgid "Colombia"
@@ -1242,7 +1435,7 @@ msgstr "Kostarika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:55
 msgid "Cote d'Ivoire"
-msgstr "Pobrežie slonoviny"
+msgstr "Pobre�ie slonoviny"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
@@ -1250,7 +1443,7 @@ msgstr "Kra_jina:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:57
 msgid "Croatia"
-msgstr "Chorvátsko"
+msgstr "Chorv�tsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:58
 msgid "Cuba"
@@ -1262,15 +1455,15 @@ msgstr "Cyprus"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:60
 msgid "Czech Republic"
-msgstr "Česká Republika"
+msgstr "�esk� Republika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:61
 msgid "Denmark"
-msgstr "Dánsko"
+msgstr "D�nsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:62
 msgid "Djibouti"
-msgstr "Džibuti"
+msgstr "D�ibuti"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:63
 msgid "Dominica"
@@ -1278,15 +1471,15 @@ msgstr "Dominika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:64
 msgid "Dominican Republic"
-msgstr "Dominikánska Republika"
+msgstr "Dominik�nska Republika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:65
 msgid "East Timor"
-msgstr "Východný Timor"
+msgstr "V�chodn� Timor"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:66
 msgid "Ecuador"
-msgstr "Ekvádor"
+msgstr "Ekv�dor"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:67
 msgid "Egypt"
@@ -1294,11 +1487,11 @@ msgstr "Egypt"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:68
 msgid "El Salvador"
-msgstr "Salvádor"
+msgstr "Salv�dor"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:69
 msgid "Equatorial Guinea"
-msgstr "Rovníková Guinea"
+msgstr "Rovn�kov� Guinea"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:70
 msgid "Eritrea"
@@ -1306,43 +1499,43 @@ msgstr "Eritrea"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:71
 msgid "Estonia"
-msgstr "Estónsko"
+msgstr "Est�nsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:72
 msgid "Ethiopia"
-msgstr "Etiópia"
+msgstr "Eti�pia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:73
 msgid "Falkland Islands"
-msgstr "Falklandské ostrovy"
+msgstr "Falklandsk� ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:74
 msgid "Faroe Islands"
-msgstr "Faerské ostrovy"
+msgstr "Faersk� ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:75
 msgid "Fiji"
-msgstr "Fidži"
+msgstr "Fid�i"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
-msgstr "Fínsko"
+msgstr "F�nsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:77
 msgid "France"
-msgstr "Francúzsko"
+msgstr "Franc�zsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:78
 msgid "French Guiana"
-msgstr "Francúzska guajana"
+msgstr "Franc�zska guajana"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:79
 msgid "French Polynesia"
-msgstr "Francúzska Polynézia"
+msgstr "Franc�zska Polyn�zia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:80
 msgid "French Southern Territories"
-msgstr "Francúzske južné teritóriá"
+msgstr "Franc�zske ju�n� terit�ri�"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:81
 msgid "Gabon"
@@ -1354,7 +1547,7 @@ msgstr "Gambia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:83
 msgid "Georgia"
-msgstr "Gruzínsko"
+msgstr "Gruz�nsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:84
 msgid "Germany"
@@ -1370,11 +1563,11 @@ msgstr "Gibraltar"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:87
 msgid "Greece"
-msgstr "Grécko"
+msgstr "Gr�cko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:88
 msgid "Greenland"
-msgstr "Grónsko"
+msgstr "Gr�nsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:89
 msgid "Grenada"
@@ -1426,7 +1619,7 @@ msgstr "Hongkong"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:101
 msgid "Hungary"
-msgstr "Maďarsko"
+msgstr "Ma�arsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:102
 msgid "Iceland"
@@ -1438,11 +1631,11 @@ msgstr "India"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:104
 msgid "Indonesia"
-msgstr "Indonézia"
+msgstr "Indon�zia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:105
 msgid "Ireland"
-msgstr "Írsko"
+msgstr "�rsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:106
 msgid "Israel"
@@ -1462,15 +1655,15 @@ msgstr "Japonsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:110
 msgid "Jordan"
-msgstr "Jordánsko"
+msgstr "Jord�nsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:111
 msgid "Kazakhstan"
-msgstr "Kazachstán"
+msgstr "Kazachst�n"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:112
 msgid "Kenya"
-msgstr "Keňa"
+msgstr "Ke�a"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:113
 msgid "Kiribati"
@@ -1482,7 +1675,7 @@ msgstr "Kuvajt"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:115
 msgid "Kyrgyzstan"
-msgstr "Kirgistán"
+msgstr "Kirgist�n"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:116
 msgid "Laos"
@@ -1490,7 +1683,7 @@ msgstr "Laos"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:117
 msgid "Latvia"
-msgstr "Lotyšsko"
+msgstr "Loty�sko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:118
 msgid "Lebanon"
@@ -1502,11 +1695,11 @@ msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:120
 msgid "Liberia"
-msgstr "Libéria"
+msgstr "Lib�ria"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:121
 msgid "Liechtenstein"
-msgstr "Lichtenštajnsko"
+msgstr "Lichten�tajnsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:122
 msgid "Lithuania"
@@ -1558,11 +1751,11 @@ msgstr "Martinik"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:134
 msgid "Mauritania"
-msgstr "Mauretánia"
+msgstr "Mauret�nia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:135
 msgid "Mauritius"
-msgstr "Maurítius"
+msgstr "Maur�tius"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:136
 msgid "Mayotte"
@@ -1574,7 +1767,7 @@ msgstr "Mexiko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:138
 msgid "Micronesia"
-msgstr "Mikronézia"
+msgstr "Mikron�zia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:139
 msgid "Monaco"
@@ -1602,7 +1795,7 @@ msgstr "Myanmar (Barma)"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:145
 msgid "Namibia"
-msgstr "Namíbia"
+msgstr "Nam�bia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:146
 msgid "Nauru"
@@ -1610,7 +1803,7 @@ msgstr "Nauru"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:147
 msgid "Nepal"
-msgstr "Nepál"
+msgstr "Nep�l"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:148
 msgid "Netherlands"
@@ -1618,15 +1811,15 @@ msgstr "Holandsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:149
 msgid "Netherlands Antilles"
-msgstr "Holandské Antily"
+msgstr "Holandsk� Antily"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:150
 msgid "New Caledonia"
-msgstr "Nová Kaledónia"
+msgstr "Nov� Kaled�nia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:151
 msgid "New Zealand"
-msgstr "Nový Zéland"
+msgstr "Nov� Z�land"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:152
 msgid "Nicaragua"
@@ -1638,7 +1831,7 @@ msgstr "Niger"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:154
 msgid "Nigeria"
-msgstr "Nigéria"
+msgstr "Nig�ria"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:155
 msgid "Niue"
@@ -1650,15 +1843,15 @@ msgstr "Ostrov Norfolk"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:157
 msgid "Northern Mariana Islands"
-msgstr "Severné Mariánske Ostrovy"
+msgstr "Severn� Mari�nske Ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:158
 msgid "Norway"
-msgstr "Nórsko"
+msgstr "N�rsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:159
 msgid "Oman"
-msgstr "Omán"
+msgstr "Om�n"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:160
 msgid "Pakistan"
@@ -1674,7 +1867,7 @@ msgstr "Panama"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:163
 msgid "Papua New Guinea"
-msgstr "Papua Nová Guinea"
+msgstr "Papua Nov� Guinea"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:164
 msgid "Paraguay"
@@ -1686,7 +1879,7 @@ msgstr "Peru"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:166
 msgid "Philippines"
-msgstr "Filipíny"
+msgstr "Filip�ny"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:167
 msgid "Pitcairn"
@@ -1694,7 +1887,7 @@ msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:168
 msgid "Poland"
-msgstr "Poľsko"
+msgstr "Po�sko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:169
 msgid "Portugal"
@@ -1710,11 +1903,11 @@ msgstr "Katar"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:172
 msgid "Republic Of Korea"
-msgstr "Korejská republika"
+msgstr "Korejsk� republika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:173
 msgid "Republic Of Moldova"
-msgstr "Moldavská republika"
+msgstr "Moldavsk� republika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:174
 msgid "Reunion"
@@ -1726,7 +1919,7 @@ msgstr "Rumunsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:176
 msgid "Russian Federation"
-msgstr "Ruská federácia"
+msgstr "Rusk� feder�cia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:177
 msgid "Rwanda"
@@ -1734,15 +1927,15 @@ msgstr "Rwanda"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:178
 msgid "Saint Kitts And Nevis"
-msgstr "Svätý Kitts a Nevis"
+msgstr "Sv�t� Kitts a Nevis"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:179
 msgid "Saint Lucia"
-msgstr "Svätá Lucia"
+msgstr "Sv�t� Lucia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:180
 msgid "Saint Vincent And The Grena-dines"
-msgstr "Svätý Vincent a Grenadiny"
+msgstr "Sv�t� Vincent a Grenadiny"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:181
 msgid "Samoa"
@@ -1758,7 +1951,7 @@ msgstr "Sao Tome a Principe"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:184
 msgid "Saudi Arabia"
-msgstr "Saudská Arábia"
+msgstr "Saudsk� Ar�bia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:185
 msgid "Senegal"
@@ -1786,15 +1979,15 @@ msgstr "Slovinsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:191
 msgid "Solomon Islands"
-msgstr "Šalamúnove Ostrovy"
+msgstr "�alam�nove Ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:192
 msgid "Somalia"
-msgstr "Somálsko"
+msgstr "Som�lsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:193
 msgid "South Africa"
-msgstr "Južná Afrika"
+msgstr "Ju�n� Afrika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:194
 msgid "South Georgia And The South Sandwich Islands"
@@ -1802,23 +1995,23 @@ msgstr "South Georgia a The South Sandwich Islands"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:195
 msgid "Spain"
-msgstr "Španielsko"
+msgstr "�panielsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:196
 msgid "Sri Lanka"
-msgstr "Srí Lanka"
+msgstr "Sr� Lanka"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:197
 msgid "St. Helena"
-msgstr "Svätá Helena"
+msgstr "Sv�t� Helena"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:198
 msgid "St. Pierre And Miquelon"
-msgstr "Svätý Pierre a Miquelon"
+msgstr "Sv�t� Pierre a Miquelon"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:199
 msgid "Sudan"
-msgstr "Sudán"
+msgstr "Sud�n"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:200
 msgid "Suriname"
@@ -1826,7 +2019,7 @@ msgstr "Surinam"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:201
 msgid "Svalbard And Jan Mayen Islands"
-msgstr "Svalbardove a Jan Mayenové ostrovy"
+msgstr "Svalbardove a Jan Mayenov� ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:202
 msgid "Swaziland"
@@ -1834,11 +2027,11 @@ msgstr "Svazijsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:203
 msgid "Sweden"
-msgstr "Švédsko"
+msgstr "�v�dsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:204
 msgid "Switzerland"
-msgstr "Švajčiarsko"
+msgstr "�vaj�iarsko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:205
 msgid "Taiwan"
@@ -1846,7 +2039,7 @@ msgstr "Taiwan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:206
 msgid "Tajikistan"
-msgstr "Tadžikistan"
+msgstr "Tad�ikistan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:207
 msgid "Thailand"
@@ -1878,11 +2071,11 @@ msgstr "Turecko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:214
 msgid "Turkmenistan"
-msgstr "Turkmenistán"
+msgstr "Turkmenist�n"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:215
 msgid "Turks And Caicos Islands"
-msgstr "Turecké a kaikoské ostrovy"
+msgstr "Tureck� a kaikosk� ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:216
 msgid "Tuvalu"
@@ -1890,7 +2083,7 @@ msgstr "Tuvalu"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:217
 msgid "U.S. Virgin Islands"
-msgstr "U.S. panenské ostrovy"
+msgstr "U.S. panensk� ostrovy"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:218
 msgid "Uganda"
@@ -1902,23 +2095,23 @@ msgstr "Ukrajina"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:220
 msgid "United Arab Emirates"
-msgstr "Spojené Arabské Emiráty"
+msgstr "Spojen� Arabsk� Emir�ty"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:221
 msgid "United Kingdom"
-msgstr "Spojené kráľovstvo"
+msgstr "Spojen� kr�ovstvo"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:222
 msgid "United Republic Of Tanzania"
-msgstr "Spojená republiká Tanzánia"
+msgstr "Spojen� republik� Tanz�nia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:223
 msgid "United States"
-msgstr "Spojené štáty"
+msgstr "Spojen� �t�ty"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:224
 msgid "United States Minor Outlying Islands"
-msgstr "Menšie ostrovy mimo spojené štáty"
+msgstr "Men�ie ostrovy mimo spojen� �t�ty"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:225
 msgid "Uruguay"
@@ -1926,11 +2119,11 @@ msgstr "Uruguaj"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:226
 msgid "Uzbekistan"
-msgstr "Uzbekistán"
+msgstr "Uzbekist�n"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:227
 msgid "Vanuatu"
-msgstr "Vanuatu (Nové Hebridy)"
+msgstr "Vanuatu (Nov� Hebridy)"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:228
 msgid "Venezuela"
@@ -1946,7 +2139,7 @@ msgstr "Ostrovy Wallis a Futuna"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:231
 msgid "Western Sahara"
-msgstr "Západná sahara"
+msgstr "Z�padn� sahara"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:232
 msgid "Yemen"
@@ -1954,7 +2147,7 @@ msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:233
 msgid "Yugoslavia"
-msgstr "Juhoslávia"
+msgstr "Juhosl�via"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:234
 msgid "Zambia"
@@ -1978,15 +2171,15 @@ msgstr "_PO Box:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
-msgstr "_Štát/Provincia:"
+msgstr "_�t�t/Provincia:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
-msgstr "_PSČ:"
+msgstr "_PS�:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
-msgstr "Skontrolovať celé meno"
+msgstr "Skontrolova� cel� meno"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
@@ -2014,11 +2207,11 @@ msgstr "Ml."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
-msgstr "Slečna"
+msgstr "Sle�na"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
-msgstr "Pán"
+msgstr "P�n"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
@@ -2034,7 +2227,7 @@ msgstr "St."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
-msgstr "_Krstné:"
+msgstr "_Krstn�:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
@@ -2042,11 +2235,11 @@ msgstr "_Priezvisko:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
-msgstr "_Stredné:"
+msgstr "_Stredn�:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
-msgstr "_Prípona:"
+msgstr "_Pr�pona:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
@@ -2058,20 +2251,20 @@ msgstr "Meno _zoznamu:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 msgid "Members"
-msgstr "Členovia"
+msgstr "�lenovia"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Type an email address or drag a contact into the list below:"
-msgstr "Zadajte e-mailovú adresu, alo do zoznamu pretiahnite kontakt myšou:"
+msgstr "Zadajte e-mailov� adresu, alo do zoznamu pretiahnite kontakt my�ou:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
-msgstr "_Skryť adresy pri posielaní e-mailu do tohto zoznamu"
+msgstr "_Skry� adresy pri posielan� e-mailu do tohto zoznamu"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
-msgstr "_Odstrániť"
+msgstr "_Odstr�ni�"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "contact-list-editor"
@@ -2084,36 +2277,36 @@ msgstr "Editor zoznamu kontaktov"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
-msgstr "Pridať aj tak"
+msgstr "Prida� aj tak"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
-msgstr "Nájdený duplikát kontaktu"
+msgstr "N�jden� duplik�t kontaktu"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 msgid "New Contact:"
-msgstr "Nový kontakt:"
+msgstr "Nov� kontakt:"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid "Original Contact:"
-msgstr "Pôvodný kontakt:"
+msgstr "P�vodn� kontakt:"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Meno alebo e-mail pre tento kontakt už v tomto priečinku\n"
-"existuje. Chcete ho aj tak pridať?"
+"Meno alebo e-mail pre tento kontakt u� v tomto prie�inku\n"
+"existuje. Chcete ho aj tak prida�?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 msgid "Change Anyway"
-msgstr "Zmeniť aj tak"
+msgstr "Zmeni� aj tak"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
-msgstr "Zmenený kontakt:"
+msgstr "Zmenen� kontakt:"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
@@ -2124,209 +2317,114 @@ msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Zmenený e-mail alebo meno pre tento kontakt už v tomto\n"
-"priečinku existuje. Chcete ho aj tak pridať?"
+"Zmenen� e-mail alebo meno pre tento kontakt u� v tomto\n"
+"prie�inku existuje. Chcete ho aj tak prida�?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:146
 #: widgets/misc/e-filter-bar.c:243
 msgid "Advanced Search"
-msgstr "Pokročilé hľadanie"
+msgstr "Pokro�il� h�adanie"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:260
+#: mail/mail-search.c:264
 msgid "Search"
-msgstr "Hľadať"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
+msgstr "H�ada�"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-model.c:121
+msgid "No cards"
+msgstr "�iadne karty"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-model.c:124
+msgid "1 card"
+msgstr "1 karta"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-model.c:127
+#, c-format
+msgid "%d cards"
+msgstr "%d kariet"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:1286
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:753
+#: addressbook/gui/widgets/e-addressbook-view.c:1373
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
-msgstr "Uložiť ako vKartu"
+msgstr "Ulo�i� ako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
-#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
-msgstr "Otvoriť"
+msgstr "Otvori�"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:754
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
-msgstr "Predať ďalej kontakt"
+msgstr "Preda� �alej kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:755
 msgid "Send Message to Contact"
-msgstr "Poslať správu kontaktu"
+msgstr "Posla� spr�vu kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:756
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
-msgstr "Tlačiť"
+msgstr "Tla�i�"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
+#: addressbook/gui/widgets/e-addressbook-view.c:758
 msgid "Print Envelope"
-msgstr "Tlačiť obálku"
+msgstr "Tla�i� ob�lku"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
+#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
-msgstr "Odstrániť"
+msgstr "Odstr�ni�"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
 #: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:451
+#: addressbook/gui/widgets/e-minicard.c:452
 msgid "Error modifying card"
 msgstr "Chyba pri zmene karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:34
 msgid "Success"
-msgstr "Úspech"
+msgstr "�spech"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1649
-#: shell/e-storage.c:503
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1654
+#: shell/e-storage.c:515
 msgid "Unknown error"
-msgstr "Neznáma chyba"
+msgstr "Nezn�ma chyba"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
-msgstr "Prístup zamietnutý"
+msgstr "Pr�stup zamietnut�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card not found"
-msgstr "Karta nenájdená"
+msgstr "Karta nen�jden�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card ID already exists"
-msgstr "ID karty už existuje"
+msgstr "ID karty u� existuje"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Protocol not supported"
-msgstr "Protokol nepodporovaný"
+msgstr "Protokol nepodporovan�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
 #: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
@@ -2334,19 +2432,19 @@ msgstr "Protokol nepodporovaný"
 #: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
-msgstr "Zrušený"
+msgstr "Zru�en�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Other error"
-msgstr "Iná chyba"
+msgstr "In� chyba"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:59
 msgid "Error adding list"
-msgstr "Chyba pri pridávaní zoznamu"
+msgstr "Chyba pri prid�van� zoznamu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:59
 msgid "Error adding card"
-msgstr "Chyba pri pridávaní karty"
+msgstr "Chyba pri prid�van� karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:68
 msgid "Error modifying list"
@@ -2354,140 +2452,91 @@ msgstr "Chyba pri zmene zoznamu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error removing list"
-msgstr "Chyba pri odstraňovaní zoznamu"
+msgstr "Chyba pri odstra�ovan� zoznamu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1159
+#: addressbook/gui/widgets/e-addressbook-view.c:1248
 msgid "Error removing card"
-msgstr "Chyba pri odstraňovaní karty"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+msgstr "Chyba pri odstra�ovan� karty"
+
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:399
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:404
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "* Click here to add a contact *"
-msgstr "* kliknutím pridáte kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:775
-msgid "File As"
-msgstr "Uložiť ako"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:777
-msgid "Email"
-msgstr "E-mail"
+msgstr "* Kliknut�m prid�te kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Primary Phone"
-msgstr "Primárny telefón"
+msgstr "Prim�rny telef�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Assistant Phone"
-msgstr "Asistentov telefón"
+msgstr "Asistentov telef�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "Business Phone"
-msgstr "Telefón do zamestania"
+msgstr "Telef�n do zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Callback Phone"
-msgstr "Spätné volanie"
+msgstr "Sp�tn� volanie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Company Phone"
-msgstr "Firemný felefón"
+msgstr "Firemn� felef�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Home Phone"
-msgstr "Telefón domov"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:784
-msgid "Organization"
-msgstr "Organizácia"
+msgstr "Telef�n domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Business Address"
 msgstr "Adresa zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Home Address"
 msgstr "Adresa domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Mobile Phone"
 msgstr "Mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Car Phone"
-msgstr "Telefón v aute"
+msgstr "Telef�n v aute"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Business Phone 2"
-msgstr "Telefón do zamestnania 2"
+msgstr "Telef�n do zamestnania 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Home Phone 2"
-msgstr "Telefón domov 2"
+msgstr "Telef�n domov 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Other Phone"
-msgstr "Iný telefón"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:799
-msgid "TTY"
-msgstr "TTY"
+msgstr "In� telef�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Other Address"
-msgstr "Iná adresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:803
-msgid "Web Site"
-msgstr "WWW stránka"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:804
-msgid "Department"
-msgstr "Oddelenie"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:805
-msgid "Office"
-msgstr "Pracovisko"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:806
-msgid "Title"
-msgstr "Titul"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:807
-msgid "Profession"
-msgstr "Povolanie"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:808
-msgid "Manager"
-msgstr "Vedúci"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:810
-msgid "Nickname"
-msgstr "Prezývka"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:811
-msgid "Spouse"
-msgstr "Manžel(ka)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:812
-msgid "Note"
-msgstr "Poznámka"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-msgid "Free-busy URL"
-msgstr "Voľno/zaneprázdnený URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1156
-msgid "Done."
-msgstr "Hotovo."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1188
-msgid "Removing cards..."
-msgstr "Odstraňujem karty..."
+msgstr "In� adresa"
 
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
-msgstr "Uložiť do adresára"
+msgstr "Ulo�i� do adres�ra"
 
 #: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
@@ -2499,9 +2548,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"V tomto pohľade nie je čo ukázať\n"
+"V tomto poh�ade nie je �o uk�za�\n"
 "\n"
-"Dvojitým kliknutím vytvoríte nový kontakt."
+"Dvojit�m kliknut�m vytvor�te nov� kontakt."
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
@@ -2517,7 +2566,7 @@ msgstr "8 bd. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
-msgstr "Prázdnych strán na konci:"
+msgstr "Pr�zdnych str�n na konci:"
 
 #: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
@@ -2525,7 +2574,7 @@ msgstr "Telo"
 
 #: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
-msgstr "Spodný:"
+msgstr "Spodn�:"
 
 #: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
@@ -2533,59 +2582,59 @@ msgstr "Rozmery:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr "_Písmo..."
+msgstr "_P�smo..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
-msgstr "Písma"
+msgstr "P�sma"
 
 #: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
-msgstr "Pätička:"
+msgstr "P�ti�ka:"
 
 #: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
-msgstr "Formát"
+msgstr "Form�t"
 
 #: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
-msgstr "Hlavička"
+msgstr "Hlavi�ka"
 
 #: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
-msgstr "Hlavička/Pätička"
+msgstr "Hlavi�ka/P�ti�ka"
 
 #: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
-msgstr "Hlavičky"
+msgstr "Hlavi�ky"
 
 #: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
-msgstr "Hlavičky pre každý list"
+msgstr "Hlavi�ky pre ka�d� list"
 
 #: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
-msgstr "Výška:"
+msgstr "V��ka:"
 
 #: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
-msgstr "Okamžite jeden za druhým"
+msgstr "Okam�ite jeden za druh�m"
 
 #: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
-msgstr "Vložiť:"
+msgstr "Vlo�i�:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
-msgstr "Na šírku"
+msgstr "Na ��rku"
 
 #: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
-msgstr "Ľavý:"
+msgstr "�av�:"
 
 #: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
-msgstr "Záložky písmen na okraji"
+msgstr "Z�lo�ky p�smen na okraji"
 
 #: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
@@ -2593,7 +2642,7 @@ msgstr "Okraje"
 
 #: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
-msgstr "Počet stĺpcov:"
+msgstr "Po�et st�pcov:"
 
 #: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
@@ -2601,7 +2650,7 @@ msgstr "Nastavenie"
 
 #: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
-msgstr "Orientácia"
+msgstr "Orient�cia"
 
 #: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
@@ -2609,7 +2658,7 @@ msgstr "Strana"
 
 #: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
-msgstr "Nastavenie stránky:"
+msgstr "Nastavenie str�nky:"
 
 #: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
@@ -2621,47 +2670,47 @@ msgstr "Zdroj papiera:"
 
 #: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
-msgstr "Na výšku"
+msgstr "Na v��ku"
 
 #: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
-msgstr "Náhľad:"
+msgstr "N�h�ad:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
-msgstr "Tlačiť v stupňoch šedej"
+msgstr "Tla�i� v stup�och �edej"
 
 #: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
-msgstr "Opačne na párnych stránkach"
+msgstr "Opa�ne na p�rnych str�nkach"
 
 #: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
-msgstr "Pravý:"
+msgstr "Prav�:"
 
 #: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
-msgstr "Časti:"
+msgstr "�asti:"
 
 #: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
-msgstr "Tieňovanie"
+msgstr "Tie�ovanie"
 
 #: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
-msgstr "Veľkosť:"
+msgstr "Ve�kos�:"
 
 #: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
-msgstr "Začať na novej stránke"
+msgstr "Za�a� na novej str�nke"
 
 #: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
-msgstr "Meno štýlu:"
+msgstr "Meno �t�lu:"
 
 #: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
-msgstr "Vrchný:"
+msgstr "Vrchn�:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
@@ -2669,122 +2718,122 @@ msgstr "Typ:"
 
 #: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
-msgstr "Šírka:"
+msgstr "��rka:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr "_Písmo..."
+msgstr "_P�smo..."
 
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1092
 msgid "Print cards"
-msgstr "Tlačiť karty"
+msgstr "Tla�i� karty"
 
-#: addressbook/printing/e-contact-print.c:1111
-#: addressbook/printing/e-contact-print.c:1133
+#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1134
 msgid "Print card"
-msgstr "Tlačiť kartu"
+msgstr "Tla�i� kartu"
 
 #: addressbook/printing/e-contact-print-envelope.c:216
 #: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
-msgstr "Tlačiť obálku"
+msgstr "Tla�i� ob�lku"
 
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
-msgstr "Chyba pri komunikácii s kalendárovým serverom"
+msgstr "Chyba pri komunik�cii s kalend�rov�m serverom"
 
 #: calendar/conduits/calendar/calendar-conduit.c:839
 #: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
-msgstr "Nie je možné prečítať blok aplikácie Calendar pilota"
+msgstr "Nie je mo�n� pre��ta� blok aplik�cie Calendar pilota"
 
 #: calendar/conduits/todo/todo-conduit.c:653
 #: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
-msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
+msgstr "Nie je mo�n� pre��ta� blok aplik�cie ToDo pilota"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
 msgid "A sample Bonobo control which displays an calendar."
-msgstr "Ukážkový ovládací prvok Bonobo pre zobrazenie kalendára."
+msgstr "Uk�kov� ovl�dac� prvok Bonobo pre zobrazenie kalend�ra."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 msgid "Evolution calendar executive summary component."
-msgstr "Komponent Súhrn kalendára Evolution."
+msgstr "Komponent S�hrn kalend�ra Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Prehliadač iTip/mTip kalendára Evolution"
+msgstr "Prehliada� iTip/mTip kalend�ra Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution component for handling the calendar."
-msgstr "Komponent Evolution pre prácu s kalendárom."
+msgstr "Komponent Evolution pre pr�cu s kalend�rom."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Factory for the Calendar Summary component."
-msgstr "Vytváracie rozhranie pre komponent Súhrnu kalendára."
+msgstr "Vytv�racie rozhranie pre komponent S�hrnu kalend�ra."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Vytváracie rozhranie pre komponent Kalendár Evolution."
+msgid "Factory for the calendar iTip view control"
+msgstr "Vytv�racie rozhranie pre ovl�dac� prvok poh�adu iTip kalend�ra"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Vytváracie rozhranie pre ovládací prvok pohľadu iTip kalendára"
+msgid "Factory for the sample Calendar control"
+msgstr "Vytv�racie rozhranie pre uk�kov� ovl�dac� prvok Kalend�r."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Kalendár."
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Vytv�racie rozhranie pre centraliz�ciu komponent Kalend�r Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Vytváracie rozhranie pre centralizáciu komponent Kalendár Evolution."
+msgid "Factory to create a component editor factory"
+msgstr "Vytv�racie rozhranie pre vytv�racie rozhrania komponentu editor"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
-msgstr "Služba upozorňovania na poplachy"
+msgstr "Slu�ba upozor�ovania na poplachy"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
 msgid "Factory for the alarm notification service"
-msgstr "Vytváracie rozhranie pre službu na upozornenie na poplach"
+msgstr "Vytv�racie rozhranie pre slu�bu na upozornenie na poplach"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
-msgstr "Upozornenie na schôdzku začínajúcu o %s a končiacu o %s"
+msgstr "Upozornenie na sch�dzku za��naj�cu o %s a kon�iacu o %s"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
-msgstr "Upozornenie na schôdzku začínajúcu o %s"
+msgstr "Upozornenie na sch�dzku za��naj�cu o %s"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
-msgstr "Upozornenie na schôdzku končiacu o %s"
+msgstr "Upozornenie na sch�dzku kon�iacu o %s"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
-msgstr "Upozornenie na schôdzku"
+msgstr "Upozornenie na sch�dzku"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
-msgstr "Upozornenie na úlohu začínajúcu o %s a končiacu o %s"
+msgstr "Upozornenie na �lohu za��naj�cu o %s a kon�iacu o %s"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, c-format
 msgid "Notification about your task starting on %s"
-msgstr "Upozornenie na úlohu začínajúcu o %s"
+msgstr "Upozornenie na �lohu za��naj�cu o %s"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, c-format
 msgid "Notification about your task ending on %s"
-msgstr "Upozornenie na úlohu končiacu o %s"
+msgstr "Upozornenie na �lohu kon�iacu o %s"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
-msgstr "Upozornenie na úlohu"
+msgstr "Upozornenie na �lohu"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
@@ -2793,37 +2842,37 @@ msgstr "Poplach o %A %b %d %Y %H:%M"
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
-msgstr "_Zavrieť"
+msgstr "_Zavrie�"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Snoo_ze"
-msgstr "O_pakovať"
+msgstr "O_pakova�"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
-msgstr "Čas opakovania (minúty)"
+msgstr "�as opakovania (min�ty)"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "_Edit appointment"
-msgstr "_Upraviť schôdzku"
+msgstr "_Upravi� sch�dzku"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:487
+#: calendar/gui/alarm-notify/alarm-queue.c:606
 msgid "No description available."
-msgstr "Popis nie je k dispozícii."
+msgstr "Popis nie je k dispoz�cii."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:700
-#: calendar/gui/alarm-notify/alarm-queue.c:999
-#: calendar/gui/alarm-notify/alarm-queue.c:1055
+#: calendar/gui/alarm-notify/alarm-queue.c:825
+#: calendar/gui/alarm-notify/alarm-queue.c:1124
+#: calendar/gui/alarm-notify/alarm-queue.c:1180
 msgid "Reminder of your appointment at "
-msgstr "Pripomenúť schôdzku o "
+msgstr "Pripomen�� sch�dzku o "
 
-#: calendar/gui/alarm-notify/alarm-queue.c:991
+#: calendar/gui/alarm-notify/alarm-queue.c:1116
 msgid "Snooze"
-msgstr "Opakovať"
+msgstr "Opakova�"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1004
-#: calendar/gui/alarm-notify/alarm-queue.c:1059
+#: calendar/gui/alarm-notify/alarm-queue.c:1129
+#: calendar/gui/alarm-notify/alarm-queue.c:1184
 msgid "Ok"
 msgstr "Ok"
 
@@ -2832,74 +2881,73 @@ msgstr "Ok"
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
-msgstr "Je to %s. Práve teraz je unixový čas %ld. Možno ste to chceli vedieť."
+msgstr "Je to %s. Pr�ve teraz je unixov� �as %ld. Mo�no ste to chceli vedie�."
 
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
-msgstr "Nie je možné inicializovať GNOME"
+msgstr "Nie je mo�n� inicializova� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:106
 msgid "Could not initialize gnome-vfs"
-msgstr "Nie je možné inicializovať gnome-vfs"
+msgstr "Nie je mo�n� inicializova� gnome-vfs"
 
 #: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
-msgstr "Nie je možné vytvoriť vytváracie rozhranie pre službu upozorňovania"
+msgstr "Nie je mo�n� vytvori� vytv�racie rozhranie pre slu�bu upozor�ovania"
 
-#: calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:426
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:429 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:431 calendar/gui/calendar-commands.c:436
+#: calendar/gui/calendar-commands.c:438
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:447
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:449 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:464
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:454
 #: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:601
+#: calendar/gui/calendar-commands.c:664
 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 "
+"Nie je mo�n� vytvori� kalend�rov� poh�ad. Pros�m, overte nastavenie ORBit a "
 "OAF."
 
 #: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
 msgid "Private"
-msgstr "Súkromný"
+msgstr "S�kromn�"
 
 #: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
 #: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
-msgstr "Tajný"
+msgstr "Tajn�"
 
 #: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
 msgid "Public"
-msgstr "Verejný"
+msgstr "Verejn�"
 
 #: calendar/gui/calendar-model.c:454
 msgid "N"
@@ -2919,38 +2967,38 @@ msgstr "Z"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
 msgid "High"
-msgstr "Vysoká"
+msgstr "Vysok�"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
 msgid "Normal"
-msgstr "Normálny"
+msgstr "Norm�lny"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
 msgid "Low"
-msgstr "Nízka"
+msgstr "N�zka"
 
 #: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
 #: calendar/gui/e-calendar-table.c:380
 msgid "Free"
-msgstr "Voľný"
+msgstr "Vo�n�"
 
 #: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
-msgstr "Zaneprázdnený"
+msgstr "Zanepr�zdnen�"
 
 #: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
-msgstr "Nezačal"
+msgstr "Neza�al"
 
 #: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
 #: calendar/gui/dialogs/task-details-page.glade.h:7
@@ -2959,20 +3007,20 @@ msgid "In Progress"
 msgstr "Prebieha"
 
 #: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
-msgstr "Dokončený"
+msgstr "Dokon�en�"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:323
 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:842 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:332
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -2983,7 +3031,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Dátum musí byť vo formáte:\n"
+"D�tum mus� by� vo form�te:\n"
 "\n"
 "%s"
 
@@ -2993,35 +3041,35 @@ msgid ""
 "\n"
 "45.436845,125.862501"
 msgstr ""
-"Geografické miesto musí byť zadané vo formáte:\n"
+"Geografick� miesto mus� by� zadan� vo form�te:\n"
 "\n"
 "45.436845,125.862501"
 
 #: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Percentuálna hodnota musí byť medzi 0 až 100"
+msgstr "Percentu�lna hodnota mus� by� medzi 0 a� 100"
 
 #: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "Priorita musí byť 'Vysoká', 'Normálna', 'Nízka' alebo 'Nedefinovaná'."
+msgstr "Priorita mus� by� 'Vysok�', 'Norm�lna', 'N�zka' alebo 'Nedefinovan�'."
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1105
 #: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
-msgstr "Nedefinovaná"
+msgstr "Nedefinovan�"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1452
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:360
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1430
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:49
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
 #: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
-msgstr "Žiadna"
+msgstr "�iadna"
 
 #: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
@@ -3029,31 +3077,31 @@ msgstr "Opakovanie"
 
 #: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
-msgstr "Priradené"
+msgstr "Priraden�"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1187
-#: calendar/gui/dialogs/meeting-page.c:1283
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:637
+#: calendar/gui/dialogs/meeting-page.c:647
+#: calendar/gui/dialogs/meeting-page.c:1179
+#: calendar/gui/dialogs/meeting-page.c:1286
 msgid "Yes"
-msgstr "Áno"
+msgstr "�no"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1284
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:649
+#: calendar/gui/dialogs/meeting-page.c:1287
 msgid "No"
 msgstr "Nie"
 
 #: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
 msgid "Day View"
-msgstr "Deň"
+msgstr "De�"
 
 #: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
 msgid "Work Week View"
-msgstr "Pracovný týždeň"
+msgstr "Pracovn� t��de�"
 
 #: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
 msgid "Week View"
-msgstr "Týždeň"
+msgstr "T��de�"
 
 #: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
 msgid "Month View"
@@ -3061,7 +3109,7 @@ msgstr "Mesiac"
 
 #: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
-msgstr "Súhrn obsahuje"
+msgstr "S�hrn obsahuje"
 
 #: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
@@ -3069,51 +3117,71 @@ msgstr "Popis obsahuje"
 
 #: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
-msgstr "Komentár obsahuje"
+msgstr "Koment�r obsahuje"
 
 #: calendar/gui/cal-search-bar.c:416
 msgid "Unmatched"
-msgstr "Nenájdené"
+msgstr "Nen�jden�"
+
+#: calendar/gui/component-factory.c:61 my-evolution/my-evolution.glade.h:6
+#: shell/e-shortcuts.c:1057
+msgid "Calendar"
+msgstr "Kalend�r"
+
+#: calendar/gui/component-factory.c:62
+msgid "Folder containing appointments and events"
+msgstr "Prie�inok obsahuj�ci sch�dzky a udalosti"
+
+#: calendar/gui/component-factory.c:66 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-shortcuts.c:1060 views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "�lohy"
+
+#: calendar/gui/component-factory.c:67
+msgid "Folder containing to-do items"
+msgstr "Prie�inok obsahuj�ci �lohy to-do"
 
-#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:512 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
-msgstr "Vytvoriť novú schôdzku"
+msgstr "Vytvori� nov� sch�dzku"
 
-#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#: calendar/gui/component-factory.c:513 calendar/gui/e-day-view.c:3420
 msgid "New _Appointment"
-msgstr "Nová _schôdzka"
+msgstr "Nov� _sch�dzka"
 
-#: calendar/gui/component-factory.c:408 ui/evolution-tasks.xml.h:4
+#: calendar/gui/component-factory.c:518 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
-msgstr "Vytvorí novú úlohu"
+msgstr "Vytvor� nov� �lohu"
 
-#: calendar/gui/component-factory.c:409
+#: calendar/gui/component-factory.c:519
 msgid "New _Task"
-msgstr "Nová ú_loha"
+msgstr "Nov� �_loha"
 
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
-msgstr "URI, ktoré bude kalendár zobrazovať"
+msgstr "URI, ktor� bude kalend�r zobrazova�"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
-msgstr "Zvukové alarmy"
+msgstr "Zvukov� alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
-msgstr "Alarmy správami"
+msgstr "Alarmy spr�vami"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
-msgstr "Poštové alarmy"
+msgstr "Po�tov� alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
-msgstr "Programové alarmy"
+msgstr "Programov� alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
-msgstr "Neznáme alarmy"
+msgstr "Nezn�me alarmy"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:1
 msgid "Alarm Repeat"
@@ -3121,145 +3189,145 @@ msgstr "Opakovanie alarmu"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "FIXME: mail alarm options"
-msgstr "FIXME: možnosti alarmu poštou"
+msgstr "FIXME: mo�nosti alarmu po�tou"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
-msgstr "Zobrazovaná správa"
+msgstr "Zobrazovan� spr�va"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
-msgstr "Prehrať zvuk:"
+msgstr "Prehra� zvuk:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
-msgstr "Opakovať alarm"
+msgstr "Opakova� alarm"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
-msgstr "Spustiť program:"
+msgstr "Spusti� program:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
-msgstr "S týmito argumentami:"
+msgstr "S t�mito argumentami:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 msgid "days"
-msgstr "dní"
+msgstr "dn�"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "extra times every"
-msgstr "extra oprakovanie každých"
+msgstr "extra oprakovanie ka�d�ch"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 msgid "hours"
-msgstr "hodín"
+msgstr "hod�n"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
-msgstr "minút"
+msgstr "min�t"
 
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d days"
-msgstr "%d dní"
+msgstr "%d dn�"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 day"
-msgstr "1 deň"
+msgstr "1 de�"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d weeks"
-msgstr "%d týždňov"
+msgstr "%d t��d�ov"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:311
 msgid "1 week"
-msgstr "1 týždeň"
+msgstr "1 t��de�"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:314
 #, c-format
 msgid "%d hours"
-msgstr "%d hodín"
+msgstr "%d hod�n"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:316
 msgid "1 hour"
 msgstr "1 hodina"
 
-#: calendar/gui/dialogs/alarm-page.c:347
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d minutes"
-msgstr "%d minút"
+msgstr "%d min�t"
 
-#: calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:321
 msgid "1 minute"
-msgstr "1 minúta"
+msgstr "1 min�ta"
 
-#: calendar/gui/dialogs/alarm-page.c:352
+#: calendar/gui/dialogs/alarm-page.c:324
 #, c-format
 msgid "%d seconds"
-msgstr "%d sekúnd"
+msgstr "%d sek�nd"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:351
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
-msgstr "Prehrať zvuk"
+msgstr "Prehra� zvuk"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:355
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
-msgstr "Zobraziť správu"
+msgstr "Zobrazi� spr�vu"
 
-#: calendar/gui/dialogs/alarm-page.c:387
+#: calendar/gui/dialogs/alarm-page.c:359
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
-msgstr "Poslať e-mail"
+msgstr "Posla� e-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:363
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
-msgstr "Spustiť program"
+msgstr "Spusti� program"
 
-#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
-#: calendar/gui/dialogs/meeting-page.c:601
-#: calendar/gui/dialogs/meeting-page.c:636
-#: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1255
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/alarm-page.c:369 calendar/gui/dialogs/alarm-page.c:405
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:693
+#: calendar/gui/dialogs/meeting-page.c:1258
+#: calendar/gui/dialogs/meeting-page.c:1274
 #: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
-msgstr "Neznámy"
+msgstr "Nezn�my"
 
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "before start of appointment"
-msgstr "pred začiatkom schôdzky"
+msgstr "pred za�iatkom sch�dzky"
 
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:384
 msgid "after start of appointment"
-msgstr "po začiatku schôdzky"
+msgstr "po za�iatku sch�dzky"
 
-#: calendar/gui/dialogs/alarm-page.c:422
+#: calendar/gui/dialogs/alarm-page.c:394
 msgid "before end of appointment"
-msgstr "pred koncom schôdzky"
+msgstr "pred koncom sch�dzky"
 
-#: calendar/gui/dialogs/alarm-page.c:425
+#: calendar/gui/dialogs/alarm-page.c:397
 msgid "after end of appointment"
-msgstr "po konci schôdzky"
+msgstr "po konci sch�dzky"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
-msgstr "Základné"
+msgstr "Z�kladn�"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
-msgstr "Dátum a čas:"
+msgstr "D�tum a �as:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
@@ -3269,11 +3337,11 @@ msgstr "Pripomenutia"
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
-msgstr "Súhrn:"
+msgstr "S�hrn:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
-msgstr "_Možnosti..."
+msgstr "_Mo�nosti..."
 
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
@@ -3286,59 +3354,59 @@ msgstr "pred"
 #: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
-msgstr "dňa/í"
+msgstr "d�a/�"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
-msgstr "koniec schôdzky"
+msgstr "koniec sch�dzky"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
-msgstr "hodín"
+msgstr "hod�n"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:114
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:116
 msgid "minute(s)"
-msgstr "minút"
+msgstr "min�t"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
-msgstr "začiatok schôdzky"
+msgstr "za�iatok sch�dzky"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
-msgstr "05 minút"
+msgstr "05 min�t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
-msgstr "10 minút"
+msgstr "10 min�t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "15 minutes"
-msgstr "15 minút"
+msgstr "15 min�t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
-msgstr "30 minút"
+msgstr "30 min�t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
-msgstr "60 minút"
+msgstr "60 min�t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "Calendar and Tasks Settings"
-msgstr "Nastavenie kalendára a úloh"
+msgstr "Nastavenie kalend�ra a �loh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
-msgstr "Farba pre nestihnuté úlohy"
+msgstr "Farba pre nestihnut� �lohy"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for tasks due today"
-msgstr "Farba pre úlohy do dnešného dňa"
+msgstr "Farba pre �lohy do dne�n�ho d�a"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Create new appointments with a default _reminder"
-msgstr "Vytvoriť novú schôdzku so štandardným _pripomenutím"
+msgstr "Vytvori� nov� sch�dzku so �tandardn�m _pripomenut�m"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
@@ -3346,59 +3414,59 @@ msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "First day of wee_k:"
-msgstr "_Prvý deň týždňa:"
+msgstr "_Prv� de� t��d�a:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:969
+#: calendar/gui/dialogs/recurrence-page.c:950
 msgid "Friday"
 msgstr "Piatok"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Hide completed tasks after"
-msgstr "Skryť dokončené úlohy po"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Hours"
 msgstr "Hodiny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
-msgstr "Minúty"
+msgstr "Min�ty"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.c:946
 msgid "Monday"
 msgstr "Pondelok"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "O_verdue tasks:"
+msgstr "�lohy _po term�ne:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:970
+#: calendar/gui/dialogs/recurrence-page.c:951
 msgid "Saturday"
 msgstr "Sobota"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Show appointment _end times in week and month views"
-msgstr "Zobraziť _koncové časy schôdzok v týždennom a mesačnom pohľade"
+msgstr "Zobrazi� _koncov� �asy sch�dzok v t��dennom a mesa�nom poh�ade"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
-msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
+msgstr "Zobrazi� ��_sla t��d�ov v navig�rovi d�tumov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Sta_rt of day:"
-msgstr "_Začiatok dňa:"
+msgstr "_Za�iatok d�a:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Su_n"
 msgstr "_Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/recurrence-page.c:952
 msgid "Sunday"
-msgstr "Nedeľa"
+msgstr "Nede�a"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
-msgstr "Š_tv"
+msgstr "�_tv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "T_ue"
@@ -3406,59 +3474,59 @@ msgstr "_Ut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Tas_ks due today:"
-msgstr "Úlohy s _dnešným termínom:"
+msgstr "�lohy s _dne�n�m term�nom:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/recurrence-page.c:949
 msgid "Thursday"
-msgstr "Štvrtok"
+msgstr "�tvrtok"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
-msgstr "Čas"
+msgstr "�as"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time _zone:"
-msgstr "Časová _zóna:"
+msgstr "�asov� _z�na:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Time di_visions:"
-msgstr "Ro_zdelenie času:"
+msgstr "Ro_zdelenie �asu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
-msgstr "Formát času:"
+msgstr "Form�t �asu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:947
 msgid "Tuesday"
 msgstr "Utorok"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/recurrence-page.c:948
 msgid "Wednesday"
 msgstr "Streda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
-msgstr "Pracovný týždeň"
+msgstr "Pracovn� t��de�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_12 hour (AM/PM)"
-msgstr "_12-hodinový (am/pm)"
+msgstr "_12-hodinov� (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
-msgstr "_24 hodín"
+msgstr "_24 hod�n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
-msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
+msgstr "_P�ta� sa na potvrdenie pri odstra�ovan�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Compress weekends in month view"
-msgstr "Z_hustiť víkendy v mesačnom pohľade"
+msgstr "Z_husti� v�kendy v mesa�nom poh�ade"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
@@ -3466,7 +3534,7 @@ msgstr "_Zobrazenie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_End of day:"
-msgstr "_Koniec dňa:"
+msgstr "_Koniec d�a:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
@@ -3474,19 +3542,19 @@ msgstr "P_ia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_General"
-msgstr "_Všeobecné"
+msgstr "_V�eobecn�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Mon"
-msgstr "_Pon"
+msgid "_Hide completed tasks after"
+msgstr "_Skry� dokon�en� �lohy po"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Other"
-msgstr "_Iné"
+msgid "_Mon"
+msgstr "_Pon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Overdue tasks:"
-msgstr "Úlohy _po termíne:"
+msgid "_Other"
+msgstr "_In�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
@@ -3494,7 +3562,7 @@ msgstr "_So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Task List"
-msgstr "_Zoznam úloh"
+msgstr "_Zoznam �loh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Wed"
@@ -3502,67 +3570,67 @@ msgstr "_Str"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "before the start of the appointment"
-msgstr "pred začiatkom schôdzky"
+msgstr "pred za�iatkom sch�dzky"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
-msgstr "Stav stretnutia sa zmenil. Chcete poslať aktualizovanú verziu?"
+msgstr "Stav stretnutia sa zmenil. Chcete posla� aktualizovan� verziu?"
 
 #: calendar/gui/dialogs/cancel-comp.c:58
 msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
+msgstr "Naozaj chcete zru�i� a odstr�ni� toto stretnutie?"
 
 #: calendar/gui/dialogs/cancel-comp.c:63
 msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Naozaj chcete zrušiť a odstrániť túto úlohu?"
+msgstr "Naozaj chcete zru�i� a odstr�ni� t�to �lohu?"
 
 #: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
+msgstr "Naozaj chcete zru�i� a odstr�ni� t�to polo�ku denn�ka?"
 
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
-msgstr "Táto udalosť bola odstránená."
+msgstr "T�to udalos� bola odstr�nen�."
 
 #: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
-msgstr "Táto úloha bola odstránená."
+msgstr "T�to �loha bola odstr�nen�."
 
 #: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
-msgstr "Táto položka denníka bola odstránená."
+msgstr "T�to polo�ka denn�ka bola odstr�nen�."
 
 #: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Urobili ste zmeny. Zahodiť ich a zatvoriť editor?"
+msgstr "%s  Urobili ste zmeny. Zahodi� ich a zatvori� editor?"
 
 #: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  Neurobili ste žiadne zmeny, zatvoriť editor?"
+msgstr "%s  Neurobili ste �iadne zmeny, zatvori� editor?"
 
 #: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
-msgstr "Táto udalosť bola zmenená."
+msgstr "T�to udalos� bola zmenen�."
 
 #: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
-msgstr "Táto úloha bola zmenená."
+msgstr "T�to �loha bola zmenen�."
 
 #: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
-msgstr "Táto položka denníka bola zmenená."
+msgstr "T�to polo�ka denn�ka bola zmenen�."
 
 #: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
+msgstr "%s  Urobili ste zmeny. Zahodi� ich a aktualizova� editor?"
 
 #: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
+msgstr "%s  Neurobili ste �iadne zmeny. Aktualizova� editor?"
 
 #: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
@@ -3570,129 +3638,123 @@ msgstr "u do "
 
 #: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
-msgstr " (Dokončený "
+msgstr " (Dokon�en� "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
-msgstr "Dokončený "
+msgstr "Dokon�en� "
 
 #: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
-msgstr " (Termín do "
+msgstr " (Term�n do "
 
 #: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
-msgstr "Termín do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
-#: shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Kontakty"
+msgstr "Term�n do "
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:469
 msgid "Edit Appointment"
-msgstr "Upraviť schôdzku"
+msgstr "Upravi� sch�dzku"
 
-#: calendar/gui/dialogs/comp-editor.c:464
+#: calendar/gui/dialogs/comp-editor.c:474
 #, c-format
 msgid "Appointment - %s"
-msgstr "Schôdzka - %s"
+msgstr "Sch�dzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:477
 #, c-format
 msgid "Task - %s"
-msgstr "Úloha - %s"
+msgstr "�loha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:480
 #, c-format
 msgid "Journal entry - %s"
-msgstr "Položka denníka - %s"
+msgstr "Polo�ka denn�ka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:484
+#: calendar/gui/dialogs/comp-editor.c:494
 msgid "No summary"
-msgstr "Žiadny súhrn"
+msgstr "�iadny s�hrn"
 
-#: calendar/gui/dialogs/comp-editor.c:854 mail/mail-callbacks.c:1486
-#: mail/mail-display.c:99
+#: calendar/gui/dialogs/comp-editor.c:860 mail/mail-callbacks.c:1524
+#: mail/mail-display.c:100
 msgid "Overwrite file?"
-msgstr "Prepísať súbor?"
+msgstr "Prep�sa� s�bor?"
 
-#: calendar/gui/dialogs/comp-editor.c:858 mail/mail-callbacks.c:1492
-#: mail/mail-display.c:103
+#: calendar/gui/dialogs/comp-editor.c:864 mail/mail-callbacks.c:1530
+#: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
-"Súbor s týmto menom už existuje\n"
-"Prepísať ho?"
+"S�bor s t�mto menom u� existuje\n"
+"Prep�sa� ho?"
 
-#: calendar/gui/dialogs/comp-editor.c:921 ui/evolution-comp-editor.xml.h:15
+#: calendar/gui/dialogs/comp-editor.c:927 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
-msgstr "Uložiť ako..."
+msgstr "Ulo�i� ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/dialogs/comp-editor.c:1080
 msgid "Unable to obtain current version!"
-msgstr "Nepodarilo sa získať aktuálnu verziu!"
+msgstr "Nepodarilo sa z�ska� aktu�lnu verziu!"
 
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
+msgstr "Naozaj chcete odstr�ni� sch�dzku `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Naozaj chcete odstrániť túto schôdzku bez mena?"
+msgstr "Naozaj chcete odstr�ni� t�to sch�dzku bez mena?"
 
 #: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Naozaj chcete odstrániť úlohu `%s'?"
+msgstr "Naozaj chcete odstr�ni� �lohu `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
-msgstr "Naozaj chcete odstrániť úlohu bez mena?"
+msgstr "Naozaj chcete odstr�ni� �lohu bez mena?"
 
 #: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
+msgstr "Naozaj chcete odstr�ni� polo�ku denn�ka `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Naozaj chcete odstrániť položku denníka bez mena?"
+msgstr "Naozaj chcete odstr�ni� polo�ku denn�ka bez mena?"
 
 #: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
-msgstr "Naozaj chcete odstrániť %d schôdzok?"
+msgstr "Naozaj chcete odstr�ni� %d sch�dzok?"
 
 #: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
-msgstr "Naozaj chcete odstrániť %d úloh?"
+msgstr "Naozaj chcete odstr�ni� %d �loh?"
 
 #: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Naozaj chcete odstrániť %d položiek denníka?"
+msgstr "Naozaj chcete odstr�ni� %d polo�iek denn�ka?"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
-msgstr "Adresár..."
+msgstr "Adres�r..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
-msgstr "Delegovať na:"
+msgstr "Delegova� na:"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
-msgstr "Zadajte na koho delegovať"
+msgstr "Zadajte na koho delegova�"
 
 #: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
-msgstr "Schôdzka"
+msgstr "Sch�dzka"
 
 #: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
@@ -3709,194 +3771,194 @@ msgstr "Stretnutie"
 
 #: calendar/gui/dialogs/event-page.glade.h:1
 msgid "A_ll day event"
-msgstr "_Celodenná udalosť"
+msgstr "_Celodenn� udalos�"
 
 #: calendar/gui/dialogs/event-page.glade.h:2
 msgid "B_usy"
-msgstr "_Zaneprázdnený"
+msgstr "_Zanepr�zdnen�"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
-msgstr "Klasifikácia"
+msgstr "Klasifik�cia"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Con_fidential"
-msgstr "_Tajné"
+msgstr "_Tajn�"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
-msgstr "Dátum a čas"
+msgstr "D�tum a �as"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 msgid "F_ree"
-msgstr "_Voľné"
+msgstr "_Vo�n�"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
 #: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
-msgstr "_Súkromné"
+msgstr "_S�kromn�"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
-msgstr "_Verejné"
+msgstr "_Verejn�"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
-msgstr "Zobraziť čas ako"
+msgstr "Zobrazi� �as ako"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
-msgstr "_Súhrn:"
+msgstr "_S�hrn:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
-msgstr "Čas _konca:"
+msgstr "�as _konca:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
-msgstr "Čas _začiatku:"
+msgstr "�as _za�iatku:"
 
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1251
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:585
+#: calendar/gui/dialogs/meeting-page.c:1175
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Individual"
-msgstr "Individuálne"
+msgstr "Individu�lne"
 
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:587
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:589
+#: calendar/gui/dialogs/meeting-page.c:1256
 msgid "Resource"
 msgstr "Zdroj"
 
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:591
+#: calendar/gui/dialogs/meeting-page.c:1257
 msgid "Room"
-msgstr "Miestnosť"
+msgstr "Miestnos�"
 
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Chair"
 msgstr "Predseda"
 
-#: calendar/gui/dialogs/meeting-page.c:613
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:622
+#: calendar/gui/dialogs/meeting-page.c:1177
+#: calendar/gui/dialogs/meeting-page.c:1271
 msgid "Required Participant"
-msgstr "Vyžadovaný účastník"
+msgstr "Vy�adovan� ��astn�k"
 
-#: calendar/gui/dialogs/meeting-page.c:615
-#: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:624
+#: calendar/gui/dialogs/meeting-page.c:1272
 msgid "Optional Participant"
-msgstr "Nepovinný účastník"
+msgstr "Nepovinn� ��astn�k"
 
-#: calendar/gui/dialogs/meeting-page.c:617
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:1273
 msgid "Non-Participant"
-msgstr "Bez účasti"
+msgstr "Bez ��asti"
 
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1193
-#: calendar/gui/dialogs/meeting-page.c:1296
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:678
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1299
 msgid "Needs Action"
-msgstr "Potrebné úkony"
+msgstr "Potrebn� �kony"
 
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
+#: calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:680
+#: calendar/gui/dialogs/meeting-page.c:1300
 msgid "Accepted"
-msgstr "Akceptované"
+msgstr "Akceptovan�"
 
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
+#: calendar/gui/dialogs/meeting-page.c:659
+#: calendar/gui/dialogs/meeting-page.c:682
+#: calendar/gui/dialogs/meeting-page.c:1301
 msgid "Declined"
-msgstr "Odmietnuté"
+msgstr "Odmietnut�"
 
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1299
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:684
+#: calendar/gui/dialogs/meeting-page.c:1302
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
-msgstr "Predbežný"
+msgstr "Predbe�n�"
 
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1300
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1303
 msgid "Delegated"
-msgstr "Delegované"
+msgstr "Delegovan�"
 
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
 msgid "In Process"
 msgstr "Prebieha"
 
-#: calendar/gui/dialogs/meeting-page.c:737
+#: calendar/gui/dialogs/meeting-page.c:729
 msgid "That person is already attending the meeting!"
-msgstr "Táto osoba sa už zúčastňuje!"
+msgstr "T�to osoba sa u� z��ast�uje!"
 
-#: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:780
+#: calendar/gui/dialogs/meeting-page.c:834
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:842
-#: calendar/gui/dialogs/meeting-page.c:962
+#: calendar/gui/dialogs/meeting-page.c:782
+#: calendar/gui/dialogs/meeting-page.c:834
+#: calendar/gui/dialogs/meeting-page.c:954
 msgid "Required Participants"
-msgstr "Vyžadovaný účastníci"
+msgstr "Vy�adovan� ��astn�ci"
 
-#: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:784
+#: calendar/gui/dialogs/meeting-page.c:834
 msgid "Optional Participants"
-msgstr "Nepovinný účastníci"
+msgstr "Nepovinn� ��astn�ci"
 
-#: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:786
+#: calendar/gui/dialogs/meeting-page.c:834
 msgid "Non-Participants"
-msgstr "Bez účasti"
+msgstr "Bez ��asti"
 
-#: calendar/gui/dialogs/meeting-page.c:920
+#: calendar/gui/dialogs/meeting-page.c:912
 msgid "Sent By:"
-msgstr "Poslané:"
+msgstr "Poslan�:"
 
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:1478
 msgid "_Delegate To..."
-msgstr "_Delegovať na..."
+msgstr "_Delegova� na..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 msgid "Attendee"
-msgstr "Účastník"
+msgstr "��astn�k"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 msgid "Common Name"
-msgstr "Spoločé meno"
+msgstr "Spolo�� meno"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 msgid "Delegated From"
-msgstr "Delegované od"
+msgstr "Delegovan� od"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 msgid "Delegated To"
-msgstr "Delegované na"
+msgstr "Delegovan� na"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 msgid "Language"
@@ -3904,7 +3966,7 @@ msgstr "Jazyk"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 msgid "Member"
-msgstr "Člen"
+msgstr "�len"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 msgid "RSVP"
@@ -3921,7 +3983,7 @@ msgid "Status"
 msgstr "Stav"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:84
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -3929,64 +3991,64 @@ msgstr "Typ"
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
-msgstr "Organizátor:"
+msgstr "Organiz�tor:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "_Change Organizer"
-msgstr "_Zmeniť organizátora"
+msgstr "_Zmeni� organiz�tora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
 msgid "_Invite Others"
-msgstr "_Pozvať ostatných"
+msgstr "_Pozva� ostatn�ch"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
-msgstr "_Iný organizátor"
+msgstr "_In� organiz�tor"
 
-#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:417 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:584
+#: calendar/gui/dialogs/recurrence-page.c:565
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
+msgstr "T�to sch�dzka obsahuje opakovanie, ktor� Evolution nedok�e upravi�."
 
-#: calendar/gui/dialogs/recurrence-page.c:938
+#: calendar/gui/dialogs/recurrence-page.c:919
 msgid "on"
-msgstr "zapnutá"
+msgstr "zapnut�"
 
-#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:945 filter/filter-datespec.c:83
 msgid "day"
-msgstr "deň"
+msgstr "de�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1083
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1275
+#: calendar/gui/dialogs/recurrence-page.c:1256
 msgid "occurrences"
-msgstr "výskytov"
+msgstr "v�skytov"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
-msgstr "_Pridať"
+msgstr "_Prida�"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
-msgstr "Každých"
+msgstr "Ka�d�ch"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
-msgstr "Výnimky"
+msgstr "V�nimky"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Preview"
-msgstr "Ukážka"
+msgstr "Uk�ka"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
@@ -3994,27 +4056,27 @@ msgstr "Pravidlo opakovania"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "_Custom recurrence"
-msgstr "_Vlastné opakovanie"
+msgstr "_Vlastn� opakovanie"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
-msgstr "_Upraviť"
+msgstr "_Upravi�"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_No recurrence"
-msgstr "_Neopakovať"
+msgstr "_Neopakova�"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Simple recurrence"
-msgstr "_Jednoduché opakovanie"
+msgstr "_Jednoduch� opakovanie"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
-msgstr "počas"
+msgstr "po�as"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "forever"
-msgstr "navždy"
+msgstr "nav�dy"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:17
 msgid "month(s)"
@@ -4022,11 +4084,11 @@ msgstr "mesiaca/ov"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
-msgstr "pokým"
+msgstr "pok�m"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
-msgstr "týždňov"
+msgstr "t��d�ov"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
@@ -4034,36 +4096,36 @@ msgstr "rokov"
 
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
-msgstr "Chcete uložiť zmeny?"
+msgstr "Chcete ulo�i� zmeny?"
 
 #: calendar/gui/dialogs/send-comp.c:56
 msgid "The meeting information has changed. Send an updated version?"
-msgstr "Informácia o schôdzke sa zmenila. Chcete poslať upravenú verziu?"
+msgstr "Inform�cia o sch�dzke sa zmenila. Chcete posla� upraven� verziu?"
 
 #: calendar/gui/dialogs/send-comp.c:61
 msgid "The task information has changed. Send an updated version?"
-msgstr "Informácia o úlohe sa zmenila. Chcete poslať upravenú verziu?"
+msgstr "Inform�cia o �lohe sa zmenila. Chcete posla� upraven� verziu?"
 
 #: calendar/gui/dialogs/send-comp.c:66
 msgid "The journal entry has changed. Send an updated version?"
-msgstr "Položka záznamu sa zmenila. Chcete poslať upravenú verziu?"
+msgstr "Polo�ka z�znamu sa zmenila. Chcete posla� upraven� verziu?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
-msgstr "% hotových"
+msgstr "% hotov�ch"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Date Completed:"
-msgstr "Dátum dokončenia:"
+msgstr "D�tum dokon�enia:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Priebeh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:897
+#: my-evolution/e-summary-preferences.c:896
 msgid "URL:"
 msgstr "URL:"
 
@@ -4088,15 +4150,15 @@ msgstr "Popis:"
 
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
-msgstr "_Počiatočný dátum:"
+msgstr "_Po�iato�n� d�tum:"
 
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Confidential"
-msgstr "_Tajné"
+msgstr "_Tajn�"
 
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
-msgstr "_Termín:"
+msgstr "_Term�n:"
 
 #: calendar/gui/e-calendar-table.c:350
 #, c-format
@@ -4153,58 +4215,57 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1284
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
+#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1283
+#: shell/e-shortcuts-view.c:383
 msgid "_Open"
-msgstr "_Otvoriť"
+msgstr "_Otvori�"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
+#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
-msgstr "Vystri_hnúť"
+msgstr "Vystri_hn��"
 
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:11
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
-msgstr "_Kopírovať"
+msgstr "_Kop�rova�"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
-#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:36 ui/evolution-tasks.xml.h:13
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
+#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
+#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
-msgstr "_Vložiť"
+msgstr "_Vlo�i�"
 
 #: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
-msgstr "_Označiť ako dokončenú"
+msgstr "_Ozna�i� ako dokon�en�"
 
 #: calendar/gui/e-calendar-table.c:865
 msgid "_Delete this Task"
-msgstr "O_dstrániť túto úlohu"
+msgstr "O_dstr�ni� t�to �lohu"
 
 #: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
-msgstr "_Označiť úlohy ako dokončené"
+msgstr "_Ozna�i� �lohy ako dokon�en�"
 
 #: calendar/gui/e-calendar-table.c:870
 msgid "_Delete Selected Tasks"
-msgstr "O_dstrániť vybrané úlohy"
+msgstr "O_dstr�ni� vybran� �lohy"
 
 #: calendar/gui/e-calendar-table.c:1130
 msgid "Click to add a task"
-msgstr "Kliknutím pridáte úlohu"
+msgstr "Kliknut�m prid�te �lohu"
 
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategórie"
-
 #: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
 #: camel/camel-filter-driver.c:815
 msgid "Complete"
@@ -4212,19 +4273,19 @@ msgstr "Hotovo"
 
 #: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
-msgstr "Dátum dokončenia"
+msgstr "D�tum dokon�enia"
 
 #: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
-msgstr "Termín"
+msgstr "Term�n"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
-msgstr "Dátum konca"
+msgstr "D�tum konca"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
-msgstr "Geografické umiestnenie"
+msgstr "Geografick� umiestnenie"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
@@ -4232,16 +4293,19 @@ msgstr "Priorita"
 
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
-msgstr "Dátum štartu"
+msgstr "D�tum �tartu"
 
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-storage-set-view.c:1464
-#: shell/e-summary-storage.c:78
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1051
+#: shell/e-storage-set-view.c:1479
 msgid "Summary"
-msgstr "Súhrn"
+msgstr "S�hrn"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
-msgstr "Triedenie úloh"
+msgstr "Triedenie �loh"
 
 #: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
@@ -4250,239 +4314,239 @@ msgstr "URL"
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
-msgstr "%02i rozdelení minúty"
+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:285 calendar/gui/e-day-view.c:1354
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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:293 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
 #: 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:588 calendar/gui/e-week-view.c:324
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
 #: calendar/gui/print.c:759
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
 #: calendar/gui/print.c:761
 msgid "pm"
-msgstr "popoludní"
+msgstr "popoludn�"
 
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
 msgid "New All Day _Event"
-msgstr "Nová celodenná _udalosť"
+msgstr "Nov� celodenn� _udalos�"
 
-#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
-#: ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
-msgstr "Prejsť na d_nešný dátum"
+msgstr "Prejs� na d_ne�n� d�tum"
 
-#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
 msgid "_Go to Date..."
-msgstr "_Prejsť na dátum..."
+msgstr "_Prejs� na d�tum..."
 
-#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
+#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
 msgid "_Delete this Appointment"
-msgstr "O_dstrániť túto schôdzku"
+msgstr "O_dstr�ni� t�to sch�dzku"
 
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
+#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
 msgid "Make this Occurrence _Movable"
-msgstr "Nastaviť tento výskyt ako _presunuteľný"
+msgstr "Nastavi� tento v�skyt ako _presunute�n�"
 
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
 msgid "Delete this _Occurrence"
-msgstr "Odstrániť tento vý_skyt"
+msgstr "Odstr�ni� tento v�_skyt"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
 msgid "Delete _All Occurrences"
-msgstr "Odstrániť _všetky výskyty"
+msgstr "Odstr�ni� _v�etky v�skyty"
 
 #: calendar/gui/e-itip-control.c:617
 #, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> poslal informácie o stretnutí."
+msgstr "<b>%s</b> poslal inform�cie o stretnut�."
 
 #: calendar/gui/e-itip-control.c:618
 msgid "Meeting Information"
-msgstr "Informácie o stretnutí"
+msgstr "Inform�cie o stretnut�"
 
 #: calendar/gui/e-itip-control.c:622
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> vyžaduje vašu účasť na stretnutí."
+msgstr "<b>%s</b> vy�aduje va�u ��as� na stretnut�."
 
 #: calendar/gui/e-itip-control.c:623
 msgid "Meeting Proposal"
-msgstr "Návrh na stretnutie"
+msgstr "N�vrh na stretnutie"
 
 #: calendar/gui/e-itip-control.c:627
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> si praje byť pridaný do existujúceho stretnutia."
+msgstr "<b>%s</b> si praje by� pridan� do existuj�ceho stretnutia."
 
 #: calendar/gui/e-itip-control.c:628
 msgid "Meeting Update"
-msgstr "Aktualizácia stretnutia"
+msgstr "Aktualiz�cia stretnutia"
 
 #: calendar/gui/e-itip-control.c:632
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> požaduje najnovšie informácie o stretnutí."
+msgstr "<b>%s</b> po�aduje najnov�ie inform�cie o stretnut�."
 
 #: calendar/gui/e-itip-control.c:633
 msgid "Meeting Update Request"
-msgstr "Požiadavka na aktualizáciu stretnutia"
+msgstr "Po�iadavka na aktualiz�ciu stretnutia"
 
 #: calendar/gui/e-itip-control.c:637
 #, c-format
-msgid "<b>%s</b> has replyed to a meeting request."
-msgstr "<b>%s</b> odpovedal požiadavku na stretnutie."
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> odpovedal na po�iadavku na stretnutie."
 
 #: calendar/gui/e-itip-control.c:638
 msgid "Meeting Reply"
-msgstr "Odpoveď na stretnutie"
+msgstr "Odpove� na stretnutie"
 
 #: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> zrušil stretnutie."
+msgstr "<b>%s</b> zru�il stretnutie."
 
 #: calendar/gui/e-itip-control.c:643
 msgid "Meeting Cancellation"
-msgstr "Zrušenie stretnutia"
+msgstr "Zru�enie stretnutia"
 
 #: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
 #: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> poslal neplatnú správu."
+msgstr "<b>%s</b> poslal neplatn� spr�vu."
 
 #: calendar/gui/e-itip-control.c:648
 msgid "Bad Meeting Message"
-msgstr "Neplatná správa o stretnutí"
+msgstr "Neplatn� spr�va o stretnut�"
 
 #: calendar/gui/e-itip-control.c:665
 #, c-format
 msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> poslal informácie o úlohe."
+msgstr "<b>%s</b> poslal inform�cie o �lohe."
 
 #: calendar/gui/e-itip-control.c:666
 msgid "Task Information"
-msgstr "Informácia o úlohe"
+msgstr "Inform�cia o �lohe"
 
 #: calendar/gui/e-itip-control.c:670
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> požaduje, aby ste vykonali úlohu."
+msgstr "<b>%s</b> po�aduje, aby ste vykonali �lohu."
 
 #: calendar/gui/e-itip-control.c:671
 msgid "Task Proposal"
-msgstr "Návrh na úlohu"
+msgstr "N�vrh na �lohu"
 
 #: calendar/gui/e-itip-control.c:675
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
+msgstr "<b>%s</b> si praje by� pridan� do existuj�cej �lohy."
 
 #: calendar/gui/e-itip-control.c:676
 msgid "Task Update"
-msgstr "Aktualizácia úlohy"
+msgstr "Aktualiz�cia �lohy"
 
 #: calendar/gui/e-itip-control.c:680
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> si praje dostať najnovšie informácie o úlohe."
+msgstr "<b>%s</b> si praje dosta� najnov�ie inform�cie o �lohe."
 
 #: calendar/gui/e-itip-control.c:681
 msgid "Task Update Request"
-msgstr "Požiadavka na aktualizáciu úlohy"
+msgstr "Po�iadavka na aktualiz�ciu �lohy"
 
 #: calendar/gui/e-itip-control.c:685
 #, c-format
-msgid "<b>%s</b> has replyed to a task assignment."
-msgstr "<b>%s</b> odpovedal na priradenie úlohy."
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> odpovedal na priradenie �lohy."
 
 #: calendar/gui/e-itip-control.c:686
 msgid "Task Reply"
-msgstr "Odpoveď na úlohu"
+msgstr "Odpove� na �lohu"
 
 #: calendar/gui/e-itip-control.c:690
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> zrušil úlohu."
+msgstr "<b>%s</b> zru�il �lohu."
 
 #: calendar/gui/e-itip-control.c:691
 msgid "Task Cancellation"
-msgstr "Zrušenie úlohy"
+msgstr "Zru�enie �lohy"
 
 #: calendar/gui/e-itip-control.c:696
 msgid "Bad Task Message"
-msgstr "Neplatná správa o úlohe"
+msgstr "Neplatn� spr�va o �lohe"
 
 #: calendar/gui/e-itip-control.c:713
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> oznámil informácie o voľnom čase."
+msgstr "<b>%s</b> ozn�mil inform�cie o vo�nom �ase."
 
 #: calendar/gui/e-itip-control.c:714
 msgid "Free/Busy Information"
-msgstr "Informácie o voľnom čase"
+msgstr "Inform�cie o vo�nom �ase"
 
 #: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> požaduje informáciu o vašom voľnom čase."
+msgstr "<b>%s</b> po�aduje inform�ciu o va�om vo�nom �ase."
 
 #: calendar/gui/e-itip-control.c:719
 msgid "Free/Busy Request"
-msgstr "Požiadavka na voľný čas"
+msgstr "Po�iadavka na vo�n� �as"
 
 #: calendar/gui/e-itip-control.c:723
 #, c-format
-msgid "<b>%s</b> has replyed to a free/busy request."
-msgstr "<b>%s</b> odpovedal na požiadavku na voľný čas."
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> odpovedal na po�iadavku na vo�n� �as."
 
 #: calendar/gui/e-itip-control.c:724
 msgid "Free/Busy Reply"
-msgstr "Odpoveď o voľnom čase"
+msgstr "Odpove� o vo�nom �ase"
 
 #: calendar/gui/e-itip-control.c:729
 msgid "Bad Free/Busy Message"
-msgstr "Neplatná správa o voľnom čase"
+msgstr "Neplatn� spr�va o vo�nom �ase"
 
 #: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
-msgstr "Nie je možné aktualizovať váš súbor s kalendárom!\n"
+msgstr "Nie je mo�n� aktualizova� v� s�bor s kalend�rom!\n"
 
 #: calendar/gui/e-itip-control.c:942
 msgid "Update complete\n"
-msgstr "Aktualizácia dokončená\n"
+msgstr "Aktualiz�cia dokon�en�\n"
 
 #: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
-msgstr "Nie je možné odstrániť položku zo súboru s kalendárom!\n"
+msgstr "Nie je mo�n� odstr�ni� polo�ku zo s�boru s kalend�rom!\n"
 
 #: calendar/gui/e-itip-control.c:969
 msgid "Removal Complete"
-msgstr "Odstránenie dokončené"
+msgstr "Odstr�nenie dokon�en�"
 
 #: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
 msgid "Item sent!\n"
-msgstr "Položka poslaná!\n"
+msgstr "Polo�ka poslan�!\n"
 
 #: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
-msgid "The item could not be send!\n"
-msgstr "Položku nie je možné poslať!\n"
+msgid "The item could not be sent!\n"
+msgstr "Polo�ku nie je mo�n� posla�!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4495,59 +4559,59 @@ msgstr "--do--"
 
 #: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
-msgstr "Správa kalendára"
+msgstr "Spr�va kalend�ra"
 
 #: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
-msgstr "Dátum:"
+msgstr "D�tum:"
 
 #: calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
-msgstr "Načítavam kalendár"
+msgstr "Na��tavam kalend�r"
 
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
-msgstr "Načítavam kalendár..."
+msgstr "Na��tavam kalend�r..."
 
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
-msgstr "Správa serveru:"
+msgstr "Spr�va serveru:"
 
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
-msgstr "dátum konca"
+msgstr "d�tum konca"
 
 #: calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
-msgstr "dátum začiatku"
+msgstr "d�tum za�iatku"
 
 #: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
-msgstr "Nepodarilo sa načítať úlohy v `%s'"
+msgstr "Nepodarilo sa na��ta� �lohy v `%s'"
 
 #: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
-msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
+msgstr "Met�dy potrebn� pre na��tanie `%s' nie je podporovan�"
 
-#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
 msgid "New _Appointment..."
-msgstr "Nová _schôdzka..."
+msgstr "Nov� _sch�dzka..."
 
-#: calendar/gui/gnome-cal.c:1258
+#: calendar/gui/gnome-cal.c:1318
 #, c-format
 msgid "Could not open the folder in `%s'"
-msgstr "Nie je možné otvoriť priečinok v `%s'"
+msgstr "Nie je mo�n� otvori� prie�inok v `%s'"
 
-#: calendar/gui/gnome-cal.c:1269
+#: calendar/gui/gnome-cal.c:1329
 #, c-format
 msgid "The method required to open `%s' is not supported"
-msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
+msgstr "Met�da nutn� k otvoreniu `%s' nie je podporovan�"
 
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
-msgstr "Apríl"
+msgstr "Apr�l"
 
 #: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
@@ -4559,27 +4623,27 @@ msgstr "December"
 
 #: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
-msgstr "Február"
+msgstr "Febru�r"
 
 #: calendar/gui/goto-dialog.glade.h:5
 msgid "Go To Date"
-msgstr "Prejsť na dátum"
+msgstr "Prejs� na d�tum"
 
 #: calendar/gui/goto-dialog.glade.h:6
 msgid "Go To Today"
-msgstr "Prejsť na dnešný dátum"
+msgstr "Prejs� na dne�n� d�tum"
 
 #: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
-msgstr "Január"
+msgstr "Janu�r"
 
 #: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
-msgstr "Júl"
+msgstr "J�l"
 
 #: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
-msgstr "Jún"
+msgstr "J�n"
 
 #: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
@@ -4587,7 +4651,7 @@ msgstr "Marec"
 
 #: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
-msgstr "Máj"
+msgstr "M�j"
 
 #: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
@@ -4595,15 +4659,19 @@ msgstr "November"
 
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
-msgstr "Október"
+msgstr "Okt�ber"
 
 #: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:254
 msgid "An organizer must be set."
-msgstr "Organizátor musí byť nastavený."
+msgstr "Organiz�tor mus� by� nastaven�."
+
+#: calendar/gui/main.c:92
+msgid "Could not create the component editor factory"
+msgstr "Nie je mo�n� vytvori� vytv�racie rozhranie pre komponent editora"
 
 #: calendar/gui/print.c:422
 msgid "1st"
@@ -4747,7 +4815,7 @@ msgstr "St"
 
 #: calendar/gui/print.c:491
 msgid "Th"
-msgstr "Št"
+msgstr "�t"
 
 #: calendar/gui/print.c:491
 msgid "Fr"
@@ -4757,16 +4825,10 @@ msgstr "Pi"
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-local-storage.c:180
-#: shell/e-shortcuts.c:1025 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Úlohy"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
-msgstr "Vybraný deň (%a %b %d %Y)"
+msgstr "Vybran� de� (%a %b %d %Y)"
 
 #: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
@@ -4779,48 +4841,47 @@ msgstr "%a %d %Y"
 #: calendar/gui/print.c:1846
 #, c-format
 msgid "Selected week (%s - %s)"
-msgstr "Vybraný týždeň (%s - %s)"
+msgstr "Vybran� t��de� (%s - %s)"
 
 #. Month
 #: calendar/gui/print.c:1854
 msgid "Selected month (%b %Y)"
-msgstr "Vybraný mesiac (%b - %Y)"
+msgstr "Vybran� mesiac (%b - %Y)"
 
 #. Year
 #: calendar/gui/print.c:1861
 msgid "Selected year (%Y)"
-msgstr "Vybraný rok (%Y)"
+msgstr "Vybran� rok (%Y)"
 
 #: calendar/gui/print.c:2200
 msgid "Print Calendar"
-msgstr "Tlačiť kalendár"
+msgstr "Tla�i� kalend�r"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1895 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-comp-editor.xml.h:10
-#: ui/evolution-mail-message.xml.h:64
+#: mail/mail-callbacks.c:1933 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
-msgstr "Ukážka pred tlačou"
+msgstr "Uk�ka pred tla�ou"
 
 #: calendar/gui/print.c:2317
 msgid "Print Item"
-msgstr "Tlačiť položku"
+msgstr "Tla�i� polo�ku"
 
 #: calendar/gui/print.c:2398
 msgid "Print Setup"
-msgstr "Nastavenie tlačiarne"
+msgstr "Nastavenie tla�iarne"
 
 #: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
-msgstr "URI, ktoré bude zobrazovať priečinok úloh"
+msgstr "URI, ktor� bude zobrazova� prie�inok �loh"
 
 #: calendar/gui/tasks-migrate.c:106
 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."
+"Evolution automaticky previedol �lohy z prie�inku kalend�ra do nov�ho "
+"prie�inku �loh."
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -4829,9 +4890,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."
+"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
@@ -4839,8 +4900,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."
+"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
@@ -4848,128 +4909,132 @@ 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."
+"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:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
-msgstr "NPUSŠPS"
+msgstr "NPUS�PS"
 
-#: calendar/pcs/query.c:218
+#: calendar/pcs/query.c:230
 msgid "time-now expects 0 arguments"
-msgstr "time-now neočakáva žiadne argumenty"
+msgstr "time-now neo�ak�va �iadne argumenty"
 
-#: calendar/pcs/query.c:242
+#: calendar/pcs/query.c:254
 msgid "make-time expects 1 argument"
-msgstr "make-time očakáva 1 argument"
+msgstr "make-time o�ak�va 1 argument"
 
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:259
 msgid "make-time expects argument 1 to be a string"
-msgstr "make-time očakáva ako prvý argument reťazec"
+msgstr "make-time o�ak�va ako prv� argument re�azec"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:267
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "make-time očakáva prvý argument reťazec dátumu/času podľa ISO 8601"
+msgstr "make-time o�ak�va prv� argument re�azec d�tumu/�asu pod�a ISO 8601"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:296
 msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day očakáva dva argumenty"
+msgstr "time-add-day o�ak�va dva argumenty"
 
-#: calendar/pcs/query.c:289
+#: calendar/pcs/query.c:301
 msgid "time-add-day expects argument 1 to be a time_t"
-msgstr "time-add-day očakáva ako prvý argument time_t"
+msgstr "time-add-day o�ak�va ako prv� argument time_t"
 
-#: calendar/pcs/query.c:296
+#: calendar/pcs/query.c:308
 msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day očakáva ako druhý argument celé číslo"
+msgstr "time-add-day o�ak�va ako druh� argument cel� ��slo"
 
-#: calendar/pcs/query.c:323
+#: calendar/pcs/query.c:335
 msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin očakáva jeden argument"
+msgstr "time-day-begin o�ak�va jeden argument"
 
-#: calendar/pcs/query.c:328
+#: calendar/pcs/query.c:340
 msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-begin očakáva ako prvý argument time_t"
+msgstr "time-day-begin o�ak�va ako prv� argument time_t"
 
-#: calendar/pcs/query.c:355
+#: calendar/pcs/query.c:367
 msgid "time-day-end expects 1 argument"
-msgstr "time-day-end očakáva jeden argument"
+msgstr "time-day-end o�ak�va jeden argument"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:372
 msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-day-end očakáva ako prvý argument time_t"
+msgstr "time-day-end o�ak�va ako prv� argument time_t"
 
-#: calendar/pcs/query.c:396
+#: calendar/pcs/query.c:408
 msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype neočakáva argumenty"
+msgstr "get-vtype neo�ak�va argumenty"
 
-#: calendar/pcs/query.c:492
+#: calendar/pcs/query.c:504
 msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? očakáva dva argumenty"
+msgstr "occur-in-time-range? o�ak�va dva argumenty"
 
-#: calendar/pcs/query.c:497
+#: calendar/pcs/query.c:509
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr "occur-in-time-range? očakáva ako prvý argument time_t"
+msgstr "occur-in-time-range? o�ak�va ako prv� argument time_t"
 
-#: calendar/pcs/query.c:504
+#: calendar/pcs/query.c:516
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr "occur-in-time-range? očakáva ako druhý argument time_t"
+msgstr "occur-in-time-range? o�ak�va ako druh� argument time_t"
 
-#: calendar/pcs/query.c:634
+#: calendar/pcs/query.c:646
 msgid "contains? expects 2 arguments"
-msgstr "contains? očakáva dva argumenty"
+msgstr "contains? o�ak�va dva argumenty"
 
-#: calendar/pcs/query.c:639
+#: calendar/pcs/query.c:651
 msgid "contains? expects argument 1 to be a string"
-msgstr "contains? očakáva ako prvý argument reťazec"
+msgstr "contains? o�ak�va ako prv� argument re�azec"
 
-#: calendar/pcs/query.c:646
+#: calendar/pcs/query.c:658
 msgid "contains? expects argument 2 to be a string"
-msgstr "contains? očakáva ako druhý argument reťazec"
+msgstr "contains? o�ak�va ako druh� argument re�azec"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:675
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
-"contains? očakáva ako prvý argument jednu z hodnôt \"any\", \"summary\", "
+"contains? o�ak�va ako prv� argument jednu z hodn�t \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:705
+#: calendar/pcs/query.c:717
 msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? očakáva aspoň jeden argument"
+msgstr "has-categories? o�ak�va aspo� jeden argument"
 
-#: calendar/pcs/query.c:717
+#: calendar/pcs/query.c:729
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
-"has-categories? očakáva ako všetky argumenty reťazce alebo presne jeden "
+"has-categories? o�ak�va ako v�etky argumenty re�azce alebo presne jeden "
 "argument boolean nepravu (#f)"
 
-#: calendar/pcs/query.c:967
+#: calendar/pcs/query.c:817
+msgid "is-completed? expects 0 arguments"
+msgstr "is-completed? neo�ak�va �iadne argumenty"
+
+#: calendar/pcs/query.c:1085
 msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr "Vyhodnotenie výrazu pre hľadanie neskončilo pravdivostnou hodnotou"
+msgstr "Vyhodnotenie v�razu pre h�adanie neskon�ilo pravdivostnou hodnotou"
 
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
-msgstr "Digitálny podpis nie je podporovaný touto šifrou"
+msgstr "Digit�lny podpis nie je podporovan� touto �ifrou"
 
 #: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
-msgstr "Digitálny podpis v čistom texte nie je podporovaný touto šifrou"
+msgstr "Digit�lny podpis v �istom texte nie je podporovan� touto �ifrou"
 
 #: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
-msgstr "Overenie podpisu nie je podporované touto šifrou"
+msgstr "Overenie podpisu nie je podporovan� touto �ifrou"
 
 #: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
-msgstr "Šifrovanie nie je podporované touto šifrou"
+msgstr "�ifrovanie nie je podporovan� touto �ifrou"
 
 #: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
-msgstr "Dešifrovanie nie je podporované touto šifrou"
+msgstr "De�ifrovanie nie je podporovan� touto �ifrou"
 
 #: camel/camel-disco-diary.c:181
 #, c-format
@@ -4978,9 +5043,9 @@ msgid ""
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"Nepodarilo sa zapísať záznam: %s\n"
-"Ďalšie operácie na tomto serveri nebudú znovu vykonané\n"
-"pri ďalšom pripojení na sieť."
+"Nepodarilo sa zap�sa� z�znam: %s\n"
+"�al�ie oper�cie na tomto serveri nebud� znovu vykonan�\n"
+"pri �al�om pripojen� na sie�."
 
 #: camel/camel-disco-diary.c:244
 #, c-format
@@ -4989,72 +5054,72 @@ msgid ""
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"Nepodarilo sa otvoriť `%s':\n"
+"Nepodarilo sa otvori� `%s':\n"
 "%s\n"
-"Zmeny v tomto priečinku nebudú zosynchronizované."
+"Zmeny v tomto prie�inku nebud� zosynchronizovan�."
 
 #: camel/camel-disco-diary.c:278
 msgid "Resynchronizing with server"
-msgstr "Obnovujem synchronizáciu so serverom"
+msgstr "Obnovujem synchroniz�ciu so serverom"
 
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
-msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
+msgstr "Pre dokon�enie tejto oper�cie mus�te pracova� on-line"
 
 #: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
-msgstr "Synchronizujem priečinky"
+msgstr "Synchronizujem prie�inky"
 
 #: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
-msgstr "Nie je možné otvoriť priečinok fronty"
+msgstr "Nie je mo�n� otvori� prie�inok fronty"
 
 #: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
-msgstr "Nie je možné spracovať priečinok fronty"
+msgstr "Nie je mo�n� spracova� prie�inok fronty"
 
 #: camel/camel-filter-driver.c:667
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Získavam správu %d (%d%%)"
+msgstr "Z�skavam spr�vu %d (%d%%)"
 
 #: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
 msgid "Failed on message %d"
-msgstr "Zlyhala správa %d"
+msgstr "Zlyhala spr�va %d"
 
 #: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
-msgstr "Nie je možné otvoriť správu"
+msgstr "Nie je mo�n� otvori� spr�vu"
 
 #: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
-msgstr "Synchronizujem priečinok"
+msgstr "Synchronizujem prie�inok"
 
 #: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Získavam správu %d z %d"
+msgstr "Z�skavam spr�vu %d z %d"
 
 #: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
-msgstr "Zlyhanie na správe %d z %d"
+msgstr "Zlyhanie na spr�ve %d z %d"
 
 #: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Chyba pri spracovávaní filtra: %s: %s"
+msgstr "Chyba pri spracov�van� filtra: %s: %s"
 
 #: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "Chyba pri vykonávaní filtra: %s: %s"
+msgstr "Chyba pri vykon�van� filtra: %s: %s"
 
 #: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
+msgstr "Chyba pri vykon�van� h�adania filtra: %s: %s"
 
 #: camel/camel-folder-search.c:328
 #, c-format
@@ -5062,7 +5127,7 @@ msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"Nie je možné spracovať hľadací výraz: %s:\n"
+"Nie je mo�n� spracova� h�adac� v�raz: %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:338
@@ -5071,92 +5136,92 @@ msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
-"Chyba pri vykonávaní hľadacieho výrazu: %s:\n"
+"Chyba pri vykon�van� h�adacieho v�razu: %s:\n"
 "%s"
 
 #: 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"
+msgstr "(odpoved� v�etk�mu) vy�aduje jeden pravdivostn� v�sledok"
 
 #: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
-msgstr "Vykonanie otázky na neznámej hlavičke: %s"
+msgstr "Vykonanie ot�zky na nezn�mej hlavi�ke: %s"
 
 #: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
-msgstr "Neplatný typ v body-contains, očakávam reťazec"
+msgstr "Neplatn� typ v body-contains, o�ak�vam re�azec"
 
 #: camel/camel-lock-client.c:110
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr "Nie je možné vytvoriť pomocnú rúru pre zamykanie: %s"
+msgstr "Nie je mo�n� vytvori� pomocn� r�ru pre zamykanie: %s"
 
 #: camel/camel-lock-client.c:123
 #, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr "Nie je možné spustiť pomocný program pre zámok: %s"
+msgstr "Nie je mo�n� spusti� pomocn� program pre z�mok: %s"
 
 #: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Nepodarilo sa zamknúť '%s': chyba protokolu s lock-helper"
+msgstr "Nepodarilo sa zamkn�� '%s': chyba protokolu s lock-helper"
 
 #: camel/camel-lock-client.c:212
 #, c-format
 msgid "Could not lock '%s'"
-msgstr "Nepodarilo sa zamknúť '%s'"
+msgstr "Nepodarilo sa zamkn�� '%s'"
 
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, 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"
+msgstr "Nie je mo�n� vytvori� s�bor so z�mkom pre %s: %s"
 
 #: camel/camel-lock.c:151
 #, 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."
+msgstr "Vypr�al �as pri pokuse o z�skanie z�mku na %s. Sk�ste to nesk�r."
 
 #: 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"
+msgstr "Nepodarilo sa z�ska� z�mok pomocou fcntl(2): %s"
 
 #: 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"
+msgstr "Nepodarilo sa z�ska� z�mok pomocou flock(2): %s"
 
 #: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "Nie je možné skontrolovať súbor s poštou %s: %s"
+msgstr "Nie je mo�n� skontrolova� s�bor s po�tou %s: %s"
 
 #: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Nie je možné otvoriť súbor s poštou %s: %s"
+msgstr "Nie je mo�n� otvori� s�bor s po�tou %s: %s"
 
 #: camel/camel-movemail.c:130
 #, 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"
+msgstr "Nie je mo�n� otvori� do�asn� s�bor s po�tou %s: %s"
 
 #: camel/camel-movemail.c:159
 #, 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"
+msgstr "Nepodarilo sa ulo�i� po�tu v do�asnom s�bore %s: %s"
 
 #: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "Nie je možné vytvoriť rúru: %s"
+msgstr "Nie je mo�n� vytvori� r�ru: %s"
 
 #: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
-msgstr "Nie je možné vykonať fork: %s"
+msgstr "Nie je mo�n� vykona� fork: %s"
 
 #: camel/camel-movemail.c:239
 #, c-format
@@ -5165,90 +5230,90 @@ msgstr "Program movemail zlyhal: %s"
 
 #: camel/camel-movemail.c:240
 msgid "(Unknown error)"
-msgstr "(Neznáma chyba)"
+msgstr "(Nezn�ma chyba)"
 
 #: camel/camel-movemail.c:263
 #, c-format
 msgid "Error reading mail file: %s"
-msgstr "Chyba pri čítaní súboru s poštou: %s"
+msgstr "Chyba pri ��tan� s�boru s po�tou: %s"
 
 #: camel/camel-movemail.c:274
 #, c-format
 msgid "Error writing mail temp file: %s"
-msgstr "Chyba pri zápise pošty do dočasného súboru: %s"
+msgstr "Chyba pri z�pise po�ty do do�asn�ho s�boru: %s"
 
 #: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr "Chyba kopírovaní dočasného súboru: pošty %s"
+msgstr "Chyba kop�rovan� do�asn�ho s�boru: po�ty %s"
 
 #: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
-msgstr "Prosím, zadajte vaše %s heslo pre %s"
+msgstr "Pros�m, zadajte va�e %s heslo pre %s"
 
 #: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
-msgstr "Prosím, zadajte vaše %s heslo"
+msgstr "Pros�m, zadajte va�e %s heslo"
 
 #: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
-msgstr "Žiadny čistý text na podpis."
+msgstr "�iadny �ist� text na podpis."
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
+#: camel/camel-pgp-context.c:1079 camel/camel-pgp-context.c:1266
 msgid "No password provided."
-msgstr "Nezadané heslo."
+msgstr "Nezadan� heslo."
 
 #: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
-#: camel/camel-pgp-context.c:1302
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1273
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nie je možné vytvoriť rúru do GPG/PGP: %s"
+msgstr "Nie je mo�n� vytvori� r�ru do GPG/PGP: %s"
 
 #: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
-msgstr "Žiadny čistý text pre pridanie digitálneho podpisu do čistého textu."
+msgstr "�iadny �ist� text pre pridanie digit�lneho podpisu do �ist�ho textu."
 
 #: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
-msgstr "Žiadny čistý text pre overenie."
+msgstr "�iadny �ist� text pre overenie."
 
 #: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
-msgstr "Nie je možné vytvoriť dočasný súbor: %s"
+msgstr "Nie je mo�n� vytvori� do�asn� s�bor: %s"
 
-#: camel/camel-pgp-context.c:1070
+#: camel/camel-pgp-context.c:1069
 msgid "No plaintext to encrypt."
-msgstr "Žiadny čistý text na zašifrovanie."
+msgstr "�iadny �ist� text na za�ifrovanie."
 
-#: camel/camel-pgp-context.c:1096
+#: camel/camel-pgp-context.c:1095
 msgid "No recipients specified"
-msgstr "Neuvedený žiadni adresáti"
+msgstr "Neuveden� �iadni adres�ti"
 
-#: camel/camel-pgp-context.c:1287
+#: camel/camel-pgp-context.c:1258
 msgid "No ciphertext to decrypt."
-msgstr "Žiadny zašifrovaný text na odkódovanie."
+msgstr "�iadny za�ifrovan� text na odk�dovanie."
 
 #: 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é."
+"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"
+msgstr "Nie je mo�n� na��ta� %s: %s"
 
 #: 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."
+msgstr "Nie je mo�n� na��ta� %s: V module nie je inicializa�n� k�d."
 
 #: camel/camel-remote-store.c:191
 #, c-format
@@ -5258,39 +5323,40 @@ msgstr "%s server %s"
 #: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
-msgstr "%s služba pre %s na %s"
+msgstr "%s slu�ba pre %s na %s"
 
 #: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
-msgstr "Spojenie zrušené"
+msgstr "Spojenie zru�en�"
 
 #: camel/camel-remote-store.c:255
 #: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
-msgstr "Nie je možné spojenie s %s (port %d): %s"
+msgstr "Nie je mo�n� spojenie s %s (port %d): %s"
 
 #: camel/camel-remote-store.c:256
 msgid "(unknown host)"
-msgstr "(neznámy hostiteľ)"
+msgstr "(nezn�my hostite�)"
 
-#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:349 camel/camel-remote-store.c:411
+#: camel/camel-remote-store.c:474
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
-msgstr "Operácia zrušená"
+msgstr "Oper�cia zru�en�"
 
-#: camel/camel-remote-store.c:489
-msgid "Server unexpectedly disconnected"
-msgstr "Server neočakávane zrušil spojenie"
+#: camel/camel-remote-store.c:477
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Server neo�ak�vane zru�il spojenie: %s"
 
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
-msgstr "Anonymný"
+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."
+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."
@@ -5302,7 +5368,7 @@ msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Neplatná informácia krokovania e-mailovej adresy:\n"
+"Neplatn� inform�cia krokovania e-mailovej adresy:\n"
 "%s"
 
 #: camel/camel-sasl-anonymous.c:131
@@ -5311,7 +5377,7 @@ msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
-"Neplatná informácia nepriehľadného krokovania:\n"
+"Neplatn� inform�cia neprieh�adn�ho krokovania:\n"
 "%s"
 
 #: camel/camel-sasl-anonymous.c:143
@@ -5320,7 +5386,7 @@ msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
-"Neplatná informácia krokovania:\n"
+"Neplatn� inform�cia krokovania:\n"
 "%s"
 
 #: camel/camel-sasl-cram-md5.c:35
@@ -5332,7 +5398,7 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Táto voľba vás pripojí k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
+"T�to vo�ba v�s pripoj� k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
 "server."
 
 #: camel/camel-sasl-digest-md5.c:43
@@ -5344,32 +5410,32 @@ 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 bezpečného hesla DIGEST-MD5, ak ho "
+"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:810
 msgid "Server challenge too long (>2048 octets)\n"
-msgstr "Správa challenge pre server príliš dlhá (>2048 bajtov)\n"
+msgstr "Spr�va challenge pre server pr�li� dlh� (>2048 bajtov)\n"
 
 #: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
-msgstr "Správa challenge pre server neplatná\n"
+msgstr "Spr�va challenge pre server neplatn�\n"
 
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Správa challenge pre server obsahovala neplatný prvok \"Kvalita ochrany\"\n"
+msgstr "Spr�va challenge pre server obsahovala neplatn� prvok \"Kvalita ochrany\"\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
-msgstr "Odpoveď serveru neobsahovala informáciu o overení\n"
+msgstr "Odpove� serveru neobsahovala inform�ciu o overen�\n"
 
 #: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
-msgstr "Odpoveď serveru obsahovala neúplné údaje o overení\n"
+msgstr "Odpove� serveru obsahovala ne�pln� �daje o overen�\n"
 
 #: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
-msgstr "Odpoveď serveru neodpovedá\n"
+msgstr "Odpove� serveru neodpoved�\n"
 
 #: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
@@ -5377,7 +5443,7 @@ msgstr "Kerberos 4"
 
 #: 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."
+msgstr "T�to vo�ba v�s pripoj� na server pomocou overenia Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -5385,29 +5451,29 @@ msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
-"Nie je možné získať Kerberos ticket:\n"
+"Nie je mo�n� z�ska� Kerberos ticket:\n"
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:485
 msgid "Bad authentication response from server."
-msgstr "Neplatná odpoveď na overenie od serveru."
+msgstr "Neplatn� odpove� na overenie od serveru."
 
 #: camel/camel-sasl-login.c:32
 msgid "NT Login"
-msgstr "Prihlásenie NT"
+msgstr "Prihl�senie NT"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Táto voľba pripojí na server pomocou hesiel prenášaných ako čistý text."
+msgstr "T�to vo�ba pripoj� na server pomocou hesiel pren�an�ch ako �ist� text."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
-msgstr "Neznámy stav overenia."
+msgstr "Nezn�my stav overenia."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Heslo"
 
@@ -5417,72 +5483,72 @@ msgstr "POP pred SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Táto voľba bude prihlasovať POP spojenie pred pokusom o SMTP"
+msgstr "T�to vo�ba bude prihlasova� POP spojenie pred pokusom o SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
-msgstr "Zdrojové URI pre POP"
+msgstr "Zdrojov� URI pre POP"
 
 #: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
-msgstr "Prihlásenie POP pred SMTP pomocou neznámeho transportu"
+msgstr "Prihl�senie POP pred SMTP pomocou nezn�meho transportu"
 
 #: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
-msgstr "Prihlásenie POP pred SMTP nie pomocou zdroja POP"
+msgstr "Prihl�senie POP pred SMTP nie pomocou zdroja POP"
 
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "Preklad regulárneho výrazu zlyhal: %s: %s"
+msgstr "Preklad regul�rneho v�razu zlyhal: %s: %s"
 
 #: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "URL '%s' vyžaduje komponentu používateľského mena"
+msgstr "URL '%s' vy�aduje komponentu pou��vate�sk�ho mena"
 
 #: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "URL '%s' vyžaduje komponentu hostiteľa"
+msgstr "URL '%s' vy�aduje komponentu hostite�a"
 
 #: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr "URL '%s' vyžaduje komponentu cesty"
+msgstr "URL '%s' vy�aduje komponentu cesty"
 
 #: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
-msgstr "Zisťujem adresu: %s"
+msgstr "Zis�ujem adresu: %s"
 
 #: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
-msgstr "Zlyhalo hľadanie mena: %s"
+msgstr "Zlyhalo h�adanie mena: %s"
 
 #: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
-msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
+msgstr "Zlyhalo h�adanie hostite�a: %s: hostite� nen�jden�"
 
 #: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
-msgstr "Zlyhalo hľadanie hostiteľa: %s: neznámy dôvod"
+msgstr "Zlyhalo h�adanie hostite�a: %s: nezn�my d�vod"
 
 #: camel/camel-session.c:68
 msgid "Virtual folder email provider"
-msgstr "Poskytovateľ pošty pre virtuálny priečinok"
+msgstr "Poskytovate� po�ty pre virtu�lny prie�inok"
 
 #: camel/camel-session.c:70
 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"
+msgstr "Pre ��tanie po�ty ako ot�zky na in� mno�inu prie�inkov"
 
 #: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
-msgstr "Pre protokol `%s' nie je k dispozícii poskytovateľ"
+msgstr "Pre protokol `%s' nie je k dispoz�cii poskytovate�"
 
 #: camel/camel-session.c:483
 #, c-format
@@ -5490,45 +5556,45 @@ msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"Nie je možné vytvoriť priečinok %s:\n"
+"Nie je mo�n� vytvori� prie�inok %s:\n"
 "%s"
 
 #: camel/camel-smime-context.c:173
 #, c-format
 msgid "Please enter your password for %s"
-msgstr "Prosím, zadajte vaše heslo pre %s"
+msgstr "Pros�m, zadajte va�e heslo pre %s"
 
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
-msgstr "Prosím, zadajte prezývku certifikátu, ktorým sa má podpísať."
+msgstr "Pros�m, zadajte prez�vku certifik�tu, ktor�m sa m� podp�sa�."
 
 #: camel/camel-smime-context.c:209
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
-msgstr "Podpisový certifikát pre \"%s\" neexistuje."
+msgstr "Podpisov� certifik�t pre \"%s\" neexistuje."
 
 #: camel/camel-smime-context.c:249
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
-msgstr "Šifrovací certifikát pre \"%s\" neexistuje."
+msgstr "�ifrovac� certifik�t pre \"%s\" neexistuje."
 
-#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
-#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
-msgstr "Nepodarilo sa nájsť certifikát pre \"%s\"."
+msgstr "Nepodarilo sa n�js� certifik�t pre \"%s\"."
 
-#: camel/camel-smime-context.c:545
+#: camel/camel-smime-context.c:556
 msgid "Failed to find a common bulk algorithm."
-msgstr "Nepodarilo sa nájsť obvyklý bulk algoritmus."
+msgstr "Nepodarilo sa n�js� obvykl� bulk algoritmus."
 
-#: camel/camel-smime-context.c:799
+#: camel/camel-smime-context.c:810
 msgid "Failed to decode message."
-msgstr "Nepodarilo sa dekódovať správu."
+msgstr "Nepodarilo sa dek�dova� spr�vu."
 
-#: camel/camel-smime-context.c:844
+#: camel/camel-smime-context.c:855
 msgid "Failed to verify certificates."
-msgstr "Nepodarilo sa overiť certifikáty"
+msgstr "Nepodarilo sa overi� certifik�ty"
 
 #: camel/camel-tcp-stream-openssl.c:463
 #, c-format
@@ -5540,7 +5606,7 @@ msgstr ""
 "Pre: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5549,13 +5615,13 @@ msgid ""
 "\n"
 "Do you wish to accept anyway?"
 msgstr ""
-"Neplatný certifikát od %s.\n"
+"Neplatn� certifik�t od %s.\n"
 "\n"
 "%s\n"
 "\n"
-"Chcete ho aj tak akceptovať?"
+"Chcete ho aj tak akceptova�?"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-ssl.c:353
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5567,117 +5633,117 @@ msgid ""
 "Country: %s"
 msgstr ""
 "E-mail: %s\n"
-"Normálne meno: %s\n"
-"Organizačná jednotka: %s\n"
-"Organizácia: %s\n"
+"Norm�lne meno: %s\n"
+"Organiza�n� jednotka: %s\n"
+"Organiz�cia: %s\n"
 "Umiestnenie: %s\n"
-"Štát: %s\n"
+"�t�t: %s\n"
 "Krajina: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
-msgstr "Nie je možné spracovať URL `%s'"
+msgstr "Nie je mo�n� spracova� URL `%s'"
 
 #: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
-msgstr "Taká správa neexistuje %s v %s"
+msgstr "Tak� spr�va neexistuje %s v %s"
 
 #: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
-msgstr "Žiadna taká správa: %s"
+msgstr "�iadna tak� spr�va: %s"
 
 #: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
-msgstr "Nemôžete skopírovať správy z tohto priečinku s odpadkami."
+msgstr "Nem��ete skop�rova� spr�vy z tohto prie�inku s odpadkami."
 
 #: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
+msgstr "Neo�ak�van� odpove� od IMAP serveru: %s"
 
 #: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "IMAP príkaz zlyhal: %s"
+msgstr "IMAP pr�kaz zlyhal: %s"
 
 #: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
-msgstr "Odpoveď serveru skončila príliš skoro."
+msgstr "Odpove� serveru skon�ila pr�li� skoro."
 
 #: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
+msgstr "Odpove� IMAP serveru neobsahovala inform�ciu %s"
 
 #: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Neočakávaná odpoveď OK od IMAP serveru: %s"
+msgstr "Neo�ak�van� odpove� OK od IMAP serveru: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "Nie je možné vytvoriť priečinok %s: %s"
+msgstr "Nie je mo�n� vytvori� prie�inok %s: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
-msgstr "Nie je možné načítať súhrn pre %s"
+msgstr "Nie je mo�n� na��ta� s�hrn pre %s"
 
 #: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
-msgstr "Priečinok bol zničený a znovu vytvorený na serveri."
+msgstr "Prie�inok bol zni�en� a znovu vytvoren� na serveri."
 
 #. Check UIDs and flags of all messages we already know of.
 #: camel/providers/imap/camel-imap-folder.c:435
 msgid "Scanning for changed messages"
-msgstr "Hľadám zmenené správy"
+msgstr "H�ad�m zmenen� spr�vy"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1968
 msgid "This message is not currently available"
-msgstr "Táto správa momentálne nie je k dipozícii"
+msgstr "T�to spr�va moment�lne nie je k dipoz�cii"
 
 #: camel/providers/imap/camel-imap-folder.c:1634
 #: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
-msgstr "Sťahujem súhrnné informácie pre nové správy"
+msgstr "S�ahujem s�hrnn� inform�cie pre nov� spr�vy"
 
 #: camel/providers/imap/camel-imap-folder.c:1640
 msgid "Scanning for new messages"
-msgstr "Hľadám nové správy"
+msgstr "H�ad�m nov� spr�vy"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:2001
 msgid "Could not find message body in FETCH response."
-msgstr "Nie je možné nájsť telo správy v odpovedi FETCH."
+msgstr "Nie je mo�n� n�js� telo spr�vy v odpovedi FETCH."
 
 #: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
-msgstr "Nie je možné otvoriť priečinok pre vyrovnávaciu pamäť: %s"
+msgstr "Nie je mo�n� otvori� prie�inok pre vyrovn�vaciu pam�: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
-msgstr "Kontrolujem novú poštu"
+msgstr "Kontrolujem nov� po�tu"
 
 #: 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"
+msgstr "Kontrolujem nov� po�tu vo v�etk�ch prie�inkoch"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:717
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:750
 msgid "Folders"
-msgstr "Priečinky"
+msgstr "Prie�inky"
 
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
-msgstr "Zobraziť iba prihlásené priečinky"
+msgstr "Zobrazi� iba prihl�sen� prie�inky"
 
 #: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
-msgstr "Predefinovať mená priečinkov zo serveru"
+msgstr "Predefinova� men� prie�inkov zo serveru"
 
 #: camel/providers/imap/camel-imap-provider.c:54
 msgid "Namespace"
@@ -5685,143 +5751,143 @@ 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"
+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"
+msgid "IMAP"
+msgstr "IMAP"
 
 #: 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."
+msgstr "Pre ��tanie a ukladanie po�ty na IMAP serveroch."
 
 #: 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:463
+#: camel/providers/imap/camel-imap-store.c:508
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "Požadovaný spôsob overenia %s nie je podporovaný IMAP serverom %s"
+msgstr "Po�adovan� sp�sob overenia %s nie je podporovan� IMAP serverom %s"
 
-#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/imap/camel-imap-store.c:518
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
-msgstr "Overenie typu %s nie je podporované."
+msgstr "Overenie typu %s nie je podporovan�."
 
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:542
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sProsím, zadajte IMAP heslo pre %s@%s"
+msgstr "%sPros�m, zadajte IMAP heslo pre %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:538
+#: camel/providers/imap/camel-imap-store.c:583
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Nepodarilo sa overiť na IMAP serveri.\n"
+"Nepodarilo sa overi� na IMAP serveri.\n"
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:837 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:882
 #, c-format
 msgid "No such folder %s"
-msgstr "Priečinok %s neexistuje"
+msgstr "Prie�inok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1037
+#: camel/providers/imap/camel-imap-store.c:1083
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Rodičovský priečinok nesmie obsahovať podpriečinky"
+msgstr "Rodi�ovsk� prie�inok nesmie obsahova� podprie�inky"
 
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
-msgstr "Poštové priečinky vo formáte MH"
+msgstr "Po�tov� prie�inky vo form�te MH"
 
 #: camel/providers/local/camel-local-provider.c:41
-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"
+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:50
-msgid "Standard Unix mailbox file"
-msgstr "Štandardný Unixový súbor mailbox"
+msgid "Local delivery"
+msgstr "Lok�lne doru�enie"
 
 #: camel/providers/local/camel-local-provider.c:51
-msgid "For storing local mail in standard mbox format"
-msgstr "Pre ukladanie lokálnej pošty v štandardnom formáte mbox"
+msgid "For retrieving local mail from standard mbox formated spools."
+msgstr "Pre ukladanie lok�lnej po�ty v �tandardnom form�te mbox."
 
 #: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
-msgstr "Poštové súbory vo formáte Qmail maildir"
+msgstr "Po�tov� s�bory vo form�te Qmail maildir"
 
 #: camel/providers/local/camel-local-provider.c:61
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Pre ukladanie lokálnej pošty v priečinkov vo formáte qmail"
+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-provider.c:70
-msgid "Unix mbox spool-format mail files"
-msgstr "Poštové súbory vo formáte mbox"
+msgid "Standard Unix mbox spools"
+msgstr "�tandardn� Unixov� s�bor mbox"
 
 #: camel/providers/local/camel-local-provider.c:71
-msgid "For storing local mail in standard Unix spool directories"
-msgstr "Pre ukladanie lokálnej pošty v priečinkov v štandardnom formáte Unix"
+msgid "For reading and storing local mail in standard mbox spool files."
+msgstr "Pre ��tanie a ukladanie lok�lnej po�ty v prie�inkov v �tandardnom form�te Unix mbox."
 
 #: camel/providers/local/camel-local-store.c:127
 #: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "Koreň ukladania %s nie je absolútna cesta"
+msgstr "Kore� ukladania %s nie je absol�tna cesta"
 
 #: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "Koreň ukladania %s nie je normálny priečinok"
+msgstr "Kore� ukladania %s nie je norm�lny prie�inok"
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "Nie je možné získať priečinok: %s: %s"
+msgstr "Nie je mo�n� z�ska� prie�inok: %s: %s"
 
 #: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
-msgstr "Lokálne ukladanie nemá priečinok pre novú poštu"
+msgstr "Lok�lne ukladanie nem� prie�inok pre nov� po�tu"
 
 #: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
-msgstr "Lokálny poštový súbor %s"
+msgstr "Lok�lny po�tov� s�bor %s"
 
 #: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "Nie je možné premenovať priečinok %s na %s: %s"
+msgstr "Nie je mo�n� premenova� prie�inok %s na %s: %s"
 
 #: camel/providers/local/camel-local-store.c:279
 #, 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"
+msgstr "Nie je mo�n� odstr�ni� s�bor s�hrnu prie�inku `%s': %s"
 
 #: camel/providers/local/camel-local-store.c:289
 #, 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"
+msgstr "Nie je mo�n� odstr�ni� indexov� s�bor prie�inku`%s': %s"
 
 #: camel/providers/local/camel-local-summary.c:417
 #: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Nie je možné pridať správu do súhrnu: neznámy dôvod"
+msgstr "Nie je mo�n� prida� spr�vu do s�hrnu: nezn�my d�vod"
 
 #: camel/providers/local/camel-maildir-folder.c:176
 #, 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"
+msgstr "Nie je mo�n� prida� spr�vu do prie�inku maildir: %s: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
@@ -5836,7 +5902,7 @@ msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
-"Nie je možné získať správu: %s\n"
+"Nie je mo�n� z�ska� spr�vu: %s\n"
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
@@ -5844,12 +5910,12 @@ msgstr ""
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
-msgstr "Taká správa neexistuje"
+msgstr "Tak� spr�va neexistuje"
 
 #: camel/providers/local/camel-maildir-folder.c:222
 #: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
-msgstr "Neplatný obsah správy"
+msgstr "Neplatn� obsah spr�vy"
 
 #: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
@@ -5858,7 +5924,7 @@ msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Nie je možné otvoriť priečinok `%s':\n"
+"Nie je mo�n� otvori� prie�inok `%s':\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:107
@@ -5866,7 +5932,7 @@ msgstr ""
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
-msgstr "Priečinok `%s' neexistuje."
+msgstr "Prie�inok `%s' neexistuje."
 
 #: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
@@ -5875,52 +5941,52 @@ msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
-"Nie je možné vytvoriť priečinok `%s':\n"
+"Nie je mo�n� vytvori� prie�inok `%s':\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
-msgstr "`%s' nie je priečinok maildir."
+msgstr "`%s' nie je prie�inok maildir."
 
 #: camel/providers/local/camel-maildir-store.c:165
 #: camel/providers/local/camel-maildir-store.c:202
 #: 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"
+msgstr "Nie je mo�n� odstr�ni� prie�inok `%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
-msgstr "nie je priečinok maildir"
+msgstr "nie je prie�inok maildir"
 
 #: camel/providers/local/camel-maildir-store.c:276
 #, c-format
 msgid "Could not scan folder `%s': %s"
-msgstr "Nie je možné prehľadať priečinok `%s': %s"
+msgstr "Nie je mo�n� preh�ada� prie�inok `%s': %s"
 
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Nie je možné otvoriť cestu poštovej schránky: %s: %s"
+msgstr "Nie je mo�n� otvori� cestu po�tovej schr�nky: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
 #: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr "Nie je možné získať zámok na priečinok %s: %s"
+msgstr "Nie je mo�n� z�ska� z�mok na prie�inok %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:209
 #: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Nie je možné otvoriť poštovú schránku: %s: %s\n"
+msgstr "Nie je mo�n� otvori� po�tov� schr�nku: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
 #, 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"
+msgstr "Nie je mo�n� prida� spr�vu do s�boru mbox: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:344
 #: camel/providers/local/camel-mbox-folder.c:376
@@ -5933,18 +5999,18 @@ msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
-"Nie je možné získať správu: %s z priečinku %s\n"
+"Nie je mo�n� z�ska� spr�vu: %s z prie�inku %s\n"
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:377
 #: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Priečinok vyzerá ako nenapraviteľne poškodený."
+msgstr "Prie�inok vyzer� ako nenapravite�ne po�koden�."
 
 #: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Vytvorenie správy zlyhalo: Poškodená poštová schránka?"
+msgstr "Vytvorenie spr�vy zlyhalo: Po�koden� po�tov� schr�nka?"
 
 #: camel/providers/local/camel-mbox-store.c:94
 #, c-format
@@ -5952,7 +6018,7 @@ msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
-"Nie je možné otvoriť súbor `%s':\n"
+"Nie je mo�n� otvori� s�bor `%s':\n"
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:110
@@ -5961,14 +6027,14 @@ msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
-"Nie je možné vytvoriť súbor `%s':\n"
+"Nie je mo�n� vytvori� s�bor `%s':\n"
 "%s"
 
 #: 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."
+msgstr "`%s' nie je norm�lny s�bor."
 
 #: camel/providers/local/camel-mbox-store.c:138
 #: camel/providers/local/camel-mbox-store.c:161
@@ -5977,56 +6043,56 @@ msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Nie je možné odstrániť priečinok `%s':\n"
+"Nie je mo�n� odstr�ni� prie�inok `%s':\n"
 "%s"
 
 #: 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ý."
+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:249
 #: camel/providers/local/camel-spool-summary.c:379
-msgid "Summarizing folder"
-msgstr "Vytváram súhrn priečinku"
+msgid "Summarising folder"
+msgstr "Vytv�ram s�hrn prie�inku"
 
 #: camel/providers/local/camel-mbox-summary.c:254
 #: camel/providers/local/camel-spool-summary.c:384
 #, c-format
-msgid "Could not open folder: %s: summarizing from position %ld: %s"
-msgstr "Nie je možné otvoriť priečinok: %s: vytváram súhrn od pozície %ld: %s"
+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:296
 #: camel/providers/local/camel-spool-summary.c:426
 #, 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"
+msgstr "Kritick� chyba spracovania spr�vy na poz�cii %ld v prie�inku %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
 #, c-format
 msgid "Cannot summarize folder: %s: %s"
-msgstr "Nie je možné vytvoriť súhrn priečinku: %s: %s"
+msgstr "Nie je mo�n� vytvori� s�hrn prie�inku: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1549
+#: camel/providers/local/camel-spool-summary.c:931
 msgid "Synchronising folder"
-msgstr "Synchronizujem priečinok"
+msgstr "Synchronizujem prie�inok"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
 #, c-format
 msgid "Could not open folder to summarize: %s: %s"
-msgstr "Nie je možné otvoriť priečinok pre vytvorenie súhrnu: %s: %s"
+msgstr "Nie je mo�n� otvori� prie�inok pre vytvorenie s�hrnu: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "Nie je možné otvoriť dočasnú poštovú schránku: %s"
+msgstr "Nie je mo�n� otvori� do�asn� po�tov� schr�nku: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:549
 #: camel/providers/local/camel-mbox-summary.c:557
@@ -6037,113 +6103,109 @@ msgstr "Nie je možné otvoriť dočasnú poštovú schránku: %s"
 #: camel/providers/local/camel-spool-summary.c:974
 #: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
-msgstr "Súhrn a priečinok si neodpovedajú, ani po synchronizácii"
+msgstr "S�hrn a prie�inok si neodpovedaj�, ani po synchroniz�cii"
 
 #: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
-msgstr "Chyba pri zápise do dočasnej schránky: %s"
+msgstr "Chyba pri z�pise do do�asnej schr�nky: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
 #: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Zápis do dočasnej schránky zlyhal: %s: %s"
+msgstr "Z�pis do do�asnej schr�nky zlyhal: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
 #: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "Nie je možné zatvoriť zdrojový priečinok: %s: %s"
+msgstr "Nie je mo�n� zatvori� zdrojov� prie�inok: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
-msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
+msgstr "Nie je mo�n� zatvori� do�asn� prie�inok: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "Nie je možné premenovať priečinok: %s"
+msgstr "Nie je mo�n� premenova� prie�inok: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
 #: camel/providers/local/camel-spool-summary.c:545
 #: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
-msgstr "Neznáma chyba: %s"
+msgstr "Nezn�ma chyba: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
 #, 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"
+msgstr "Nie je mo�n� prida� spr�vu do prie�inok mh: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
-msgstr "`%s' nie je priečinok."
+msgstr "`%s' nie je prie�inok."
 
 #: camel/providers/local/camel-mh-summary.c:218
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "Nie je možné otvoriť cestu MH: %s: %s"
+msgstr "Nie je mo�n� otvori� cestu MH: %s: %s"
 
 #: camel/providers/local/camel-spool-folder.c:465
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
-msgstr "Nie je možné pridať správu do súboru fronty: %s: %s"
+msgstr "Nie je mo�n� prida� spr�vu do s�boru fronty: %s: %s"
 
 #: camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Fronta `%s' neexistuje alebo nie je normálny súbor."
+msgstr "Fronta `%s' neexistuje alebo nie je norm�lny s�bor."
 
 #: camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Folder `%s/%s' does not exist."
-msgstr "Priečinok `%s/%s' neexistuje."
-
-#: camel/providers/local/camel-spool-store.c:176
-msgid "Spool stores do not have an inbox"
-msgstr "Lokálne ukladanie nemá priečinok pre novú poštu"
+msgstr "Prie�inok `%s/%s' neexistuje."
 
-#: camel/providers/local/camel-spool-store.c:186
+#: camel/providers/local/camel-spool-store.c:184
 #, c-format
 msgid "Spool mail file %s"
-msgstr "Lokálny poštový súbor %s"
+msgstr "Lok�lny po�tov� s�bor %s"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:220
 msgid "Spool folders cannot be renamed"
-msgstr "Lokálne priečinky nie je možné premenovať"
+msgstr "Lok�lne prie�inky nie je mo�n� premenova�"
 
-#: camel/providers/local/camel-spool-store.c:230
+#: camel/providers/local/camel-spool-store.c:228
 msgid "Spool folders cannot be deleted"
-msgstr "Lokálne priečinky nie je možné odstrániť"
+msgstr "Lok�lne prie�inky nie je mo�n� odstr�ni�"
 
 #: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
-msgstr "Nie je možné vytvoriť súhrn: %s: %s"
+msgstr "Nie je mo�n� vytvori� s�hrn: %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:649
 #: camel/providers/local/camel-spool-summary.c:936
 #, 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"
+msgstr "Nie je mo�n� otvori� prie�inok pre vytvorenie s�hrnu: %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr "Nie je možné synchronizovať dočasný priečinok %s: %s"
+msgstr "Nie je mo�n� synchronizova� do�asn� prie�inok %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:817
 #, c-format
 msgid "Could not sync spool folder %s: %s"
-msgstr "Nie je možné synchronizovať priečinok fronty %s: %s"
+msgstr "Nie je mo�n� synchronizova� prie�inok fronty %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:847
 #: camel/providers/local/camel-spool-summary.c:865
@@ -6153,178 +6215,177 @@ msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
-"Nie je možné synchronizovať priečinok fronty %s: %s\n"
-"Priečinok je asi poškodený, kópia uložená do `%s'"
+"Nie je mo�n� synchronizova� prie�inok fronty %s: %s\n"
+"Prie�inok je asi po�koden�, k�pia ulo�en� do `%s'"
 
 #: 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"
+msgstr "Pros�m, zadajte NNTP heslo pre %s@%s"
 
 #: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
-msgstr "Server odmietol používateľské meno"
+msgstr "Server odmietol pou��vate�sk� meno"
 
 #: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
-msgstr "Nepodarilo sa poslať používateľské meno na server"
+msgstr "Nepodarilo sa posla� pou��vate�sk� meno na server"
 
 #: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
-msgstr "Server odmietol používateľské meno/heslo"
+msgstr "Server odmietol pou��vate�sk� meno/heslo"
 
 #: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
-msgstr "Správa %s nenájdená."
+msgstr "Spr�va %s nen�jden�."
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
-msgstr "Nie je možné získať zoznam skupín zo serveru."
+msgstr "Nie je mo�n� z�ska� zoznam skup�n zo serveru."
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:99
 #: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
-msgstr "Nie je možné načítať súbor so zoznamom skupín pre %s: %s"
+msgstr "Nie je mo�n� na��ta� s�bor so zoznamom skup�n pre %s: %s"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 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"
+msgstr "Nie je mo�n� ulo�i� s�bor so zoznamom skup�n pre %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
-msgstr "Diskusné skupiny USENET"
+msgstr "Diskusn� skupiny USENET"
 
 #: 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."
+msgstr "Toto je pr�stup k ��taniu a posielaniu do Diskusn�ch skup�n USENET."
 
 #: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
-msgstr "Nie je možné otvoriť priečinok pre server diskusných skupín: %s"
+msgstr "Nie je mo�n� otvori� prie�inok pre server diskusn�ch skup�n: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
-msgstr "Diskusné skupiny USENET pomocou %s"
+msgstr "Diskusn� skupiny USENET pomocou %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
-"Táto možnosť nastaví overenie na NNTP server pomocou poslania hesla ako "
-"čistého textu."
+"T�to mo�nos� nastav� overenie na NNTP server pomocou poslania hesla ako "
+"�ist�ho textu."
 
 #: camel/providers/nntp/camel-nntp-store.c:334
 #: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 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"
+msgstr "Nie je mo�n� otvori� alebo vytvori� s�bor .newsrc pre %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
-msgstr "Získavam POP súhrn"
+msgstr "Z�skavam POP s�hrn"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
-msgstr "Nie je možné skontrolovať novú poštu na POP serveri: %s"
+msgstr "Nie je mo�n� skontrolova� nov� po�tu na POP serveri: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:239
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
-msgstr "Nie je možné otvoriť priečinok: zoznam správ nebol úplný."
+msgstr "Nie je mo�n� otvori� prie�inok: zoznam spr�v nebol �pln�."
 
-#: camel/providers/pop3/camel-pop3-folder.c:332
+#: camel/providers/pop3/camel-pop3-folder.c:259
+msgid "Expunging deleted messages"
+msgstr "Odstra�ujem zmazan� spr�vy"
+
+#: camel/providers/pop3/camel-pop3-folder.c:335
 #, c-format
 msgid "Could not fetch message: %s"
-msgstr "Nie je možné získať správu: %s"
+msgstr "Nie je mo�n� z�ska� spr�vu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:348
+#: camel/providers/pop3/camel-pop3-folder.c:351
 #, 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"
+msgstr "Nie je mo�n� z�ska� spr�vu zo POP serveru %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:374
 #, c-format
 msgid "No message with uid %s"
-msgstr "Žiadna správa s uid %s"
+msgstr "�iadna spr�va s uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:375
+#: camel/providers/pop3/camel-pop3-folder.c:378
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr "Získavam POP správu %d"
+msgstr "Z�skavam POP spr�vu %d"
 
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
-msgstr "Sklad správ"
+msgstr "Sklad spr�v"
 
 #: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Leave messages on server"
-msgstr "Nechať poštu na serveri"
+msgstr "Necha� po�tu na serveri"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 msgid "Delete after %s day(s)"
-msgstr "Odstrániť po %s dňoch"
+msgstr "Odstr�ni� po %s d�och"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:52
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:50
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"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-provider.c:53
+msgid "For connecting to and downloading mail from POP servers."
+msgstr "Pre pripojenie a stiahnutie po�ty zo serverov POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:70
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 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ú."
+"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-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:80
 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 "
 "claim to support it."
 msgstr ""
-"Táto voľba vás spojí s POP serverom pomocou šifrovaného hesla protokolom "
-"APOP. Nemusí to fungovať pre všetkých používateľov aj keď server tvrdí, že "
+"T�to vo�ba v�s spoj� s POP serverom pomocou �ifrovan�ho hesla protokolom "
+"APOP. Nemus� to fungova� pre v�etk�ch pou��vate�ov aj ke� server tvrd�, �e "
 "tento protokol podporuje."
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
+#: camel/providers/pop3/camel-pop3-provider.c:92
 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."
+msgstr "T�to vo�ba v�s spoj� s POP serverom pomocou overenia Kerberos 4."
 
 #: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
-msgstr "Nepodarilo sa overiť na KPOP serveri: %s"
+msgstr "Nepodarilo sa overi� na KPOP serveri: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not connect to server: %s"
-msgstr "Nie je možné sa spojiť so serverom: %s"
+msgstr "Nie je mo�n� sa spoji� so serverom: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
-msgstr "Nie je možné sa spojiť s POP serverom na %s."
+msgstr "Nie je mo�n� sa spoji� s POP serverom na %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sProsím, zadajte POP3 heslo pre %s@%s"
+msgstr "%sPros�m, zadajte POP3 heslo pre %s@%s"
 
 #: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
@@ -6332,21 +6393,21 @@ msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
-"Nepodarilo sa pripojiť k POP serveru.\n"
-"Chyba pri posielaní používateľského mena: %s"
+"Nepodarilo sa pripoji� k POP serveru.\n"
+"Chyba pri posielan� pou��vate�sk�ho mena: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:382
 #: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
-msgstr "(Neznámy)"
+msgstr "(Nezn�my)"
 
 #: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
-"Nepodarilo sa pripojiť k POP serveru.\n"
-"Požadovaný spôsob overenia nie je podporovaný."
+"Nepodarilo sa pripoji� k POP serveru.\n"
+"Po�adovan� sp�sob overenia nie je podporovan�."
 
 #: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
@@ -6354,16 +6415,21 @@ msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
-"Nepodarilo sa pripojiť k POP serveru.\n"
-"Chyba pri posielaní hesla: %s"
+"Nepodarilo sa pripoji� k POP serveru.\n"
+"Chyba pri posielan� hesla: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
-msgstr "Priečinok `%s' neexistuje."
+msgstr "Prie�inok `%s' neexistuje."
+
+#: camel/providers/pop3/camel-pop3-store.c:567
+#, c-format
+msgid "Unexpected response from POP server: %s"
+msgstr "Neo�ak�van� odpove� od POP serveru: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6371,41 +6437,41 @@ msgstr "Sendmail"
 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."
+msgstr "Pre doru�enie po�ty programom \"sendmail\" na tomto po��ta�i."
 
 #: 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á"
+msgstr "Nie je mo�n� vytvori� r�ru do sendmailu: %s: po�ta neodoslan�"
 
 #: 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á"
+msgstr "Nie je mo�n� spusti� sendmail: %s: po�ta neodoslan�"
 
 #: 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"
+msgstr "Nie je mo�n� posla� spr�vu: %s"
 
 #: 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á."
+msgstr "sendmail skon�il so sign�lom %s: po�ta neodoslan�."
 
 #: 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á."
+msgstr "Nie je mo�n� vykona� %s: po�ta neodoslan�."
 
 #: 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á."
+msgstr "sendmail skon�il so stavom %d: po�ta neodoslan�."
 
 #: 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'"
+msgstr "Nie je mo�n� n�js� v spr�ve adresu 'Od'"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
@@ -6413,91 +6479,91 @@ msgstr "sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
-msgstr "Prenos pošty pomocou programu sendmail"
+msgstr "Prenos po�ty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:64
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
 #: 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"
+msgstr "Pre doru�enie po�ty spojen�m sa so vzdialen�m serverom pomocou SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
-msgstr "Syntaktická chyba, príkaz neznámy"
+msgstr "Syntaktick� chyba, pr�kaz nezn�my"
 
 #: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
-msgstr "Syntaktická chyba v parametroch alebo argumentoch"
+msgstr "Syntaktick� chyba v parametroch alebo argumentoch"
 
 #: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
-msgstr "Príkaz neimplementovaný"
+msgstr "Pr�kaz neimplementovan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
-msgstr "Parameter príkazu neimplementovaný"
+msgstr "Parameter pr�kazu neimplementovan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
-msgstr "Stav systému alebo odpoveď na pomoc"
+msgstr "Stav syst�mu alebo odpove� na pomoc"
 
 #: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
-msgstr "Správa pomocníka"
+msgstr "Spr�va pomocn�ka"
 
 #: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
-msgstr "Služba pripravená"
+msgstr "Slu�ba pripraven�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
-msgstr "Služba zatvára prenosový kanál"
+msgstr "Slu�ba zatv�ra prenosov� kan�l"
 
 #: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
-msgstr "Služba nie je k dispozícii, zatváram prenosový kanál"
+msgstr "Slu�ba nie je k dispoz�cii, zatv�ram prenosov� kan�l"
 
 #: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
-msgstr "Požadovaná poštová akcia v poriadku, dokončená"
+msgstr "Po�adovan� po�tov� akcia v poriadku, dokon�en�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
-msgstr "Používateľ nie je lokálny, bude predaná podľa <forward-path>"
+msgstr "Pou��vate� nie je lok�lny, bude predan� pod�a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:193
 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:195
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "Požadovaná akcia nevykonaná, poštová schránka nie je k dispozícii"
+msgstr "Po�adovan� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
 
 #: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
-msgstr "Požadovaná akcia zrušená: chyba pri spracovaní"
+msgstr "Po�adovan� akcia zru�en�: chyba pri spracovan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
-msgstr "Používateľ nie je lokálny, skúste <forward-path>"
+msgstr "Pou��vate� nie je lok�lny, sk�ste <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Požadovaná akcia nevykonaná: nedostatok miesta v systéme"
+msgstr "Po�adovan� akcia nevykonan�: nedostatok miesta v syst�me"
 
 #: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Požadovaná poštová akcia prerušená: presiahnutá alokácia miesta"
+msgstr "Po�adovan� po�tov� akcia preru�en�: presiahnut� alok�cia miesta"
 
 #: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Požadovaná akcia nevykonaná: meno poštovej schránky nepovolené"
+msgstr "Po�adovan� akcia nevykonan�: meno po�tovej schr�nky nepovolen�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Spustiť vstup pošty, končí <CRLF>.<CRLF>"
+msgstr "Spusti� vstup po�ty, kon�� <CRLF>.<CRLF>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
@@ -6505,38 +6571,38 @@ msgstr "Prenos zlyhal"
 
 #: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
-msgstr "Vyžadované heslo"
+msgstr "Vy�adovan� heslo"
 
 #: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
-msgstr "Mechanizmus overenia je príliš slabý"
+msgstr "Mechanizmus overenia je pr�li� slab�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
-msgstr "Požadované šifrovanie pre požadovaný spôsob overenia"
+msgstr "Po�adovan� �ifrovanie pre po�adovan� sp�sob overenia"
 
 #: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
-msgstr "Dočasné zlyhanie overenia."
+msgstr "Do�asn� zlyhanie overenia."
 
 #: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
-msgstr "Autentifikácia vyžadovaná"
+msgstr "Autentifik�cia vy�adovan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Chyba privítanie od serveru: %s : možno nie kritické"
+msgstr "Chyba priv�tanie od serveru: %s : mo�no nie kritick�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
-msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
+msgstr "Po�adovan� sp�sob overenia %s nie je podporovan� SMTP serverom %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
-msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
+msgstr "%sPros�m, zadajte SMTP heslo pre %s@%s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
@@ -6545,7 +6611,7 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"Nepodarilo sa overiť na SMTP serveri.\n"
+"Nepodarilo sa overi� na SMTP serveri.\n"
 "%s\n"
 "\n"
 
@@ -6557,23 +6623,23 @@ msgstr "SMTP server %s"
 #: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr "Doručenie pošty SMTP pomocou %s"
+msgstr "Doru�enie po�ty SMTP pomocou %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
-msgstr "Nie je možné poslať správu: adresa odosielateľa nie je definovaná."
+msgstr "Nie je mo�n� posla� spr�vu: adresa odosielate�a nie je definovan�."
 
 #: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
-msgstr "Nie je možné poslať správu: adresa odosielateľa nie je platná."
+msgstr "Nie je mo�n� posla� spr�vu: adresa odosielate�a nie je platn�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:602
 msgid "Sending message"
-msgstr "Posielam správu"
+msgstr "Posielam spr�vu"
 
 #: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
-msgstr "Nie je možné poslať správu: adresáti nie sú definovaní."
+msgstr "Nie je mo�n� posla� spr�vu: adres�ti nie s� definovan�."
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
@@ -6582,80 +6648,80 @@ msgstr "Pozdrav SMTP"
 #: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
-msgstr "Vypršal čas odpovede HELO: %s: nie je kritická"
+msgstr "Vypr�al �as odpovede HELO: %s: nie je kritick�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
-msgstr "Chyba odpovede HELO: %s: nie je kritická"
+msgstr "Chyba odpovede HELO: %s: nie je kritick�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:760
 msgid "SMTP Authentication"
-msgstr "Prihlásenie SMTP"
+msgstr "Prihl�senie SMTP"
 
 #: camel/providers/smtp/camel-smtp-transport.c:766
 msgid "Error creating SASL authentication object."
-msgstr "Chyba pri vytváraní overovacieho objektu SASL."
+msgstr "Chyba pri vytv�ran� overovacieho objektu SASL."
 
 #: camel/providers/smtp/camel-smtp-transport.c:781
 #: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
-msgstr "Vypršal čas požiadavky AUTH: %s"
+msgstr "Vypr�al �as po�iadavky AUTH: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
-msgstr "Požiadavka AUTH zlyhala."
+msgstr "Po�iadavka AUTH zlyhala."
 
 #: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
-msgstr "Neplatná odpoveď na overenie od serveru.\n"
+msgstr "Neplatn� odpove� na overenie od serveru.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Vypršal čas odpovede MAIL FROM: %s: pošta neodoslaná"
+msgstr "Vypr�al �as odpovede MAIL FROM: %s: po�ta neodoslan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "Chyba odpovede MAIL FROM: %s: pošta neodoslaná"
+msgstr "Chyba odpovede MAIL FROM: %s: po�ta neodoslan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Vypršal čas odpovede RCPT TO: %s: pošta neodoslaná"
+msgstr "Vypr�al �as odpovede RCPT TO: %s: po�ta neodoslan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Chyba odpovede RCPT TO: %s: pošta neodoslaná"
+msgstr "Chyba odpovede RCPT TO: %s: po�ta neodoslan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
-msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
+msgstr "Vypr�al �as posielania DATA: %s: po�ta neodoslan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
-msgstr "Chyba odpovede DATA: %s: pošta neodoslaná"
+msgstr "Chyba odpovede DATA: %s: po�ta neodoslan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1006
 #: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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á"
+msgstr "Vypr�al �as posielania DATA: koniec spr�vy: %s: po�ta neodoslan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Chyba odpovede DATA: koniec správy: %s: pošta neodoslaná"
+msgstr "Chyba odpovede DATA: koniec spr�vy: %s: po�ta neodoslan�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
-msgstr "Vypršal čas odpovede RSET: %s"
+msgstr "Vypr�al �as odpovede RSET: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
@@ -6665,12 +6731,12 @@ msgstr "Chyba odpovede RSET: %s"
 #: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Vypršal čas odpovede QUIT: %s: nie je kritická"
+msgstr "Vypr�al �as odpovede QUIT: %s: nie je kritick�"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
-msgstr "Chyba odpovede QUIT: %s: nie je kritická"
+msgstr "Chyba odpovede QUIT: %s: nie je kritick�"
 
 #: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
@@ -6697,29 +6763,29 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:134
 msgid "attachment"
-msgstr "príloha"
+msgstr "pr�loha"
 
 #: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
-msgstr "Odstráni vybrané položky zo zoznamu príloh"
+msgstr "Odstr�ni vybran� polo�ky zo zoznamu pr�loh"
 
 #: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
-msgstr "Pridať prílohu..."
+msgstr "Prida� pr�lohu..."
 
 #: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
-msgstr "Priloží súbor k správe"
+msgstr "Prilo�� s�bor k spr�ve"
 
 #: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
-msgstr "Vlastnosti prílohy"
+msgstr "Vlastnosti pr�lohy"
 
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
-msgstr "Meno súboru:"
+msgstr "Meno s�boru:"
 
 #: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
@@ -6728,11 +6794,11 @@ msgstr "Typ MIME:"
 #: composer/e-msg-composer-attachment.glade.h:5
 #: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
-msgstr "Navrhnúť automatické zobrazovanie príloh"
+msgstr "Navrhn�� automatick� zobrazovanie pr�loh"
 
 #: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
-msgstr "Kliknutím zobrazíte adresár"
+msgstr "Kliknut�m zobraz�te adres�r"
 
 #.
 #. * From:
@@ -6746,7 +6812,7 @@ msgstr "Od:"
 #.
 #: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
-msgstr "Odpovedať komu:"
+msgstr "Odpoveda� komu:"
 
 #.
 #. * Subject:
@@ -6761,7 +6827,7 @@ msgstr "Komu:"
 
 #: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
-msgstr "Zadajte adresátov správy"
+msgstr "Zadajte adres�tov spr�vy"
 
 #: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
@@ -6769,7 +6835,7 @@ msgstr "Cc:"
 
 #: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
+msgstr "Zadajte adresy, ktor� dostan� k�piu spr�vy"
 
 #: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
@@ -6780,13 +6846,13 @@ msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname "
-"adresátov správy."
+"Zadajte adresy, ktor� dostan� k�piu spr�vy bez toho, aby boli v zozname "
+"adres�tov spr�vy."
 
 #: composer/e-msg-composer-select-file.c:228
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
-msgstr "Priložiť súbor"
+msgstr "Prilo�i� s�bor"
 
 #: composer/e-msg-composer.c:670
 #, c-format
@@ -6794,7 +6860,7 @@ msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
-"Nie je možné otvoriť súbor %s:\n"
+"Nie je mo�n� otvori� s�bor %s:\n"
 "%s"
 
 #: composer/e-msg-composer.c:683
@@ -6803,137 +6869,140 @@ msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
-"Chyba pri čítaní súboru %s:\n"
+"Chyba pri ��tan� s�boru %s:\n"
 "%s"
 
 #: composer/e-msg-composer.c:865
 msgid "Save as..."
-msgstr "Uložiť ako..."
+msgstr "Ulo�i� ako..."
 
 #: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:876
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
-msgstr "Súbor existuje, prepísať ho?"
+msgstr "S�bor existuje, prep�sa� ho?"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
-msgstr "Chyba pri ukladaní súboru: %s"
+msgstr "Chyba pri ukladan� s�boru: %s"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
-msgstr "Chyba pri načítavaní súboru: %s"
+msgstr "Chyba pri na��tavan� s�boru: %s"
 
-#: composer/e-msg-composer.c:989
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
-"Nei je možné otvoriť priečinok na koncepty pre tento účet.\n"
-"Chcete použiť štandardný priečinok na koncepty?"
+"Nei je mo�n� otvori� prie�inok na koncepty pre tento ��et.\n"
+"Chcete pou�i� �tandardn� prie�inok na koncepty?"
 
-#: composer/e-msg-composer.c:1039
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
-msgstr "Chyba pri prístupe k súboru: %s"
+msgstr "Chyba pri pr�stupe k s�boru: %s"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
-msgstr "Nie je možné získať správu z editora"
+msgstr "Nie je mo�n� z�ska� spr�vu z editora"
 
-#: composer/e-msg-composer.c:1053
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
-"Nepodarilo sa hľadať v súbore: %s\n"
+"Nepodarilo sa h�ada� v s�bore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1059
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
-"Nepodarilo sa skrátiť súbor: %s\n"
+"Nepodarilo sa skr�ti� s�bor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1068
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
-"Chyba pri automatickom ukladaní správ: %s\n"
+"Chyba pri automatickom ukladan� spr�v: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1168
+#: composer/e-msg-composer.c:1172
 msgid ""
-"Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Ximian Evolution has found unsaved files from a previous session.\n"
+"Would you like to try to recover them?"
 msgstr ""
-"Evolution našiel neuložené súbory z predchádzajúceho sedenia.\n"
-"Chcete sa pokúsiť o ich záchranu?"
+"Ximian Evolution na�iel neulo�en� s�bory z predch�dzaj�ceho sedenia.\n"
+"Chcete sa pok�si� o ich z�chranu?"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
-"Táto správa nebola odoslaná.\n"
+"T�to spr�va nebola odoslan�.\n"
 "\n"
-"Chcete uložiť zmeny?"
+"Chcete ulo�i� zmeny?"
 
-#: composer/e-msg-composer.c:1323 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:217
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1327
+msgid "Warning: Modified Message"
+msgstr "Varovanie: Zmenen� spr�va"
 
-#: composer/e-msg-composer.c:1346
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
-msgstr "Otvoriť súbor"
+msgstr "Otvori� s�bor"
 
-#: composer/e-msg-composer.c:1495
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
-msgstr "Vložiť súbor"
+msgstr "Vlo�i� s�bor"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2312
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
-msgstr "Napísať správu"
+msgstr "Nap�sa� spr�vu"
 
-#: composer/e-msg-composer.c:2402
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
-msgstr "Nie je možné vytvoriť okno editora správ."
+msgstr "Nie je mo�n� vytvori� okno editora spr�v."
 
 #: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 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."
+"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:374
 msgid "Cannot initialize Evolution's composer."
-msgstr "Nie je možné inicializovať editor správ Evolution."
+msgstr "Nie je mo�n� inicializova� editor spr�v Evolution."
+
+#: data/evolution.desktop.in.h:1
+msgid "Evolution"
+msgstr "Evolution"
 
 #: data/evolution.desktop.in.h:2
 msgid "The Evolution groupware suite"
-msgstr "Sada groupvérových nástrojov Evolution"
+msgstr "Sada groupv�rov�ch n�strojov Evolution"
 
 #: data/evolution.keys.in.h:1
 msgid "address card"
-msgstr "karta adresára"
+msgstr "karta adres�ra"
 
 #: data/evolution.keys.in.h:2
 msgid "calendar information"
-msgstr "informácie o kalendári"
+msgstr "inform�cie o kalend�ri"
 
 #: default_user/searches.xml.h:1
 msgid "Body contains"
@@ -6949,15 +7018,15 @@ msgstr "Telo alebo predmet obsahuje"
 
 #: default_user/searches.xml.h:4
 msgid "Message contains"
-msgstr "Správa obsahuje"
+msgstr "Spr�va obsahuje"
 
 #: default_user/searches.xml.h:5
 msgid "Recipients contain"
-msgstr "Adresát obsahuje"
+msgstr "Adres�t obsahuje"
 
 #: default_user/searches.xml.h:6
 msgid "Sender contains"
-msgstr "Odosielateľ obsahuje"
+msgstr "Odosielate� obsahuje"
 
 #: default_user/searches.xml.h:7
 msgid "Subject contains"
@@ -6968,54 +7037,65 @@ msgid "Subject does not contain"
 msgstr "Predmet neobsahuje"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:239
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:131
+#: e-util/e-time-utils.c:243
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
 #: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:368
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:280
+#: e-util/e-time-utils.c:360
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1339
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:365 widgets/misc/e-dateedit.c:1339
 #: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+#. strptime format for hour and AM/PM
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:287
+msgid "%I %p"
+msgstr "%I %p"
+
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1336
+#: e-util/e-time-utils.c:111 e-util/e-time-utils.c:290
+#: e-util/e-time-utils.c:357 widgets/misc/e-dateedit.c:1336
 #: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:247
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:251
 msgid "%Y/%m/%d"
 msgstr "%d.%m.%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:255
 #, c-format
 msgid "%x"
 msgstr "%x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:314
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -7023,13 +7103,13 @@ 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:303
+#: e-util/e-time-utils.c:319
 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:312
+#: e-util/e-time-utils.c:328
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -7051,11 +7131,11 @@ msgstr "mesiacov"
 
 #: filter/filter-datespec.c:82
 msgid "week"
-msgstr "týždňa"
+msgstr "t��d�a"
 
 #: filter/filter-datespec.c:82
 msgid "weeks"
-msgstr "týždňov"
+msgstr "t��d�ov"
 
 #: filter/filter-datespec.c:84
 msgid "hour"
@@ -7063,7 +7143,7 @@ msgstr "hodiny"
 
 #: filter/filter-datespec.c:85
 msgid "minute"
-msgstr "minúty"
+msgstr "min�ty"
 
 #: filter/filter-datespec.c:86
 msgid "second"
@@ -7071,15 +7151,15 @@ msgstr "sekundy"
 
 #: filter/filter-datespec.c:86
 msgid "seconds"
-msgstr "sekúnd"
+msgstr "sek�nd"
 
 #: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
-msgstr "Aj. Zabudli ste vybrať dátum."
+msgstr "Aj. Zabudli ste vybra� d�tum."
 
 #: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
-msgstr "Aj. Vybrali ste neplatný dátum."
+msgstr "Aj. Vybrali ste neplatn� d�tum."
 
 #: filter/filter-datespec.c:271
 msgid ""
@@ -7087,17 +7167,17 @@ msgid ""
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
-"Dátum správy bude porovnaný s časom\n"
-"keď bol spustený filter alebo keď bol\n"
-"otvorený vpriečinok."
+"D�tum spr�vy bude porovnan� s �asom\n"
+"ke� bol spusten� filter alebo ke� bol\n"
+"otvoren� vprie�inok."
 
 #: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
-"Dátum správy bude porovnaný\n"
-"s časom, ktorý tu uvediete."
+"D�tum spr�vy bude porovnan�\n"
+"s �asom, ktor� tu uvediete."
 
 #: filter/filter-datespec.c:334
 msgid ""
@@ -7105,27 +7185,27 @@ msgid ""
 "a time relative to when the filter is run;\n"
 "\"a week ago\", for example."
 msgstr ""
-"Dátum správy bude porovnaný\n"
-"s čas relatívnym k okamžiku, keď bol\n"
-"filter spustený. Napr. \"pred týždňom\".."
+"D�tum spr�vy bude porovnan�\n"
+"s �as relat�vnym k okam�iku, ke� bol\n"
+"filter spusten�. Napr. \"pred t��d�om\".."
 
 #. keep in sync with FilterDatespec_type!
 #: filter/filter-datespec.c:369
 msgid "the current time"
-msgstr "aktuálny tento"
+msgstr "aktu�lny tento"
 
 #: filter/filter-datespec.c:369
 msgid "a time you specify"
-msgstr "zadaný čas"
+msgstr "zadan� �as"
 
 #: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
-msgstr "čas relatívny k aktuálnemu času"
+msgstr "�as relat�vny k aktu�lnemu �asu"
 
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
-msgstr "Porovnať s"
+msgstr "Porovna� s"
 
 #: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
@@ -7133,23 +7213,23 @@ msgstr "teraz"
 
 #: filter/filter-datespec.c:575
 msgid " ago"
-msgstr " naspäť"
+msgstr " nasp�"
 
 #: filter/filter-datespec.c:621
 msgid "ago"
-msgstr "späť"
+msgstr "sp�"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:936
+#: filter/filter-datespec.c:711 mail/message-list.c:940
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 #: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
-msgstr "<kliknutím vyberiete dátum>"
+msgstr "<kliknut�m vyberiete d�tum>"
 
 #: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
-msgstr "Pravidlá filtra"
+msgstr "Pravidl� filtra"
 
 #. and now for the action area
 #: filter/filter-filter.c:452
@@ -7158,36 +7238,36 @@ msgstr "Potom"
 
 #: filter/filter-filter.c:466
 msgid "Add action"
-msgstr "Pridať akciu"
+msgstr "Prida� akciu"
 
 #: 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."
 msgstr ""
-"Aj, zabudli ste vybrať priečinok.\n"
-"Prosím, vráťte sa a zadajte platný priečinok, kam doručiť poštu."
+"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:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:808
+#: mail/mail-account-gui.c:820
 msgid "Select Folder"
-msgstr "Vybrať priečinok"
+msgstr "Vybra� prie�inok"
 
 #: filter/filter-folder.c:257
 msgid "Enter folder URI"
-msgstr "Zadajte URI priečinku"
+msgstr "Zadajte URI prie�inku"
 
 #: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
-msgstr "<kliknutím vyberiete priečinok>"
+msgstr "<kliknut�m vyberiete prie�inok>"
 
-#: filter/filter-input.c:197
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
-"Chyba v regulárnom výraze '%s':\n"
+"Chyba v regul�rnom v�raze '%s':\n"
 "%s"
 
 #: filter/filter-part.c:488
@@ -7208,96 +7288,96 @@ msgstr "Ak"
 
 #: filter/filter-rule.c:665
 msgid "Execute actions"
-msgstr "Spustiť akcie"
+msgstr "Spusti� akcie"
 
 #: filter/filter-rule.c:669
 msgid "if all criteria are met"
-msgstr "ak odpovedajú všetky kritériá"
+msgstr "ak odpovedaj� v�etky krit�ri�"
 
 #: filter/filter-rule.c:674
 msgid "if any criteria are met"
-msgstr "ak odpovedá niektoré kritérium"
+msgstr "ak odpoved� niektor� krit�rium"
 
 #: filter/filter-rule.c:685
 msgid "Add criterion"
-msgstr "Pridať kritérium"
+msgstr "Prida� krit�rium"
 
 #: filter/filter-rule.c:770
 msgid "incoming"
-msgstr "prijatá"
+msgstr "prijat�"
 
 #: filter/filter-rule.c:770
 msgid "outgoing"
-msgstr "odoslaná"
+msgstr "odoslan�"
 
 #: filter/filter.glade.h:1
 msgid "Edit Filters"
-msgstr "Upraviť filtre"
+msgstr "Upravi� filtre"
 
 #: filter/filter.glade.h:2
 msgid "Edit VFolders"
-msgstr "Upraviť vpriečinky"
+msgstr "Upravi� vprie�inky"
 
 #: filter/filter.glade.h:4
 msgid "Incoming"
-msgstr "Prijatá"
+msgstr "Prijat�"
 
 #: filter/filter.glade.h:5
 msgid "Outgoing"
-msgstr "Odoslaná"
+msgstr "Odoslan�"
 
 #: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
-msgstr "Virtuálne priečinky"
+msgstr "Virtu�lne prie�inky"
 
 #: filter/filter.glade.h:11
 msgid "specific folders only"
-msgstr "iba špecifické priečinky"
+msgstr "iba �pecifick� prie�inky"
 
 #: filter/filter.glade.h:12
 msgid "vFolder Sources"
-msgstr "Zdroje vpriečinkov"
+msgstr "Zdroje vprie�inkov"
 
 #: filter/filter.glade.h:13
 msgid "with all active remote folders"
-msgstr "pre všetky aktívne vzdialené priečinky"
+msgstr "pre v�etky akt�vne vzdialen� prie�inky"
 
 #: filter/filter.glade.h:14
 msgid "with all local and active remote folders"
-msgstr "pre všetky lokálne a aktívne vzdialené priečinky"
+msgstr "pre v�etky lok�lne a akt�vne vzdialen� prie�inky"
 
 #: filter/filter.glade.h:15
 msgid "with all local folders"
-msgstr "pre všetky lokálne priečinky"
+msgstr "pre v�etky lok�lne prie�inky"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Assign Color"
-msgstr "Priradiť farbu"
+msgstr "Priradi� farbu"
 
 #: filter/libfilter-i18n.h:3
 msgid "Assign Score"
-msgstr "Priradiť skóre"
+msgstr "Priradi� sk�re"
 
 #: filter/libfilter-i18n.h:4
 msgid "Attachments"
-msgstr "Prílohy"
+msgstr "Pr�lohy"
 
 #: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
-msgstr "Kopírovať do priečinku"
+msgstr "Kop�rova� do prie�inku"
 
 #: filter/libfilter-i18n.h:6
 msgid "Date received"
-msgstr "Dátum prijatia"
+msgstr "D�tum prijatia"
 
 #: filter/libfilter-i18n.h:7
 msgid "Date sent"
-msgstr "Dátum odoslania"
+msgstr "D�tum odoslania"
 
 #: filter/libfilter-i18n.h:9
 msgid "Deleted"
-msgstr "Odstránené"
+msgstr "Odstr�nen�"
 
 #: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
@@ -7305,7 +7385,7 @@ msgstr "Neexistuje"
 
 #: filter/libfilter-i18n.h:11
 msgid "Draft"
-msgstr "Návrh"
+msgstr "N�vrh"
 
 #: filter/libfilter-i18n.h:12
 msgid "Exist"
@@ -7313,11 +7393,11 @@ msgstr "Existuje"
 
 #: filter/libfilter-i18n.h:13
 msgid "Expression"
-msgstr "Výraz"
+msgstr "V�raz"
 
 #: filter/libfilter-i18n.h:14
 msgid "Important"
-msgstr "Dôležité"
+msgstr "D�le�it�"
 
 #: filter/libfilter-i18n.h:15
 msgid "Mailing list"
@@ -7325,68 +7405,68 @@ msgstr "Konferencia"
 
 #: filter/libfilter-i18n.h:16
 msgid "Message Body"
-msgstr "Telo správy"
+msgstr "Telo spr�vy"
 
 #: filter/libfilter-i18n.h:17
 msgid "Message Header"
-msgstr "Hlavička správy"
+msgstr "Hlavi�ka spr�vy"
 
 #: filter/libfilter-i18n.h:18
 msgid "Message was received"
-msgstr "Správa bola prijatá"
+msgstr "Spr�va bola prijat�"
 
 #: filter/libfilter-i18n.h:19
 msgid "Message was sent"
-msgstr "Správa bola odoslaná"
+msgstr "Spr�va bola odoslan�"
 
 #: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
-msgstr "Presunúť do priečinku"
+msgstr "Presun�� do prie�inku"
 
 #: filter/libfilter-i18n.h:21
 msgid "Read"
-msgstr "Prečítaná"
+msgstr "Pre��tan�"
 
 #: filter/libfilter-i18n.h:22
 msgid "Recipients"
-msgstr "Adresáti"
+msgstr "Adres�ti"
 
 #: filter/libfilter-i18n.h:23
 msgid "Regex Match"
-msgstr "Regul. výraz"
+msgstr "Regul. v�raz"
 
 #: filter/libfilter-i18n.h:24
 msgid "Replied to"
-msgstr "Odpovedaná"
+msgstr "Odpovedan�"
 
 #: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
-msgstr "Skóre"
+msgstr "Sk�re"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1071
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1109
 msgid "Sender"
-msgstr "Odosielateľ"
+msgstr "Odosielate�"
 
 #: filter/libfilter-i18n.h:27
 msgid "Set Status"
-msgstr "Nastaviť stav"
+msgstr "Nastavi� stav"
 
 #: filter/libfilter-i18n.h:28
 msgid "Size (kB)"
-msgstr "Veľkosť (kB)"
+msgstr "Ve�kos� (kB)"
 
 #: filter/libfilter-i18n.h:29
 msgid "Source Account"
-msgstr "Zdrojový účet"
+msgstr "Zdrojov� ��et"
 
 #: filter/libfilter-i18n.h:30
 msgid "Specific header"
-msgstr "Špecifická hlavička"
+msgstr "�pecifick� hlavi�ka"
 
 #: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
-msgstr "Zastaviť spracovanie"
+msgstr "Zastavi� spracovanie"
 
 #: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
@@ -7403,7 +7483,7 @@ msgstr "neobsahuje"
 
 #: filter/libfilter-i18n.h:38
 msgid "does not end with"
-msgstr "nekončí na"
+msgstr "nekon�� na"
 
 #: filter/libfilter-i18n.h:39
 msgid "does not exist"
@@ -7411,15 +7491,15 @@ msgstr "neexistuje"
 
 #: filter/libfilter-i18n.h:40
 msgid "does not sound like"
-msgstr "nevyzerá ako"
+msgstr "nevyzer� ako"
 
 #: filter/libfilter-i18n.h:41
 msgid "does not start with"
-msgstr "nezačína na"
+msgstr "neza��na na"
 
 #: filter/libfilter-i18n.h:42
 msgid "ends with"
-msgstr "končí na"
+msgstr "kon�� na"
 
 #: filter/libfilter-i18n.h:43
 msgid "exists"
@@ -7427,11 +7507,11 @@ msgstr "existuje"
 
 #: filter/libfilter-i18n.h:44
 msgid "is greater than"
-msgstr "je viac než"
+msgstr "je viac ne�"
 
 #: filter/libfilter-i18n.h:45
 msgid "is less than"
-msgstr "je menej než"
+msgstr "je menej ne�"
 
 #: filter/libfilter-i18n.h:46
 msgid "is not"
@@ -7443,19 +7523,19 @@ msgstr "je"
 
 #: filter/libfilter-i18n.h:48
 msgid "on or after"
-msgstr "dňa a po"
+msgstr "d�a a po"
 
 #: filter/libfilter-i18n.h:49
 msgid "on or before"
-msgstr "dňa a pred"
+msgstr "d�a a pred"
 
 #: filter/libfilter-i18n.h:50
 msgid "sounds like"
-msgstr "vyzerá ako"
+msgstr "vyzer� ako"
 
 #: filter/libfilter-i18n.h:51
 msgid "starts with"
-msgstr "začína na"
+msgstr "za��na na"
 
 #: filter/libfilter-i18n.h:52
 msgid "was after"
@@ -7467,314 +7547,368 @@ msgstr "bolo pred"
 
 #: filter/rule-editor.c:147
 msgid "Rules"
-msgstr "Pravidlá"
+msgstr "Pravidl�"
 
 #: filter/rule-editor.c:240
 msgid "Add Rule"
-msgstr "Pridať pravidlo"
+msgstr "Prida� pravidlo"
 
 #: filter/rule-editor.c:299
 msgid "Edit Rule"
-msgstr "Upraviť pravidlo"
+msgstr "Upravi� pravidlo"
 
 #: filter/score-editor.c:130
 msgid "Score Rules"
-msgstr "Pravidlá skóre"
+msgstr "Pravidl� sk�re"
 
 #: filter/vfolder-rule.c:198
 msgid "Oops.  You need to to specify at least one folder as a source."
-msgstr "Jaj. Musíte zadať aspoň jeden priečinok ako zdrojový."
+msgstr "Jaj. Mus�te zada� aspo� jeden prie�inok ako zdrojov�."
+
+#: importers/elm-importer.c:96
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution importuje va�u star� po�ty Elm"
+
+#: importers/elm-importer.c:97 importers/netscape-importer.c:108
+#: importers/pine-importer.c:101
+msgid "Importing..."
+msgstr "Importujem..."
+
+#: importers/elm-importer.c:99 importers/netscape-importer.c:110
+#: importers/pine-importer.c:103
+msgid "Please wait"
+msgstr "Pros�m, �akajte"
+
+#: importers/elm-importer.c:171 importers/netscape-importer.c:687
+#: importers/pine-importer.c:438
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Importujem %s ako %s"
 
-#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:814 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:651 shell/importer/intelligent.c:194
+#: importers/elm-importer.c:377 importers/netscape-importer.c:780
+#: importers/pine-importer.c:571
+#, c-format
+msgid "Scanning %s"
+msgstr "Preh�ad�vam %s"
+
+#: importers/elm-importer.c:526 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:951 importers/pine-importer.c:732
+#: shell/e-shell-importer.c:701 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632
+#: importers/elm-importer.c:531 importers/netscape-importer.c:956
+#: importers/pine-importer.c:737 mail/component-factory.c:95
 msgid "Mail"
-msgstr "Pošta"
+msgstr "Po�ta"
 
-#: importers/elm-importer.c:498
+#: importers/elm-importer.c:554
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution našiel poštové súbory Elm.\n"
-"Chcete ich naimportovať do Evolution?"
+"Evolution na�iel po�tov� s�bory Elm.\n"
+"Chcete ich naimportova� do Evolution?"
 
-#: importers/elm-importer.c:527
+#: importers/elm-importer.c:583
 msgid "Elm mail"
-msgstr "Pošta Elm"
+msgstr "Po�ta Elm"
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:742
 msgid "Addressbook"
-msgstr "Adresár"
+msgstr "Adres�r"
 
 #: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
-"Evolution našiel súbory GnomeCard.\n"
-"Chcete ich naimportovať do Evolution?"
+"Evolution na�iel s�bory GnomeCard.\n"
+"Chcete ich naimportova� do Evolution?"
+
+#: importers/netscape-importer.c:107
+msgid "Evolution is importing your old Netscape data"
+msgstr "Evolution importuje va�e star� d�ta Netscape"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:883 importers/pine-importer.c:667
+msgid "Scanning directory"
+msgstr "Preh�ad�vam prie�inok"
+
+#: importers/netscape-importer.c:892
+msgid "Starting import"
+msgstr "Sp���am import"
+
+#: importers/netscape-importer.c:961
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:986
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
-"Evolution našiel poštové súbory Netscape.\n"
-"Chcete ich naimportovať do Evolution?"
+"Evolution na�iel po�tov� s�bory Netscape.\n"
+"Chcete ich naimportova� do Evolution?"
+
+#: importers/pine-importer.c:100
+msgid "Evolution is importing your old Pine data"
+msgstr "Evolution importuje va�e star� d�ta Pine"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:768
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution našiel poštové súbory Pine.\n"
-"Chcete ich naimportovať do Evolution?"
+"Evolution na�iel po�tov� s�bory Pine.\n"
+"Chcete ich naimportova� do Evolution?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:796
 msgid "Pine mail"
-msgstr "Pošta Pine"
+msgstr "Po�ta Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
-msgstr "Komponent Evolution pre prácu s poštou."
+msgstr "Komponent Evolution pre pr�cu s po�tou."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
 msgid "Evolution mail composer."
-msgstr "Poštový komponent Evolution."
+msgstr "Po�tov� komponent Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
 msgid "Evolution mail executive summary component."
-msgstr "Komponent Súhrn pošty Evolution."
+msgstr "Komponent S�hrn po�ty Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Evolution mail folder display component."
-msgstr "Komponent zobrazenia poštového priečinku Evolution."
+msgstr "Komponent zobrazenia po�tov�ho prie�inku Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Evolution mail folder factory component."
-msgstr "Vytváracie rozhranie pre komponent poštového priečinku Evolution."
+msgstr "Vytv�racie rozhranie pre komponent po�tov�ho prie�inku Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Factory for the Evolution composer."
-msgstr "Vytváracie rozhranie pre editor správ Evolution."
+msgstr "Vytv�racie rozhranie pre editor spr�v Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Vytváracie rozhranie pre poštový komponent Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Factory for the Mail Summary component."
-msgstr "Vytváracie rozhranie pre komponent Súhrnu pošty Evolution."
+msgstr "Vytv�racie rozhranie pre komponent S�hrnu po�ty Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Mail configuration interface"
-msgstr "Rozhranie pre nastavenie pošty"
+msgstr "Rozhranie pre nastavenie po�ty"
+
+#: mail/component-factory.c:95
+msgid "Folder containing mail"
+msgstr "Prie�inok obsahuj�ci po�tu"
+
+#: mail/component-factory.c:96
+msgid "Mail storage folder (internal)"
+msgstr "Prie�inok pre ukladanie po�ty (intern�)"
+
+#: mail/component-factory.c:97
+msgid "Virtual Trash"
+msgstr "Virtu�lne odpadky"
 
-#: mail/component-factory.c:112
+#: mail/component-factory.c:97
+msgid "Virtual Trash folder"
+msgstr "Virtu�lny prie�inok s odpadkami"
+
+#: mail/component-factory.c:113
 msgid "This folder cannot contain messages."
-msgstr "Tento priečinok nemôže obsahovať správy."
+msgstr "Tento prie�inok nem��e obsahova� spr�vy."
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:344
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:344
 msgid "Change this folder's properties"
-msgstr "Zmení vlastnosti tohto priečinku"
+msgstr "Zmen� vlastnosti tohto prie�inku"
 
-#: mail/component-factory.c:739
+#: mail/component-factory.c:766
 msgid "New Mail Message"
-msgstr "Nová správa"
+msgstr "Nov� spr�va"
 
-#: mail/component-factory.c:739
+#: mail/component-factory.c:766
 msgid "New _Mail Message"
-msgstr "Nová _správa"
+msgstr "Nov� _spr�va"
 
-#: mail/component-factory.c:771
+#: mail/component-factory.c:797
 msgid "Cannot initialize Evolution's mail component."
-msgstr "Nie je možné inicializovať poštový komponent Evolution."
+msgstr "Nie je mo�n� inicializova� po�tov� komponent Evolution."
 
-#: mail/component-factory.c:908
+#: mail/component-factory.c:974
 msgid "Cannot register storage with shell"
-msgstr "Nie je možné zaregistrovať sklad u shellu"
+msgstr "Nie je mo�n� zaregistrova� sklad u shellu"
 
-#: mail/folder-browser-ui.c:257
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Vlastnosti \"%s\""
 
-#: mail/folder-browser-ui.c:259
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:233 mail/mail-display.c:281
+#: mail/folder-browser.c:229 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
-msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
+msgstr "Nie je mo�n� vytvori� do�asn� prie�inok: %s"
 
-#: mail/folder-browser.c:906
+#: mail/folder-browser.c:905
 msgid "Create vFolder from Search"
-msgstr "Vytvoriť vPriečinok z výsledku hľadania"
+msgstr "Vytvori� vPrie�inok z v�sledku h�adania"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1250
 msgid "VFolder on _Subject"
-msgstr "Vpriečinok na _predmet"
+msgstr "Vprie�inok na _predmet"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1253
 msgid "VFolder on Se_nder"
-msgstr "Vpriečinok na _odosielateľa"
+msgstr "Vprie�inok na _odosielate�a"
 
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1256
 msgid "VFolder on _Recipients"
-msgstr "Vpriečinok na _adresátov"
+msgstr "Vprie�inok na _adres�tov"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1259
 msgid "VFolder on Mailing _List"
-msgstr "VPriečinok na _konferenciu"
+msgstr "VPrie�inok na _konferenciu"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1265
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1268
 msgid "Filter on Sen_der"
-msgstr "Filter na o_dosielateľovi"
+msgstr "Filter na o_dosielate�ovi"
 
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1271
 msgid "Filter on Re_cipients"
-msgstr "Filter na _adresátoch"
+msgstr "Filter na _adres�toch"
 
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1274
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1285 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
-msgstr "_Upraviť ako novú správu..."
+msgstr "_Upravi� ako nov� spr�vu..."
 
-#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1287 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
-msgstr "Uložiť _ako..."
+msgstr "Ulo�i� _ako..."
 
-#: mail/folder-browser.c:1290
+#: mail/folder-browser.c:1289
 msgid "_Print"
-msgstr "_Tlačiť"
+msgstr "_Tla�i�"
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1294 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
-msgstr "_Odpovedať odosielateľovi"
+msgstr "_Odpoveda� odosielate�ovi"
 
-#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1296 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
-msgstr "Odpovedať _zoznamu"
+msgstr "Odpoveda� _zoznamu"
 
-#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
-msgstr "Odpovedať _všetkým"
+msgstr "Odpoveda� _v�etk�m"
 
-#: mail/folder-browser.c:1301
+#: mail/folder-browser.c:1300
 msgid "_Forward"
-msgstr "Poslať ď_alej"
+msgstr "Posla� �_alej"
 
-#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1303 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
-msgstr "Označiť ako _prečítanú"
+msgstr "Ozna�i� ako _pre��tan�"
 
-#: mail/folder-browser.c:1306 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1305 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
-msgstr "Označiť ako _neprečítanú"
+msgstr "Ozna�i� ako _nepre��tan�"
 
-#: mail/folder-browser.c:1308
+#: mail/folder-browser.c:1307
 msgid "Mark as _Important"
-msgstr "Označiť ako _dôležitú"
+msgstr "Ozna�i� ako _d�le�it�"
 
-#: mail/folder-browser.c:1310
+#: mail/folder-browser.c:1309
 msgid "Mark as Unim_portant"
-msgstr "Označiť ako nedô_ležitú"
+msgstr "Ozna�i� ako ned�_le�it�"
 
-#: mail/folder-browser.c:1315
+#: mail/folder-browser.c:1314
 msgid "_Move to Folder..."
-msgstr "Pre_sunúť do priečinka..."
+msgstr "Pre_sun�� do prie�inka..."
 
-#: mail/folder-browser.c:1317
+#: mail/folder-browser.c:1316
 msgid "_Copy to Folder..."
-msgstr "_Kopírovať do priečinku..."
+msgstr "_Kop�rova� do prie�inku..."
 
-#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1320 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
-msgstr "Obnoviť _zmazané"
+msgstr "Obnovi� _zmazan�"
 
-#: mail/folder-browser.c:1326
+#: mail/folder-browser.c:1325
 msgid "Add Sender to Address Book"
-msgstr "Pridať odosielateľa do adresára"
+msgstr "Prida� odosielate�a do adres�ra"
 
-#: mail/folder-browser.c:1331
+#: mail/folder-browser.c:1330
 msgid "Apply Filters"
-msgstr "Použiť filtre"
+msgstr "Pou�i� filtre"
 
-#: mail/folder-browser.c:1335
+#: mail/folder-browser.c:1334
 msgid "Create Ru_le From Message"
-msgstr "Vytvoriť pra_vidlo zo správy"
+msgstr "Vytvori� pra_vidlo zo spr�vy"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1492
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:1494
+#: mail/folder-browser.c:1493
 msgid "VFolder on Mailing List"
-msgstr "VPriečinok na konferenciu"
+msgstr "VPrie�inok na konferenciu"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1495
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1496
 #, c-format
 msgid "VFolder on Mailing List (%s)"
-msgstr "VPriečinok na konferenciu (%s)"
+msgstr "VPrie�inok na konferenciu (%s)"
 
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
-msgstr "Získanie informácie o priečinku"
+msgstr "Z�skanie inform�cie o prie�inku"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
-msgstr "Vytváracie rozhranie pre import súborov mbox do Evolution"
+msgstr "Vytv�racie rozhranie pre import s�borov mbox do Evolution"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
 msgid "Imports mbox files into Evolution"
-msgstr "Importuje súbory mbox do Evolution"
+msgstr "Importuje s�bory mbox do Evolution"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Vytváracie rozhranie pre import súborov Outlook Express 4 do Evolution"
+msgstr "Vytv�racie rozhranie pre import s�borov Outlook Express 4 do Evolution"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importuje súbory Outlook Express 4 do Evolution"
+msgstr "Importuje s�bory Outlook Express 4 do Evolution"
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
-msgstr "Súčasný formát ukladania:"
+msgstr "S��asn� form�t ukladania:"
 
 #: mail/local-config.glade.h:2
 msgid "Mailbox Format"
-msgstr "Formát poštová schránky"
+msgstr "Form�t po�tov� schr�nky"
 
 #: mail/local-config.glade.h:3
 msgid "New store format:"
-msgstr "Nový formát ukladania:"
+msgstr "Nov� form�t ukladania:"
 
 #: mail/local-config.glade.h:4
 msgid ""
@@ -7782,9 +7916,9 @@ msgid ""
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
-"Poznámka: Pri prevode medzi formátmi poštových schránok\n"
-"nie je možná automatická oprava pri zlyhaní (napr. nedostatku\n"
-"miesta na disku). Prosím, používajte túto funkciu opatrne."
+"Pozn�mka: Pri prevode medzi form�tmi po�tov�ch schr�nok\n"
+"nie je mo�n� automatick� oprava pri zlyhan� (napr. nedostatku\n"
+"miesta na disku). Pros�m, pou��vajte t�to funkciu opatrne."
 
 #: mail/local-config.glade.h:7
 msgid "maildir"
@@ -7800,69 +7934,73 @@ msgstr "mh"
 
 #: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
-msgstr "Nevyplnili ste všetky povinné informácie."
+msgstr "Nevyplnili ste v�etky povinn� inform�cie."
 
 #. give our dialog an OK button and title
 #: mail/mail-account-editor-news.c:160
 msgid "Evolution News Editor"
-msgstr "Editor diskusných skupín Evolution"
+msgstr "Editor diskusn�ch skup�n Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
-msgstr "Editor účtov Evolution"
+msgstr "Editor ��tov Evolution"
 
-#: mail/mail-account-gui.c:998
+#: mail/mail-account-gui.c:1010
 msgid "Save signature"
-msgstr "Uložiť podpis"
+msgstr "Ulo�i� podpis"
 
-#: mail/mail-account-gui.c:1004
+#: mail/mail-account-gui.c:1016
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
-"Tento podpis bol zmenený, ale neuložený.\n"
+"Tento podpis bol zmenen�, ale neulo�en�.\n"
 "\n"
-"Chcete uložiť zmeny?"
+"Chcete ulo�i� zmeny?"
+
+#: mail/mail-account-gui.c:1597
+msgid "You may not create two accounts with the same name."
+msgstr "Nem��ete vytvori� dva ��ty s rovnak�m menom."
 
 #: mail/mail-accounts.c:145
 msgid " (default)"
-msgstr " (štandard)"
+msgstr " (�tandard)"
 
 #: mail/mail-accounts.c:190
 msgid "Disable"
-msgstr "Zakázať"
+msgstr "Zak�za�"
 
 #: mail/mail-accounts.c:192
 msgid "Enable"
-msgstr "Povoliť"
+msgstr "Povoli�"
 
-#: mail/mail-accounts.c:280
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
-msgstr "Naozaj chcete odstrániť tento účet?"
+msgstr "Naozaj chcete odstr�ni� tento ��et?"
 
-#: mail/mail-accounts.c:284
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
-msgstr "Neodstraňovať"
+msgstr "Neodstra�ova�"
 
-#: mail/mail-accounts.c:287
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
-msgstr "Naozaj odstrániť účet?"
+msgstr "Naozaj odstr�ni� ��et?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
-msgstr "Naozaj chcete odstrániť tento účet diskusných skupín?"
+msgstr "Naozaj chcete odstr�ni� tento ��et diskusn�ch skup�n?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:41
+#: mail/mail-accounts.c:758 mail/mail-config.glade.h:42
 msgid "Mail Settings"
-msgstr "Nastavenie pošty"
+msgstr "Nastavenie po�ty"
 
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
-msgstr "Pošta pre %s"
+msgstr "Po�ta pre %s"
 
 #: mail/mail-autofilter.c:213
 #, c-format
@@ -7872,7 +8010,7 @@ msgstr "Predmet je %s"
 #: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
-msgstr "Pošta od %s"
+msgstr "Po�ta od %s"
 
 #: mail/mail-autofilter.c:285
 #, c-format
@@ -7881,232 +8019,247 @@ msgstr "%s konferencia"
 
 #: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
-msgstr "Pridať pravidlo filtra"
+msgstr "Prida� pravidlo filtra"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
 "receive or compose mail.\n"
 "Would you like to configure it now?"
 msgstr ""
-"Nemáte nastaveného poštového klienta.\n"
-"To ale musíte urobiť predtým, ako budete\n"
-"posielať, prijímať alebo písať poštu.\n"
-"Chcete ho nastaviť teraz?"
+"Nem�te nastaven�ho po�tov�ho klienta.\n"
+"To ale mus�te urobi� predt�m, ako budete\n"
+"posiela�, prij�ma� alebo p�sa� po�tu.\n"
+"Chcete ho nastavi� teraz?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
-"Predtým, ako začnete písať správu,\n"
-"musíte nastaviť identitu."
+"Predt�m, ako za�nete p�sa� spr�vu,\n"
+"mus�te nastavi� identitu."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
-"Predtým, ako začnete písať správu,\n"
-"musíte nastaviť spôsob prenosu.."
+"Predt�m, ako za�nete p�sa� spr�vu,\n"
+"mus�te nastavi� sp�sob prenosu.."
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
-msgstr "Nemáte nastavený spôsob prenosu pošty"
+msgstr "Nem�te nastaven� sp�sob prenosu po�ty"
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
-"Táto správa nemá predmet.\n"
-"Naozaj ju chcete poslať?"
+"T�to spr�va nem� predmet.\n"
+"Naozaj ju chcete posla�?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:262
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Ked�e je zoznam kontaktov, ktor� posielate, nastaven� tak, aby skryl adresy, "
+"t�to spr�va bude obsahova� iba pr�jemcov Bcc."
+
+#: mail/mail-callbacks.c:266
+msgid "This message contains only Bcc recipients."
+msgstr "T�to spr�va obsahuje iba adres�tov Bcc."
+
+#: mail/mail-callbacks.c:270
 msgid ""
-"This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Táto správa obsahuje iba adresátov Bcc.\n"
-"Je možné, že ich poštový server zverejní pridaním hlavičky Apparently-To.\n"
-"Poslať aj tak?"
+"Je mo�n�, �e po�tov� server zverejn� zoznam pr�jemcov pridan�m hlavi�ky Apparently-To.\n"
+"Posla� aj tak?"
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
-msgstr "Musíte zadať adresátov pre poslanie tejto správy."
+msgstr "Mus�te zada� adres�tov pre poslanie tejto spr�vy."
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:424
 msgid "You must configure an account before you can send this email."
-msgstr "Musíte nastaviť účet pred poslaním tejto správy."
+msgstr "Mus�te nastavi� ��et pred poslan�m tejto spr�vy."
 
-#: mail/mail-callbacks.c:633
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "V %s, %s zapísané:"
+#: mail/mail-callbacks.c:666
+msgid "an unknown sender"
+msgstr "nezn�my odosielate�"
 
-#: mail/mail-callbacks.c:894
-msgid "Forwarded message:\n"
-msgstr "Predaná správa:\n"
+#: mail/mail-callbacks.c:671
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "D�a %a, %Y-%m-%d at %H:%M, %%s nap�sal:"
 
-#: mail/mail-callbacks.c:991
+#: mail/mail-callbacks.c:1029
 msgid "Move message(s) to"
-msgstr "Presunúť správu do"
+msgstr "Presun�� spr�vu do"
 
-#: mail/mail-callbacks.c:993
+#: mail/mail-callbacks.c:1031
 msgid "Copy message(s) to"
-msgstr "Kopírovať správu do"
+msgstr "Kop�rova� spr�vu do"
 
-#: mail/mail-callbacks.c:1362
+#: mail/mail-callbacks.c:1400
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
-msgstr "Naozaj chcete upraviť všetkých %d správ?"
+msgstr "Naozaj chcete upravi� v�etk�ch %d spr�v?"
 
-#: mail/mail-callbacks.c:1384
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
-"Upravovať môžete iba správy uložené\n"
-"v priečinku Koncepty."
+"Upravova� m��ete iba spr�vy ulo�en�\n"
+"v prie�inku Koncepty."
 
-#: mail/mail-callbacks.c:1418
+#: mail/mail-callbacks.c:1456
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
-"Iba správy z priečinku Odoslané je možné\n"
-"znovu poslať."
+"Iba spr�vy z prie�inku Odoslan� je mo�n�\n"
+"znovu posla�."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1468
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
+msgstr "Naozaj chcete znovu posla� v�etk�ch %d spr�v?"
 
-#: mail/mail-callbacks.c:1451
+#: mail/mail-callbacks.c:1489
 msgid "No Message Selected"
-msgstr "Žiadna vybraná správa"
+msgstr "�iadna vybran� spr�va"
 
-#: mail/mail-callbacks.c:1536
+#: mail/mail-callbacks.c:1574
 msgid "Save Message As..."
-msgstr "Uložiť správu ako..."
+msgstr "Ulo�i� spr�vu ako..."
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1576
 msgid "Save Messages As..."
-msgstr "Uložiť správy ako..."
+msgstr "Ulo�i� spr�vy ako..."
 
-#: mail/mail-callbacks.c:1683 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1721 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varovanie"
 
-#: mail/mail-callbacks.c:1688
+#: mail/mail-callbacks.c:1726
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Táto operácia natrvalo odstráni všetky správy označené ako zmazané. Ak "
-"budete pokračovať, nebude už možné tieto správy obnoviť.\n"
+"T�to oper�cia natrvalo odstr�ni v�etky spr�vy ozna�en� ako zmazan�. Ak "
+"budete pokra�ova�, nebude u� mo�n� tieto spr�vy obnovi�.\n"
 "\n"
-"Naozaj odstrániť tieto správy?"
+"Naozaj odstr�ni� tieto spr�vy?"
 
-#: mail/mail-callbacks.c:1695
+#: mail/mail-callbacks.c:1733
 msgid "Do not ask me again."
-msgstr "Túto správu už nezobrazovať."
+msgstr "T�to spr�vu u� nezobrazova�."
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1838
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
-"Chyba pri načítavaní informácie o filtroch:\n"
+"Chyba pri na��tavan� inform�cie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1810
+#: mail/mail-callbacks.c:1848
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:1856
+#: mail/mail-callbacks.c:1894
 msgid "Print Message"
-msgstr "Tlačiť správu"
+msgstr "Tla�i� spr�vu"
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1940
 msgid "Printing of message failed"
-msgstr "Tlač správy zlyhala"
+msgstr "Tla� spr�vy zlyhala"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:2024
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
+msgstr "Naozaj chcete otvori� v�etk�ch %d spr�v v samostatn�ch okn�ch?"
 
 #: mail/mail-config-druid.c:135
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
-"Prosím, zadajte vaše meno a e-mailovú adresu. \"Nepovinné\" informácie "
-"nemusíte zadať, iba ak chcete, aby boli posielané vo vašich správach."
+"Pros�m, zadajte va�e meno a e-mailov� adresu. \"Nepovinn�\" inform�cie\n"
+"nemus�te zada�, iba ak chcete, aby boli posielan� vo va�ich spr�vach."
 
 #: mail/mail-config-druid.c:137
 msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
-"Prosím, zadajte informácie o vašom serveri pre prijímanú poštu. Ak neviete, "
-"ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
-"poskytovateľa pripojenia na Internet."
+"Pros�m, zadajte inform�cie o va�om serveri pre prij�man� po�tu.\n"
+"Ak neviete, ktor� typ serveru pou�i�, kontaktujte v�ho administr�tora\n"
+"alebo poskytovate�a pripojenia na Internet."
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr "Pros�m, vyberte si z t�chto mo�nost�"
 
 #: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
-"Prosím, zadajte informácie o vašom serveri pre odosielanú poštu. Ak neviete, "
-"ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
-"poskytovateľa pripojenia na Internet."
+"Pros�m, zadajte inform�cie o va�om serveri pre odosielan� po�tu. Ak neviete,\n"
+"ktor� typ serveru pou�i�, kontaktujte v�ho administr�tora alebo poskytovate�a\n"
+"pripojenia na Internet."
 
 #: mail/mail-config-druid.c:143
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"Už ste skoro na konci nastavenia pošty. Vaše meno, server pre príjem pošty a "
-"spôsob odosielania budú použité pre vytvorenie poštového účtu Evolution. "
-"Prosím, zadajte meno pre tento účet. Toto meno bude používané iba pre "
-"zobrazenie."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"U� ste skoro na konci nastavenia po�ty. Va�e meno, server pre pr�jem po�ty\n"
+"a sp�sob odosielania bud� pou�it� pre vytvorenie po�tov�ho ��tu Evolution.\n"
+"Pros�m, zadajte meno pre tento ��et.\n"
+"Toto meno bude pou��van� iba pre zobrazenie."
 
 #. set window title
-#: mail/mail-config-druid.c:622
+#: mail/mail-config-druid.c:570
 msgid "Evolution Account Assistant"
-msgstr "Sprievodca účtom Evolution"
+msgstr "Sprievodca ��tom Evolution"
 
 #. right now, the URL always works basically as a matter of luck...
 #. * both IMAP and mbox spool stores have INBOX as their inbox folder
 #. * name. I don't think this will work with maildir. How can we figure out
 #. * what shortcut to insert?
 #.
-#: mail/mail-config.c:1577
+#: mail/mail-config.c:1587
 #, c-format
 msgid "%s: Inbox"
-msgstr "%s: Doručená pošta"
+msgstr "%s: Doru�en� po�ta"
 
-#: mail/mail-config.c:1807
+#: mail/mail-config.c:1829
 msgid "Checking Service"
-msgstr "Kontrolujem službu"
+msgstr "Kontrolujem slu�bu"
 
-#: mail/mail-config.c:1878 mail/mail-config.c:1881
+#: mail/mail-config.c:1900 mail/mail-config.c:1903
 msgid "Connecting to server..."
-msgstr "Pripájam sa na server..."
+msgstr "Prip�jam sa na server..."
 
 #: mail/mail-config.glade.h:1
 msgid " color"
@@ -8114,39 +8267,39 @@ msgstr " farba"
 
 #: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
-msgstr "(Táto verzia Evolution nepodporuje SSL)"
+msgstr "(T�to verzia Evolution nepodporuje SSL)"
 
 #: mail/mail-config.glade.h:3
 msgid "Account"
-msgstr "Účet"
+msgstr "��et"
 
 #: mail/mail-config.glade.h:4
 msgid "Account Information"
-msgstr "Informácia o účte"
+msgstr "Inform�cia o ��te"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
-msgstr "Správa účtu"
+msgstr "Spr�va ��tu"
 
 #: mail/mail-config.glade.h:6
 msgid "Accounts"
-msgstr "Účty"
+msgstr "��ty"
 
 #: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
-msgstr "Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
+msgstr "V�dy �ifrova� k�piu sebe pri posielan� �ifrovanej spr�vy"
 
 #: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
-msgstr "Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
+msgstr "V�dy �ifrova� k�piu sebe pri posielan� �ifrovanej spr�vy"
 
 #: mail/mail-config.glade.h:9
 msgid "Always sign outgoing messages when using this account"
-msgstr "Vždy podpisovať správy pri použití tohto účtu"
+msgstr "V�dy podpisova� spr�vy pri pou�it� tohto ��tu"
 
 #: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
-msgstr "Príloha"
+msgstr "Pr�loha"
 
 #: mail/mail-config.glade.h:11
 msgid "Authentication"
@@ -8158,7 +8311,7 @@ msgstr "Typ overenia:"
 
 #: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
-msgstr "ID certifikátu:"
+msgstr "ID certifik�tu:"
 
 #: mail/mail-config.glade.h:15
 msgid "Composer"
@@ -8173,461 +8326,468 @@ msgid ""
 "\n"
 "Click \"Finish\" to save your settings."
 msgstr ""
-"Blahoželáme, nastavenie vašej pošty je hotové.\n"
+"Blaho�el�me, nastavenie va�ej po�ty je hotov�.\n"
 "\n"
-"Teraz môžete začať používať Evolution\n"
-"pre posielanie a prijímanie pošty. \n"
+"Teraz m��ete za�a� pou��va� Evolution\n"
+"pre posielanie a prij�manie po�ty. \n"
 "\n"
-"Kliknutím na \"Dokončiť\" uložíte vaše nastavenie."
+"Kliknut�m na \"Dokon�i�\" ulo��te va�e nastavenie."
 
 #: mail/mail-config.glade.h:22
 msgid "De_fault"
-msgstr "Š_tandardné"
+msgstr "�_tandardn�"
 
 #: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
-msgstr "Štandardný štýl \"Predať ďalej\" je: "
+msgstr "�tandardn� �t�l \"Preda� �alej\" je: "
 
 #: mail/mail-config.glade.h:24
 msgid "Default character encoding: "
-msgstr "Štandardná znaková sada:"
+msgstr "�tandardn� znakov� sada:"
 
 #: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
-msgstr "Digitálne IDs..."
+msgstr "Digit�lne IDs..."
 
 #: mail/mail-config.glade.h:26
 msgid "Display"
 msgstr "Zobrazenie"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:28
 msgid "Drafts"
 msgstr "Koncepty"
 
 #: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
-msgstr "Priečinok konceptov:"
+msgstr "Prie�inok konceptov:"
 
 #: mail/mail-config.glade.h:30
 msgid "E_nable"
-msgstr "_Povoliť"
+msgstr "_Povoli�"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31
+msgid "Each account must have a different name."
+msgstr "Ka�d� ��et mus� ma� in� meno."
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
-msgstr "Upraviť..."
+msgstr "Upravi�..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
-msgstr "Povolené"
+msgstr "Povolen�"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
-msgstr "Získať digitálne ID..."
+msgstr "Z�ska� digit�lne ID..."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
-msgstr "Súbor s HTML podpisom:"
+msgstr "S�bor s HTML podpisom:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
-msgstr "v HTML pošte"
+msgstr "v HTML po�te"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
-msgstr "Nastavenie pošty"
+msgstr "Nastavenie po�ty"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
-msgstr "Umiestnenie poštovej schránky"
+msgstr "Umiestnenie po�tovej schr�nky"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
-msgstr "Použiť ho ako š_tandardný účet"
+msgstr "Pou�i� ho ako �_tandardn� ��et"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
-msgstr "Štandardne zobrazovať _náhľad správy"
+msgstr "�tandardne zobrazova� _n�h�ad spr�vy"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
-msgstr "Štandardne zobrazovať správy ako _vlákna"
+msgstr "�tandardne zobrazova� spr�vy ako _vl�kna"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "NNTP server:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "News"
-msgstr "Diskusné skupiny"
+msgstr "Diskusn� skupiny"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
-msgstr "Nepovinné informácie"
+msgstr "Nepovinn� inform�cie"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
-msgstr "ID PGP kľúča:"
+msgstr "ID PGP k���a:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with an _empty subject"
-msgstr "Pýtať sa pri posielaní správ be_z predmetu"
+msgstr "P�ta� sa pri posielan� spr�v be_z predmetu"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
+msgstr "P�ta� sa pri posielan� spr�v s adres�tmi iba v _Bcc"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
-msgstr "Citovať"
+msgstr "Citova�"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
-msgstr "Príjem pošty"
+msgstr "Pr�jem po�ty"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
-msgstr "Prijímam poštu"
+msgstr "Prij�mam po�tu"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
-msgstr "Možnosti príjmu"
+msgstr "Mo�nosti pr�jmu"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
-msgstr "Povinné informácie"
+msgstr "Povinn� inform�cie"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
-msgstr "Bezpečné MIME"
+msgstr "Bezpe�n� MIME"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Security"
-msgstr "Bezpečnosť"
+msgstr "Bezpe�nos�"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
-msgstr "Vyberte súbor pre ukladanie záznamu filtrovania..."
+msgstr "Vyberte s�bor pre ukladanie z�znamu filtrovania..."
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
-msgstr "Posielanie pošty"
+msgstr "Posielanie po�ty"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
-msgstr "Posielanie pošty"
+msgstr "Posielanie po�ty"
 
-#: mail/mail-config.glade.h:72 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:179
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
 msgid "Sent"
-msgstr "Odoslané"
+msgstr "Odoslan�"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
-msgstr "Odoslané a koncepty"
+msgstr "Odoslan� a koncepty"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
-msgstr "Priečinok pre odoslané správy:"
+msgstr "Prie�inok pre odoslan� spr�vy:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
-msgstr "Server vyžaduje _prihlásenie"
+msgstr "Server vy�aduje _prihl�senie"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
-msgstr "Súbor s podpisom:"
+msgstr "S�bor s podpisom:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Zdroj"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
-msgstr "Informácia o zdrojovom kóde"
+msgstr "Inform�cia o zdrojovom k�de"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Zdroje"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
-msgstr "Špeciálne priečinky"
+msgstr "�peci�lne prie�inky"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
-msgstr "Štandardný Unixový súbor mbox"
+msgstr "�tandardn� Unixov� s�bor mbox"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
-msgstr "Použiť bezpečné pripojenie (_SSL)"
+msgstr "Pou�i� bezpe�n� pripojenie (_SSL)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
-"Vitajte v Sprievodcovi nastavením pošty Evolution.\n"
+"Vitajte v Sprievodcovi nastaven�m po�ty Evolution.\n"
 "\n"
-"Kliknutím \"Nasledujúci\" začneme."
+"Kliknut�m \"Nasleduj�ci\" za�neme."
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
-msgstr "_Vždy načítavať obrázky zo siete"
+msgstr "_V�dy na��tava� obr�zky zo siete"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
-msgstr "_Automaticky kontrolovať poštu každých"
+msgstr "_Automaticky kontrolova� po�tu ka�d�ch"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
-msgstr "Kontrolovať _podporované typy"
+msgstr "Kontrolova� _podporovan� typy"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
-msgstr "_E-mailová adresa:"
+msgstr "_E-mailov� adresa:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
-msgstr "Vyprázdniť priečinky na O_dpadky pri ukončení"
+msgstr "Vypr�zdni� prie�inky na O_dpadky pri ukon�en�"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
-msgstr "_Celé meno:"
+msgstr "_Cel� meno:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "_HTML podpis:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
-msgstr "_Zvýrazniť citácie pomocou"
+msgstr "_Zv�razni� cit�cie pomocou"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
-msgstr "_Hostiteľ:"
+msgstr "_Hostite�:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
-msgstr "_Načítať obrázky ak je odosielateľ v adresári"
+msgstr "_Na��ta� obr�zky ak je odosielate� v adres�ri"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
-msgstr "Uložiť _záznam o filtrovaní do:"
+msgstr "Ulo�i� _z�znam o filtrovan� do:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
-msgstr "_Označiť správy ako \"Prečítané\" po"
+msgstr "_Ozna�i� spr�vy ako \"Pre��tan�\" po"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
-msgstr "_Nikdy nenačítať obrázky zo siete"
+msgstr "_Nikdy nena��ta� obr�zky zo siete"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
-msgstr "_Organizácia:"
+msgstr "_Organiz�cia:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
-msgstr "Cesta k spustiteľnému _súboru PGP:"
+msgstr "Cesta k spustite�n�mu _s�boru PGP:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
-msgstr "Pamätať si heslo _PGP pri ukončení"
+msgstr "Pam�ta� si heslo _PGP pri ukon�en�"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
-msgstr "_Uložiť toto heslo"
+msgstr "_Ulo�i� toto heslo"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
-msgstr "Posielať štandardne ako _HTML."
+msgstr "Posiela� �tandardne ako _HTML."
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
-msgstr "Súbor s po_dpisom:"
+msgstr "S�bor s po_dpisom:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
-msgstr "Meno po_užívateľa:"
+msgstr "Meno po_u��vate�a:"
 
 #: mail/mail-config.glade.h:115
+msgid "description"
+msgstr "popis"
+
+#: mail/mail-config.glade.h:117
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "placeholder"
 msgstr "miesto"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:119
 msgid "seconds."
-msgstr "sekúnd."
+msgstr "sek�nd."
 
 #: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
-msgstr "Nepodarilo sa vytvoriť kontext podpisu PGP."
+msgstr "Nepodarilo sa vytvori� kontext podpisu PGP."
 
 #: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
-msgstr "Nepodarilo sa vytvoriť kontext overenia PGP."
+msgstr "Nepodarilo sa vytvori� kontext overenia PGP."
 
 #: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
-msgstr "Nepodarilo sa vytvoriť kontext zašifrovania PGP."
+msgstr "Nepodarilo sa vytvori� kontext za�ifrovania PGP."
 
 #: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
-msgstr "Nepodarilo sa vytvoriť kontext dešifrovania PGP."
+msgstr "Nepodarilo sa vytvori� kontext de�ifrovania PGP."
 
 #: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
-msgstr "Nepodarilo sa vytvoriť kontext podpisu S/MIME."
+msgstr "Nepodarilo sa vytvori� kontext podpisu S/MIME."
 
 #: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
-msgstr "Nepodarilo sa vytvoriť kontext certsonly S/MIME."
+msgstr "Nepodarilo sa vytvori� kontext certsonly S/MIME."
 
 #: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
-msgstr "Nepodarilo sa vytvoriť kontext zašifrovania S/MIME."
+msgstr "Nepodarilo sa vytvori� kontext za�ifrovania S/MIME."
 
 #: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
-msgstr "Nepodarilo sa vytvoriť kontext obálky S/MIME."
+msgstr "Nepodarilo sa vytvori� kontext ob�lky S/MIME."
 
 #: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
-msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
+msgstr "Nepodarilo sa vytvori� kontext dek�dovania S/MIME."
 
-#: mail/mail-display.c:222
+#: mail/mail-display.c:223
 msgid "Save Attachment"
-msgstr "Uložiť prílohu"
+msgstr "Ulo�i� pr�lohu"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:327
 msgid "Save to Disk..."
-msgstr "Uložiť na disk..."
+msgstr "Ulo�i� na disk..."
 
-#: mail/mail-display.c:343
+#: mail/mail-display.c:329
 msgid "View Inline"
-msgstr "Zobraziť v texte"
+msgstr "Zobrazi� v texte"
 
-#: mail/mail-display.c:345
+#: mail/mail-display.c:331
 #, c-format
 msgid "Open in %s..."
-msgstr "Otvoriť v %s..."
+msgstr "Otvori� v %s..."
 
-#: mail/mail-display.c:406
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
-msgstr "Zobraziť v text (pomocou %s)"
+msgstr "Zobrazi� v text (pomocou %s)"
 
-#: mail/mail-display.c:410
+#: mail/mail-display.c:396
 msgid "Hide"
-msgstr "Skryť"
+msgstr "Skry�"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:417
 msgid "External Viewer"
-msgstr "Externý zobrazovač"
+msgstr "Extern� zobrazova�"
 
-#: mail/mail-display.c:1055
+#: mail/mail-display.c:1053
 msgid "Loading message content"
-msgstr "Načítavam obsah správy"
+msgstr "Na��tavam obsah spr�vy"
 
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1512
 msgid "Open Link in Browser"
-msgstr "Otvoriť odkaz v prehliadači"
+msgstr "Otvori� odkaz v prehliada�i"
 
-#: mail/mail-display.c:1413
+#: mail/mail-display.c:1514
 msgid "Copy Link Location"
-msgstr "Kopírovať umiestnenie odkazu"
+msgstr "Kop�rova� umiestnenie odkazu"
 
-#: mail/mail-display.c:1415
+#: mail/mail-display.c:1516
 msgid "Save Link as (FIXME)"
-msgstr "Uložiť odkaz ako"
+msgstr "Ulo�i� odkaz ako"
 
-#: mail/mail-display.c:1417
+#: mail/mail-display.c:1518
 msgid "Save Image as..."
-msgstr "Uložiť obrázok ako..."
+msgstr "Ulo�i� obr�zok ako..."
 
-#: mail/mail-folder-cache.c:147
+#: mail/mail-folder-cache.c:151
 #, c-format
 msgid "%d new"
-msgstr "%d nových"
+msgstr "%d nov�ch"
 
-#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
-#: mail/mail-folder-cache.c:167
+#: mail/mail-folder-cache.c:157 mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:171
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:154
+#: mail/mail-folder-cache.c:158
 #, c-format
 msgid "%d hidden"
-msgstr "skrytých %d"
+msgstr "skryt�ch %d"
 
-#: mail/mail-folder-cache.c:161
+#: mail/mail-folder-cache.c:165
 #, c-format
 msgid "%d selected"
-msgstr "%d vybraných"
+msgstr "%d vybran�ch"
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:174
 #, c-format
 msgid "%d unsent"
-msgstr "%d neposlaných"
+msgstr "%d neposlan�ch"
 
-#: mail/mail-folder-cache.c:172
+#: mail/mail-folder-cache.c:176
 #, c-format
 msgid "%d total"
 msgstr "celkovo %d"
@@ -8635,19 +8795,19 @@ msgstr "celkovo %d"
 #: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
-msgstr "%s príloha"
+msgstr "%s pr�loha"
 
 #: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
+msgstr "Nie je mo�n� spracova� spr�vu MIME. Zobrazujem ako zdrojov� k�d."
 
 #: mail/mail-format.c:760
 msgid "Date"
-msgstr "Dátum"
+msgstr "D�tum"
 
 #: mail/mail-format.c:856
 msgid "Bad Address"
-msgstr "Neplatná adresa"
+msgstr "Neplatn� adresa"
 
 #: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
@@ -8667,92 +8827,97 @@ msgstr "Cc"
 
 #: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
-msgstr "Nenastavený žiadny program GPG/PGP."
+msgstr "Nenastaven� �iadny program GPG/PGP."
 
 #: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
-msgstr "Zašifrovaná správa nie je zobrazená"
+msgstr "Za�ifrovan� spr�va nie je zobrazen�"
 
 #: mail/mail-format.c:1333
 msgid "Encrypted message"
-msgstr "Zašifrovaná správa"
+msgstr "Za�ifrovan� spr�va"
 
 #: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
-msgstr "Kliknite na ikonu pre dešifrovanie."
+msgstr "Kliknite na ikonu pre de�ifrovanie."
 
-#: mail/mail-format.c:1392
+#: mail/mail-format.c:1389
 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ý."
+msgstr "T�to spr�va je digit�lne podp�san� a podpis je platn�."
 
-#: mail/mail-format.c:1403
+#: mail/mail-format.c:1400
 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ý."
+msgstr "T�to spr�va je digit�lne podp�san� ale podpis nie je platn�."
 
-#: mail/mail-format.c:2061
+#: mail/mail-format.c:2058
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:2075
+#: mail/mail-format.c:2072
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
+msgstr "Odkaz na lok�lny s�bor (%s) platn� na serveri \"%s\""
 
-#: mail/mail-format.c:2080
+#: mail/mail-format.c:2077
 #, c-format
 msgid "Pointer to local file (%s)"
-msgstr "Odkaz na lokálny súbor (%s)"
+msgstr "Odkaz na lok�lny s�bor (%s)"
 
-#: mail/mail-format.c:2109
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to remote data (%s)"
-msgstr "Odkaz na vzdialené dáta (%s)"
+msgstr "Odkaz na vzdialen� d�ta (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2114
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
+msgstr "Odkaz na nezn�me extern� d�ta (typ \"%s\")"
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2119
 msgid "Malformed external-body part."
-msgstr "Nesprávna časť externého tela."
+msgstr "Nespr�vna �as� extern�ho tela."
 
-#: mail/mail-local.c:466
+#: mail/mail-local.c:330
 #, c-format
-msgid "Opening '%s'"
-msgstr "Otváram '%s'"
+msgid "No such folder /%s"
+msgstr "Prie�inok /%s neexistuje"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:460
+#, c-format
+msgid "Registering '%s'"
+msgstr "Registrujem '%s'"
+
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Mení priečinok \"%s\" na formát \"%s\""
+msgstr "Men� prie�inok \"%s\" na form�t \"%s\""
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 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"
+"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:914
+#: mail/mail-local.c:908
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
-"Ak nemôžete otvoriť túto poštovú schránku, potom\n"
-"ju budete musieť opraviť ručne."
+"Ak nem��ete otvori� t�to po�tov� schr�nku, potom\n"
+"ju budete musie� opravi� ru�ne."
 
-#: mail/mail-local.c:1007
+#: mail/mail-local.c:1001
 msgid "You cannot change the format of a non-local folder."
-msgstr "Nemôžete zmeniž formát nelokálnych priečinkov."
+msgstr "Nem��ete zmeni� form�t nelok�lnych prie�inkov."
 
-#: mail/mail-local.c:1018
+#: mail/mail-local.c:1012
 #, c-format
 msgid "Reconfigure %s"
-msgstr "Znovu nastaviť %s"
+msgstr "Znovu nastavi� %s"
 
 #: mail/mail-mt.c:187
 #, c-format
@@ -8760,7 +8925,7 @@ msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
-"Chyba počas '%s':\n"
+"Chyba po�as '%s':\n"
 "%s"
 
 #: mail/mail-mt.c:190
@@ -8769,478 +8934,487 @@ msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
-"Chyba pri vykonávaní operácie:\n"
+"Chyba pri vykon�van� oper�cie:\n"
 "%s"
 
 #. Remember the password?
 #: mail/mail-mt.c:439
 msgid "Remember this password"
-msgstr "Uložiť toto heslo"
+msgstr "Ulo�i� toto heslo"
 
 #: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Pracujem"
 
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:85
 msgid "Filtering Folder"
-msgstr "Filtrujem priečinok"
+msgstr "Filtrujem prie�inok"
 
-#: mail/mail-ops.c:227
+#: mail/mail-ops.c:228
 msgid "Fetching Mail"
-msgstr "Prijímam poštu"
+msgstr "Prij�mam po�tu"
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:598
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posielam \"%s\""
 
-#: mail/mail-ops.c:709
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "Posielam správu %d z %d"
+msgstr "Posielam spr�vu %d z %d"
 
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:736
 #, c-format
 msgid "Failed on message %d of %d"
-msgstr "Zlyhanie na správe %d z %d"
+msgstr "Zlyhanie na spr�ve %d z %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:738 mail/mail-send-recv.c:500
 msgid "Complete."
-msgstr "Dokončené."
+msgstr "Dokon�en�."
 
-#: mail/mail-ops.c:823
+#: mail/mail-ops.c:831
 msgid "Saving message to folder"
-msgstr "Ukladám správu do priečinku"
+msgstr "Uklad�m spr�vu do prie�inku"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:910
 #, c-format
 msgid "Moving messages to %s"
-msgstr "Presúvam správy do %s"
+msgstr "Pres�vam spr�vy do %s"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:910
 #, c-format
 msgid "Copying messages to %s"
-msgstr "Kopírujem správy do %s"
+msgstr "Kop�rujem spr�vy do %s"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:927
 msgid "Moving"
-msgstr "Premiestňujem"
+msgstr "Premiest�ujem"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:930
 msgid "Copying"
-msgstr "Kopírujem"
+msgstr "Kop�rujem"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "Prechádzam priečinky v \"%s\""
-
-#. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
-msgid "Trash"
-msgstr "Odpadky"
+msgstr "Prech�dzam prie�inky v \"%s\""
 
-#: mail/mail-ops.c:1211
+#: mail/mail-ops.c:1219
 msgid "Forwarded messages"
-msgstr "Správy predané ďalej"
+msgstr "Spr�vy predan� �alej"
 
-#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
+#: mail/mail-ops.c:1261
 #, c-format
 msgid "Opening folder %s"
-msgstr "Otváram priečinok %s"
+msgstr "Otv�ram prie�inok %s"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1330
 #, c-format
 msgid "Opening store %s"
-msgstr "Otváram sklad %s"
+msgstr "Otv�ram sklad %s"
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1403
+#, c-format
+msgid "Creating folder %s"
+msgstr "Vytv�ram prie�inok %s"
+
+#: mail/mail-ops.c:1473
 #, c-format
 msgid "Removing folder %s"
-msgstr "Odstraňujem priečinok %s"
+msgstr "Odstra�ujem prie�inok %s"
 
-#: mail/mail-ops.c:1599
+#: mail/mail-ops.c:1569
+#, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synchronizujem '%s'"
+
+#: mail/mail-ops.c:1620
 msgid "Refreshing folder"
-msgstr "Aktualizujem priečinok"
+msgstr "Aktualizujem prie�inok"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1656
 msgid "Expunging folder"
-msgstr "Čistím priečinok"
+msgstr "�ist�m prie�inok"
 
-#: mail/mail-ops.c:1684
+#: mail/mail-ops.c:1705
 #, c-format
 msgid "Retrieving message %s"
-msgstr "Získavam správu %s"
+msgstr "Z�skavam spr�vu %s"
 
-#: mail/mail-ops.c:1751
+#: mail/mail-ops.c:1772
 #, c-format
 msgid "Retrieving %d message(s)"
-msgstr "Získavam %d správ"
+msgstr "Z�skavam %d spr�v"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1858
 #, c-format
 msgid "Saving %d messsage(s)"
-msgstr "Ukladám %d správ"
+msgstr "Uklad�m %d spr�v"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1938
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
-"Nepodarilo sa vytvoriť výstupný súbor: %s\n"
+"Nepodarilo sa vytvori� v�stupn� s�bor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1964
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
-"Chyba pri ukladaní správ do `%s':\n"
+"Chyba pri ukladan� spr�v do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2038
 msgid "Saving attachment"
-msgstr "Ukladám prílohu"
+msgstr "Uklad�m pr�lohu"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2054
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
-"Nepodarilo sa vytvoriť výstupný súbor: %s\n"
+"Nepodarilo sa vytvori� v�stupn� s�bor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2085
 #, c-format
 msgid "Could not write data: %s"
-msgstr "Nie je možné zapísať dáta: %s"
+msgstr "Nie je mo�n� zap�sa� d�ta: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2154
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
-msgstr "_Nájsť"
+msgstr "_N�js�"
 
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
-msgstr "(Správa bez mena)"
+msgstr "(Spr�va bez mena)"
 
-#: mail/mail-search.c:237
+#: mail/mail-search.c:241
 msgid "Untitled Message"
-msgstr "Správa bez mena"
+msgstr "Spr�va bez mena"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:245
 msgid "Empty Message"
-msgstr "Prázdna správa"
+msgstr "Pr�zdna spr�va"
 
-#: mail/mail-search.c:288
+#: mail/mail-search.c:292
 msgid "Find in Message"
-msgstr "Nájsť v správe"
+msgstr "N�js� v spr�ve"
 
-#: mail/mail-search.c:318
+#: mail/mail-search.c:322
 msgid "Case Sensitive"
-msgstr "Rozlišovať veľkosť písmen"
+msgstr "Rozli�ova� ve�kos� p�smen"
 
-#: mail/mail-search.c:320
+#: mail/mail-search.c:324
 msgid "Search Forward"
-msgstr "Hľadať dopredu"
+msgstr "H�ada� dopredu"
 
-#: mail/mail-search.c:340
+#: mail/mail-search.c:344
 msgid "Find:"
-msgstr "Hľadať:"
+msgstr "H�ada�:"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:347
 msgid "Matches:"
-msgstr "Odpovedá:"
+msgstr "Odpoved�:"
 
 #: mail/mail-send-recv.c:138
 msgid "Cancelling..."
-msgstr "Ruším..."
+msgstr "Ru��m..."
 
-#: mail/mail-send-recv.c:257
-msgid "Send & Receive mail"
-msgstr "Príjem a odoslanie pošty"
+#: mail/mail-send-recv.c:258
+msgid "Send & Receive Mail"
+msgstr "Pr�jem a odoslanie po�ty"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
+#: mail/mail-send-recv.c:313 mail/mail-send-recv.c:366
 msgid "Waiting..."
-msgstr "Čakám..."
+msgstr "�ak�m..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:496
 msgid "Cancelled."
-msgstr "Zrušené."
+msgstr "Zru�en�."
 
 #: mail/mail-session.c:182
 msgid "User canceled operation."
-msgstr "Používateľ zrušil operáciu."
+msgstr "Pou��vate� zru�il oper�ciu."
 
 #: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Nie je možné vytvoriť dočasnú poštovú schránku `%s': %s"
+msgstr "Nie je mo�n� vytvori� do�asn� po�tov� schr�nku `%s': %s"
 
-#: mail/mail-tools.c:241
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "Predaná správa - %s"
+msgstr "Predan� spr�va - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:294
 msgid "Forwarded message"
-msgstr "Predaná správa"
+msgstr "Predan� spr�va"
 
-#: mail/mail-tools.c:471
+#: mail/mail-tools.c:442
 msgid "Forwarded Message"
-msgstr "Predaná správa"
+msgstr "Predan� spr�va"
 
-#: mail/mail-vfolder.c:282
-msgid "VFolders"
-msgstr "VPriečinky"
-
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:500
 msgid "New VFolder"
-msgstr "Nový vPriečinok"
+msgstr "Nov� vPrie�inok"
 
-#: mail/message-browser.c:125
+#: mail/message-browser.c:121
 msgid "(No subject)"
 msgstr "(Bez predmetu)"
 
-#: mail/message-browser.c:127
+#: mail/message-browser.c:123
 #, c-format
 msgid "%s - Message"
-msgstr "%s - Správa"
+msgstr "%s - Spr�va"
 
-#: mail/message-list.c:636
+#: mail/message-list.c:640
 msgid "Unseen"
-msgstr "Nevidené"
+msgstr "Neviden�"
 
-#: mail/message-list.c:637
+#: mail/message-list.c:641
 msgid "Seen"
-msgstr "Videné"
+msgstr "Viden�"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:642
 msgid "Answered"
-msgstr "Odpovedané"
+msgstr "Odpovedan�"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:643
 msgid "Multiple Unseen Messages"
-msgstr "Viacero neprečítaných správ"
+msgstr "Viacero nepre��tan�ch spr�v"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:644
 msgid "Multiple Messages"
-msgstr "Viacero správ"
+msgstr "Viacero spr�v"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:648
 msgid "Lowest"
-msgstr "Najnižšia"
+msgstr "Najni��ia"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:649
 msgid "Lower"
-msgstr "Nižšia"
+msgstr "Ni��ia"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:653
 msgid "Higher"
-msgstr "Vyššia"
+msgstr "Vy��ia"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:654
 msgid "Highest"
-msgstr "Najvyššia"
+msgstr "Najvy��ia"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:911
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:920
 msgid "Yesterday %l:%M %p"
-msgstr "Včera %l:%M %p"
+msgstr "V�era %l:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:932
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:938
+#: mail/message-list.c:942
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2314
+#: mail/message-list.c:2316
 msgid "Generating message list"
-msgstr "Generujem zoznam správ"
+msgstr "Generujem zoznam spr�v"
 
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
-msgstr "Vyznačené"
+msgstr "Vyzna�en�"
 
 #: mail/message-list.etspec.h:4
 msgid "Received"
-msgstr "Prijaté"
+msgstr "Prijat�"
 
 #: mail/message-list.etspec.h:7
 msgid "Size"
-msgstr "Veľkosť"
+msgstr "Ve�kos�"
 
-#: mail/subscribe-dialog.c:167
+#: mail/subscribe-dialog.c:174
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
-msgstr "Prechádzam priečinky pod %s na \"%s\""
+msgstr "Prech�dzam prie�inky pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:169
+#: mail/subscribe-dialog.c:176
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
-msgstr "Prechádzam koreňové priečinky na \"%s\""
+msgstr "Prech�dzam kore�ov� prie�inky na \"%s\""
 
-#: mail/subscribe-dialog.c:268
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
-msgstr "Prihlasujem si priečinok \"%s\""
+msgstr "Prihlasujem si prie�inok \"%s\""
 
-#: mail/subscribe-dialog.c:270
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
-msgstr "Odhlasujem sa z priečinku \"%s\""
+msgstr "Odhlasujem sa z prie�inku \"%s\""
 
-#: mail/subscribe-dialog.c:1241 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
-msgstr "Priečinok"
+msgstr "Prie�inok"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1490
 msgid "No server has been selected"
-msgstr "Nebol vybraný žiadny server"
+msgstr "Nebol vybran� �iadny server"
 
-#: mail/subscribe-dialog.c:1540
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
-msgstr "Prosím, vyberte server."
+msgstr "Pros�m, vyberte server."
 
 #: mail/subscribe-dialog.glade.h:1
 msgid " _Refresh List "
-msgstr "_Aktualizovať zoznam"
+msgstr "_Aktualizova� zoznam"
 
 #: mail/subscribe-dialog.glade.h:2
 msgid "All folders"
-msgstr "Všetky priečinky"
+msgstr "V�etky prie�inky"
 
 #: mail/subscribe-dialog.glade.h:3
 msgid "Display options"
-msgstr "Možnosti zobrazenia"
+msgstr "Mo�nosti zobrazenia"
 
 #: mail/subscribe-dialog.glade.h:4
 msgid "Folders whose names begin with:"
-msgstr "Priečinky, ktorých meno začína na:"
+msgstr "Prie�inky, ktor�ch meno za��na na:"
 
 #: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
-msgstr "Správa prihlásení"
+msgstr "Spr�va prihl�sen�"
 
 #: mail/subscribe-dialog.glade.h:6
 msgid "Show _folders from server: "
-msgstr "Zobraziť _priečinky zo serveru:"
+msgstr "Zobrazi� _prie�inky zo serveru:"
 
 #: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
-msgstr "_Prihlásiť si"
+msgstr "_Prihl�si� si"
 
 #: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
-msgstr "O_dhlásiť"
+msgstr "O_dhl�si�"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
-msgstr "Komponent Evolution pre Súhrn."
+msgstr "Komponent Evolution pre S�hrn."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Vytváracie rozhranie pre komponent Súhrn Evolution."
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr "Prie�inok obsahuj�ci s�hrn Evolution"
 
 #: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nie je možné inicializovať komponent Súhrn Evolution."
+msgstr "Nie je mo�n� inicializova� komponent S�hrn Evolution."
 
-#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
+#: my-evolution/e-summary-calendar.c:188 my-evolution/e-summary-calendar.c:206
 msgid "Appointments"
-msgstr "Schôdzky"
+msgstr "Sch�dzky"
 
-#: my-evolution/e-summary-calendar.c:183
+#: my-evolution/e-summary-calendar.c:189
 msgid "No appointments"
-msgstr "Žiadne schôdzky"
-
-#: my-evolution/e-summary-calendar.c:236
-msgid "%l:%M%p"
-msgstr "%l:%M%p"
+msgstr "�iadne sch�dzky"
 
 #: my-evolution/e-summary-calendar.c:238
-msgid "%a %l:%M%p"
-msgstr "%a %l:%M%p"
+msgid "%k%M %d %B"
+msgstr "%k%M %d %B"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-calendar.c:240
+msgid "%l:%M %d %B"
+msgstr "%l:%M %d %B"
+
+#: my-evolution/e-summary-mail.c:113
 msgid "Mail summary"
-msgstr "Súhrn pošty"
+msgstr "S�hrn po�ty"
 
 #. translators: Put here a list of codes for locations you want to
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
 #: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:591
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS:ZSAM:EGAA"
 msgstr "LZIB:LZTT:LKPR"
 
-#: my-evolution/e-summary-preferences.c:428
+#: my-evolution/e-summary-preferences.c:427
 msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Slovo dňa"
+msgstr "Dictionary.com Slovo d�a"
 
-#: my-evolution/e-summary-preferences.c:450
+#: my-evolution/e-summary-preferences.c:448
 msgid "Quotes of the Day"
-msgstr "Citát dňa"
+msgstr "Cit�t d�a"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:876
 msgid "Add a news feed"
-msgstr "Pridať nový kanál správ"
+msgstr "Prida� nov� kan�l spr�v"
 
-#: my-evolution/e-summary-preferences.c:885
+#: my-evolution/e-summary-preferences.c:884
 msgid "Enter the URL of the news feed you wish to add"
-msgstr "Zadajte URL nového kanálu správ, ktorý chcete pridať"
+msgstr "Zadajte URL nov�ho kan�lu spr�v, ktor� chcete prida�"
 
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:888
 msgid "Name:"
 msgstr "Meno:"
 
-#: my-evolution/e-summary-preferences.c:1421
+#: my-evolution/e-summary-preferences.c:1423
 msgid "Summary Settings"
-msgstr "Nastavenie súhrnu"
+msgstr "Nastavenie s�hrnu"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
-msgstr "Nastala chyba počas načítavania kanála správ."
+msgstr "Nastala chyba po�as na��tavania kan�la spr�v."
 
 #: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
-msgstr "<b> Chyba načítavania RDF</b>"
+msgstr "<b> Chyba na��tavania RDF</b>"
+
+#: my-evolution/e-summary-rdf.c:479
+msgid "News Feed"
+msgstr "Kan�ly spr�v"
 
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
-msgstr "Žiadne úlohy"
+msgstr "�iadne �lohy"
 
 #: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
-msgstr "Moje počasie"
+msgstr "Moje po�asie"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Server počasia nemohol byť kontaktovaný</b></dd>"
+msgstr "<dd><b>Server po�asia nemohol by� kontaktovan�</b></dd>"
 
-#: my-evolution/e-summary-weather.c:652
+#: my-evolution/e-summary-weather.c:512
+msgid "Weather"
+msgstr "Po�asie"
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Oblasti"
 
@@ -9250,15 +9424,15 @@ msgstr "%A, %B %e %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 msgid "Print Summary"
-msgstr "Tlač súhrnu"
+msgstr "Tla� s�hrnu"
 
 #: my-evolution/e-summary.c:518
 msgid "Printing of Summary failed"
-msgstr "Tlač súhrnu zlyhala"
+msgstr "Tla� s�hrnu zlyhala"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Komponent súhrnu nemohol inicializovať Bonobo.\n"
+msgstr "Komponent s�hrnu nemohol inicializova� Bonobo.\n"
 
 #: my-evolution/metar.c:29
 msgid "F"
@@ -9286,7 +9460,7 @@ msgstr "mmHg"
 
 #: my-evolution/metar.c:41
 msgid "miles"
-msgstr "míľ"
+msgstr "m��"
 
 #: my-evolution/metar.c:41
 msgid "kilometers"
@@ -9294,27 +9468,27 @@ msgstr "kilometrov"
 
 #: my-evolution/metar.c:44
 msgid "Clear sky"
-msgstr "Jasná obloha"
+msgstr "Jasn� obloha"
 
 #: my-evolution/metar.c:45
 msgid "Broken clouds"
-msgstr "Oblačno"
+msgstr "Obla�no"
 
 #: my-evolution/metar.c:46
 msgid "Scattered clouds"
-msgstr "Rozptýlená oblačnosť"
+msgstr "Rozpt�len� obla�nos�"
 
 #: my-evolution/metar.c:47
 msgid "Few clouds"
-msgstr "Malá oblačnosť"
+msgstr "Mal� obla�nos�"
 
 #: my-evolution/metar.c:48
 msgid "Overcast"
-msgstr "Zatiahnuté"
+msgstr "Zatiahnut�"
 
 #: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
-msgstr "Neplatné"
+msgstr "Neplatn�"
 
 #: my-evolution/metar.c:63
 msgid "Variable"
@@ -9326,31 +9500,31 @@ msgstr "Sever"
 
 #: my-evolution/metar.c:64
 msgid "North - NorthEast"
-msgstr "Severo-severovýchod"
+msgstr "Severo-severov�chod"
 
 #: my-evolution/metar.c:64
 msgid "Northeast"
-msgstr "Severovýchod"
+msgstr "Severov�chod"
 
 #: my-evolution/metar.c:64
 msgid "East - NorthEast"
-msgstr "Východo-severovýchod"
+msgstr "V�chodo-severov�chod"
 
 #: my-evolution/metar.c:65
 msgid "East"
-msgstr "Východ"
+msgstr "V�chod"
 
 #: my-evolution/metar.c:65
 msgid "East - Southeast"
-msgstr "Východo-Juhovýchod"
+msgstr "V�chodo-Juhov�chod"
 
 #: my-evolution/metar.c:65
 msgid "Southeast"
-msgstr "Juhovýchod"
+msgstr "Juhov�chod"
 
 #: my-evolution/metar.c:65
 msgid "South - Southeast"
-msgstr "Juho-juhovýchod"
+msgstr "Juho-juhov�chod"
 
 #: my-evolution/metar.c:66
 msgid "South"
@@ -9358,31 +9532,31 @@ msgstr "Juh"
 
 #: my-evolution/metar.c:66
 msgid "South - Southwest"
-msgstr "Juho-juhozápad"
+msgstr "Juho-juhoz�pad"
 
 #: my-evolution/metar.c:66
 msgid "Southwest"
-msgstr "Juhozápad"
+msgstr "Juhoz�pad"
 
 #: my-evolution/metar.c:66
 msgid "West - Southwest"
-msgstr "Západo-juhozápad"
+msgstr "Z�pado-juhoz�pad"
 
 #: my-evolution/metar.c:67
 msgid "West"
-msgstr "Západ"
+msgstr "Z�pad"
 
 #: my-evolution/metar.c:67
 msgid "West - Northwest"
-msgstr "Západo-severozápad"
+msgstr "Z�pado-severoz�pad"
 
 #: my-evolution/metar.c:67
 msgid "Northwest"
-msgstr "Severozápad"
+msgstr "Severoz�pad"
 
 #: my-evolution/metar.c:67
 msgid "North - Northwest"
-msgstr "Severo-severozápad"
+msgstr "Severo-severoz�pad"
 
 #. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
@@ -9394,11 +9568,11 @@ msgstr "Mrholenie"
 
 #: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
-msgstr "Mrholenie v okolí"
+msgstr "Mrholenie v okol�"
 
 #: my-evolution/metar.c:100
 msgid "Light drizzle"
-msgstr "Ľahké mrholenie"
+msgstr "�ahk� mrholenie"
 
 #: my-evolution/metar.c:100
 msgid "Moderate drizzle"
@@ -9406,325 +9580,325 @@ msgstr "Mierne mrholenie"
 
 #: my-evolution/metar.c:100
 msgid "Heavy drizzle"
-msgstr "Ťažké mrholenie"
+msgstr "�a�k� mrholenie"
 
 #: my-evolution/metar.c:100
 msgid "Shallow drizzle"
-msgstr "Slabé mrholenie"
+msgstr "Slab� mrholenie"
 
 #: my-evolution/metar.c:100
 msgid "Patches of drizzle"
-msgstr "Občasné mrholenie"
+msgstr "Ob�asn� mrholenie"
 
 #: my-evolution/metar.c:100
 msgid "Partial drizzle"
-msgstr "Čiastočné mrholenie"
+msgstr "�iasto�n� mrholenie"
 
 #: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
-msgstr "Búrka"
+msgstr "B�rka"
 
 #: my-evolution/metar.c:100
 msgid "Windy drizzle"
-msgstr "Veterné mrholenie"
+msgstr "Vetern� mrholenie"
 
 #: my-evolution/metar.c:100
 msgid "Showers"
-msgstr "Spŕšky"
+msgstr "Sp�ky"
 
 #: my-evolution/metar.c:100
 msgid "Drifting drizzle"
-msgstr "Kolísajúce mrholenie"
+msgstr "Kol�saj�ce mrholenie"
 
 #: my-evolution/metar.c:100
 msgid "Freezing drizzle"
-msgstr "Mrznúce mrholenie"
+msgstr "Mrzn�ce mrholenie"
 
 #. RAIN
 #: my-evolution/metar.c:101
 msgid "Rain"
-msgstr "Dážď"
+msgstr "D��"
 
 #: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
-msgstr "Dážď v okolí"
+msgstr "D�� v okol�"
 
 #: my-evolution/metar.c:101
 msgid "Light rain"
-msgstr "Ľahký dážď"
+msgstr "�ahk� d��"
 
 #: my-evolution/metar.c:101
 msgid "Moderate rain"
-msgstr "Mierny dážď"
+msgstr "Mierny d��"
 
 #: my-evolution/metar.c:101
 msgid "Heavy rain"
-msgstr "Ťažký dážď"
+msgstr "�a�k� d��"
 
 #: my-evolution/metar.c:101
 msgid "Shallow rain"
-msgstr "Slabý dážď"
+msgstr "Slab� d��"
 
 #: my-evolution/metar.c:101
 msgid "Patches of rain"
-msgstr "Občasný dážď"
+msgstr "Ob�asn� d��"
 
 #: my-evolution/metar.c:101
 msgid "Partial rainfall"
-msgstr "Čiastočné zrážky"
+msgstr "�iasto�n� zr�ky"
 
 #: my-evolution/metar.c:101
 msgid "Blowing rainfall"
-msgstr "Veterné zrážky"
+msgstr "Vetern� zr�ky"
 
 #: my-evolution/metar.c:101
 msgid "Rain showers"
-msgstr "Dážďové spŕšky"
+msgstr "D��ov� sp�ky"
 
 #: my-evolution/metar.c:101
 msgid "Drifting rain"
-msgstr "Kolísajúci dážď"
+msgstr "Kol�saj�ci d��"
 
 #: my-evolution/metar.c:101
 msgid "Freezing rain"
-msgstr "Mrznúci dážď"
+msgstr "Mrzn�ci d��"
 
 #. SNOW
 #: my-evolution/metar.c:102
 msgid "Snow"
-msgstr "Sneženie"
+msgstr "Sne�enie"
 
 #: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
-msgstr "Sneženie v okolí"
+msgstr "Sne�enie v okol�"
 
 #: my-evolution/metar.c:102
 msgid "Light snow"
-msgstr "Ľahké sneženie"
+msgstr "�ahk� sne�enie"
 
 #: my-evolution/metar.c:102
 msgid "Moderate snow"
-msgstr "Mierne sneženie"
+msgstr "Mierne sne�enie"
 
 #: my-evolution/metar.c:102
 msgid "Heavy snow"
-msgstr "Ťažké sneženie"
+msgstr "�a�k� sne�enie"
 
 #: my-evolution/metar.c:102
 msgid "Shallow snow"
-msgstr "Slabé sneženie"
+msgstr "Slab� sne�enie"
 
 #: my-evolution/metar.c:102
 msgid "Patches of snow"
-msgstr "Občasné sneženie"
+msgstr "Ob�asn� sne�enie"
 
 #: my-evolution/metar.c:102
 msgid "Partial snowfall"
-msgstr "Čiastočné sneženie"
+msgstr "�iasto�n� sne�enie"
 
 #: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
-msgstr "Snehová búrka"
+msgstr "Snehov� b�rka"
 
 #: my-evolution/metar.c:102
 msgid "Blowing snowfall"
-msgstr "Veterné sneženie"
+msgstr "Vetern� sne�enie"
 
 #: my-evolution/metar.c:102
 msgid "Snow showers"
-msgstr "Snehové spŕšky"
+msgstr "Snehov� sp�ky"
 
 #: my-evolution/metar.c:102
 msgid "Drifting snow"
-msgstr "Kolísajúce sneženie"
+msgstr "Kol�saj�ce sne�enie"
 
 #: my-evolution/metar.c:102
 msgid "Freezing snow"
-msgstr "Mrznúce sneženie"
+msgstr "Mrzn�ce sne�enie"
 
 #. SNOW_GRAINS
 #: my-evolution/metar.c:103
 msgid "Snow grains"
-msgstr "Zrnité sneženie"
+msgstr "Zrnit� sne�enie"
 
 #: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
-msgstr "Zrnité sneženie v okolí"
+msgstr "Zrnit� sne�enie v okol�"
 
 #: my-evolution/metar.c:103
 msgid "Light snow grains"
-msgstr "Ľahké zrnité sneženie"
+msgstr "�ahk� zrnit� sne�enie"
 
 #: my-evolution/metar.c:103
 msgid "Moderate snow grains"
-msgstr "Mierne zrnité sneženie"
+msgstr "Mierne zrnit� sne�enie"
 
 #: my-evolution/metar.c:103
 msgid "Heavy snow grains"
-msgstr "Ťažké zrnité sneženie"
+msgstr "�a�k� zrnit� sne�enie"
 
 #: my-evolution/metar.c:103
 msgid "Shallow snow grains"
-msgstr "Slabé zrnité sneženie"
+msgstr "Slab� zrnit� sne�enie"
 
 #: my-evolution/metar.c:103
 msgid "Patches of snow grains"
-msgstr "Občasné zrnité sneženie"
+msgstr "Ob�asn� zrnit� sne�enie"
 
 #: my-evolution/metar.c:103
 msgid "Partial snow grains"
-msgstr "Čiastočné zrnité sneženie"
+msgstr "�iasto�n� zrnit� sne�enie"
 
 #: my-evolution/metar.c:103
 msgid "Blowing snow grains"
-msgstr "Veterné zrnité sneženie"
+msgstr "Vetern� zrnit� sne�enie"
 
 #: my-evolution/metar.c:103
 msgid "Snow grain showers"
-msgstr "Spŕšky zrnitého snehu"
+msgstr "Sp�ky zrnit�ho snehu"
 
 #: my-evolution/metar.c:103
 msgid "Drifting snow grains"
-msgstr "Kolísajúce zrnité sneženie"
+msgstr "Kol�saj�ce zrnit� sne�enie"
 
 #: my-evolution/metar.c:103
 msgid "Freezing snow grains"
-msgstr "Mrznúce zrnité sneženie"
+msgstr "Mrzn�ce zrnit� sne�enie"
 
 #. ICE_CRYSTALS
 #: my-evolution/metar.c:104
 msgid "Ice crystals"
-msgstr "Ľadové kryštály"
+msgstr "�adov� kry�t�ly"
 
 #: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
-msgstr "Ľadové kryštály v okolí"
+msgstr "�adov� kry�t�ly v okol�"
 
 #: my-evolution/metar.c:104
 msgid "Few ice crystals"
-msgstr "Málo ľadových kryštálov"
+msgstr "M�lo �adov�ch kry�t�lov"
 
 #: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
-msgstr "Mierne ľadové kryštály"
+msgstr "Mierne �adov� kry�t�ly"
 
 #: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
-msgstr "Ťažké ľadové kryštály"
+msgstr "�a�k� �adov� kry�t�ly"
 
 #: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
-msgstr "Občasné ľadové kryštály"
+msgstr "Ob�asn� �adov� kry�t�ly"
 
 #: my-evolution/metar.c:104
 msgid "Partial ice crystals"
-msgstr "Čiastočné ľadové kryštály"
+msgstr "�iasto�n� �adov� kry�t�ly"
 
 #: my-evolution/metar.c:104
 msgid "Ice crystal storm"
-msgstr "Búrka ľadových kryštálov"
+msgstr "B�rka �adov�ch kry�t�lov"
 
 #: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
-msgstr "Veterné ľadové kryštály"
+msgstr "Vetern� �adov� kry�t�ly"
 
 #: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
-msgstr "Spŕšky ľadových kryštálálov"
+msgstr "Sp�ky �adov�ch kry�t�l�lov"
 
 #: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
-msgstr "Kolísajúce ľadové kryštály"
+msgstr "Kol�saj�ce �adov� kry�t�ly"
 
 #: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
-msgstr "Mrznúce ľadové kryštály"
+msgstr "Mrzn�ce �adov� kry�t�ly"
 
 #. ICE_PELLETS
 #: my-evolution/metar.c:105
 msgid "Ice pellets"
-msgstr "Ľadové guličky"
+msgstr "�adov� guli�ky"
 
 #: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
-msgstr "Ľadové guličky v okolí"
+msgstr "�adov� guli�ky v okol�"
 
 #: my-evolution/metar.c:105
 msgid "Few ice pellets"
-msgstr "Málo ľadových guličiek"
+msgstr "M�lo �adov�ch guli�iek"
 
 #: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
-msgstr "Mierne ľadové guličky"
+msgstr "Mierne �adov� guli�ky"
 
 #: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
-msgstr "Ťažké ľadové guličky"
+msgstr "�a�k� �adov� guli�ky"
 
 #: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
-msgstr "Slabé ľadové guličky"
+msgstr "Slab� �adov� guli�ky"
 
 #: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
-msgstr "Občasné ľadové guličky"
+msgstr "Ob�asn� �adov� guli�ky"
 
 #: my-evolution/metar.c:105
 msgid "Partial ice pellets"
-msgstr "Čiastočné ľadové guličky"
+msgstr "�iasto�n� �adov� guli�ky"
 
 #: my-evolution/metar.c:105
 msgid "Ice pellet storm"
-msgstr "Búrka ľadových guličiek"
+msgstr "B�rka �adov�ch guli�iek"
 
 #: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
-msgstr "Veterné ľadové guličky"
+msgstr "Vetern� �adov� guli�ky"
 
 #: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
-msgstr "Spŕšky ľadových guličiek"
+msgstr "Sp�ky �adov�ch guli�iek"
 
 #: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
-msgstr "Kolísajúce ľadové guličky"
+msgstr "Kol�saj�ce �adov� guli�ky"
 
 #: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
-msgstr "Mrznúce ľadové guličky"
+msgstr "Mrzn�ce �adov� guli�ky"
 
 #. HAIL
 #: my-evolution/metar.c:106
 msgid "Hail"
-msgstr "Krúpy"
+msgstr "Kr�py"
 
 #: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
-msgstr "Krúpy v okolí"
+msgstr "Kr�py v okol�"
 
 #: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
-msgstr "Ľahké krúpy"
+msgstr "�ahk� kr�py"
 
 #: my-evolution/metar.c:106
 msgid "Moderate hail"
-msgstr "Mierne krúpy"
+msgstr "Mierne kr�py"
 
 #: my-evolution/metar.c:106
 msgid "Heavy hail"
-msgstr "Ťažké krúpy"
+msgstr "�a�k� kr�py"
 
 #: my-evolution/metar.c:106
 msgid "Shallow hail"
-msgstr "Slabé krúpy"
+msgstr "Slab� kr�py"
 
 #: my-evolution/metar.c:106
 msgid "Patches of hail"
-msgstr "Občasné krúpy"
+msgstr "Ob�asn� kr�py"
 
 #: my-evolution/metar.c:106
 msgid "Partial hail"
-msgstr "Čiastočné krúpy"
+msgstr "�iasto�n� kr�py"
 
 #: my-evolution/metar.c:106
 msgid "Hailstorm"
@@ -9732,121 +9906,121 @@ msgstr "Krupobitie"
 
 #: my-evolution/metar.c:106
 msgid "Blowing hail"
-msgstr "Veterné krúpy"
+msgstr "Vetern� kr�py"
 
 #: my-evolution/metar.c:106
 msgid "Hail showers"
-msgstr "Spŕšky krúp"
+msgstr "Sp�ky kr�p"
 
 #: my-evolution/metar.c:106
 msgid "Drifting hail"
-msgstr "Kolísajúce krúpy"
+msgstr "Kol�saj�ce kr�py"
 
 #: my-evolution/metar.c:106
 msgid "Freezing hail"
-msgstr "Mrznúce krúpy"
+msgstr "Mrzn�ce kr�py"
 
 #. SMALL_HAIL
 #: my-evolution/metar.c:107
 msgid "Small hail"
-msgstr "Male krúpy"
+msgstr "Male kr�py"
 
 #: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
-msgstr "Malé krúpy v okolí"
+msgstr "Mal� kr�py v okol�"
 
 #: my-evolution/metar.c:107
 msgid "Moderate small hail"
-msgstr "Mierne malé krúpy"
+msgstr "Mierne mal� kr�py"
 
 #: my-evolution/metar.c:107
 msgid "Heavy small hail"
-msgstr "Ťažké malé krúpy"
+msgstr "�a�k� mal� kr�py"
 
 #: my-evolution/metar.c:107
 msgid "Shallow small hail"
-msgstr "Slabé malé krúpy"
+msgstr "Slab� mal� kr�py"
 
 #: my-evolution/metar.c:107
 msgid "Patches of small hail"
-msgstr "Občasné malé krúpy"
+msgstr "Ob�asn� mal� kr�py"
 
 #: my-evolution/metar.c:107
 msgid "Partial small hail"
-msgstr "Čiastočné malé krúpy"
+msgstr "�iasto�n� mal� kr�py"
 
 #: my-evolution/metar.c:107
 msgid "Small hailstorm"
-msgstr "Krupobitie s malými krúpami"
+msgstr "Krupobitie s mal�mi kr�pami"
 
 #: my-evolution/metar.c:107
 msgid "Blowing small hail"
-msgstr "Veterné malé krúpy"
+msgstr "Vetern� mal� kr�py"
 
 #: my-evolution/metar.c:107
 msgid "Showers of small hail"
-msgstr "Spŕšky malých krúp"
+msgstr "Sp�ky mal�ch kr�p"
 
 #: my-evolution/metar.c:107
 msgid "Drifting small hail"
-msgstr "Kolísajúce malé krúpy"
+msgstr "Kol�saj�ce mal� kr�py"
 
 #: my-evolution/metar.c:107
 msgid "Freezing small hail"
-msgstr "Mrznúce malé krúpy"
+msgstr "Mrzn�ce mal� kr�py"
 
 #. PRECIPITATION
 #: my-evolution/metar.c:108
 msgid "Unknown precipitation"
-msgstr "Neznáme zrážky"
+msgstr "Nezn�me zr�ky"
 
 #: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
-msgstr "Zrážky v okolí"
+msgstr "Zr�ky v okol�"
 
 #: my-evolution/metar.c:108
 msgid "Light precipitation"
-msgstr "Ľahké zrážky"
+msgstr "�ahk� zr�ky"
 
 #: my-evolution/metar.c:108
 msgid "Moderate precipitation"
-msgstr "Mierne zrážky"
+msgstr "Mierne zr�ky"
 
 #: my-evolution/metar.c:108
 msgid "Heavy precipitation"
-msgstr "Ťažké zrážky"
+msgstr "�a�k� zr�ky"
 
 #: my-evolution/metar.c:108
 msgid "Shallow precipitation"
-msgstr "Slabé zrážky"
+msgstr "Slab� zr�ky"
 
 #: my-evolution/metar.c:108
 msgid "Patches of precipitation"
-msgstr "Občasné zrážky"
+msgstr "Ob�asn� zr�ky"
 
 #: my-evolution/metar.c:108
 msgid "Partial precipitation"
-msgstr "Čiastočné zrážky"
+msgstr "�iasto�n� zr�ky"
 
 #: my-evolution/metar.c:108
 msgid "Unknown thunderstorm"
-msgstr "Neznáma búrka"
+msgstr "Nezn�ma b�rka"
 
 #: my-evolution/metar.c:108
 msgid "Blowing precipitation"
-msgstr "Veterné zrážky"
+msgstr "Vetern� zr�ky"
 
 #: my-evolution/metar.c:108
 msgid "Showers, type unknown"
-msgstr "Spŕšky, neznámy typ"
+msgstr "Sp�ky, nezn�my typ"
 
 #: my-evolution/metar.c:108
 msgid "Drifting precipitation"
-msgstr "Kolísajúce zrážky"
+msgstr "Kol�saj�ce zr�ky"
 
 #: my-evolution/metar.c:108
 msgid "Freezing precipitation"
-msgstr "Mrznúce zrážky"
+msgstr "Mrzn�ce zr�ky"
 
 #. MIST
 #: my-evolution/metar.c:109
@@ -9855,11 +10029,11 @@ msgstr "Opar"
 
 #: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
-msgstr "Opar v okolí"
+msgstr "Opar v okol�"
 
 #: my-evolution/metar.c:109
 msgid "Light mist"
-msgstr "Ľahký opar"
+msgstr "�ahk� opar"
 
 #: my-evolution/metar.c:109
 msgid "Moderate mist"
@@ -9867,19 +10041,19 @@ msgstr "Mierny opar"
 
 #: my-evolution/metar.c:109
 msgid "Thick mist"
-msgstr "Hustý opar"
+msgstr "Hust� opar"
 
 #: my-evolution/metar.c:109
 msgid "Shallow mist"
-msgstr "Slabý opar"
+msgstr "Slab� opar"
 
 #: my-evolution/metar.c:109
 msgid "Patches of mist"
-msgstr "Občasný opar"
+msgstr "Ob�asn� opar"
 
 #: my-evolution/metar.c:109
 msgid "Partial mist"
-msgstr "Čiastočný opar"
+msgstr "�iasto�n� opar"
 
 #: my-evolution/metar.c:109
 msgid "Mist with wind"
@@ -9887,11 +10061,11 @@ msgstr "Opar s vetrom"
 
 #: my-evolution/metar.c:109
 msgid "Drifting mist"
-msgstr "Kolísajúci opar"
+msgstr "Kol�saj�ci opar"
 
 #: my-evolution/metar.c:109
 msgid "Freezing mist"
-msgstr "Mrznúci opar"
+msgstr "Mrzn�ci opar"
 
 #. FOG
 #: my-evolution/metar.c:110
@@ -9900,11 +10074,11 @@ msgstr "Hmla"
 
 #: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
-msgstr "Hmla v okolí"
+msgstr "Hmla v okol�"
 
 #: my-evolution/metar.c:110
 msgid "Light fog"
-msgstr "Ľahká hmla"
+msgstr "�ahk� hmla"
 
 #: my-evolution/metar.c:110
 msgid "Moderate fog"
@@ -9912,19 +10086,19 @@ msgstr "Mierna hmla"
 
 #: my-evolution/metar.c:110
 msgid "Thick fog"
-msgstr "Hustá hmla"
+msgstr "Hust� hmla"
 
 #: my-evolution/metar.c:110
 msgid "Shallow fog"
-msgstr "Slabá hmla"
+msgstr "Slab� hmla"
 
 #: my-evolution/metar.c:110
 msgid "Patches of fog"
-msgstr "Občasná hmla"
+msgstr "Ob�asn� hmla"
 
 #: my-evolution/metar.c:110
 msgid "Partial fog"
-msgstr "Čiastočná hmla"
+msgstr "�iasto�n� hmla"
 
 #: my-evolution/metar.c:110
 msgid "Fog with wind"
@@ -9932,11 +10106,11 @@ msgstr "Hmla s vetrom"
 
 #: my-evolution/metar.c:110
 msgid "Drifting fog"
-msgstr "Kolísajúca hmla"
+msgstr "Kol�saj�ca hmla"
 
 #: my-evolution/metar.c:110
 msgid "Freezing fog"
-msgstr "Mrznúca hmla"
+msgstr "Mrzn�ca hmla"
 
 #. SMOKE
 #: my-evolution/metar.c:111
@@ -9945,11 +10119,11 @@ msgstr "Dym"
 
 #: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
-msgstr "Dym v okolí"
+msgstr "Dym v okol�"
 
 #: my-evolution/metar.c:111
 msgid "Thin smoke"
-msgstr "Priehľadný dym"
+msgstr "Prieh�adn� dym"
 
 #: my-evolution/metar.c:111
 msgid "Moderate smoke"
@@ -9957,19 +10131,19 @@ msgstr "Mierny dym"
 
 #: my-evolution/metar.c:111
 msgid "Thick smoke"
-msgstr "Hustý dym"
+msgstr "Hust� dym"
 
 #: my-evolution/metar.c:111
 msgid "Shallow smoke"
-msgstr "Slabý dym"
+msgstr "Slab� dym"
 
 #: my-evolution/metar.c:111
 msgid "Patches of smoke"
-msgstr "Občasný dym"
+msgstr "Ob�asn� dym"
 
 #: my-evolution/metar.c:111
 msgid "Partial smoke"
-msgstr "Čiastočný dym"
+msgstr "�iasto�n� dym"
 
 #: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
@@ -9981,56 +10155,56 @@ msgstr "Dym s vetrom"
 
 #: my-evolution/metar.c:111
 msgid "Drifting smoke"
-msgstr "Kolísajúci dym"
+msgstr "Kol�saj�ci dym"
 
 #. VOLCANIC_ASH
 #: my-evolution/metar.c:112
 msgid "Volcanic ash"
-msgstr "Sopečný popol"
+msgstr "Sope�n� popol"
 
 #: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
-msgstr "Sopečný popol v okolí"
+msgstr "Sope�n� popol v okol�"
 
 #: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
-msgstr "Mierny sopečný popol"
+msgstr "Mierny sope�n� popol"
 
 #: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
-msgstr "Hustý sopečný popol"
+msgstr "Hust� sope�n� popol"
 
 #: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
-msgstr "Slabý sopečný popol"
+msgstr "Slab� sope�n� popol"
 
 #: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
-msgstr "Občasný sopečný popol"
+msgstr "Ob�asn� sope�n� popol"
 
 #: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
-msgstr "Čiastočný sopečný popol"
+msgstr "�iasto�n� sope�n� popol"
 
 #: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
-msgstr "Sopečný popol s hromami"
+msgstr "Sope�n� popol s hromami"
 
 #: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
-msgstr "Veterný sopečný popol"
+msgstr "Vetern� sope�n� popol"
 
 #: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
-msgstr "Spŕšky sopečného popola"
+msgstr "Sp�ky sope�n�ho popola"
 
 #: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
-msgstr "Kolísajúci sopečný popol"
+msgstr "Kol�saj�ci sope�n� popol"
 
 #: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
-msgstr "Mrznúci sopečný popol"
+msgstr "Mrzn�ci sope�n� popol"
 
 #. SAND
 #: my-evolution/metar.c:113
@@ -10039,11 +10213,11 @@ msgstr "Piesok"
 
 #: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
-msgstr "Piesok v okolí"
+msgstr "Piesok v okol�"
 
 #: my-evolution/metar.c:113
 msgid "Light sand"
-msgstr "Ľahký piesok"
+msgstr "�ahk� piesok"
 
 #: my-evolution/metar.c:113
 msgid "Moderate sand"
@@ -10051,23 +10225,23 @@ msgstr "Mierny piesok"
 
 #: my-evolution/metar.c:113
 msgid "Heavy sand"
-msgstr "Ťažký piesok"
+msgstr "�a�k� piesok"
 
 #: my-evolution/metar.c:113
 msgid "Patches of sand"
-msgstr "Občasný piesok"
+msgstr "Ob�asn� piesok"
 
 #: my-evolution/metar.c:113
 msgid "Partial sand"
-msgstr "Čiastočný piesok"
+msgstr "�iasto�n� piesok"
 
 #: my-evolution/metar.c:113
 msgid "Blowing sand"
-msgstr "Veterný piesok"
+msgstr "Vetern� piesok"
 
 #: my-evolution/metar.c:113
 msgid "Drifting sand"
-msgstr "Kolísajúci piesok"
+msgstr "Kol�saj�ci piesok"
 
 #. HAZE
 #: my-evolution/metar.c:114
@@ -10076,11 +10250,11 @@ msgstr "Opar"
 
 #: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
-msgstr "Opar v okolí"
+msgstr "Opar v okol�"
 
 #: my-evolution/metar.c:114
 msgid "Light haze"
-msgstr "Ľahký opar"
+msgstr "�ahk� opar"
 
 #: my-evolution/metar.c:114
 msgid "Moderate haze"
@@ -10088,19 +10262,19 @@ msgstr "Mierny opar"
 
 #: my-evolution/metar.c:114
 msgid "Thick haze"
-msgstr "Hustý opar"
+msgstr "Hust� opar"
 
 #: my-evolution/metar.c:114
 msgid "Shallow haze"
-msgstr "Slabý opar"
+msgstr "Slab� opar"
 
 #: my-evolution/metar.c:114
 msgid "Patches of haze"
-msgstr "Občasný opar"
+msgstr "Ob�asn� opar"
 
 #: my-evolution/metar.c:114
 msgid "Partial haze"
-msgstr "Čiastočný opar"
+msgstr "�iasto�n� opar"
 
 #: my-evolution/metar.c:114
 msgid "Haze with wind"
@@ -10108,56 +10282,56 @@ msgstr "Opar s vetrom"
 
 #: my-evolution/metar.c:114
 msgid "Drifting haze"
-msgstr "Kolísajúci opar"
+msgstr "Kol�saj�ci opar"
 
 #: my-evolution/metar.c:114
 msgid "Freezing haze"
-msgstr "Mrznúci opar"
+msgstr "Mrzn�ci opar"
 
 #. SPRAY
 #: my-evolution/metar.c:115
 msgid "Sprays"
-msgstr "Jemné spŕšky"
+msgstr "Jemn� sp�ky"
 
 #: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
-msgstr "Jemné spŕšky v okolí"
+msgstr "Jemn� sp�ky v okol�"
 
 #: my-evolution/metar.c:115
 msgid "Light sprays"
-msgstr "Ľahké jemné spŕšky"
+msgstr "�ahk� jemn� sp�ky"
 
 #: my-evolution/metar.c:115
 msgid "Moderate sprays"
-msgstr "Mierne jemné spŕšky"
+msgstr "Mierne jemn� sp�ky"
 
 #: my-evolution/metar.c:115
 msgid "Heavy sprays"
-msgstr "Tažké jemné spŕšky"
+msgstr "Ta�k� jemn� sp�ky"
 
 #: my-evolution/metar.c:115
 msgid "Shallow sprays"
-msgstr "Slabé jemné spŕšky"
+msgstr "Slab� jemn� sp�ky"
 
 #: my-evolution/metar.c:115
 msgid "Patches of sprays"
-msgstr "Občasné jemné spŕšky"
+msgstr "Ob�asn� jemn� sp�ky"
 
 #: my-evolution/metar.c:115
 msgid "Partial sprays"
-msgstr "Čiastočné jemné spŕšky"
+msgstr "�iasto�n� jemn� sp�ky"
 
 #: my-evolution/metar.c:115
 msgid "Blowing sprays"
-msgstr "Veterné jemné spŕšky"
+msgstr "Vetern� jemn� sp�ky"
 
 #: my-evolution/metar.c:115
 msgid "Drifting sprays"
-msgstr "Kolísavé jemné spŕšky"
+msgstr "Kol�sav� jemn� sp�ky"
 
 #: my-evolution/metar.c:115
 msgid "Freezing sprays"
-msgstr "Mrznúce jemné spŕšky"
+msgstr "Mrzn�ce jemn� sp�ky"
 
 #. DUST
 #: my-evolution/metar.c:116
@@ -10166,11 +10340,11 @@ msgstr "Prach"
 
 #: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
-msgstr "Prach v okolí"
+msgstr "Prach v okol�"
 
 #: my-evolution/metar.c:116
 msgid "Light dust"
-msgstr "Ľahký prach"
+msgstr "�ahk� prach"
 
 #: my-evolution/metar.c:116
 msgid "Moderate dust"
@@ -10178,23 +10352,23 @@ msgstr "Mierny prach"
 
 #: my-evolution/metar.c:116
 msgid "Heavy dust"
-msgstr "Ťažký prach"
+msgstr "�a�k� prach"
 
 #: my-evolution/metar.c:116
 msgid "Patches of dust"
-msgstr "Občasný prach"
+msgstr "Ob�asn� prach"
 
 #: my-evolution/metar.c:116
 msgid "Partial dust"
-msgstr "Čiastočný prach"
+msgstr "�iasto�n� prach"
 
 #: my-evolution/metar.c:116
 msgid "Blowing dust"
-msgstr "Veterný prach"
+msgstr "Vetern� prach"
 
 #: my-evolution/metar.c:116
 msgid "Drifting dust"
-msgstr "Kolísajúci prach"
+msgstr "Kol�saj�ci prach"
 
 #. SQUALL
 #: my-evolution/metar.c:117
@@ -10203,11 +10377,11 @@ msgstr "Poryvy"
 
 #: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
-msgstr "Poryvy v okolí"
+msgstr "Poryvy v okol�"
 
 #: my-evolution/metar.c:117
 msgid "Light squall"
-msgstr "Ľahké poryvy"
+msgstr "�ahk� poryvy"
 
 #: my-evolution/metar.c:117
 msgid "Moderate squall"
@@ -10215,269 +10389,264 @@ msgstr "Mierne poryvy"
 
 #: my-evolution/metar.c:117
 msgid "Heavy squall"
-msgstr "Ťažké poryvy"
+msgstr "�a�k� poryvy"
 
 #: my-evolution/metar.c:117
 msgid "Partial squall"
-msgstr "Čiastočné poryvy"
+msgstr "�iasto�n� poryvy"
 
 #: my-evolution/metar.c:117
 msgid "Thunderous squall"
-msgstr "Búrkové poryvy"
+msgstr "B�rkov� poryvy"
 
 #: my-evolution/metar.c:117
 msgid "Blowing squall"
-msgstr "Veterné poryvy"
+msgstr "Vetern� poryvy"
 
 #: my-evolution/metar.c:117
 msgid "Drifting squall"
-msgstr "Kolísajúce poryvy"
+msgstr "Kol�saj�ce poryvy"
 
 #: my-evolution/metar.c:117
 msgid "Freezing squall"
-msgstr "Mrazivé poryvy"
+msgstr "Mraziv� poryvy"
 
 #. SANDSTORM
 #: my-evolution/metar.c:118
 msgid "Sandstorm"
-msgstr "Piesočná búrka"
+msgstr "Pieso�n� b�rka"
 
 #: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
-msgstr "Piesočná búrka v okolí"
+msgstr "Pieso�n� b�rka v okol�"
 
 #: my-evolution/metar.c:118
 msgid "Light standstorm"
-msgstr "Ľahká piesočná búrka"
+msgstr "�ahk� pieso�n� b�rka"
 
 #: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
-msgstr "Mierna piesočná búrka"
+msgstr "Mierna pieso�n� b�rka"
 
 #: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
-msgstr "Ťažká piesočná búrka"
+msgstr "�a�k� pieso�n� b�rka"
 
 #: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
-msgstr "Slabá piesočná búrka"
+msgstr "Slab� pieso�n� b�rka"
 
 #: my-evolution/metar.c:118
 msgid "Partial sandstorm"
-msgstr "Čiastočná piesočná búrka"
+msgstr "�iasto�n� pieso�n� b�rka"
 
 #: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
-msgstr "Piesočná búrka s hromami"
+msgstr "Pieso�n� b�rka s hromami"
 
 #: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
-msgstr "Veterná piesková búrka"
+msgstr "Vetern� pieskov� b�rka"
 
 #: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
-msgstr "Kolísajúca piesočná búrka"
+msgstr "Kol�saj�ca pieso�n� b�rka"
 
 #: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
-msgstr "Mrazivá piesočná búrka"
+msgstr "Mraziv� pieso�n� b�rka"
 
 #. DUSTSTORM
 #: my-evolution/metar.c:119
 msgid "Duststorm"
-msgstr "Prachová búrka"
+msgstr "Prachov� b�rka"
 
 #: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
-msgstr "Prachová búrka v okolí"
+msgstr "Prachov� b�rka v okol�"
 
 #: my-evolution/metar.c:119
 msgid "Light duststorm"
-msgstr "Ľahká prachová búrka"
+msgstr "�ahk� prachov� b�rka"
 
 #: my-evolution/metar.c:119
 msgid "Moderate duststorm"
-msgstr "Mierna prachová búrka"
+msgstr "Mierna prachov� b�rka"
 
 #: my-evolution/metar.c:119
 msgid "Heavy duststorm"
-msgstr "Ťažká prachová búrka"
+msgstr "�a�k� prachov� b�rka"
 
 #: my-evolution/metar.c:119
 msgid "Shallow duststorm"
-msgstr "Slabá prachová búrka"
+msgstr "Slab� prachov� b�rka"
 
 #: my-evolution/metar.c:119
 msgid "Partial duststorm"
-msgstr "Čiastočná prachová búrka"
+msgstr "�iasto�n� prachov� b�rka"
 
 #: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
-msgstr "Prachová búrka s hromami"
+msgstr "Prachov� b�rka s hromami"
 
 #: my-evolution/metar.c:119
 msgid "Blowing duststorm"
-msgstr "Veterná prachová búrka"
+msgstr "Vetern� prachov� b�rka"
 
 #: my-evolution/metar.c:119
 msgid "Drifting duststorm"
-msgstr "Kolísajúca prachová búrka"
+msgstr "Kol�saj�ca prachov� b�rka"
 
 #: my-evolution/metar.c:119
 msgid "Freezing duststorm"
-msgstr "Mrazivá prachová búrka"
+msgstr "Mraziv� prachov� b�rka"
 
 #. FUNNEL_CLOUD
 #: my-evolution/metar.c:120
 msgid "Funnel cloud"
-msgstr "Lievikovité mraky"
+msgstr "Lievikovit� mraky"
 
 #: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
-msgstr "Lievikovité mraky v okolí"
+msgstr "Lievikovit� mraky v okol�"
 
 #: my-evolution/metar.c:120
 msgid "Light funnel cloud"
-msgstr "Ľahké lievikovité mraky"
+msgstr "�ahk� lievikovit� mraky"
 
 #: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
-msgstr "Mierne lievikovité mraky"
+msgstr "Mierne lievikovit� mraky"
 
 #: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
-msgstr "Husté lievikovité mraky"
+msgstr "Hust� lievikovit� mraky"
 
 #: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
-msgstr "Slabé lievikovité mraky"
+msgstr "Slab� lievikovit� mraky"
 
 #: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
-msgstr "Občasné lievikovité mraky"
+msgstr "Ob�asn� lievikovit� mraky"
 
 #: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
-msgstr "Čiastočné lievikovité mraky"
+msgstr "�iasto�n� lievikovit� mraky"
 
 #: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
-msgstr "Lievikovité mraky s vetrom"
+msgstr "Lievikovit� mraky s vetrom"
 
 #: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
-msgstr "Kolísajúce lievikovité mraky"
+msgstr "Kol�saj�ce lievikovit� mraky"
 
 #. TORNADO
 #: my-evolution/metar.c:121
 msgid "Tornado"
-msgstr "Tornádo"
+msgstr "Torn�do"
 
 #: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
-msgstr "Tornádo v okolí"
+msgstr "Torn�do v okol�"
 
 #: my-evolution/metar.c:121
 msgid "Moderate tornado"
-msgstr "Mierne tornádo"
+msgstr "Mierne torn�do"
 
 #: my-evolution/metar.c:121
 msgid "Raging tornado"
-msgstr "Zúrivé tornádo"
+msgstr "Z�riv� torn�do"
 
 #: my-evolution/metar.c:121
 msgid "Partial tornado"
-msgstr "Čiastočné tornádo"
+msgstr "�iasto�n� torn�do"
 
 #: my-evolution/metar.c:121
 msgid "Thunderous tornado"
-msgstr "Búrkové tornádo"
+msgstr "B�rkov� torn�do"
 
 #: my-evolution/metar.c:121
 msgid "Drifting tornado"
-msgstr "Kolísajúce tornádo"
+msgstr "Kol�saj�ce torn�do"
 
 #: my-evolution/metar.c:121
 msgid "Freezing tornado"
-msgstr "Mrazivé tornádo"
+msgstr "Mraziv� torn�do"
 
 #. DUST_WHIRLS
 #: my-evolution/metar.c:122
 msgid "Dust whirls"
-msgstr "Prachové víry"
+msgstr "Prachov� v�ry"
 
 #: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
-msgstr "Prachové víry v okolí"
+msgstr "Prachov� v�ry v okol�"
 
 #: my-evolution/metar.c:122
 msgid "Light dust whirls"
-msgstr "Ľahké prachové víry"
+msgstr "�ahk� prachov� v�ry"
 
 #: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
-msgstr "Mierne prachové víry"
+msgstr "Mierne prachov� v�ry"
 
 #: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
-msgstr "Ťažké prachové víry"
+msgstr "�a�k� prachov� v�ry"
 
 #: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
-msgstr "Slabé prachové víry"
+msgstr "Slab� prachov� v�ry"
 
 #: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
-msgstr "Občasné prachové víry"
+msgstr "Ob�asn� prachov� v�ry"
 
 #: my-evolution/metar.c:122
 msgid "Partial dust whirls"
-msgstr "Čiastočné prachové víry"
+msgstr "�iasto�n� prachov� v�ry"
 
 #: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
-msgstr "Veterné prachové víry"
+msgstr "Vetern� prachov� v�ry"
 
 #: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
-msgstr "Kolísajúce prachové víry"
+msgstr "Kol�saj�ce prachov� v�ry"
 
 #: my-evolution/my-evolution.glade.h:1
 msgid " _Remove"
-msgstr "_Odstrániť"
+msgstr "_Odstr�ni�"
 
 #: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ew feed"
-msgstr "Pridať nový k_anál"
+msgstr "Prida� nov� k_an�l"
 
 #: my-evolution/my-evolution.glade.h:3
 msgid "Al_l stations:"
-msgstr "Všetky _stanice:"
+msgstr "V�etky _stanice:"
 
 #: my-evolution/my-evolution.glade.h:4
 msgid "All _folders:"
-msgstr "Všetky _priečinky:"
+msgstr "V�etky _prie�inky:"
 
 #: my-evolution/my-evolution.glade.h:5
 msgid "All news _feeds:"
-msgstr "Všetky _kanály správ:"
-
-#: my-evolution/my-evolution.glade.h:6 shell/e-local-storage.c:174
-#: shell/e-shortcuts.c:1024
-msgid "Calendar"
-msgstr "Kalendár"
+msgstr "V�etky _kan�ly spr�v:"
 
 #: my-evolution/my-evolution.glade.h:7
 msgid "How many days should the calendar display at once?"
-msgstr "Koľko dní má naraz kalendár zobraziť?"
+msgstr "Ko�ko dn� m� naraz kalend�r zobrazi�?"
 
 #: my-evolution/my-evolution.glade.h:8
 msgid "Ma_x number of items shown:"
-msgstr "Ma_ximálny počet zobrazených položiek:"
+msgstr "Ma_xim�lny po�et zobrazen�ch polo�iek:"
 
 #: my-evolution/my-evolution.glade.h:9
 msgid "News Feed Settings"
-msgstr "Nastavenie kanálov správ"
+msgstr "Nastavenie kan�lov spr�v"
 
 #: my-evolution/my-evolution.glade.h:10
 msgid "One mont_h"
@@ -10485,170 +10654,148 @@ msgstr "Jeden _mesiac"
 
 #: my-evolution/my-evolution.glade.h:11
 msgid "One w_eek"
-msgstr "Jeden _týždeň"
+msgstr "Jeden _t��de�"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Refresh _time (seconds):"
-msgstr "_Aktualizácia (sekundy):"
+msgid "R_efresh time (seconds):"
+msgstr "_Aktualiz�cia (sekundy):"
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "Show _all tasks"
-msgstr "Zobraziť _všetky úlohy"
+msgid "Refresh _time (seconds):"
+msgstr "_Aktualiz�cia (sekundy):"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "Show _today's tasks"
-msgstr "Zobraziť _dnešné úlohy"
+msgid "S_how full path for folders"
+msgstr "Zobrazi� _cel� cesty k prie�inkom"
 
 #: my-evolution/my-evolution.glade.h:15
-msgid "Tasks "
-msgstr "Úlohy "
+msgid "Show _all tasks"
+msgstr "Zobrazi� _v�etky �lohy"
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "Units: "
-msgstr "Jednotky:"
+msgid "Show _today's tasks"
+msgstr "Zobrazi� _dne�n� �lohy"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
-msgstr "Nastavenie počasia"
+msgid "Tasks "
+msgstr "�lohy "
 
-#: my-evolution/my-evolution.glade.h:19
-msgid "_Display folders:"
-msgstr "_Zobraziť priečinky:"
+#: my-evolution/my-evolution.glade.h:18
+msgid "Units: "
+msgstr "Jednotky:"
 
-#: my-evolution/my-evolution.glade.h:20
-msgid "_Display stations:"
-msgstr "_Zobraziť stanice:"
+#: my-evolution/my-evolution.glade.h:19
+msgid "Weather settings"
+msgstr "Nastavenie po�asia"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "_Displayed feeds:"
-msgstr "_Zobrazené kanály:"
+msgid "_Display folders:"
+msgstr "_Zobrazi� prie�inky:"
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "_Five days"
-msgstr "_Päť dní"
+msgid "_Display stations:"
+msgstr "_Zobrazi� stanice:"
 
 #: my-evolution/my-evolution.glade.h:23
-msgid "_Mail"
-msgstr "_Pošta"
+msgid "_Displayed feeds:"
+msgstr "_Zobrazen� kan�ly:"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "_News Feeds"
-msgstr "_Kanály správ"
+msgid "_Five days"
+msgstr "_P� dn�"
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "_One day"
-msgstr "_Jeden deň"
+msgid "_Mail"
+msgstr "_Po�ta"
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "_Refresh time (seconds):"
-msgstr "_Aktualizácia (sekundy):"
+msgid "_News Feeds"
+msgstr "_Kan�ly spr�v"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "_Schedule"
-msgstr "Na_plánovať"
+msgid "_One day"
+msgstr "_Jeden de�"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "_Show full path for folders"
-msgstr "Zobraziť _celé cesty k priečinkom"
+msgid "_Schedule"
+msgstr "Na_pl�nova�"
 
 #: my-evolution/my-evolution.glade.h:29
 msgid "_Weather"
-msgstr "_Počasie"
+msgstr "_Po�asie"
 
 #: my-evolution/my-evolution.glade.h:30
 msgid "_imperial"
-msgstr "_imperiálne"
+msgstr "_imperi�lne"
 
 #: my-evolution/my-evolution.glade.h:31
 msgid "m_etric"
-msgstr "_metrické"
+msgstr "_metrick�"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:199
 msgid "Show Details"
-msgstr "Zobraziť detaily"
+msgstr "Zobrazi� detaily"
 
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:201
 msgid "Cancel Operation"
-msgstr "Zrušiť operáciu"
+msgstr "Zru�i� oper�ciu"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1023
-msgid "Inbox"
-msgstr "Doručená pošta"
-
-#: shell/e-local-storage.c:178
-msgid "Outbox"
-msgstr "Pošta na odoslanie"
-
-#: shell/e-local-storage.c:592
-msgid "Local Folders"
-msgstr "Lokálne priečinky"
-
-#: shell/e-setup.c:125 shell/e-setup.c:196
+#: shell/e-setup.c:125
 msgid "Evolution installation"
-msgstr "Inštalácia Evolution"
+msgstr "In�tal�cia Evolution"
 
 #: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 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"
+"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:130
 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:170
 msgid "Could not update files correctly"
-msgstr "Nepodarilo sa korektne aktualizovať súbory"
+msgstr "Nepodarilo sa korektne aktualizova� s�bory"
 
-#: shell/e-setup.c:200
-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:201
-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:220
+#: shell/e-setup.c:193
 #, c-format
 msgid ""
 "Cannot create the directory\n"
 "%s\n"
 "Error: %s"
 msgstr ""
-"Nie je možné vytvoriť priečinok\n"
+"Nie je mo�n� vytvori� prie�inok\n"
 "%s\n"
 "Chyba: %s"
 
-#: shell/e-setup.c:235
+#: shell/e-setup.c:208
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
-"Nastala chyba počas kopírovania súborov do\n"
+"Nastala chyba po�as kop�rovania s�borov do\n"
 "`%s'."
 
-#: shell/e-setup.c:309
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
 "Please move it in order to allow installation\n"
 "of the Evolution user files."
 msgstr ""
-"Súbor `%s' nie je priečinok\n"
-"Prosím, presuňte ho, aby mohli\n"
-"byť nainštalované súbory Evolution."
+"S�bor `%s' nie je prie�inok\n"
+"Pros�m, presu�te ho, aby mohli\n"
+"by� nain�talovan� s�bory Evolution."
 
-#: shell/e-setup.c:323
+#: shell/e-setup.c:296
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -10656,87 +10803,87 @@ msgid ""
 "Evolution will run.\n"
 "Do you want me to remove this directory?"
 msgstr ""
-"Evolution našla starý priečinok Súhrnu.\n"
-"Musí byť odstránený pred spustením Evolution.\n"
-"Chcete ho odstrániť?"
+"Evolution na�la star� prie�inok S�hrnu.\n"
+"Mus� by� odstr�nen� pred spusten�m Evolution.\n"
+"Chcete ho odstr�ni�?"
 
-#: shell/e-setup.c:348
+#: shell/e-setup.c:321
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
 "Evolution directory.  Please move it in order\n"
 "to allow installation of the Evolution user files."
 msgstr ""
-"Priečinok `%s' existuje, ale nie je\n"
-"to priečinok Evolution. Prosím, presuňte ho,\n"
-"aby mohli byť nainštalované súbory Evolution."
+"Prie�inok `%s' existuje, ale nie je\n"
+"to prie�inok Evolution. Pros�m, presu�te ho,\n"
+"aby mohli by� nain�talovan� s�bory Evolution."
 
 #: shell/e-shell-folder-commands.c:174
 msgid "Cannot move a folder over itself."
-msgstr "Nie je možné presunúť priečinok do seba."
+msgstr "Nie je mo�n� presun�� prie�inok do seba."
 
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot copy a folder over itself."
-msgstr "Nie je možné skopírovať priečinok sám do seba."
+msgstr "Nie je mo�n� skop�rova� prie�inok s�m do seba."
 
 #: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
-msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
+msgstr "Nie je mo�n� presun�� prie�inok do jednoho zo svoj�ch podprie�inkov."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:289
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Zadajte priečinok, kam chcete skopírovať priečinok \"%s\":"
+msgstr "Zadajte prie�inok, kam chcete skop�rova� prie�inok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:294
 msgid "Copy folder"
-msgstr "Kopírovať priečinok"
+msgstr "Kop�rova� prie�inok"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:332
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Zadajte priečinok, kam presunúť prečinok \"%s\":"
+msgstr "Zadajte prie�inok, kam presun�� pre�inok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:337
 msgid "Move folder"
-msgstr "Presunúť priečinok"
+msgstr "Presun�� prie�inok"
 
-#: shell/e-shell-folder-commands.c:357
+#: shell/e-shell-folder-commands.c:362
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
-"Nie je možné odstrániť priečinok:\n"
+"Nie je mo�n� odstr�ni� prie�inok:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:378
 #, c-format
 msgid "Delete folder '%s'"
-msgstr "Odstrániť priečinok '%s'"
+msgstr "Odstr�ni� prie�inok '%s'"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:388
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
-msgstr "Naozaj chcete odstrániť priečinok `%s'?"
+msgstr "Naozaj chcete odstr�ni� prie�inok `%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:458
+#: shell/e-shell-folder-commands.c:463
 #, c-format
 msgid "Rename folder '%s'"
-msgstr "Premenovať priečinok '%s'"
+msgstr "Premenova� prie�inok '%s'"
 
-#: shell/e-shell-folder-commands.c:462 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:467
 msgid "Rename"
-msgstr "Premenovať"
+msgstr "Premenova�"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:470
+#: shell/e-shell-folder-commands.c:475
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
-msgstr "Meno priečinku:"
+msgstr "Meno prie�inku:"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -10744,34 +10891,51 @@ msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Zadaný priečinok sa nedá vytvoriť:\n"
+"Zadan� prie�inok sa ned� vytvori�:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:168
-msgid "The specified folder name is not valid."
-msgstr "Zadané meno priečinku nie je platné."
+#: shell/e-shell-folder-creation-dialog.c:126
+msgid "No folder name specified."
+msgstr "Nezadan� meno prie�inku."
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:132
+msgid "Folder name cannot contain the Return character."
+msgstr "Meno prie�inku nesmie obsahova� znak Enter."
+
+#: shell/e-shell-folder-creation-dialog.c:137
+msgid "Folder cannot contain the directory separator."
+msgstr "Prie�inok nesmie obsahova� odde�ova� prie�inkov."
+
+#: shell/e-shell-folder-creation-dialog.c:142
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' a '..' s� rezervovan� men� prie�inkov."
+
+#: shell/e-shell-folder-creation-dialog.c:180
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Zadan� meno prie�inku nie je platn�: %s"
+
+#: shell/e-shell-folder-creation-dialog.c:300
 msgid "Evolution - Create new folder"
-msgstr "Evolution - Vytvoriť nový priečinok"
+msgstr "Evolution - Vytvori� nov� prie�inok"
 
 #: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
-"Typ vybraného priečinku nie je platný\n"
-"pre požadovanú operáciu."
+"Typ vybran�ho prie�inku nie je platn�\n"
+"pre po�adovan� oper�ciu."
 
 #: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
-msgstr "Nová..."
+msgstr "Nov�..."
 
-#: shell/e-shell-folder-title-bar.c:569 shell/e-shell-folder-title-bar.c:570
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Bez mena)"
 
-#: shell/e-shell-importer.c:97
+#: shell/e-shell-importer.c:101
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -10779,15 +10943,15 @@ msgid ""
 "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"
+"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ť."
+"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/e-shell-importer.c:192
+#: shell/e-shell-importer.c:196
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -10795,19 +10959,24 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 "Importujem %s\n"
-"Importér nie je pripravený.\n"
-"Čakám 5 sekúnd a skúsim to znovu."
+"Import�r nie je pripraven�.\n"
+"�ak�m 5 sek�nd a sk�sim to znovu."
 
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:216 shell/e-shell-importer.c:247
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 "Importujem %s\n"
-"Importujem položku %d."
+"Importujem polo�ku %d."
+
+#: shell/e-shell-importer.c:348
+#, c-format
+msgid "File %s does not exist"
+msgstr "S�bor %s neexistuje"
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:365
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -10815,87 +10984,104 @@ msgid ""
 msgstr ""
 "Pre spracovanie\n"
 "%s\n"
-"nie je k dispozícii importér."
+"nie je k dispoz�cii import�r."
 
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:377
 msgid "Importing"
 msgstr "Importujem"
 
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:385
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 "Importujem %s\n"
-"Začínam %s"
+"Za��nam %s"
 
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:398
 #, c-format
 msgid "Error starting %s"
-msgstr "Chyba pri štarte %s"
+msgstr "Chyba pri �tarte %s"
 
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid "Error loading %s"
-msgstr "Chyba pri načítavaní %s"
+msgstr "Chyba pri na��tavan� %s"
 
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:434
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 "Importujem %s\n"
-"Importujem položku 1."
+"Importujem polo�ku 1."
 
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:505
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:538
+#: shell/e-shell-importer.c:555
 msgid "Filename:"
-msgstr "Meno súboru:"
+msgstr "Meno s�boru:"
 
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:560
 msgid "Select a file"
-msgstr "Vyberte súbor"
+msgstr "Vyberte s�bor"
 
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:570
 msgid "File type:"
-msgstr "Typ súboru:"
+msgstr "Typ s�boru:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:639
 msgid "Select folder"
-msgstr "Vybrať priečinok"
+msgstr "Vybra� prie�inok"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:640
 msgid "Select a destination folder for importing this data"
-msgstr "Vyberte cieľový priečinok pre import týchro dát"
+msgstr "Vyberte cie�ov� prie�inok pre import t�chro d�t"
 
 #: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
-msgstr "Zatváram spojenia..."
+msgstr "Zatv�ram spojenia..."
 
-#: shell/e-shell-startup-wizard.c:536
+#: shell/e-shell-startup-wizard.c:161
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+"Nie je mo�n� spusti� rozhranie Evolution Mailer Wizard\n"
+"%s"
+
+#: shell/e-shell-startup-wizard.c:170
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Nie je mo�n� inicializova� rozhranie Evolution Mailer Wizard"
+
+#: shell/e-shell-startup-wizard.c:580
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
-"Prosím, čakajte...\n"
-"Hľadám existujúce nastavenie"
+"Pros�m, �akajte...\n"
+"H�ad�m existuj�ce nastavenie"
 
-#: shell/e-shell-startup-wizard.c:539
+#: shell/e-shell-startup-wizard.c:583
 msgid "Starting Intelligent Importers"
-msgstr "Spúšťam inteligentné importy"
+msgstr "Sp���am inteligentn� importy"
 
 #: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
-msgstr "Nástroj pre oznamovanie chýb nebol nájdený v $PATH."
+msgstr "N�stroj pre oznamovanie ch�b nebol n�jden� v $PATH."
 
 #: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
-msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb"
+msgstr "Ned� sa spusti� n�stroj pre oznamovanie ch�b"
+
+#: shell/e-shell-view-menu.c:217
+msgid "Ximian Evolution"
+msgstr "Ximian Evolution"
 
 #: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
@@ -10903,259 +11089,284 @@ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
 #: shell/e-shell-view-menu.c:221
 msgid ""
-"Evolution is a suite of groupware applications\n"
+"Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
-"Evolution je skupina groupwarových aplikácií\n"
-"pre elektronickú poštu, kalendár a správu kontaktov\n"
-"v rámci prostredia GNOME."
+"Ximian Evolution je sada groupwarov�ch aplik�ci�\n"
+"pre elektronick� po�tu, kalend�r a spr�vu kontaktov\n"
+"v r�mci prostredia GNOME."
 
 #: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
-msgstr "Prejsť na priečinku..."
+msgstr "Prejs� na prie�inku..."
 
 #: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
-msgstr "Vyberte priečinok, ktorý chcete otvoriť"
+msgstr "Vyberte prie�inok, ktor� chcete otvori�"
 
 #: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
-msgstr "Vytvorí novú skratku"
+msgstr "Vytvor� nov� skratku"
 
 #: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
-msgstr "Vyberte priečinok, kam má skratka smerovať:"
+msgstr "Vyberte prie�inok, kam m� skratka smerova�:"
 
 #: shell/e-shell-view-menu.c:684
 msgid "Work Online"
-msgstr "Pracovať on-line"
+msgstr "Pracova� on-line"
 
 #: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:30
 msgid "Work Offline"
-msgstr "Pracovať off-line"
+msgstr "Pracova� off-line"
 
-#: shell/e-shell-view.c:184
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
-msgstr "(Nezobrazený žiadny priečinok)"
+msgstr "(Nezobrazen� �iadny prie�inok)"
 
-#: shell/e-shell-view.c:1457
+#: shell/e-shell-view.c:1495
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:1497
+msgid "(None)"
+msgstr "(�iadna)"
 
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1502
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid "%s - Ximian Evolution %s"
+msgstr "%s - Ximian Evolution %s"
 
-#: shell/e-shell-view.c:1497
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1504
+#, c-format
+msgid "%s - Ximian Evolution %s [%s]"
+msgstr "%s - Ximian Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1544
+msgid "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Evolution je momentálne on-line. Stlačením tohto tlačidla prejdete do módu "
+"Ximian Evolution je moment�lne on-line. Stla�en�m tohto tla�idla prejdete do m�du "
 "off-line."
 
-#: shell/e-shell-view.c:1504
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution prechádza do módu off-line."
+#: shell/e-shell-view.c:1551
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution prech�dza do m�du off-line."
 
-#: shell/e-shell-view.c:1510
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1557
+msgid "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete do módu "
+"Ximian Evolution je moment�lne off-line. Stla�en�m tohto tla�idla prejdete do m�du "
 "on-line."
 
-#: shell/e-shell.c:508
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
-msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
+msgstr "Nepodarilo sa vytvori� lok�lny sklad -- %s"
 
-#: shell/e-shell.c:1435
+#: shell/e-shell.c:1440
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
-"Aj! Pohľad pre `%s' neočakávane spadol. :-(\n"
-"To asi znamená, že komponent %s spadol."
+"Aj! Poh�ad pre `%s' neo�ak�vane spadol. :-(\n"
+"To asi znamen�, �e komponent %s spadol."
 
-#: shell/e-shell.c:1639 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1644 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1641
+#: shell/e-shell.c:1646
 msgid "Invalid arguments"
-msgstr "Neplatné argumenty"
+msgstr "Neplatn� argumenty"
 
-#: shell/e-shell.c:1643
+#: shell/e-shell.c:1648
 msgid "Cannot register on OAF"
-msgstr "Nie je možné zaregistrovať u OAF"
+msgstr "Nie je mo�n� zaregistrova� u OAF"
 
-#: shell/e-shell.c:1645
+#: shell/e-shell.c:1650
 msgid "Configuration Database not found"
-msgstr "Konfiguračná databáza nenájdená"
+msgstr "Konfigura�n� datab�za nen�jden�"
 
-#: shell/e-shell.c:1647 shell/e-storage.c:481
+#: shell/e-shell.c:1652 shell/e-storage.c:491
 msgid "Generic error"
-msgstr "Všeobecná chyba"
+msgstr "V�eobecn� chyba"
 
-#: shell/e-shortcuts-view.c:72
+#: shell/e-shortcuts-view.c:75
 msgid "Create new shortcut group"
-msgstr "Vytvoriť novú skupinu skratiek"
+msgstr "Vytvori� nov� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:73
+#: shell/e-shortcuts-view.c:76
 msgid "Group name:"
 msgstr "Meno skupiny:"
 
-#: shell/e-shortcuts-view.c:171
+#: shell/e-shortcuts-view.c:176
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
-"Naozaj chcete odstrániť skupinu\n"
+"Naozaj chcete odstr�ni� skupinu\n"
 "`%s' z panelu skratiek?"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:181
 msgid "Don't remove"
-msgstr "Neodstraňovať"
+msgstr "Neodstra�ova�"
 
-#: shell/e-shortcuts-view.c:204
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
-msgstr "Premenovať skupinu skratiek"
+msgstr "Premenova� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
-msgstr "Premenovať túto skupinu skratiek na:"
+msgstr "Premenova� t�to skupinu skratiek na:"
 
-#: shell/e-shortcuts-view.c:218
+#: shell/e-shortcuts-view.c:223
 msgid "_Small Icons"
-msgstr "_Malé ikony"
+msgstr "_Mal� ikony"
 
-#: shell/e-shortcuts-view.c:219
+#: shell/e-shortcuts-view.c:224
 msgid "Show the shortcuts as small icons"
-msgstr "Zobraziť skratky ako malé ikony"
+msgstr "Zobrazi� skratky ako mal� ikony"
 
-#: shell/e-shortcuts-view.c:221
+#: shell/e-shortcuts-view.c:226
 msgid "_Large Icons"
-msgstr "_Veľké ikony"
+msgstr "_Ve�k� ikony"
 
-#: shell/e-shortcuts-view.c:222
+#: shell/e-shortcuts-view.c:227
 msgid "Show the shortcuts as large icons"
-msgstr "Zobraziť skratky ako veľké ikony"
+msgstr "Zobrazi� skratky ako ve�k� ikony"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:238
 msgid "_New Group..."
-msgstr "_Nová skupina..."
+msgstr "_Nov� skupina..."
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:239
 msgid "Create a new shortcut group"
-msgstr "Vytvoriť novú skupinu skratiek"
+msgstr "Vytvori� nov� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:241
 msgid "_Remove this Group..."
-msgstr "Odst_rániť túto skupinu..."
+msgstr "Odst_r�ni� t�to skupinu..."
 
-#: shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:242
 msgid "Remove this shortcut group"
-msgstr "Odstrániť túto skupinu skratiek"
+msgstr "Odstr�ni� t�to skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:244
 msgid "Re_name this Group..."
-msgstr "_Premenovať túto skupinu..."
+msgstr "_Premenova� t�to skupinu..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:245
 msgid "Rename this shortcut group"
-msgstr "Premenuje túto skupinu skratiek"
+msgstr "Premenuje t�to skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:250
 msgid "_Hide the Shortcut Bar"
-msgstr "_Skryť panel skratiek"
+msgstr "_Skry� panel skratiek"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:251
 msgid "Hide the shortcut bar"
-msgstr "Skryť panel skratiek"
+msgstr "Skry� panel skratiek"
 
-#: shell/e-shortcuts-view.c:365
+#: shell/e-shortcuts-view.c:370
 msgid "Rename shortcut"
-msgstr "Premenovať skratku"
+msgstr "Premenova� skratku"
 
-#: shell/e-shortcuts-view.c:366
+#: shell/e-shortcuts-view.c:371
 msgid "Rename selected shortcut to:"
-msgstr "Premenovať túto skratku na:"
+msgstr "Premenova� t�to skratku na:"
 
-#: shell/e-shortcuts-view.c:378
+#: shell/e-shortcuts-view.c:383
 msgid "Open the folder linked to this shortcut"
-msgstr "Otvoriť priečinok skratky v novom okn"
+msgstr "Otvori� prie�inok skratky v novom okn"
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
-msgid "Open in New Window"
-msgstr "Otvoriť v novom okne"
+#: shell/e-shortcuts-view.c:385 ui/evolution.xml.h:19
+msgid "Open in New _Window"
+msgstr "Otvori� v _novom okne"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:385
 msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Otvorí priečinok spojený s touto skratkou v novom okne"
+msgstr "Otvor� prie�inok spojen� s touto skratkou v novom okne"
 
-#: shell/e-shortcuts-view.c:383
+#: shell/e-shortcuts-view.c:388
+msgid "_Rename"
+msgstr "_Premenova�"
+
+#: shell/e-shortcuts-view.c:388
 msgid "Rename this shortcut"
-msgstr "Premenuje túto skratku"
+msgstr "Premenuje t�to skratku"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:390
+msgid "Re_move"
+msgstr "O_dstr�ni�"
+
+#: shell/e-shortcuts-view.c:390
 msgid "Remove this shortcut from the shortcut bar"
-msgstr "Odstrániť túto skratku z panelu skratiek"
+msgstr "Odstr�ni� t�to skratku z panelu skratiek"
 
-#: shell/e-shortcuts.c:620
+#: shell/e-shortcuts.c:642
 msgid "Error saving shortcuts."
-msgstr "Chyba pri ukladaní skratiek."
+msgstr "Chyba pri ukladan� skratiek."
 
-#: shell/e-shortcuts.c:1019
+#: shell/e-shortcuts.c:1045
 msgid "Shortcuts"
 msgstr "Skratky"
 
+#: shell/e-shortcuts.c:1054
+msgid "Inbox"
+msgstr "Doru�en� po�ta"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Bez mena)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
-msgstr "Žiadna chyba"
+msgstr "�iadna chyba"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
-msgstr "Priečinok s týmto menom už existuje"
+msgstr "Prie�inok s t�mto menom u� existuje"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
-msgstr "Uvedený typ priečinku nie je platný"
+msgstr "Uveden� typ prie�inku nie je platn�"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
-msgstr "Nedostatok miesta pre vytvorenie priečinku"
+msgstr "Nedostatok miesta pre vytvorenie prie�inku"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
-msgstr "Uvedený priečinok nebol nájdený"
+msgstr "Uveden� prie�inok nebol n�jden�"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
-msgstr "Funkcia nie je v tomto sklade implementovaná"
+msgstr "Funkcia nie je v tomto sklade implementovan�"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
-msgstr "Operácia nepodporovaná"
+msgstr "Oper�cia nepodporovan�"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
-msgstr "Uvedený typ nie je podporovaný týmto skladom"
+msgstr "Uveden� typ nie je podporovan� t�mto skladom"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:511
 msgid "The specified folder cannot be modified or removed"
-msgstr "Uvedený priečinok nie je možné zmeniť alebo odstrániť"
+msgstr "Uveden� prie�inok nie je mo�n� zmeni� alebo odstr�ni�"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Nie je mo�n� presun�� prie�inok do jednoho zo svoj�ch podprie�inkov."
 
 #: shell/e-task-widget.c:170
 #, c-format
@@ -11165,51 +11376,81 @@ msgstr "%s (...)"
 #: shell/e-task-widget.c:175
 #, c-format
 msgid "%s (%d%% complete)"
-msgstr "%s (%d%% hotových)"
+msgstr "%s (%d%% hotov�ch)"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
-msgstr "Aktívne spojenia"
+msgstr "Akt�vne spojenia"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
-msgstr "Stlačením OK tieto spojenia zatvoríte a prejdete do módu off-line"
+msgstr "Stla�en�m OK tieto spojenia zatvor�te a prejdete do m�du off-line"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Host"
-msgstr "Hostiteľ"
+msgstr "Hostite�"
 
 #: shell/glade/e-active-connection-dialog.glade.h:4
 msgid "The following connections are currently active:"
-msgstr "Tieto spojenia sú momentálne aktívne:"
+msgstr "Tieto spojenia s� moment�lne akt�vne:"
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
-msgstr "Typ priečinku:"
+msgstr "Typ prie�inku:"
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Specify where to create the folder:"
-msgstr "Zadajte, kde vytvoriť priečinok"
+msgstr "Zadajte, kde vytvori� prie�inok"
+
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "First Run Setup Assistant"
+msgstr "Asistent nastavenia pri prvom spusten�"
+
+#: shell/glade/evolution-startup-wizard.glade.h:5
+msgid "Importing Data"
+msgstr "Importujem d�ta"
+
+#: shell/glade/evolution-startup-wizard.glade.h:8
+msgid "Setup Assistant"
+msgstr "Asistent nastavenia"
+
+#: shell/glade/evolution-startup-wizard.glade.h:9
+msgid "Timezone "
+msgstr "�asov� z�na "
+
+#: shell/glade/evolution-startup-wizard.glade.h:10
+msgid ""
+"Welcome to the Evolution first run setup assistant\n"
+"\n"
+"This assistant will help you get started"
+msgstr ""
+"Vitajte v asistentovi Evolution ur�enom pre po�iato�n� nastavenie.\n"
+"\n"
+"Pom��e v�m za�a� pracova� s Evolution."
+
+#: shell/glade/evolution-startup-wizard.glade.h:13
+msgid "Your configuration is complete."
+msgstr "Va�e nastavenie je dokon�en�."
 
 #: 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."
+msgstr "Kliknite na \"Importova\" pre spustenie importu s�boru do Evolution."
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
-msgstr "Nástroj Evolution pre import"
+msgstr "N�stroj Evolution pre import"
 
 #: shell/importer/import.glade.h:3
 msgid "Evolution Importer Assistant"
-msgstr "Nástroj Evolution pre import"
+msgstr "N�stroj Evolution pre import"
 
 #: shell/importer/import.glade.h:4
 msgid "Import File (Step 2 of 2)"
-msgstr "Import súboru (krok 2 z 2)"
+msgstr "Import s�boru (krok 2 z 2)"
 
 #: shell/importer/import.glade.h:5
 msgid "Select a File (step 1 of 2)"
-msgstr "Vyberte súbor (krok 1 z 2)"
+msgstr "Vyberte s�bor (krok 1 z 2)"
 
 #: shell/importer/import.glade.h:6
 msgid ""
@@ -11217,9 +11458,9 @@ msgid ""
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
-"Vitajte v nástroji Evolution pre import.\n"
-"Tento sprievodca vám pomôže importovať\n"
-"externé súbory do Evolution."
+"Vitajte v n�stroji Evolution pre import.\n"
+"Tento sprievodca v�m pom��e importova�\n"
+"extern� s�bory do Evolution."
 
 #: shell/importer/intelligent.c:191
 msgid "Importers"
@@ -11227,23 +11468,23 @@ msgstr "Importy"
 
 #: shell/importer/intelligent.c:197
 msgid "Don't import"
-msgstr "Neimportovať"
+msgstr "Neimportova�"
 
 #: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
-msgstr "Túto správu už nezobrazovať"
+msgstr "T�to spr�vu u� nezobrazova�"
 
 #: shell/importer/intelligent.c:209
 msgid "Evolution can import data from the following files:"
-msgstr "Evolution našiel tieto súbory dát pre import:"
+msgstr "Evolution na�iel tieto s�bory d�t pre import:"
 
 #: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
+"of the Ximian Evolution groupware suite.\n"
 "\n"
-"Evolution is not yet complete. It's getting close, but there are\n"
+"Ximian Evolution is not yet complete. It's getting close, but there are\n"
 "places where features are either missing or only half working. \n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -11253,137 +11494,137 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"Vitajte.  Vďaka za čas strávený sťahovaním tejto ukážky\n"
-"groupwarového nástroja Evolution.\n"
+"Vitajte.  V�aka za �as str�ven� s�ahovan�m tejto uk�ky\n"
+"groupwarov�ho n�stroja Ximian Evolution.\n"
 "\n"
-"Evolution ešte stále nie je dokončená. Už je blízko, ale ešte stále\n"
-"niektoré jej fukcie chýbajú alebo nefungujú úplne.\n"
+"Ximian Evolution e�te st�le nie je dokon�en�. U� je bl�zko, ale e�te st�le\n"
+"niektor� jej fukcie ch�baj� alebo nefunguj� �plne.\n"
 "\n"
-"Ak nájdete chyby, prosím, oznámte nám ich na bugzilla.ximian.com.\n"
-"Tento produkt neposkytuje žiadne záruky a nie je určený pre ľudí,\n"
-"ktorí sa nevedia ovládať.\n"
+"Ak n�jdete chyby, pros�m, ozn�mte n�m ich na bugzilla.ximian.com.\n"
+"Tento produkt neposkytuje �iadne z�ruky a nie je ur�en� pre �ud�,\n"
+"ktor� sa nevedia ovl�da�.\n"
 "\n"
-"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"
+"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:116
 msgid ""
 "Thanks\n"
-"The Evolution Team\n"
+"The Ximian Evolution Team\n"
 msgstr ""
-"Vďaka\n"
-"Tím Evolution\n"
+"V�aka\n"
+"T�m Ximian Evolution\n"
 
 #: shell/main.c:173
-msgid "Cannot access the Evolution shell."
-msgstr "Nie je možné inicializovať shell Evolution."
+msgid "Cannot access the Ximian Evolution shell."
+msgstr "Nie je mo�n� inicializova� shell Ximian Evolution."
 
 #: shell/main.c:184
 #, c-format
-msgid "Cannot initialize the Evolution shell: %s"
-msgstr "Nie je možné inicializovať shell Evolution: %s"
+msgid "Cannot initialize the Ximian Evolution shell: %s"
+msgstr "Nie je mo�n� inicializova� shell Ximian Evolution: %s"
 
 #: shell/main.c:228
 msgid "Disable splash screen"
-msgstr "Zakázať úvodné okno"
+msgstr "Zak�za� �vodn� okno"
 
 #: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
-msgstr "Poslať ladiaci výstup zo všetkých komponent od súboru."
+msgstr "Posla� ladiaci v�stup zo v�etk�ch komponent od s�boru."
 
 #: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
-msgstr "Nie je možné inicializovať komponentový systém Bonobo."
+msgstr "Nie je mo�n� inicializova� komponentov� syst�m Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
-msgstr "Kopírovať"
+msgstr "Kop�rova�"
 
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
-msgstr "Skopíruje výber"
+msgstr "Skop�ruje v�ber"
 
 #: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
-msgstr "Vytvoriť nový kontakt"
+msgstr "Vytvori� nov� kontakt"
 
 #: ui/evolution-addressbook.xml.h:5
 msgid "Create new contact list"
-msgstr "Vytvoriť nový zoznam kontaktov"
+msgstr "Vytvori� nov� zoznam kontaktov"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
-msgstr "Vystrihnúť"
+msgstr "Vystrihn��"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:9
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
-msgstr "Vystrihne výber"
+msgstr "Vystrihne v�ber"
 
 #: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
-msgstr "Odstrániť vybrané kontakty"
+msgstr "Odstr�ni� vybran� kontakty"
 
 #: ui/evolution-addressbook.xml.h:12
 msgid "New List"
-msgstr "Nový zoznam"
+msgstr "Nov� zoznam"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
-msgstr "Vložiť"
+msgstr "Vlo�i�"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:21
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
-msgstr "Vloží obsah schránky"
+msgstr "Vlo�� obsah schr�nky"
 
 #: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
-msgstr "Náhľad kontaktov pred tlačou"
+msgstr "N�h�ad kontaktov pred tla�ou"
 
 #: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
-msgstr "Tlačiť vybrané kontakty"
+msgstr "Tla�i� vybran� kontakty"
 
 #: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
-msgstr "Uloží vybrané kontakty ako vKartu."
+msgstr "Ulo�� vybran� kontakty ako vKartu."
 
 #: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
-msgstr "Vybrať všetko"
+msgstr "Vybra� v�etko"
 
 #: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
-msgstr "Vybrať všetky kontakty"
+msgstr "Vybra� v�etky kontakty"
 
 #: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
-msgstr "Poslať _správu kontaktu..."
+msgstr "Posla� _spr�vu kontaktu..."
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
-msgstr "Pošle správu vybraným kontaktom."
+msgstr "Po�le spr�vu vybran�m kontaktom."
 
 #: ui/evolution-addressbook.xml.h:25
 msgid "Send message to contact"
-msgstr "Poslať správu kontaktu"
+msgstr "Posla� spr�vu kontaktu"
 
 #: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
-msgstr "Pošle vybrané kontakty inej osobe."
+msgstr "Po�le vybran� kontakty inej osobe."
 
 #: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
-msgstr "Zastaviť"
+msgstr "Zastavi�"
 
 #: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
-msgstr "Zastaviť načítavanie"
+msgstr "Zastavi� na��tavanie"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
@@ -11391,7 +11632,7 @@ msgstr "A_kcie"
 
 #: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
-msgstr "Zdroje _adresára..."
+msgstr "Zdroje _adres�ra..."
 
 #: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
@@ -11401,146 +11642,150 @@ msgstr "_Kontakt"
 msgid "_Contact List"
 msgstr "Zoznam _kontaktov"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
-msgstr "_Poslať kontakt ďalej..."
+msgstr "_Posla� kontakt �alej..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:37
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
-msgstr "_Tlačiť..."
+msgstr "_Tla�i�..."
 
-#: ui/evolution-addressbook.xml.h:37
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Save as VCard"
-msgstr "_Uložiť ako vKartu"
+msgstr "_Ulo�i� ako vKartu"
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Search for Contacts"
-msgstr "_Hľadať kontakty"
+msgstr "_H�ada� kontakty"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Select All"
-msgstr "Vybrať _všetko"
+msgstr "Vybra� _v�etko"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:40
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
 #: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:15
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
-msgstr "_Nástroje"
+msgstr "_N�stroje"
 
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
-msgstr "Nastavenie kalendára"
+msgstr "Nastavenie kalend�ra"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
-msgstr "Vytvoriť novú celodennú _udalosť"
+msgid "Create a New All Day _Event"
+msgstr "Vytvori� nov� celodenn� _udalos�"
 
 #: ui/evolution-calendar.xml.h:5
 msgid "Create a New _Task"
-msgstr "Vytvoriť novú ú_lohu"
+msgstr "Vytvori� nov� �_lohu"
 
 #: ui/evolution-calendar.xml.h:6
 msgid "Create a _New Appointment"
-msgstr "Vytvoriť _novú schôdzku"
+msgstr "Vytvori� _nov� sch�dzku"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
-msgstr "Vytvorí udalosť počas celého dňa"
+msgstr "Vytvor� udalos� po�as cel�ho d�a"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
-msgstr "Deň"
+msgstr "De�"
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Delete the appointment"
+msgstr "Odstr�ni� sch�dzku"
 
-#: ui/evolution-calendar.xml.h:11 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
-msgstr "Prejsť na"
+msgstr "Prejs� na"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
-msgstr "Prejsť dozadu"
+msgstr "Prejs� dozadu"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
-msgstr "Prejsť dopredu"
+msgstr "Prejs� dopredu"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
-msgstr "Prejsť na _dátum"
+msgstr "Prejs� na _d�tum"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
-msgstr "Prejsť na zadaný dátum"
+msgstr "Prejs� na zadan� d�tum"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
-msgstr "Prejsť na dnešný dátum"
+msgstr "Prejs� na dne�n� d�tum"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Mesiac"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
-msgstr "Nová schôdzka"
+msgstr "Nov� sch�dzka"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 msgid "New Task"
-msgstr "Nová úloha"
+msgstr "Nov� �loha"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
-msgstr "Ukážka kalendára pred tlačou"
+msgstr "Uk�ka kalend�ra pred tla�ou"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
-msgstr "U_kážka pred tlačou"
+msgstr "U_k�ka pred tla�ou"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
-msgstr "Vytlačí tento kalendár"
+msgstr "Vytla�� tento kalend�r"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
-msgstr "Publikovať informácie o voľnom čase pre tento kalendár"
+msgstr "Publikova� inform�cie o vo�nom �ase pre tento kalend�r"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
-msgstr "Zobraziť jeden deň"
+msgstr "Zobrazi� jeden de�"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
-msgstr "Zobraziť jeden mesiac"
+msgstr "Zobrazi� jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
-msgstr "Zobraziť jeden týždeň"
+msgstr "Zobrazi� jeden t��de�"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show work week"
-msgstr "Zobraziť pracovný týždeň"
+#: ui/evolution-calendar.xml.h:31
+msgid "Show the working week"
+msgstr "Zobrazi� pracovn� t��de�"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
-msgstr "Týždeň"
+msgstr "T��de�"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
-msgstr "_Schôdzka..."
+msgstr "_Sch�dzka..."
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
-msgstr "Nastavenie _kalendára..."
+msgstr "Nastavenie _kalend�ra..."
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:42
 msgid "_Publish Free/Busy Information"
-msgstr "_Publikovať informácie o voľnom čase"
+msgstr "_Publikova� inform�cie o vo�nom �ase"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:43
 msgid "_Task..."
-msgstr "Ú_loha..."
+msgstr "�_loha..."
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -11548,213 +11793,204 @@ msgstr "Ú_loha..."
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:4
 msgid "Close"
-msgstr "Zavrieť"
+msgstr "Zavrie�"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this item"
-msgstr "Zatvorí túto položku"
+msgstr "Zatvor� t�to polo�ku"
 
 #: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
-msgstr "Odstráni túto položku"
+msgstr "Odstr�ni t�to polo�ku"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Main toolbar"
-msgstr "Hlavný panel nástrojov"
+msgstr "Hlavn� panel n�strojov"
 
 #: ui/evolution-comp-editor.xml.h:7
 msgid "Preview the printed item"
-msgstr "Náhľad položky pred tlačou"
+msgstr "N�h�ad polo�ky pred tla�ou"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr "Nastavenie t_lače"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
-msgstr "Tlačiť túto položku"
+msgstr "Tla�i� t�to polo�ku"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
-msgstr "Tlačiť..."
+msgstr "Tla�i�..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
 msgid "Save"
-msgstr "Uložiť"
+msgstr "Ulo�i�"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 msgid "Save and Close"
-msgstr "Uložiť a zavrieť"
+msgstr "Ulo�i� a zavrie�"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
-msgstr "Uložiť zoznam a zatvoriť dialóg"
+msgstr "Ulo�i� zoznam a zatvori� dial�g"
 
-#: ui/evolution-comp-editor.xml.h:18
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
-msgstr "Uložiť túto položku na disk"
-
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-mail-message.xml.h:73
-msgid "Setup the page settings for your current printer"
-msgstr "Nastaví stránku pre aktuálnu tlačiareň"
+msgstr "Ulo�i� t�to polo�ku na disk"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "_File"
-msgstr "_Súbor"
+msgstr "_S�bor"
 
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
-msgstr "Tlačiť _obálku..."
+msgstr "Tla�i� _ob�lku..."
 
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
-msgstr "Uložiť _ako..."
+msgstr "Ulo�i� _ako..."
 
 #: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
-msgstr "Uložiť kontakt a zatvoriť dialóg"
+msgstr "Ulo�i� kontakt a zatvori� dial�g"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
-msgstr "_Uložiť"
+msgstr "_Ulo�i�"
 
 #: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
-msgstr "Odstrániž tento zoznam"
+msgstr "Odstr�ni� tento zoznam"
 
 #: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete..."
-msgstr "Odstrániť..."
+msgstr "Odstr�ni�..."
 
 #: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
-msgstr "Uložiť zoznam a zatvoriť dialóg"
+msgstr "Ulo�i� zoznam a zatvori� dial�g"
 
 #: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
-msgstr "Poslať _zoznam inému..."
+msgstr "Posla� _zoznam in�mu..."
 
 #: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
-msgstr "Poslať _správu zoznamu..."
+msgstr "Posla� _spr�vu zoznamu..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
-msgstr "Zrušiť _stretnutie"
+msgstr "Zru�i� _stretnutie"
 
 #: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
-msgstr "Zrušiť stretnutie pre túto položku"
+msgstr "Zru�i� stretnutie pre t�to polo�ku"
 
 #: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
-msgstr "Poslať ďalej ako i_Calendar"
+msgstr "Posla� �alej ako i_Calendar"
 
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
-msgstr "Poslať ďalej pomocou pošty"
+msgstr "Posla� �alej pomocou po�ty"
 
 #: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
-msgstr "Získať najnovšie informácie o stretnutí"
+msgstr "Z�ska� najnov�ie inform�cie o stretnut�"
 
 #: ui/evolution-event-editor.xml.h:6
 msgid "Re_fresh Meeting"
-msgstr "_Aktualizovať stretnutie"
+msgstr "_Aktualizova� stretnutie"
 
 #: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
-msgstr "Naplánovať _stretnutie"
+msgstr "Napl�nova� _stretnutie"
 
 #: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
-msgstr "Naplánovať stretnutie pre túto položku"
+msgstr "Napl�nova� stretnutie pre t�to polo�ku"
 
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
-msgstr "Prispôsobiť moje Evolution"
+msgstr "Prisp�sobi� moje Evolution"
 
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
-msgstr "Zrušiť"
+msgstr "Zru�i�"
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
-msgstr "Zrušiť aktuálnu poštovú operáciu"
+msgstr "Zru�i� aktu�lnu po�tov� oper�ciu"
 
 #: ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
-msgstr "Napísať _novú správu"
+msgstr "Nap�sa� _nov� spr�vu"
 
 #: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
-msgstr "Vytvorí alebo upraví poštové účty a iné nastavenia"
+msgstr "Vytvor� alebo uprav� po�tov� ��ty a in� nastavenia"
 
 #: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
-msgstr "Vytvorí alebo upraví pravidlá pre filtrovanie novej pošty"
+msgstr "Vytvor� alebo uprav� pravidl� pre filtrovanie novej po�ty"
 
 #: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
-msgstr "Vytvorí alebo upraví definície virtuálnych priečinkov"
+msgstr "Vytvor� alebo uprav� defin�cie virtu�lnych prie�inkov"
 
 #: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
-msgstr "Vyprázdniť _Odpadky"
+msgstr "Vypr�zdni� _Odpadky"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
-msgstr "Zabudnúť _heslá"
+msgstr "Zabudn�� _hesl�"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Zabudnúť uložené heslá, takže ich budete musieť znovu zadať"
+msgstr "Zabudn�� ulo�en� hesl�, tak�e ich budete musie� znovu zada�"
 
 #: ui/evolution-mail-global.xml.h:10
 msgid "New Message"
-msgstr "Nová správa"
+msgstr "Nov� spr�va"
 
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
-msgstr "Otvorí okno pre písanie správy"
+msgstr "Otvor� okno pre p�sanie spr�vy"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých priečinkov"
+msgstr "Trvalo odstr�ni� v�etky zmazan� spr�vy zo v�etk�ch prie�inkov"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
-msgstr "Príjem / odoslanie"
+msgstr "Pr�jem / odoslanie"
 
 #: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
-msgstr "Poslať neodoslanú poštu a prijať novú poštu"
+msgstr "Posla� neodoslan� po�tu a prija� nov� po�tu"
 
 #: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
-msgstr "Zobraziť okno s náhľadom správy"
+msgstr "Zobrazi� okno s n�h�adom spr�vy"
 
 #: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Prihlásiť alebo odhlásiť priečinky na vzdialených serveroch"
+msgstr "Prihl�si� alebo odhl�si� prie�inky na vzdialen�ch serveroch"
 
 #: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
-msgstr "_Editor virtuálneho priečinku..."
+msgstr "_Editor virtu�lneho prie�inku..."
 
 #: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
@@ -11762,211 +11998,215 @@ msgstr "_Filtre..."
 
 #: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
-msgstr "_Poslať správu"
+msgstr "_Posla� spr�vu"
 
 #: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
-msgstr "Nastavenie _pošty..."
+msgstr "Nastavenie _po�ty..."
 
 #: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
-msgstr "_Náhľad"
+msgstr "_N�h�ad"
 
 #: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
-msgstr "_Poslať / Prijať"
+msgstr "_Posla� / Prija�"
 
 #: ui/evolution-mail-global.xml.h:24
 msgid "_Subscribe to Folders..."
-msgstr "_Prihlásiť priečinky..."
+msgstr "_Prihl�si� prie�inky..."
 
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
-msgstr "Zmení vlastnosti tohto priečinku"
+msgstr "Zmen� vlastnosti tohto prie�inku"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
-msgstr "Kopírovať vybrané správy"
+msgstr "Kop�rova� vybran� spr�vy"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+msgid "Cu_t"
+msgstr "Vy_strihn��"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
-msgstr "Vystrihnúť vybrané správy"
+msgstr "Vystrihn�� vybran� spr�vy"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
-msgstr "Skryť _vybrané správy"
+msgstr "Skry� _vybran� spr�vy"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
-msgstr "Skryť _odstránené správy"
+msgstr "Skry� _odstr�nen� spr�vy"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
-msgstr "Skryť _prečítané správy"
+msgstr "Skry� _pre��tan� spr�vy"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Skryje zmazané správy namiesto zobrazenia škrtnutím"
+msgstr "Skryje zmazan� spr�vy namiesto zobrazenia �krtnut�m"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
-msgstr "Označiť _všetky ako prečítané"
+msgstr "Ozna�i� _v�etky ako pre��tan�"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
-msgstr "Označí všetky viditeľné správy ako už prečítané"
+msgstr "Ozna�� v�etky vidite�n� spr�vy ako u� pre��tan�"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
-msgstr "Vloží správu zo schránky"
+msgstr "Vlo�� spr�vu zo schr�nky"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Trvalo odstrániť všetky zmazané správy z tohto priečinku"
+msgstr "Trvalo odstr�ni� v�etky zmazan� spr�vy z tohto prie�inku"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
-msgstr "Vybrať _všetko"
+msgstr "Vybra� _v�etko"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
-msgstr "Vybrať _vlákno"
+msgstr "Vybra� _vl�kno"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
-msgstr "Vyberie všetky správy, ktoré momentálne nie sú vybrané"
+msgstr "Vyberie v�etky spr�vy, ktor� moment�lne nie s� vybran�"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
-msgstr "Vyberie všetky správy v rovnakom vlákne ako je vybraná správa"
+msgstr "Vyberie v�etky spr�vy v rovnakom vl�kne ako je vybran� spr�va"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
-msgstr "Vybrať všetky viditeľné správy"
+msgstr "Vybra� v�etky vidite�n� spr�vy"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
-msgstr "Zobraziť sk_ryté správy"
+msgstr "Zobrazi� sk_ryt� spr�vy"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
-msgstr "Zobraziť správy, ktoré boli dočasne skryté"
+msgstr "Zobrazi� spr�vy, ktor� boli do�asne skryt�"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
-msgstr "Dočasne skryť všetky správy, ktoré už boli prečítané"
+msgstr "Do�asne skry� v�etky spr�vy, ktor� u� boli pre��tan�"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
-msgstr "Dočasne skryť vybrané správy"
+msgstr "Do�asne skry� vybran� spr�vy"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
-msgstr "Zoznam vlákien"
+msgstr "Zoznam vl�kien"
 
 #: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
-msgstr "_Vyčistiť"
+msgstr "_Vy�isti�"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:38
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
-msgstr "_Priečinok"
+msgstr "_Prie�inok"
 
 #: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
-msgstr "_Obrátiť výber"
+msgstr "_Obr�ti� v�ber"
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
-msgstr "Zoznam _vlákien"
+msgstr "Zoznam _vl�kien"
 
 #: ui/evolution-mail-message.xml.h:1
 msgid "Apply filter rules to the selected messages"
-msgstr "Použiť pravidlá filtrov na vybrané správy"
+msgstr "Pou�i� pravidl� filtrov na vybran� spr�vy"
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Odpovedať všetkým adresátom vybranej správy"
+msgstr "Odpoveda� v�etk�m adres�tom vybranej spr�vy"
 
 #: ui/evolution-mail-message.xml.h:3
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Odpovedať do konferencie tejto správy"
+msgstr "Odpoveda� do konferencie tejto spr�vy"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
-msgstr "Odpovedať odosielateľovi tejto správy"
+msgstr "Odpoveda� odosielate�ovi tejto spr�vy"
 
 #: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
-msgstr "Kopírovať vybrané správy do iného priečinka"
+msgstr "Kop�rova� vybran� spr�vy do in�ho prie�inka"
 
 #: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
-msgstr "Vytvoriť _virtuálny priečinok zo správy"
+msgstr "Vytvori� _virtu�lny prie�inok zo spr�vy"
 
 #: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
-msgstr "Vytvorí pravidlo pre filtrovanie správ od tohto odosielateľa"
+msgstr "Vytvor� pravidlo pre filtrovanie spr�v od tohto odosielate�a"
 
 #: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Vytvorí pravidlo pre filtrovanie správ týmto adresátom"
+msgstr "Vytvor� pravidlo pre filtrovanie spr�v t�mto adres�tom"
 
 #: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Vytvoriť pravidlo pre filtrovanie správ pre túto konferenciu"
+msgstr "Vytvori� pravidlo pre filtrovanie spr�v pre t�to konferenciu"
 
 #: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
-msgstr "Vytvoriť pravidlo pre filtrovanie správ s týmto predmetom"
+msgstr "Vytvori� pravidlo pre filtrovanie spr�v s t�mto predmetom"
 
 #: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
-msgstr "Vytvoriť virtuálny priečinok pre týchto adresátov"
+msgstr "Vytvori� virtu�lny prie�inok pre t�chto adres�tov"
 
 #: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
-msgstr "Vytvoriť virtuálny priečinok pre túto konferenciu"
+msgstr "Vytvori� virtu�lny prie�inok pre t�to konferenciu"
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
-msgstr "Vytvoriť virtuálny priečinok pre tohto odosielateľa"
+msgstr "Vytvori� virtu�lny prie�inok pre tohto odosielate�a"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
-msgstr "Vytvoriť virtuálny priečinok pre tento predmet"
+msgstr "Vytvori� virtu�lny prie�inok pre tento predmet"
 
 #: ui/evolution-mail-message.xml.h:17
 msgid "Display the next important message"
-msgstr "Prejsť na nasledujúcu dôležitú správu"
+msgstr "Prejs� na nasleduj�cu d�le�it� spr�vu"
 
 #: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
-msgstr "Prejsť na nasledujúcu správu"
+msgstr "Prejs� na nasleduj�cu spr�vu"
 
 #: ui/evolution-mail-message.xml.h:19
 msgid "Display the next unread message"
-msgstr "Prejsť na nasledujúcu neprečítanú správu"
+msgstr "Prejs� na nasleduj�cu nepre��tan� spr�vu"
 
 #: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
-msgstr "Prejsť na nasledujúcu neprečítané vlákno"
+msgstr "Prejs� na nasleduj�cu nepre��tan� vl�kno"
 
 #: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
-msgstr "Prejsť na predchádzajúcu dôležitú správu"
+msgstr "Prejs� na predch�dzaj�cu d�le�it� spr�vu"
 
 #: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
-msgstr "Prejsť na predchádzajúcu správu"
+msgstr "Prejs� na predch�dzaj�cu spr�vu"
 
 #: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
-msgstr "Prejsť na predchádzajúcu neprečítanú správu"
+msgstr "Prejs� na predch�dzaj�cu nepre��tan� spr�vu"
 
 #: ui/evolution-mail-message.xml.h:24
 msgid "Filter on Mailing _List..."
@@ -11974,11 +12214,11 @@ msgstr "Filter na _konferenciu..."
 
 #: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Se_nder..."
-msgstr "Filter na _odosielateľovi..."
+msgstr "Filter na _odosielate�ovi..."
 
 #: ui/evolution-mail-message.xml.h:26
 msgid "Filter on _Recipients..."
-msgstr "Filter na _adresátoch..."
+msgstr "Filter na _adres�toch..."
 
 #: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Subject..."
@@ -11986,227 +12226,231 @@ msgstr "Filter na _predmet..."
 
 #: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
-msgstr "Vždy nahrávať obrázky v pošte HTML"
+msgstr "V�dy nahr�va� obr�zky v po�te HTML"
 
 #: ui/evolution-mail-message.xml.h:29
 msgid "Forward"
-msgstr "Poslať ďalej"
+msgstr "Posla� �alej"
 
 #: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
-msgstr "Poslať ďalej ako"
+msgstr "Posla� �alej ako"
 
 #: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
-msgstr "Predať ďalej ako _prílohu"
+msgstr "Preda� �alej ako _pr�lohu"
 
 #: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
-msgstr "Predať ďalej v _tele"
+msgstr "Preda� �alej v _tele"
 
 #: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
-msgstr "Poslať ďalej _citované"
+msgstr "Posla� �alej _citovan�"
 
 #: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
-msgstr "Predá niekomu vybranú správu v tele novej správy"
+msgstr "Pred� niekomu vybran� spr�vu v tele novej spr�vy"
 
 #: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
-msgstr "Predá túto správu vloženú do vašej správy podobne ako pri odpovedi"
+msgstr "Pred� t�to spr�vu vlo�en� do va�ej spr�vy podobne ako pri odpovedi"
 
 #: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
-msgstr "Predá niekomu vybranú správu"
+msgstr "Pred� niekomu vybran� spr�vu"
 
 #: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
-msgstr "Predá vybranú správu niekomu ako prílohu"
+msgstr "Pred� vybran� spr�vu niekomu ako pr�lohu"
 
 #: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
-msgstr "Nahrávať _obrázky"
+msgstr "Nahr�va� _obr�zky"
 
 #: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
-msgstr "Označiť ako _dôležité"
+msgstr "Ozna�i� ako _d�le�it�"
 
 #: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
-msgstr "Označiť ako nedô_ležité"
+msgstr "Ozna�i� ako ned�_le�it�"
 
 #: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
-msgstr "Označí vybrané správy ako už prečítané"
+msgstr "Ozna�� vybran� spr�vy ako u� pre��tan�"
 
 #: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
-msgstr "Označí vybrané správy ako dôležité"
+msgstr "Ozna�� vybran� spr�vy ako d�le�it�"
 
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
-msgstr "Označí vybrané správy ako neprečítané"
+msgstr "Ozna�� vybran� spr�vy ako nepre��tan�"
 
 #: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
-msgstr "Označí vybrané správy ako nedôležité"
+msgstr "Ozna�� vybran� spr�vy ako ned�le�it�"
 
 #: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
-msgstr "Označí vybrané správy na zmazanie"
+msgstr "Ozna�� vybran� spr�vy na zmazanie"
 
 #: ui/evolution-mail-message.xml.h:49
 msgid "Move"
-msgstr "Presunúť"
+msgstr "Presun��"
 
 #: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
-msgstr "Presunúť vybrané správy do iného priečinku"
+msgstr "Presun�� vybran� spr�vy do in�ho prie�inku"
 
 #: ui/evolution-mail-message.xml.h:51
 msgid "Next"
-msgstr "Nasledujúca"
+msgstr "Nasleduj�ca"
 
 #: ui/evolution-mail-message.xml.h:52
 msgid "Next Important Message"
-msgstr "Nasledujúca dôležitá správa"
+msgstr "Nasleduj�ca d�le�it� spr�va"
 
 #: ui/evolution-mail-message.xml.h:53
 msgid "Next Message"
-msgstr "Nasledujúca správa"
+msgstr "Nasleduj�ca spr�va"
 
 #: ui/evolution-mail-message.xml.h:54
 msgid "Next Thread"
-msgstr "Nasledujúce vlákno"
+msgstr "Nasleduj�ce vl�kno"
 
 #: ui/evolution-mail-message.xml.h:55
 msgid "Next Unread Message"
-msgstr "Nasledujúca neprečítaná správa"
+msgstr "Nasleduj�ca nepre��tan� spr�va"
 
 #: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
-msgstr "Otvorí aktuálnu správu v novom okne"
+msgstr "Otvor� aktu�lnu spr�vu v novom okne"
 
 #: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
-msgstr "Otvorí vybranú správu v composeri pre nové poslanie"
+msgstr "Otvor� vybran� spr�vu v composeri pre nov� poslanie"
 
 #: ui/evolution-mail-message.xml.h:58
 msgid "Preview the message to be printed"
-msgstr "Náhľad správy pred tlačou"
+msgstr "N�h�ad spr�vy pred tla�ou"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
-msgstr "Predchádzajúca"
+msgstr "Predch�dzaj�ca"
 
 #: ui/evolution-mail-message.xml.h:60
 msgid "Previous Important Message"
-msgstr "Prejde na predchádzajúcu dôležitú správu"
+msgstr "Prejde na predch�dzaj�cu d�le�it� spr�vu"
 
 #: ui/evolution-mail-message.xml.h:61
 msgid "Previous Message"
-msgstr "Predchádzajúca správa"
+msgstr "Predch�dzaj�ca spr�va"
 
 #: ui/evolution-mail-message.xml.h:62
 msgid "Previous Unread Message"
-msgstr "Prejde na predchádzajúcu neprečítanú správu"
+msgstr "Prejde na predch�dzaj�cu nepre��tan� spr�vu"
 
 #: ui/evolution-mail-message.xml.h:65
 msgid "Print this message"
-msgstr "Vytlačí túto správu"
+msgstr "Vytla�� t�to spr�vu"
 
 #: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
-msgstr "Odpovedať"
+msgstr "Odpoveda�"
 
 #: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
-msgstr "Odpovedať všetkým"
+msgstr "Odpoveda� v�etk�m"
 
 #: ui/evolution-mail-message.xml.h:70
-msgid "S_earch Message"
-msgstr "_Nájsť správu"
+msgid "S_earch Message..."
+msgstr "_N�js� spr�vu..."
 
 #: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
-msgstr "Uložiť správu do textového súboru"
+msgstr "Ulo�i� spr�vu do textov�ho s�boru"
 
 #: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
-msgstr "Hľadá v texte zobrazenej správy"
+msgstr "H�ad� v texte zobrazenej spr�vy"
+
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Nastav� str�nku pre aktu�lnu tla�iare�"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
-msgstr "Zobraziť zdrojový _kód správy"
+msgstr "Zobrazi� zdrojov� _k�d spr�vy"
 
 #: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
-msgstr "Zobraziť ú_plné hlavičky"
+msgstr "Zobrazi� �_pln� hlavi�ky"
 
 #: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
-msgstr "Zobraziť správu normálne"
+msgstr "Zobrazi� spr�vu norm�lne"
 
 #: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
-msgstr "Zobraziť správu so všetkými hlavičkami"
+msgstr "Zobrazi� spr�vu so v�etk�mi hlavi�kami"
 
 #: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
-msgstr "Zobraziť zdrojový poštový formát v správe"
+msgstr "Zobrazi� zdrojov� po�tov� form�t v spr�ve"
 
 #: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
-msgstr "Obnoviť vybrané správy"
+msgstr "Obnovi� vybran� spr�vy"
 
 #: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
-msgstr "VPriečinok na _konferenciu..."
+msgstr "VPrie�inok na _konferenciu..."
 
 #: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
-msgstr "Vpriečinok na _odosielateľa..."
+msgstr "Vprie�inok na _odosielate�a..."
 
 #: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
-msgstr "Vpriečinok na _adresátov..."
+msgstr "Vprie�inok na _adres�tov..."
 
 #: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
-msgstr "Vpriečinok na _predmet..."
+msgstr "Vprie�inok na _predmet..."
 
 #: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
-msgstr "_Použiť filtre"
+msgstr "_Pou�i� filtre"
 
 #: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
-msgstr "_Kopírovať do priečinku"
+msgstr "_Kop�rova� do prie�inku"
 
 #: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
-msgstr "Vytvoriť _filter zo správy"
+msgstr "Vytvori� _filter zo spr�vy"
 
 #: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
-msgstr "Správy _predané ďalej"
+msgstr "Spr�vy _predan� �alej"
 
 #: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
-msgstr "Zobrazenie _správy"
+msgstr "Zobrazenie _spr�vy"
 
 #: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
-msgstr "_Presunúť do priečinku"
+msgstr "_Presun�� do prie�inku"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
-msgstr "_Normálne zobrazenie"
+msgstr "_Norm�lne zobrazenie"
 
 #: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
-msgstr "_Otvoriť správu"
+msgstr "_Otvori� spr�vu"
 
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
@@ -12217,36 +12461,36 @@ msgstr "Zavrie toto okno"
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
-msgstr "_Zavrieť"
+msgstr "_Zavrie�"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
 msgid "_View"
-msgstr "_Pohľad"
+msgstr "_Poh�ad"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
-msgstr "Priložiť"
+msgstr "Prilo�i�"
 
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
-msgstr "Zavrie aktuálny súbor"
+msgstr "Zavrie aktu�lny s�bor"
 
 #: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
-msgstr "Odstrániť všetko okrem podpisu"
+msgstr "Odstr�ni� v�etko okrem podpisu"
 
 #: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
-msgstr "Zašifrovať túto správu pomocou PGP"
+msgstr "Za�ifrova� t�to spr�vu pomocou PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Zašifrovať túto správu vaším šifrovacím certifikátom S/MIME"
+msgstr "Za�ifrova� t�to spr�vu va��m �ifrovac�m certifik�tom S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
-msgstr "_Formát"
+msgstr "_Form�t"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
@@ -12254,23 +12498,23 @@ msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
 msgid "Inline Text _File..."
-msgstr "Vložiť te_xtový súbor...."
+msgstr "Vlo�i� te_xtov� s�bor...."
 
 #: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
-msgstr "Vložiť súbor ako text do správy"
+msgstr "Vlo�i� s�bor ako text do spr�vy"
 
 #: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
-msgstr "Vložiť textový súbor...."
+msgstr "Vlo�i� textov� s�bor...."
 
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
-msgstr "OtvorĂ­ súbor"
+msgstr "Otvorí s�bor"
 
 #: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
-msgstr "Šifrovanie PGP"
+msgstr "�ifrovanie PGP"
 
 #: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
@@ -12278,7 +12522,7 @@ msgstr "Podpis PGP"
 
 #: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
-msgstr "Šifrovanie S/MIME"
+msgstr "�ifrovanie S/MIME"
 
 #: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
@@ -12286,92 +12530,92 @@ msgstr "Podpis S/MIME"
 
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
-msgstr "Uložiť ako"
+msgstr "Ulo�i� ako"
 
 #: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
-msgstr "Uložiť _koncept"
+msgstr "Ulo�i� _koncept"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
-msgstr "Uložiť v priečinku..."
+msgstr "Ulo�i� v prie�inku..."
 
 #: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
-msgstr "Uložiť aktuálny súbor"
+msgstr "Ulo�i� aktu�lny s�bor"
 
 #: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
-msgstr "Uloží aktuálny súbor pod iným menom"
+msgstr "Ulo�� aktu�lny s�bor pod in�m menom"
 
 #: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
-msgstr "Uložiť správu do daného priečinku"
+msgstr "Ulo�i� spr�vu do dan�ho prie�inku"
 
 #: ui/evolution-message-composer.xml.h:27
 msgid "Send"
-msgstr "Poslať"
+msgstr "Posla�"
 
 #: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
-msgstr "Poslať _neskôr"
+msgstr "Posla� _nesk�r"
 
 #: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
-msgstr "Poslať _neskôr"
+msgstr "Posla� _nesk�r"
 
 #: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
-msgstr "Poslať správu vo formáte HTML"
+msgstr "Posla� spr�vu vo form�te HTML"
 
 #: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
-msgstr "Poslať správu neskôr"
+msgstr "Posla� spr�vu nesk�r"
 
 #: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
-msgstr "Poslať túto správu hneď"
+msgstr "Posla� t�to spr�vu hne�"
 
 #: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
-msgstr "Zobraziť / Skryť prílohy"
+msgstr "Zobrazi� / Skry� pr�lohy"
 
 #: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
-msgstr "Zobraziť _prílohy"
+msgstr "Zobrazi� _pr�lohy"
 
 #: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
-msgstr "Zobraziť prílohy"
+msgstr "Zobrazi� pr�lohy"
 
 #: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
-msgstr "Podpísať túto správu kľúčom PGP"
+msgstr "Podp�sa� t�to spr�vu k���om PGP"
 
 #: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Podpísať túto správu podpisovým certifikátor S/MIME"
+msgstr "Podp�sa� t�to spr�vu podpisov�m certifik�tor S/MIME"
 
 #: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
-msgstr "Prepne, či má byť zobrazené pole BCC"
+msgstr "Prepne, �i m� by� zobrazen� pole BCC"
 
 #: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
-msgstr "Prepne, či má byť zobrazené pole CC"
+msgstr "Prepne, �i m� by� zobrazen� pole CC"
 
 #: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
-msgstr "Prepne, či má byť zobrazené pole pre výber odosielateľa"
+msgstr "Prepne, �i m� by� zobrazen� pole pre v�ber odosielate�a"
 
 #: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Prepne, či má byť zobrazené pole Reply-to"
+msgstr "Prepne, �i m� by� zobrazen� pole Reply-to"
 
 #: ui/evolution-message-composer.xml.h:42
 msgid "_Attachment..."
-msgstr "_Príloha..."
+msgstr "_Pr�loha..."
 
 #: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
@@ -12384,11 +12628,11 @@ msgstr "Pole _CC"
 #: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
-msgstr "_Ladiť"
+msgstr "_Ladi�"
 
 #: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
-msgstr "_Odstrániť všetky"
+msgstr "_Odstr�ni� v�etky"
 
 #: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
@@ -12397,11 +12641,11 @@ msgstr "Pole _Od"
 #: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
-msgstr "_Vložiť"
+msgstr "_Vlo�i�"
 
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
-msgstr "_Otvoriť..."
+msgstr "_Otvori�..."
 
 #: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
@@ -12409,307 +12653,307 @@ msgstr "Pole _Reply-To"
 
 #: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
-msgstr "Za_bezpečenie"
+msgstr "Za_bezpe�enie"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
-msgstr "_Pomocník"
+msgstr "_Pomocn�k"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
-msgstr "Pridať priečinok do zoznamu prihlásených priečinkov"
+msgstr "Prida� prie�inok do zoznamu prihl�sen�ch prie�inkov"
 
 #: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
-msgstr "P_riečinok"
+msgstr "P_rie�inok"
 
 #: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
-msgstr "Obnoviť zoznam"
+msgstr "Obnovi� zoznam"
 
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
-msgstr "Obnoviť zoznam priečinkov"
+msgstr "Obnovi� zoznam prie�inkov"
 
 #: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
-msgstr "Odstrániť priečinok zo zoznamu prihlásených priečinkov"
+msgstr "Odstr�ni� prie�inok zo zoznamu prihl�sen�ch prie�inkov"
 
 #: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
-msgstr "Prihlásiť si"
+msgstr "Prihl�si� si"
 
 #: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
-msgstr "Odhlásiť"
+msgstr "Odhl�si�"
 
 #: ui/evolution-task-editor.xml.h:1
 msgid "Assign Task"
-msgstr "Priradiť úlohu"
+msgstr "Priradi� �lohu"
 
 #: ui/evolution-task-editor.xml.h:2
 msgid "Assign this task to others"
-msgstr "Priradiť túto úlohu niekomu inému"
+msgstr "Priradi� t�to �lohu niekomu in�mu"
 
 #: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
-msgstr "Zrušiť úlohu"
+msgstr "Zru�i� �lohu"
 
 #: ui/evolution-task-editor.xml.h:4
 msgid "Cancel this task"
-msgstr "Zrušiť túto úlohu"
+msgstr "Zru�i� t�to �lohu"
 
 #: ui/evolution-task-editor.xml.h:7
 msgid "Obtain the latest task information"
-msgstr "Získať najnovšie informácie o stretnutí"
+msgstr "Z�ska� najnov�ie inform�cie o stretnut�"
 
 #: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
-msgstr "O_bnoviť úlohu"
+msgstr "O_bnovi� �lohu"
 
 #: ui/evolution-tasks.xml.h:2
 msgid "Configure the task view's settings"
-msgstr "Nastavenie pohľadu pre úlohy"
+msgstr "Nastavenie poh�adu pre �lohy"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
-msgstr "Kopíruje vybranú úlohu"
+msgstr "Kop�ruje vybran� �lohu"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
-msgstr "Vystihne vybranú úlohu"
+msgstr "Vystihne vybran� �lohu"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
-msgstr "Odstrániť vybrané úlohy"
+msgstr "Odstr�ni� vybran� �lohy"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
-msgstr "Vloží úlohu zo schránky"
+msgstr "Vlo�� �lohu zo schr�nky"
 
-#: ui/evolution-tasks.xml.h:10
-msgid "Tasks Settings"
-msgstr "Nastavenie úlohy"
+#: ui/evolution-tasks.xml.h:13
+msgid "Tasks Settings..."
+msgstr "Nastavenie �loh..."
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:18
 msgid "_Task"
-msgstr "Ú_loha"
+msgstr "�_loha"
 
 #: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "O Evolution..."
+msgid "About Ximian Evolution..."
+msgstr "O Ximian Evolution..."
 
 #: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
-msgstr "Pridať do _panelu skratiek"
+msgstr "Prida� do _panelu skratiek"
 
 #: ui/evolution.xml.h:3
 msgid "Change the name of this folder"
-msgstr "Zmeniť meno tohto priečinku"
+msgstr "Zmeni� meno tohto prie�inku"
 
 #: ui/evolution.xml.h:6
 msgid "Copy this folder"
-msgstr "Kopírovať tento priečinok"
+msgstr "Kop�rova� tento prie�inok"
 
 #: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
-msgstr "Vytvoriť _nový priečinok..."
+msgstr "Vytvori� _nov� prie�inok..."
 
 #: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
-msgstr "Vytvoriť odkaz do tohto priečinku v paneli skratiek"
+msgstr "Vytvori� odkaz do tohto prie�inku v paneli skratiek"
 
 #: ui/evolution.xml.h:9
 msgid "Create a new folder"
-msgstr "Vytvoriť nový priečinok"
+msgstr "Vytvori� nov� prie�inok"
 
 #: ui/evolution.xml.h:10
 msgid "Delete this folder"
-msgstr "Odstrániť tento priečinok"
+msgstr "Odstr�ni� tento prie�inok"
 
 #: ui/evolution.xml.h:11
 msgid "Display a different folder"
-msgstr "Zobraziť iný priečinok"
+msgstr "Zobrazi� in� prie�inok"
 
 #: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_Koniec"
 
 #: ui/evolution.xml.h:13
-msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
-
-#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Okno Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Exit the program"
-msgstr "Ukončí program"
+msgstr "Ukon�� program"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "Import an external file format"
-msgstr "Importuje externý súbor"
+msgstr "Importuje extern� s�bor"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
-msgstr "Presunúť tento priečinok inam"
+msgstr "Presun�� tento prie�inok inam"
+
+#: ui/evolution.xml.h:18
+msgid "Open in New Window"
+msgstr "Otvori� v novom okne"
 
 #: ui/evolution.xml.h:20
-msgid "Open in New _Window"
-msgstr "Otvoriť v _novom okne"
+msgid "Open this folder in an other window"
+msgstr "Otvori� tento prie�inok v inom okne"
 
 #: ui/evolution.xml.h:21
-msgid "Open this folder in an other window"
-msgstr "Otvoriť tento priečinok v inom okne"
+msgid "Show information about Ximian Evolution"
+msgstr "Zobraz� inform�ciu o Ximian Evolution"
 
 #: ui/evolution.xml.h:22
-msgid "Show information about Evolution"
-msgstr "Zobrazí informáciu o Evolution"
-
-#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
-msgstr "Pošle správu o chybe"
+msgstr "Po�le spr�vu o chybe"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
-msgstr "_Poslať správu o chybe"
+msgstr "_Posla� spr�vu o chybe"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
+msgstr "Po�le spr�vu o chybe pomocou n�stroja pre oznamovanie ch�b Priate� v n�dzi."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Toggle"
-msgstr "Prepnúť"
+msgstr "Prepn��"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
-msgstr "Prepne, či sa má zobrazovať panel priečinkov"
+msgstr "Prepne, �i sa m� zobrazova� panel prie�inkov"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
-msgstr "Prepne, či sa má zobrazovať panel skratiek"
+msgstr "Prepne, �i sa m� zobrazova� panel skratiek"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
-msgstr "Prepne, či pracujete on alebo off-line."
+msgstr "Prepne, �i pracujete on alebo off-line."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "View the selected folder"
-msgstr "Zobraziť vybraný priečinok"
+msgstr "Zobrazi� vybran� prie�inok"
+
+#: ui/evolution.xml.h:31
+msgid "Ximian Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
 
 #: ui/evolution.xml.h:32
-msgid "_About Evolution..."
-msgstr "O _Evolution..."
+msgid "_About Ximian Evolution..."
+msgstr "O Ximian _Evolution..."
 
 #: ui/evolution.xml.h:34
 msgid "_Copy..."
-msgstr "_Kopírovať..."
+msgstr "_Kop�rova�..."
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
 msgid "_Folder Bar"
-msgstr "Pru_h priečinkov"
+msgstr "Pru_h prie�inkov"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
 msgid "_Go to Folder..."
-msgstr "_Prejsť do priečinku..."
+msgstr "_Prejs� do prie�inku..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:41
 msgid "_Import File..."
-msgstr "_Importovať súbor..."
+msgstr "_Importova� s�bor..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
 msgid "_Move..."
-msgstr "_Presunúť..."
+msgstr "_Presun��..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
 msgid "_New"
-msgstr "_Nový"
+msgstr "_Nov�"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
-msgstr "Nový _priečinok"
+msgstr "Nov� _prie�inok"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:45
 msgid "_Rename..."
-msgstr "_Premenovať..."
+msgstr "_Premenova�..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:46
 msgid "_Shortcut"
 msgstr "_Skratka"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:47
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
 msgid "_Work Offline"
-msgstr "_Pracovať off-line"
+msgstr "_Pracova� off-line"
 
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
-msgstr "Zmení nastavenie súhrnu"
+msgstr "Zmen� nastavenie s�hrnu"
 
 #: ui/my-evolution.xml.h:4
 msgid "Print summary"
-msgstr "Tlačiť súhrn"
+msgstr "Tla�i� s�hrn"
 
 #: ui/my-evolution.xml.h:5
 msgid "Reload"
-msgstr "Aktualizovať"
+msgstr "Aktualizova�"
 
 #: ui/my-evolution.xml.h:6
 msgid "Reload the view"
-msgstr "Znovu načíta pohľad"
+msgstr "Znovu na��ta poh�ad"
 
 #: ui/my-evolution.xml.h:8
 msgid "_Summary Settings..."
-msgstr "Nastavenie _súhrnu..."
+msgstr "Nastavenie _s�hrnu..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
-msgstr "Karty adresára"
+msgstr "Karty adres�ra"
 
 #: views/addressbook/galview.xml.h:2
 msgid "By Company"
-msgstr "Podľa firmy"
+msgstr "Pod�a firmy"
 
 #: views/addressbook/galview.xml.h:3
 msgid "Phone List"
-msgstr "Zoznam telefónov"
+msgstr "Zoznam telef�nov"
 
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
-msgstr "Podľa odosielateľ"
+msgstr "Pod�a odosielate�"
 
 #: views/mail/galview.xml.h:2
 msgid "By Status"
-msgstr "Podľa stavu"
+msgstr "Pod�a stavu"
 
 #: views/mail/galview.xml.h:3
 msgid "By Subject"
-msgstr "Podľa predmetu"
+msgstr "Pod�a predmetu"
 
 #: views/mail/galview.xml.h:4
 msgid "Messages"
-msgstr "Správy"
+msgstr "Spr�vy"
 
 #: views/tasks/galview.xml.h:2
 msgid "With Category"
-msgstr "S kategóriou"
+msgstr "S kateg�riou"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
-msgstr "Vyberte časovú zónu"
+msgstr "Vyberte �asov� z�nu"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "Selection:"
-msgstr "Výber:"
+msgstr "V�ber:"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "Time Zones"
-msgstr "Časové zóny"
+msgstr "�asov� z�ny"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid ""
@@ -12717,9 +12961,9 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Pomocou ľavého tlačidla myši môžete zväčšiť oblasť mapy a vybrať časovú "
-"zónu.\n"
-"Pre zmenšenie použite pravé tlačidlo myši."
+"Pomocou �av�ho tla�idla my�i m��ete zv��i� oblas� mapy a vybra� �asov� "
+"z�nu.\n"
+"Pre zmen�enie pou�ite prav� tla�idlo my�i."
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
@@ -12730,15 +12974,15 @@ msgstr "%A, %B %d, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
-msgstr "Mimo kancelárie"
+msgstr "Mimo kancel�rie"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
-msgstr "Žiadna informácia"
+msgstr "�iadna inform�cia"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
-msgstr "_Pozvať ostatných..."
+msgstr "_Pozva� ostatn�ch..."
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
@@ -12746,15 +12990,15 @@ msgstr "_Nastavenie"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
-msgstr "Zobraziť _iba pracovné hodiny"
+msgstr "Zobrazi� _iba pracovn� hodiny"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
-msgstr "Ukázať z_menšené"
+msgstr "Uk�za� z_men�en�"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
-msgstr "_Obnoviť voľno/zaneprázdnený"
+msgstr "_Obnovi� vo�no/zanepr�zdnen�"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
@@ -12762,7 +13006,7 @@ msgstr "_<<"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
-msgstr "_Autovýber"
+msgstr "_Autov�ber"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
@@ -12770,23 +13014,23 @@ msgstr ">_>"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
-msgstr "_Všetky osoby a zdroje"
+msgstr "_V�etky osoby a zdroje"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
-msgstr "Všetky _osoby a jeden zdroj"
+msgstr "V�etky _osoby a jeden zdroj"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
-msgstr "_Vyžadované osoby"
+msgstr "_Vy�adovan� osoby"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
-msgstr "Vyžadované osoby a _jeden zdroj"
+msgstr "Vy�adovan� osoby a _jeden zdroj"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
-msgstr "_Začiatok stretnutia:"
+msgstr "_Za�iatok stretnutia:"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
@@ -12794,21 +13038,21 @@ msgstr "_Koniec stretnutia:"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
-msgstr "Všetci účastníci"
+msgstr "V�etci ��astn�ci"
 
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
-msgstr "_Aktuálny pohľad"
+msgstr "_Aktu�lny poh�ad"
 
 #: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
-msgstr "Definovať pohľady"
+msgstr "Definova� poh�ady"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
-msgstr "PUSŠPSN"
+msgstr "PUS�PSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1071
@@ -12826,19 +13070,19 @@ msgstr "Dnes"
 #: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
-msgstr "Čas musí byť vo formáte: %s"
+msgstr "�as mus� by� vo form�te: %s"
 
 #: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
-msgstr "Pobaltská"
+msgstr "Pobaltsk�"
 
 #: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
-msgstr "Stredoeurópska"
+msgstr "Stredoeur�pska"
 
 #: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
-msgstr "Čínska"
+msgstr "��nska"
 
 #: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
@@ -12846,19 +13090,19 @@ msgstr "Azbuka"
 
 #: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
-msgstr "Grécka"
+msgstr "Gr�cka"
 
 #: widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
-msgstr "Japonská"
+msgstr "Japonsk�"
 
 #: widgets/misc/e-charset-picker.c:65
 msgid "Korean"
-msgstr "Kórejská"
+msgstr "K�rejsk�"
 
 #: widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
-msgstr "Turecká"
+msgstr "Tureck�"
 
 #: widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
@@ -12866,40 +13110,40 @@ msgstr "Unicode"
 
 #: widgets/misc/e-charset-picker.c:68
 msgid "Western European"
-msgstr "Západoeurópska"
+msgstr "Z�padoeur�pska"
 
 #: widgets/misc/e-charset-picker.c:85
 msgid "Traditional"
-msgstr "Tradičná"
+msgstr "Tradi�n�"
 
 #: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
 msgid "Simplified"
-msgstr "Zjednodušená"
+msgstr "Zjednodu�en�"
 
 #: widgets/misc/e-charset-picker.c:91
 msgid "Ukrainian"
-msgstr "Ukrajinská"
+msgstr "Ukrajinsk�"
 
 #: widgets/misc/e-charset-picker.c:102
 msgid "New"
-msgstr "Nová"
+msgstr "Nov�"
 
 #: widgets/misc/e-charset-picker.c:160
 #, c-format
 msgid "Unknown character set: %s"
-msgstr "Neznáma znaková sada: %s"
+msgstr "Nezn�ma znakov� sada: %s"
 
 #: widgets/misc/e-charset-picker.c:202
 msgid "Enter the character set to use"
-msgstr "Zadajte znakovú sadu, ktorú chcete použiť"
+msgstr "Zadajte znakov� sadu, ktor� chcete pou�i�"
 
 #: widgets/misc/e-charset-picker.c:277
 msgid "Other..."
-msgstr "Iné..."
+msgstr "In�..."
 
 #: widgets/misc/e-charset-picker.c:394
 msgid "Character Encoding"
-msgstr "Znaková sada"
+msgstr "Znakov� sada"
 
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
@@ -12907,27 +13151,27 @@ msgstr "..."
 
 #: widgets/misc/e-filter-bar.c:158
 msgid "Search Editor"
-msgstr "Editor hľadania"
+msgstr "Editor h�adania"
 
 #: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
-msgstr "Uložiť hľadanie"
+msgstr "Ulo�i� h�adanie"
 
 #: widgets/misc/e-filter-bar.h:94
 msgid "Add to Saved Searches"
-msgstr "Pridať do uložených hľadaní"
+msgstr "Prida� do ulo�en�ch h�adan�"
 
 #: widgets/misc/e-filter-bar.h:95
 msgid "Clear"
-msgstr "Vymazať"
+msgstr "Vymaza�"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
-msgstr "Zobraziť všetko"
+msgstr "Zobrazi� v�etko"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
-msgstr "Informácia"
+msgstr "Inform�cia"
 
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
@@ -12935,42 +13179,42 @@ msgstr "Chyba"
 
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
-msgstr "Otázka"
+msgstr "Ot�zka"
 
 #: widgets/misc/e-messagebox.c:180
 msgid "Message"
-msgstr "Správa"
+msgstr "Spr�va"
 
 #. Add the "Don't show this message again." checkbox
 #: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
-msgstr "Túto správu už nezobrazovať."
+msgstr "T�to spr�vu u� nezobrazova�."
 
 #: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
-msgstr "_Nájsť"
+msgstr "_N�js�"
 
 #: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
-msgstr "Nájsť"
+msgstr "N�js�"
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
-msgstr "Osobný adresárový server"
+msgstr "Osobn� adres�rov� server"
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
-msgstr "Vytváracie rozhranie kalendára pre Osobný kalendárový server."
+msgstr "Vytv�racie rozhranie kalend�ra pre Osobn� kalend�rov� server."
 
 #: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): Nie je možné inicializovať GNOME"
+msgstr "setup_vfs(): Nie je mo�n� inicializova� GNOME"
 
 #: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): Nie je možné inicializovať GNOME"
+msgstr "init_corba(): Nie je mo�n� inicializova� GNOME"
 
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
+msgstr "init_bonobo(): Nie je mo�n� inicializova� Bonobo"