Updated Slovak translation

svn path=/trunk/; revision=8174

1 files changed, 610 insertions, 461 deletions

diff --git a/po/sk.po b/po/sk.po
index 78d50e7139..36b87169be 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-02-09 16:18+0100\n"
-"PO-Revision-Date: 2001-02-09 16:35CET\n"
+"POT-Creation-Date: 2001-02-11 17:37+0100\n"
+"PO-Revision-Date: 2001-02-11 17:43CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
 "MIME-Version: 1.0\n"
@@ -455,161 +455,157 @@ msgstr "Nie je možné spustiť wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je možné prečítať blok aplikácie Adresa z pilota"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Odstrániť kontakt?"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Pridať"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Odstrániť"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Typy telefónov"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Nový typ telefónu"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
+#: addressbook/contact-editor/contact-editor.glade.h:1
 #: 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
 msgid "Add"
 msgstr "Pridať"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr "_Výročie:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
+msgstr "Do _práce"
+
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
+msgstr "_Fax do práce"
+
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr "_Kontakty..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Ka_tegórie..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "_Celé meno..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
+msgstr "Detaily"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Uložiť ako:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Adresa WWW stránky:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Chce prijímať poštu ako _HTML"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Práca"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:28
+msgid "General"
+msgstr "Všeobecné"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Domov"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
+msgstr "Nový typ telefónu"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "_Fax do práce"
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
+msgstr "_Poznámky:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Mobil"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
+msgstr "Typy telefónov"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/contact-editor.glade.h:14
 #: addressbook/contact-editor/e-contact-editor.c:1336
 msgid "Primary Email"
 msgstr "Primárny e-mail"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "Do _práce"
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
+msgstr "Chce prijímať poštu ako _HTML"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "_Toto je e-mailová adresa"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
+msgstr "Adresa WWW stránky:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "_Kontakty..."
+#: addressbook/contact-editor/contact-editor.glade.h:17
+msgid "_Add"
+msgstr "_Pridať"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ka_tegórie..."
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
+msgstr "_Adresa..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "Činnosť/po_zícia:"
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
+msgstr "Meno _asistenta:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr "Dátum na_rodenia:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr "_Práca"
+
+#: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Adresa..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "Všeobecné"
+#: 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
+msgid "_Delete"
+msgstr "_Odstrániť"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "O_ddelenie:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
+msgstr "_Celé meno..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
+msgstr "_Domov"
+
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
+msgstr "Činnosť/po_zícia:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
+msgstr "Meno _vedúceho:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
+msgstr "_Mobil"
+
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
+msgstr "Pre_zývka:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "Prac_ovisko:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "_Povolanie:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "Pre_zývka:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "Ma_nžel(ka):"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Dátum na_rodenia:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "Meno _asistenta:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "Meno _vedúceho:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "_Výročie:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "_Poznámky:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
+msgstr "_Toto je e-mailová adresa"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Detaily"
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Odstrániť kontakt?"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
 #: addressbook/gui/widgets/e-addressbook-view.c:594
@@ -674,7 +670,7 @@ msgstr "Mobil"
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
 #: addressbook/gui/widgets/e-addressbook-view.c:584
-#: mail/mail-config.glade.h:47
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
 msgid "Other"
 msgstr "Iné"
 
@@ -758,69 +754,74 @@ msgstr "_Štát/Provincia:"
 msgid "_ZIP Code:"
 msgstr "_PSČ:"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Skontrolovať celé meno"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Pán\n"
-"Pani\n"
-"Pani/Slečna\n"
-"Slečna\n"
-"Dr.\n"
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr "Dr. "
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-"\n"
-"St.\n"
-"Ml.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr "Esq."
+
+#: addressbook/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr "I"
+
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr "II"
+
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr "III"
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr "Ml."
+
+#: addressbook/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr "Slečna"
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr "Pán"
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr "Pani"
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr "Sl."
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr "St."
+
+#: addressbook/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Krstné:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Titul:"
+#: addressbook/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Priezvisko:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Stredné:"
 
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Priezvisko:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Prípona:"
 
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_Titul:"
+
 #: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Ako _minikarty"
@@ -904,9 +905,9 @@ msgid "None (anonymous mode)"
 msgstr "Žiadny (anonymný mód)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:249
+#: camel/providers/imap/camel-imap-store.c:248
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:140
 msgid "Password"
 msgstr "Heslo"
 
@@ -1017,6 +1018,7 @@ msgid "FIXME Name help text here"
 msgstr "FIXME Pomocník pre Name"
 
 #: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Popis:"
@@ -1030,6 +1032,7 @@ msgid "Addressbook Sources"
 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:7 mail/folder-browser.c:684
 #: mail/mail-config.glade.h:21 mail/mail-view.c:150
@@ -1039,8 +1042,8 @@ msgid "Delete"
 msgstr "Odstrániť"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/folder-browser.c:670
-#: mail/mail-config.glade.h:24
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
 msgid "Edit"
 msgstr "Upraviť"
 
@@ -1341,6 +1344,7 @@ msgid "Margins"
 msgstr "Okraje"
 
 #: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Počet stĺpcov:"
 
@@ -1620,7 +1624,7 @@ msgstr "Zobraziť schôdzky"
 msgid "Show tasks"
 msgstr "Zobraziť úlohy"
 
-#: calendar/gui/calendar-summary.c:719
+#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Načítavam kalendár"
 
@@ -2271,6 +2275,128 @@ msgstr "Aktualizovať kalendár"
 msgid "Cancel Meeting"
 msgstr "Zrušiť stretnutie"
 
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr "--do--"
+
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr "Správa kalendára"
+
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr "Dátum:"
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr "Načítavam kalendár..."
+
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizátor:"
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
+msgid "Sender"
+msgstr "Odosielateľ"
+
+#: calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Súhrn:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "dátum konca"
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "dátum začiatku"
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+msgid "Attendee"
+msgstr "Účastník"
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+msgid "Attendee address"
+msgstr "Adresa účastníka"
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+msgid "Attendees: "
+msgstr "Účastníci:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:5
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr ""
+"Zrušiť\n"
+"stretnutie"
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+msgid "Chair"
+msgstr "Predseda"
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+msgid "Meeting Invitations"
+msgstr "Pozvánky na stretnutie"
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr "Nie-účastník"
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+msgid "Optional Participant"
+msgstr "Nepovinný účastník"
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+msgid "Organizer: "
+msgstr "Organizátor:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
+msgstr ""
+"Publikovať\n"
+"udalosť"
+
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/e-meeting-dialog.glade.h:18
+msgid ""
+"Request\n"
+"Meeting"
+msgstr ""
+"Požadovať\n"
+"stretnutie"
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+msgid "Required Participant"
+msgstr "Vyžadovaný účastník"
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+msgid "Role"
+msgstr "Rola"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+"Naplánovať\n"
+"čas"
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
+#: mail/message-list.c:1157
+msgid "Status"
+msgstr "Stav"
+
 #: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
 #: calendar/gui/e-tasks.c:487
 msgid "All"
@@ -2797,7 +2923,7 @@ msgstr "Tento rok (%Y)"
 msgid "Print Calendar"
 msgstr "Tlačiť kalendár"
 
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1161
+#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
@@ -2941,32 +3067,32 @@ msgstr "Nie je možné načítať %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie je možné načítať %s: V module nie je inicializačný kód."
 
-#: camel/camel-remote-store.c:183
+#: camel/camel-remote-store.c:176
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:187
+#: camel/camel-remote-store.c:180
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s služba pre %s na %s"
 
-#: camel/camel-remote-store.c:313
+#: camel/camel-remote-store.c:306
 msgid "Connection cancelled"
 msgstr "Spojenie zrušené"
 
-#: camel/camel-remote-store.c:316 camel/camel-remote-store.c:329
+#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
 #: camel/providers/smtp/camel-smtp-transport.c:214
 #, 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:317 camel/camel-remote-store.c:330
+#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
 msgid "(unknown host)"
 msgstr "(neznámy hostiteľ)"
 
-#: camel/camel-remote-store.c:421 camel/camel-remote-store.c:483
-#: camel/camel-remote-store.c:551
+#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
+#: camel/camel-remote-store.c:538
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
@@ -2976,37 +3102,37 @@ msgstr "Operácia zrušená"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Preklad regulárneho výrazu zlyhal: %s: %s"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:142
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vyžaduje komponentu používateľského mena"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:151
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vyžaduje komponentu hostiteľa"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vyžaduje komponentu cesty"
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:512
 #, c-format
 msgid "No such host %s."
 msgstr "Hostiteľ %s nenájdený."
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:515
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Dočasne nie je možné nájsť meno hostiteľa %s."
 
-#: camel/camel-session.c:298
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pre protokol `%s' nie je k dispozícii poskytovateľ"
 
-#: camel/camel-session.c:389
+#: camel/camel-session.c:394
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3089,24 +3215,24 @@ 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:251
+#: camel/providers/imap/camel-imap-store.c:250
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
 
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:259
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:262
+#: camel/providers/imap/camel-imap-store.c:261
 msgid "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr "Táto voľba pripojí na IMAP server pomocou overenia Kerberos 4."
 
-#: camel/providers/imap/camel-imap-store.c:368
+#: camel/providers/imap/camel-imap-store.c:367
 #, 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:396
+#: camel/providers/imap/camel-imap-store.c:395
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3117,7 +3243,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:652
+#: camel/providers/imap/camel-imap-store.c:672
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
@@ -3146,50 +3272,42 @@ msgstr "Poštové súbory vo formáte Qmail maildir"
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Pre ukladanie lokálnej pošty v priečinkov vo formáte qmail"
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Koreň ukladania %s nie je absolútna cesta"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:135
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Koreň ukladania %s nie je normálny priečinok"
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Lokálne ukladanie nemá koreňový priečinok"
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Lokálne ukladanie nemá štandardný priečinok"
+#: camel/providers/local/camel-local-store.c:174
+msgid "Local stores do not have an inbox"
+msgstr "Lokálne ukladanie nemá priečinok pre novú poštu"
 
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Lokálne priečinky nesmú byť vnorené do seba."
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokálny poštový súbor %s"
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:240
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie je možné premenovať priečinok %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nie je možné odstrániť súbor súhrnu priečinku `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:290
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie je možné odstrániť indexový súbor priečinku`%s': %s"
@@ -3227,8 +3345,8 @@ msgstr "Taká správa neexistuje"
 msgid "Invalid message contents"
 msgstr "Neplatný obsah správy"
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3237,15 +3355,15 @@ msgstr ""
 "Nie je možné otvoriť priečinok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Priečinok `%s' neexistuje."
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3254,19 +3372,19 @@ msgstr ""
 "Nie je možné vytvoriť priečinok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:120
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' nie je priečinok maildir."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie je možné odstrániť priečinok `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:150
 msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
@@ -3299,7 +3417,7 @@ msgstr "Priečinok vyzerá ako nenapraviteľne poškodený."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvorenie správy zlyhalo: Poškodená poštová schránka?"
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:92
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3308,7 +3426,7 @@ msgstr ""
 "Nie je možné otvoriť súbor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:108
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3317,14 +3435,14 @@ msgstr ""
 "Nie je možné vytvoriť súbor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nie je normálny súbor."
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3333,7 +3451,7 @@ msgstr ""
 "Nie je možné odstrániť priečinok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:151
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Priečinok `%s' nie je prázdny. Neodstránený."
@@ -3419,7 +3537,7 @@ msgstr "Neznáma chyba: %s"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:108
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nie je priečinok."
@@ -3529,7 +3647,7 @@ msgstr ""
 "pošty od rôznych poskytovateľov pošty pomocou WWW a proprietárnymi poštovými "
 "systémami."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:142
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3537,7 +3655,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:160
+#: camel/providers/pop3/camel-pop3-store.c:152
 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 "
@@ -3547,26 +3665,26 @@ msgstr ""
 "APOP. Nemusí to fungovať pre všetkých používateľov aj keď server tvrdí, že "
 "tento protokol podporuje."
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:164
 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:217
+#: camel/providers/pop3/camel-pop3-store.c:209
 #, 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:334
+#: camel/providers/pop3/camel-pop3-store.c:326
 #, 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:381
+#: camel/providers/pop3/camel-pop3-store.c:373
 #, 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:400
+#: camel/providers/pop3/camel-pop3-store.c:392
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3575,12 +3693,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:403
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:432
 msgid "(Unknown)"
 msgstr "(Neznámy)"
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:422
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3588,7 +3706,7 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Požadovaný spôsob overenia nie je podporovaný."
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:430
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3597,7 +3715,7 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:547
+#: camel/providers/pop3/camel-pop3-store.c:530
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
@@ -3922,7 +4040,7 @@ msgstr "Pridať prílohu..."
 msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1152
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1157
 msgid "Attachment"
 msgstr "Príloha"
 
@@ -4031,7 +4149,7 @@ msgstr "Uložiť zmeny do správy..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Chyba pri ukladaní do priečinku 'Koncepty': %s"
 
-#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:183
+#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -4089,6 +4207,14 @@ msgstr "Nie je možné vytvoriť okno editora správ."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie je možné inicializovať editor správ Evolution."
 
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr "karta s adresou"
+
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr "informácie o kalendári"
+
 #: executive-summary/component/component-factory.c:159
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Nie je možné inicializovať komponent Súhrn Evolution."
@@ -4183,6 +4309,14 @@ msgstr ""
 msgid "File does not have a place for the services.\n"
 msgstr "Súbor nemá miesto pre služby.\n"
 
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr "Vzhľad"
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr "Pozadie:"
+
 #: executive-summary/component/main.c:59
 msgid ""
 "Executive summary component could not initialize Bonobo.\n"
@@ -4510,14 +4644,10 @@ msgid "Regex Match"
 msgstr "Regul. výraz"
 
 #: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1152
+#: mail/message-list.c:1157
 msgid "Score"
 msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Odosielateľ"
-
 #: filter/libfilter-i18n.h:19
 msgid "Set Status"
 msgstr "Nastaviť stav"
@@ -4530,15 +4660,11 @@ msgstr "Zdroj"
 msgid "Specific header"
 msgstr "Špeciálna hlavička"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1152
-msgid "Status"
-msgstr "Stav"
-
 #: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1153
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1158
 msgid "Subject"
 msgstr "Predmet"
 
@@ -4893,24 +5019,24 @@ msgstr "Musíte nastaviť účet pred poslaním tejto správy."
 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:507
+#: mail/mail-callbacks.c:571
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "V %s, %s zapísané:\n"
 
-#: mail/mail-callbacks.c:661
+#: mail/mail-callbacks.c:727
 msgid "Forwarded message:\n"
 msgstr "Predaná správa:\n"
 
-#: mail/mail-callbacks.c:744
+#: mail/mail-callbacks.c:812
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:746
+#: mail/mail-callbacks.c:814
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:881
+#: mail/mail-callbacks.c:949
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4918,11 +5044,11 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:914 mail/mail-display.c:83
+#: mail/mail-callbacks.c:982 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Prepísať súbor?"
 
-#: mail/mail-callbacks.c:918 mail/mail-display.c:87
+#: mail/mail-callbacks.c:986 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4930,15 +5056,15 @@ msgstr ""
 "Súbor s týmto menom už existuje\n"
 "Prepísať ho?"
 
-#: mail/mail-callbacks.c:962
+#: mail/mail-callbacks.c:1030
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:964
+#: mail/mail-callbacks.c:1032
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:1072
+#: mail/mail-callbacks.c:1140
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4947,11 +5073,11 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1121
+#: mail/mail-callbacks.c:1189
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:1168
+#: mail/mail-callbacks.c:1236
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
@@ -5328,37 +5454,55 @@ msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: mail/mail-local.c:211
+#: mail/mail-local.c:399
+msgid "Registering local folder"
+msgstr "Registrujem lokálny priečinok"
+
+#: mail/mail-local.c:401
+msgid "Register local folder"
+msgstr "Registrovať lokálny priečinok"
+
+#: mail/mail-local.c:508
+#, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+"Nepodarilo sa zaregistrovať priečinok '%s':\n"
+"%s"
+
+#: mail/mail-local.c:672
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mení priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:215
+#: mail/mail-local.c:676
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Zmeniť priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:258
+#: mail/mail-local.c:707
 msgid "Reconfiguring folder"
 msgstr "Prenastavujem priečinok"
 
-#: mail/mail-local.c:276
+#. first, 'close' the old folder
+#: mail/mail-local.c:736
 msgid "Closing current folder"
 msgstr "Zatváram aktuálny priečinok"
 
-#: mail/mail-local.c:302
+#: mail/mail-local.c:768
 msgid "Renaming old folder and opening"
 msgstr "Premenovávam starý priečinok a otváram"
 
-#: mail/mail-local.c:320
+#: mail/mail-local.c:786
 msgid "Creating new folder"
 msgstr "Vytváram nový priečinok"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:800
 msgid "Copying messages"
 msgstr "Kopírujem správy"
 
-#: mail/mail-local.c:355
+#: mail/mail-local.c:821
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5367,7 +5511,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:386
+#: mail/mail-local.c:852
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5375,23 +5519,6 @@ msgstr ""
 "Ak nemôžete otvoriť túto poštovú schránku, potom\n"
 "ju budete musieť opraviť ručne."
 
-#: mail/mail-local.c:794
-msgid "Registering local folder"
-msgstr "Registrujem lokálny priečinok"
-
-#: mail/mail-local.c:796
-msgid "Register local folder"
-msgstr "Registrovať lokálny priečinok"
-
-#: mail/mail-local.c:900
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Nepodarilo sa zaregistrovať priečinok '%s':\n"
-"%s"
-
 #: mail/mail-mt.c:88
 #, c-format
 msgid ""
@@ -5506,21 +5633,21 @@ msgstr "Získavam správy"
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Získavam správu číslo %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Načítavam %s priečinok pre %s"
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1674
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Načítať %s priečinok pre %s"
 
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:1840
 msgid "Saving messages"
 msgstr "Ukladám správy"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5529,12 +5656,12 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1930
+#: mail/mail-ops.c:1932
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Ukladám správu %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5543,11 +5670,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2020
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2035
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5556,7 +5683,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:2063
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
@@ -5597,7 +5724,7 @@ msgstr "Zrušené."
 msgid "Complete."
 msgstr "Dokončené."
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:734
 msgid "Incomplete message written on pipe!"
 msgstr "Do rúry zapísaná neúplná správa!"
 
@@ -5610,7 +5737,7 @@ msgstr ""
 "Chyba pri príprave `%s':\n"
 "%s"
 
-#: mail/mail-threads.c:676
+#: mail/mail-threads.c:681
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5619,46 +5746,46 @@ msgstr ""
 "Chyba počas `%s':\n"
 "%s"
 
-#: mail/mail-threads.c:733
+#: mail/mail-threads.c:738
 msgid "Error reading commands from dispatching thread."
 msgstr "Chyba pri čítaní príkazov z rozdeľovacieho vlákna."
 
-#: mail/mail-threads.c:798
+#: mail/mail-threads.c:803
 msgid "Corrupted message from dispatching thread?"
 msgstr "Poškodená správa z rozdeľovacieho vlákna?"
 
-#: mail/mail-threads.c:917
+#: mail/mail-threads.c:922
 msgid "Could not create dialog box."
 msgstr "Nie je možné vytvoriť dialóg."
 
-#: mail/mail-threads.c:928
+#: mail/mail-threads.c:933
 msgid "User cancelled query."
 msgstr "Používateľ zrušil otázku."
 
-#: mail/mail-tools.c:192
+#: mail/mail-tools.c:198
 #, 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:250
+#: mail/mail-tools.c:256
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (predaná správa)"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:266
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (žiadny predmet)"
 
-#: mail/mail-tools.c:277
+#: mail/mail-tools.c:283
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predaná správa - %s"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:285
 msgid "Forwarded message (no subject)"
 msgstr "Predaná správa (bez predmetu)"
 
-#: mail/mail-tools.c:380
+#: mail/mail-tools.c:357
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5721,66 +5848,66 @@ msgstr "Viacero neprečítaných správ"
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:933
+#: mail/message-list.c:938
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:945 mail/message-list.c:961
+#: mail/message-list.c:950 mail/message-list.c:966
 #, c-format
 msgid "%s, et al."
 msgstr "%s, a spol."
 
-#: mail/message-list.c:948 mail/message-list.c:964
+#: mail/message-list.c:953 mail/message-list.c:969
 msgid "<unknown>"
 msgstr "<neznámy>"
 
-#: mail/message-list.c:1016
+#: mail/message-list.c:1021
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1023
+#: mail/message-list.c:1028
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:1032
+#: mail/message-list.c:1037
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: mail/message-list.c:1044
+#: mail/message-list.c:1049
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1052
+#: mail/message-list.c:1057
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:1059
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1152
+#: mail/message-list.c:1157
 msgid "Flagged"
 msgstr "Vyznačené"
 
-#: mail/message-list.c:1153
+#: mail/message-list.c:1158
 msgid "From"
 msgstr "Od"
 
-#: mail/message-list.c:1153
+#: mail/message-list.c:1158
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/message-list.c:1153
+#: mail/message-list.c:1158
 msgid "Received"
 msgstr "Prijaté"
 
-#: mail/message-list.c:1154
+#: mail/message-list.c:1159
 msgid "To"
 msgstr "Komu"
 
-#: mail/message-list.c:1154
+#: mail/message-list.c:1159
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -5861,6 +5988,157 @@ msgstr "Prihlásiť si priečinok \"%s\""
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Odhlásiť sa z priečinku \"%s\""
 
+#: mail/subscribe-dialog.glade.h:1
+msgid "All Folders"
+msgstr "Všetky priečinky"
+
+#: mail/subscribe-dialog.glade.h:2
+msgid "Display folders whose name contain:"
+msgstr "Zobraziť priečinky, ktorých meno obsahuje:"
+
+#: mail/subscribe-dialog.glade.h:3
+msgid "Query"
+msgstr "Otázka"
+
+#: mail/subscribe-dialog.glade.h:4 ui/evolution-subscribe.xml.h:8
+msgid "Subscribe"
+msgstr "Prihlásiť si"
+
+#: mail/subscribe-dialog.glade.h:5
+msgid "Subscribed"
+msgstr "Prihlásené"
+
+#: mail/subscribe-dialog.glade.h:6 ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr "Odhlásiť"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Meno priečinku:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Typ priečinku:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "Zadajte, kde vytvoriť priečinok"
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:155
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importujem %s\n"
+"Importér nie je pripravený.\n"
+"Čakám 5 sekúnd a skúsim to znovu."
+
+#: shell/importer/importer.c:173 shell/importer/importer.c:200
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importujem %s\n"
+"Importujem položku %d."
+
+#: shell/importer/importer.c:307
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Pre spracovanie\n"
+"%s\n"
+"nie je k dispozícii importér."
+
+#: shell/importer/importer.c:317
+msgid "Importing"
+msgstr "Importujem"
+
+#: shell/importer/importer.c:325
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importujem %s\n"
+"Začínam %s"
+
+#: shell/importer/importer.c:340
+#, c-format
+msgid "Error loading %s"
+msgstr "Chyba pri načítavaní %s"
+
+#: shell/importer/importer.c:355
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importujem %s\n"
+"Importujem položku 1."
+
+#: shell/importer/importer.c:426
+msgid "Automatic"
+msgstr "Automaticky"
+
+#: shell/importer/importer.c:476
+msgid "Filename:"
+msgstr "Meno súboru:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:481
+msgid "Select a file"
+msgstr "Vyberte súbor"
+
+#: shell/importer/importer.c:491
+msgid "File type:"
+msgstr "Typ súboru:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:572
+msgid "Import"
+msgstr "Import"
+
+#: shell/importer/importer.c:605
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Vyberte súbor, ktorý chcete importovať do Evolution a jeho typ\n"
+"zo zoznamu.\n"
+"\n"
+"Použijte \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
+"ho pokúsi určiť."
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Kliknite na \"Importova\" pre spustenie importu súboru do Evolution."
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Nástroj Evolution pre import"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Nástroj Evolution pre import"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"Vitajte v Nástroji Evolution pre import.\n"
+"Tento sprievodca vám pomôže importovať\n"
+"externé súbory do Evolution."
+
 #: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Inštalácia Evolution"
@@ -5968,19 +6246,19 @@ msgstr "Nová..."
 msgid "(Untitled)"
 msgstr "(Bez mena)"
 
-#: shell/e-shell-view-menu.c:127
+#: shell/e-shell-view-menu.c:159
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Nástroj pre oznamovanie chýb nebol nájdený v $PATH."
 
-#: shell/e-shell-view-menu.c:133
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb"
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:194
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:187
+#: shell/e-shell-view-menu.c:196
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5990,7 +6268,7 @@ msgstr ""
 "pre elektronickú poštu, kalendár a správu kontaktov\n"
 "v rámci prostredia GNOME."
 
-#: shell/e-shell-view-menu.c:349
+#: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
 msgstr "Prejsť na priečinku..."
 
@@ -6221,99 +6499,6 @@ msgstr "Zakázať."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je možné inicializovať komponentový systém Bonobo."
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importujem %s\n"
-"Importér nie je pripravený.\n"
-"Čakám 5 sekúnd a skúsim to znovu."
-
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importujem %s\n"
-"Importujem položku %d."
-
-#: shell/importer/importer.c:307
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Pre spracovanie\n"
-"%s\n"
-"nie je k dispozícii importér."
-
-#: shell/importer/importer.c:317
-msgid "Importing"
-msgstr "Importujem"
-
-#: shell/importer/importer.c:325
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importujem %s\n"
-"Začínam %s"
-
-#: shell/importer/importer.c:340
-#, c-format
-msgid "Error loading %s"
-msgstr "Chyba pri načítavaní %s"
-
-#: shell/importer/importer.c:355
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importujem %s\n"
-"Importujem položku 1."
-
-#: shell/importer/importer.c:426
-msgid "Automatic"
-msgstr "Automaticky"
-
-#: shell/importer/importer.c:476
-msgid "Filename:"
-msgstr "Meno súboru:"
-
-#: shell/importer/importer.c:481
-msgid "Select a file"
-msgstr "Vyberte súbor"
-
-#: shell/importer/importer.c:491
-msgid "File type:"
-msgstr "Typ súboru:"
-
-#: shell/importer/importer.c:572
-msgid "Import"
-msgstr "Import"
-
-#: shell/importer/importer.c:605
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Vyberte súbor, ktorý chcete importovať do Evolution a jeho typ\n"
-"zo zoznamu.\n"
-"\n"
-"Použijte \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
-"ho pokúsi určiť."
-
 #: ui/evolution-addressbook.xml.h:2
 msgid "Create new contact"
 msgstr "Vytvoriť nový kontakt"
@@ -7175,14 +7360,6 @@ msgstr "Obnoviť zoznam priečinkov"
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Odstrániť priečinok zo zoznamu prihlásených priečinkov"
 
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Prihlásiť si"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Odhlásiť"
-
 #: ui/evolution-task-editor-dialog.xml.h:5
 msgid "Assig_n Task (FIXME)"
 msgstr "P_riradiť úlohu"
@@ -7530,31 +7707,3 @@ msgstr "Túto správu už nezobrazovať."
 msgid "Sear_ch"
 msgstr "_Nájsť"
 
-
-#: evolution.desktop.in:4
-msgid "The Evolution groupware suite"
-msgstr "Sada groupwarových nástrojov Evolution"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
-msgid "Evolution Address conduit "
-msgstr "Spojka adresára Evolution"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
-msgid "Configure the address conduit"
-msgstr "Nastavenie spojky adresára"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
-msgid "Evolution Calendar conduit"
-msgstr "Spojka kalendára Evolution"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
-msgid "Configure the GnomeCal conduit"
-msgstr "Nastavenie spojky GnomeCal"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
-msgid "Evolution ToDo conduit "
-msgstr "Spojka ToDo Evolution"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
-msgid "Configure the todo conduit"
-msgstr "Nastavenie spojky todo"