Updated Slovak translation

svn path=/trunk/; revision=9811

2 files changed, 2058 insertions, 1545 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index e20916ba65..9854d086df 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-15  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation.
+
 2001-05-15  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian translation.
diff --git a/po/sk.po b/po/sk.po
index 201e022860..4074dc4148 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,20 +4,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10\n"
-"POT-Creation-Date: 2001-04-17 15:13+0200\n"
-"PO-Revision-Date: 2001-04-17 16:11CET\n"
+"POT-Creation-Date: 2001-05-15 13:50+0200\n"
+"PO-Revision-Date: 2001-05-15 14:39CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.8\n"
+"X-Generator: KBabel 0.9\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/e-card.c:3314
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3316
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3317
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  Predpona:     "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3318
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Krstné:      "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3319
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  Ďalšie: "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3320
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  Priezvisko:     "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3321
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  Prípona:     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3335
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Dátum narodenia:"
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3346
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3348
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "Poštová schránka:"
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3349
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "  Príp:         "
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3350
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "  Ulica:      "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3351
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "   Mesto:  "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3352
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "  Región:      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "   PSČ:  "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "  Krajina:  "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3367
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Dodacie ozn:"
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefóny:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3382
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 " Telefón: "
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3406
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3409
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3428
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "Pošt.klient:"
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3434
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Časová zóna:"
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3442
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Miesto: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3446
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Pozícia: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3458
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3459
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 " Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3460
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "  Vlastné:"
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3461
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "  Vlastné2: "
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3462
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "  Vlastné3: "
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3463
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "  Vlastné4: "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3467
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Kategórie: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3468
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3481
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Unikátny reťazec:"
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3484
 msgid ""
 "\n"
 "Public Key: "
@@ -299,23 +299,36 @@ msgstr ""
 "\n"
 "Verejný kľúč:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Vytváracie rozhranie pre import súborov GnomeCard do Evolution."
+#: addressbook/backend/ebook/e-card.c:3745
+msgid "Multiple VCards"
+msgstr "Viacero VKariet"
+
+#: addressbook/backend/ebook/e-card.c:3753
+#, c-format
+msgid "VCard for %s"
+msgstr "VKartapre %s"
+
+#: addressbook/backend/ebook/e-destination.c:232
+msgid "???"
+msgstr "???"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importuje súbory GnomeCard do Evolution"
+#: 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:43
+#: addressbook/gui/component/addressbook-factory.c:42
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
@@ -418,7 +431,7 @@ msgid "Web page address:"
 msgstr "Adresa WWW stránky:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
 msgid "_Add"
 msgstr "_Pridať"
 
@@ -443,8 +456,9 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:93 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/folder-browser.c:649 mail/mail-config.glade.h:85
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:101
+#: ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Odstrániť"
 
@@ -492,10 +506,6 @@ msgstr "Ma_nžel(ka):"
 msgid "_This is the mailing address"
 msgstr "_Toto je e-mailová adresa"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Odstrániť kontakt?"
-
 #: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrí do týchto kategórií:"
@@ -556,7 +566,6 @@ msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1254
 #: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Iné"
 
@@ -598,20 +607,24 @@ msgstr "E-mail 2"
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: 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:233
 msgid "Contact Quick-Add"
 msgstr "Rýchly kontakt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/contact-editor/e-contact-quick-add.c:235
 msgid "Edit Full"
 msgstr "Upraviť celé"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/contact-editor/e-contact-quick-add.c:276
 #: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
 msgstr "Celé meno"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/contact-editor/e-contact-quick-add.c:282
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -727,72 +740,68 @@ msgstr "_Prípona:"
 msgid "_Title:"
 msgstr "_Titul:"
 
-#: addressbook/gui/component/addressbook.c:241
+#: addressbook/gui/component/addressbook.c:242
 msgid "As _Minicards"
 msgstr "Ako _minikarty"
 
-#: addressbook/gui/component/addressbook.c:247
+#: addressbook/gui/component/addressbook.c:248
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Ako _tabuľku"
 
-#: addressbook/gui/component/addressbook.c:399
+#: addressbook/gui/component/addressbook.c:408
 #, c-format
 msgid "Enter password for %s"
 msgstr "Zadajte heslo pre %s"
 
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:436
 msgid "Unable to open addressbook"
 msgstr "Nie je možné otvoriť adresár"
 
-#: addressbook/gui/component/addressbook.c:432
+#: addressbook/gui/component/addressbook.c:443
 msgid ""
 "We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Neboli sme schopní otvoriť tento adresár. To znamená,\n"
-"že buď ste zadali nesprávne URI alebo ste sa pokúsili\n"
-"pristúpiť na LDAP server a nemáte zakompilovanú\n"
-"podporu pre LDAP. Ak ste zadali URI, overte, či je \n"
-"správne. Ak ste neuspeli, potom ste asi chceli pracovať\n"
-"s LDAP serverom. Ak chcete používať LDAP, musíte\n"
-"si nainštalovať OpenLDAP a znovu skompilovať a \n"
-"nainštalovať Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Zobraziť všetko"
+"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:557
-msgid "Advanced..."
-msgstr "Pokročilé..."
+#: addressbook/gui/component/addressbook.c:448
+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:587 calendar/gui/gnome-cal.c:236
+#: addressbook/gui/component/addressbook.c:456
+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:616 calendar/gui/gnome-cal.c:233
 msgid "Any field contains"
 msgstr "Ľubovoľné pole obsahuje"
 
-#: addressbook/gui/component/addressbook.c:588
+#: addressbook/gui/component/addressbook.c:617
 msgid "Name contains"
 msgstr "Meno obsahuje"
 
-#: addressbook/gui/component/addressbook.c:589
+#: addressbook/gui/component/addressbook.c:618
 msgid "Email contains"
 msgstr "E-mail obsahuje"
 
-#: addressbook/gui/component/addressbook.c:732
+#: addressbook/gui/component/addressbook.c:761
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktoré zobrazí prehliadač priečinku"
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Iné kontakty"
-
 #: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "LDAP Server"
@@ -812,56 +821,60 @@ 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:43
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Heslo"
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
+#: addressbook/gui/component/addressbook-config.c:168
 msgid "Unknown auth type"
 msgstr "Neznámy typ overenia"
 
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/component/addressbook-config.c:177
 msgid "Base"
 msgstr "Sústava"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Subtree"
 msgstr "Podstrom"
 
-#: addressbook/gui/component/addressbook-config.c:186
+#: addressbook/gui/component/addressbook-config.c:184
 msgid "Unknown scope type"
 msgstr "Neznámy typ rozsahu"
 
-#: addressbook/gui/component/addressbook-config.c:353
+#: addressbook/gui/component/addressbook-config.c:349
 msgid "Bind DN:"
 msgstr "Pripájacie DN:"
 
-#: addressbook/gui/component/addressbook-config.c:354
+#: 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:356
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:60
 msgid "Remember this password"
 msgstr "Uložiť toto heslo"
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:33
 msgid "Host:"
 msgstr "Hostiteľ:"
 
-#: addressbook/gui/component/addressbook-config.c:407
+#: addressbook/gui/component/addressbook-config.c:402
 msgid "FIXME Host help text here."
 msgstr "FIXME Pomocník pre Host"
 
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "Root DN:"
+msgstr "Koreňové DN:"
+
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Pomocník pre Root DN"
+
 #: addressbook/gui/component/addressbook-config.c:409
 msgid "Port:"
 msgstr "Port:"
@@ -870,65 +883,61 @@ msgstr "Port:"
 msgid "FIXME Port help text here."
 msgstr "FIXME Pomocník pre Port"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "Koreňové DN:"
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Pomocník pre Root DN"
-
-#: addressbook/gui/component/addressbook-config.c:435
+#: addressbook/gui/component/addressbook-config.c:430
 msgid "Search Scope:"
 msgstr "Oblasť hľadania:"
 
-#: addressbook/gui/component/addressbook-config.c:489
+#: addressbook/gui/component/addressbook-config.c:477
 msgid "Authentication:"
 msgstr "Overenie:"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
+#: addressbook/gui/component/addressbook-config.c:499
+msgid "Advanced LDAP Options"
+msgstr "Pokročilé možnosti LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:520
+#: mail/mail-config.glade.h:53
 msgid "Path:"
 msgstr "Cesta:"
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:521
 msgid "FIXME Path Help text here"
 msgstr "FIXME Pomocník pre Path"
 
-#: addressbook/gui/component/addressbook-config.c:513
+#: addressbook/gui/component/addressbook-config.c:526
 msgid "Create path if it doesn't exist."
 msgstr "Vytvoriť cestu, ak ešte neexistuje."
 
-#: addressbook/gui/component/addressbook-config.c:647
+#: addressbook/gui/component/addressbook-config.c:660
 msgid "Edit Addressbook"
 msgstr "Upraviť adresár"
 
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/component/addressbook-config.c:662
 msgid "Add Addressbook"
 msgstr "Pridať adresár"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.c:680
 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:671
-#: mail/mail-config.glade.h:35
+#: addressbook/gui/component/addressbook-config.c:686
+#: mail/mail-config.glade.h:43
 msgid "Name:"
 msgstr "Meno:"
 
-#: addressbook/gui/component/addressbook-config.c:672
+#: addressbook/gui/component/addressbook-config.c:687
 msgid "FIXME Name help text here"
 msgstr "FIXME Pomocník pre Name"
 
-#: addressbook/gui/component/addressbook-config.c:674
+#: addressbook/gui/component/addressbook-config.c:689
 #: 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:675
+#: addressbook/gui/component/addressbook-config.c:690
 msgid "FIXME Description help text here"
 msgstr "FIXME Pomocník pre Description"
 
@@ -938,19 +947,19 @@ msgstr "Zdroje adresára"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
+#: addressbook/gui/widgets/e-minicard-view-model.c:253
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
+#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "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:23
+#: mail/mail-config.glade.h:28
 msgid "Edit"
 msgstr "Upraviť"
 
@@ -962,6 +971,10 @@ msgstr "Meno"
 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"
@@ -1024,16 +1037,8 @@ msgstr "Vytváracie rozhranie pre komponent adresára Evolution."
 msgid "Factory for the sample Addressbook control"
 msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Adresár"
 
-#: 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:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
@@ -1043,6 +1048,14 @@ msgstr "Odstrániť"
 msgid "Remove All"
 msgstr "Odstrániť všetky"
 
+#: 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/select-names.glade.h:1
 msgid "Find..."
 msgstr "Nájsť..."
@@ -1060,6 +1073,7 @@ msgid "Select name from:"
 msgstr "Vybrať meno z:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:213
 msgid "Search"
 msgstr "Hľadať"
 
@@ -1173,31 +1187,31 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:513
 #: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-minicard-view-model.c:152
+#: addressbook/gui/widgets/e-minicard-view-model.c:248
 msgid "Save as VCard"
 msgstr "Uložiť ako vKartu"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-minicard-view-model.c:249
 msgid "Send contact to other"
 msgstr "Poslať kontakt inému"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-minicard-view-model.c:250
 msgid "Send message to contact"
 msgstr "Poslať správu kontaktu"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
+#: addressbook/gui/widgets/e-minicard-view-model.c:251
+#: mail/message-browser.c:199 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:59
 #: ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Tlačiť"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-minicard-view-model.c:252
 msgid "Print Envelope"
 msgstr "Tlačiť obálku"
 
@@ -1321,7 +1335,7 @@ msgstr "Voľno/zaneprázdnený URL"
 msgid "Save in addressbook"
 msgstr "Uložiť do adresára"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:507
 msgid ""
 "\n"
 "\n"
@@ -1519,6 +1533,46 @@ 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/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Opakovať"
+
+#. 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/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Služba upozorňovania na poplachy"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "Vytváracie rozhranie pre službu na upozornenie na poplach"
+
+#: calendar/gui/alarm-notify/notify-main.c:56
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr "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
+msgid "Could not initialize GNOME"
+msgstr "Nie je možné inicializovať GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:108
+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
 msgid "File not found"
 msgstr "Súbor nenájdený"
@@ -1537,24 +1591,24 @@ 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:895
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
 #: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Verejný"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
 #: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Súkromný"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
 #: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Tajný"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1628
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Unknown"
 msgstr "Neznámy"
 
@@ -1574,71 +1628,71 @@ msgstr "V"
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:689
 msgid "High"
 msgstr "Vysoká"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1574
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:688
 msgid "Normal"
 msgstr "Normálny"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:687
 msgid "Low"
 msgstr "Nízka"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
 #: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Priehľadné"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
 #: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Nepriehľadné"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 #: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Nezačal"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 #: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "Prebieha"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 #: calendar/gui/e-calendar-table.c:428
 msgid "Completed"
 msgstr "Dokončený"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/e-calendar-table.c:429 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:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:802
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1649,22 +1703,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:882
 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:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
+#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:976
 #: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1199
+#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
+#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
 msgid "None"
 msgstr "Žiadna"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:970
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1674,70 +1728,83 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1010
 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:1048
+#: calendar/gui/calendar-model.c:1051
 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:1061
+#: calendar/gui/calendar-model.c:1064
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 #: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1105
 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:1571
+#: calendar/gui/calendar-model.c:1576
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1578
 msgid "Assigned"
 msgstr "Priradené"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
 msgid "Yes"
 msgstr "Áno"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
 msgid "No"
 msgstr "Nie"
 
-#: calendar/gui/calendar-summary.c:196
+#: calendar/gui/calendar-summary.c:198
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
+#: calendar/gui/calendar-summary.c:207
+msgid "Appointments"
+msgstr "Schôdzky"
+
+#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:437
+#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Úlohy"
+
+#: calendar/gui/calendar-summary.c:443
 msgid "<b>Error loading calendar</b>"
 msgstr "<b> Chyba načítavania kalendára</b>"
 
-#: calendar/gui/calendar-summary.c:449
+#: 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/calendar-summary.c:616
+#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
 msgid "Display"
 msgstr "Zobrazenie"
 
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/calendar-summary.c:627
 msgid "Show appointments"
 msgstr "Zobraziť schôdzky"
 
-#: calendar/gui/calendar-summary.c:629
+#: calendar/gui/calendar-summary.c:635
 msgid "Show tasks"
 msgstr "Zobraziť úlohy"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:690
+msgid "Things to do"
+msgstr "Čo je treba urobiť"
+
+#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Načítavam kalendár"
 
@@ -1745,46 +1812,6 @@ msgstr "Načítavam kalendár"
 msgid "The URI that the calendar will display"
 msgstr "URI, ktoré bude kalendár zobrazovať"
 
-#: 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/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Opakovať"
-
-#. 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/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Služba upozorňovania na poplachy"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "Vytváracie rozhranie pre službu na upozornenie na poplach"
-
-#: calendar/gui/alarm-notify/notify-main.c:56
-#, c-format
-msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
-msgstr "Je to %s. Práve teraz je unixový čas %ld. Možno ste to chceli vedieť."
-
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "Nie je možné inicializovať GNOME"
-
-#: calendar/gui/alarm-notify/notify-main.c:109
-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/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Poplach o %A %b %d %Y %H:%M"
@@ -1903,7 +1930,7 @@ msgid "Fri"
 msgstr "Pia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "Piatok"
 
@@ -1932,7 +1959,7 @@ msgid "Mon"
 msgstr "Pon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -1945,7 +1972,7 @@ msgid "Overdue Items:"
 msgstr "Po termíne:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:54
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
@@ -1968,7 +1995,7 @@ msgid "Sat"
 msgstr "So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -1993,7 +2020,7 @@ msgid "Sun"
 msgstr "Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "Nedeľa"
 
@@ -2006,7 +2033,7 @@ msgid "Thu"
 msgstr "Štv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "Štvrtok"
 
@@ -2027,7 +2054,7 @@ msgid "Tue"
 msgstr "Ut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "Utorok"
 
@@ -2040,7 +2067,7 @@ msgid "Wed"
 msgstr "Str"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -2053,7 +2080,7 @@ 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:78
+#: mail/mail-config.glade.h:88
 msgid "seconds."
 msgstr "sekúnd."
 
@@ -2088,6 +2115,29 @@ msgstr "Naozaj chcete odstrániť položku denníka bez mena?"
 msgid "Do you want to save changes?"
 msgstr "Chcete uložiť zmeny?"
 
+#: calendar/gui/dialogs/task-editor.c:709
+msgid "Edit Task"
+msgstr "Upraviť úlohu"
+
+#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
+#, c-format
+msgid "Appointment - %s"
+msgstr "Schôdzka - %s"
+
+#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
+#, c-format
+msgid "Task - %s"
+msgstr "Úloha - %s"
+
+#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Položka denníku - %s"
+
+#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
+msgid "No summary"
+msgstr "Žiadny súhrn"
+
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #, no-c-format
 msgid "% Comp_lete:"
@@ -2161,29 +2211,6 @@ msgstr "_Priorita:"
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
-msgstr "Upraviť úlohu"
-
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
-msgstr "Žiadny súhrn"
-
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Appointment - %s"
-msgstr "Schôdzka - %s"
-
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Task - %s"
-msgstr "Úloha - %s"
-
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Položka denníku - %s"
-
 #: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr "Kategórie"
@@ -2308,10 +2335,17 @@ msgstr "Odstrániť túto úlohu"
 msgid "Delete the task"
 msgstr "Odstrániť úlohu"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i rozdelení minúty"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
+msgid "am"
+msgstr "dopoludnia"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
+msgid "pm"
+msgstr "popoludní"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -2334,18 +2368,6 @@ msgstr "%a %d %b"
 msgid "%d %b"
 msgstr "%d %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "dopoludnia"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "popoludní"
-
 #: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Nová schôdzka"
@@ -2363,8 +2385,7 @@ msgid "Go to Date..."
 msgstr "Prejsť na dátum..."
 
 #: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otvoriť"
 
@@ -2389,6 +2410,11 @@ msgstr "Odstrániť tento výskyt"
 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:161
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nie je možné aktualizovať váš súbor s kalendárom!\n"
@@ -2470,7 +2496,7 @@ msgstr "--do--"
 msgid "Calendar Message"
 msgstr "Správa kalendára"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:632
 msgid "Date:"
 msgstr "Dátum:"
 
@@ -2538,7 +2564,7 @@ msgstr "Nepovinný účastník"
 msgid "Organizer: "
 msgstr "Organizátor:"
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
+#: calendar/gui/e-meeting-dialog.glade.h:14
 msgid ""
 "Publish\n"
 "Event"
@@ -2546,11 +2572,11 @@ msgstr ""
 "Publikovať\n"
 "udalosť"
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
+#: calendar/gui/e-meeting-dialog.glade.h:16
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
+#: calendar/gui/e-meeting-dialog.glade.h:17
 msgid ""
 "Request\n"
 "Meeting"
@@ -2558,15 +2584,15 @@ msgstr ""
 "Požadovať\n"
 "stretnutie"
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
+#: calendar/gui/e-meeting-dialog.glade.h:19
 msgid "Required Participant"
 msgstr "Vyžadovaný účastník"
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/e-meeting-dialog.glade.h:20
 msgid "Role"
 msgstr "Rola"
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
+#: calendar/gui/e-meeting-dialog.glade.h:21
 msgid ""
 "Schedule\n"
 "Time"
@@ -2574,8 +2600,8 @@ msgstr ""
 "Naplánovať\n"
 "čas"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1052
+#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
+#: mail/message-list.c:1081
 msgid "Status"
 msgstr "Stav"
 
@@ -2598,20 +2624,119 @@ msgstr "Nepodarilo sa načítať úlohy v `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
-msgstr "%d %B"
+#: calendar/gui/event-editor.c:377
+msgid "Edit Appointment"
+msgstr "Upraviť schôdzku"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Nová schôdzka..."
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr "zapnutá"
 
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Odstrániť všetky výskyty"
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
+msgid "day"
+msgstr "deň"
+
+#: calendar/gui/event-editor.c:601
+msgid "on the"
+msgstr " "
+
+#: calendar/gui/event-editor.c:608
+msgid "th"
+msgstr " "
+
+#: calendar/gui/event-editor.c:754
+msgid "occurrences"
+msgstr "výskytov"
+
+#: calendar/gui/event-editor.c:871
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
+
+#: calendar/gui/event-editor.c:1543
+#, c-format
+msgid " %d days"
+msgstr " %d dní"
+
+#: calendar/gui/event-editor.c:1545
+msgid " 1 day"
+msgstr " 1 deň"
+
+#: calendar/gui/event-editor.c:1548
+#, c-format
+msgid " %d weeks"
+msgstr " %d týždňov"
+
+#: calendar/gui/event-editor.c:1550
+msgid " 1 week"
+msgstr " 1 týždeň"
+
+#: calendar/gui/event-editor.c:1553
+#, c-format
+msgid " %d hours"
+msgstr " %d hodín"
+
+#: calendar/gui/event-editor.c:1555
+msgid " 1 hour"
+msgstr " 1 hodina"
+
+#: calendar/gui/event-editor.c:1558
+#, c-format
+msgid " %d minutes"
+msgstr " %d minút"
+
+#: calendar/gui/event-editor.c:1560
+msgid " 1 minute"
+msgstr " 1 minúta"
+
+#: calendar/gui/event-editor.c:1563
+#, c-format
+msgid " %d seconds"
+msgstr " %d sekúnd"
+
+#: calendar/gui/event-editor.c:1565
+msgid " 1 second"
+msgstr " 1 sekunda"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1588
+msgid "Play a sound"
+msgstr "Prehrať zvuk"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1591
+msgid "Show a dialog"
+msgstr "Zobraziť dialóg"
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1594
+msgid "Send an email"
+msgstr "Poslať e-mail"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1597
+msgid "Run a program"
+msgstr "Spustiť program"
+
+#: calendar/gui/event-editor.c:1612
+msgid " before start of appointment"
+msgstr " pred začiatkom schôdzky"
+
+#: calendar/gui/event-editor.c:1614
+msgid " after start of appointment"
+msgstr " po začiatku schôdzky"
+
+#: calendar/gui/event-editor.c:1622
+msgid " before end of appointment"
+msgstr " pred koncom schôdzky"
+
+#: calendar/gui/event-editor.c:1624
+msgid " after end of appointment"
+msgstr " po konci schôdzky"
+
+#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
 
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
@@ -2645,11 +2770,6 @@ msgstr "Zmeniť"
 msgid "No recurrence"
 msgstr "Neopakovať"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
-msgstr "Prehrať zvuk"
-
 #: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Preview"
 msgstr "Ukážka"
@@ -2666,25 +2786,10 @@ msgstr "Pravidlo opakovania"
 msgid "Reminder"
 msgstr "Pripomenutie"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
-msgstr "Spustiť program"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
-msgid "Send an email"
-msgstr "Poslať e-mail"
-
 #: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 msgid "Settings..."
 msgstr "Nastavenie..."
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
-msgstr "Zobraziť dialóg"
-
 #: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Simple recurrence"
 msgstr "Jednoduché opakovanie"
@@ -2730,7 +2835,7 @@ msgstr "navždy"
 msgid "hour(s)"
 msgstr "hodín"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
 msgid "minute(s)"
 msgstr "minút"
 
@@ -2754,99 +2859,46 @@ msgstr "týždňov"
 msgid "year(s)"
 msgstr "rokov"
 
-#: calendar/gui/event-editor.c:373
-msgid "Edit Appointment"
-msgstr "Upraviť schôdzku"
-
-#: calendar/gui/event-editor.c:451
-msgid "on"
-msgstr "zapnutá"
-
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
-msgstr "deň"
-
-#: calendar/gui/event-editor.c:603
-msgid "on the"
-msgstr " "
-
-#: calendar/gui/event-editor.c:610
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:756
-msgid "occurrences"
-msgstr "výskytov"
-
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+msgid "New Appointment..."
+msgstr "Nová schôdzka..."
 
-#: calendar/gui/event-editor.c:1534
-#, c-format
-msgid " %d days"
-msgstr " %d dní"
+#: calendar/gui/e-week-view.c:3314
+msgid "Delete All Occurrences"
+msgstr "Odstrániť všetky výskyty"
 
-#: calendar/gui/event-editor.c:1536
-msgid " 1 day"
-msgstr " 1 deň"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
-msgstr " %d týždňov"
+#: calendar/gui/gnome-cal.c:234
+msgid "Summary contains"
+msgstr "Súhrn obsahuje"
 
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
-msgstr " 1 týždeň"
+#: calendar/gui/gnome-cal.c:235
+msgid "Description contains"
+msgstr "Popis obsahuje"
 
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
-msgstr " %d hodín"
+#: calendar/gui/gnome-cal.c:236
+msgid "Comment contains"
+msgstr "Komentár obsahuje"
 
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
-msgstr " 1 hodina"
+#: calendar/gui/gnome-cal.c:237
+msgid "Has category"
+msgstr "Má kategóriu"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/gnome-cal.c:840
 #, c-format
-msgid " %d minutes"
-msgstr " %d minút"
-
-#: calendar/gui/event-editor.c:1551
-msgid " 1 minute"
-msgstr " 1 minúta"
+msgid "Could not open the folder in `%s'"
+msgstr "Nie je možné otvoriť priečinok v `%s'"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/gnome-cal.c:851
 #, c-format
-msgid " %d seconds"
-msgstr " %d sekúnd"
-
-#: calendar/gui/event-editor.c:1556
-msgid " 1 second"
-msgstr " 1 sekunda"
-
-#: calendar/gui/event-editor.c:1603
-msgid " before start of appointment"
-msgstr " pred začiatkom schôdzky"
-
-#: calendar/gui/event-editor.c:1605
-msgid " after start of appointment"
-msgstr " po začiatku schôdzky"
-
-#: calendar/gui/event-editor.c:1613
-msgid " before end of appointment"
-msgstr " pred koncom schôdzky"
-
-#: calendar/gui/event-editor.c:1615
-msgid " after end of appointment"
-msgstr " po konci schôdzky"
-
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+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."
@@ -2880,36 +2932,6 @@ msgstr "Vytváracie rozhranie pre ovládací prvok pohľadu iTip kalendára"
 msgid "Factory for the sample Calendar control"
 msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Kalendár."
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Zobraziť všetko"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "Súhrn obsahuje"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "Popis obsahuje"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "Komentár obsahuje"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Má kategóriu"
-
-#: calendar/gui/gnome-cal.c:843
-#, 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:854
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Apríl"
@@ -3118,10 +3140,6 @@ msgstr "Pi"
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Úlohy"
-
 #. Day
 #: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
@@ -3154,9 +3172,9 @@ msgstr "Tento rok (%Y)"
 msgid "Print Calendar"
 msgstr "Tlačiť kalendár"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1406
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1552
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:61
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
@@ -3205,26 +3223,122 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "NPUSŠPS"
 
-#: camel/camel-cipher-context.c:169
+#: 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"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Digitálny podpis v čistom texte nie je podporovaný touto šifrou"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Overenie podpisu nie je podporované touto šifrou"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifrovanie nie je podporované touto šifrou"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifrovanie nie je podporované touto šifrou"
 
+#: camel/camel-disco-store.c:271
+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
 msgid "Syncing folders"
 msgstr "Synchronizujem priečinky"
@@ -3405,47 +3519,91 @@ msgstr "Prosím, zadajte vaše %s heslo pre %s"
 msgid "Please enter your %s passphrase"
 msgstr "Prosím, zadajte vaše %s heslo"
 
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:511
 msgid "No plaintext to sign."
 msgstr "Žiadny čistý text na podpis."
 
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1061 camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
+#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
 msgid "No password provided."
 msgstr "Nezadané heslo."
 
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1068
-#: camel/camel-pgp-context.c:1280
+#: 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
 #, 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:685
+#: camel/camel-pgp-context.c:683
 msgid "No plaintext to clearsign."
 msgstr "Žiadny čistý text pre pridanie digitálneho podpisu do čistého textu."
 
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:873
 msgid "No plaintext to verify."
 msgstr "Žiadny čistý text pre overenie."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:890
 #, 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:1051
+#: camel/camel-pgp-context.c:1047
 msgid "No plaintext to encrypt."
 msgstr "Žiadny čistý text na zašifrovanie."
 
-#: camel/camel-pgp-context.c:1077
+#: camel/camel-pgp-context.c:1073
 msgid "No recipients specified"
 msgstr "Neuvedený žiadni adresáti"
 
-#: camel/camel-pgp-context.c:1265
+#: camel/camel-pgp-context.c:1261
 msgid "No ciphertext to decrypt."
 msgstr "Žiadny zašifrovaný text na odkódovanie."
 
+#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:205
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Prosím, zadajte vaše heslo pre %s"
+
+#: camel/camel-pkcs7-context.c:213 camel/camel-smime-context.c:221
+msgid "Error hashing password."
+msgstr "Chyba pri hashovaní hesla."
+
+#: camel/camel-pkcs7-context.c:222 camel/camel-smime-context.c:230
+msgid "Invalid password."
+msgstr "Neplatné heslo."
+
+#: camel/camel-pkcs7-context.c:329 camel/camel-smime-context.c:338
+#, c-format
+msgid "Could not sign: certificate not found for \"%s\"."
+msgstr "Nie je možné podpísať: certifikát pre \"%s\" nebol nájdený."
+
+#: camel/camel-pkcs7-context.c:378
+#, c-format
+msgid "Could not clearsign: certificate not found for \"%s\"."
+msgstr "Nie je možné podpísať v čistom text: certifikát pre \"%s\" nebol nájdený."
+
+#: camel/camel-pkcs7-context.c:567 camel/camel-smime-context.c:539
+msgid "Could not encrypt: failed to create enveloped data."
+msgstr "Nepodarilo sa zašifrovanie: nepodarilo sa vytvoriť dáta s obálkou."
+
+#: camel/camel-pkcs7-context.c:590 camel/camel-smime-context.c:546
+msgid "Could not encrypt: failed to create encryption context."
+msgstr "Nepodarilo sa zašifrovanie: nepodarilo sa vytvoriť zašifrovaný obsah."
+
+#: camel/camel-pkcs7-context.c:620 camel/camel-smime-context.c:581
+#, c-format
+msgid "Could not encrypt data: invalid user key: \"%s\"."
+msgstr "Nepodarilo sa zašifrovanie: neplatný kľúč používateľa: \"%s\"."
+
+#: camel/camel-pkcs7-context.c:626 camel/camel-smime-context.c:587
+msgid "Could not encrypt: encoding failed."
+msgstr "Nepodarilo sa zašifrovanie: kódovanie zlyhalo."
+
+#: camel/camel-pkcs7-context.c:677 camel/camel-smime-context.c:637
+msgid "Failed to decrypt: Unknown"
+msgstr "Nepodarilo sa dešifrovanie: Neznáme"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -3463,37 +3621,37 @@ msgstr "Nie je možné načítať %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie je možné načítať %s: V module nie je inicializačný kód."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s služba pre %s na %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Spojenie zrušené"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:269
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie je možné spojenie s %s (port %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(neznámy hostiteľ)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: 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:287
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:476
 msgid "Server unexpectedly disconnected"
 msgstr "Server neočakávane zrušil spojenie"
 
@@ -3602,68 +3760,76 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:416
+#: camel/providers/imap/camel-imap-store.c:433
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr "Prihlásenie NT"
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "Táto voľba pripojí na server pomocou hesiel prenášaných ako čistý text."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr "Neznámy stav overenia."
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Preklad regulárneho výrazu zlyhal: %s: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vyžaduje komponentu používateľského mena"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vyžaduje komponentu hostiteľa"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vyžaduje komponentu cesty"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "Zisťujem adresu: %s"
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Zlyhalo hľadanie mena: %s"
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: neznámy dôvod"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Poskytovateľ pošty pre virtuálny priečinok"
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pre čítanie pošty ako otázky na inú množinu priečinkov"
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pre protokol `%s' nie je k dispozícii poskytovateľ"
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:479
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3672,12 +3838,72 @@ msgstr ""
 "Nie je možné vytvoriť priečinok %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:354
+msgid "Could not sign: failed to create content info."
+msgstr "Nie je možné podpísať: nepodarilos a vytvoriť informáciu o obsahu."
+
+#: camel/camel-smime-context.c:361
+msgid "Could not sign: failed to create signing context."
+msgstr "Nie je možné podpísať: nepodarilo sa vytvoriť kontext."
+
+#: camel/camel-smime-context.c:367
+msgid "Could not sign: failed to create signature."
+msgstr "Nie je možné podpísať: nepodarilo sa vytvoriť signatúru."
+
+#: camel/camel-smime-context.c:394
+msgid "'clearsign' is not supported by S/MIME."
+msgstr "Digitálny podpis v čistom texte nie je podporovaný pre S/MIME."
+
 #. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
+#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
 msgid "Trash"
 msgstr "Odpadky"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"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"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Neplatný certifikát od %s.\n"
+"\n"
+"%s\n"
+"\n"
+"Chcete ho aj tak akceptovať?"
+
+#: camel/camel-tcp-stream-openssl.c:423
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+"Vydal: %s\n"
+"Pre: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -3688,59 +3914,73 @@ msgstr "Nie je možné spracovať URL `%s'"
 msgid "No such message %s in %s"
 msgstr "Taká správa neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:546
 #, c-format
 msgid "No such message: %s"
 msgstr "Žiadna taká správa: %s"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr "Nemôžete skopírovať správy z tohto priečinku s odpadkami."
+
+#: 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:232
 #, 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:217
+#: camel/providers/imap/camel-imap-command.c:240
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:295
 msgid "Server response ended too soon."
 msgstr "Odpoveď serveru skončila príliš skoro."
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:487
 #, 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:490
+#: camel/providers/imap/camel-imap-command.c:524
 #, 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:170
+#: camel/providers/imap/camel-imap-folder.c:172
+#, 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:191
 #, 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:349
+#: camel/providers/imap/camel-imap-folder.c:364
 msgid "Scanning IMAP folder"
 msgstr "Prechádzam priečinok IMAP"
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1047
+#: camel/providers/imap/camel-imap-folder.c:1281
 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:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1075
+#: camel/providers/imap/camel-imap-folder.c:1314
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je možné nájsť telo správy v odpovedi FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
 msgid "Checking for new mail"
 msgstr "Kontrolujem novú poštu"
 
@@ -3748,7 +3988,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:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:552
 msgid "Folders"
 msgstr "Priečinky"
 
@@ -3780,28 +4020,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:439
+#: camel/providers/imap/camel-imap-store.c:456
 #, 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:449
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:466
+#: camel/providers/smtp/camel-smtp-transport.c:366
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:474
+#: camel/providers/imap/camel-imap-store.c:490
 #, 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:489
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:505
+#: camel/providers/smtp/camel-smtp-transport.c:410
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3812,19 +4052,10 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:864
+#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
 #, c-format
-msgid "%s is not a selectable folder"
-msgstr "Priečinok %s nie je možné vybrať"
-
-#: camel/providers/imap/camel-imap-store.c:878
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Nie je možné vytvoriť priečinok %s: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1381
-msgid "You must be working online to complete this operation"
-msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
+msgid "No such folder %s"
+msgstr "Priečinok %s neexistuje"
 
 #: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
@@ -3850,46 +4081,50 @@ msgstr "Poštové súbory vo formáte Qmail maildir"
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Pre ukladanie lokálnej pošty v priečinkov vo formáte qmail"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:127
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Koreň ukladania %s nie je absolútna cesta"
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Koreň ukladania %s nie je normálny priečinok"
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr "Lokálne ukladanie nemá priečinok pre novú poštu"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokálny poštový súbor %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie je možné premenovať priečinok %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nie je možné odstrániť súbor súhrnu priečinku `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie je možné odstrániť indexový súbor priečinku`%s': %s"
 
+#: camel/providers/local/camel-local-summary.c:404
+msgid "Unable to add message to summary: unknown reason"
+msgstr "Nie je možné pridať správu do súhrnu: neznámy dôvod"
+
 #: camel/providers/local/camel-maildir-folder.c:150
 #: camel/providers/local/camel-maildir-folder.c:158
 #: camel/providers/local/camel-maildir-folder.c:169
@@ -3966,6 +4201,12 @@ msgstr "Nie je možné odstrániť priečinok `%s': %s"
 msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Nie je možné otvoriť cestu poštovej schránky: %s: %s"
+
 #: camel/providers/local/camel-mbox-folder.c:152
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
@@ -4041,75 +4282,75 @@ 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:248
+#: camel/providers/local/camel-mbox-summary.c:249
 msgid "Summarising folder"
 msgstr "Vytváram súhrn priečinku"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
 #, 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:295
+#: camel/providers/local/camel-mbox-summary.c:296
 #, 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:370
+#: camel/providers/local/camel-mbox-summary.c:371
 #, 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:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
 msgid "Synchronising folder"
 msgstr "Synchronizujem priečinok"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nie je možné otvoriť priečinok pre vytvorenie súhrnu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie je možné otvoriť dočasnú poštovú schránku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Súhrn a priečinok si neodpovedajú, ani po synchronizácii"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #, 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:616
+#: camel/providers/local/camel-mbox-summary.c:617
 #, 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:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie je možné zatvoriť zdrojový priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie je možné premenovať priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-mbox-summary.c:879
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznáma chyba: %s"
@@ -4125,6 +4366,11 @@ msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' nie je priečinok."
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Nie je možné otvoriť cestu MH: %s: %s"
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -4198,21 +4444,31 @@ msgstr "Nie je možné otvoriť alebo vytvoriť súbor .newsrc pre %s: %s"
 msgid "Retrieving POP summary"
 msgstr "Získavam POP súhrn"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "Nie je možné skontrolovať novú poštu na POP serveri: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nie je možné otvoriť priečinok: zoznam správ nebol úplný."
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr "Žiadna správa s uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Získavam POP správu %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, c-format
+msgid "Could not fetch message: %s"
+msgstr "Nie je možné získať správu: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nie je možné získať správu zo POP serveru %s: %s"
@@ -4230,7 +4486,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:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
@@ -4265,22 +4521,27 @@ msgstr ""
 msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr "Táto voľba vás spojí s POP serverom pomocou overenia Kerberos 4."
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nepodarilo sa overiť na KPOP serveri: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr "Nie je možné sa spojiť so serverom: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nie je možné sa spojiť s POP serverom na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sProsím, zadajte POP3 heslo pre %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4289,12 +4550,12 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní používateľského mena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Neznámy)"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4302,7 +4563,7 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Požadovaný spôsob overenia nie je podporovaný."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4311,13 +4572,13 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:67
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4369,7 +4630,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:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4377,122 +4638,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:165
+#: camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktická chyba, príkaz neznámy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktická chyba v parametroch alebo argumentoch"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Command not implemented"
 msgstr "Príkaz neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command parameter not implemented"
 msgstr "Parameter príkazu neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "System status, or system help reply"
 msgstr "Stav systému alebo odpoveď na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Help message"
 msgstr "Správa pomocníka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Service ready"
 msgstr "Služba pripravená"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service closing transmission channel"
 msgstr "Služba zatvára prenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:184
 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Requested mail action okay, completed"
 msgstr "Požadovaná poštová akcia v poriadku, dokončená"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:188
 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:190
 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:189
+#: camel/providers/smtp/camel-smtp-transport.c:192
 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action aborted: error in processing"
 msgstr "Požadovaná akcia zrušená: chyba pri spracovaní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:196
 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:195
+#: camel/providers/smtp/camel-smtp-transport.c:198
 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:197
+#: camel/providers/smtp/camel-smtp-transport.c:200
 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:202
 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Spustiť vstup pošty, končí <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Transaction failed"
 msgstr "Prenos zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "A password transition is needed"
 msgstr "Vyžadované heslo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizmus overenia je príliš slabý"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Požadované šifrovanie pre požadovaný spôsob overenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Temporary authentication failure"
 msgstr "Dočasné zlyhanie overenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication required"
 msgstr "Autentifikácia vyžadovaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:313
 #, 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:348
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, 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:388
+#: camel/providers/smtp/camel-smtp-transport.c:395
 #, 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:411
+#: camel/providers/smtp/camel-smtp-transport.c:418
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4503,109 +4764,113 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:534
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručenie pošty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:561
 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:561
+#: camel/providers/smtp/camel-smtp-transport.c:568
 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:575
+#: camel/providers/smtp/camel-smtp-transport.c:582
 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:669
+#: camel/providers/smtp/camel-smtp-transport.c:676
 #, 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:688
+#: camel/providers/smtp/camel-smtp-transport.c:695
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Chyba odpovede HELO: %s: nie je kritická"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Error creating SASL authentication object."
 msgstr "Chyba pri vytváraní overovacieho objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:755
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:764
+msgid "AUTH request failed."
+msgstr "Požiadavka AUTH zlyhala."
+
+#: camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpoveď na overenie od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:835
 #, 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:843
+#: camel/providers/smtp/camel-smtp-transport.c:854
 #, 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:868
+#: camel/providers/smtp/camel-smtp-transport.c:879
 #, 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:887
+#: camel/providers/smtp/camel-smtp-transport.c:898
 #, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:929
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, 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:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:981
 #, 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:989
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 #, 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:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Chyba odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1066
 #, 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:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1085
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Chyba odpovede QUIT: %s: nie je kritická"
@@ -4635,7 +4900,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:121
 msgid "attachment"
 msgstr "príloha"
 
@@ -4656,7 +4921,8 @@ msgstr "Pridať prílohu..."
 msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
+#: mail/message-list.c:1081
 msgid "Attachment"
 msgstr "Príloha"
 
@@ -4680,60 +4946,7 @@ msgstr "Typ MIME:"
 msgid "Send as:"
 msgstr "Poslať ako:"
 
-#: composer/e-msg-composer-hdrs.c:321
-msgid "Click here for the address book"
-msgstr "Kliknutím zobrazíte adresár"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
-msgid "From:"
-msgstr "Od:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
-msgid "Reply-To:"
-msgstr "Odpovedať komu:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
-msgid "Subject:"
-msgstr "Predmet:"
-
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
-msgid "To:"
-msgstr "Komu:"
-
-#: composer/e-msg-composer-hdrs.c:384
-msgid "Enter the recipients of the message"
-msgstr "Zadajte adresátov správy"
-
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname "
-"adresátov správy."
-
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer.c:536
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4742,21 +4955,21 @@ msgstr ""
 "Nie je možné otvoriť súbor s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:709
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:720
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:740
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:812
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4764,12 +4977,12 @@ 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:877 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:870 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:876
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4779,27 +4992,27 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:901
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1027
 msgid "That file does not exist."
 msgstr "Súbor neexistuje."
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1037
 msgid "That is not a regular file."
 msgstr "Toto nie je normálny súbor."
 
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1047
 msgid "That file exists but is not readable."
 msgstr "Súbor existuje, ale nedá sa prečítať."
 
-#: composer/e-msg-composer.c:1064
+#: composer/e-msg-composer.c:1057
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Súbor vyzerá ako dostupný, ale open(2) zlyhala."
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1079
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4807,18 +5020,71 @@ msgstr ""
 "Súbor je veľmi veľký (viac ako 100K)\n"
 "Naozaj ho chcete vložiť?"
 
-#: composer/e-msg-composer.c:1107
+#: composer/e-msg-composer.c:1100
 msgid "An error occurred while reading the file."
 msgstr "Nastala chyba počas čítania súboru."
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1401 composer/e-msg-composer.c:1744
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:1835
 msgid "Could not create composer window."
 msgstr "Nie je možné vytvoriť okno editora správ."
 
+#: composer/e-msg-composer-hdrs.c:323
+msgid "Click here for the address book"
+msgstr "Kliknutím zobrazíte adresár"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:753
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:755
+msgid "Reply-To:"
+msgstr "Odpovedať komu:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:652
+msgid "Subject:"
+msgstr "Predmet:"
+
+#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:757
+msgid "To:"
+msgstr "Komu:"
+
+#: composer/e-msg-composer-hdrs.c:386
+msgid "Enter the recipients of the message"
+msgstr "Zadajte adresátov správy"
+
+#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:759
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
+
+#: composer/e-msg-composer-hdrs.c:393
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname "
+"adresátov správy."
+
 #: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -4846,7 +5112,7 @@ 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
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -4875,7 +5141,7 @@ msgstr "%H:%M%n"
 #. strftime format of a weekday and a date.
 #: e-util/e-time-utils.c:269
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -4893,8 +5159,8 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+#: 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"
 
@@ -4905,8 +5171,8 @@ msgstr "%H:%M:%S"
 
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+#: 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"
 
@@ -4915,18 +5181,36 @@ msgstr "%I:%M %p"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Komponent Evolution pre Súhrn."
-
-#: 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/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 "
@@ -4995,28 +5279,6 @@ msgstr "Presunúť %s do nasledujúceho riadku"
 msgid "Configure %s"
 msgstr "Nastavenie %s"
 
-#: executive-summary/component/e-summary.c:924
-#, 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:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Chyba pri čítaní dát:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr "Súbor nemá miesto pre služby.\n"
-
 #: executive-summary/component/executive-summary-config.glade.h:1
 msgid "Appearance"
 msgstr "Vzhľad"
@@ -5035,6 +5297,14 @@ msgstr ""
 "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."
@@ -5066,19 +5336,19 @@ msgstr "Testovacia služba"
 msgid "Error"
 msgstr "Chyba"
 
-#: executive-summary/test-service/rdf-summary.c:768
+#: executive-summary/test-service/rdf-summary.c:775
 msgid "Update automatically"
 msgstr "Aktualizovať automaticky"
 
-#: executive-summary/test-service/rdf-summary.c:778
+#: executive-summary/test-service/rdf-summary.c:785
 msgid "Update now"
 msgstr "Aktualizovať"
 
-#: executive-summary/test-service/rdf-summary.c:788
+#: executive-summary/test-service/rdf-summary.c:795
 msgid "Update every "
 msgstr "Aktualizovať každých"
 
-#: executive-summary/test-service/rdf-summary.c:796
+#: executive-summary/test-service/rdf-summary.c:806
 #: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minút"
@@ -5139,7 +5409,7 @@ msgstr "Aj. Zabudli ste vybrať dátum."
 msgid "Oops. You have chosen an invalid date."
 msgstr "Aj. Vybrali ste neplatný dátum."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:276
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5149,7 +5419,7 @@ msgstr ""
 "keď bol spustený filter alebo keď bol\n"
 "otvorený vpriečinok."
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:299
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5157,7 +5427,7 @@ msgstr ""
 "Dátum správy bude porovnaný\n"
 "s časom, ktorý tu uvediete."
 
-#: filter/filter-datespec.c:338
+#: filter/filter-datespec.c:339
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5168,28 +5438,28 @@ msgstr ""
 "filter spustený. Napr. \"pred týždňom\".."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:374
 msgid "the current time"
 msgstr "aktuálny tento"
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:374
 msgid "a time you specify"
 msgstr "zadaný čas"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:375
 msgid "a time relative to the current time"
 msgstr "čas relatívny k aktuálnemu času"
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:433
 msgid "Compare against"
 msgstr "Porovnať s"
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
 msgid "now"
 msgstr "teraz"
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:707
 msgid "<click here to select a date>"
 msgstr "<kliknutím vyberiete dátum>"
 
@@ -5198,11 +5468,11 @@ msgid "Filter Rules"
 msgstr "Pravidlá filtra"
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Potom"
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Pridať akciu"
 
@@ -5214,20 +5484,60 @@ 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:222 filter/vfolder-rule.c:285
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
 #: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Zadajte URI priečinku"
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<kliknutím vyberiete priečinok>"
 
-#: filter/filter-input.c:194
+#: 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 ""
 "Error in regular expression '%s':\n"
@@ -5236,7 +5546,7 @@ msgstr ""
 "Chyba v regulárnom výraze '%s':\n"
 "%s"
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
@@ -5268,45 +5578,13 @@ msgstr "ak odpovedá niektoré kritérium"
 msgid "Add criterion"
 msgstr "Pridať kritérium"
 
-#: 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-rule.c:770
+msgid "incoming"
+msgstr "prijatá"
 
-#: 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-rule.c:770
+msgid "outgoing"
+msgstr "odoslaná"
 
 #: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
@@ -5456,8 +5734,8 @@ msgstr "Regul. výraz"
 msgid "Replied to"
 msgstr "Odpovedaná"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.c:1081
 msgid "Score"
 msgstr "Skóre"
 
@@ -5489,7 +5767,7 @@ msgstr "začína na"
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/message-list.c:1082
 msgid "Subject"
 msgstr "Predmet"
 
@@ -5501,130 +5779,232 @@ msgstr "bolo po"
 msgid "was before"
 msgstr "bolo pred"
 
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr "Pravidlá"
+
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "Pridať pravidlo"
+
+#: filter/rule-editor.c:299
+msgid "Edit Rule"
+msgstr "Upraviť pravidlo"
+
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Pravidlá skóre"
 
-#: mail/component-factory.c:329
+#: importers/elm-importer.c:512 importers/netscape-importer.c:780
+#: importers/pine-importer.c:646 shell/e-shell-importer.c:655
+#: shell/importer/import.glade.h:4
+msgid "Import"
+msgstr "Import"
+
+#: importers/elm-importer.c:517 importers/netscape-importer.c:785
+#: importers/pine-importer.c:651
+msgid "Mail"
+msgstr "Pošta"
+
+#: importers/elm-importer.c:521
+msgid "Elm Aliases"
+msgstr "Aliasy Elm"
+
+#: importers/elm-importer.c:528 importers/netscape-importer.c:807
+#: importers/pine-importer.c:668
+msgid "Don't ask me again"
+msgstr "Túto správu už nezobrazovať"
+
+#: importers/elm-importer.c:561
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution našiel poštové súbory Elm.\n"
+"Chcete ich naimportovať do Evolution?"
+
+#: importers/elm-importer.c:579
+msgid "Elm mail"
+msgstr "Pošta Elm"
+
+#: importers/evolution-gnomecard-importer.c:156
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution našiel súbory GnomeCard.\n"
+"Chcete ich naimportovať do Evolution?"
+
+#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+msgid "Settings"
+msgstr "Nastavenie"
+
+#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1464
+msgid "Filters"
+msgstr "Filtre"
+
+#: importers/netscape-importer.c:800
+msgid "Addressbooks"
+msgstr "Adresáre"
+
+#: importers/netscape-importer.c:847
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution našiel poštové súbory Netscape.\n"
+"Chcete ich naimportovať do Evolution?"
+
+#: importers/pine-importer.c:661
+msgid "Addressbook"
+msgstr "Adresár"
+
+#: importers/pine-importer.c:705
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution našiel poštové súbory Pine.\n"
+"Chcete ich naimportovať do Evolution?"
+
+#: importers/pine-importer.c:723
+msgid "Pine mail"
+msgstr "Pošta Pine"
+
+#: mail/component-factory.c:337
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je možné inicializovať poštový komponent Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:410
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať sklad u shellu"
 
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Vlastnosti \"%s\""
-
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:270
 msgid "Store search as vFolder"
 msgstr "Uložiť hľadanie ako vPriečinok"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr "Vpriečinok na predmet"
+#: mail/folder-browser.c:587 ui/evolution-mail.xml.h:95
+msgid "VFolder on _Subject"
+msgstr "Vpriečinok na _predmet"
+
+#: mail/folder-browser.c:590 ui/evolution-mail.xml.h:93
+msgid "VFolder on Se_nder"
+msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "Vpriečinok na odosielateľovi"
+#: mail/folder-browser.c:593 ui/evolution-mail.xml.h:94
+msgid "VFolder on _Recipients"
+msgstr "Vpriečinok na _adresátov"
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "Vpriečinok na adresátoch"
+#: mail/folder-browser.c:596 ui/evolution-mail.xml.h:92
+msgid "VFolder on Mailing _List"
+msgstr "VPriečinok na _konferenciu"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
-msgstr "VPriečinok na konferenciu"
+#: mail/folder-browser.c:602
+msgid "Filter on Sub_ject"
+msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
-msgstr "Filter na predmet"
+#: mail/folder-browser.c:605
+msgid "Filter on Sen_der"
+msgstr "Filter na o_dosielateľovi"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
-msgstr "Filter na odosielateľovi"
+#: mail/folder-browser.c:608
+msgid "Filter on Re_cipients"
+msgstr "Filter na _adresátoch"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
-msgstr "Filter na adresátoch"
+#: mail/folder-browser.c:611
+msgid "Filter on _Mailing List"
+msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
-msgstr "Filter na konferenciu"
+#: mail/folder-browser.c:620
+msgid "_Open"
+msgstr "_Otvoriť"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:622
 msgid "Resend"
 msgstr "Znovuposlať"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr "Uložiť ako..."
+#: mail/folder-browser.c:624 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:114 ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
+msgstr "Uložiť _ako..."
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
-msgstr "Odpovedať odosielateľovi"
+#: mail/folder-browser.c:626 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "_Tlačiť"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "Odpovedať všetkým"
+#: mail/folder-browser.c:631
+msgid "_Reply to Sender"
+msgstr "_Odpovedať odosielateľovi"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Poslať ďalej"
+#: mail/folder-browser.c:633 ui/evolution-mail.xml.h:70
+msgid "Reply to _All"
+msgstr "Odpovedať _všetkým"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Predať ďalej v tele"
+#: mail/folder-browser.c:635 ui/evolution-mail.xml.h:105
+msgid "_Forward"
+msgstr "Poslať ď_alej"
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
-msgstr "Označiť ako prečítanú"
+#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:44
+msgid "Mar_k as Read"
+msgstr "Označiť ako _prečítanú"
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
-msgstr "Označiť ako neprečítanú"
+#: mail/folder-browser.c:640 ui/evolution-mail.xml.h:48
+msgid "Mark as U_nread"
+msgstr "Označiť ako _neprečítanú"
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
-msgstr "Presunúť do priečinku..."
+#: mail/folder-browser.c:645 ui/evolution-mail.xml.h:109
+msgid "_Move to Folder..."
+msgstr "Pre_sunúť do priečinka..."
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr "Kopírovať do priečinku..."
+#: mail/folder-browser.c:647 ui/evolution-mail.xml.h:99
+msgid "_Copy to Folder..."
+msgstr "_Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr "Obnoviť zmazaný záznam"
+#: mail/folder-browser.c:651 ui/evolution-mail.xml.h:119
+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:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:661 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
-msgstr "Vytvoriť pravidlo zo správy"
+#: mail/folder-browser.c:665
+msgid "Create Ru_le From Message"
+msgstr "Vytvoriť pra_vidlo zo správy"
+
+#: mail/folder-browser.c:804
+msgid "Filter on Mailing List"
+msgstr "Filter na konferenciu"
+
+#: mail/folder-browser.c:805
+msgid "VFolder on Mailing List"
+msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:807
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:808
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
 
+#: mail/folder-browser-factory.c:216
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Vlastnosti \"%s\""
+
+#: mail/folder-browser-factory.c:218 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."
@@ -5657,6 +6037,26 @@ msgstr "Vytváracie rozhranie pre poštový komponent Evolution."
 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"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr "Importuje súbory mbox do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Vytváracie rozhranie pre import súborov Outlook Express 4 do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Importuje súbory Outlook Express 4 do Evolution"
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Súčasný formát ukladania:"
@@ -5691,6 +6091,15 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "Nevyplnili ste všetky povinné informácie."
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:173
+msgid "Evolution Account Editor"
+msgstr "Editor účtov Evolution"
+
 #: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (štandard)"
@@ -5699,7 +6108,7 @@ msgstr " (štandard)"
 msgid "Disable"
 msgstr "Zakázať"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
 msgid "Enable"
 msgstr "Povoliť"
 
@@ -5712,19 +6121,10 @@ 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:536
+#: mail/mail-accounts.c:568
 msgid "Evolution Account Manager"
 msgstr "Správca účtov Evolution"
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr "Nevyplnili ste všetky povinné informácie."
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
-msgstr "Editor účtov Evolution"
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5745,11 +6145,11 @@ msgstr "Pošta od %s"
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 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"
@@ -5761,7 +6161,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."
@@ -5769,7 +6169,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."
@@ -5777,11 +6177,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?"
@@ -5789,32 +6189,37 @@ msgstr ""
 "Táto správa nemá predmet.\n"
 "Naozaj ju chcete poslať?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:311
 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:354
 msgid "You must configure an account before you can send this email."
 msgstr "Musíte nastaviť účet pred poslaním tejto správy."
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:593
 #, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "V %s, %s zapísané:\n"
+msgid "On %s, %s wrote:"
+msgstr "V %s, %s zapísané:"
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:755
 msgid "Forwarded message:\n"
 msgstr "Predaná správa:\n"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:849
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:851
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:1089
+#: mail/mail-callbacks.c:1130
+#, 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:1152
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5822,7 +6227,7 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:1120
+#: mail/mail-callbacks.c:1186
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5830,11 +6235,20 @@ msgstr ""
 "Iba správy z priečinku Odoslané je možné\n"
 "znovu poslať."
 
-#: mail/mail-callbacks.c:1153 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1198
+#, 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:1219
+msgid "No Message Selected"
+msgstr "Žiadna vybraná správa"
+
+#: mail/mail-callbacks.c:1245 mail/mail-display.c:91
 msgid "Overwrite file?"
 msgstr "Prepísať súbor?"
 
-#: mail/mail-callbacks.c:1157 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1249 mail/mail-display.c:95
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5842,15 +6256,15 @@ msgstr ""
 "Súbor s týmto menom už existuje\n"
 "Prepísať ho?"
 
-#: mail/mail-callbacks.c:1201
+#: mail/mail-callbacks.c:1293
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:1203
+#: mail/mail-callbacks.c:1295
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:1317
+#: mail/mail-callbacks.c:1454
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5859,18 +6273,70 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1366 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1512 ui/evolution-mail.xml.h:60
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:1413
+#: mail/mail-callbacks.c:1559
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1654
+#, 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:1199 mail/mail-config.c:1202
 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 "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Prosím, zadajte vaše meno a e-mailovú adresu. \"Nepovinné\" informácie "
+"nemusíte zadať, iba ak chcete, aby boli posielané vo vašich správach."
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"Prosím, zadajte informácie o vašom serveri pre prijímanú poštu. Ak neviete, "
+"ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
+"poskytovateľa pripojenia na Internet."
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"Prosím, zadajte informácie o protokole pre odosielanie pošty. Ak neviete, "
+"ktorý typ protokolu použiť, kontaktujte vášho administrátora alebo "
+"poskytovateľa pripojenia na Internet."
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"Už ste skoro na konci nastavenia pošty. Vaše meno, server pre príjem pošty a "
+"spôsob odosielania budú použité pre vytvorenie poštového účtu Evolution. "
+"Prosím, zadajte meno pre tento účet. Toto meno bude používané iba pre "
+"zobrazenie."
+
+#. set window title
+#: mail/mail-config-druid.c:445
+msgid "Evolution Account Wizard"
+msgstr "Sprievodca účtom Evolution"
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Kontrolovať podporované typy"
@@ -5896,18 +6362,26 @@ msgid "Accounts"
 msgstr "Účty"
 
 #: mail/mail-config.glade.h:8
+msgid "Always load images off the net"
+msgstr "Vždy načítavať obrázky zo siete"
+
+#: mail/mail-config.glade.h:10
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Authentication Type: "
 msgstr "Typ overenia:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Automatically check for new mail every"
 msgstr "Automaticky kontrolovať poštu každých"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
+msgid "Composer"
+msgstr "Editor"
+
+#: mail/mail-config.glade.h:15
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5923,163 +6397,191 @@ msgstr ""
 "\n"
 "Kliknutím na \"Dokončiť\" uložíte vaše nastavenie."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:21
 msgid "De_fault"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
+msgid "Default \"Forward\" style is: "
+msgstr "Štandardný štýl \"Predať ďalej\" je: "
+
+#: mail/mail-config.glade.h:25
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:26
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:27
 msgid "Drafts folder:"
 msgstr "Priečinok konceptov:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:29
 msgid "Email Address:"
 msgstr "E-mailová adresa:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 msgid "Full Name:"
 msgstr "Celé meno:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:32
+msgid "Highlight citations with"
 msgstr "Zvýrazniť citácie pomocou"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:35
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
+msgid "In HTML mail"
+msgstr "v HTML pošte"
+
+#: mail/mail-config.glade.h:37
+msgid "Inline"
+msgstr "v texte"
+
+#: mail/mail-config.glade.h:38
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:39
+msgid "Load images if sender is in addressbook"
+msgstr "Načítať obrázky ak je odosielateľ v adresári"
+
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:41
 msgid "Make this my default account"
 msgstr "Použiť ho ako štandardný účet"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:42
 msgid "Mark messages as \"Read\" after:"
 msgstr "Označiť správy ako \"Prečítané\" po:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:44
+msgid "Never load images off the net"
+msgstr "Nikdy nenačítať obrázky zo siete"
+
+#: mail/mail-config.glade.h:45
 msgid "News"
 msgstr "Diskusné skupiny"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "Optional Information"
 msgstr "Nepovinné informácie"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:48
 msgid "Organization:"
 msgstr "Organizácia:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:49
+msgid "PGP"
+msgstr "PGP"
+
+#: mail/mail-config.glade.h:50
 msgid "PGP binary path:"
 msgstr "Cesta k spustiteľnému súboru PGP:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:55
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:56
+msgid "Quoted"
+msgstr "Citovať"
+
+#: mail/mail-config.glade.h:57
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:58
 msgid "Receiving Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:59
 msgid "Receiving Options"
 msgstr "Možnosti príjmu"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:61
 msgid "Required Information"
 msgstr "Povinné informácie"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:63
 msgid "Select PGP binary"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:64
 msgid "Send mail in HTML format by default."
 msgstr "Posielať štandardne ako HTML."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:65
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:66
 msgid "Sending Mail"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:68
 msgid "Sent"
 msgstr "Odoslané"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:69
 msgid "Sent and Draft Messages"
 msgstr "Odoslané a koncepty"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:70
 msgid "Sent messages folder:"
 msgstr "Priečinok pre odoslané správy:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:71
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:72
 msgid "Server Type: "
 msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:73
 msgid "Server requires authentication"
 msgstr "Server vyžaduje overenie"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:74
 msgid "Signature file:"
 msgstr "Súbor s podpisom:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:75
 msgid "Sources"
 msgstr "Zdroje"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:76
 msgid "Special Folders"
 msgstr "Špeciálne priečinky"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:77
 msgid "Standard Unix mbox"
 msgstr "Štandardný Unixový súbor mbox"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:78
 msgid "Type"
 msgstr "Typ"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
 msgid "Use secure connection (SSL)"
 msgstr "Použiť bezpečné pripojenie (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:80
 msgid "Username:"
 msgstr "Meno používateľa:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:81
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6089,209 +6591,157 @@ msgstr ""
 "\n"
 "Kliknutím \"Ďalší\" začneme."
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
+#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Prosím, zadajte vaše meno a e-mailovú adresu. \"Nepovinné\" informácie "
-"nemusíte zadať, iba ak chcete, aby boli posielané vo vašich správach."
-
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
-"Prosím, zadajte informácie o vašom serveri pre prijímanú poštu. Ak neviete, "
-"ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
-"poskytovateľa pripojenia na Internet."
-
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
-"Prosím, zadajte informácie o protokole pre odosielanie pošty. Ak neviete, "
-"ktorý typ protokolu použiť, kontaktujte vášho administrátora alebo "
-"poskytovateľa pripojenia na Internet."
-
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"Už ste skoro na konci nastavenia pošty. Vaše meno, server pre príjem pošty a "
-"spôsob odosielania budú použité pre vytvorenie poštového účtu Evolution. "
-"Prosím, zadajte meno pre tento účet. Toto meno bude používané iba pre "
-"zobrazenie."
-
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr "Sprievodca účtom Evolution"
-
-#: mail/mail-display.c:194
+#: mail/mail-display.c:195
 msgid "Save Attachment"
 msgstr "Uložiť prílohu"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:235
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:296
 msgid "Save to Disk..."
 msgstr "Uložiť na disk..."
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:298
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:300
 msgid "View Inline"
 msgstr "Zobraziť v texte"
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:335
 msgid "External Viewer"
 msgstr "Externý zobrazovač"
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:358
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Zobraziť v text (pomocou %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:362
 msgid "Hide"
 msgstr "Skryť"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:960
+msgid "Loading message content"
+msgstr "Načítavam obsah správy"
+
+#: mail/mail-display.c:1239
 msgid "Open link in browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1241
 msgid "Save as (FIXME)"
 msgstr "Uložiť ako"
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1243
 msgid "Copy location (FIXME)"
 msgstr "Kopírovať umiestnenie"
 
-#: mail/mail-format.c:518
+#: mail/mail-format.c:527
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:573
 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:742
-msgid "Loading message content"
-msgstr "Načítavam obsah správy"
-
-#: mail/mail-format.c:1036
+#: mail/mail-format.c:1029
 msgid "No GPG/PGP program configured."
 msgstr "Nenastavený žiadny program GPG/PGP."
 
-#: mail/mail-format.c:1051
+#: mail/mail-format.c:1044
 msgid "Encrypted message not displayed"
 msgstr "Zašifrovaná správa nie je zobrazená"
 
-#: mail/mail-format.c:1057
+#: mail/mail-format.c:1050
 msgid "Encrypted message"
 msgstr "Zašifrovaná správa"
 
-#: mail/mail-format.c:1058
+#: mail/mail-format.c:1051
 msgid "Click icon to decrypt."
 msgstr "Kliknite na ikonu pre dešifrovanie."
 
-#: mail/mail-format.c:1148 mail/mail-format.c:1536
+#: mail/mail-format.c:1141 mail/mail-format.c:1527
 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:1156 mail/mail-format.c:1544
+#: mail/mail-format.c:1149 mail/mail-format.c:1535
 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:1757
+#: mail/mail-format.c:1749
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:1769
+#: mail/mail-format.c:1761
 #, 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:1773
+#: mail/mail-format.c:1765
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:1807
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:1812
+#: mail/mail-format.c:1804
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "Priečinok %s neexistuje"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:505
 #, c-format
 msgid "Opening '%s'"
 msgstr "Otváram '%s'"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:785
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mení priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:791
+#: mail/mail-local.c:789
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Zmeniť priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:812
 msgid "Reconfiguring folder"
 msgstr "Prenastavujem priečinok"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:841
 msgid "Closing current folder"
 msgstr "Zatváram aktuálny priečinok"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:873
 msgid "Renaming old folder and opening"
 msgstr "Premenovávam starý priečinok a otváram"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:891
 msgid "Creating new folder"
 msgstr "Vytváram nový priečinok"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:905
 msgid "Copying messages"
 msgstr "Kopírujem správy"
 
-#: mail/mail-local.c:924
+#: mail/mail-local.c:922
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6300,7 +6750,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:963
+#: mail/mail-local.c:961
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6317,7 +6767,7 @@ msgstr ""
 "Chyba počas '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:193
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6326,105 +6776,101 @@ msgstr ""
 "Chyba pri vykonávaní operácie:\n"
 "%s"
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
 msgid "Working"
 msgstr "Pracujem"
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr "Súhlasíte?"
-
-#: mail/mail-mt.c:873
+#: mail/mail-mt.c:862
 msgid "Evolution progress"
 msgstr "Priebeh Evolution"
 
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:599
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posielam \"%s\""
 
-#: mail/mail-ops.c:589
+#: mail/mail-ops.c:603
 msgid "Sending message"
 msgstr "Posielam správu"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:718
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:737
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "Dokončené."
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:825
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:914
 msgid "Moving"
 msgstr "Premiestňujem"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:917
 msgid "Copying"
 msgstr "Kopírujem"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: mail/mail-ops.c:1139
+#: mail/mail-ops.c:1154
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1262
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1449
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1498
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1550
+#: mail/mail-ops.c:1565
 msgid "Retrieving messages"
 msgstr "Získavam správy"
 
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1575
 #, 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:1634
+#: mail/mail-ops.c:1649
 msgid "Saving messages"
 msgstr "Ukladám správy"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1728
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6433,12 +6879,12 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1741
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Ukladám správu %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1755
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6447,11 +6893,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1829
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1844
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6460,17 +6906,46 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:1872
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
+#: mail/mail-ops.c:1939
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "Odpojujem sa od %s"
+
+#: mail/mail-search.c:196 mail/mail-search.c:248
+msgid "(Untitled Message)"
+msgstr "(Správa bez mena)"
+
+#: mail/mail-search.c:242
+msgid "Find in Message"
+msgstr "Nájsť v správe"
+
+#: mail/mail-search.c:284
+msgid "Case Sensitive"
+msgstr "Rozlišovať veľkosť písmen"
+
+#: mail/mail-search.c:285
+msgid "Search Forward"
+msgstr "Hľadať dopredu"
+
+#: mail/mail-search.c:300
+msgid "Find:"
+msgstr "Hľadať:"
+
+#: mail/mail-search.c:304
+msgid "Matches:"
+msgstr "Odpovedá:"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Nájsť"
 
 #: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+msgid "Cancelling..."
 msgstr "Ruším..."
 
 #: mail/mail-send-recv.c:233
@@ -6482,11 +6957,11 @@ msgid "Receiving"
 msgstr "Príjímam"
 
 #: mail/mail-send-recv.c:285
-msgid "Updating ..."
-msgstr "Aktualizujem..."
+msgid "Updating..."
+msgstr "Obnovujem..."
 
 #: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+msgid "Waiting..."
 msgstr "Čakám..."
 
 #: mail/mail-send-recv.c:306
@@ -6497,34 +6972,38 @@ msgstr "Posielam"
 msgid "Cancelled."
 msgstr "Zrušené."
 
-#: mail/mail-summary.c:109
+#: mail/mail-summary.c:110
 msgid "Incomplete message written on pipe!"
 msgstr "Do rúry zapísaná neúplná správa!"
 
-#: mail/mail-tools.c:141
+#: mail/mail-summary.c:468
+msgid "Mail Summary"
+msgstr "Súhrn pošty"
+
+#: mail/mail-tools.c:145
 #, 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:188
+#: mail/mail-tools.c:192
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (predaná správa)"
 
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:202
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (žiadny predmet)"
 
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:219
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predaná správa - %s"
 
-#: mail/mail-tools.c:217
+#: mail/mail-tools.c:221
 msgid "Forwarded message (no subject)"
 msgstr "Predaná správa (bez predmetu)"
 
-#: mail/mail-tools.c:414
+#: mail/mail-tools.c:428
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6537,121 +7016,152 @@ msgstr ""
 msgid "VFolders"
 msgstr "VPriečinky"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:438
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:60
+#: mail/message-browser.c:188 ui/evolution-mail.xml.h:68
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:66
+#: mail/message-browser.c:188 ui/evolution-mail.xml.h:74
 msgid "Reply to the sender of this message"
 msgstr "Odpovedať odosielateľovi tejto správy"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:64
+#: mail/message-browser.c:191 ui/evolution-mail.xml.h:69
+msgid "Reply to All"
+msgstr "Odpovedať všetkým"
+
+#: mail/message-browser.c:191 ui/evolution-mail.xml.h:72
 msgid "Reply to all recipients of this message"
 msgstr "Odpovedať všetkým adresátom tento správy"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:29
+#: mail/message-browser.c:194 ui/evolution-mail.xml.h:25
+msgid "Forward"
+msgstr "Poslať ďalej"
+
+#: mail/message-browser.c:194 ui/evolution-mail.xml.h:32
 msgid "Forward this message"
 msgstr "Predať túto správu ďalej"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:57
+#: mail/message-browser.c:199 ui/evolution-mail.xml.h:65
 msgid "Print the selected message"
 msgstr "Tlačiť vybranú správu"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:202 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Odstrániť túto správu"
 
-#: mail/message-list.c:648
+#: mail/message-browser.c:207 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr "Predchádzajúca"
+
+#: mail/message-browser.c:207
+msgid "Previous message"
+msgstr "Predchádzajúca správa"
+
+#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:54
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr "Nasl"
+
+#: mail/message-browser.c:210
+msgid "Next message"
+msgstr "Nasledujúca správa"
+
+#: mail/message-list.c:677
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:678
 msgid "Seen"
 msgstr "Videné"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:679
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:680
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:681
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:685
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: mail/message-list.c:657
+#: mail/message-list.c:686
 msgid "Lower"
 msgstr "Nižšia"
 
-#: mail/message-list.c:661
+#: mail/message-list.c:690
 msgid "Higher"
 msgstr "Vyššia"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:691
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:941
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:948
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:957
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:969
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:977
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:979
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1052
+#: mail/message-list.c:1081
 msgid "Flagged"
 msgstr "Vyznačené"
 
-#: mail/message-list.c:1053
+#: mail/message-list.c:1082
 msgid "From"
 msgstr "Od"
 
-#: mail/message-list.c:1053
+#: mail/message-list.c:1082
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/message-list.c:1053
+#: mail/message-list.c:1082
 msgid "Received"
 msgstr "Prijaté"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:1083
 msgid "To"
 msgstr "Komu"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:1083
 msgid "Size"
 msgstr "Veľkosť"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/mail-session.c:161
+msgid "User canceled operation."
+msgstr "Používateľ zrušil operáciu."
+
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
 msgid "Folder"
 msgstr "Priečinok"
 
@@ -6683,138 +7193,6 @@ msgstr "Odhlasujem sa z priečinku \"%s\""
 msgid "Manage Subscriptions"
 msgstr "Správa prihlásení"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Meno priečinku:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Typ priečinku:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Zadajte, kde vytvoriť priečinok"
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Vyberte súbor, ktorý chcete importovať do Evolution a jeho typ\n"
-"zo zoznamu.\n"
-"\n"
-"Použijte \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
-"ho pokúsi určiť."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importujem %s\n"
-"Importér nie je pripravený.\n"
-"Čakám 5 sekúnd a skúsim to znovu."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importujem %s\n"
-"Importujem položku %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Pre spracovanie\n"
-"%s\n"
-"nie je k dispozícii importér."
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importujem"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importujem %s\n"
-"Začínam %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Chyba pri štarte %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Chyba pri načítavaní %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importujem %s\n"
-"Importujem položku 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automaticky"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Meno súboru:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Vyberte súbor"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Typ súboru:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Import"
-
-#: 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."
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Nástroj Evolution pre import"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Nástroj Evolution pre import"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Vitajte v Nástroji Evolution pre import.\n"
-"Tento sprievodca vám pomôže importovať\n"
-"externé súbory do Evolution."
-
 #: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Inštalácia Evolution"
@@ -6889,6 +7267,20 @@ msgstr ""
 "to priečinok Evolution. Prosím, presuňte ho,\n"
 "aby mohli byť nainštalované súbory Evolution."
 
+#: shell/e-shell.c:388
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
+
+#: shell/e-shell.c:1268
+#, 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-creation-dialog.c:99
 #, c-format
 msgid ""
@@ -6922,6 +7314,122 @@ msgstr "Nová..."
 msgid "(Untitled)"
 msgstr "(Bez mena)"
 
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Vyberte súbor, ktorý chcete importovať do Evolution a jeho typ\n"
+"zo zoznamu.\n"
+"\n"
+"Použijte \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
+"ho pokúsi určiť."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importujem %s\n"
+"Importér nie je pripravený.\n"
+"Čakám 5 sekúnd a skúsim to znovu."
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importujem %s\n"
+"Importujem položku %d."
+
+#: shell/e-shell-importer.c:353
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Pre spracovanie\n"
+"%s\n"
+"nie je k dispozícii importér."
+
+#: shell/e-shell-importer.c:363
+msgid "Importing"
+msgstr "Importujem"
+
+#: shell/e-shell-importer.c:371
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importujem %s\n"
+"Začínam %s"
+
+#: shell/e-shell-importer.c:384
+#, c-format
+msgid "Error starting %s"
+msgstr "Chyba pri štarte %s"
+
+#: shell/e-shell-importer.c:404
+#, c-format
+msgid "Error loading %s"
+msgstr "Chyba pri načítavaní %s"
+
+#: shell/e-shell-importer.c:419
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importujem %s\n"
+"Importujem položku 1."
+
+#: shell/e-shell-importer.c:490
+msgid "Automatic"
+msgstr "Automaticky"
+
+#: shell/e-shell-importer.c:540
+msgid "Filename:"
+msgstr "Meno súboru:"
+
+#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Vyberte súbor"
+
+#: shell/e-shell-importer.c:555
+msgid "File type:"
+msgstr "Typ súboru:"
+
+#: shell/e-shell-importer.c:601
+msgid "Select folder"
+msgstr "Vybrať priečinok"
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr "Zatváram spojenia..."
+
+#: shell/e-shell-view.c:149
+msgid "(No folder displayed)"
+msgstr "(Nezobrazený žiadny priečinok)"
+
+#: shell/e-shell-view.c:1204
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1206
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
 #: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Nástroj pre oznamovanie chýb nebol nájdený v $PATH."
@@ -6948,33 +7456,17 @@ msgstr ""
 msgid "Go to folder..."
 msgstr "Prejsť na priečinku..."
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(Nezobrazený žiadny priečinok)"
-
-#: shell/e-shell-view.c:1134
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+#: shell/e-shell-view-menu.c:562
+msgid "Work online"
+msgstr "Pracovať on-line"
 
-#: shell/e-shell-view.c:1136
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:378
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
+#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
+msgid "Work offline"
+msgstr "Pracovať off-line"
 
-#: shell/e-shell.c:1248
-#, 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.c:381
+msgid "Error saving shortcuts."
+msgstr "Chyba pri ukladaní skratiek."
 
 #: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
@@ -7049,20 +7541,6 @@ msgstr "Použiť túto skratku"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrániť túto skratku z panelu skratiek"
 
-#: shell/e-shortcuts.c:379
-msgid "Error saving shortcuts."
-msgstr "Chyba pri ukladaní skratiek."
-
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
-msgstr "_Pohľad"
-
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Zobraziť vybraný priečinok"
-
 #: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Bez mena)"
@@ -7111,11 +7589,49 @@ msgstr "Operácia nepodporovaná"
 msgid "The specified type is not supported in this storage"
 msgstr "Uvedený typ nie je podporovaný týmto skladom"
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Meno priečinku:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Typ priečinku:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "Zadajte, kde vytvoriť priečinok"
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
-#: shell/main.c:83
+#: 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."
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Nástroj Evolution pre import"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Nástroj Evolution pre import"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"Vitajte v Nástroji Evolution pre import.\n"
+"Tento sprievodca vám pomôže importovať\n"
+"externé súbory do Evolution."
+
+#: shell/importer/intelligent.c:186
+msgid "Importers"
+msgstr "Importy"
+
+#: shell/main.c:82
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7154,7 +7670,7 @@ msgstr ""
 "Dúfame, že vás potešia výsledky našej ťažkej práce a netrpezlivo\n"
 "čakáme na váš príspevok!\n"
 
-#: shell/main.c:108
+#: shell/main.c:107
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7162,19 +7678,19 @@ msgstr ""
 "Vďaka\n"
 "Tím Evolution\n"
 
-#: shell/main.c:139
+#: shell/main.c:138
 msgid "Cannot initialize the Evolution shell."
 msgstr "Nie je možné inicializovať shell Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:184
 msgid "Disable splash screen"
 msgstr "Zakázať úvodné okno"
 
-#: shell/main.c:186
+#: shell/main.c:185
 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:219
+#: shell/main.c:217
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je možné inicializovať komponentový systém Bonobo."
 
@@ -7198,7 +7714,7 @@ msgstr "Nájsť kontakt"
 msgid "New contact"
 msgstr "Nový kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:57
 msgid "Previews the message to be printed"
 msgstr "Ukážka správy pred tlačou"
 
@@ -7206,7 +7722,7 @@ msgstr "Ukážka správy pred tlačou"
 msgid "Print contacts"
 msgstr "Tlačiť kontakty"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:88
 msgid "Stop"
 msgstr "Zastaviť"
 
@@ -7240,8 +7756,8 @@ msgid "_Search for contacts"
 msgstr "_Hľadať kontakty"
 
 #: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:118
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:45
 msgid "_Tools"
 msgstr "_Nástroje"
 
@@ -7305,11 +7821,6 @@ msgstr "Mesiac"
 msgid "New _Event"
 msgstr "Nová _udalosť"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Nasl"
-
 #: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "Otvoriť kalendár"
@@ -7354,8 +7865,8 @@ msgstr "Zobraziť jeden týždeň"
 msgid "Show the working week"
 msgstr "Zobraziť pracovný týždeň"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
+#: widgets/misc/e-dateedit.c:424
 msgid "Today"
 msgstr "Dnes"
 
@@ -7380,7 +7891,7 @@ msgid "_Month"
 msgstr "_Mesiac"
 
 #: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Nový"
 
@@ -7388,11 +7899,6 @@ msgstr "_Nový"
 msgid "_Open Calendar"
 msgstr "_Otvoriť kalendár"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:108
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Uložiť _ako..."
-
 #: ui/evolution-calendar.xml.h:45
 msgid "_Week"
 msgstr "_Týždeň"
@@ -7419,7 +7925,7 @@ msgid "Print this item"
 msgstr "Tlačiť túto položku"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:66 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Tlačiť..."
 
@@ -7451,13 +7957,13 @@ 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:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:33
 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:51
+#: ui/evolution-message-composer.xml.h:50
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Uložiť"
@@ -7579,10 +8085,6 @@ msgstr "Vloží obsah schránky"
 msgid "Pre_vious"
 msgstr "_Predchádzajúca"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Predchádzajúca"
-
 #: 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"
@@ -7596,7 +8098,7 @@ msgid "Print Setup"
 msgstr "Nastavenie tlačiarne"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
 msgid "Save"
 msgstr "Uložiť"
 
@@ -7617,7 +8119,7 @@ msgstr "Naplánovať _stretnutie"
 msgid "Schedule some sort of a meeting"
 msgstr "Naplánovať niečo ako stretnutie"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:78
 #: ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Vybrať všetko"
@@ -7634,18 +8136,17 @@ msgstr "Nastaví stránku pre aktuálnu tlačiareň"
 msgid "Task _Request (FIXME)"
 msgstr "_Požiadavka na úlohu"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_O programe..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:30
 msgid "_Close"
 msgstr "_Zavrieť"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:31
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
@@ -7653,13 +8154,13 @@ msgstr "_Kontakt"
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Ladiť"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:37
 msgid "_Help"
 msgstr "_Pomocník"
 
@@ -7691,12 +8192,7 @@ msgstr "_Poznámka"
 msgid "_Paste"
 msgstr "_Vložiť"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Tlačiť"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:111
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
@@ -7706,7 +8202,7 @@ msgid "_Select All"
 msgstr "Vybrať _všetko"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
 msgid "_Task (FIXME)"
 msgstr "Ú_loha"
 
@@ -7714,6 +8210,11 @@ msgstr "Ú_loha"
 msgid "_Unread Item (FIXME)"
 msgstr "_Neprečítaná položka"
 
+#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:52
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:46
+msgid "_View"
+msgstr "_Pohľad"
+
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Add Service"
 msgstr "Nová služba"
@@ -7818,147 +8319,167 @@ msgstr "Zabudnúť _heslá"
 msgid "Forward As"
 msgstr "Poslať ďalej ako"
 
+#: ui/evolution-mail.xml.h:27
+msgid "Forward attached"
+msgstr "Predať ďalej ako prílohu"
+
 #: ui/evolution-mail.xml.h:28
+msgid "Forward inline"
+msgstr "Predať ďalej v tele"
+
+#: ui/evolution-mail.xml.h:29
+msgid "Forward quoted"
+msgstr "Poslať ďalej citované"
+
+#: ui/evolution-mail.xml.h:30
 msgid "Forward the selected mail to someone"
 msgstr "Predá niekomu vybranú správu"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:31
+msgid "Forward the selected mail to someone as an attachment"
+msgstr "Predá vybranú správu niekomu ako prílohu"
+
+#: ui/evolution-mail.xml.h:33
 msgid "Forward this message in-line with your mail, so you can edit it"
 msgstr "Predá túto správu vloženú do vašej správy, takže ju môžete upraviť"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:34
+msgid "Forward this 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:35
 msgid "Full _Headers"
 msgstr "Ú_plné hlavičky"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:36
+msgid "Go to the next message"
+msgstr "Prejsť na nasledujúcu položku"
+
+#: ui/evolution-mail.xml.h:37
+msgid "Go to the previous message"
+msgstr "Prejsť na predchádzajúcu položku"
+
+#: ui/evolution-mail.xml.h:38
 msgid "Hide Deleted Messages"
 msgstr "Skryť zmazané správy"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:39
 msgid "Hide S_elected Messages"
 msgstr "Skryť _vybrané správy"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:40
 msgid "Hide _Deleted Messages"
 msgstr "Skryť _odstránené správy"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:41
 msgid "Hide _Read messages"
 msgstr "Skryť _prečítané správy"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:42
 msgid "Invert Selection"
 msgstr "Obrátiť výber"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:43
 msgid "Manage _Subscriptions..."
 msgstr "Správa _prihlásení..."
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mar_k as Read"
-msgstr "Označiť ako _prečítanú"
-
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
 msgid "Mark All as R_ead"
 msgstr "Označiť _všetky ako prečítané"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:46
 msgid "Mark As Read"
 msgstr "Označiť ako prečítanú"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:47
 msgid "Mark As U_nread"
 msgstr "Označiť ako _neprečítanú"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark as U_nread"
-msgstr "Označiť ako _neprečítanú"
-
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:49
 msgid "Mark the selected messages as having been read"
 msgstr "Označí vybrané správy ako už prečítané"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:50
 msgid "Mark the selected messages as not having been read"
 msgstr "Označí vybrané správy ako neprečítané"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:51
 msgid "Move"
 msgstr "Presunúť"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:52
 msgid "Move message to a new folder"
 msgstr "Presunúť správu do nového priečinka"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:53
 msgid "Move selected messages to another folder"
 msgstr "Presunúť vybrané správy do iného priečinku"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:55
 msgid "Open in New Window"
 msgstr "Otvoriť v novom okne"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:56
 msgid "Open the current message in a new window"
 msgstr "Otvorí aktuálnu správu v novom okne"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:62
 msgid "Print Preview of message..."
 msgstr "Ukážka správy pred tlačou..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:63
 msgid "Print message to the printer"
 msgstr "Tlačiť správu na tlačiarni"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:64
 msgid "Print message..."
 msgstr "Tlačiť správu..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:67
 msgid "Redirect (FIXME: implement me)"
 msgstr "Presmerovať"
 
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to _All"
-msgstr "Odpovedať _všetkým"
-
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:71
 msgid "Reply to all"
 msgstr "Odpovedať všetkým"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:73
 msgid "Reply to sender"
 msgstr "Odpovedať odosielateľovi"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:75
+msgid "S_earch Message"
+msgstr "_Nájsť správu"
+
+#: ui/evolution-mail.xml.h:76
 msgid "S_ource"
 msgstr "_Zdroj"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:77
 msgid "Save the message into a new file"
 msgstr "Uložiť správu do nového súboru"
 
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:79 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Vybrať _všetko"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:80
 msgid "Select _Thread"
 msgstr "Vybrať _vlákno"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:81
 msgid "Send / Receive"
 msgstr "Príjem / odoslanie"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:82
 msgid "Send a reply to the person who sent you this mail"
 msgstr "Pošle odpoveď osobe, ktorá vám túto správu poslala"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:83
 msgid "Send a single mail in reply to all the selected mail"
 msgstr "Pošle jednu odpoveď na všetky vybrané správy"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:84
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -7966,130 +8487,90 @@ msgstr ""
 "Poslať neodoslanú poštu\n"
 " a prijať novú poštu"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:86
 msgid "Send queued mail and retrieve new mail"
 msgstr "Poslať neodoslanú poštu a prijať novú poštu"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail.xml.h:87
 msgid "Show _All"
 msgstr "Zobraziť _všetko"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail.xml.h:89
 msgid "Threaded Message list"
 msgstr "Zoznam vlákien"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail.xml.h:90
 msgid "Un-delete the selected messages"
 msgstr "Obnoviť vybrané správy"
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on Mailing _List"
-msgstr "VPriečinok na _konferenciu"
-
-#: ui/evolution-mail.xml.h:84
-msgid "VFolder on Se_nder"
-msgstr "Vpriečinok na _odosielateľa"
-
-#: ui/evolution-mail.xml.h:85
-msgid "VFolder on _Recipients"
-msgstr "Vpriečinok na _adresátov"
-
-#: ui/evolution-mail.xml.h:86
-msgid "VFolder on _Subject"
-msgstr "Vpriečinok na _predmet"
+#: ui/evolution-mail.xml.h:91
+msgid "Undelete"
+msgstr "Obnoviť zmazaný záznam"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail.xml.h:96
 msgid "View Raw Message Source"
 msgstr "Zobraziť čistý kód správy"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail.xml.h:97
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor virtuálneho priečinku..."
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail.xml.h:98
 msgid "_Apply Filters"
 msgstr "_Použiť filtre"
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Attachment"
-msgstr "_Príloha"
-
-#: ui/evolution-mail.xml.h:91
-msgid "_Copy to Folder..."
-msgstr "_Kopírovať do priečinku..."
-
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail.xml.h:100
 msgid "_Create Filter From Message"
 msgstr "Vytvoriť _filter zo správy"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:102
 msgid "_Expunge"
 msgstr "_Vyčistiť"
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail.xml.h:103
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:104 ui/evolution.xml.h:34
 msgid "_Folder"
 msgstr "_Priečinok"
 
-#: ui/evolution-mail.xml.h:97
-msgid "_Forward"
-msgstr "Poslať ď_alej"
-
-#: ui/evolution-mail.xml.h:98
-msgid "_Inline"
-msgstr "_V texte"
-
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:106 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrátiť výber"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:107
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail.xml.h:108
 msgid "_Mail Settings..."
 msgstr "Nastavenie _pošty..."
 
-#: ui/evolution-mail.xml.h:102
-msgid "_Move to Folder..."
-msgstr "Pre_sunúť do priečinka..."
-
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail.xml.h:110
 msgid "_Open Selected Items"
 msgstr "_Otvoriť vybrané položky"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Quoted"
-msgstr "_Citovať"
-
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail.xml.h:112
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail.xml.h:113
 msgid "_Resend Messages"
 msgstr "_Znovu poslať správy"
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail.xml.h:115
 msgid "_Save Message As..."
 msgstr "Uložiť správu _ako..."
 
-#: ui/evolution-mail.xml.h:110
+#: ui/evolution-mail.xml.h:116
 msgid "_Send / Receive"
 msgstr "_Poslať / Prijať"
 
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail.xml.h:117
 msgid "_Threaded"
 msgstr "_Vlákna"
 
-#: ui/evolution-mail.xml.h:113
-msgid "_Undelete"
-msgstr "Obnoviť _zmazané"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priložiť"
@@ -8211,35 +8692,35 @@ msgstr "Prepne, či má byť zobrazené pole pre výber odosielateľa"
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prepne, či má byť zobrazené pole Reply-to"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Bcc Field"
 msgstr "Pole _BCC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Cc Field"
 msgstr "Pole _CC"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:44
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Insert text file... (FIXME)"
 msgstr "Vložiť _textový súbor..."
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "Pole _Reply-To"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "Za_bezpečenie"
 
@@ -8331,7 +8812,7 @@ msgstr "Vrátiť"
 msgid "Undo the last action"
 msgstr "Vráti späť poslednú akciu"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:29
 msgid "_Appointment (FIXME)"
 msgstr "S_chôdzka"
 
@@ -8392,230 +8873,290 @@ msgid "E_xit"
 msgstr "_Koniec"
 
 #: ui/evolution.xml.h:9
+msgid "Evolution _Window"
+msgstr "_Okno Evolution"
+
+#: ui/evolution.xml.h:10
 msgid "Evolution bar _shortcut"
 msgstr "_Skratka pre panel Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:12
 msgid "Getting _Started"
 msgstr "_Začíname"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:13
 msgid "Import an external file format"
 msgstr "Importuje externý súbor"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:14
 msgid "Main toolbar"
 msgstr "Hlavný panel nástrojov"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:15
 msgid "Show information about Evolution"
 msgstr "Zobrazí informáciu o Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 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:18
+#: ui/evolution.xml.h:19
+msgid "Toggle"
+msgstr "Prepnúť"
+
+#: ui/evolution.xml.h:20
 msgid "Toggle whether to show the folder bar"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prepne, či sa má zobrazovať panel skratiek"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
+msgid "Toggle whether we are working offline."
+msgstr "Prepne, či pracujete on alebo off-line."
+
+#: ui/evolution.xml.h:23
 msgid "Using the C_ontact Manager"
 msgstr "Pomocou Správcu  ko_ntaktov"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:24
 msgid "Using the _Calendar"
 msgstr "Pomocou _Kalendára"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Using the _Mailer"
 msgstr "Pomocou _Pošty "
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:27
 msgid "_About Evolution..."
 msgstr "O _Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:28
 msgid "_Actions"
 msgstr "A_kcie"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "_Folder Bar"
 msgstr "Pru_h priečinkov"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "_Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
 msgid "_Import file..."
 msgstr "_Importovať súbor..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
 msgid "_Mail message"
 msgstr "_Poslať správu"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:42
 msgid "_New Folder"
 msgstr "Nový _priečinok"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#: ui/evolution.xml.h:47
+msgid "_Work Offline"
+msgstr "_Pracovať off-line"
+
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr "Karta adresára"
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr "Podľa firmy"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr "Zoznam telefónov"
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr "Podľa odosielateľ"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "Podľa stavu"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "Podľa predmetu"
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr "Správy"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr "S kategóriou"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Predbežný"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Mimo kancelárie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Žiadna informácia"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Pozvať ostatných..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Nastavenie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Zobraziť _iba pracovné hodiny"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Ukázať z_menšené"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Obnoviť voľno/zaneprázdnený"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Autovýber"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Všetky osoby a zdroje"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Všetky _osoby a jeden zdroj"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "_Vyžadované osoby"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Vyžadované osoby a _jeden zdroj"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "_Začiatok stretnutia:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Všetci účastníci"
 
-#: widgets/menus/gal-view-menus.c:177
+#. 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:176
 msgid "_Current View"
 msgstr "_Aktuálny pohľad"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:202
 msgid "Define Views"
 msgstr "Definovať pohľady"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:422
 msgid "MTWTFSS"
 msgstr "PUSŠPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
 msgid "Now"
 msgstr "Teraz"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:245
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:726
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Čas musí byť vo formáte: %s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:239
 msgid "Advanced Search"
 msgstr "Pokročilé hľadanie"
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Uložiť ako..."
+
+#: 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
+msgid "Advanced..."
 msgstr "Pokročilé..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -8639,42 +9180,10 @@ msgstr "Správa"
 msgid "Don't show this message again."
 msgstr "Túto správu už nezobrazovať."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "_Nájsť"
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
-msgstr "Karta adresára"
-
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Podľa firmy"
-
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr "Zoznam telefónov"
-
-#: views/mail/galview.xml.h:1
-msgid "By Sender"
-msgstr "Podľa odosielateľ"
-
-#: views/mail/galview.xml.h:2
-msgid "By Status"
-msgstr "Podľa stavu"
-
-#: views/mail/galview.xml.h:3
-msgid "By Subject"
-msgstr "Podľa predmetu"
-
-#: views/mail/galview.xml.h:4
-msgid "Messages"
-msgstr "Správy"
-
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr "S kategóriou"
-
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Osobný adresárový server"