Added Azeri language file

fixed various po files
fixed a no-c-format tag

svn path=/trunk/; revision=8733

1 files changed, 1861 insertions, 1227 deletions

diff --git a/po/sk.po b/po/sk.po
index 03aef2b9b5..8afea49ccf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,11 +1,10 @@
 # evolution Slovak translation.
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001.
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-03-02 16:28+0100\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2001-03-02 16:42CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -313,131 +312,13 @@ msgstr "Importuje súbory GnomeCard do Evolution"
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Zakázané"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronizovať"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopírovať z Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopírovať do Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Spojiť z Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Spojiť do Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Pôvodný autor:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Spojka pre adresár Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation a Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfiguračný nástroj pre spojku adresára Evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Akcia Synchronizovať"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Stav spojky"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nie je nastavený žiadny pilot, prosím,\n"
-"najprv použite 'Vlastnosti spojenia Pilota'."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Nespojený s démonom gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Nastala chyba pri pokuse o získanie\n"
-"zoznamu pilotov od démona gnome-pilot"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Kurzor nie je možné načítať\n"
@@ -467,7 +348,7 @@ msgstr "Nie je možné prečítať blok aplikácie Adresa z pilota"
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Add"
 msgstr "Pridať"
 
@@ -508,7 +389,7 @@ msgstr "Uložiť ako:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Všeobecné"
 
@@ -525,7 +406,7 @@ msgid "Phone Types"
 msgstr "Typy telefónov"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Primárny e-mail"
 
@@ -538,6 +419,7 @@ msgid "Web page address:"
 msgstr "Adresa WWW stránky:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
 msgid "_Add"
 msgstr "_Pridať"
 
@@ -562,8 +444,8 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Odstrániť"
 
@@ -615,113 +497,132 @@ msgstr "_Toto je e-mailová adresa"
 msgid "Delete Contact?"
 msgstr "Odstrániť kontakt?"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrí do týchto kategórií:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1188
+#: addressbook/contact-editor/e-contact-editor.c:1229
 #: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1189
-#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
 #: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Práca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1190
+#: addressbook/contact-editor/e-contact-editor.c:1231
 #: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Práca 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1191
+#: addressbook/contact-editor/e-contact-editor.c:1232
 #: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Pracovný fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1192
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Spätné volanie"
 
-#: addressbook/contact-editor/e-contact-editor.c:1193
+#: addressbook/contact-editor/e-contact-editor.c:1234
 #: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1194
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1195
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
 #: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/contact-editor/e-contact-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:1237
 #: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Domov 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:1238
 #: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Domáci fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1198
+#: addressbook/contact-editor/e-contact-editor.c:1239
 #: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:1240
 #: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1200
-#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
 #: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Iné"
 
-#: addressbook/contact-editor/e-contact-editor.c:1201
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Ďalší fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:1243
 #: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Primárny"
 
-#: addressbook/contact-editor/e-contact-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Rádio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1205
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1206
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1272
 #: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/contact-editor/e-contact-editor.c:1273
 #: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "E-mail 3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Upraviť filtre"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Celé meno:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "E-mail"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresa _2:"
@@ -917,9 +818,9 @@ msgid "None (anonymous mode)"
 msgstr "Žiadny (anonymný mód)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Heslo"
 
@@ -960,7 +861,7 @@ msgid "Remember this password"
 msgstr "Uložiť toto heslo"
 
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Hostiteľ:"
 
@@ -989,12 +890,12 @@ msgid "Search Scope:"
 msgstr "Oblasť hľadania:"
 
 #: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Overenie:"
 
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Cesta:"
 
@@ -1021,7 +922,7 @@ msgid ""
 msgstr "Vyberte typ adresára, ktorý máte, a zadajte požadované informácie."
 
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Meno:"
 
@@ -1046,16 +947,16 @@ msgstr "Zdroje adresára"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: 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:19 mail/folder-browser.c:535
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:7 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/folder-browser.c:521 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:22
 msgid "Edit"
 msgstr "Upraviť"
 
@@ -1068,31 +969,47 @@ msgstr "Meno"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Iné kontakty"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
+#, fuzzy
+msgid "A Bonobo control for displaying an address."
 msgstr "Ukážkový ovládací prvok Bonobo, ktorý zobrazuje adresár."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Ukážkový ovládací prvok Bonobo, ktorý zobrazuje adresár."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Ovládací prvok pre zobrazenie minikariet adresára Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Prehliadač minikariet adresára Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution pre prácu s kontaktami."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Vytváracie rozhranie pre ovládací prvok minikariet adresára."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Vytváracie rozhranie pre rozhranie pre výber mena adresára."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Evolution addressbook component."
 msgstr "Vytváracie rozhranie pre komponent adresára Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the sample Addressbook control"
 msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Adresár"
 
@@ -1104,6 +1021,21 @@ msgstr "Rozhranie pre výber mena adresára Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Vytváracie rozhranie pre rozhranie pre výber mena adresára."
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+msgid "Remove"
+msgstr "Odstrániť"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Odstrániť"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Nájsť..."
@@ -1311,6 +1243,11 @@ msgstr ""
 "\n"
 "Dvojitým kliknutím vytvoríte nový kontakt."
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#, fuzzy
+msgid "Card View"
+msgstr "Karta: "
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 bd. Tahoma"
@@ -1468,7 +1405,7 @@ msgstr "Meno štýlu:"
 msgid "Top:"
 msgstr "Vrchný:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Typ:"
 
@@ -1476,18 +1413,6 @@ msgstr "Typ:"
 msgid "Width:"
 msgstr "Šírka:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Spojka kalendára Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Nástroj pre nastavenie spojky pre kalendár Evolution.\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1498,33 +1423,11 @@ msgstr "Chyba pri komunikácii s kalendárovým serverom"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je možné prečítať blok aplikácie Calendar pilota"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Spojka ToDo pre Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Nástroj pre nastavenie spojky pre todo Evolution.\n"
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 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.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Pripomenúť schôdzku o "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Opakovať"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
 #: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "Súbor nenájdený"
@@ -1537,74 +1440,114 @@ msgstr "Otvoriť kalendár"
 msgid "Save calendar"
 msgstr "Uložiť kalendár"
 
-#: calendar/gui/calendar-commands.c:444
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:451
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie je možné vytvoriť kalendárový pohľad. Prosím, overte nastavenie ORBit a "
 "OAF."
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "Verejný"
 
-#: calendar/gui/calendar-model.c:379
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Súkromný"
 
-#: calendar/gui/calendar-model.c:382
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Tajný"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1590 calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:547
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Vysoká"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normálny"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Nízka"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Priesvitný"
 
-#: calendar/gui/calendar-model.c:550
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Nepriehľadný"
 
-#: calendar/gui/calendar-model.c:776
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Nezačal"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "Prebieha"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "Dokončený"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
+msgstr "Zrušený"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1615,36 +1558,24 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Žiadna"
 
-#: calendar/gui/calendar-model.c:1025
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1654,32 +1585,38 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1013
 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:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Priorita musí byť medzi 1 až 9"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normálny"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr "Nedefinovaný"
+
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1550
+#: calendar/gui/calendar-model.c:1598
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1552
+#: calendar/gui/calendar-model.c:1600
 msgid "Assigned"
 msgstr "Priradené"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "Yes"
 msgstr "Áno"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "No"
 msgstr "Nie"
 
@@ -1719,6 +1656,41 @@ 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 ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the alarm notification service"
+msgstr "Vytváracie rozhranie pre editor správ Evolution."
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "Nie je možné inicializovať GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
+
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Poplach o %A %b %d %Y %H:%M"
@@ -1787,7 +1759,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Pípnuť pri zobrazení okna alarmu."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "Kalendár"
 
@@ -1816,7 +1788,7 @@ msgid "Display options"
 msgstr "Možnosti zobrazenia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Due Date"
 msgstr "Termín"
 
@@ -1883,8 +1855,7 @@ msgid "Pick a color"
 msgstr "Vyberte farbu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Priorita"
 
@@ -2027,45 +1998,22 @@ msgstr "Chcete uložiť zmeny?"
 msgid "% Comp_lete:"
 msgstr "% _Hotových:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Zrušený"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Klasifikácia"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Dokončený"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date &amp; Time"
+#, fuzzy
+msgid "Date & Time"
 msgstr "Dátum a čas"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Date Completed:"
 msgstr "Dátum dokončenia:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Vysoká"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "Prebieha"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Nízka"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Nezačal"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Pri_vate"
@@ -2097,10 +2045,6 @@ msgstr "Úloha"
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Nedefinovaný"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Confidential"
@@ -2146,72 +2090,128 @@ msgstr "Úloha - %s"
 msgid "Journal entry - %s"
 msgstr "Položka denníku - %s"
 
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr "Kategórie"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr "Dátum dokončenia"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr "Dátum konca"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr "Dátum štartu"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr "Geografické umiestnenie"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Percent complete"
 msgstr "Hotových percent"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "Súhrn"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr "Priesvitnosť"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:169
 msgid "Click here to add a task"
 msgstr "Kliknutím pridáte úlohu"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Označiť ako dokončenú"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Označí úlohu ako dokončenú"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:556
 msgid "Edit this task..."
 msgstr "Upraviť túto úlohu..."
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit the task"
 msgstr "Upraviť úlohu"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:559
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Odstrániť túto úlohu"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "Odstrániť úlohu"
 
@@ -2222,68 +2222,72 @@ msgstr "%02i rozdelení minúty"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: calendar/gui/e-week-view-main-item.c:330
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: calendar/gui/e-week-view-main-item.c:344
 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:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "popoludní"
 
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
 msgstr "Nová schôdzka..."
 
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Naplánovať stretnutie"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Upraviť túto schôdzku..."
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Otvoriť"
 
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "Odstrániť túto schôdzku"
 
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr "Naplánovať stretnutie"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
 msgstr "Nastaviť túto schôdzku ako presunuteľnú"
 
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
 msgstr "Odstrániť tento výskyt"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
 msgstr "Odstrániť všetky výskyty"
 
 #: calendar/gui/e-itip-control.c:153
@@ -2380,8 +2384,7 @@ msgstr "Načítavam kalendár..."
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Odosielateľ"
 
@@ -2473,26 +2476,26 @@ msgstr ""
 "Naplánovať\n"
 "čas"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Stav"
 
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr "Všetky"
 
-#: calendar/gui/e-tasks.c:150
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr "Kategória:"
 
-#: calendar/gui/e-tasks.c:288
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa načítať úlohy v `%s'"
 
-#: calendar/gui/e-tasks.c:300
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
@@ -2504,6 +2507,11 @@ msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
 msgid "%d %B"
 msgstr "%d %B"
 
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Odstrániť všetky výskyty"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "_Celodenná udalosť"
@@ -2567,7 +2575,7 @@ msgstr "Spustiť program"
 msgid "Send an email"
 msgstr "Poslať e-mail"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
 msgid "Settings..."
 msgstr "Nastavenie..."
 
@@ -2592,14 +2600,12 @@ msgstr "Čas _začiatku:"
 msgid "_Starting date:"
 msgstr "Dátum _začiatku:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "pred"
 
@@ -2624,34 +2630,26 @@ msgid "hour(s)"
 msgstr "hodín"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "minút"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "mesiaca/ov"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "začiatok schôdzky"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "pokým"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "týždňov"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "rokov"
 
@@ -2744,8 +2742,8 @@ msgstr " pred koncom schôdzky"
 msgid " after end of appointment"
 msgstr " po konci schôdzky"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -2781,12 +2779,12 @@ 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:694
+#: calendar/gui/gnome-cal.c:695
 #, 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:705
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
@@ -2847,199 +2845,197 @@ msgstr "Október"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Nie je možné inicializovať GNOME"
-
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "St"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "Št"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "Pi"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:943
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "Úlohy"
 
 #. Day
-#: calendar/gui/print.c:1073
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "Dnes (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1088
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1099
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Tento týždeň (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "Tento mesiac (%b - %Y)"
 
 #. Year
-#: calendar/gui/print.c:1114
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Tento rok (%Y)"
 
-#: calendar/gui/print.c:1151
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Tlačiť kalendár"
 
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1237
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
@@ -3047,6 +3043,34 @@ msgstr "Ukážka pred tlačou"
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktoré bude zobrazovať priečinok úloh"
 
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "NPUSŠPS"
@@ -3066,7 +3090,7 @@ msgstr "Chyba pri vykonávaní filtra: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3075,7 +3099,7 @@ msgstr ""
 "Nie je možné spracovať hľadací výraz: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3084,16 +3108,16 @@ msgstr ""
 "Chyba pri vykonávaní hľadacieho výrazu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr "(odpovedá všetkému) vyžaduje jeden pravdivostný výsledok"
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonanie otázky na neznámej hlavičke: %s"
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neplatný typ v body-contains, očakávam reťazec"
 
@@ -3173,51 +3197,51 @@ msgstr "Program movemail zlyhal: %s"
 msgid "(Unknown error)"
 msgstr "(Neznáma chyba)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie je možné načítať %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie je možné načítať %s: V module nie je inicializačný kód."
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s služba pre %s na %s"
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Spojenie zrušené"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(neznámy hostiteľ)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
-#: camel/camel-remote-store.c:543
+#: camel/camel-remote-store.c:453
 msgid "Server unexpectedly disconnected"
 msgstr "Server neočakávane zrušil spojenie"
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:73
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
 msgid "Authentication failed."
 msgstr "Overenie zlyhalo."
 
@@ -3248,9 +3272,7 @@ msgstr ""
 "Neplatná informácia krokovania:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3258,7 +3280,48 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "Táto voľba vás pripojí k serveru pomocou hesla CRAM-MD5, ak ho podporuje server."
+msgstr ""
+"Táto voľba vás pripojí k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
+"server."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Táto voľba vás pripojí k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
+"server."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "Odpoveď serveru skončila príliš skoro."
 
 #: camel/camel-sasl-kerberos4.c:38
 msgid "Kerberos 4"
@@ -3278,10 +3341,23 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:378
+#: camel/providers/imap/camel-imap-store.c:381
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Táto voľba vás pripojí k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
+"server."
+
 #: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3320,12 +3396,12 @@ msgstr "Poskytovateľ pošty pre virtuálny priečinok"
 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:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pre protokol `%s' nie je k dispozícii poskytovateľ"
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3334,6 +3410,13 @@ msgstr ""
 "Nie je možné vytvoriť priečinok %s:\n"
 "%s"
 
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Úloha"
+
 #: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
@@ -3349,6 +3432,11 @@ msgstr "Reťazec URL `%s' obsahuje neplatný protokol"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Číslo portu v URL `%s' nie je číslo"
 
+#: camel/camel-vee-folder.c:960
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Taká správa neexistuje"
+
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -3399,16 +3487,45 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
 
-#: camel/providers/imap/camel-imap-store.c:262
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
+
+#: camel/providers/imap/camel-imap-store.c:263
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
+msgstr ""
+"Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
+
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr ""
+"Nepodarilo sa pripojiť k POP serveru.\n"
+"Požadovaný spôsob overenia nie je podporovaný."
 
-#: camel/providers/imap/camel-imap-store.c:442
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Overenie nie je vyžadované"
+
+#: camel/providers/imap/camel-imap-store.c:454
 #, 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:478
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3419,7 +3536,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:752
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
@@ -3654,7 +3771,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Nie je možné vytvoriť súhrn: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1311
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Synchronizujem priečinok"
 
@@ -3823,7 +3940,22 @@ msgstr ""
 "pošty od rôznych poskytovateľov pošty pomocou WWW a proprietárnymi poštovými "
 "systémami."
 
-#: camel/providers/pop3/camel-pop3-store.c:142
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"Pre spojenie s POP serverami. Protokol POP je možné použiť aj pre získavanie "
+"pošty od rôznych poskytovateľov pošty pomocou WWW a proprietárnymi poštovými "
+"systémami."
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3831,7 +3963,7 @@ msgstr ""
 "Táto voľba vás spojí s POP serverom pomocou hesla preneseného ako čistý "
 "text. To je často jediná možnosť, ktorú POP servery podporujú."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:157
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3841,26 +3973,27 @@ msgstr ""
 "APOP. Nemusí to fungovať pre všetkých používateľov aj keď server tvrdí, že "
 "tento protokol podporuje."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:169
+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:209
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, 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:326
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, 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:373
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, 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:392
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3869,12 +4002,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:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Neznámy)"
 
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3882,7 +4015,7 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Požadovaný spôsob overenia nie je podporovaný."
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3891,13 +4024,13 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3941,15 +4074,15 @@ msgstr "sendmail skončil so stavom %d: pošta neodoslaná."
 msgid "Could not find 'From' address in message"
 msgstr "Nie je možné nájsť v správe adresu 'Od'"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:244
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos pošty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -3957,96 +4090,140 @@ 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:141
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr "Pre doručenie pošty spojením sa so vzdialeným serverom pomocou SMTP.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktická chyba, príkaz neznámy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktická chyba v parametroch alebo argumentoch"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Príkaz neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr "Parameter príkazu neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr "Stav systému alebo odpoveď na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Správa pomocníka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Služba pripravená"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr "Služba zatvára prenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:163
 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:159
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr "Požadovaná poštová akcia v poriadku, dokončená"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:167
 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:163
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Požadovaná poštová akcia nevykonaná, poštová schránka nie je k dispozícii"
+msgstr ""
+"Požadovaná poštová akcia nevykonaná, poštová schránka nie je k dispozícii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:171
 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:167
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr "Požadovaná akcia zrušená: chyba pri spracovaní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:175
 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:171
+#: camel/providers/smtp/camel-smtp-transport.c:177
 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:173
+#: camel/providers/smtp/camel-smtp-transport.c:179
 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:181
 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:177
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Spustiť vstup pošty, končí <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "Prenos zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Nezadané heslo."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+#, fuzzy
+msgid "Authentication mechanism is too weak"
+msgstr "Overenie zlyhalo."
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"Nepodarilo sa pripojiť k POP serveru.\n"
+"Požadovaný spôsob overenia nie je podporovaný."
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Overenie zlyhalo."
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Overenie nie je vyžadované"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, 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:337
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sProsím, zadajte IMAP heslo pre %s@%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Overenie nie je vyžadované"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:468
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
@@ -4054,99 +4231,106 @@ msgstr ""
 "Táto voľba vás pripojí k SMTP serveru bez overenia. To je asi v poriadku pre "
 "väčšinu SMTP serverov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid "This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "Táto voľba vás pripojí k SMTP serveru pomocou overenia CRAM-MD5."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručenie pošty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:538
 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:412
+#: camel/providers/smtp/camel-smtp-transport.c:545
 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:426
+#: camel/providers/smtp/camel-smtp-transport.c:559
 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:520
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, 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:539
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Chyba odpovede HELO: %s: nie je kritická"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Vypršal čas odpovede RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Neplatná odpoveď na overenie od serveru."
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, 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:597
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, 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:622
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, 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:641
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, 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:672
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, 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:691
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, 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:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, 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:743
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, 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:767
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:786
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Chyba odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, 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:828
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Chyba odpovede QUIT: %s: nie je kritická"
@@ -4185,11 +4369,6 @@ msgstr "príloha"
 msgid "Attach a file"
 msgstr "Priložiť súbor"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Odstrániť"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Odstráni vybrané položky zo zoznamu príloh"
@@ -4203,6 +4382,7 @@ msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
 #: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
 msgid "Attachment"
 msgstr "Príloha"
 
@@ -4226,40 +4406,52 @@ msgstr "Typ MIME:"
 msgid "Send as:"
 msgstr "Poslať ako:"
 
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "Kliknutím zobrazíte adresár"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Kliknutím zobrazíte adresár"
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Odpovedať komu:"
 
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Zadajte identitu, pod ktorou chcete túto správu poslať"
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:381
 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:402
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4267,15 +4459,7 @@ msgstr ""
 "Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname "
 "adresátov správy."
 
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Predmet:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Zadajte predmet správy"
-
-#: composer/e-msg-composer.c:512
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4284,25 +4468,26 @@ msgstr ""
 "Nie je možné otvoriť súbor s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:680
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:791 shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:797
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4312,27 +4497,27 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:822
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Súbor neexistuje."
 
-#: composer/e-msg-composer.c:958
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Toto nie je normálny súbor."
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Súbor existuje, ale nedá sa prečítať."
 
-#: composer/e-msg-composer.c:978
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Súbor vyzerá ako dostupný, ale open(2) zlyhala."
 
-#: composer/e-msg-composer.c:1000
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4340,15 +4525,15 @@ msgstr ""
 "Súbor je veľmi veľký (viac ako 100K)\n"
 "Naozaj ho chcete vložiť?"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Nastala chyba počas čítania súboru."
 
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:1580
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "Nie je možné vytvoriť okno editora správ."
 
@@ -4364,6 +4549,71 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie je možné inicializovať editor správ Evolution."
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Shell Evolution."
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Adresa _2:"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Informácie o používateľovi"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+msgid "%H:%M:%S%n"
+msgstr "%H:%M:%S%n"
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %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."
@@ -4642,38 +4892,20 @@ msgstr "teraz"
 msgid "<click here to select a date>"
 msgstr "<kliknutím vyberiete dátum>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "Pridať pravidlo filtra"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Upraviť pravidlo filtra"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "prijatá"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "odoslaná"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Upraviť filtre"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Pravidlá filtra"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Potom"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Pridať akciu"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Odstrániť akciu"
 
@@ -4685,7 +4917,7 @@ msgstr ""
 "Aj, zabudli ste vybrať priečinok.\n"
 "Prosím, vráťte sa a zadajte platný priečinok, kam doručiť poštu."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
@@ -4710,35 +4942,35 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:545
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Meno pravidla: "
 
-#: filter/filter-rule.c:549
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Bez mena"
 
-#: filter/filter-rule.c:565
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Ak"
 
-#: filter/filter-rule.c:582
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Spustiť akcie"
 
-#: filter/filter-rule.c:586
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "ak odpovedajú všetky kritériá"
 
-#: filter/filter-rule.c:591
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "ak odpovedá niektoré kritérium"
 
-#: filter/filter-rule.c:602
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Pridať kritérium"
 
-#: filter/filter-rule.c:608
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Odstrániť kritérium"
 
@@ -4746,8 +4978,8 @@ msgstr "Odstrániť kritérium"
 msgid "Replied to"
 msgstr "Odpovedaná"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Dôležité"
@@ -4756,14 +4988,14 @@ msgstr "Dôležité"
 msgid "Read"
 msgstr "Prečítaná"
 
+#: 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:6
-msgid "Filter Rules"
-msgstr "Pravidlá filtra"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Prijatá"
@@ -4772,343 +5004,326 @@ msgstr "Prijatá"
 msgid "Outgoing"
 msgstr "Odoslaná"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Virtuálne priečinky"
 
 #: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "Uvedený priečinok nebol nájdený"
+
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "Zdroje vpriečinkov"
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Odpovedané"
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Priradiť farbu"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Priradiť skóre"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Príloha"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "obsahuje"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopírovať do priečinku"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dátum prijatia"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dátum odoslania"
 
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Odstránené"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "neobsahuje"
 
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Návrh"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "nekončí na"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "nevyzerá ako"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "nezačína na"
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "končí na"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "Koniec"
+
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "existuje"
+
+#: filter/libfilter-i18n.h:21
 msgid "Expression"
 msgstr "Výraz"
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Vyznačené"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr "Predať ďalej na adresu"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "je"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "je viac než"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "je menej než"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "nie je"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr "Konferencia"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr "Telo správy"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Hlavička správy"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Správa bola prijatá"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Správa bola odoslaná"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Presunúť do priečinku"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "dňa a po"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "dňa a pred"
+
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Adresáti"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr "Regul. výraz"
 
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Videné"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Nastaviť vyznačenie"
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
+#: filter/libfilter-i18n.h:39
 msgid "Set Status"
 msgstr "Nastaviť stav"
 
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "vyzerá ako"
+
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Zdroj"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr "Špeciálna hlavička"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "začína na"
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Predmet"
 
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "obsahuje"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "neobsahuje"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "nekončí na"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "neexistuje"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "nevyzerá ako"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "nezačína na"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "končí na"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "existuje"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "je viac než"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "je menej než"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "nie je"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "odpovedá reg. výrazu"
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "dňa a po"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "dňa a pred"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "vyzerá ako"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "začína na"
-
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "bolo po"
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "bolo pred"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Pridať pravidlo"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Upraviť pravidlo skóre"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Pridať pravidlo vpriečinku"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Upraviť pravidlo vpriečinku"
-
-#: mail/component-factory.c:302
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je možné inicializovať poštový komponent Evolution."
 
-#: mail/component-factory.c:375
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať sklad u shellu"
 
-#: mail/folder-browser.c:218
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Vlastnosti"
+
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: mail/folder-browser.c:219
 msgid "Store search as vFolder"
 msgstr "Uložiť hľadanie ako vPriečinok"
 
-#: mail/folder-browser.c:506
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "Vpriečinok na predmet"
 
-#: mail/folder-browser.c:507
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "Vpriečinok na odosielateľovi"
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "Vpriečinok na adresátoch"
 
-#: mail/folder-browser.c:509 mail/folder-browser.c:627
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filter na predmet"
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filter na odosielateľovi"
 
-#: mail/folder-browser.c:513
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filter na adresátoch"
 
-#: mail/folder-browser.c:514 mail/folder-browser.c:626
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:520 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Otvoriť"
-
-#: mail/folder-browser.c:522
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: mail/folder-browser.c:523 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Tlačiť"
 
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Odpovedať odosielateľovi"
 
-#: mail/folder-browser.c:526 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Odpovedať všetkým"
 
-#: mail/folder-browser.c:527 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: mail/folder-browser.c:528 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Predať ďalej v tele"
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Označiť ako prečítanú"
 
-#: mail/folder-browser.c:531
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Označiť ako neprečítanú"
 
-#: mail/folder-browser.c:533
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Presunúť do priečinku..."
 
-#: mail/folder-browser.c:534
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:536
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Obnoviť zmazaný záznam"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:540
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:542
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Vytvoriť pravidlo zo správy"
 
-#: mail/folder-browser.c:629
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:630
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
@@ -5145,22 +5360,6 @@ 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 "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Vytváracie rozhranie pre import súborov Outlook Express 4 do Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Vytváracie rozhranie pre import súborov mbox do Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importuje súbory Outlook Express 4 do Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importuje súbory mbox do Evolution"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Súčasný formát ukladania:"
@@ -5195,15 +5394,6 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Žiadna"
-
 #: mail/mail-accounts.c:116
 msgid " (default)"
 msgstr " (štandard)"
@@ -5221,7 +5411,7 @@ msgstr "Naozaj chcete odstrániť tento účet diskusných skupín?"
 msgid "Evolution Account Manager"
 msgstr "Správca účtov Evolution"
 
-#: mail/mail-account-editor.c:290
+#: mail/mail-account-editor.c:307
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -5230,10 +5420,15 @@ msgstr ""
 "Chcete ich aj tak uložiť?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
+#: mail/mail-account-editor.c:706
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
+#: mail/mail-account-editor.c:727
+#, fuzzy
+msgid "Unspecified"
+msgstr "Nedefinovaný"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -5249,12 +5444,16 @@ msgstr "Predmet je %s"
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Pridať pravidlo filtra"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5266,7 +5465,7 @@ msgstr ""
 "posielať, prijímať alebo písať poštu.\n"
 "Chcete ho nastaviť teraz?"
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5274,7 +5473,7 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť identitu."
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5282,11 +5481,11 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť spôsob prenosu.."
 
-#: mail/mail-callbacks.c:192
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "Nemáte nastavený spôsob prenosu pošty"
 
-#: mail/mail-callbacks.c:225
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5294,32 +5493,32 @@ msgstr ""
 "Táto správa nemá predmet.\n"
 "Naozaj ju chcete poslať?"
 
-#: mail/mail-callbacks.c:292
+#: mail/mail-callbacks.c:294
 msgid "You must configure an account before you can send this email."
 msgstr "Musíte nastaviť účet pred poslaním tejto správy."
 
-#: mail/mail-callbacks.c:314
+#: mail/mail-callbacks.c:316
 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:577
+#: mail/mail-callbacks.c:579
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "V %s, %s zapísané:\n"
 
-#: mail/mail-callbacks.c:735
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr "Predaná správa:\n"
 
-#: mail/mail-callbacks.c:820
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:822
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:957
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5327,11 +5526,11 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:990 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Prepísať súbor?"
 
-#: mail/mail-callbacks.c:994 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5339,15 +5538,15 @@ msgstr ""
 "Súbor s týmto menom už existuje\n"
 "Prepísať ho?"
 
-#: mail/mail-callbacks.c:1038
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:1040
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:1148
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5356,11 +5555,11 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1197
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
@@ -5376,31 +5575,27 @@ msgstr "Informácia o účte"
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Vlastnosti účtu"
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Authentication Type:"
 msgstr "Typ overenia:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Automatically check mail every"
 msgstr "Automaticky kontrolovať poštu každých"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Check settings"
 msgstr "Overiť nastavenie"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5417,190 +5612,188 @@ msgstr ""
 "Kliknutím na \"Dokončiť\" uložíte vaše nastavenie."
 
 #: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
+#, fuzzy
+msgid "De_fault"
 msgstr "Štandardné"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Done"
 msgstr "Hotovo"
 
 #: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
+msgid "Email Address:"
 msgstr "E-mailová adresa:"
 
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Email address:"
 msgstr "E-mailová adresa:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "Evolution Mail Configuration"
 msgstr "Nastavenie pošty Evolution"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Celé meno:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Hostname:"
 msgstr "Hostiteľ:"
 
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
 #: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identita"
 
 #: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr "Zahrnúť do operácií \"Stiahnuť poštu\"."
+msgid "Include this account when receiving mail"
+msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "Server pre príjem pošty"
-
-#: mail/mail-config.glade.h:34
 msgid "Keep mail on server"
 msgstr "Nechávať poštu na serveri"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Mail"
 msgstr "Pošta"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Mail Account"
 msgstr "Poštový účet"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
 msgid "Mail Configuration Druid"
 msgstr "Sprievodca pre nastavenie pošty"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Make this my default account"
 msgstr "Použiť ho ako štandardný účet"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Mark messages as \"Read\" after:"
 msgstr "Označiť správy ako \"Prečítané\" po:"
 
 #: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "Rôzne"
-
-#: mail/mail-config.glade.h:44
 msgid "News"
 msgstr "Diskusné skupiny"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:44
 msgid "Optional"
 msgstr "Voliteľné"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:45
 msgid "Organization:"
 msgstr "Organizácia:"
 
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Server odosielanej pošty"
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "PGP binary path:"
 msgstr "Cesta k spustiteľnému súboru PGP:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Password:"
 msgstr "Heslo:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "Plain Text"
 msgstr "Čistý text"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 msgid "Remember my password"
 msgstr "Uložiť heslo"
 
-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Odpovedať komu:"
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "Adresa WWW stránky:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Required"
 msgstr "Požadované"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Select PGP binary"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Select signature file"
 msgstr "Vybrať súbor s podpisom"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Send mail in HTML format by default."
 msgstr "Posielať štandardne ako HTML."
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:60
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:62
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:63
 msgid "Server Type: "
 msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:64
 msgid "Server requires authentication"
 msgstr "Server vyžaduje overenie"
 
-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Servery"
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:66
 msgid "Signature file:"
 msgstr "Súbor s podpisom:"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:67
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:69
 msgid "Sources"
 msgstr "Zdroje"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:70
 msgid "This server requires a secure connection (SSL)"
 msgstr "Tento server vyžaduje bezpečné pripojenie (SSL)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:71
 msgid "Transport"
 msgstr "Prenos"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Overenie"
+
+#: mail/mail-config.glade.h:73
 msgid "Type"
 msgstr "Typ"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -5608,15 +5801,15 @@ msgstr ""
 "Zadajte meno, ktorým chcete tieto servery označovať. Napríklad:\"Doma\" "
 "alebo \"Práca\"."
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:75
 msgid "User Information"
 msgstr "Informácie o používateľovi"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:76
 msgid "Username:"
 msgstr "Meno používateľa:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:77
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5626,11 +5819,17 @@ msgstr ""
 "\n"
 "Kliknutím \"Ďalší\" začneme."
 
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_Upraviť"
+
 #: mail/mail-config.glade.h:83
 msgid "minutes."
 msgstr "minút."
 
-#: mail/mail-config-druid.c:401
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5639,11 +5838,11 @@ msgstr ""
 "Nepodarilo sa overiť nastavenie prijímania pošty.\n"
 "Možno sa stretnete s problémami pri príjme vašej pošty z %s"
 
-#: mail/mail-config-druid.c:495
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr "Priestor mien:"
 
-#: mail/mail-config-druid.c:683
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5653,7 +5852,7 @@ msgstr ""
 "Možno sa stretnete s problémami pri odosielaní vašej pošty z %s"
 
 #. set window title
-#: mail/mail-config-druid.c:1042
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr "Sprievodca účtom Evolution"
 
@@ -5697,91 +5896,96 @@ msgstr "Skryť"
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/mail-format.c:654
+#: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Načítavam obsah správy"
 
-#: mail/mail-format.c:943
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "Zašifrovaná správa nie je zobrazená"
 
-#: mail/mail-format.c:949
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Zašifrovaná správa"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr "Kliknite na ikonu pre dešifrovanie."
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
 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:1027 mail/mail-format.c:1414
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
 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:1627
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:1639
+#: mail/mail-format.c:1689
 #, 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:1643
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:1682
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: mail/mail-local.c:456
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Priečinok `%s' neexistuje."
+
+#: mail/mail-local.c:508
 #, c-format
 msgid "Opening '%s'"
 msgstr "Otváram '%s'"
 
-#: mail/mail-local.c:738
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mení priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:742
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Zmeniť priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:766
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "Prenastavujem priečinok"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:795
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Zatváram aktuálny priečinok"
 
-#: mail/mail-local.c:827
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Premenovávam starý priečinok a otváram"
 
-#: mail/mail-local.c:845
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Vytváram nový priečinok"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Kopírujem správy"
 
-#: mail/mail-local.c:880
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5790,7 +5994,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:919
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5816,11 +6020,15 @@ msgstr ""
 "Chyba pri vykonávaní operácie:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:789
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Pracujem"
 
-#: mail/mail-mt.c:771
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
+
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr "Priebeh Evolution"
 
@@ -5833,75 +6041,75 @@ msgstr "Posielam \"%s\""
 msgid "Sending message"
 msgstr "Posielam správu"
 
-#: mail/mail-ops.c:744
+#: mail/mail-ops.c:752
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Premiestňujem"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Kopírujem"
 
-#: mail/mail-ops.c:848
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s správa %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: mail/mail-ops.c:1068
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1109 mail/mail-ops.c:1247
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1176
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1412
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1479
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Získavam správy"
 
-#: mail/mail-ops.c:1489
+#: mail/mail-ops.c:1506
 #, 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:1563
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Ukladám správy"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5910,12 +6118,12 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Ukladám správu %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1669
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5924,11 +6132,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:1743
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5937,7 +6145,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1786
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
@@ -5982,60 +6190,67 @@ msgstr "Dokončené."
 msgid "Incomplete message written on pipe!"
 msgstr "Do rúry zapísaná neúplná správa!"
 
-#: mail/mail-tools.c:146
+#: mail/mail-tools.c:138
 #, 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:199
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (predaná správa)"
 
-#: mail/mail-tools.c:209
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (žiadny predmet)"
 
-#: mail/mail-tools.c:226
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predaná správa - %s"
 
-#: mail/mail-tools.c:228
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Predaná správa (bez predmetu)"
 
-#: mail/mail-vfolder.c:170
+#: mail/mail-tools.c:411
+#, c-format
+msgid ""
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
+msgstr ""
+
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VPriečinky"
 
-#: mail/mail-vfolder.c:335
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Odpovedať odosielateľovi tejto správy"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Odpovedať všetkým adresátom tento správy"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Predať túto správu ďalej"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Tlačiť vybranú správu"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Odstrániť túto správu"
 
@@ -6043,6 +6258,14 @@ msgstr "Odstrániť túto správu"
 msgid "Unseen"
 msgstr "Nevidené"
 
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "Videné"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Odpovedané"
+
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
@@ -6090,6 +6313,10 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "Vyznačené"
+
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "Od"
@@ -6313,7 +6540,8 @@ msgstr ""
 
 #: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "Prosím, stlačte \"OK\" pre inštaláciu súborov, alebo \"Zrušiť\" pre koniec."
+msgstr ""
+"Prosím, stlačte \"OK\" pre inštaláciu súborov, alebo \"Zrušiť\" pre koniec."
 
 #: shell/e-setup.c:157
 msgid "Could not update files correctly"
@@ -6455,7 +6683,7 @@ msgstr "%s - Evolution %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6541,13 +6769,13 @@ msgstr "Odstrániť túto skratku z panelu skratiek"
 msgid "Error saving shortcuts."
 msgstr "Chyba pri ukladaní skratiek."
 
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Pohľad"
 
-#: shell/e-storage-set-view.c:345
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Zobraziť vybraný priečinok"
 
@@ -6603,8 +6831,8 @@ msgstr "Uvedený typ nie je podporovaný týmto skladom"
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
-#: shell/main.c:74
-#, c-format
+#: shell/main.c:73
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6642,7 +6870,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:99
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6650,15 +6878,15 @@ msgstr ""
 "Vďaka\n"
 "Tím Evolution\n"
 
-#: shell/main.c:130
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Nie je možné inicializovať shell Evolution."
 
-#: shell/main.c:176
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Zakázať."
 
-#: shell/main.c:196
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je možné inicializovať komponentový systém Bonobo."
 
@@ -6682,40 +6910,53 @@ msgstr "Nájsť kontakt"
 msgid "New contact"
 msgstr "Nový kontakt"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Ukážka správy pred tlačou"
+
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "Tlačiť kontakty"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "Zastaviť načítavanie"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "Zobraziť všetko"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "Zobraziť všetky kontakty"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Nastavenie _adresára..."
+#: ui/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Zdroje adresára"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Tlačiť kontakty..."
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "_Kontakty..."
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "_Tlačiť..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "_Hľadať kontakty"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_Nástroje"
 
@@ -6727,117 +6968,119 @@ msgstr "5 dní"
 msgid "Alter preferences"
 msgstr "Zmeniť nastavenie"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lendár"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Nastavenie kalendára..."
-
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:4
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Vytvoriť nový kalendár"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:6
 msgid "Day"
 msgstr "Deň"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Go To"
+msgstr "Prejsť na"
+
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "Prejsť dozadu"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "Prejsť dopredu"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Prejsť na"
-
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to a specific date"
 msgstr "Prejsť na zadaný dátum"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to present time"
 msgstr "Prejsť na aktuálny čas"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:12
 msgid "Month"
 msgstr "Mesiac"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "New Appointment"
 msgstr "Nová schôdzka"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Nasl"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:16
 msgid "Open Calendar"
 msgstr "Otvoriť kalendár"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Pred"
 
 #: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print calendar"
+msgstr "Tlačiť kalendár"
+
+#: ui/evolution-calendar.xml.h:22
 msgid "Print this Calendar"
 msgstr "Tlačiť tento kalendár"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Uložiť ako"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 msgid "Save calendar as something else"
 msgstr "Uložiť kalendár ako niečo iné"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Zobraziť jeden deň"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Zobraziť jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Zobraziť jeden týždeň"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Zobraziť pracovný týždeň"
 
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Dnes"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Týždeň"
 
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "Schôdzka"
+
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
 msgid "_New"
 msgstr "_Nový"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:34
 msgid "_Open Calendar"
 msgstr "_Otvoriť kalendár"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Tlačiť tento kalendár"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
@@ -6863,7 +7106,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-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Tlačiť..."
 
@@ -6895,17 +7138,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:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Súbor"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Tlačiť..."
-
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Uložiť"
@@ -6954,7 +7193,7 @@ msgstr "Zavrieť túto schôdzku"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "_Kopírovať do priečinku..."
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopírovať"
@@ -6971,6 +7210,10 @@ msgstr "Vystrihnúť"
 msgid "Cut the selection"
 msgstr "Vystrihne výber"
 
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Odstrániť túto schôdzku"
+
 #: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "Vypísať XML"
@@ -7039,12 +7282,8 @@ msgstr "Nastavenie _tlačiarne..."
 msgid "Print Setup"
 msgstr "Nastavenie tlačiarne"
 
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Vlastnosti"
-
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Uložiť"
 
@@ -7057,10 +7296,6 @@ msgstr "Uložiť schôdzku a zavrieť tento dialóg"
 msgid "Save the current file"
 msgstr "Uložiť aktuálny súbor"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Naplánovať stretnutie"
-
 #: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "Naplánovať _stretnutie"
@@ -7085,18 +7320,18 @@ 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:34
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: 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:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Zavrieť"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
@@ -7104,19 +7339,13 @@ msgstr "_Kontakt"
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Ladiť"
 
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Upraviť"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: 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:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Pomocník"
 
@@ -7153,7 +7382,8 @@ msgstr "_Vložiť"
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
@@ -7190,206 +7420,262 @@ msgstr "Nastavenie Súhrnu..."
 msgid "New Mail"
 msgstr "Nová správa"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
 msgid "Compose"
 msgstr "Napísať"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:3
 msgid "Compose a new message"
 msgstr "Napísať novú správu"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Copy message to a new folder"
 msgstr "Kopírovať správu do nového priečinka"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Vytvoriť pravidlo"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "P_riečinok"
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Vytvoriť pravidlo zo správy"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filter na _odosielateľa"
+msgid "Display all of the message headers"
+msgstr ""
 
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filter na _adresátov"
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Upraviť úlohu"
 
 #: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Filter na odosielateľovi"
+
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Filter na adresátoch"
+
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Filter na predmet"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Zabudnúť _heslá"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Stiahnuť poštu"
-
 #: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Skryť _vybrané správy"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Skryť _odstránené správy"
+#, fuzzy
+msgid "Forward As"
+msgstr "Poslať ďalej"
 
 #: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skryť _prečítané správy"
+#, fuzzy
+msgid "Full Headers"
+msgstr "Hlavička"
 
 #: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtre pošty..."
+msgid "Hide S_elected Messages"
+msgstr "Skryť _vybrané správy"
 
 #: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Správa prihlásení..."
+msgid "Hide _Deleted Messages"
+msgstr "Skryť _odstránené správy"
 
 #: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Označiť ako _prečítané"
+msgid "Hide _Read messages"
+msgstr "Skryť _prečítané správy"
 
 #: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Označiť ako _neprečítané"
+#, fuzzy
+msgid "Inline"
+msgstr "Zobraziť v texte"
 
 #: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Presunúť"
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Správa prihlásení..."
 
 #: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Presunúť správu do nového priečinka"
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Označiť ako prečítanú"
 
 #: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Ukážka správy pred tlačou"
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Označiť ako prečítanú"
+
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Označiť ako neprečítanú"
 
 #: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Ukážka správy pred tlačou..."
+#, fuzzy
+msgid "Message _Display"
+msgstr "Telo správy"
 
 #: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Tlačiť správu na tlačiarni"
+msgid "Move"
+msgstr "Presunúť"
 
 #: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Tlačiť správu..."
+msgid "Move message to a new folder"
+msgstr "Presunúť správu do nového priečinka"
 
 #: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Odpovedať _všetkým"
+msgid "Print message to the printer"
+msgstr "Tlačiť správu na tlačiarni"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Odpovedať _odosielateľovi"
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Poznámka"
 
 #: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Odpovedať _všetkým"
+
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "_Zdroj"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Vybrať _všetko"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "Vybrať _všetko"
+
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Send and Receive"
+msgstr "Príjem a odoslanie pošty"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Poslať neodoslanú poštu a prijať novú poštu"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Ukázať _všetky správy"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Zobraziť všetko"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Zoznam vlákien"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Vpriečinok na predmet"
+
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Zobraziť čistý kód správy"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Editor _virtuálneho priečinku..."
+
+#: ui/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Actions"
+msgstr "A_kcie"
+
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "_Použiť filtre"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Nastavenie priečinku..."
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Napísať"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Upraviť správu"
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "Vytvoriť pravidlo zo správy"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_Vyčistiť"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filter na predmet"
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "_Filtre pošty..."
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Priečinok"
+
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrátiť výber"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Nastavenie pošty..."
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Poslať správu"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "Nastavenie..."
+
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Message Hiding"
 msgstr "_Správa"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "Otvoriť v novom o_kne"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Tlačiť správu"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Skryť _vybrané správy"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Uložiť správu _ako..."
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid "_Send and Receive"
+msgstr "Príjem a odoslanie pošty"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "_Vlákna"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "Obnoviť _zmazané"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_vPriečinok na predmete"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor _virtuálneho priečinku..."
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priložiť"
@@ -7495,15 +7781,56 @@ msgstr "Zobraziť prílohy"
 msgid "Sign this message with your PGP key"
 msgstr "Podpísať túto správu kľúčom PGP"
 
+#: ui/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Prepne, či sa má zobrazovať panel priečinkov"
+
+#: ui/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Prepne, či sa má zobrazovať panel priečinkov"
+
+#: ui/evolution-message-composer.xml.h:36
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Prepne, či sa má zobrazovať panel priečinkov"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Insert"
+msgstr "_Index"
+
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "Vložiť _textový súbor..."
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Odpovedať komu:"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "Za_bezpečenie"
 
@@ -7511,6 +7838,10 @@ msgstr "Za_bezpečenie"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Pridať priečinok do zoznamu prihlásených priečinkov"
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "P_riečinok"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Obnoviť zoznam"
@@ -7591,7 +7922,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:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 msgid "_Appointment (FIXME)"
 msgstr "S_chôdzka"
 
@@ -7608,8 +7939,9 @@ msgid "Create a new task"
 msgstr "Vytvoriť novú úlohu"
 
 #: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nový"
+#, fuzzy
+msgid "New Task"
+msgstr "Úloha"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
@@ -7619,6 +7951,11 @@ msgstr "Uložiť úlohu ako niečo iné"
 msgid "Tasks Preferences..."
 msgstr "Nastavenie úloh..."
 
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "Úloha"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "O Evolution..."
@@ -7628,8 +7965,9 @@ msgid "Close this window"
 msgstr "Zavrie toto okno"
 
 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Pri_spôsobiť..."
+#, fuzzy
+msgid "Customi_ze Toolbars..."
+msgstr "Prispôsobiť panely nástrojov"
 
 #: ui/evolution.xml.h:5
 msgid "Customize"
@@ -7652,96 +7990,96 @@ msgid "Evolution bar _shortcut"
 msgstr "_Skratka pre panel Evolution"
 
 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Koniec"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "_Začíname"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr "Importuje externý súbor"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hlavný panel nástrojov"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Zobrazí informáciu o Evolution"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Ukázať panel _priečinkov"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Ukázať panel _skratiek"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 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:21
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prepne, či sa má zobrazovať panel skratiek"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Pomocou Správcu  ko_ntaktov"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Pomocou _Kalendára"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Pomocou _Pošty "
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "Work Offline"
+msgstr "Pracujem"
+
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "O _Evolution..."
 
-#: ui/evolution.xml.h:32
-msgid "_Folder"
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Folder Bar"
 msgstr "_Priečinok"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "_Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "_Import file..."
 msgstr "_Importovať súbor..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "_Mail message"
 msgstr "_Poslať správu"
 
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nový vPriečinok"
+
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "Nas_tavenie"
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "_Skryť panel skratiek"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
@@ -7822,6 +8160,11 @@ msgstr "_Koniec stretnutia:"
 msgid "All Attendees"
 msgstr "Všetci účastníci"
 
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "aktuálny tento"
+
 #. 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
@@ -7833,26 +8176,68 @@ msgstr "PUSŠPSN"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Teraz"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
 #: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
 #: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
 #: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
 #: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-filter-bar.c:160
+#, fuzzy
+msgid "Save Search"
+msgstr "Hľadať"
+
+#: widgets/misc/e-filter-bar.c:231
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Pokročilé"
+
+#: widgets/misc/e-filter-bar.c:311
+#, fuzzy
+msgid "Advanced ..."
+msgstr "Pokročilé..."
+
 #: widgets/misc/e-messagebox.c:141
 msgid "Information"
 msgstr "Informácia"
@@ -7898,3 +8283,252 @@ msgstr "init_corba(): Nie je možné inicializovať GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 
+#~ msgid "Disabled"
+#~ msgstr "Zakázané"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synchronizovať"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopírovať z Pilota"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopírovať do Pilota"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Spojiť z Pilota"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Spojiť do Pilota"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Pôvodný autor:"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Spojka pre adresár Evolution"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation a Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr "Konfiguračný nástroj pre spojku adresára Evolution.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Akcia Synchronizovať"
+
+#~ msgid "Conduit state"
+#~ msgstr "Stav spojky"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Nie je nastavený žiadny pilot, prosím,\n"
+#~ "najprv použite 'Vlastnosti spojenia Pilota'."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Nespojený s démonom gnome-pilot"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Nastala chyba pri pokuse o získanie\n"
+#~ "zoznamu pilotov od démona gnome-pilot"
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Spojka kalendára Evolution"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Nástroj pre nastavenie spojky pre kalendár Evolution.\n"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Spojka ToDo pre Evolution"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Nástroj pre nastavenie spojky pre todo Evolution.\n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "Priorita musí byť medzi 1 až 9"
+
+#~ msgid "Schedule meeting"
+#~ msgstr "Naplánovať stretnutie"
+
+#~ msgid "Edit this appointment..."
+#~ msgstr "Upraviť túto schôdzku..."
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid ""
+#~ "This option will connect to the SMTP server using CRAM-MD5 authentication."
+#~ msgstr "Táto voľba vás pripojí k SMTP serveru pomocou overenia CRAM-MD5."
+
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Zadajte identitu, pod ktorou chcete túto správu poslať"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Zadajte predmet správy"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Upraviť pravidlo filtra"
+
+#~ msgid "incoming"
+#~ msgstr "prijatá"
+
+#~ msgid "outgoing"
+#~ msgstr "odoslaná"
+
+#~ msgid "Deleted"
+#~ msgstr "Odstránené"
+
+#~ msgid "Draft"
+#~ msgstr "Návrh"
+
+#~ msgid "Set Flag"
+#~ msgstr "Nastaviť vyznačenie"
+
+#~ msgid "matches regex"
+#~ msgstr "odpovedá reg. výrazu"
+
+#~ msgid "Add Rule"
+#~ msgstr "Pridať pravidlo"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Pridať pravidlo vpriečinku"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Upraviť pravidlo vpriečinku"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "Vytváracie rozhranie pre import súborov Outlook Express 4 do Evolution"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Vytváracie rozhranie pre import súborov mbox do Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importuje súbory Outlook Express 4 do Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importuje súbory mbox do Evolution"
+
+#~ msgid "Account Properties"
+#~ msgstr "Vlastnosti účtu"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-mailová adresa:"
+
+#~ msgid "Include in \"Get Mail\" operations."
+#~ msgstr "Zahrnúť do operácií \"Stiahnuť poštu\"."
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Server pre príjem pošty"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Rôzne"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Server odosielanej pošty"
+
+#~ msgid "Servers"
+#~ msgstr "Servery"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Nastavenie _adresára..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Tlačiť kontakty..."
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ka_lendár"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Nastavenie kalendára..."
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Tlačiť tento kalendár"
+
+#~ msgid "Create Rule"
+#~ msgstr "Vytvoriť pravidlo"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filter na _odosielateľa"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filter na _adresátov"
+
+#~ msgid "Get Mail"
+#~ msgstr "Stiahnuť poštu"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Označiť ako _prečítané"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Označiť ako _neprečítané"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Ukážka správy pred tlačou..."
+
+#~ msgid "Print message..."
+#~ msgstr "Tlačiť správu..."
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Odpovedať _odosielateľovi"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Ukázať _všetky správy"
+
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Nastavenie priečinku..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Upraviť správu"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filter na predmet"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Nastavenie pošty..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "Otvoriť v novom o_kne"
+
+#~ msgid "_Print Message"
+#~ msgstr "_Tlačiť správu"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Uložiť správu _ako..."
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_vPriečinok na predmete"
+
+#~ msgid "New"
+#~ msgstr "Nový"
+
+#~ msgid "Customi_ze..."
+#~ msgstr "Pri_spôsobiť..."
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Ukázať panel _priečinkov"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Ukázať panel _skratiek"
+
+#~ msgid "_Settings"
+#~ msgstr "Nas_tavenie"