Updated Slovak translation.

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

	* sk.po: Updated Slovak translation.

svn path=/trunk/; revision=11203

2 files changed, 5211 insertions, 3217 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index edda503894..9cca04806c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-18  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation.
+
 2001-07-18  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/sk.po b/po/sk.po
index 629c0fe639..8450e302fa 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,21 +3,29 @@
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 0.10\n"
-"POT-Creation-Date: 2001-06-10 16:19+0200\n"
-"PO-Revision-Date: 2001-06-10 18:17CET\n"
+"Project-Id-Version: evolution 0.10.99\n"
+"POT-Creation-Date: 2001-07-18 18:11+0200\n"
+"PO-Revision-Date: 2001-07-18 18:50CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.1beta\n"
+"X-Generator: KBabel 0.9.3\n"
 
-#: addressbook/backend/ebook/e-card.c:3324
+#: 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."
+
+#: 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."
+
+#: addressbook/backend/ebook/e-card.c:3606
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:3326
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +33,7 @@ msgstr ""
 "\n"
 "Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3327
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +41,7 @@ msgstr ""
 "\n"
 "  Predpona:     "
 
-#: addressbook/backend/ebook/e-card.c:3328
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +49,7 @@ msgstr ""
 "\n"
 "  Krstné:      "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +57,7 @@ msgstr ""
 "\n"
 "  Ďalšie: "
 
-#: addressbook/backend/ebook/e-card.c:3330
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +65,7 @@ msgstr ""
 "\n"
 "  Priezvisko:     "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3613
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +73,7 @@ msgstr ""
 "\n"
 "  Prípona:     "
 
-#: addressbook/backend/ebook/e-card.c:3345
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +81,7 @@ msgstr ""
 "\n"
 "Dátum narodenia:"
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3638
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +89,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +97,7 @@ msgstr ""
 "\n"
 "Poštová schránka:"
 
-#: addressbook/backend/ebook/e-card.c:3359
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +105,7 @@ msgstr ""
 "\n"
 "  Príp:         "
 
-#: addressbook/backend/ebook/e-card.c:3360
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +113,7 @@ msgstr ""
 "\n"
 "  Ulica:      "
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +121,7 @@ msgstr ""
 "\n"
 "   Mesto:  "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +129,7 @@ msgstr ""
 "\n"
 "  Región:      "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +137,7 @@ msgstr ""
 "\n"
 "   PSČ:  "
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3646
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +145,7 @@ msgstr ""
 "\n"
 "  Krajina:  "
 
-#: addressbook/backend/ebook/e-card.c:3377
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +153,7 @@ msgstr ""
 "\n"
 "Dodacie ozn:"
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3671
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +161,7 @@ msgstr ""
 "\n"
 "Telefóny:\n"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3674
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +169,7 @@ msgstr ""
 "\n"
 " Telefón: "
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3698
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3419
+#: addressbook/backend/ebook/e-card.c:3701
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +185,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3438
+#: addressbook/backend/ebook/e-card.c:3720
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +193,7 @@ msgstr ""
 "\n"
 "Pošt.klient:"
 
-#: addressbook/backend/ebook/e-card.c:3444
+#: addressbook/backend/ebook/e-card.c:3726
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +201,7 @@ msgstr ""
 "\n"
 "Časová zóna:"
 
-#: addressbook/backend/ebook/e-card.c:3452
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +209,7 @@ msgstr ""
 "\n"
 "Miesto: "
 
-#: addressbook/backend/ebook/e-card.c:3456
+#: addressbook/backend/ebook/e-card.c:3738
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +217,7 @@ msgstr ""
 "\n"
 "Pozícia: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +225,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3469
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +233,7 @@ msgstr ""
 "\n"
 " Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3470
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +241,7 @@ msgstr ""
 "\n"
 "  Vlastné:"
 
-#: addressbook/backend/ebook/e-card.c:3471
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +249,7 @@ msgstr ""
 "\n"
 "  Vlastné2: "
 
-#: addressbook/backend/ebook/e-card.c:3472
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +257,7 @@ msgstr ""
 "\n"
 "  Vlastné3: "
 
-#: addressbook/backend/ebook/e-card.c:3473
+#: addressbook/backend/ebook/e-card.c:3755
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +265,7 @@ msgstr ""
 "\n"
 "  Vlastné4: "
 
-#: addressbook/backend/ebook/e-card.c:3477
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +273,7 @@ msgstr ""
 "\n"
 "Kategórie: "
 
-#: addressbook/backend/ebook/e-card.c:3478
+#: addressbook/backend/ebook/e-card.c:3760
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3491
+#: addressbook/backend/ebook/e-card.c:3773
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +299,7 @@ msgstr ""
 "\n"
 "Unikátny reťazec:"
 
-#: addressbook/backend/ebook/e-card.c:3494
+#: addressbook/backend/ebook/e-card.c:3776
 msgid ""
 "\n"
 "Public Key: "
@@ -299,36 +307,24 @@ msgstr ""
 "\n"
 "Verejný kľúč:"
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:4038
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/backend/ebook/e-card.c:3763
+#: addressbook/backend/ebook/e-card.c:4046
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
 
-#: addressbook/backend/ebook/e-destination.c:244
-msgid "???"
-msgstr "???"
-
-#: 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."
-
-#: 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."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
 #: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/calendar/calendar-conduit.c:1150
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
@@ -341,13 +337,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook nenačítaný\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:730
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Nie je možné spustiť server wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nie je možné spustiť wombat"
@@ -357,719 +353,831 @@ msgstr "Nie je možné spustiť wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je možné prečítať blok aplikácie Adresa z pilota"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: 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."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Ovládací prvok Bonobo, ktorý zobrazuje adresy."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Ukážkový ovládací prvok Bonobo, ktorý zobrazuje adresár."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Ovládací prvok pre zobrazenie minikariet adresára Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+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."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Vytváracie rozhranie pre ovládací prvok minikariet adresára."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+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."
+
+#: 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"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Súbor"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Neznámy typ adresára"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Žiadny (anonymný mód)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:64
+msgid "Password"
+msgstr "Heslo"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Neznámy typ overenia"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Sústava"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Jeden"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Podstrom"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Neznámy typ rozsahu"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Pripájacie DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME Pomocník pre Bind DN"
+
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:75
+msgid "Remember this password"
+msgstr "Uložiť toto heslo"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:42
+msgid "Host:"
+msgstr "Hostiteľ:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Pomocník pre Host"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Koreňové DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Pomocník pre Root DN"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Pomocník pre Port"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Oblasť hľadania:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Overenie:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Pokročilé možnosti LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:65
+msgid "Path:"
+msgstr "Cesta:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Pomocník pre Path"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Vytvoriť cestu, ak ešte neexistuje."
+
+#: addressbook/gui/component/addressbook-config.c:662
+msgid "Edit Addressbook"
+msgstr "Upraviť adresár"
+
+#: addressbook/gui/component/addressbook-config.c:664
+msgid "Add Addressbook"
+msgstr "Pridať adresár"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr "Vyberte typ adresára, ktorý máte, a zadajte požadované informácie."
+
+#: addressbook/gui/component/addressbook-config.c:688
+#: mail/mail-config.glade.h:54 my-evolution/e-summary-preferences.c:888
+msgid "Name:"
+msgstr "Meno:"
+
+#: addressbook/gui/component/addressbook-config.c:689
+msgid "FIXME Name help text here"
+msgstr "FIXME Pomocník pre Name"
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Popis:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Description help text here"
+msgstr "FIXME Pomocník pre Description"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Pridať"
+msgid "Addressbook Sources"
+msgstr "Zdroje adresára"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "De_lete"
+msgstr "O_dstrániť"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Meno"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:103
+msgid "_Add"
+msgstr "_Pridať"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:105 ui/evolution-comp-editor.xml.h:20
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Upraviť"
+
+#: addressbook/gui/component/addressbook-storage.c:99
+msgid "Other Contacts"
+msgstr "Iné kontakty"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Zadajte heslo pre %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Nie je možné otvoriť adresár"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"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"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"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:554 calendar/gui/gnome-cal.c:218
+msgid "Any field contains"
+msgstr "Ľubovoľné pole obsahuje"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Meno obsahuje"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-mail obsahuje"
+
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr "Kategória obsahuje"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, ktoré zobrazí prehliadač priečinku"
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(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:1476
+msgid "Primary Email"
+msgstr "Primárny e-mail"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1477
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1478
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Vyberte akciu"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%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\""
+
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
+msgstr "Otázka pre adresár..."
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Upraviť kontakt"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:339
+msgid "Add to Contacts"
+msgstr "Pridať do kontaktov"
+
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "Zliať e-mailovú adresu"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Zakázať otázky"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Povoliť otázky (nebezpečné)"
+
+#: addressbook/gui/component/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."
+
+#: 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."
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:618
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
+msgid "Remove"
+msgstr "Odstrániť"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+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?"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Adresáti správy"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Výber mien"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
+msgstr "Vybrať meno z _priečinka:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
+msgstr "_Kategória:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Nájsť"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_Výročie:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "Do _práce"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax do práce"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_Kontakty..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ka_tegórie..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:115
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detaily"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Uložiť ako:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Všeobecné"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nový typ telefónu"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "_Poznámky:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "Organi_zation:"
+msgstr "Or_ganizácia:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Typy telefónov"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Primary Email"
-msgstr "Primárny e-mail"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Chce prijímať poštu ako _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Adresa WWW stránky:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:94
-msgid "_Add"
-msgstr "_Pridať"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adresa..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Meno _asistenta:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Dátum na_rodenia:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Práca"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Firma:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Kontakty..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:725 mail/mail-config.glade.h:95
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:108
-#: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution-tasks.xml.h:9
-#: ui/evolution.xml.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1205
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1298
+#: mail/mail-config.glade.h:104 ui/evolution-mail-message.xml.h:78
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Odstrániť"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "O_ddelenie:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Celé meno..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Domov"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "Činnosť/po_zícia:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Meno _vedúceho:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Pre_zývka:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "Prac_ovisko:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Povolanie:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "Ma_nžel(ka):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Toto je e-mailová adresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Odstrániť kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:663
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrí do týchto kategórií:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/contact-editor/e-contact-editor.c:1309
+#: addressbook/gui/contact-editor/e-contact-editor.c:1435
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Business"
 msgstr "Práca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/contact-editor/e-contact-editor.c:1436
 msgid "Business 2"
 msgstr "Práca 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1437
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Pracovný fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/contact-editor/e-contact-editor.c:1438
 msgid "Callback"
 msgstr "Spätné volanie"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1439
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1440
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1441
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/contact-editor/e-contact-editor.c:1442
 msgid "Home 2"
 msgstr "Domov 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1443
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Domáci fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/contact-editor/e-contact-editor.c:1445
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
-#: addressbook/contact-editor/e-contact-editor.c:1311
-#: mail/mail-config.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor.c:1446
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: mail/mail-config.glade.h:60
 msgid "Other"
 msgstr "Iné"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Ďalší fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1448
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/contact-editor/e-contact-editor.c:1449
 msgid "Primary"
 msgstr "Primárny"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1450
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Rádio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1451
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/contact-editor/e-contact-editor.c:1452
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:724
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:725
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Odstrániť kontakt?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:234
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Rýchly kontakt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:236
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Upraviť celé"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:277
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Celé meno"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresa _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Skontrolovať adresu"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Kra_jina:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Fínsko"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Štát/Provincia:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_PSČ:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Skontrolovať celé meno"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr. "
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Ml."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Slečna"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Pán"
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Pani"
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Sl."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "St."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Krstné:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Priezvisko:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Stredné:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Prípona:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titul:"
 
-#: addressbook/gui/component/addressbook.c:341
-#, c-format
-msgid "Enter password for %s"
-msgstr "Zadajte heslo pre %s"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "List _name:"
+msgstr "Meno _zoznamu:"
 
-#: addressbook/gui/component/addressbook.c:369
-msgid "Unable to open addressbook"
-msgstr "Nie je možné otvoriť adresár"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
+msgstr "Členovia"
 
-#: addressbook/gui/component/addressbook.c:376
-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."
+#: 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:"
 
-#: addressbook/gui/component/addressbook.c:381
-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"
+#: 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"
 
-#: addressbook/gui/component/addressbook.c:389
-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."
-
-#: addressbook/gui/component/addressbook.c:549 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "Ľubovoľné pole obsahuje"
-
-#: addressbook/gui/component/addressbook.c:550
-msgid "Name contains"
-msgstr "Meno obsahuje"
-
-#: addressbook/gui/component/addressbook.c:551
-msgid "Email contains"
-msgstr "E-mail obsahuje"
-
-#: addressbook/gui/component/addressbook.c:697
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ktoré zobrazí prehliadač priečinku"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Súbor"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Neznámy typ adresára"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Žiadny (anonymný mód)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:59
-msgid "Password"
-msgstr "Heslo"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Neznámy typ overenia"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Sústava"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Jeden"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Podstrom"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Neznámy typ rozsahu"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Pripájacie DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Pomocník pre Bind DN"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:68
-msgid "Remember this password"
-msgstr "Uložiť toto heslo"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:39
-msgid "Host:"
-msgstr "Hostiteľ:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Pomocník pre Host"
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Koreňové DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Pomocník pre Root DN"
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Pomocník pre Port"
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Oblasť hľadania:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Overenie:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Pokročilé možnosti LDAP"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Remove"
+msgstr "_Odstrániť"
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:60
-msgid "Path:"
-msgstr "Cesta:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
+msgstr "editor-zoznamu-kontaktov"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Pomocník pre Path"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+msgid "Contact List Editor"
+msgstr "Editor zoznamu kontaktov"
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Vytvoriť cestu, ak ešte neexistuje."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr "Nájdený duplikát kontaktu"
 
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Upraviť adresár"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+msgid "New Contact:"
+msgstr "Nový kontakt:"
 
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Pridať adresár"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+msgid "Original Contact:"
+msgstr "Pôvodný kontakt:"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr "Vyberte typ adresára, ktorý máte, a zadajte požadované informácie."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:49
-msgid "Name:"
-msgstr "Meno:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME Pomocník pre Name"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Popis:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME Pomocník pre Description"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Zdroje adresára"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-#: calendar/gui/e-meeting-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:7
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
-#: ui/evolution-task-editor-dialog.xml.h:18 ui/evolution-tasks.xml.h:3
-msgid "Delete"
-msgstr "Odstrániť"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Upraviť"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Meno"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Iné kontakty"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Zakázať otázky"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Povoliť otázky (nebezpečné)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:281
-msgid "Edit Contact Info"
-msgstr "Upraviť kontakt"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:347
-msgid "Add to Contacts"
-msgstr "Pridať do kontaktov"
-
-#: 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."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Ovládací prvok Bonobo, ktorý zobrazuje adresy."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Ukážkový ovládací prvok Bonobo, ktorý zobrazuje adresár."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Ovládací prvok pre zobrazenie minikariet adresára Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-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."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Vytváracie rozhranie pre ovládací prvok minikariet adresára."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-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."
-
-#: 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"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:161
-#: composer/e-msg-composer-attachment-bar.c:473 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Odstrániť"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:176
-msgid "Remove All"
-msgstr "Odstrániť všetky"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Send HTML Mail?"
-msgstr "Poslať poštu HTML?"
-
-#: 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."
+"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ť?"
 
-#: 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."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:6
+msgid "_Add Anyway"
+msgstr "_Pridať aj tak"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Nájsť..."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Zmenený kontakt:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Adresáti správy"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Konflikt v kontakte:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Výber mien"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+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ť?"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Vybrať meno z:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr "_Zmeniť aj tak"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
 #: mail/mail-search.c:242
@@ -1186,165 +1294,231 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:538
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Uložiť ako vKartu"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Poslať kontakt inému"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Poslať správu kontaktu"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:601 mail/message-browser.c:208
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:70 ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
+#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Tlačiť"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Tlačiť obálku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:697
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:264
+#: mail/mail-config.glade.h:27 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:5
+msgid "Delete"
+msgstr "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
+msgid "Error modifying card"
+msgstr "Chyba pri zmene karty"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr "Úspech"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:250 shell/e-storage.c:481
+msgid "Unknown error"
+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:475
+msgid "Permission denied"
+msgstr "Prístup zamietnutý"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr "Karta nenájdená"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr "ID karty už existuje"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr "Protokol nepodporovaný"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+msgid "Canceled"
+msgstr "Zrušené"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr "Iná chyba"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr "Chyba pri pridávaní zoznamu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr "Chyba pri pridávaní karty"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr "Chyba pri zmene zoznamu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+msgid "Error removing list"
+msgstr "Chyba pri odstraňovaní zoznamu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr "Chyba pri odstraňovaní karty"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* kliknutím pridáte kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Uložiť ako"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Primárny telefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Asistentov telefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Telefón do zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Spätné volanie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Firemný felefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Telefón domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizácia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Adresa zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Adresa domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Telefón v aute"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Telefón do zamestnania 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Telefón domov 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Iný telefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Iná adresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "WWW stránka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Oddelenie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Pracovisko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titul"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Povolanie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Vedúci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Manžel(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Poznámka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Voľno/zaneprázdnený URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Hotovo."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-msgid "Error removing card"
-msgstr "Chyba pri odstraňovaní karty"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1111
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Odstraňujem karty..."
 
-#: addressbook/gui/widgets/e-minicard.c:435
-msgid "Error modifying card"
-msgstr "Chyba pri zmene karty"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Uložiť do adresára"
@@ -1392,8 +1566,8 @@ msgid "Dimensions:"
 msgstr "Rozmery:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Písmo..."
+msgid "F_ont..."
+msgstr "_Písmo..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
@@ -1452,7 +1626,6 @@ msgid "Margins"
 msgstr "Okraje"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Počet stĺpcov:"
 
@@ -1532,13 +1705,17 @@ msgstr "Typ:"
 msgid "Width:"
 msgstr "Šírka:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr "_Písmo..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:686
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Chyba pri komunikácii s kalendárovým serverom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je možné prečítať blok aplikácie Calendar pilota"
 
@@ -1547,22 +1724,37 @@ msgstr "Nie je možné prečítať blok aplikácie Calendar pilota"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Pripomenúť schôdzku o "
+#: 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."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Opakovať"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Komponent Súhrn kalendára Evolution."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+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."
+
+#: 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."
+
+#: 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."
+
+#: 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"
+
+#: 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."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1572,141 +1764,232 @@ msgstr "Služba upozorňovania na poplachy"
 msgid "Factory for the alarm notification service"
 msgstr "Vytváracie rozhranie pre službu na upozornenie na poplach"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Upozornenie na schôdzku o %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Upozornenie na schôdzku o %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Upozornenie na schôdzku o %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Upozornenie na schôdzku o %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Upozornenie na schôdzku o %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Upozornenie na schôdzku o %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Upozornenie na schôdzku o %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Zobrazí informáciu o Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+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
+#, fuzzy
+msgid "C_lose"
+msgstr "Zavrieť"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Opakovať"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Čas opakovania (minúty)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Upraviť schôdzku"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Žiaden popis"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Pripomenúť schôdzku o "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Opakovať"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr "Je to %s. Práve teraz je unixový čas %ld. Možno ste to chceli vedieť."
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Nie je možné inicializovať GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Nie je možné inicializovať Bonobo"
+
+#: 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"
 
-#: calendar/gui/calendar-commands.c:266
+#: calendar/gui/calendar-commands.c:278
 msgid "File not found"
 msgstr "Súbor nenájdený"
 
-#: calendar/gui/calendar-commands.c:290
+#: calendar/gui/calendar-commands.c:302
 msgid "Open calendar"
 msgstr "Otvoriť kalendár"
 
-#: calendar/gui/calendar-commands.c:332
+#: calendar/gui/calendar-commands.c:344
 msgid "Save calendar"
 msgstr "Uložiť kalendár"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:596
 msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie je možné vytvoriť kalendárový pohľad. Prosím, overte nastavenie ORBit a "
 "OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:323
+#: calendar/gui/calendar-model.c:375 calendar/gui/calendar-model.c:981
+#: calendar/gui/e-calendar-table.c:346
 msgid "Public"
 msgstr "Verejný"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/calendar-model.c:378 calendar/gui/calendar-model.c:983
+#: calendar/gui/e-calendar-table.c:347
 msgid "Private"
 msgstr "Súkromný"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/calendar-model.c:381 calendar/gui/calendar-model.c:985
+#: calendar/gui/e-calendar-table.c:348
 msgid "Confidential"
 msgstr "Tajný"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:384 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:481
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:481
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:483
 msgid "E"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:483
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
+#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1166
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:696
+#: calendar/gui/e-calendar-table.c:368 mail/message-list.c:625
 msgid "High"
 msgstr "Vysoká"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
+#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1691
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:695
+#: calendar/gui/e-calendar-table.c:369 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normálny"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:525 calendar/gui/calendar-model.c:1170
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:694
+#: calendar/gui/e-calendar-table.c:370 mail/message-list.c:623
 msgid "Low"
 msgstr "Nízka"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/calendar-model.c:561 calendar/gui/calendar-model.c:1222
+#: calendar/gui/e-calendar-table.c:422
 msgid "Transparent"
 msgstr "Priehľadné"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:564 calendar/gui/calendar-model.c:1224
+#: calendar/gui/e-calendar-table.c:421
 msgid "Opaque"
 msgstr "Nepriehľadné"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:718 calendar/gui/calendar-model.c:1276
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:442
 msgid "Not Started"
 msgstr "Nezačal"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:721 calendar/gui/calendar-model.c:1278
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:443
 msgid "In Progress"
 msgstr "Prebieha"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1280
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:444
 msgid "Completed"
 msgstr "Dokončený"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1282
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:445 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Zrušený"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:877 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:880 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:885
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1717,22 +2000,25 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:965
 msgid "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "Klasifikácia musí byť 'Verejné', 'Súkromné', 'Tajné' alebo 'Žiadna'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:322
-#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:997
-#: mail/mail-accounts.c:123 mail/mail-accounts.c:174
-#: mail/mail-config.glade.h:52 shell/e-shell-view.c:1395
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:979 calendar/gui/calendar-model.c:1220
+#: calendar/gui/calendar-model.c:1274
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:345 calendar/gui/e-calendar-table.c:420
+#: mail/mail-account-gui.c:1362 mail/mail-accounts.c:131
+#: mail/mail-accounts.c:384 mail/mail-config.glade.h:57
+#: shell/e-shell-view.c:1407 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Žiadna"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1070
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1742,226 +2028,253 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1110
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Percentuálna hodnota musí byť medzi 0 až 100"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1151
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Priorita musí byť 'Vysoká', 'Normálna', 'Nízka' alebo 'Nedefinovaná'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
+#: calendar/gui/calendar-model.c:1164
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/e-calendar-table.c:371
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1205
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Priehľadnosť musí byť 'Priehľadné', 'Nepriehľadné' alebo 'Žiadne'."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1693
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1695
 msgid "Assigned"
 msgstr "Priradené"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1701
 msgid "Yes"
 msgstr "Áno"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1701
 msgid "No"
 msgstr "Nie"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Deň"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Schôdzky"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "P_racovný týždeň"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Týždeň"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:1844
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Úlohy"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Prezrieť Mesiac"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b> Chyba načítavania kalendára</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI, ktoré bude kalendár zobrazovať"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b> Chyba načítavania kalendára</b>Metóda nepodporovaná"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Zvukové alarmy"
 
-#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:29
-msgid "Display"
-msgstr "Zobrazenie"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Adresáti správy"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Zobraziť schôdzky"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Možnosti zobrazenia"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Zobraziť úlohy"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Čo je treba urobiť"
+#: calendar/gui/dialogs/alarm-options.c:390
+#, fuzzy
+msgid "Unknown Alarm Options"
+msgstr "Neznámy stav overenia."
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Načítavam kalendár"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, ktoré bude kalendár zobrazovať"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Poplach o %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Zobrazenie _správy"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Upozornenie na schôdzku o %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Prehrať zvuk:"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Súhrn nie je k dispozícii."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Zavrieť"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "spusť program:"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Upraviť schôdzku"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Čas opakovania (minúty)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
+msgid "days"
+msgstr "dní"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Aktualizovať každých"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
+msgid "hours"
+msgstr "hodín"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+msgid "minutes"
+msgstr "minút"
+
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d dní"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 deň"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d týždňov"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 týždeň"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d hodín"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 hodina"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d minút"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 minúta"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekúnd"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Prehrať zvuk"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "Show a dialog"
-msgstr "Zobraziť dialóg"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Prejsť na nasledujúcu položku"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Poslať e-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Spustiť program"
 
-#: calendar/gui/dialogs/alarm-page.c:332
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr " pred začiatkom schôdzky"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr " po začiatku schôdzky"
 
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr " pred koncom schôdzky"
 
-#: calendar/gui/dialogs/alarm-page.c:348
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr " po konci schôdzky"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Základné"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:297
 msgid "Date/Time:"
 msgstr "Dátum a čas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Pripomenutia"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Nastavenie..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:286 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Súhrn:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "Nastavenie"
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -1984,7 +2297,7 @@ msgstr "koniec schôdzky"
 msgid "hour(s)"
 msgstr "hodín"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:97
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:106
 msgid "minute(s)"
 msgstr "minút"
 
@@ -2021,36 +2334,39 @@ msgid "60 minutes"
 msgstr "60 minút"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarm vyprší po"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Zvukové alarmy"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Pípnuť pri zobrazení okna alarmu."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:985
+#: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Nastavenie kalendára"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farby"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Zhustené víkendy"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Možnosti navigácie dátumov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -2058,179 +2374,286 @@ msgid "Defaults"
 msgstr "Štandard"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Možnosti zobrazenia"
+#: mail/mail-config.glade.h:29
+msgid "Display"
+msgstr "Zobrazenie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:155
-msgid "Due Date"
-msgstr "Termín"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Povoliť opakovanie na"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Koniec dňa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Prvý deň týždňa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Pia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "Friday"
 msgstr "Piatok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Zvýraznenie"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Dnešné termíny"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Dnešné termíny:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Ešte pred termínom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Ešte pred termínom:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:974
 msgid "Monday"
 msgstr "Pondelok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Po termíne"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Po termíne:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:61
-msgid "Pick a color"
-msgstr "Vyberte farbu"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:158
-msgid "Priority"
-msgstr "Priorita"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Po termíne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Pripomenúť všetky schôdzky"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "So"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "Saturday"
 msgstr "Sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Ukázať"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Zobraziť koncové časy schôdzok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Zobraziť čísla týždňov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Začiatok dňa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Ne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Zoznam úloh"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Úlohy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Dnešné termíny"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Štv"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Čas do termínu"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Čas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Rozdelenie čas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Formát času:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Časová zóna:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Ut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:975
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Vizuálne alarmy"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Str"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:976
 msgid "Wednesday"
 msgstr "Streda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Pracovný týždeň"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "P_racovný týždeň"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minút predtým, než nastanú."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:99
-msgid "seconds."
-msgstr "sekúnd."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Naozaj chcete odstrániť tento účet?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Naozaj chcete odstrániť %d úloh?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+#, fuzzy
+msgid "This task has been deleted."
+msgstr "_Toto je e-mailová adresa"
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:582 calendar/gui/print.c:2116
+#, fuzzy
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:586 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Dokončený"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:588 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Dokončený"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:593 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:595 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Termín"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "Upraviť schôdzku"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "Schôdzka - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "Úloha - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "Položka denníku - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+#, fuzzy
+msgid "No summary"
+msgstr "Žiadny súhrn"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1462
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Prepísať súbor?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1466
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Súbor s týmto menom už existuje\n"
+"Prepísať ho?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Uložiť ako..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
@@ -2274,25 +2697,49 @@ msgstr "Naozaj chcete odstrániť %d úloh?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Naozaj chcete odstrániť %d položiek denníka?"
 
-#: calendar/gui/dialogs/event-editor.c:112
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Vyberte časovú zónu"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Výber:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Časové zóny"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Schôdzka"
 
-#: calendar/gui/dialogs/event-editor.c:117
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Pripomenutie"
 
-#: calendar/gui/dialogs/event-editor.c:122
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Opakovanie"
 
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+msgid "Meeting"
+msgstr "Stretnutie"
+
 #: calendar/gui/dialogs/event-page.glade.h:1
 msgid "A_ll day event"
 msgstr "_Celodenná udalosť"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:151
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klasifikácia"
 
@@ -2321,11 +2768,6 @@ msgstr "_Súhrn:"
 msgid "_Confidential"
 msgstr "_Tajné"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "_Kontakty..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "Čas _konca:"
@@ -2334,38 +2776,137 @@ msgstr "Čas _konca:"
 msgid "_Start time:"
 msgstr "Čas _začiatku:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "Sent By:"
+msgstr "Poslané:"
+
+#: calendar/gui/dialogs/meeting-page.c:1200
+msgid "_Delegate To..."
+msgstr "_Delegovať na..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Účastník"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
+msgstr "Spoločé meno"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+msgid "Delegated From"
+msgstr "Delegované od"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+msgid "Delegated To"
+msgstr "Delegované na"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
+msgstr "Jazyk"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
+msgstr "Člen"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rola"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: mail/message-list.etspec.h:8
+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:97
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Typ"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizátor:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
+msgstr "_Zmeniť organizátora"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
+msgstr "_Pozvať ostatných"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
+msgstr "_Iný organizátor"
+
+#: calendar/gui/dialogs/recurrence-page.c:434 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:582
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
+
+#: calendar/gui/dialogs/recurrence-page.c:947
+msgid "on"
+msgstr "zapnutá"
+
+#: calendar/gui/dialogs/recurrence-page.c:973 filter/filter-datespec.c:81
+msgid "day"
+msgstr "deň"
+
+#: calendar/gui/dialogs/recurrence-page.c:1103
+msgid "on the"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1111
+msgid "th"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1281
+msgid "occurrences"
+msgstr "výskytov"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Vlastné opakovanie"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Každých"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Výnimky"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "Zmeniť"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Neopakovať"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Ukážka"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Pravidlo opakovania"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Jednoduché opakovanie"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Modify"
+msgstr "_Upraviť"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "počas"
@@ -2390,48 +2931,44 @@ msgstr "týždňov"
 msgid "year(s)"
 msgstr "rokov"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1975
-#: calendar/gui/print.c:1977 calendar/gui/print.c:1978
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:544
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
-
-#: calendar/gui/dialogs/recurrence-page.c:887
-msgid "on"
-msgstr "zapnutá"
-
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
-msgid "day"
-msgstr "deň"
-
-#: calendar/gui/dialogs/recurrence-page.c:1043
-msgid "on the"
-msgstr " "
-
-#: calendar/gui/dialogs/recurrence-page.c:1051
-msgid "th"
-msgstr " "
-
-#: calendar/gui/dialogs/recurrence-page.c:1215
-msgid "occurrences"
-msgstr "výskytov"
-
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 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?"
+
+#: 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?"
+
+#: 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?"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Dátum dokončenia:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+msgid "Delegated From:"
+msgstr "Delegované od:"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Delegated To:"
+msgstr "Delegované na:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+msgid "No one"
+msgstr "Žiadna"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:896
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:110
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "Úloha"
 
@@ -2460,273 +2997,321 @@ msgstr "_Priorita:"
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/e-calendar-table.c:150
-msgid "Categories"
-msgstr "Kategórie"
-
-#: calendar/gui/e-calendar-table.c:152
-msgid "Completion Date"
-msgstr "Dátum dokončenia"
-
-#: calendar/gui/e-calendar-table.c:153
-msgid "End Date"
-msgstr "Dátum konca"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Start Date"
-msgstr "Dátum štartu"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Geographical Position"
-msgstr "Geografické umiestnenie"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "Percent complete"
-msgstr "Hotových percent"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Summary"
-msgstr "Súhrn"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Transparency"
-msgstr "Priesvitnosť"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Alarms"
-msgstr "Alarmy"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Click here to add a task"
-msgstr "Kliknutím pridáte úlohu"
-
-#: calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-calendar-table.c:390
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:391
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:392
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:393
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:394
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:395
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:396
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:397
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:398
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:399
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:400
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:737
+#: calendar/gui/e-calendar-table.c:886
 msgid "Edit this task"
 msgstr "Upraviť túto úlohu"
 
-#: calendar/gui/e-calendar-table.c:739
+#: calendar/gui/e-calendar-table.c:887 calendar/gui/e-calendar-table.c:897
+#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
+#: ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Vystrihnúť"
+
+#: calendar/gui/e-calendar-table.c:888 calendar/gui/e-calendar-table.c:898
+#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopírovať"
+
+#: calendar/gui/e-calendar-table.c:889 calendar/gui/e-calendar-table.c:899
+#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
+#: ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Vložiť"
+
+#: calendar/gui/e-calendar-table.c:891
 msgid "Mark as complete"
 msgstr "Označiť ako dokončenú"
 
-#: calendar/gui/e-calendar-table.c:740
-#: ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/e-calendar-table.c:892
 msgid "Delete this task"
 msgstr "Odstrániť túto úlohu"
 
-#: calendar/gui/e-calendar-table.c:745
+#: calendar/gui/e-calendar-table.c:901
 msgid "Mark tasks as complete"
 msgstr "Označiť úlohy ako dokončenú"
 
-#: calendar/gui/e-calendar-table.c:746 ui/evolution-tasks.xml.h:4
+#: calendar/gui/e-calendar-table.c:902 ui/evolution-tasks.xml.h:6
 msgid "Delete selected tasks"
 msgstr "Odstrániť vybrané úlohy"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:284
-#: calendar/gui/print.c:782
-msgid "am"
-msgstr "dopoludnia"
+#: calendar/gui/e-calendar-table.c:1259
+msgid "Click here to add a task"
+msgstr "Kliknutím pridáte úlohu"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:784
-msgid "pm"
-msgstr "popoludní"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% hotových"
+
+#: 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:696
+#: camel/camel-filter-driver.c:812
+msgid "Complete"
+msgstr "Hotovo"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Dátum dokončenia"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Termín"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Dátum konca"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Geografické umiestnenie"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Priorita"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Dátum štartu"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Súhrn"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+msgid "Task sort"
+msgstr "Triedenie úloh"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Priesvitnosť"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i rozdelení minúty"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1275
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1599
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1289
+#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1302
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3129 ui/evolution-calendar.xml.h:16
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: 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:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "popoludní"
+
+#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/e-day-view.c:3131 calendar/gui/e-week-view.c:2968
+#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
 msgid "New All Day Event"
 msgstr "Nová celodenná udalosť"
 
-#: calendar/gui/e-day-view.c:3136 calendar/gui/e-week-view.c:2973
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
 msgid "Go to Today"
 msgstr "Prejsť na dnešný dátum"
 
-#: calendar/gui/e-day-view.c:3138 calendar/gui/e-week-view.c:2975
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 msgid "Go to Date..."
 msgstr "Prejsť na dátum..."
 
-#: calendar/gui/e-day-view.c:3145 calendar/gui/e-week-view.c:2981
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
+#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
+#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
+#: ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "Otvoriť"
 
-#: calendar/gui/e-day-view.c:3147 calendar/gui/e-week-view.c:2983
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
 msgid "Delete this Appointment"
 msgstr "Odstrániť túto schôdzku"
 
-#: calendar/gui/e-day-view.c:3149 calendar/gui/e-week-view.c:2985
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Naplánovať stretnutie"
-
-#: calendar/gui/e-day-view.c:3158 calendar/gui/e-week-view.c:2998
+#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
 msgid "Make this Occurrence Movable"
 msgstr "Nastaviť tento výskyt ako presunuteľný"
 
-#: calendar/gui/e-day-view.c:3160 calendar/gui/e-week-view.c:3000
+#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
 msgid "Delete this Occurrence"
 msgstr "Odstrániť tento výskyt"
 
-#: calendar/gui/e-day-view.c:3162
+#: calendar/gui/e-day-view.c:3348
 msgid "Delete all Occurrences"
 msgstr "Odstrániť všetky výskyty"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i rozdelení minúty"
+#: calendar/gui/e-itip-control.c:649
+msgid "This is an event that can be added to your calendar."
+msgstr "Toto je udalosť, ktorú je možné pridať do vášho kalendára."
 
-#: calendar/gui/e-itip-control.c:163
-msgid "I couldn't update your calendar file!\n"
-msgstr "Nie je možné aktualizovať váš súbor s kalendárom!\n"
+#: calendar/gui/e-itip-control.c:652
+msgid "This is a meeting request."
+msgstr "Toto je požiadavka na schôdzku."
 
-#: calendar/gui/e-itip-control.c:169 calendar/gui/e-itip-control.c:512
-msgid "Component successfully updated."
-msgstr "Komponent úspešne aktualizovaný."
+#: calendar/gui/e-itip-control.c:655
+msgid "This is one or more additions to a current meeting."
+msgstr "Toto je jedna, alebo viacero úprav aktuálnej schôdzky."
 
-#: calendar/gui/e-itip-control.c:175
-msgid "There was an error loading the calendar file."
-msgstr "Nastala chyba počas načítavania súboru s kalendárom."
+#: calendar/gui/e-itip-control.c:658
+msgid "This is a request for the latest event information."
+msgstr "Toto je požiadavka na najnovšie informácie o udalosti."
 
-#: calendar/gui/e-itip-control.c:199
-msgid "I couldn't open your calendar file!\n"
-msgstr "Nie je možné otvoriť váš súbor s kalendárom!\n"
+#: calendar/gui/e-itip-control.c:661
+msgid "This is a reply to a meeting request."
+msgstr "Toto je odpoveď na požiadavku na schôdzku."
 
-#: calendar/gui/e-itip-control.c:460 calendar/gui/e-itip-control.c:531
-msgid "I couldn't load your calendar file!\n"
-msgstr "Nie je možné načítať váš súbor s kalendárom!\n"
+#: calendar/gui/e-itip-control.c:664
+msgid "This is an event cancellation."
+msgstr "Toto je zrušenie udalosti."
 
-#: calendar/gui/e-itip-control.c:472
-msgid "I couldn't read your calendar file!\n"
-msgstr "Nie je možné čítať váš súbor s kalendárom!\n"
+#: calendar/gui/e-itip-control.c:667 calendar/gui/e-itip-control.c:707
+#: calendar/gui/e-itip-control.c:735
+msgid "The message is not understandable."
+msgstr "Táto správa nie je k zrozumiteľná."
 
-#: calendar/gui/e-itip-control.c:485
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Toto je odpoveď od niekoho nepozvaného!"
+#: calendar/gui/e-itip-control.c:692
+msgid "This is an task that can be added to your calendar."
+msgstr "Toto je úloha, ktorá je možné pridať do vášho kalendára."
 
-#: calendar/gui/e-itip-control.c:501
-msgid "I couldn't update your calendar store."
-msgstr "Nie je možné aktualizovať kalendár."
+#: calendar/gui/e-itip-control.c:695
+msgid "This is a task request."
+msgstr "Toto je požiadavka na úlohu."
 
-#: calendar/gui/e-itip-control.c:542
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Nie je možné odstrániť komponent kalendára!\n"
+#: calendar/gui/e-itip-control.c:698
+msgid "This is a request for the latest task information."
+msgstr "Toto je požiadavka na najnovšie informácie o úlohe."
 
-#: calendar/gui/e-itip-control.c:552
-msgid "Component successfully deleted."
-msgstr "Komponent úspešne zmazaný."
+#: calendar/gui/e-itip-control.c:701
+msgid "This is a reply to a task request."
+msgstr "Toto je odpoveď na požiadavku na úlohu."
 
-#: calendar/gui/e-itip-control.c:696
-msgid "I don't recognize this type of calendar component."
-msgstr "Nie je možné rozoznať typ komponentu kalendára."
+#: calendar/gui/e-itip-control.c:704
+msgid "This is an task cancellation."
+msgstr "Toto je zrušenie úlohy."
 
-#: calendar/gui/e-itip-control.c:782
-msgid "Add to Calendar"
-msgstr "Pridať do kalendára"
+#: calendar/gui/e-itip-control.c:726
+msgid "This is freebusy information."
+msgstr "Toto je informácia o voľnom čase."
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Accept "
-msgstr "Akceptovať"
+#: calendar/gui/e-itip-control.c:729
+msgid "This is a request for freebusy information."
+msgstr "Toto je požiadavka na informáciu o voľnom čase."
 
-#: calendar/gui/e-itip-control.c:817
-msgid " Decline "
-msgstr "Odmietnuť"
+#: calendar/gui/e-itip-control.c:732
+msgid "This is a reply to a freebusy request."
+msgstr "Toto je odpoveď na požiadavku na voľný čas."
 
-#: calendar/gui/e-itip-control.c:818
-msgid " Tentative "
-msgstr "Predbežný"
+#: calendar/gui/e-itip-control.c:789
+msgid "The message does not appear to be properly formed"
+msgstr "Správa vyzerá ako nesprávna"
 
-#: calendar/gui/e-itip-control.c:862
-msgid "Update Calendar"
-msgstr "Aktualizovať kalendár"
+#: calendar/gui/e-itip-control.c:808
+msgid "The message contains only unsupported requests."
+msgstr "Správa obsahuje iba nepodporované požiadavky."
 
-#: calendar/gui/e-itip-control.c:885
-msgid "Cancel Meeting"
-msgstr "Zrušiť stretnutie"
+#: calendar/gui/e-itip-control.c:827
+msgid "The information contained in this attachment was not valid"
+msgstr "Informácia obsiahnutá v tento prílohe nie je platná"
+
+#: calendar/gui/e-itip-control.c:923
+msgid "I couldn't update your calendar file!\n"
+msgstr "Nie je možné aktualizovať váš súbor s kalendárom!\n"
+
+#: calendar/gui/e-itip-control.c:948
+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"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2745,14 +3330,14 @@ msgstr "Správa kalendára"
 msgid "Date:"
 msgstr "Dátum:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Načítavam kalendár"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Načítavam kalendár..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizátor:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Správa serveru:"
@@ -2765,178 +3350,67 @@ msgstr "dátum konca"
 msgid "date-start"
 msgstr "dátum začiatku"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Účastník"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Adresa účastníka"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Účastníci:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Zrušiť\n"
-"stretnutie"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Predseda"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Pozvánky na stretnutie"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Nie-účastník"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Nepovinný účastník"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizátor:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publikovať\n"
-"udalosť"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Požadovať\n"
-"stretnutie"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "Vyžadovaný účastník"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Rola"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Naplánovať\n"
-"čas"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-msgid "Status"
-msgstr "Stav"
-
-#: calendar/gui/e-tasks.c:181 calendar/gui/e-tasks.c:525
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
+#: calendar/gui/e-tasks.c:554
 msgid "All"
 msgstr "Všetky"
 
-#: calendar/gui/e-tasks.c:187
+#: calendar/gui/e-tasks.c:190
 msgid "Category:"
 msgstr "Kategória:"
 
-#: calendar/gui/e-tasks.c:333
+#: calendar/gui/e-tasks.c:329
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa načítať úlohy v `%s'"
 
-#: calendar/gui/e-tasks.c:345
+#: calendar/gui/e-tasks.c:341
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
 
-#: calendar/gui/e-week-view.c:2966 calendar/gui/e-week-view.c:2989
-msgid "New Appointment..."
-msgstr "Nová schôdzka..."
-
-#: calendar/gui/e-week-view.c:3002
-msgid "Delete All Occurrences"
-msgstr "Odstrániť všetky výskyty"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1583
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:234
+#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
+msgid "New Appointment..."
+msgstr "Nová schôdzka..."
+
+#: calendar/gui/e-week-view.c:3190
+msgid "Delete All Occurrences"
+msgstr "Odstrániť všetky výskyty"
+
+#: calendar/gui/gnome-cal.c:219
 msgid "Summary contains"
 msgstr "Súhrn obsahuje"
 
-#: calendar/gui/gnome-cal.c:235
+#: calendar/gui/gnome-cal.c:220
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: calendar/gui/gnome-cal.c:236
+#: calendar/gui/gnome-cal.c:221
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: calendar/gui/gnome-cal.c:237
+#: calendar/gui/gnome-cal.c:222
 msgid "Has category"
 msgstr "Má kategóriu"
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:1058
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie je možné otvoriť priečinok v `%s'"
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1069
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
 
-#: 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."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-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"
-
-#: 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."
-
-#: 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."
-
-#: 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."
-
-#: 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"
-
-#: 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."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Apríl"
@@ -2958,231 +3432,251 @@ msgid "Go To Date"
 msgstr "Prejsť na dátum"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Prejsť na dnešný dátum"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Január"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Júl"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Jún"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Marec"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Máj"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Október"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "_Go To Today"
+msgstr "_Prejsť na dnešný dátum"
+
+#: calendar/gui/itip-utils.c:223
+msgid "An organizer must be set."
+msgstr "Organizátor musí byť nastavený."
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "St"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Št"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Pi"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "So"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:156
+#: my-evolution/e-summary-tasks.c:172 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Úlohy"
+
 #. Day
-#: calendar/gui/print.c:1951
+#: calendar/gui/print.c:1815
 msgid "Current day (%a %b %d %Y)"
 msgstr "Dnes (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1970 calendar/gui/print.c:1974
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1971
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1982
+#: calendar/gui/print.c:1846
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Tento týždeň (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1990
+#: calendar/gui/print.c:1854
 msgid "Current month (%b %Y)"
 msgstr "Tento mesiac (%b - %Y)"
 
 #. Year
-#: calendar/gui/print.c:1997
+#: calendar/gui/print.c:1861
 msgid "Current year (%Y)"
 msgstr "Tento rok (%Y)"
 
-#: calendar/gui/print.c:2212
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Tlačiť kalendár"
 
-#: calendar/gui/print.c:2299 mail/mail-callbacks.c:1487
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1823 my-evolution/e-summary.c:501
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
-#: calendar/gui/tasks-control.c:112
+#: calendar/gui/print.c:2317
+msgid "Print Item"
+msgstr "Tlačiť položku"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Nastavenie tlačiarne"
+
+#: calendar/gui/tasks-control.c:122
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktoré bude zobrazovať priečinok úloh"
 
@@ -3227,98 +3721,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "NPUSŠPS"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "time-now neočakáva žiadne argumenty"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "make-time očakáva 1 argument"
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time očakáva ako prvý argument reťazec"
-
-#: calendar/pcs/query.c:255
-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"
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day očakáva dva argumenty"
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr "time-add-day očakáva ako prvý argument time_t"
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day očakáva ako druhý argument celé číslo"
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin očakáva jeden argument"
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-begin očakáva ako prvý argument time_t"
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr "time-day-end očakáva jeden argument"
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-day-end očakáva ako prvý argument time_t"
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype neočakáva argumenty"
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? očakáva dva argumenty"
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr "occur-in-time-range? očakáva ako druhý argument time_t"
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr "očakáva ako prvý argument time_t"
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr "contains? očakáva dva argumenty"
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? očakáva ako prvý argument reťazec"
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? očakáva ako druhý argument reťazec"
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
-msgstr ""
-"contains? očakáva ako prvý argument \"any\", \"summary\" alebo "
-"\"description\""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? očakáva aspoň jeden argument"
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr "has-categories? očakáva všetky argumenty ako reťazce"
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-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"
@@ -3339,64 +3741,81 @@ msgstr "Šifrovanie nie je podporované touto šifrou"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifrovanie nie je podporované touto šifrou"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: 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"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:530 camel/camel-filter-driver.c:539
 msgid "Syncing folders"
 msgstr "Synchronizujem priečinky"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:641
 msgid "Unable to open spool folder"
 msgstr "Nie je možné otvoriť priečinok fronty"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:650
 msgid "Unable to process spool folder"
 msgstr "Nie je možné spracovať priečinok fronty"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:664
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Získavam správu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:680
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:668 camel/camel-filter-driver.c:681
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Zlyhala správa %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:669
 msgid "Cannot open message"
 msgstr "Nie je možné otvoriť správu"
 
-#: camel/camel-filter-driver.c:691 camel/camel-filter-driver.c:801
+#: camel/camel-filter-driver.c:692 camel/camel-filter-driver.c:807
 msgid "Syncing folder"
 msgstr "Synchronizujem priečinok"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:806
-msgid "Complete"
-msgstr "Hotovo"
-
-#: camel/camel-filter-driver.c:761
+#: camel/camel-filter-driver.c:763
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Získavam správu %d z %d"
 
-#: camel/camel-filter-driver.c:766 camel/camel-filter-driver.c:784
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:786
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: camel/camel-filter-driver.c:883
+#: camel/camel-filter-driver.c:889
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba pri spracovávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:888
+#: camel/camel-filter-driver.c:895
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykonávaní filtra: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
@@ -3432,14 +3851,33 @@ msgstr "Vykonanie otázky na neznámej hlavičke: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neplatný typ v body-contains, očakávam reťazec"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nie je možné vytvoriť rúru: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nie je možné získať zámok na priečinok %s: %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 ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Nie je možné vykonať fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nie je možné vytvoriť súbor so zámkom pre %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Vypršal čas pri pokuse o získanie zámku na %s. Skúste to neskôr."
@@ -3454,113 +3892,108 @@ msgstr "Nepodarilo sa získať zámok pomocou fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepodarilo sa získať zámok pomocou flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: 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"
 
-#: camel/camel-movemail.c:148
+#: 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"
 
-#: camel/camel-movemail.c:158
+#: 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"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Nepodarilo sa otestovať súbor so zámkom pre %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Chyba pri čítaní súboru s poštou: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Chyba pri zápise pošty do dočasného súboru: %s"
-
-#: camel/camel-movemail.c:274
+#: 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"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nie je možné vytvoriť rúru: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nie je možné vykonať fork: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail zlyhal: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Neznáma chyba)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %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"
+
+#: 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"
 
-#: camel/camel-pgp-context.c:190
+#: 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"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Prosím, zadajte vaše %s heslo"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Žiadny čistý text na podpis."
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Nezadané heslo."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie je možné vytvoriť rúru do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "Žiadny čistý text pre pridanie digitálneho podpisu do čistého textu."
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Žiadny čistý text pre overenie."
 
-#: camel/camel-pgp-context.c:890
+#: 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"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Žiadny čistý text na zašifrovanie."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Neuvedený žiadni adresáti"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "Žiadny zašifrovaný text na odkódovanie."
 
@@ -3596,7 +4029,7 @@ msgid "Connection cancelled"
 msgstr "Spojenie zrušené"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie je možné spojenie s %s (port %d): %s"
@@ -3605,13 +4038,13 @@ msgstr "Nie je možné spojenie s %s (port %d): %s"
 msgid "(unknown host)"
 msgstr "(neznámy hostiteľ)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:296
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Server neočakávane zrušil spojenie"
 
@@ -3720,7 +4153,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:442
+#: camel/providers/imap/camel-imap-store.c:438
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -3789,7 +4222,7 @@ msgstr "Pre čítanie pošty ako otázky na inú množinu priečinkov"
 msgid "No provider available for protocol `%s'"
 msgstr "Pre protokol `%s' nie je k dispozícii poskytovateľ"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3835,33 +4268,17 @@ msgstr "Nepodarilo sa dekódovať správu."
 msgid "Failed to verify certificates."
 msgstr "Nepodarilo sa overiť certifikáty"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1017 mail/mail-ops.c:1024
-#: mail/mail-ops.c:1042 mail/mail-ops.c:1043
-msgid "Trash"
-msgstr "Odpadky"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"E-mail: %s\n"
-"Normálne meno: %s\n"
-"Organizačná jednotka: %s\n"
-"Organizácia: %s\n"
-"Umiestnenie: %s\n"
-"Štát: %s\n"
-"Krajina: %s"
+"Vydal: %s\n"
+"Pre: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3876,26 +4293,36 @@ msgstr ""
 "\n"
 "Chcete ho aj tak akceptovať?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Vydal: %s\n"
-"Pre: %s"
+"E-mail: %s\n"
+"Normálne meno: %s\n"
+"Organizačná jednotka: %s\n"
+"Organizácia: %s\n"
+"Umiestnenie: %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'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Taká správa neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Žiadna taká správa: %s"
@@ -3904,67 +4331,62 @@ msgstr "Žiadna taká správa: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Nemôžete skopírovať správy z tohto priečinku s odpadkami."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Nie je možné otvoriť priečinok pre vyrovnávaciu pamäť: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:241
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:249
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Neznáma chyba"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:304
 msgid "Server response ended too soon."
 msgstr "Odpoveď serveru skončila príliš skoro."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:507
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:544
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neočakávaná odpoveď OK od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:188
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:207
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie je možné načítať súhrn pre %s"
 
-#: camel/providers/imap/camel-imap-folder.c:267
+#: camel/providers/imap/camel-imap-folder.c:275
 msgid "Folder was destroyed and recreated on server."
 msgstr "Priečinok bol zničený a znovu vytvorený na serveri."
 
-#: camel/providers/imap/camel-imap-folder.c:415
+#: camel/providers/imap/camel-imap-folder.c:430
 msgid "Scanning IMAP folder"
 msgstr "Prechádzam priečinok IMAP"
 
-#: camel/providers/imap/camel-imap-folder.c:1437
-#: camel/providers/imap/camel-imap-folder.c:1673
+#: camel/providers/imap/camel-imap-folder.c:1483
+#: camel/providers/imap/camel-imap-folder.c:1824
 msgid "This message is not currently available"
 msgstr "Táto správa momentálne nie je k dipozícii"
 
-#: camel/providers/imap/camel-imap-folder.c:1465
-#: camel/providers/imap/camel-imap-folder.c:1706
+#: camel/providers/imap/camel-imap-folder.c:1857
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je možné nájsť telo správy v odpovedi FETCH."
 
+#: camel/providers/imap/camel-imap-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"
+
 #: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
 msgid "Checking for new mail"
 msgstr "Kontrolujem novú poštu"
@@ -3973,7 +4395,7 @@ msgstr "Kontrolujem novú poštu"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:599
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:646
 msgid "Folders"
 msgstr "Priečinky"
 
@@ -4005,28 +4427,28 @@ msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
 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."
 
-#: camel/providers/imap/camel-imap-store.c:465
+#: camel/providers/imap/camel-imap-store.c:461
 #, 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"
 
-#: camel/providers/imap/camel-imap-store.c:475
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:471
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:499
+#: camel/providers/imap/camel-imap-store.c:495
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsím, zadajte IMAP heslo pre %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:514
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:411
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:540
+#: camel/providers/imap/camel-imap-store.c:536
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4037,36 +4459,47 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:829 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Poštové priečinky vo formáte MH"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Pre ukladanie lokálnej pošty v poštových priečinkoch typu MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Štandardný Unixový súbor mailbox"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Pre ukladanie lokálnej pošty v štandardnom formáte mbox"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Poštové súbory vo formáte Qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Pre ukladanie lokálnej pošty v priečinkov vo formáte qmail"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Poštové súbory vo formáte Qmail maildir"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Pre ukladanie lokálnej pošty v priečinkov vo formáte qmail"
+
 #: 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"
@@ -4106,7 +4539,8 @@ msgstr "Nie je možné odstrániť súbor súhrnu priečinku `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie je možné odstrániť indexový súbor priečinku`%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: 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"
 
@@ -4122,6 +4556,7 @@ msgstr "Nie je možné pridať správu do priečinku maildir: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4133,6 +4568,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: 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"
 
@@ -4141,7 +4577,7 @@ msgstr "Taká správa neexistuje"
 msgid "Invalid message contents"
 msgstr "Neplatný obsah správy"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4151,14 +4587,14 @@ msgstr ""
 "Nie je možné otvoriť priečinok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Priečinok `%s' neexistuje."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4168,22 +4604,29 @@ msgstr ""
 "Nie je možné vytvoriť priečinok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' nie je priečinok maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: 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"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Nie je možné vytvoriť priečinok `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4191,11 +4634,13 @@ msgid "Cannot open maildir directory path: %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"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: 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"
@@ -4208,6 +4653,9 @@ msgstr "Nie je možné pridať správu do súboru mbox: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4217,10 +4665,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: 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ý."
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: 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?"
 
@@ -4266,36 +4716,45 @@ 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 "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: 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"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: 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"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1598
+#: 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:1504
 msgid "Synchronising folder"
 msgstr "Synchronizujem priečinok"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: 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"
 
 #: 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"
@@ -4304,21 +4763,28 @@ msgstr "Nie je možné otvoriť dočasnú poštovú schránku: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: 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"
 
 #: 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"
 
 #: 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"
 
 #: 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"
@@ -4334,6 +4800,8 @@ msgid "Could not rename folder: %s"
 msgstr "Nie je možné premenovať priečinok: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:879
+#: 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"
@@ -4353,39 +4821,95 @@ msgstr "`%s' nie je priečinok."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nie je možné otvoriť cestu MH: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Nie je možné pridať správu do súboru mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' nie je normálny súbor."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Priečinok `%s' neexistuje."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Lokálne ukladanie nemá priečinok pre novú poštu"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Lokálny poštový súbor %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Nie je možné otvoriť dočasný súbor s poštou %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr ""
+"Nie je možné vytvoriť priečinok `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Prosím, zadajte NNTP heslo pre %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Server odmietol používateľské meno"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: 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"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Server odmietol používateľské meno/heslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Správa %s nenájdená."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: 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."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: 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"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: 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"
@@ -4398,17 +4922,17 @@ msgstr "Diskusné skupiny USENET"
 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."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: 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"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Diskusné skupiny USENET pomocou %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4416,8 +4940,8 @@ msgstr ""
 "Táto možnosť nastaví overenie na NNTP server pomocou poslania hesla ako "
 "čistého textu."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: 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"
@@ -4468,7 +4992,7 @@ msgstr "Nechať poštu na serveri"
 msgid "Delete after %s day(s)"
 msgstr "Odstrániť po %s dňoch"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:58
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:63
 msgid "POP"
 msgstr "POP"
 
@@ -4560,7 +5084,7 @@ msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:84
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4612,7 +5136,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos pošty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:70
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:77
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4620,122 +5144,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Pre doručenie pošty spojením sa so vzdialeným serverom pomocou SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktická chyba, príkaz neznámy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktická chyba v parametroch alebo argumentoch"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Príkaz neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Parameter príkazu neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Stav systému alebo odpoveď na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Správa pomocníka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Služba pripravená"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Služba zatvára prenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Služba nie je k dispozícii, zatváram prenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Požadovaná poštová akcia v poriadku, dokončená"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Používateľ nie je lokálny, bude predaná podľa <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Požadovaná poštová akcia nevykonaná, poštová schránka nie je k dispozícii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Požadovaná akcia nevykonaná, poštová schránka nie je k dispozícii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Požadovaná akcia zrušená: chyba pri spracovaní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Používateľ nie je lokálny, skúste <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Požadovaná akcia nevykonaná: nedostatok miesta v systéme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Požadovaná poštová akcia prerušená: presiahnutá alokácia miesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Požadovaná akcia nevykonaná: meno poštovej schránky nepovolené"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Spustiť vstup pošty, končí <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Prenos zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Vyžadované heslo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizmus overenia je príliš slabý"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Požadované šifrovanie pre požadovaný spôsob overenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Dočasné zlyhanie overenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Autentifikácia vyžadovaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Chyba privítanie od serveru: %s : možno nie kritické"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:396
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:419
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4746,113 +5270,113 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:535
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:537
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručenie pošty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:562
 msgid "Cannot send message: sender address not defined."
 msgstr "Nie je možné poslať správu: adresa odosielateľa nie je definovaná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:569
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie je možné poslať správu: adresa odosielateľa nie je platná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie je možné poslať správu: adresáti nie sú definovaní."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Vypršal čas odpovede HELO: %s: nie je kritická"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:696
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Chyba odpovede HELO: %s: nie je kritická"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Error creating SASL authentication object."
 msgstr "Chyba pri vytváraní overovacieho objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:744
+#: camel/providers/smtp/camel-smtp-transport.c:756
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:765
 msgid "AUTH request failed."
 msgstr "Požiadavka AUTH zlyhala."
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpoveď na overenie od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:836
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Vypršal čas odpovede MAIL FROM: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:855
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Chyba odpovede MAIL FROM: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Vypršal čas odpovede RCPT TO: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:899
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Chyba odpovede RCPT TO: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:930
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Chyba odpovede DATA: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:984
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Vypršal čas posielania DATA: koniec správy: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1003
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Chyba odpovede DATA: koniec správy: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1027
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1046
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Chyba odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Vypršal čas odpovede QUIT: %s: nie je kritická"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Chyba odpovede QUIT: %s: nie je kritická"
@@ -4882,75 +5406,137 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:336 mail/mail-display.c:123
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
 msgid "attachment"
 msgstr "príloha"
 
-#: composer/e-msg-composer-attachment-bar.c:426
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Priložiť súbor"
-
-#: composer/e-msg-composer-attachment-bar.c:474
+#: 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"
 
-#: composer/e-msg-composer-attachment-bar.c:505
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Pridať prílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:11
-msgid "Attachment"
-msgstr "Príloha"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Vlastnosti prílohy"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Meno súboru:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Príloha v texte"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Typ MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Poslať ako:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer.c:620
-#, c-format
+#: composer/e-msg-composer-hdrs.c:325
+msgid "Click here for the address book"
+msgstr "Kliknutím zobrazíte adresár"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:356
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:362
+msgid "Reply-To:"
+msgstr "Odpovedať komu:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:373
+msgid "Subject:"
+msgstr "Predmet:"
+
+#: composer/e-msg-composer-hdrs.c:387
+msgid "To:"
+msgstr "Komu:"
+
+#: composer/e-msg-composer-hdrs.c:388
+msgid "Enter the recipients of the message"
+msgstr "Zadajte adresátov správy"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:392
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:396
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"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"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"Nie je možné otvoriť súbor s podpisom %s:\n"
+"Nie je možné otvoriť súbor %s:\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
 "%s"
+msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:869
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: composer/e-msg-composer.c:804
+#: composer/e-msg-composer.c:878
+#, fuzzy
+msgid "Warning!"
+msgstr "Pozor!"
+
+#: composer/e-msg-composer.c:880
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:902
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:922
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:896
+#: composer/e-msg-composer.c:993
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4958,12 +5544,58 @@ msgstr ""
 "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:958 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:228
+#: composer/e-msg-composer.c:1043
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Chyba pri ukladaní súboru: %s"
+
+#: composer/e-msg-composer.c:1051
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Nie je možné získať správu zo POP serveru %s: %s"
+
+#: composer/e-msg-composer.c:1057
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Nepodarilo sa vytvoriť výstupný súbor: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1063
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Nepodarilo sa vytvoriť výstupný súbor: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1072
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Chyba pri ukladaní správ do `%s':\n"
+"%s"
+
+#: composer/e-msg-composer.c:1169
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution našiel poštové súbory Pine.\n"
+"Chcete ich naimportovať do Evolution?"
+
+#: composer/e-msg-composer.c:1318 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:964
+#: composer/e-msg-composer.c:1324
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4973,100 +5605,24 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:989
+#: composer/e-msg-composer.c:1349
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:1145
-msgid "That file does not exist."
-msgstr "Súbor neexistuje."
-
-#: composer/e-msg-composer.c:1155
-msgid "That is not a regular file."
-msgstr "Toto nie je normálny súbor."
-
-#: composer/e-msg-composer.c:1165
-msgid "That file exists but is not readable."
-msgstr "Súbor existuje, ale nedá sa prečítať."
-
-#: composer/e-msg-composer.c:1175
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Súbor vyzerá ako dostupný, ale open(2) zlyhala."
-
-#: composer/e-msg-composer.c:1197
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Súbor je veľmi veľký (viac ako 100K)\n"
-"Naozaj ho chcete vložiť?"
-
-#: composer/e-msg-composer.c:1218
-msgid "An error occurred while reading the file."
-msgstr "Nastala chyba počas čítania súboru."
+#: composer/e-msg-composer.c:1498
+#, fuzzy
+msgid "Insert File"
+msgstr "Vložiť súbor"
 
-#: composer/e-msg-composer.c:1581 composer/e-msg-composer.c:1926
+#: composer/e-msg-composer.c:1854 composer/e-msg-composer.c:2243
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2337
 msgid "Could not create composer window."
 msgstr "Nie je možné vytvoriť okno editora správ."
 
-#: composer/e-msg-composer-hdrs.c:324
-msgid "Click here for the address book"
-msgstr "Kliknutím zobrazíte adresár"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:355
-msgid "From:"
-msgstr "Od:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:361
-msgid "Reply-To:"
-msgstr "Odpovedať komu:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:372
-msgid "Subject:"
-msgstr "Predmet:"
-
-#: composer/e-msg-composer-hdrs.c:386
-msgid "To:"
-msgstr "Komu:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the recipients of the message"
-msgstr "Zadajte adresátov správy"
-
-#: composer/e-msg-composer-hdrs.c:390
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
-
-#: composer/e-msg-composer-hdrs.c:394
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:395
-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."
-
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -5074,7 +5630,7 @@ msgstr ""
 "Nie je možné vytvoriť okno pre písanie správ, pretože ste ešte\n"
 "nenastavili žiadne identity pre poštový komponent."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie je možné inicializovať editor správ Evolution."
 
@@ -5091,36 +5647,56 @@ msgid "calendar information"
 msgstr "informácie o kalendári"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: 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"
@@ -5128,216 +5704,16 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 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:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nie je možné inicializovať komponent Súhrn Evolution."
-
-#: executive-summary/component/e-summary.c:926
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nie je možné otvoriť súbor HTML:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:940
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Chyba pri čítaní dát:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr "Súbor nemá miesto pre služby.\n"
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Vyberte službu"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Vybrali ste inú stránku HTML pre pozadie Súhrnu.\n"
-"\n"
-"Pre štandardnú nevypĺňajte nič."
-
-#: executive-summary/component/e-summary-url.c:70
-#: executive-summary/component/e-summary-url.c:75
-#: executive-summary/component/e-summary-url.c:82
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Otvoriť %s pomocou štandardnej aplikácie GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Otvoriť %s pomocou štandardného prehliadača WWW GNOME"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Send an email to %s"
-msgstr "Poslať e-mail %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Change the view to %s"
-msgstr "Zmeniť pohľad na %s"
-
-#: executive-summary/component/e-summary-url.c:74
-#, c-format
-msgid "Run %s"
-msgstr "Spustiť %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Close %s"
-msgstr "Zavrieť %s"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the left"
-msgstr "Presunúť %s doľava"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s to the right"
-msgstr "Presunúť %s doprava"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Presunúť %s do predchádzajúceho riadku"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Presunúť %s do nasledujúceho riadku"
-
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Configure %s"
-msgstr "Nastavenie %s"
-
-#: executive-summary/component/e-summary-url.c:554
-msgid "page"
-msgstr "strana"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Vzhľad"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Pozadie:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Komponent Súhrn nemohol inicializovať Bonobo.\n"
-"Ak bolo zobrazené nejaké varovanie o RootPOA, asi to\n"
-"znamená, že ste preložili Bonobo s GOAD a nie s OAF."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Komponent Evolution pre Súhrn."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Vytváracie rozhranie pre komponent Súhrn Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Vytváracie rozhranie pre súhrn RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Súhrn RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Vytváracie rozhranie pre komponent testovacej služby"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Vytváracie rozhranie pre testovaciu službu."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Testovacia služba Bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testovacia služba"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Chyba"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Aktualizovať automaticky"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Aktualizovať"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Aktualizovať každých"
-
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minút"
-
 #: filter/filter-datespec.c:78
 msgid "year"
 msgstr "roku"
@@ -5362,18 +5738,10 @@ msgstr "týždňa"
 msgid "weeks"
 msgstr "týždňov"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dní"
-
 #: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "hodiny"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "hodín"
-
 #: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minúty"
@@ -5444,6 +5812,10 @@ msgstr "Porovnať s"
 msgid "now"
 msgstr "teraz"
 
+#: filter/filter-datespec.c:579
+msgid " ago"
+msgstr ""
+
 #: filter/filter-datespec.c:707
 msgid "<click here to select a date>"
 msgstr "<kliknutím vyberiete dátum>"
@@ -5469,8 +5841,8 @@ msgstr ""
 "Aj, zabudli ste vybrať priečinok.\n"
 "Prosím, vráťte sa a zadajte platný priečinok, kam doručiť poštu."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:687
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
+#: mail/mail-account-gui.c:768
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
@@ -5482,46 +5854,6 @@ msgstr "Zadajte URI priečinku"
 msgid "<click here to select a folder>"
 msgstr "<kliknutím vyberiete priečinok>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Upraviť filtre"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Upraviť vpriečinky"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Prijatá"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Odoslaná"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtuálne priečinky"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "iba špecifické priečinky"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "Zdroje vpriečinkov"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-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"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "pre všetky lokálne priečinky"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5543,36 +5875,85 @@ msgstr "Meno pravidla: "
 msgid "Untitled"
 msgstr "Bez mena"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Ak"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Spustiť akcie"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "ak odpovedajú všetky kritériá"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "ak odpovedá niektoré kritérium"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Pridať kritérium"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "prijatá"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "odoslaná"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:7
+msgid "Add"
+msgstr "Pridať"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
+msgid "Edit"
+msgstr "Upraviť"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Upraviť filtre"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Upraviť vpriečinky"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Prijatá"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Odoslaná"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtuálne priečinky"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "iba špecifické priečinky"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Zdroje vpriečinkov"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+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"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "pre všetky lokálne priečinky"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Priradiť farbu"
 
 #: filter/libfilter-i18n.h:4
@@ -5720,10 +6101,11 @@ msgid "Replied to"
 msgstr "Odpovedaná"
 
 #: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:6
 msgid "Score"
 msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
 msgid "Sender"
 msgstr "Odosielateľ"
 
@@ -5732,34 +6114,39 @@ msgid "Set Status"
 msgstr "Nastaviť stav"
 
 #: filter/libfilter-i18n.h:45
+msgid "Size (kB)"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
 msgid "sounds like"
 msgstr "vyzerá ako"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Source Account"
 msgstr "Zdrojový účet"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "Specific header"
 msgstr "Špecifická hlavička"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "starts with"
 msgstr "začína na"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:774
+#: filter/libfilter-i18n.h:52 mail/mail-format.c:860
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Predmet"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "bolo po"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "was before"
 msgstr "bolo pred"
 
@@ -5779,29 +6166,19 @@ msgstr "Upraviť pravidlo"
 msgid "Score Rules"
 msgstr "Pravidlá skóre"
 
-#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
-#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:815 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:820
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:12
 msgid "Mail"
 msgstr "Pošta"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr "Aliasy Elm"
-
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
-#: shell/importer/intelligent.c:195
-msgid "Don't ask me again"
-msgstr "Túto správu už nezobrazovať"
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5809,15 +6186,15 @@ msgstr ""
 "Evolution našiel poštové súbory Elm.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Pošta Elm"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adresár"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5825,19 +6202,11 @@ msgstr ""
 "Evolution našiel súbory GnomeCard.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:825
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1399
-msgid "Filters"
-msgstr "Filtre"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "Adresáre"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:850
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5845,7 +6214,7 @@ msgstr ""
 "Evolution našiel poštové súbory Netscape.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5853,180 +6222,194 @@ msgstr ""
 "Evolution našiel poštové súbory Pine.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pošta Pine"
 
-#: mail/component-factory.c:401
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+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."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+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."
+
+#: 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."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+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."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Rozhranie pre nastavenie pošty"
+
+#: mail/component-factory.c:686
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je možné inicializovať poštový komponent Evolution."
 
-#: mail/component-factory.c:527
+#: mail/component-factory.c:820
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať sklad u shellu"
 
-#: mail/folder-browser.c:339
+#: mail/folder-browser-ui.c:253
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Vlastnosti \"%s\""
+
+#: mail/folder-browser-ui.c:255
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: mail/folder-browser.c:227 mail/mail-display.c:277
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
+
+#: mail/folder-browser.c:889
 msgid "Store search as vFolder"
 msgstr "Uložiť hľadanie ako vPriečinok"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:1232
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:1235
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:1241
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/folder-browser.c:678
+#: mail/folder-browser.c:1247
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:1250
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:1253
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/folder-browser.c:687
+#: mail/folder-browser.c:1256
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:696
+#: mail/folder-browser.c:1265
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: mail/folder-browser.c:698
+#: mail/folder-browser.c:1267
 msgid "Resend"
 msgstr "Znovuposlať"
 
-#: mail/folder-browser.c:700 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:123 ui/evolution-tasks.xml.h:11
+#: mail/folder-browser.c:1269 ui/evolution-calendar.xml.h:54
+#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
-#: mail/folder-browser.c:702 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:10
+#: mail/folder-browser.c:1271 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/folder-browser.c:707 ui/evolution-mail.xml.h:122
+#: mail/folder-browser.c:1276 ui/evolution-mail-message.xml.h:85
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/folder-browser.c:709 ui/evolution-mail.xml.h:77
+#: mail/folder-browser.c:1278 ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Odpovedať _všetkým"
+
+#: mail/folder-browser.c:1280 ui/evolution-mail-message.xml.h:60
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/folder-browser.c:711
+#: mail/folder-browser.c:1282
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/folder-browser.c:714
+#: mail/folder-browser.c:1285
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: mail/folder-browser.c:716
+#: mail/folder-browser.c:1287
 msgid "Mark as U_nread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/folder-browser.c:721
+#: mail/folder-browser.c:1289
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Označiť ako _neprečítanú"
+
+#: mail/folder-browser.c:1294
 msgid "_Move to Folder..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: mail/folder-browser.c:723
+#: mail/folder-browser.c:1296
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:727 ui/evolution-mail.xml.h:126
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:87
 msgid "_Undelete"
 msgstr "Obnoviť _zmazané"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:1305
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Pridať adresár"
+
+#: mail/folder-browser.c:1310
 msgid "Apply Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:741
+#: mail/folder-browser.c:1314
 msgid "Create Ru_le From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/folder-browser.c:880
+#: mail/folder-browser.c:1453
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:881
+#: mail/folder-browser.c:1454
 msgid "VFolder on Mailing List"
 msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:883
+#: mail/folder-browser.c:1456
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:1457
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
 
-#: mail/folder-browser-factory.c:210
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Vlastnosti \"%s\""
-
-#: mail/folder-browser-factory.c:212 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-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."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-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."
-
-#: 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."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-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."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "Rozhranie pre nastavenie pošty"
-
 #: 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"
@@ -6077,37 +6460,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor účtov Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-accounts.c:124 mail/mail-accounts.c:175
+#: mail/mail-account-gui.c:958
+#, fuzzy
+msgid "Save signature"
+msgstr "Súbor s podpisom:"
+
+#: mail/mail-account-gui.c:964
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Táto správa nebola odoslaná.\n"
+"\n"
+"Chcete uložiť zmeny?"
+
+#: mail/mail-accounts.c:132
 msgid " (default)"
 msgstr " (štandard)"
 
-#: mail/mail-accounts.c:207
+#: mail/mail-accounts.c:171
 msgid "Disable"
 msgstr "Zakázať"
 
-#: mail/mail-accounts.c:209 mail/mail-config.glade.h:35
+#: mail/mail-accounts.c:173 mail/mail-config.glade.h:37
 msgid "Enable"
 msgstr "Povoliť"
 
-#: mail/mail-accounts.c:297 mail/mail-accounts.c:301
+#: mail/mail-accounts.c:261
 msgid "Are you sure you want to delete this account?"
 msgstr "Naozaj chcete odstrániť tento účet?"
 
-#: mail/mail-accounts.c:435 mail/mail-accounts.c:439
+#: mail/mail-accounts.c:265
+#, fuzzy
+msgid "Don't delete"
+msgstr "Neodstraňovať"
+
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Použiť ho ako štandardný účet"
+
+#: mail/mail-accounts.c:508 mail/mail-accounts.c:512
 msgid "Are you sure you want to delete this news account?"
 msgstr "Naozaj chcete odstrániť tento účet diskusných skupín?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:597
+#: mail/mail-accounts.c:720
 msgid "Evolution Account Manager"
 msgstr "Správca účtov Evolution"
 
@@ -6135,7 +6550,7 @@ msgstr "%s konferencia"
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6147,7 +6562,7 @@ msgstr ""
 "posielať, prijímať alebo písať poštu.\n"
 "Chcete ho nastaviť teraz?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6155,7 +6570,7 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť identitu."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6163,11 +6578,11 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť spôsob prenosu.."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Nemáte nastavený spôsob prenosu pošty"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6175,37 +6590,45 @@ msgstr ""
 "Táto správa nemá predmet.\n"
 "Naozaj ju chcete poslať?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: 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."
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Musíte nastaviť účet pred poslaním tejto správy."
 
-#: mail/mail-callbacks.c:603
+#: mail/mail-callbacks.c:656
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "V %s, %s zapísané:"
 
-#: mail/mail-callbacks.c:769
+#: mail/mail-callbacks.c:888
 msgid "Forwarded message:\n"
 msgstr "Predaná správa:\n"
 
-#: mail/mail-callbacks.c:863
+#: mail/mail-callbacks.c:982
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:865
+#: mail/mail-callbacks.c:984
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:1031
+#: mail/mail-callbacks.c:1339
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Naozaj chcete upraviť všetkých %d správ?"
 
-#: mail/mail-callbacks.c:1053
+#: mail/mail-callbacks.c:1361
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6213,7 +6636,7 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:1087
+#: mail/mail-callbacks.c:1395
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6221,36 +6644,24 @@ msgstr ""
 "Iba správy z priečinku Odoslané je možné\n"
 "znovu poslať."
 
-#: mail/mail-callbacks.c:1099
+#: mail/mail-callbacks.c:1407
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: mail/mail-callbacks.c:1120
+#: mail/mail-callbacks.c:1428
 msgid "No Message Selected"
 msgstr "Žiadna vybraná správa"
 
-#: mail/mail-callbacks.c:1154 mail/mail-display.c:93
-msgid "Overwrite file?"
-msgstr "Prepísať súbor?"
-
-#: mail/mail-callbacks.c:1158 mail/mail-display.c:97
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Súbor s týmto menom už existuje\n"
-"Prepísať ho?"
-
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1510
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1512
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:1389
+#: mail/mail-callbacks.c:1725
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6259,23 +6670,23 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1447
+#: mail/mail-callbacks.c:1735
+msgid "Filters"
+msgstr "Filtre"
+
+#: mail/mail-callbacks.c:1783
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:1494
+#: mail/mail-callbacks.c:1830
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
-#: mail/mail-callbacks.c:1589
+#: mail/mail-callbacks.c:1925
 #, 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?"
 
-#: mail/mail-config.c:1321 mail/mail-config.c:1324
-msgid "Connecting to server..."
-msgstr "Pripájam sa na server..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6319,10 +6730,14 @@ msgstr ""
 "zobrazenie."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:463
 msgid "Evolution Account Wizard"
 msgstr "Sprievodca účtom Evolution"
 
+#: mail/mail-config.c:1583 mail/mail-config.c:1586
+msgid "Connecting to server..."
+msgstr "Pripájam sa na server..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Kontrolovať podporované typy"
@@ -6359,6 +6774,10 @@ msgstr "Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 msgid "Always load images off the net"
 msgstr "Vždy načítavať obrázky zo siete"
 
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Príloha"
+
 #: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Overenie"
@@ -6423,187 +6842,230 @@ msgstr "Koncepty"
 msgid "Drafts folder:"
 msgstr "Priečinok konceptov:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Upraviť..."
+
+#: mail/mail-config.glade.h:35
 msgid "Email Address:"
 msgstr "E-mailová adresa:"
 
 #: mail/mail-config.glade.h:36
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
 msgid "Full Name:"
 msgstr "Celé meno:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Get Digital ID..."
 msgstr "Získať digitálne ID..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Súbor s podpisom:"
+
+#: mail/mail-config.glade.h:41
 msgid "Highlight citations with"
 msgstr "Zvýrazniť citácie pomocou"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:45
 msgid "In HTML mail"
 msgstr "v HTML pošte"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:48
 msgid "Load images if sender is in addressbook"
 msgstr "Načítať obrázky ak je odosielateľ v adresári"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:49
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formát poštová schránky"
+
+#: mail/mail-config.glade.h:51
 msgid "Make this my default account"
 msgstr "Použiť ho ako štandardný účet"
 
-#: mail/mail-config.glade.h:48
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mark messages as \"Read\" after"
 msgstr "Označiť správy ako \"Prečítané\" po:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Server"
+
+#: mail/mail-config.glade.h:55
 msgid "Never load images off the net"
 msgstr "Nikdy nenačítať obrázky zo siete"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:56
 msgid "News"
 msgstr "Diskusné skupiny"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:58
 msgid "Optional Information"
 msgstr "Nepovinné informácie"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:59
 msgid "Organization:"
 msgstr "Organizácia:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:61
 msgid "PGP Key ID:"
 msgstr "ID PGP kľúča:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:62
 msgid "PGP binary path:"
 msgstr "Cesta k spustiteľnému súboru PGP:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:66
+msgid "Pick a color"
+msgstr "Vyberte farbu"
+
+#: mail/mail-config.glade.h:67
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:68
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:69
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:70
 msgid "Quoted"
 msgstr "Citovať"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:71
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:72
 msgid "Receiving Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:73
 msgid "Receiving Options"
 msgstr "Možnosti príjmu"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:74
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:76
 msgid "Required Information"
 msgstr "Povinné informácie"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:78
 msgid "Secure MIME"
 msgstr "Bezpečné MIME"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:79
 msgid "Security"
 msgstr "Bezpečnosť"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:80
 msgid "Select PGP binary"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:81
 msgid "Send mail in HTML format by default."
 msgstr "Posielať štandardne ako HTML."
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:82
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:83
 msgid "Sending Mail"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:85
 msgid "Sent"
 msgstr "Odoslané"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:86
 msgid "Sent and Draft Messages"
 msgstr "Odoslané a koncepty"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:87
 msgid "Sent messages folder:"
 msgstr "Priečinok pre odoslané správy:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:88
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:89
 msgid "Server Type: "
 msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:90
 msgid "Server requires authentication"
 msgstr "Server vyžaduje overenie"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:91
 msgid "Signature file:"
 msgstr "Súbor s podpisom:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Source"
+msgstr "Zdroj"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "Source Information"
+msgstr "Žiadna informácia"
+
+#: mail/mail-config.glade.h:94
 msgid "Sources"
 msgstr "Zdroje"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:95
 msgid "Special Folders"
 msgstr "Špeciálne priečinky"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:96
 msgid "Standard Unix mbox"
 msgstr "Štandardný Unixový súbor mbox"
 
-#: mail/mail-config.glade.h:88
-msgid "Type"
-msgstr "Typ"
-
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:98
 msgid "Use secure connection (SSL)"
 msgstr "Použiť bezpečné pripojenie (SSL)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:99
 msgid "Username:"
 msgstr "Meno používateľa:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:100
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6613,217 +7075,247 @@ msgstr ""
 "\n"
 "Kliknutím \"Ďalší\" začneme."
 
-#: mail/mail-config.glade.h:96 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:48
-msgid "_Edit"
-msgstr "_Upraviť"
+#: mail/mail-config.glade.h:107
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:108
 msgid "placeholder"
 msgstr "miesto"
 
-#: mail/mail-crypto.c:59
+#: mail/mail-config.glade.h:109
+msgid "seconds."
+msgstr "sekúnd."
+
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "Nepodarilo sa vytvoriť kontext podpisu PGP."
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "Nepodarilo sa vytvoriť kontext overenia PGP."
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "Nepodarilo sa vytvoriť kontext zašifrovania PGP."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "Nepodarilo sa vytvoriť kontext dešifrovania PGP."
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "Nepodarilo sa vytvoriť kontext podpisu S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nepodarilo sa vytvoriť kontext certsonly S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nepodarilo sa vytvoriť kontext zašifrovania S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nepodarilo sa vytvoriť kontext obálky S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
 
-#: mail/mail-display.c:197
+#: mail/mail-display.c:220
 msgid "Save Attachment"
 msgstr "Uložiť prílohu"
 
-#: mail/mail-display.c:237
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
-
-#: mail/mail-display.c:298
+#: mail/mail-display.c:337
 msgid "Save to Disk..."
 msgstr "Uložiť na disk..."
 
-#: mail/mail-display.c:300
-#, c-format
-msgid "Open in %s..."
-msgstr "Otvoriť v %s..."
-
-#: mail/mail-display.c:302
+#: mail/mail-display.c:339
 msgid "View Inline"
 msgstr "Zobraziť v texte"
 
-#: mail/mail-display.c:337
-msgid "External Viewer"
-msgstr "Externý zobrazovač"
+#: mail/mail-display.c:341
+#, c-format
+msgid "Open in %s..."
+msgstr "Otvoriť v %s..."
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:398
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Zobraziť v text (pomocou %s)"
 
-#: mail/mail-display.c:364
+#: mail/mail-display.c:402
 msgid "Hide"
 msgstr "Skryť"
 
-#: mail/mail-display.c:989
+#: mail/mail-display.c:423
+msgid "External Viewer"
+msgstr "Externý zobrazovač"
+
+#: mail/mail-display.c:1047
 msgid "Loading message content"
 msgstr "Načítavam obsah správy"
 
-#: mail/mail-display.c:1283
-msgid "Open link in browser"
+#: mail/mail-display.c:1403
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/mail-display.c:1285
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1405
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Skopírovať umiestnenie linky"
+
+#: mail/mail-display.c:1407
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Uložiť ako"
 
-#: mail/mail-display.c:1287
-msgid "Copy location (FIXME)"
-msgstr "Kopírovať umiestnenie"
+#: mail/mail-display.c:1409
+#, fuzzy
+msgid "Save Image as"
+msgstr "Uložiť správu ako..."
+
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr "%d minút"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#, fuzzy
+msgid ", "
+msgstr ", "
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d sekúnd"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:602
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:651
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:733 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:849 mail/message-list.etspec.h:4
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:766
+#: mail/mail-format.c:852
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/mail-format.c:769
+#: mail/mail-format.c:855 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:772
+#: mail/mail-format.c:858
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1094
+#: mail/mail-format.c:1181
 msgid "No GPG/PGP program configured."
 msgstr "Nenastavený žiadny program GPG/PGP."
 
-#: mail/mail-format.c:1109
+#: mail/mail-format.c:1196
 msgid "Encrypted message not displayed"
 msgstr "Zašifrovaná správa nie je zobrazená"
 
-#: mail/mail-format.c:1115
+#: mail/mail-format.c:1202
 msgid "Encrypted message"
 msgstr "Zašifrovaná správa"
 
-#: mail/mail-format.c:1116
+#: mail/mail-format.c:1203
 msgid "Click icon to decrypt."
 msgstr "Kliknite na ikonu pre dešifrovanie."
 
-#: mail/mail-format.c:1172
+#: mail/mail-format.c:1259
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Táto správa je digitálne podpísaná a podpis je platný."
 
-#: mail/mail-format.c:1180
+#: mail/mail-format.c:1267
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: mail/mail-format.c:1831
+#: mail/mail-format.c:1921
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:1843
+#: mail/mail-format.c:1933
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
 
-#: mail/mail-format.c:1847
+#: mail/mail-format.c:1937
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:1881
+#: mail/mail-format.c:1971
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:1886
+#: mail/mail-format.c:1976
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: mail/mail-local.c:504
+#: mail/mail-local.c:451
 #, c-format
 msgid "Opening '%s'"
 msgstr "Otváram '%s'"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:750
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mení priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:788
+#: mail/mail-local.c:754
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Zmeniť priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:811
+#: mail/mail-local.c:777
 msgid "Reconfiguring folder"
 msgstr "Prenastavujem priečinok"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:840
+#: mail/mail-local.c:806
 msgid "Closing current folder"
 msgstr "Zatváram aktuálny priečinok"
 
-#: mail/mail-local.c:872
+#: mail/mail-local.c:833
 msgid "Renaming old folder and opening"
 msgstr "Premenovávam starý priečinok a otváram"
 
-#: mail/mail-local.c:890
+#: mail/mail-local.c:851
 msgid "Creating new folder"
 msgstr "Vytváram nový priečinok"
 
-#: mail/mail-local.c:904
+#: mail/mail-local.c:865
 msgid "Copying messages"
 msgstr "Kopírujem správy"
 
-#: mail/mail-local.c:921
+#: mail/mail-local.c:882
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6832,7 +7324,7 @@ msgstr ""
 "Nie je možné uložiť metainformácie do priečinku, asi zistíte,\n"
 "že ho nie je možné ani otvoriť: %s"
 
-#: mail/mail-local.c:960
+#: mail/mail-local.c:921
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6840,7 +7332,7 @@ msgstr ""
 "Ak nemôžete otvoriť túto poštovú schránku, potom\n"
 "ju budete musieť opraviť ručne."
 
-#: mail/mail-local.c:1046
+#: mail/mail-local.c:1007
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znovu nastaviť %s"
@@ -6863,120 +7355,115 @@ msgstr ""
 "Chyba pri vykonávaní operácie:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
 msgid "Working"
 msgstr "Pracujem"
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:867
 msgid "Evolution progress"
 msgstr "Priebeh Evolution"
 
-#: mail/mail-ops.c:607
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posielam \"%s\""
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:581
 msgid "Sending message"
 msgstr "Posielam správu"
 
-#: mail/mail-ops.c:726
+#: mail/mail-ops.c:697
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: mail/mail-ops.c:745
+#: mail/mail-ops.c:716
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: mail/mail-ops.c:747 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:718 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Dokončené."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:883
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:883
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Premiestňujem"
 
-#: mail/mail-ops.c:926
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Kopírujem"
 
-#: mail/mail-ops.c:1002
+#: mail/mail-ops.c:1004
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: mail/mail-ops.c:1164
+#. Fill in the new fields
+#: mail/mail-ops.c:1044 mail/mail-ops.c:1045
+msgid "Trash"
+msgstr "Odpadky"
+
+#: mail/mail-ops.c:1177
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1343
+#: mail/mail-ops.c:1218 mail/mail-ops.c:1356
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1272
+#: mail/mail-ops.c:1285
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1411
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/mail-ops.c:1495
-#, c-format
-msgid "Moving folder %s to %s"
-msgstr "Presúvam priečinok %s do %s"
-
-#: mail/mail-ops.c:1497
-#, c-format
-msgid "Copying folder %s to %s"
-msgstr "Kopírujem priečinok %s do %s"
-
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1556
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1592
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1735
+#: mail/mail-ops.c:1641
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1802
+#: mail/mail-ops.c:1708
 msgid "Retrieving messages"
 msgstr "Získavam správy"
 
-#: mail/mail-ops.c:1812
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Získavam správu číslo %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1886
+#: mail/mail-ops.c:1792
 msgid "Saving messages"
 msgstr "Ukladám správy"
 
-#: mail/mail-ops.c:1965
+#: mail/mail-ops.c:1871
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6985,12 +7472,12 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1884
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Ukladám správu %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1898
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6999,11 +7486,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:1972
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:1987
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7012,12 +7499,12 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2109
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2176
+#: mail/mail-ops.c:2082
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
@@ -7046,202 +7533,152 @@ msgstr "Hľadať:"
 msgid "Matches:"
 msgstr "Odpovedá:"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Nájsť"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Ruším..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Príjem a odoslanie pošty"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Príjímam"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Posielam"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Zrušené."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "Do rúry zapísaná neúplná správa!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Súhrn pošty"
+#: mail/mail-session.c:170
+msgid "User canceled operation."
+msgstr "Používateľ zrušil operáciu."
 
-#: mail/mail-tools.c:156
+#: mail/mail-tools.c:159
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nie je možné vytvoriť dočasnú poštovú schránku `%s': %s"
 
-#: mail/mail-tools.c:203
+#: mail/mail-tools.c:207
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (predaná správa)"
 
-#: mail/mail-tools.c:213
+#: mail/mail-tools.c:217
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (žiadny predmet)"
 
-#: mail/mail-tools.c:230
+#: mail/mail-tools.c:234
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predaná správa - %s"
 
-#: mail/mail-tools.c:232
+#: mail/mail-tools.c:236
 msgid "Forwarded message (no subject)"
 msgstr "Predaná správa (bez predmetu)"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:457
 #, c-format
 msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+"s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"-----Správa poslaná ďalej-----<br><b>Od:</b> %s<br><b>Komu:</b> "
-"%s<br><b>Predmet:</b> %s<br>"
+"-----Správa poslaná ďalej-----<br><b>Od:</b> %s<br><b>Komu:</b> %"
+"s<br><b>Predmet:</b> %s<br>"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VPriečinky"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:197 ui/evolution-mail.xml.h:75
-msgid "Reply"
-msgstr "Odpovedať"
-
-#: mail/message-browser.c:197
-msgid "Reply to the sender of this message"
-msgstr "Odpovedať odosielateľovi tejto správy"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:76
-msgid "Reply to All"
-msgstr "Odpovedať všetkým"
-
-#: mail/message-browser.c:200
-msgid "Reply to all recipients of this message"
-msgstr "Odpovedať všetkým adresátom tento správy"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:38
-msgid "Forward"
-msgstr "Poslať ďalej"
-
-#: mail/message-browser.c:203
-msgid "Forward this message"
-msgstr "Predať túto správu ďalej"
-
-#: mail/message-browser.c:208
-msgid "Print the selected message"
-msgstr "Tlačiť vybranú správu"
-
-#: mail/message-browser.c:211
-msgid "Delete this message"
-msgstr "Odstrániť túto správu"
-
-#: mail/message-browser.c:216 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:69 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Predchádzajúca"
-
-#: mail/message-browser.c:216
-msgid "Previous message"
-msgstr "Predchádzajúca správa"
-
-#: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Nasl"
-
-#: mail/message-browser.c:219
-msgid "Next message"
-msgstr "Nasledujúca správa"
-
-#: mail/message-list.c:684
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Videné"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: mail/message-list.c:688
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: mail/message-list.c:693
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Nižšia"
 
-#: mail/message-list.c:697
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Vyššia"
 
-#: mail/message-list.c:698
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:964
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:986
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "Používateľ zrušil operáciu."
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Flagged"
+msgstr "Vyznačené"
+
+#: mail/message-list.etspec.h:5
+#, fuzzy
+msgid "Received"
+msgstr "Prijaté"
+
+#: mail/message-list.etspec.h:7
+#, fuzzy
+msgid "Size"
+msgstr "Veľkosť"
 
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
@@ -7271,15 +7708,1422 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z priečinku \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Správa prihlásení"
 
-#: shell/e-setup.c:124 shell/e-setup.c:197
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+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:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Nie je možné inicializovať komponent Súhrn Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Schôdzky"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Zobraziť schôdzky"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:103
+#, fuzzy
+msgid "Mail summary"
+msgstr "Súhrn pošty"
+
+#: my-evolution/e-summary-preferences.c:424
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:446
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:876
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:884
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:311
+#, fuzzy
+msgid "There was an error downloading news feed</dt>"
+msgstr "Nastala chyba počas načítavania súboru s kalendárom."
+
+#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b> Chyba načítavania kalendára</b>"
+
+#: my-evolution/e-summary-tasks.c:157
+#, fuzzy
+msgid "No tasks"
+msgstr "Nová úloha"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr "Moje počasie"
+
+#: my-evolution/e-summary-weather.c:311
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr "<dd><b>Server počasia nemohol byť kontaktovaný</b></dd>"
+
+#: my-evolution/e-summary-weather.c:641
+msgid "Regions"
+msgstr "Oblasti"
+
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
+msgstr "%A, %d %B %Y"
+
+#: my-evolution/e-summary.c:462 ui/my-evolution.xml.h:3
+msgid "Print My Evolution"
+msgstr "Tlačiť Moje Evolution"
+
+#: my-evolution/e-summary.c:508
+msgid "Printing of My Evolution failed"
+msgstr "Tlač Mojej Evolution zlyhala"
+
+#: my-evolution/main.c:52
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Komponent súhrnu nemohol inicializovať Bonobo.\n"
+
+#: my-evolution/metar.c:29
+msgid "°F"
+msgstr "°F"
+
+#: my-evolution/metar.c:29
+msgid "°C"
+msgstr "°C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "uzlov"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "míľ"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometrov"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
+msgstr "Jasná obloha"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr "Oblačno"
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr "Rozptýlená oblačnosť"
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr "Malá oblačnosť"
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr "Zatiahnuté"
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr "Neplatné"
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr "Premenlivo"
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr "Sever"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr "Severo-severovýchod"
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr "Severovýchod"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr "Východo-severovýchod"
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr "Východ"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr "Východo-Juhovýchod"
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr "Juhovýchod"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr "Juho-juhovýchod"
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr "Juh"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr "Juho-juhozápad"
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr "Juhozápad"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr "Západo-juhozápad"
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr "Západ"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr "Západo-severozápad"
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr "Severozápad"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr "Severo-severozápad"
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr "Mrholenie"
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr "Mrholenie v okolí"
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr "Ľahké mrholenie"
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr "Mierne mrholenie"
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr "Ťažké mrholenie"
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr "Slabé mrholenie"
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr "Občasné mrholenie"
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr "Čiastočné mrholenie"
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr "Búrka"
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr "Veterné mrholenie"
+
+#: my-evolution/metar.c:100
+msgid "Showers"
+msgstr "Spŕšky"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr "Kolísajúce mrholenie"
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr "Mrznúce mrholenie"
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr "Dážď"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr "Dážď v okolí"
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr "Ľahký dážď"
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr "Mierny dážď"
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr "Ťažký dážď"
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr "Slabý dážď"
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr "Občasný dážď"
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr "Čiastočné zrážky"
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr "Veterné zrážky"
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr "Dážďové spŕšky"
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr "Kolísajúci dážď"
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr "Mrznúci dážď"
+
+#. SNOW
+#: my-evolution/metar.c:102
+msgid "Snow"
+msgstr "Sneženie"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr "Sneženie v okolí"
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr "Ľahké sneženie"
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr "Mierne sneženie"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr "Ťažké sneženie"
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr "Slabé sneženie"
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr "Občasné sneženie"
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr "Čiastočné sneženie"
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr "Snehová búrka"
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr "Veterné sneženie"
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr "Snehové spŕšky"
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr "Kolísajúce sneženie"
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr "Mrznúce sneženie"
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr "Zrnité sneženie"
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr "Zrnité sneženie v okolí"
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr "Ľahké zrnité sneženie"
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr "Mierne zrnité sneženie"
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr "Ťažké zrnité sneženie"
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr "Slabé zrnité sneženie"
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr "Občasné zrnité sneženie"
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr "Čiastočné zrnité sneženie"
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr "Veterné zrnité sneženie"
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr "Spŕšky zrnitého snehu"
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr "Kolísajúce zrnité sneženie"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr "Mrznúce zrnité sneženie"
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr "Ľadové kryštály"
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr "Ľadové kryštály v okolí"
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr "Málo ľadových kryštálov"
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr "Mierne ľadové kryštály"
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr "Ťažké ľadové kryštály"
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr "Občasné ľadové kryštály"
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr "Čiastočné ľadové kryštály"
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr "Búrka ľadových kryštálov"
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+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"
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr "Kolísajúce ľadové kryštály"
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr "Mrznúce ľadové kryštály"
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr "Ľadové guličky"
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr "Ľadové guličky v okolí"
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr "Málo ľadových guličiek"
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr "Mierne ľadové guličky"
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr "Ťažké ľadové guličky"
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr "Slabé ľadové guličky"
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr "Občasné ľadové guličky"
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr "Čiastočné ľadové guličky"
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr "Búrka ľadových guličiek"
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr "Veterné ľadové guličky"
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr "Spŕšky ľadových guličiek"
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr "Kolísajúce ľadové guličky"
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr "Mrznúce ľadové guličky"
+
+#. HAIL
+#: my-evolution/metar.c:106
+msgid "Hail"
+msgstr "Krúpy"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr "Krúpy v okolí"
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr "Ľahké krúpy"
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr "Mierne krúpy"
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr "Ťažké krúpy"
+
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr "Slabé krúpy"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr "Občasné krúpy"
+
+#: my-evolution/metar.c:106
+msgid "Partial hail"
+msgstr "Čiastočné krúpy"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr "Krupobitie"
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr "Veterné krúpy"
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr "Spŕšky krúp"
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr "Kolísajúce krúpy"
+
+#: my-evolution/metar.c:106
+msgid "Freezing hail"
+msgstr "Mrznúce krúpy"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr "Male krúpy"
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr "Malé krúpy v okolí"
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr "Mierne malé krúpy"
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr "Ťažké malé krúpy"
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr "Slabé malé krúpy"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr "Občasné malé krúpy"
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr "Čiastočné malé krúpy"
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr "Krupobitie s malými krúpami"
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr "Veterné malé krúpy"
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr "Spŕšky malých krúp"
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr "Kolísajúce malé krúpy"
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr "Mrznúce malé krúpy"
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr "Neznáme zrážky"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr "Zrážky v okolí"
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr "Ľahké zrážky"
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr "Mierne zrážky"
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr "Ťažké zrážky"
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr "Slabé zrážky"
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr "Občasné zrážky"
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr "Čiastočné zrážky"
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr "Neznáma búrka"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr "Veterné zrážky"
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr "Spŕšky, neznámy typ"
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr "Kolísajúce zrážky"
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr "Mrznúce zrážky"
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr "Opar"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr "Opar v okolí"
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr "Ľahký opar"
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr "Mierny opar"
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr "Hustý opar"
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr "Slabý opar"
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr "Občasný opar"
+
+#: my-evolution/metar.c:109
+msgid "Partial mist"
+msgstr "Čiastočný opar"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr "Opar s vetrom"
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr "Kolísajúci opar"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr "Mrznúci opar"
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr "Hmla"
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr "Hmla v okolí"
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr "Ľahká hmla"
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr "Mierna hmla"
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr "Hustá hmla"
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr "Slabá hmla"
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr "Občasná hmla"
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr "Čiastočná hmla"
+
+#: my-evolution/metar.c:110
+msgid "Fog with wind"
+msgstr "Hmla s vetrom"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr "Kolísajúca hmla"
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr "Mrznúca hmla"
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr "Dym"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr "Dym v okolí"
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr "Priehľadný dym"
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr "Mierny dym"
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr "Hustý dym"
+
+#: my-evolution/metar.c:111
+msgid "Shallow smoke"
+msgstr "Slabý dym"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr "Občasný dym"
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr "Čiastočný dym"
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr "Dym s hromami"
+
+#: my-evolution/metar.c:111
+msgid "Smoke with wind"
+msgstr "Dym s vetrom"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr "Kolísajúci dym"
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr "Sopečný popol"
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr "Sopečný popol v okolí"
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr "Mierny sopečný popol"
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr "Hustý sopečný popol"
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr "Slabý sopečný popol"
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr "Občasný sopečný popol"
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr "Čiastočný sopečný popol"
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr "Sopečný popol s hromami"
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr "Veterný sopečný popol"
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr "Spŕšky sopečného popola"
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr "Kolísajúci sopečný popol"
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr "Mrznúci sopečný popol"
+
+#. SAND
+#: my-evolution/metar.c:113
+msgid "Sand"
+msgstr "Piesok"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr "Piesok v okolí"
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr "Ľahký piesok"
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr "Mierny piesok"
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr "Ťažký piesok"
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr "Občasný piesok"
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr "Čiastočný piesok"
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr "Veterný piesok"
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr "Kolísajúci piesok"
+
+#. HAZE
+#: my-evolution/metar.c:114
+msgid "Haze"
+msgstr "Opar"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr "Opar v okolí"
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr "Ľahký opar"
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr "Mierny opar"
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr "Hustý opar"
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr "Slabý opar"
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr "Občasný opar"
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr "Čiastočný opar"
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr "Opar s vetrom"
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr "Kolísajúci opar"
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr "Mrznúci opar"
+
+#. SPRAY
+#: my-evolution/metar.c:115
+msgid "Sprays"
+msgstr "Jemné spŕšky"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr "Jemné spŕšky v okolí"
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr "Ľahké jemné spŕšky"
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr "Mierne jemné spŕšky"
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr "Tažké jemné spŕšky"
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr "Slabé jemné spŕšky"
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr "Občasné jemné spŕšky"
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr "Čiastočné jemné spŕšky"
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr "Veterné jemné spŕšky"
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr "Kolísavé jemné spŕšky"
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr "Mrznúce jemné spŕšky"
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr "Prach"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr "Prach v okolí"
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr "Ľahký prach"
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr "Mierny prach"
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr "Ťažký prach"
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr "Občasný prach"
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr "Čiastočný prach"
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr "Veterný prach"
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr "Kolísajúci prach"
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr "Poryvy"
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr "Poryvy v okolí"
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr "Ľahké poryvy"
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr "Mierne poryvy"
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr "Ťažké poryvy"
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr "Čiastočné poryvy"
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr "Búrkové poryvy"
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr "Veterné poryvy"
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr "Kolísajúce poryvy"
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr "Mrazivé poryvy"
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr "Piesočná búrka"
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr "Piesočná búrka v okolí"
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr "Ľahká piesočná búrka"
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr "Mierna piesočná búrka"
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr "Ťažká piesočná búrka"
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr "Slabá piesočná búrka"
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr "Čiastočná piesočná búrka"
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr "Piesočná búrka s hromami"
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr "Veterná piesková búrka"
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr "Kolísajúca piesočná búrka"
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr "Mrazivá piesočná búrka"
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr "Prachová búrka"
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr "Prachová búrka v okolí"
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr "Ľahká prachová búrka"
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr "Mierna prachová búrka"
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr "Ťažká prachová búrka"
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr "Slabá prachová búrka"
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr "Čiastočná prachová búrka"
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr "Prachová búrka s hromami"
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr "Veterná prachová búrka"
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr "Kolísajúca prachová búrka"
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr "Mrazivá prachová búrka"
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr "Lievikovité mraky"
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr "Lievikovité mraky v okolí"
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr "Ľahké lievikovité mraky"
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr "Mierne lievikovité mraky"
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr "Husté lievikovité mraky"
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr "Slabé lievikovité mraky"
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr "Občasné lievikovité mraky"
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr "Čiastočné lievikovité mraky"
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr "Lievikovité mraky s vetrom"
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr "Kolísajúce lievikovité mraky"
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr "Tornádo"
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr "Tornádo v okolí"
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr "Mierne tornádo"
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr "Zúrivé tornádo"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr "Čiastočné tornádo"
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr "Búrkové tornádo"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr "Kolísajúce tornádo"
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr "Mrazivé tornádo"
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr "Prachové víry"
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr "Prachové víry v okolí"
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr "Ľahké prachové víry"
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr "Mierne prachové víry"
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr "Ťažké prachové víry"
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr "Slabé prachové víry"
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr "Občasné prachové víry"
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr "Čiastočné prachové víry"
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr "Veterné prachové víry"
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr "Kolísajúce prachové víry"
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add ->"
+msgstr "Pridať ->"
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "Add new feed"
+msgstr "Pridá nový kanál"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All folders:"
+msgstr "Všetky priečinky:"
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All news feeds:"
+msgstr "Všetky kanále správ:"
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "All stations:"
+msgstr "Všetky stanice:"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display folders:"
+msgstr "Zobraziť priečinky:"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Display stations:"
+msgstr "Zobraziť stanice:"
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "Displayed feeds:"
+msgstr "Zobrazené kanále:"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "Five days"
+msgstr "Päť dní"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Nastavenie"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "One day"
+msgstr "Jeden deň"
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "One month"
+msgstr "Jeden mesiac"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "One week"
+msgstr "Jeden týždeň"
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "Remove <-"
+msgstr "Odstrániť <-"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Schedule"
+msgstr "Naplánovať"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show all tasks"
+msgstr "Zobraziť všetky úlohy"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Ú_plné hlavičky"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+msgid "Tasks "
+msgstr "Úlohy "
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Units: "
+msgstr "Jednotky:"
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "Weather"
+msgstr "Počasie"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "Weather settings"
+msgstr "Nastavenie počasia"
+
+#: my-evolution/my-evolution.glade.h:29
+msgid "Wipe trackers"
+msgstr "Vyčistiť sledovače"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "imperial"
+msgstr "imperiálne"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "metric"
+msgstr "metrické"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Shell Evolution."
+
+#: shell/e-activity-handler.c:198
+msgid "Show Details"
+msgstr "Zobraziť detaily"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr "Zrušiť operáciu"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Inštalácia Evolution"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7287,27 +9131,23 @@ msgstr ""
 "Táto nová verzia Evolution vyžaduje inštaláciu dodatočných súborov\n"
 "do vášho osobného priečinku Evolution"
 
-#: shell/e-setup.c:129
+#: 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."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Nepodarilo sa korektne aktualizovať súbory"
 
-#: shell/e-setup.c:172 shell/e-setup.c:240
-msgid "Evolution files successfully installed."
-msgstr "Súbory Evolution boli úspešne nainštalované."
-
-#: shell/e-setup.c:201
+#: 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:202
+#: 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:221
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7318,16 +9158,16 @@ msgstr ""
 "%s\n"
 "Chyba: %s"
 
-#: shell/e-setup.c:236
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
-"Nie je možné skopírovať súbory do\n"
+"Nastala chyba počas kopírovania súborov do\n"
 "`%s'."
 
-#: shell/e-setup.c:303
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7338,7 +9178,7 @@ msgstr ""
 "Prosím, presuňte ho, aby mohli\n"
 "byť nainštalované súbory Evolution."
 
-#: shell/e-setup.c:317
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -7350,7 +9190,7 @@ msgstr ""
 "Musí byť odstránený pred spustením Evolution.\n"
 "Chcete ho odstrániť?"
 
-#: shell/e-setup.c:342
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7361,38 +9201,51 @@ msgstr ""
 "to priečinok Evolution. Prosím, presuňte ho,\n"
 "aby mohli byť nainštalované súbory Evolution."
 
-#: shell/e-shell.c:391
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
+#: shell/e-shell-folder-commands.c:160
+msgid "Cannot move a folder over itself."
+msgstr "Nie je možné presunúť priečinok do seba."
 
-#: shell/e-shell.c:1256
-#, c-format
-msgid ""
-"Ooops!  The view 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."
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr "Nie je možné skopírovať priečinok sám do seba."
+
+#: shell/e-shell-folder-commands.c:176
+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."
 
-#: shell/e-shell-folder-commands.c:239
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Zadajte priečinok, kam chcete skopírovať priečinok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:244
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Kopírovať priečinok"
 
-#: shell/e-shell-folder-commands.c:281
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Zadajte priečinok, kam presunúť prečinok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:286
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "Presunúť priečinok"
 
+#: shell/e-shell-folder-commands.c:354
+#, c-format
+msgid "Delete folder '%s'"
+msgstr "Odstrániť priečinok '%s'"
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Naozaj chcete odstrániť priečinok `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, c-format
+msgid "Rename folder '%s'"
+msgstr "Premenovať priečinok '%s'"
+
 #: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
@@ -7410,7 +9263,7 @@ msgstr "Zadané meno priečinku nie je platné."
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Vytvoriť nový priečinok"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7418,7 +9271,7 @@ msgstr ""
 "Typ vybraného priečinku nie je platný\n"
 "pre požadovanú operáciu."
 
-#: shell/e-shell-folder-selection-dialog.c:328
+#: shell/e-shell-folder-selection-dialog.c:332
 msgid "New..."
 msgstr "Nová..."
 
@@ -7532,50 +9385,19 @@ msgstr "Vyberte cieľový priečinok pre import týchro dát"
 msgid "Closing connections..."
 msgstr "Zatváram spojenia..."
 
-#: shell/e-shell-view.c:167
-msgid "(No folder displayed)"
-msgstr "(Nezobrazený žiadny priečinok)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1384
-msgid "My Evolution"
-msgstr "Moje Evolution"
-
-#: shell/e-shell-view.c:1401
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1403
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1441
-msgid "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 off-line."
-
-#: shell/e-shell-view.c:1448
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution prechádza do módu off-line."
-
-#: shell/e-shell-view.c:1454
-msgid "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 on-line."
-
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Nástroj pre oznamovanie chýb nebol nájdený v $PATH."
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:232
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7585,35 +9407,88 @@ msgstr ""
 "pre elektronickú poštu, kalendár a správu kontaktov\n"
 "v rámci prostredia GNOME."
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Prejsť na priečinku..."
 
-#: shell/e-shell-view-menu.c:466
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Vyberte priečinok, ktorý chcete otvoriť"
 
-#: shell/e-shell-view-menu.c:653
+#: shell/e-shell-view-menu.c:583
+msgid "Create a new shortcut"
+msgstr "Vytvorí novú skratku"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Vyberte priečinok, kam má skratka smerovať:"
+
+#: shell/e-shell-view-menu.c:689
 msgid "Work online"
 msgstr "Pracovať on-line"
 
-#: shell/e-shell-view-menu.c:665 shell/e-shell-view-menu.c:677
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
 msgid "Work offline"
 msgstr "Pracovať off-line"
 
-#: shell/e-shortcuts.c:382
-msgid "Error saving shortcuts."
-msgstr "Chyba pri ukladaní skratiek."
+#: shell/e-shell-view.c:177
+msgid "(No folder displayed)"
+msgstr "(Nezobrazený žiadny priečinok)"
 
-#: shell/e-shortcuts-view.c:134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1396 shell/e-storage-set-view.c:1435
+msgid "My Evolution"
+msgstr "Moje Evolution"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1415
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1453
+msgid "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 "
+"off-line."
+
+#: shell/e-shell-view.c:1460
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution prechádza do módu off-line."
+
+#: shell/e-shell-view.c:1466
+msgid "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 "
+"on-line."
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
+
+#: shell/e-shell.c:1310
+#, c-format
+msgid ""
+"Ooops!  The view 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."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Vytvoriť novú skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Meno skupiny:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7622,62 +9497,114 @@ msgstr ""
 "Naozaj chcete odstrániť skupinu\n"
 "`%s' z panelu skratiek?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Neodstraňovať"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:297
+msgid "Rename Shortcut Group"
+msgstr "Premenovať skupinu skratiek"
+
+#: shell/e-shortcuts-view.c:298
+msgid "Rename selected shortcut group to:"
+msgstr "Premenovať túto skupinu skratiek na:"
+
+#: shell/e-shortcuts-view.c:308
 msgid "_Small Icons"
 msgstr "_Malé ikony"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:309
 msgid "Show the shortcuts as small icons"
 msgstr "Zobraziť skratky ako malé ikony"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:311
 msgid "_Large Icons"
 msgstr "_Veľké ikony"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:312
 msgid "Show the shortcuts as large icons"
 msgstr "Zobraziť skratky ako veľké ikony"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:323
 msgid "_New Group..."
 msgstr "_Nová skupina..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:324
 msgid "Create a new shortcut group"
 msgstr "Vytvoriť novú skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
-msgstr "Odst_rániť túto skupinu skratiek"
+#: shell/e-shortcuts-view.c:326
+msgid "_Remove this Group..."
+msgstr "Odst_rániť túto skupinu..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:327
 msgid "Remove this shortcut group"
 msgstr "Odstrániť túto skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:329
+msgid "Re_name this Group..."
+msgstr "_Premenovať túto skupinu..."
+
+#: shell/e-shortcuts-view.c:330
+msgid "Rename this shortcut group"
+msgstr "Premenuje túto skupinu skratiek"
+
+#: shell/e-shortcuts-view.c:335
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skryť panel skratiek"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:336
 msgid "Hide the shortcut bar"
 msgstr "Skryť panel skratiek"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Použiť"
+#: shell/e-shortcuts-view.c:455
+msgid "Rename shortcut"
+msgstr "Premenovať skratku"
+
+#: shell/e-shortcuts-view.c:456
+msgid "Rename selected shortcut to:"
+msgstr "Premenovať túto skratku na:"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Použiť túto skratku"
+#: shell/e-shortcuts-view.c:468
+msgid "Open the folder linked to this shortcut"
+msgstr "Otvoriť priečinok skratky v novom okn"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Otvoriť v novom okne"
+
+#: shell/e-shortcuts-view.c:470
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Otvorí priečinok spojený s touto skratkou v novom okne"
+
+#: shell/e-shortcuts-view.c:473
+msgid "Rename"
+msgstr "Premenovať"
+
+#: shell/e-shortcuts-view.c:473
+msgid "Rename this shortcut"
+msgstr "Premenuje túto skratku"
+
+#: shell/e-shortcuts-view.c:475
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrániť túto skratku z panelu skratiek"
 
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Chyba pri ukladaní skratiek."
+
+#: shell/e-shortcuts.c:982
+msgid "Shortcuts"
+msgstr "Skratky"
+
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr "Doručená pošta"
+
+#: shell/e-shortcuts.c:987
+msgid "Contacts"
+msgstr "Kontakty"
+
 #: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Bez mena)"
@@ -7714,10 +9641,6 @@ msgstr "Uvedený priečinok nebol nájdený"
 msgid "Function not implemented in this storage"
 msgstr "Funkcia nie je v tomto sklade implementovaná"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Prístup zamietnutý"
-
 #: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Operácia nepodporovaná"
@@ -7726,6 +9649,32 @@ msgstr "Operácia nepodporovaná"
 msgid "The specified type is not supported in this storage"
 msgstr "Uvedený typ nie je podporovaný týmto skladom"
 
+#: shell/e-task-widget.c:167
+#, c-format
+msgid "%s (...)"
+msgstr "%s (...)"
+
+#: shell/e-task-widget.c:172
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% hotových)"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+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"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+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:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Meno priečinku:"
@@ -7738,10 +9687,6 @@ msgstr "Typ priečinku:"
 msgid "Specify where to create the folder:"
 msgstr "Zadajte, kde vytvoriť priečinok"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Shell Evolution."
-
 #: 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."
@@ -7764,30 +9709,34 @@ msgstr ""
 "Tento sprievodca vám pomôže importovať\n"
 "externé súbory do Evolution."
 
-#: shell/importer/intelligent.c:187
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "Importy"
 
-#: shell/importer/intelligent.c:193
+#: shell/importer/intelligent.c:197
 msgid "Don't import"
 msgstr "Neimportovať"
 
-#: shell/main.c:82
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Túto správu už nezobrazovať"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr "Evolution našla tieto zdroje dát:"
+
+#: shell/main.c:89
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7795,23 +9744,17 @@ msgstr ""
 "Vitajte.  Vďaka za čas strávený sťahovaním tejto ukážky\n"
 "groupwarového nástroja Evolution.\n"
 "\n"
-"Kedysi dávno sme sa pri vývoji sústreďovali hlavne na použiteľnosť\n"
-"Evolution.  Veľa vývojárov Evolution ho dnes používa ako\n"
-"hlavný nástroj pre elektronickú poštu. Vy môžete tiež. (Len si\n"
-"nezabudnite urobiť zálohu dát.)\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"
 "\n"
-"Ale zatiaľ čo sme opravili veľa chýb týkajúcich sa stability\n"
-"a bezpečnosti, stále tu zostáva vyhlásenie:  Evolution vám: spadne,\n"
-"stratí všetku poštu keď to nechcete, odmietne odstrániť správy\n"
-"keď to chcete, nechá bežať stratené procesy,\n"
-"zaberie 100% CPU, zatuhne, pošle poštu HTML do náhodných\n"
-"konferencií a zahanbí vás pred vašimi priateľmi, priateľkami.\n"
-"a spolupracovníkmi. Používajte ho len ako je to doporučené.\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"
 
-#: shell/main.c:107
+#: shell/main.c:110
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7819,34 +9762,28 @@ msgstr ""
 "Vďaka\n"
 "Tím Evolution\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:148
+msgid "Cannot access the Evolution shell."
 msgstr "Nie je možné inicializovať shell Evolution."
 
-#: shell/main.c:184
+#: shell/main.c:208
 msgid "Disable splash screen"
 msgstr "Zakázať úvodné okno"
 
-#: shell/main.c:185
+#: shell/main.c:209
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslať ladiaci výstup zo všetkých komponent od súboru."
 
-#: shell/main.c:217
+#: shell/main.c:244
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je možné inicializovať komponentový systém Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-event-editor.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:7
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Vystri_hnúť"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-mail.xml.h:8 ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopírovať"
-
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:15
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
 msgid "Copy the selection"
 msgstr "Skopíruje výber"
 
@@ -7854,68 +9791,54 @@ msgstr "Skopíruje výber"
 msgid "Create new contact"
 msgstr "Vytvoriť nový kontakt"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:15
-#: ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Vystrihnúť"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Create new contact list"
+msgstr "Vytvoriť nový zoznam kontaktov"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-event-editor.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:17
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
 msgid "Cut the selection"
 msgstr "Vystrihne výber"
 
-#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Odstrániť vybrané kontakty"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Nový kontakt"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:30
-#: ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Vložiť"
+#: ui/evolution-addressbook.xml.h:11
+msgid "New list"
+msgstr "Nový zoznam"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:31
-#: ui/evolution-task-editor-dialog.xml.h:34
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
 msgid "Paste the clipboard"
 msgstr "Vloží obsah schránky"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:68
-msgid "Previews the message to be printed"
-msgstr "Ukážka správy pred tlačou"
+#: ui/evolution-addressbook.xml.h:14
+msgid "Previews the contacts to be printed"
+msgstr "Náhľad kontaktov pred tlačou"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Print selected contacts"
 msgstr "Tlačiť vybrané kontakty"
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-event-editor.xml.h:48
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-addressbook.xml.h:18
 msgid "Select All"
 msgstr "Vybrať všetko"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Vybrať všetko"
+#: ui/evolution-addressbook.xml.h:19
+msgid "Select all contacts"
+msgstr "Vybrať všetky kontakty"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Zastaviť načítavanie"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "View All"
-msgstr "Zobraziť všetko"
-
-#: ui/evolution-addressbook.xml.h:21
-msgid "View all contacts"
-msgstr "Zobraziť všetky kontakty"
-
 #: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "Zdroje _adresára..."
@@ -7924,33 +9847,35 @@ msgstr "Zdroje _adresára..."
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:24 ui/evolution-event-editor.xml.h:55
-#: ui/evolution-task-editor-dialog.xml.h:67
+#: ui/evolution-addressbook.xml.h:24
+msgid "_Contact Group"
+msgstr "Skupina _kontaktov"
+
+#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-event-editor.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:81
+#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Vložiť"
 
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Hľadať kontakty"
 
-#: ui/evolution-addressbook.xml.h:28 ui/evolution-event-editor.xml.h:72
-#: ui/evolution-task-editor-dialog.xml.h:86
+#: ui/evolution-addressbook.xml.h:29
 msgid "_Select All"
 msgstr "Vybrať _všetko"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
-#: ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Nástroje"
 
@@ -7958,149 +9883,242 @@ msgstr "_Nástroje"
 msgid "5 Days"
 msgstr "5 dní"
 
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+#: ui/evolution-calendar.xml.h:2
 msgid "Alter preferences"
 msgstr "Zmeniť nastavenie"
 
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:7
 msgid "Create a new all day Event"
 msgstr "Vytvoriť novú celodennú udalosť"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:8
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:9
 msgid "Create a new calendar"
 msgstr "Vytvoriť nový kalendár"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Deň"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:13
 msgid "Go To"
 msgstr "Prejsť na"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back in time"
 msgstr "Prejsť dozadu"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward in time"
 msgstr "Prejsť dopredu"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Prejsť na _dátum"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Prejsť na d_nešný dátum"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Prejsť na zadaný dátum"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to present time"
 msgstr "Prejsť na aktuálny čas"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Mesiac"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:22
 msgid "New _Event"
 msgstr "Nová _udalosť"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
+msgid "Next"
+msgstr "Nasl"
+
+#: ui/evolution-calendar.xml.h:25
 msgid "Open Calendar"
 msgstr "Otvoriť kalendár"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:28
 msgid "Prev"
 msgstr "Pred"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:29
 msgid "Previews the calendar to be printed"
 msgstr "Ukážka kalendára pred tlačou"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:32
 msgid "Print calendar"
 msgstr "Tlačiť kalendár"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:33
 msgid "Print this Calendar"
 msgstr "Tlačiť tento kalendár"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
+#: ui/evolution-calendar.xml.h:34
+msgid "Publish Free/Busy Information"
+msgstr "Publikovať informácie o voľnom čase"
+
+#: ui/evolution-calendar.xml.h:35
+msgid "Publish Free/Busy information for this calendar"
+msgstr "Publikovať informácie o voľnom čase pre tento kalendár"
+
+#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Uložiť ako"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:37
 msgid "Save calendar as something else"
 msgstr "Uložiť kalendár ako niečo iné"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:38
+msgid "Settings..."
+msgstr "Nastavenie..."
+
+#: ui/evolution-calendar.xml.h:39
 msgid "Show 1 day"
 msgstr "Zobraziť jeden deň"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:40
 msgid "Show 1 month"
 msgstr "Zobraziť jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:41
 msgid "Show 1 week"
 msgstr "Zobraziť jeden týždeň"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:42
 msgid "Show the working week"
 msgstr "Zobraziť pracovný týždeň"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
+#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
+#: widgets/misc/e-dateedit.c:429
 msgid "Today"
 msgstr "Dnes"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:44
 msgid "W_ork Week"
 msgstr "P_racovný týždeň"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:45
 msgid "Week"
 msgstr "Týždeň"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:46
 msgid "_Appointment"
 msgstr "_Schôdzka"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:48
 msgid "_Day"
 msgstr "_Deň"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:49
 msgid "_Month"
 msgstr "_Mesiac"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:58
+#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
 msgid "_New"
 msgstr "_Nový"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:51
 msgid "_Open Calendar"
 msgstr "_Otvoriť kalendár"
 
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:56
 msgid "_Week"
 msgstr "_Týždeň"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Zavrieť"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Zavrieť túto schôdzku"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Odstrániť túto schôdzku"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+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"
+
+#: ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "U_kážka 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
+msgid "Print this item"
+msgstr "Tlačiť túto položku"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Tlačiť..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Uložiť a zavrieť"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Uložiť schôdzku a zavrieť tento dialóg"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Zmeniť pohľad na %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Nastaví stránku pre aktuálnu tlačiareň"
+
+#: ui/evolution-comp-editor.xml.h:19
+msgid "_Action"
+msgstr "A_kcia"
+
+#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Súbor"
+
+#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
+#: ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Pomocník"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Odstráni túto položku"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Odstrániť..."
 
@@ -8112,27 +10130,12 @@ msgstr "Pomocník"
 msgid "Print En_velope..."
 msgstr "Tlačiť _obálku..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Tlačiť túto položku"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Tlačiť..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
 #: ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "Uložiť _ako..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Uložiť a zavrieť"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Uložiť kontakt a zatvoriť dialóg"
@@ -8149,694 +10152,652 @@ msgstr "Zobraziť pomocníka"
 msgid "Send _message to contact..."
 msgstr "Poslať _správu kontaktu..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:49
-msgid "_File"
-msgstr "_Súbor"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:55
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "O tejto aplikácii"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Odstráni túto položku"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "O aplikácii..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Uložiť kontakt a zatvoriť dialóg"
+
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Poslať kontakt _inému..."
+
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Poslať _správu kontaktu..."
+
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Zrušiť stretnutie"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Zmeniť vlastnosti tohto priečinku"
+
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Poslať ďalej ako v_Kalendár"
+
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Predať túto správu ďalej"
+
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Požadovať\n"
+"stretnutie"
+
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "Naplánovať _stretnutie"
+
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Naplánovať stretnutie"
+
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
 msgstr "A_kcie"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Adresár..."
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
+msgstr "Prispôsobiť moje Evolution"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Zmazať"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Zrušiť"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "_Kontrolovať mená"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "Zrušiť aktuálnu poštovú operáciu"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Zmazať"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Napísať"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Zmazať výber"
+#: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Zavrieť túto schôdzku"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "_Kopírovať do priečinku..."
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Odstrániť túto schôdzku"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Empty _Trash"
+msgstr "Vyprázdniť _Odpadky"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Vypísať XML"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Forget _Passwords"
+msgstr "Zabudnúť _heslá"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Vypíše XML popis rozhrania"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rvá položka v priečinku"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Manage _Subscriptions..."
+msgstr "Správa _prihlásení..."
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Predať ď_alej"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Poslať ďalej ako v_Kalendár"
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Presunúť vybrané správy do iného priečinku"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Prejsť na nasledujúcu položku"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Send / Receive"
+msgstr "Príjem / odoslanie"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Prejsť na predchádzajúcu položku"
+#: 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"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Ne_dokončená úloha"
+#: ui/evolution-mail-global.xml.h:15
+#, fuzzy
+msgid "Show message preview window"
+msgstr "Čas musí byť vo formáte: %s"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Zmeniť vlastnosti súboru"
+#: 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"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Nasledujúca"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor virtuálneho priečinku..."
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Predchádzajúca"
+#: ui/evolution-mail-global.xml.h:18
+msgid "_Filters..."
+msgstr "_Filtre..."
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "U_kážka pred tlačou"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Mail Message"
+msgstr "_Poslať správu"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Nastavenie _tlačiarne..."
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Settings..."
+msgstr "Nastavenie _pošty..."
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Nastavenie tlačiarne"
+#: ui/evolution-mail-global.xml.h:21
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Ukážka"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:18
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "Uložiť"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Send / Receive"
+msgstr "_Poslať / Prijať"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Uložiť schôdzku a zavrieť tento dialóg"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Zmení vlastnosti tohto priečinku"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:24
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Uložiť aktuálny súbor"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Skryť _vybrané správy"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Naplánovať _stretnutie"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Tlačiť vybranú správu"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Naplánovať niečo ako stretnutie"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Skryť _vybrané správy"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Nastaví stránku pre aktuálnu tlačiareň"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Skryť _odstránené správy"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "_Požiadavka na úlohu"
+#: ui/evolution-mail-list.xml.h:8
+msgid "Hide _Read messages"
+msgstr "Skryť _prečítané správy"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_O programe..."
+#: ui/evolution-mail-list.xml.h:9
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:44
-msgid "_Close"
-msgstr "_Zavrieť"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Označiť _všetky ako prečítané"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:45
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Označí vybrané správy ako už prečítané"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:45
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Ladiť"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Vloží obsah schránky"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
-msgid "_Help"
-msgstr "_Pomocník"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Presunúť vybrané správy do iného priečinku"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Položka"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Vybrať _všetko"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "Položka _denníka"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Vybrať _vlákno"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Pos_ledná položka v priečinku"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Poslať správu"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Pre_sunúť do priečinka..."
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Zmazať vybrané správy"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Poznámka"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Zobraziť _všetko"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:120
-#: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
-msgid "_Properties..."
-msgstr "_Vlastnosti..."
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:63
-msgid "_Task (FIXME)"
-msgstr "Ú_loha"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Dočasne skryť všetky správy, ktoré už boli prečítané"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Neprečítaná položka"
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
+msgstr "Dočasne skryť vybrané správy"
 
-#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:57
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:65
-msgid "_View"
-msgstr "_Pohľad"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Zoznam vlákien"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
-msgstr "Prispôsobiť moje Evolution"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Vyčistiť"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Apply filter rules to the selected messages"
-msgstr "Použiť pravidlá filtrov na vybrané správy"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Priečinok"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Cancel"
-msgstr "Zrušiť"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Obrátiť výber"
 
-#: ui/evolution-mail.xml.h:3
-msgid "Cancel the current mail operation"
-msgstr "Zrušiť aktuálnu poštovú operáciu"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Vlastnosti..."
 
-#: ui/evolution-mail.xml.h:4
-msgid "Change the properties of this folder"
-msgstr "Zmení vlastnosti tohto priečinku"
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
+msgstr "Zoznam _vlákien"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "Napísať"
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "Použiť pravidlá filtrov na vybrané správy"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Odpovedať všetkým adresátom vybranej správy"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Odpovedať odosielateľovi tejto správy"
+
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Odpovedať odosielateľovi tejto správy"
 
-#: ui/evolution-mail.xml.h:9
+#: 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"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:13
 #, fuzzy
 msgid "Create a virtual folder for this mailing list"
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
 msgid "Create a virtual folder for this sender"
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:20
-msgid "Create or edit rules for filtering new mail"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit virtual folder definitions"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Odpovedať odosielateľovi tejto správy"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Display the next message"
 msgstr "Prejsť na nasledujúcu položku"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Zmazať vybrané správy"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:21
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Prejsť na predchádzajúcu položku"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Prejsť na predchádzajúcu položku"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Prejsť na predchádzajúcu položku"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Empty _Trash"
-msgstr "Vyprázdniť _Odpadky"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filter na _konferenciu"
 
-#: ui/evolution-mail.xml.h:32
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filter na _odosielateľovi"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filter na _adresátoch"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filter na _predmet"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:36
-msgid "Forget _Passwords"
-msgstr "Zabudnúť _heslá"
-
-#: ui/evolution-mail.xml.h:37
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Poslať ďalej"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Poslať ďalej ako"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "Predať ďalej ako _prílohu"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "Predať ďalej v _tele"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "Poslať ďalej _citované"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Predá niekomu vybranú správu"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 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"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Predá niekomu vybranú správu"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Predá vybranú správu niekomu ako prílohu"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Hide S_elected Messages"
-msgstr "Skryť _vybrané správy"
-
-#: ui/evolution-mail.xml.h:48
-msgid "Hide _Deleted Messages"
-msgstr "Skryť _odstránené správy"
-
-#: ui/evolution-mail.xml.h:49
-msgid "Hide _Read messages"
-msgstr "Skryť _prečítané správy"
-
-#: ui/evolution-mail.xml.h:50
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail-message.xml.h:38
 msgid "Load _Images"
 msgstr "Nahrávať _obrázky"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Manage _Subscriptions..."
-msgstr "Správa _prihlásení..."
-
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:39
 msgid "Mar_k As Read"
 msgstr "Označiť ako _prečítané"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Mark All as R_ead"
-msgstr "Označiť _všetky ako prečítané"
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Mark As I_mportant"
+msgstr "Označiť ako _neprečítanú"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark As U_nread"
 msgstr "Označiť ako _neprečítanú"
 
-#: ui/evolution-mail.xml.h:56
-#, fuzzy
-msgid "Mark all visible messages as read"
+#: ui/evolution-mail-message.xml.h:42
+msgid "Mark the selected messages as having been read"
 msgstr "Označí vybrané správy ako už prečítané"
 
-#: ui/evolution-mail.xml.h:57
-msgid "Mark the selected messages as having been read"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark the selected messages as important"
 msgstr "Označí vybrané správy ako už prečítané"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as not having been read"
 msgstr "Označí vybrané správy ako neprečítané"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Označí vybrané správy ako už prečítané"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:46
 msgid "Move"
 msgstr "Presunúť"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:47
 msgid "Move selected messages to another folder"
 msgstr "Presunúť vybrané správy do iného priečinku"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Otvorí aktuálnu správu v novom okne"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Označí vybrané správy ako už prečítané"
 
-#: ui/evolution-mail.xml.h:66
-#, fuzzy
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Presunúť vybrané správy do iného priečinku"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Previews the message to be printed"
+msgstr "Ukážka správy pred tlačou"
 
-#: ui/evolution-mail.xml.h:67
-#, fuzzy
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Presunúť vybrané správy do iného priečinku"
+#: ui/evolution-mail-message.xml.h:52
+msgid "Previous"
+msgstr "Predchádzajúca"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:54
 msgid "Print Message..."
 msgstr "Tlačiť správu..."
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail-message.xml.h:55
 msgid "Print Preview..."
 msgstr "Náhľad..."
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail-message.xml.h:56
 msgid "Print message to the printer"
 msgstr "Tlačiť správu na tlačiarni"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:57
 msgid "Redirect (FIXME: implement me)"
 msgstr "Presmerovať"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail-message.xml.h:58
+msgid "Reply"
+msgstr "Odpovedať"
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Reply to All"
+msgstr "Odpovedať všetkým"
+
+#: ui/evolution-mail-message.xml.h:62
 msgid "S_earch Message"
 msgstr "_Nájsť správu"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail-message.xml.h:63
 msgid "Save the message as a text file"
 msgstr "Uložiť správu do textového súboru"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:64
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:81 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Vybrať _všetko"
-
-#: ui/evolution-mail.xml.h:82
-msgid "Select _Thread"
-msgstr "Vybrať _vlákno"
-
-#: ui/evolution-mail.xml.h:83
-msgid "Select all and only the messages that are not currently selected"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:84
-msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:85
-#, fuzzy
-msgid "Select all visible messages"
-msgstr "Zmazať vybrané správy"
-
-#: ui/evolution-mail.xml.h:86
-msgid "Send / Receive"
-msgstr "Príjem / odoslanie"
-
-#: ui/evolution-mail.xml.h:87
-msgid "Send queued mail and retrieve new mail"
-msgstr "Poslať neodoslanú poštu a prijať novú poštu"
-
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:65
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Ú_plné hlavičky"
 
-#: ui/evolution-mail.xml.h:90
-msgid "Show _All"
-msgstr "Zobraziť _všetko"
-
-#: ui/evolution-mail.xml.h:91
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Čas musí byť vo formáte: %s"
 
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Show messages that have been temporarily hidden"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:69
 msgid "Show the raw email source of the message"
 msgstr "Zobraziť zdrojový poštový formát v správe"
 
-#: ui/evolution-mail.xml.h:95
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Prihlásiť alebo odhlásiť priečinky na vzdialených serveroch"
-
-#: ui/evolution-mail.xml.h:96
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Dočasne skryť všetky správy, ktoré už boli prečítané"
-
-#: ui/evolution-mail.xml.h:97
-msgid "Temporarily hide the selected messages"
-msgstr "Dočasne skryť vybrané správy"
-
-#: ui/evolution-mail.xml.h:98
-msgid "Threaded Message list"
-msgstr "Zoznam vlákien"
-
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:70
 msgid "Un-delete the selected messages"
 msgstr "Obnoviť vybrané správy"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:71
 msgid "VFolder on Mailing _List..."
 msgstr "VPriečinok na _konferenciu..."
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:72
 msgid "VFolder on Se_nder..."
 msgstr "Vpriečinok na _odosielateľa..."
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:73
 msgid "VFolder on _Recipients..."
 msgstr "Vpriečinok na _adresátov..."
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:74
 msgid "VFolder on _Subject..."
 msgstr "Vpriečinok na _predmet..."
 
-#: ui/evolution-mail.xml.h:104
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor virtuálneho priečinku..."
-
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:75
 msgid "_Apply Filters"
 msgstr "_Použiť filtre"
 
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail-message.xml.h:76
 msgid "_Copy to Folder"
 msgstr "_Kopírovať do priečinku"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:77
 msgid "_Create Filter From Message"
 msgstr "Vytvoriť _filter zo správy"
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Expunge"
-msgstr "_Vyčistiť"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Filters..."
-msgstr "_Filtre..."
-
-#: ui/evolution-mail.xml.h:111 ui/evolution.xml.h:50
-msgid "_Folder"
-msgstr "_Priečinok"
-
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail-message.xml.h:79
 msgid "_Forward Message"
 msgstr "Správy _predané ďalej"
 
-#: ui/evolution-mail.xml.h:113 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Obrátiť výber"
-
-#: ui/evolution-mail.xml.h:114
-msgid "_Mail Message"
-msgstr "_Poslať správu"
-
-#: ui/evolution-mail.xml.h:115
-msgid "_Mail Settings..."
-msgstr "Nastavenie _pošty..."
-
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail-message.xml.h:80
 msgid "_Message Display"
 msgstr "Zobrazenie _správy"
 
-#: ui/evolution-mail.xml.h:117
+#: ui/evolution-mail-message.xml.h:81
 msgid "_Move to Folder"
 msgstr "_Presunúť do priečinku"
 
-#: ui/evolution-mail.xml.h:118
+#: ui/evolution-mail-message.xml.h:82
 msgid "_Normal Display"
 msgstr "_Normálne zobrazenie"
 
-#: ui/evolution-mail.xml.h:119
+#: ui/evolution-mail-message.xml.h:83
 msgid "_Open Message"
 msgstr "_Otvoriť správu"
 
-#: ui/evolution-mail.xml.h:121
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Re-send Message"
 msgstr "_Znovu poslať správu"
 
-#: ui/evolution-mail.xml.h:124
-msgid "_Send / Receive"
-msgstr "_Poslať / Prijať"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Zavrie toto okno"
 
-#: ui/evolution-mail.xml.h:125
-msgid "_Threaded Message List"
-msgstr "Zoznam _vlákien"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Prispôsobiť pa_nely nástrojov..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Prispôsobiť"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Prispôsobiť panely nástrojov"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Zavrieť"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Pohľad"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priložiť"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: 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"
 
@@ -8888,86 +10849,96 @@ msgstr "Šifrovanie S/MIME"
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
+#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+msgid "Save"
+msgstr "Uložiť"
+
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _Draft"
 msgstr "Uložiť _koncept"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Uložiť v _priečinku..."
-
-#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Uložiť v priečinku..."
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Uložiť aktuálny súbor"
+
+#: ui/evolution-message-composer.xml.h:24
 msgid "Save the current file with a different name"
 msgstr "Uloží aktuálny súbor pod iným menom"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the message in a specified folder"
 msgstr "Uložiť správu do daného priečinku"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:26
 msgid "Send"
 msgstr "Poslať"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send _Later"
 msgstr "Poslať _neskôr"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _later"
 msgstr "Poslať _neskôr"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send the mail in HTML format"
 msgstr "Poslať správu vo formáte HTML"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the message later"
 msgstr "Poslať správu neskôr"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send this message now"
 msgstr "Poslať túto správu hneď"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:32
 msgid "Show / hide attachments"
 msgstr "Zobraziť / Skryť prílohy"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show _attachments"
 msgstr "Zobraziť _prílohy"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show attachments"
 msgstr "Zobraziť prílohy"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:35
 msgid "Sign this message with your PGP key"
 msgstr "Podpísať túto správu kľúčom PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpísať túto správu podpisovým certifikátor S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Prepne, či má byť zobrazené pole BCC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the CC field is displayed"
 msgstr "Prepne, či má byť zobrazené pole CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Prepne, či má byť zobrazené pole pre výber odosielateľa"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prepne, či má byť zobrazené pole Reply-to"
 
+#: ui/evolution-message-composer.xml.h:41
+msgid "_Attachment"
+msgstr "_Príloha"
+
 #: ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "Pole _BCC"
@@ -8976,6 +10947,11 @@ msgstr "Pole _BCC"
 msgid "_Cc Field"
 msgstr "Pole _CC"
 
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Ladiť"
+
 #: ui/evolution-message-composer.xml.h:46
 msgid "_Delete all"
 msgstr "_Odstrániť všetky"
@@ -8984,23 +10960,24 @@ msgstr "_Odstrániť všetky"
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: ui/evolution-message-composer.xml.h:52
-msgid "_Insert text file... (FIXME)"
-msgstr "Vložiť _textový súbor..."
+#: ui/evolution-message-composer.xml.h:51
+msgid "_Insert text file..."
+msgstr "_Vložiť textový súbor...."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Pole _Reply-To"
 
-#: ui/evolution-message-composer.xml.h:56
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "Za_bezpečenie"
 
@@ -9008,123 +10985,79 @@ msgstr "Za_bezpečenie"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Pridať priečinok do zoznamu prihlásených priečinkov"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "P_riečinok"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Obnoviť zoznam"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Obnoviť zoznam priečinkov"
 
-#: ui/evolution-subscribe.xml.h:6
+#: 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"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Prihlásiť si"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Odhlásiť"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "P_riradiť úlohu"
-
-#: ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Nájsť"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Cancel Task"
+msgstr "Zrušiť úlohu"
 
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Hľadať znovu"
+#: ui/evolution-task-editor.xml.h:3
+msgid "Delegate Task"
+msgstr "Delegovať úlohu"
 
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Požia_davka na stretnutie"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Opakovať"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Opakovať vrátenú akciu"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Nahradiť"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Nahradiť reťazec"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Odpovedať _všetkým"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Poslať informáciu o _stave"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Pres_kočiť výskyt"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Uložiť úlohu a zavrieť dialóg"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Hľadať znovu rovnaký reťazec"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Nájsť reťazec"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Vrátiť"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Vráti späť poslednú akciu"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:43
-msgid "_Appointment (FIXME)"
-msgstr "S_chôdzka"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "Označiť ako _dokončenú"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Odpoveď"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
+msgstr "O_bnoviť úlohu"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Copy selected task"
+msgstr "Kopíruje vybranú úlohu"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Create a new task"
-msgstr "Vytvoriť novú úlohu"
+msgstr "Vytvorí novú úlohu"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:4
+msgid "Cut selected task"
+msgstr "Vystihne vybranú úlohu"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "New Task"
 msgstr "Nová úloha"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
+msgid "Paste task from the clipboard"
+msgstr "Vloží úlohu zo schránky"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Save task as something else"
 msgstr "Uložiť úlohu ako niečo iné"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:11
+msgid "Set task view preferences"
+msgstr "Nastavenie pohľadu úloh"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Tasks Preferences..."
 msgstr "Nastavenie úloh..."
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
+msgid "TasksPreferences"
+msgstr "Nastavenie úloh"
+
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "Ú_loha"
 
@@ -9140,202 +11073,190 @@ msgstr "Pridať do _panelu skratiek"
 msgid "Change the name of this folder"
 msgstr "Zmeniť meno tohto priečinku"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Zmeniť vlastnosti tohto priečinku"
-
 #: ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Zavrie toto okno"
-
-#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopírovať tento priečinok"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "Vytvoriť _nový priečinok..."
 
-#: ui/evolution.xml.h:9
+#: 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"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: ui/evolution.xml.h:11
-msgid "Customi_ze Toolbars..."
-msgstr "Prispôsobiť pa_nely nástrojov..."
-
-#: ui/evolution.xml.h:12
-msgid "Customize"
-msgstr "Prispôsobiť"
-
 #: ui/evolution.xml.h:13
-msgid "Customize toolbars"
-msgstr "Prispôsobiť panely nástrojov"
-
-#: ui/evolution.xml.h:14
 msgid "Delete this folder"
 msgstr "Odstrániť tento priečinok"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Zobraziť iný priečinok"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Koniec"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Okno Evolution"
 
-#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "_Skratka pre panel Evolution"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_Začíname"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importuje externý súbor"
 
-#: ui/evolution.xml.h:23
-msgid "Main toolbar"
-msgstr "Hlavný panel nástrojov"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Presunúť tento priečinok inam"
 
-#: ui/evolution.xml.h:25
-msgid "Open in New Window"
-msgstr "Otvoriť v novom okne"
-
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Otvoriť v _novom okne"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Otvoriť tento priečinok v inom okne"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Zobrazí informáciu o Evolution"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Pošle správu o chybe pomocou nástroja pre oznamovanie chýb."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "Prepnúť"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prepne, či sa má zobrazovať panel skratiek"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Prepne, či pracujete on alebo off-line."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Pomocou Správcu  ko_ntaktov"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Pomocou _Kalendára"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Pomocou _Pošty "
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Zobraziť vybraný priečinok"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "O _Evolution..."
 
-#: ui/evolution.xml.h:42
-msgid "_Actions"
-msgstr "A_kcie"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "S_chôdzka"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Kontakt"
+
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Pru_h priečinkov"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importovať súbor..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Poslať správu"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "_Presunúť..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "Nový _priečinok"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:59
+msgid "_Shortcut"
+msgstr "_Skratka"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "Ú_loha"
+
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr "Zmeniť nastavenie Mojej Evolution"
+
+#: ui/my-evolution.xml.h:4
+msgid "_My Evolution Settings..."
+msgstr "Nastavenie pre _Moje Evolution..."
+
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Karty adresára"
@@ -9368,6 +11289,13 @@ msgstr "Správy"
 msgid "With Category"
 msgstr "S kategóriou"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Predbežný"
@@ -9444,13 +11372,6 @@ msgstr "_Koniec stretnutia:"
 msgid "All Attendees"
 msgstr "Všetci účastníci"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Aktuálny pohľad"
@@ -9461,53 +11382,118 @@ 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:422
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PUSŠPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
+#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Teraz"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Čas musí byť vo formáte: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr "Pobaltská"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr "Stredoeurópska"
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr "Čínska"
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr "Azbuka"
+
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
+msgstr "Grécka"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr "Japonská"
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr "Kórejská"
+
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr "Turecká"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr "Unicode"
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr "Západoeurópska"
+
+#: widgets/misc/e-charset-picker.c:85
+msgid "Traditional"
+msgstr "Tradičná"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr "Zjednodušená"
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr "Ukrajinská"
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Nová"
+
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
+msgstr "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ť"
+
+#: widgets/misc/e-charset-picker.c:277
+msgid "Other..."
+msgstr "Iné..."
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr "Znaková sada"
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:167
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:238
 msgid "Advanced Search"
 msgstr "Pokročilé hľadanie"
 
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Uložiť ako..."
-
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Zobraziť všetko"
 
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Upraviť..."
-
-#: widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Pokročilé..."
 
@@ -9519,6 +11505,10 @@ msgstr "Informácia"
 msgid "Warning"
 msgstr "Varovanie"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Chyba"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Otázka"