Updated Slovak translation.

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

	* sk.po: Updated Slovak translation.

svn path=/trunk/; revision=12766

2 files changed, 501 insertions, 437 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 63f4520d12..9d85bda086 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-11  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation.
+
 2001-09-10  Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* ga.po: Updated Irish file
diff --git a/po/sk.po b/po/sk.po
index 48f5db33b9..706a948e67 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,9 +3,9 @@
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 0.13.99\n"
-"POT-Creation-Date: 2001-09-07 10:26+0200\n"
-"PO-Revision-Date: 2001-09-07 10:57CET\n"
+"Project-Id-Version: evolution 0.15\n"
+"POT-Creation-Date: 2001-09-11 09:54+0200\n"
+"PO-Revision-Date: 2001-09-11 10:53CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -665,38 +665,38 @@ msgstr "Vytváracie rozhranie pre rozhranie adresu z Adresára."
 msgid "Factory for the sample Addressbook control"
 msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Adresár"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
 #: calendar/gui/dialogs/comp-editor-util.c:281
 #: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-shortcuts.c:1063
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
 msgid "Folder containing contact information"
 msgstr "Priečinok obsahujúci informácie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:70
+#: addressbook/gui/component/addressbook-component.c:68
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:70
+#: addressbook/gui/component/addressbook-component.c:68
 msgid "LDAP server containing contact information"
 msgstr "LDAP server obsahujúci informácie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:388
+#: addressbook/gui/component/addressbook-component.c:386
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:388
+#: addressbook/gui/component/addressbook-component.c:386
 msgid "New _Contact"
 msgstr "Nový _kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:389
+#: addressbook/gui/component/addressbook-component.c:387
 msgid "New Contact List"
 msgstr "Nový zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:389
+#: addressbook/gui/component/addressbook-component.c:387
 msgid "New Contact _List"
 msgstr "Nový _zoznam kontaktov"
 
@@ -910,7 +910,7 @@ msgstr "Pokročilé..."
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:925
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktoré zobrazí prehliadač priečinku"
 
@@ -949,13 +949,13 @@ msgstr "Otázka pre adresár..."
 
 #: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:310
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Edit Contact Info"
 msgstr "Upraviť kontakt"
 
 #: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:383
+#: addressbook/gui/component/select-names/e-select-names-popup.c:504
 msgid "Add to Contacts"
 msgstr "Pridať do kontaktov"
 
@@ -979,30 +979,43 @@ 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:156
-#: addressbook/gui/component/select-names/e-select-names.c:729
+#: addressbook/gui/component/select-names/e-select-names-popup.c:164
+#: addressbook/gui/component/select-names/e-select-names.c:755
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:543 shell/e-shortcuts-view.c:181
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#: addressbook/gui/component/select-names/e-select-names-popup.c:179
 msgid "Remove All"
 msgstr "Odstrániť všetky"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#: addressbook/gui/component/select-names/e-select-names-popup.c:203
 msgid "Send HTML Mail?"
 msgstr "Poslať poštu HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:368
+#: addressbook/gui/component/select-names/e-select-names-popup.c:418
+#, c-format
+msgid "(%d not shown)"
+msgstr "(%d nezobrazených)"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:432
+msgid "Edit Contact List"
+msgstr "Upraviť zoznam kontaktov"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:453
+msgid "Unnamed Contact List"
+msgstr "Zoznam kontaktov bez mena"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:527
 msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
-#: addressbook/gui/component/select-names/e-select-names.c:487
+#: addressbook/gui/component/select-names/e-select-names.c:521
 msgid "Unable to get local storage.  This should never happen."
 msgstr "Nepodarilo sa získať lokálny sklad. To by sa nikdy nemalo stať."
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:594
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adresára"
 
@@ -1120,7 +1133,7 @@ msgstr "_Kontakty..."
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:1483 filter/filter.glade.h:8
-#: mail/folder-browser.c:1318 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1310 mail/mail-config.glade.h:94
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -2860,22 +2873,6 @@ msgstr "_Upraviť schôdzku"
 msgid "No description available."
 msgstr "Popis nie je k dispozícii."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:825
-#: calendar/gui/alarm-notify/alarm-queue.c:1124
-#: calendar/gui/alarm-notify/alarm-queue.c:1180
-msgid "Reminder of your appointment at "
-msgstr "Pripomenúť schôdzku o "
-
-#: calendar/gui/alarm-notify/alarm-queue.c:1116
-msgid "Snooze"
-msgstr "Opakovať"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1129
-#: calendar/gui/alarm-notify/alarm-queue.c:1184
-msgid "Ok"
-msgstr "Ok"
-
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
@@ -2925,7 +2922,7 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:454
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3062,7 +3059,7 @@ msgstr "Nedefinovaná"
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:360
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1430
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1442
 #: mail/mail-accounts.c:144 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:49
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
@@ -3132,9 +3129,9 @@ msgstr "Kalendár"
 msgid "Folder containing appointments and events"
 msgstr "Priečinok obsahujúci schôdzky a udalosti"
 
-#: calendar/gui/component-factory.c:66 calendar/gui/print.c:1707
-#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
-#: shell/e-shortcuts.c:1060 views/tasks/galview.xml.h:1
+#: calendar/gui/component-factory.c:66 my-evolution/e-summary-tasks.c:212
+#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1060
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Úlohy"
 
@@ -3163,23 +3160,23 @@ msgstr "Nová ú_loha"
 msgid "The URI that the calendar will display"
 msgstr "URI, ktoré bude kalendár zobrazovať"
 
-#: calendar/gui/dialogs/alarm-options.c:357
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Zvukové alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:366
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "Alarmy správami"
 
-#: calendar/gui/dialogs/alarm-options.c:375
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Poštové alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:384
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Programové alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:393
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Neznáme alarmy"
 
@@ -3632,23 +3629,23 @@ msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
 msgid " to "
 msgstr "u do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
 msgid " (Completed "
 msgstr " (Dokončený "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
 msgid "Completed "
 msgstr "Dokončený "
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
 msgid " (Due "
 msgstr " (Termín do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
 msgid "Due "
 msgstr "Termín do "
 
@@ -3675,12 +3672,12 @@ msgstr "Položka denníka - %s"
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:860 mail/mail-callbacks.c:1524
+#: calendar/gui/dialogs/comp-editor.c:860 mail/mail-callbacks.c:1653
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Prepísať súbor?"
 
-#: calendar/gui/dialogs/comp-editor.c:864 mail/mail-callbacks.c:1530
+#: calendar/gui/dialogs/comp-editor.c:864 mail/mail-callbacks.c:1659
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -4005,8 +4002,8 @@ msgstr "_Pozvať ostatných"
 msgid "_Other Organizer"
 msgstr "_Iný organizátor"
 
-#: calendar/gui/dialogs/recurrence-page.c:417 calendar/gui/print.c:1839
-#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+#: calendar/gui/dialogs/recurrence-page.c:417 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -4125,7 +4122,7 @@ msgid "Progress"
 msgstr "Priebeh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:896
+#: my-evolution/e-summary-preferences.c:898
 msgid "URL:"
 msgstr "URL:"
 
@@ -4216,8 +4213,8 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1283
-#: shell/e-shortcuts-view.c:383
+#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1275
+#: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "_Otvoriť"
 
@@ -4299,7 +4296,7 @@ msgstr "Dátum štartu"
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1051
-#: shell/e-storage-set-view.c:1479
+#: shell/e-storage-set-view.c:1418
 msgid "Summary"
 msgstr "Súhrn"
 
@@ -4319,7 +4316,7 @@ msgstr "%02i rozdelení minúty"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4332,13 +4329,11 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:759
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "popoludní"
 
@@ -4673,201 +4668,201 @@ msgstr "Organizátor musí byť nastavený."
 msgid "Could not create the component editor factory"
 msgstr "Nie je možné vytvoriť vytváracie rozhranie pre komponent editora"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:429
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
 msgid "We"
 msgstr "St"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
 msgid "Th"
 msgstr "Št"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
 msgid "Fr"
 msgstr "Pi"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1815
+#: calendar/gui/print.c:1827
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vybraný deň (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
+#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1835
+#: calendar/gui/print.c:1847
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1846
+#: calendar/gui/print.c:1858
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vybraný týždeň (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1854
+#: calendar/gui/print.c:1866
 msgid "Selected month (%b %Y)"
 msgstr "Vybraný mesiac (%b - %Y)"
 
 #. Year
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1873
 msgid "Selected year (%Y)"
 msgstr "Vybraný rok (%Y)"
 
-#: calendar/gui/print.c:2200
+#: calendar/gui/print.c:2214
 msgid "Print Calendar"
 msgstr "Tlačiť kalendár"
 
-#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1933 my-evolution/e-summary.c:511
+#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
+#: mail/mail-callbacks.c:2062 my-evolution/e-summary.c:525
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
-#: calendar/gui/print.c:2317
+#: calendar/gui/print.c:2331
 msgid "Print Item"
 msgstr "Tlačiť položku"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2412
 msgid "Print Setup"
 msgstr "Nastavenie tlačiarne"
 
@@ -5315,37 +5310,37 @@ msgstr "Nie je možné načítať %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie je možné načítať %s: V module nie je inicializačný kód."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:207
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s služba pre %s na %s"
 
-#: camel/camel-remote-store.c:252
+#: camel/camel-remote-store.c:264
 msgid "Connection cancelled"
 msgstr "Spojenie zrušené"
 
-#: camel/camel-remote-store.c:255
+#: camel/camel-remote-store.c:267
 #: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie je možné spojenie s %s (port %d): %s"
 
-#: camel/camel-remote-store.c:256
+#: camel/camel-remote-store.c:268
 msgid "(unknown host)"
 msgstr "(neznámy hostiteľ)"
 
-#: camel/camel-remote-store.c:349 camel/camel-remote-store.c:411
-#: camel/camel-remote-store.c:474
+#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
+#: camel/camel-remote-store.c:486
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
-#: camel/camel-remote-store.c:477
+#: camel/camel-remote-store.c:489
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočakávane zrušil spojenie: %s"
@@ -5455,7 +5450,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:485
+#: camel/providers/imap/camel-imap-store.c:487
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -5765,28 +5760,28 @@ msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
 
-#: camel/providers/imap/camel-imap-store.c:508
+#: camel/providers/imap/camel-imap-store.c:510
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný IMAP serverom %s"
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:520
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:542
+#: camel/providers/imap/camel-imap-store.c:544
 #, 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:557
+#: camel/providers/imap/camel-imap-store.c:559
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:585
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5797,12 +5792,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:882
+#: camel/providers/imap/camel-imap-store.c:884
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1083
+#: camel/providers/imap/camel-imap-store.c:1085
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovský priečinok nesmie obsahovať podpriečinky"
 
@@ -5836,7 +5831,9 @@ msgstr "Štandardný Unixový súbor mbox"
 
 #: camel/providers/local/camel-local-provider.c:71
 msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Pre čítanie a ukladanie lokálnej pošty v priečinkov v štandardnom formáte Unix mbox."
+msgstr ""
+"Pre čítanie a ukladanie lokálnej pošty v priečinkov v štandardnom formáte "
+"Unix mbox."
 
 #: camel/providers/local/camel-local-store.c:127
 #: camel/providers/local/camel-spool-store.c:111
@@ -5960,7 +5957,7 @@ msgstr "Nie je možné odstrániť priečinok `%s': %s"
 msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
-#: camel/providers/local/camel-maildir-store.c:276
+#: camel/providers/local/camel-maildir-store.c:285
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie je možné prehľadať priečinok `%s': %s"
@@ -6054,15 +6051,17 @@ msgstr "Priečinok `%s' nie je prázdny. Neodstránený."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-spool-summary.c:379
-msgid "Summarising folder"
-msgstr "Vytváram súhrn priečinku"
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931
+msgid "Storing folder"
+msgstr "Ukladám priečinok"
 
 #: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Nie je možné otvoriť priečinok: %s: vytváram súhrn od pozície %ld: %s"
+msgid "Could not open folder: %s: %s"
+msgstr "Nie je možné otvoriť priečinok %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -6072,21 +6071,15 @@ msgstr "Kritická chyba spracovania správy na pozícii %ld v priečinku %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
 #, c-format
-msgid "Cannot summarize folder: %s: %s"
-msgstr "Nie je možné vytvoriť súhrn priečinku: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931
-msgid "Synchronising folder"
-msgstr "Synchronizujem priečinok"
+msgid "Cannot check folder: %s: %s"
+msgstr "Nie je možné skontrolovať priečinok: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
 #, c-format
-msgid "Could not open folder to summarize: %s: %s"
-msgstr "Nie je možné otvoriť priečinok pre vytvorenie súhrnu: %s: %s"
+msgid "Could not open file: %s: %s"
+msgstr "Nie je možné otvoriť súbor %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -6184,17 +6177,22 @@ msgstr "Lokálne priečinky nie je možné premenovať"
 msgid "Spool folders cannot be deleted"
 msgstr "Lokálne priečinky nie je možné odstrániť"
 
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-spool-summary.c:379
+msgid "Summarising folder"
+msgstr "Vytváram súhrn priečinku"
+
+#: camel/providers/local/camel-spool-summary.c:384
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Nie je možné otvoriť priečinok: %s: vytváram súhrn od pozície %ld: %s"
+
 #: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nie je možné vytvoriť súhrn: %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:649
-#: camel/providers/local/camel-spool-summary.c:936
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Nie je možné otvoriť priečinok pre vytvorenie súhrnu: %s: %s"
-
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -6218,6 +6216,11 @@ msgstr ""
 "Nie je možné synchronizovať priečinok fronty %s: %s\n"
 "Priečinok je asi poškodený, kópia uložená do `%s'"
 
+#: camel/providers/local/camel-spool-summary.c:936
+#, c-format
+msgid "Could not file: %s: %s"
+msgstr "Nie je uložiť: %s: %s"
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -6707,33 +6710,33 @@ msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
 msgid "DATA response error: %s: mail not sent"
 msgstr "Chyba odpovede DATA: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 #, 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:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 #, 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:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1086
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Chyba odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1111
 #, 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:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1130
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Chyba odpovede QUIT: %s: nie je kritická"
@@ -6796,52 +6799,52 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:326
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresár"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:357
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:363
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:374
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:388
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 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:397
+#: composer/e-msg-composer-hdrs.c:396
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -6854,7 +6857,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Priložiť súbor"
 
-#: composer/e-msg-composer.c:670
+#: composer/e-msg-composer.c:669
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -6863,7 +6866,7 @@ msgstr ""
 "Nie je možné otvoriť súbor %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:683
+#: composer/e-msg-composer.c:682
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -6872,29 +6875,29 @@ msgstr ""
 "Chyba pri čítaní súboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:864
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:873
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:877
 msgid "File exists, overwrite?"
 msgstr "Súbor existuje, prepísať ho?"
 
-#: composer/e-msg-composer.c:900
+#: composer/e-msg-composer.c:899
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:918
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:989
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -6902,16 +6905,16 @@ msgstr ""
 "Nei je možné otvoriť priečinok na koncepty pre tento účet.\n"
 "Chcete použiť štandardný priečinok na koncepty?"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1042
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prístupe k súboru: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1050
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je možné získať správu z editora"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1056
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -6920,7 +6923,7 @@ msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1062
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -6929,7 +6932,7 @@ msgstr ""
 "Nepodarilo sa skrátiť súbor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6938,7 +6941,7 @@ msgstr ""
 "Chyba pri automatickom ukladaní správ: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1171
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -6946,7 +6949,7 @@ msgstr ""
 "Ximian Evolution našiel neuložené súbory z predchádzajúceho sedenia.\n"
 "Chcete sa pokúsiť o ich záchranu?"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1319
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -6956,27 +6959,27 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:1327
+#: composer/e-msg-composer.c:1326
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenená správa"
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1349
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1498
 msgid "Insert File"
 msgstr "Vložiť súbor"
 
-#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
+#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2315
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:2406
+#: composer/e-msg-composer.c:2405
 msgid "Could not create composer window."
 msgstr "Nie je možné vytvoriť okno editora správ."
 
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:348
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -6984,7 +6987,7 @@ msgstr ""
 "Nie je možné vytvoriť okno pre písanie správ, pretože ste ešte\n"
 "nenastavili žiadne identity pre poštový komponent."
 
-#: composer/evolution-composer.c:374
+#: composer/evolution-composer.c:363
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie je možné inicializovať editor správ Evolution."
 
@@ -7202,6 +7205,11 @@ msgstr "zadaný čas"
 msgid "a time relative to the current time"
 msgstr "čas relatívny k aktuálnemu času"
 
+#. The dialog
+#: filter/filter-datespec.c:394
+msgid "Select a time to compare against"
+msgstr "Vyberte čas, s ktorým sa má porovnávať"
+
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
@@ -7444,7 +7452,7 @@ msgstr "Odpovedaná"
 msgid "Score"
 msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1109
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1233
 msgid "Sender"
 msgstr "Odosielateľ"
 
@@ -7579,30 +7587,24 @@ msgstr "Importujem..."
 msgid "Please wait"
 msgstr "Prosím, čakajte"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:687
+#: importers/elm-importer.c:171 importers/netscape-importer.c:701
 #: importers/pine-importer.c:438
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importujem %s ako %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:780
-#: importers/pine-importer.c:571
+#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/pine-importer.c:576
 #, c-format
 msgid "Scanning %s"
 msgstr "Prehľadávam %s"
 
-#: importers/elm-importer.c:526 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:951 importers/pine-importer.c:732
-#: shell/e-shell-importer.c:701 shell/importer/intelligent.c:194
-msgid "Import"
-msgstr "Import"
-
-#: importers/elm-importer.c:531 importers/netscape-importer.c:956
-#: importers/pine-importer.c:737 mail/component-factory.c:95
+#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/pine-importer.c:739 mail/component-factory.c:95
 msgid "Mail"
 msgstr "Pošta"
 
-#: importers/elm-importer.c:554
+#: importers/elm-importer.c:548
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -7610,15 +7612,19 @@ msgstr ""
 "Evolution našiel poštové súbory Elm.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/elm-importer.c:583
-msgid "Elm mail"
-msgstr "Pošta Elm"
+#: importers/elm-importer.c:577
+msgid "Elm"
+msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:742
+#: importers/evolution-gnomecard-importer.c:230
+msgid "GnomeCard:"
+msgstr "GnomeCard:"
+
+#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:744
 msgid "Addressbook"
 msgstr "Adresár"
 
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:250
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7630,19 +7636,19 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje vaše staré dáta Netscape"
 
-#: importers/netscape-importer.c:883 importers/pine-importer.c:667
+#: importers/netscape-importer.c:897 importers/pine-importer.c:672
 msgid "Scanning directory"
 msgstr "Prehľadávam priečinok"
 
-#: importers/netscape-importer.c:892
+#: importers/netscape-importer.c:906
 msgid "Starting import"
 msgstr "Spúšťam import"
 
-#: importers/netscape-importer.c:961
+#: importers/netscape-importer.c:972
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: importers/netscape-importer.c:986
+#: importers/netscape-importer.c:993
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7654,7 +7660,7 @@ msgstr ""
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuje vaše staré dáta Pine"
 
-#: importers/pine-importer.c:768
+#: importers/pine-importer.c:765
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7662,9 +7668,9 @@ msgstr ""
 "Evolution našiel poštové súbory Pine.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/pine-importer.c:796
-msgid "Pine mail"
-msgstr "Pošta Pine"
+#: importers/pine-importer.c:793
+msgid "Pine"
+msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
@@ -7718,27 +7724,27 @@ msgstr "Virtuálny priečinok s odpadkami"
 msgid "This folder cannot contain messages."
 msgstr "Tento priečinok nemôže obsahovať správy."
 
-#: mail/component-factory.c:344
+#: mail/component-factory.c:355
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:344
+#: mail/component-factory.c:355
 msgid "Change this folder's properties"
 msgstr "Zmení vlastnosti tohto priečinku"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:777
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:777
 msgid "New _Mail Message"
 msgstr "Nová _správa"
 
-#: mail/component-factory.c:797
+#: mail/component-factory.c:808
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je možné inicializovať poštový komponent Evolution."
 
-#: mail/component-factory.c:974
+#: mail/component-factory.c:985
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať sklad u shellu"
 
@@ -7756,124 +7762,124 @@ msgstr "Vlastnosti"
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
 
-#: mail/folder-browser.c:905
+#: mail/folder-browser.c:897
 msgid "Create vFolder from Search"
 msgstr "Vytvoriť vPriečinok z výsledku hľadania"
 
-#: mail/folder-browser.c:1250
+#: mail/folder-browser.c:1242
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1245
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1248
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1251
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/folder-browser.c:1265
+#: mail/folder-browser.c:1257
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1268
+#: mail/folder-browser.c:1260
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/folder-browser.c:1271
+#: mail/folder-browser.c:1263
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/folder-browser.c:1274
+#: mail/folder-browser.c:1266
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1285 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1277 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/folder-browser.c:1287 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1279 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
-#: mail/folder-browser.c:1289
+#: mail/folder-browser.c:1281
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/folder-browser.c:1294 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/folder-browser.c:1296 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1290 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1292
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/folder-browser.c:1303 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: mail/folder-browser.c:1305 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/folder-browser.c:1307
+#: mail/folder-browser.c:1299
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1301
 msgid "Mark as Unim_portant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/folder-browser.c:1314
+#: mail/folder-browser.c:1306
 msgid "_Move to Folder..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: mail/folder-browser.c:1316
+#: mail/folder-browser.c:1308
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:1320 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1312 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1317
 msgid "Add Sender to Address Book"
 msgstr "Pridať odosielateľa do adresára"
 
-#: mail/folder-browser.c:1330
+#: mail/folder-browser.c:1322
 msgid "Apply Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:1334
+#: mail/folder-browser.c:1326
 msgid "Create Ru_le From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/folder-browser.c:1492
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:1495
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
@@ -7946,11 +7952,15 @@ msgstr "Editor diskusných skupín Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-account-gui.c:1010
+#: mail/mail-account-gui.c:945
+msgid "Could not save signature file."
+msgstr "Nepodarilo sa uložiť súbor podpisu."
+
+#: mail/mail-account-gui.c:1022
 msgid "Save signature"
 msgstr "Uložiť podpis"
 
-#: mail/mail-account-gui.c:1016
+#: mail/mail-account-gui.c:1028
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -7960,7 +7970,7 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: mail/mail-account-gui.c:1597
+#: mail/mail-account-gui.c:1609
 msgid "You may not create two accounts with the same name."
 msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
 
@@ -8053,7 +8063,20 @@ msgstr ""
 msgid "You have not set a mail transport method"
 msgstr "Nemáte nastavený spôsob prenosu pošty"
 
-#: mail/mail-callbacks.c:218
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:216
+msgid ""
+"You are sending an HTML-formatted mail, but the following recipients' "
+"contact records do not indicate that they want to receive such messages:\n"
+msgstr ""
+"Posielate správu formátovanú ako HTML, ale záznamy o týchto adresátoch "
+"neobsahujú informáciu, že chcú dostávať takto formátovanú poštu:\n"
+
+#: mail/mail-callbacks.c:226
+msgid "Send anyway?"
+msgstr "Poslať aj tak?"
+
+#: mail/mail-callbacks.c:268
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8061,7 +8084,7 @@ msgstr ""
 "Táto správa nemá predmet.\n"
 "Naozaj ju chcete poslať?"
 
-#: mail/mail-callbacks.c:262
+#: mail/mail-callbacks.c:312
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8069,49 +8092,54 @@ msgstr ""
 "Kedže je zoznam kontaktov, ktorý posielate, nastavený tak, aby skryl adresy, "
 "táto správa bude obsahovať iba príjemcov Bcc."
 
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:316
 msgid "This message contains only Bcc recipients."
 msgstr "Táto správa obsahuje iba adresátov Bcc."
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:320
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Je možné, že poštový server zverejní zoznam príjemcov pridaním hlavičky Apparently-To.\n"
+"Je možné, že poštový server zverejní zoznam príjemcov pridaním hlavičky "
+"Apparently-To.\n"
 "Poslať aj tak?"
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:414
+msgid "This message contains invalid recipients:"
+msgstr "Táto správa obsahuje neplatných adresátov:"
+
+#: mail/mail-callbacks.c:447
 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:424
+#: mail/mail-callbacks.c:545
 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:666
+#: mail/mail-callbacks.c:774
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
-#: mail/mail-callbacks.c:671
+#: mail/mail-callbacks.c:779
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Dňa %a, %Y-%m-%d at %H:%M, %%s napísal:"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1153
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:1031
+#: mail/mail-callbacks.c:1155
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:1400
+#: mail/mail-callbacks.c:1529
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Naozaj chcete upraviť všetkých %d správ?"
 
-#: mail/mail-callbacks.c:1422
+#: mail/mail-callbacks.c:1551
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8119,7 +8147,7 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:1456
+#: mail/mail-callbacks.c:1585
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8127,28 +8155,28 @@ msgstr ""
 "Iba správy z priečinku Odoslané je možné\n"
 "znovu poslať."
 
-#: mail/mail-callbacks.c:1468
+#: mail/mail-callbacks.c:1597
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: mail/mail-callbacks.c:1489
+#: mail/mail-callbacks.c:1618
 msgid "No Message Selected"
 msgstr "Žiadna vybraná správa"
 
-#: mail/mail-callbacks.c:1574
+#: mail/mail-callbacks.c:1703
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:1576
+#: mail/mail-callbacks.c:1705
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:1721 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1850 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varovanie"
 
-#: mail/mail-callbacks.c:1726
+#: mail/mail-callbacks.c:1855
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8160,11 +8188,11 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto správy?"
 
-#: mail/mail-callbacks.c:1733
+#: mail/mail-callbacks.c:1862
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
-#: mail/mail-callbacks.c:1838
+#: mail/mail-callbacks.c:1967
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8173,19 +8201,19 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1848
+#: mail/mail-callbacks.c:1977
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:1894
+#: mail/mail-callbacks.c:2023
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:1940
+#: mail/mail-callbacks.c:2069
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
-#: mail/mail-callbacks.c:2024
+#: mail/mail-callbacks.c:2153
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
@@ -8219,8 +8247,10 @@ msgid ""
 "sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Prosím, zadajte informácie o vašom serveri pre odosielanú poštu. Ak neviete,\n"
-"ktorý typ serveru použiť, kontaktujte vášho administrátora alebo poskytovateľa\n"
+"Prosím, zadajte informácie o vašom serveri pre odosielanú poštu. Ak "
+"neviete,\n"
+"ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
+"poskytovateľa\n"
 "pripojenia na Internet."
 
 #: mail/mail-config-druid.c:143
@@ -8243,21 +8273,11 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
-#: mail/mail-config.c:1587
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Doručená pošta"
-
-#: mail/mail-config.c:1829
+#: mail/mail-config.c:1852
 msgid "Checking Service"
 msgstr "Kontrolujem službu"
 
-#: mail/mail-config.c:1900 mail/mail-config.c:1903
+#: mail/mail-config.c:1923 mail/mail-config.c:1926
 msgid "Connecting to server..."
 msgstr "Pripájam sa na server..."
 
@@ -8825,84 +8845,93 @@ msgstr "Komu"
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1306
+#: mail/mail-format.c:1307
 msgid "No GPG/PGP program configured."
 msgstr "Nenastavený žiadny program GPG/PGP."
 
-#: mail/mail-format.c:1322
+#: mail/mail-format.c:1323
 msgid "Encrypted message not displayed"
 msgstr "Zašifrovaná správa nie je zobrazená"
 
-#: mail/mail-format.c:1333
+#: mail/mail-format.c:1334
 msgid "Encrypted message"
 msgstr "Zašifrovaná správa"
 
-#: mail/mail-format.c:1334
+#: mail/mail-format.c:1335
 msgid "Click icon to decrypt."
 msgstr "Kliknite na ikonu pre dešifrovanie."
 
-#: mail/mail-format.c:1389
+#: mail/mail-format.c:1390
 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:1400
+#: mail/mail-format.c:1401
 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:2058
+#: mail/mail-format.c:2076
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:2072
+#: mail/mail-format.c:2090
 #, 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:2077
+#: mail/mail-format.c:2095
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:2124
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: mail/mail-format.c:2114
+#: mail/mail-format.c:2132
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:2119
+#: mail/mail-format.c:2137
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: mail/mail-local.c:330
+#: mail/mail-local.c:529
+msgid "Reconfiguring folder"
+msgstr "Znovu nastavujem priečinok"
+
+#: mail/mail-local.c:602
+#, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s: %s"
+msgstr ""
+"Nie je možné uložiť metainformácie priečinku, asi zistíte,\n"
+"že ho nie je možné ani otvoriť: %s: %s"
+
+#: mail/mail-local.c:656
 #, c-format
-msgid "No such folder /%s"
-msgstr "Priečinok /%s neexistuje"
+msgid "Cannot save folder metainfo to %s: %s"
+msgstr "Nie je možné uložiť metainformácie priečinku do %s: %s"
 
-#: mail/mail-local.c:460
+#: mail/mail-local.c:707
 #, c-format
-msgid "Registering '%s'"
-msgstr "Registrujem '%s'"
+msgid "Cannot delete folder metadata %s: %s"
+msgstr "Nie je možné odstrániť metainformácie priečinku %s: %s"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:934
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mení priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:949
 #, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Nie je možné uložiť metainformácie do priečinku, asi zistíte,\n"
-"že ho nie je možné ani otvoriť: %s"
+msgid "%s may not be reconfigured because it is not a local folder"
+msgstr "%s nie je možné znovu nastaviť, pretože to nie je lokálny priečinok"
 
-#: mail/mail-local.c:908
+#: mail/mail-local.c:971
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -8910,11 +8939,11 @@ msgstr ""
 "Ak nemôžete otvoriť túto poštovú schránku, potom\n"
 "ju budete musieť opraviť ručne."
 
-#: mail/mail-local.c:1001
+#: mail/mail-local.c:1062
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nemôžete zmeniž formát nelokálnych priečinkov."
 
-#: mail/mail-local.c:1012
+#: mail/mail-local.c:1072
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znovu nastaviť %s"
@@ -8969,7 +8998,7 @@ msgstr "Posielam správu %d z %d"
 msgid "Failed on message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: mail/mail-ops.c:738 mail/mail-send-recv.c:500
+#: mail/mail-ops.c:738 mail/mail-send-recv.c:513
 msgid "Complete."
 msgstr "Dokončené."
 
@@ -9014,45 +9043,40 @@ msgstr "Otváram priečinok %s"
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1403
-#, c-format
-msgid "Creating folder %s"
-msgstr "Vytváram priečinok %s"
-
-#: mail/mail-ops.c:1473
+#: mail/mail-ops.c:1399
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1495
 #, c-format
-msgid "Synchronizing '%s'"
-msgstr "Synchronizujem '%s'"
+msgid "Storing folder '%s'"
+msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1620
+#: mail/mail-ops.c:1546
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: mail/mail-ops.c:1656
+#: mail/mail-ops.c:1582
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1705
+#: mail/mail-ops.c:1631
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1772
+#: mail/mail-ops.c:1698
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Získavam %d správ"
 
-#: mail/mail-ops.c:1858
+#: mail/mail-ops.c:1784
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukladám %d správ"
 
-#: mail/mail-ops.c:1938
+#: mail/mail-ops.c:1864
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9061,7 +9085,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1964
+#: mail/mail-ops.c:1890
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9070,11 +9094,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2038
+#: mail/mail-ops.c:1964
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2054
+#: mail/mail-ops.c:1980
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9083,12 +9107,12 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2085
+#: mail/mail-ops.c:2011
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2154
+#: mail/mail-ops.c:2080
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
@@ -9133,19 +9157,38 @@ msgstr "Odpovedá:"
 msgid "Cancelling..."
 msgstr "Ruším..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:241
+#, c-format
+msgid "Server: %s, Type: %s"
+msgstr "Server: %s, Typ: %s"
+
+#: mail/mail-send-recv.c:243
+#, c-format
+msgid "Path: %s, Type: %s"
+msgstr "Cesta: %s, Typ: %s"
+
+#: mail/mail-send-recv.c:245
+#, c-format
+msgid "Type: %s"
+msgstr "Typ: %s"
+
+#: mail/mail-send-recv.c:270
 msgid "Send & Receive Mail"
 msgstr "Príjem a odoslanie pošty"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:271
+msgid "Cancel All"
+msgstr "Zrušiť všetko"
+
+#: mail/mail-send-recv.c:325
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: mail/mail-send-recv.c:313 mail/mail-send-recv.c:366
+#: mail/mail-send-recv.c:326 mail/mail-send-recv.c:379
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: mail/mail-send-recv.c:496
+#: mail/mail-send-recv.c:509
 msgid "Cancelled."
 msgstr "Zrušené."
 
@@ -9256,36 +9299,36 @@ msgstr "Prijaté"
 msgid "Size"
 msgstr "Veľkosť"
 
-#: mail/subscribe-dialog.c:174
+#: mail/subscribe-dialog.c:175
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Prechádzam priečinky pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:176
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Prechádzam koreňové priečinky na \"%s\""
 
-#: mail/subscribe-dialog.c:275
+#: mail/subscribe-dialog.c:276
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prihlasujem si priečinok \"%s\""
 
-#: mail/subscribe-dialog.c:277
+#: mail/subscribe-dialog.c:278
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z priečinku \"%s\""
 
-#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1249 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Priečinok"
 
-#: mail/subscribe-dialog.c:1490
+#: mail/subscribe-dialog.c:1491
 msgid "No server has been selected"
 msgstr "Nebol vybraný žiadny server"
 
-#: mail/subscribe-dialog.c:1547
+#: mail/subscribe-dialog.c:1548
 msgid "Please select a server."
 msgstr "Prosím, vyberte server."
 
@@ -9358,7 +9401,7 @@ msgstr "Súhrn pošty"
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
 #: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:605
 msgid "KBOS:ZSAM:EGAA"
 msgstr "LZIB:LZTT:LKPR"
 
@@ -9366,35 +9409,35 @@ msgstr "LZIB:LZTT:LKPR"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Slovo dňa"
 
-#: my-evolution/e-summary-preferences.c:448
+#: my-evolution/e-summary-preferences.c:449
 msgid "Quotes of the Day"
 msgstr "Citát dňa"
 
-#: my-evolution/e-summary-preferences.c:876
+#: my-evolution/e-summary-preferences.c:878
 msgid "Add a news feed"
 msgstr "Pridať nový kanál správ"
 
-#: my-evolution/e-summary-preferences.c:884
+#: my-evolution/e-summary-preferences.c:886
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Zadajte URL nového kanálu správ, ktorý chcete pridať"
 
-#: my-evolution/e-summary-preferences.c:888
+#: my-evolution/e-summary-preferences.c:890
 msgid "Name:"
 msgstr "Meno:"
 
-#: my-evolution/e-summary-preferences.c:1423
+#: my-evolution/e-summary-preferences.c:1425
 msgid "Summary Settings"
 msgstr "Nastavenie súhrnu"
 
-#: my-evolution/e-summary-rdf.c:281
+#: my-evolution/e-summary-rdf.c:277
 msgid "There was an error downloading news feed"
 msgstr "Nastala chyba počas načítavania kanála správ."
 
-#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#: my-evolution/e-summary-rdf.c:360 my-evolution/e-summary-rdf.c:386
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b> Chyba načítavania RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:479
+#: my-evolution/e-summary-rdf.c:475
 msgid "News Feed"
 msgstr "Kanály správ"
 
@@ -9410,23 +9453,23 @@ msgstr "Moje počasie"
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Server počasia nemohol byť kontaktovaný</b></dd>"
 
-#: my-evolution/e-summary-weather.c:512
+#: my-evolution/e-summary-weather.c:514
 msgid "Weather"
 msgstr "Počasie"
 
-#: my-evolution/e-summary-weather.c:664
+#: my-evolution/e-summary-weather.c:666
 msgid "Regions"
 msgstr "Oblasti"
 
-#: my-evolution/e-summary.c:145
+#: my-evolution/e-summary.c:157
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:486 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Tlač súhrnu"
 
-#: my-evolution/e-summary.c:518
+#: my-evolution/e-summary.c:532
 msgid "Printing of Summary failed"
 msgstr "Tlač súhrnu zlyhala"
 
@@ -9435,12 +9478,12 @@ msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent súhrnu nemohol inicializovať Bonobo.\n"
 
 #: my-evolution/metar.c:29
-msgid "F"
-msgstr "F"
+msgid "°F"
+msgstr "°F"
 
 #: my-evolution/metar.c:29
-msgid "C"
-msgstr "C"
+msgid "°C"
+msgstr "°C"
 
 #: my-evolution/metar.c:33
 msgid "knots"
@@ -10830,25 +10873,25 @@ msgstr "Nie je možné skopírovať priečinok sám do seba."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Zadajte priečinok, kam chcete skopírovať priečinok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:295
 msgid "Copy folder"
 msgstr "Kopírovať priečinok"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Zadajte priečinok, kam presunúť prečinok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:338
 msgid "Move folder"
 msgstr "Presunúť priečinok"
 
-#: shell/e-shell-folder-commands.c:362
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -10857,30 +10900,30 @@ msgstr ""
 "Nie je možné odstrániť priečinok:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:378
+#: shell/e-shell-folder-commands.c:379
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Odstrániť priečinok '%s'"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:388
+#: shell/e-shell-folder-commands.c:389
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Naozaj chcete odstrániť priečinok `%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:463
+#: shell/e-shell-folder-commands.c:464
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Premenovať priečinok '%s'"
 
-#: shell/e-shell-folder-commands.c:467
+#: shell/e-shell-folder-commands.c:468
 msgid "Rename"
 msgstr "Premenovať"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:475
+#: shell/e-shell-folder-commands.c:476
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Meno priečinku:"
@@ -10931,7 +10974,7 @@ msgstr ""
 msgid "New..."
 msgstr "Nová..."
 
-#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
+#: shell/e-shell-folder-title-bar.c:583 shell/e-shell-folder-title-bar.c:584
 msgid "(Untitled)"
 msgstr "(Bez mena)"
 
@@ -10971,12 +11014,12 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku %d."
 
-#: shell/e-shell-importer.c:348
+#: shell/e-shell-importer.c:349
 #, c-format
 msgid "File %s does not exist"
 msgstr "Súbor %s neexistuje"
 
-#: shell/e-shell-importer.c:365
+#: shell/e-shell-importer.c:366
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -10986,11 +11029,11 @@ msgstr ""
 "%s\n"
 "nie je k dispozícii importér."
 
-#: shell/e-shell-importer.c:377
+#: shell/e-shell-importer.c:378
 msgid "Importing"
 msgstr "Importujem"
 
-#: shell/e-shell-importer.c:385
+#: shell/e-shell-importer.c:386
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -10999,17 +11042,17 @@ msgstr ""
 "Importujem %s\n"
 "Začínam %s"
 
-#: shell/e-shell-importer.c:398
+#: shell/e-shell-importer.c:399
 #, c-format
 msgid "Error starting %s"
 msgstr "Chyba pri štarte %s"
 
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:418
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba pri načítavaní %s"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11018,30 +11061,34 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku 1."
 
-#: shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:506
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:557
 msgid "Filename:"
 msgstr "Meno súboru:"
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:562
 msgid "Select a file"
 msgstr "Vyberte súbor"
 
-#: shell/e-shell-importer.c:570
+#: shell/e-shell-importer.c:572
 msgid "File type:"
 msgstr "Typ súboru:"
 
-#: shell/e-shell-importer.c:639
+#: shell/e-shell-importer.c:643
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: shell/e-shell-importer.c:640
+#: shell/e-shell-importer.c:644
 msgid "Select a destination folder for importing this data"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
+#: shell/e-shell-importer.c:705 shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Import"
+
 #: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "Zatváram spojenia..."
@@ -11059,7 +11106,7 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Nie je možné inicializovať rozhranie Evolution Mailer Wizard"
 
-#: shell/e-shell-startup-wizard.c:580
+#: shell/e-shell-startup-wizard.c:584
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11067,10 +11114,23 @@ msgstr ""
 "Prosím, čakajte...\n"
 "Hľadám existujúce nastavenie"
 
-#: shell/e-shell-startup-wizard.c:583
+#: shell/e-shell-startup-wizard.c:587
 msgid "Starting Intelligent Importers"
 msgstr "Spúšťam inteligentné importy"
 
+#: shell/e-shell-startup-wizard.c:705
+#, c-format
+msgid "From %s:"
+msgstr "Od %s:"
+
+#: shell/e-shell-startup-wizard.c:747
+msgid ""
+"Please select the information\n"
+"that you would like to import"
+msgstr ""
+"Prosím, vyberte informácie, ktoré\n"
+"chcete importovať"
+
 #: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Nástroj pre oznamovanie chýb nebol nájdený v $PATH."
@@ -11126,40 +11186,40 @@ msgstr "Pracovať off-line"
 msgid "(No folder displayed)"
 msgstr "(Nezobrazený žiadny priečinok)"
 
-#: shell/e-shell-view.c:1495
+#: shell/e-shell-view.c:1497
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1497
+#: shell/e-shell-view.c:1499
 msgid "(None)"
 msgstr "(Žiadna)"
 
-#: shell/e-shell-view.c:1502
+#: shell/e-shell-view.c:1504
 #, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Ximian Evolution %s"
 
-#: shell/e-shell-view.c:1504
+#: shell/e-shell-view.c:1506
 #, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Ximian Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1544
+#: shell/e-shell-view.c:1546
 msgid "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Ximian Evolution je momentálne on-line. Stlačením tohto tlačidla prejdete do módu "
-"off-line."
+"Ximian Evolution je momentálne on-line. Stlačením tohto tlačidla prejdete do "
+"módu off-line."
 
-#: shell/e-shell-view.c:1551
+#: shell/e-shell-view.c:1553
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution prechádza do módu off-line."
 
-#: shell/e-shell-view.c:1557
+#: shell/e-shell-view.c:1559
 msgid "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Ximian Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete do módu "
-"on-line."
+"Ximian Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete "
+"do módu on-line."
 
 #: shell/e-shell.c:509
 #, c-format
@@ -11216,95 +11276,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Neodstraňovať"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Premenovať skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Premenovať túto skupinu skratiek na:"
 
-#: shell/e-shortcuts-view.c:223
+#: shell/e-shortcuts-view.c:225
 msgid "_Small Icons"
 msgstr "_Malé ikony"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:226
 msgid "Show the shortcuts as small icons"
 msgstr "Zobraziť skratky ako malé ikony"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:228
 msgid "_Large Icons"
 msgstr "_Veľké ikony"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:229
 msgid "Show the shortcuts as large icons"
 msgstr "Zobraziť skratky ako veľké ikony"
 
-#: shell/e-shortcuts-view.c:238
+#: shell/e-shortcuts-view.c:240
 msgid "_New Group..."
 msgstr "_Nová skupina..."
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:241
 msgid "Create a new shortcut group"
 msgstr "Vytvoriť novú skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:243
 msgid "_Remove this Group..."
 msgstr "Odst_rániť túto skupinu..."
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:244
 msgid "Remove this shortcut group"
 msgstr "Odstrániť túto skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:246
 msgid "Re_name this Group..."
 msgstr "_Premenovať túto skupinu..."
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:247
 msgid "Rename this shortcut group"
 msgstr "Premenuje túto skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:252
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skryť panel skratiek"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:253
 msgid "Hide the shortcut bar"
 msgstr "Skryť panel skratiek"
 
-#: shell/e-shortcuts-view.c:370
+#: shell/e-shortcuts-view.c:372
 msgid "Rename shortcut"
 msgstr "Premenovať skratku"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:373
 msgid "Rename selected shortcut to:"
 msgstr "Premenovať túto skratku na:"
 
-#: shell/e-shortcuts-view.c:383
+#: shell/e-shortcuts-view.c:385
 msgid "Open the folder linked to this shortcut"
 msgstr "Otvoriť priečinok skratky v novom okn"
 
-#: shell/e-shortcuts-view.c:385 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Otvoriť v _novom okne"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:387
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Otvorí priečinok spojený s touto skratkou v novom okne"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:390
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:390
 msgid "Rename this shortcut"
 msgstr "Premenuje túto skratku"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:392
 msgid "Re_move"
 msgstr "O_dstrániť"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:392
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrániť túto skratku z panelu skratiek"