[evolution] Updated Slovak translation



commit 976c4ad53540f780833d6978059e5755b762c66a
Author: Dušan Kazik <prescott66 gmail com>
Date:   Tue Feb 3 17:35:23 2015 +0000

    Updated Slovak translation

 po/sk.po |15700 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 8566 insertions(+), 7134 deletions(-)
---
diff --git a/po/sk.po b/po/sk.po
index 74d3d30..0888f69 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,63 +8,44 @@
 # Pavol Klačanský <pavol klacansky com>, 2010, 2011.
 # Marián Čavojský <cavo+gnomel10n cavo sk>, 2011-2013.
 #
-#: ../shell/main.c:555
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2013-12-12 14:59+0000\n"
-"PO-Revision-Date: 2013-09-19 09:17+0200\n"
-"Last-Translator: Marián Čavojský <cavo+gnomel10n cavo sk>\n"
+"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N&component=Miscellaneous\n";
+"POT-Creation-Date: 2015-02-03 05:18+0000\n"
+"PO-Revision-Date: 2015-02-03 16:31+0100\n"
+"Last-Translator: Dušan Kazik <prescott66 gmail com>\n"
 "Language-Team: Slovak <gnome-sk-list gnome org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+"X-Generator: Poedit 1.7.3\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
 msgstr "Tento adresár kontaktov nemohol byť otvorený."
 
 #: ../addressbook/addressbook.error.xml.h:2
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"Tento server adresára kontaktov môže byť nedosiahnuteľný, názov servera môže "
-"byť nesprávne zadaný, alebo vaše sieťové pripojenie môže byť nefunkčné."
+msgid "This address book server might be unreachable or the server name may be misspelled or your network 
connection could be down."
+msgstr "Tento server adresára kontaktov môže byť nedosiahnuteľný, názov servera môže byť nesprávne zadaný, 
alebo vaše sieťové pripojenie môže byť nefunkčné."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid "Failed to authenticate with LDAP server."
 msgstr "Nepodarilo sa overiť totožnosť na serveri LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:4
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Skontrolujte, či ste správne vyhláskovali heslo a či používate podporovanú "
-"metódu prihlasovania. Pamätajte, pri heslách záleží na veľkosti písmen, "
-"možno máte zapnutý CapsLock."
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login 
method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Skontrolujte, či ste správne vyhláskovali heslo a či používate podporovanú metódu prihlasovania. 
Pamätajte, pri heslách záleží na veľkosti písmen, možno máte zapnutý CapsLock."
 
 #: ../addressbook/addressbook.error.xml.h:5
 msgid "This address book server does not have any suggested search bases."
-msgstr ""
-"Tento server adresára kontaktov nemá žiadne navrhované rozsahy pre "
-"vyhľadávanie."
+msgstr "Tento server adresára kontaktov nemá žiadne navrhované rozsahy pre vyhľadávanie."
 
 #: ../addressbook/addressbook.error.xml.h:6
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Tento LDAP server môže použiť staršiu verziu protokolu LDAP, ktorá "
-"nepodporuje túto funkcionalitu, alebo môže byť nenakonfigurovaná. Opýtajte "
-"sa vášho správcu na podporované vyhľadávacie bázy."
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it 
may be misconfigured. Ask your administrator for supported search bases."
+msgstr "Tento LDAP server môže použiť staršiu verziu protokolu LDAP, ktorá nepodporuje túto funkcionalitu, 
alebo môže byť nenakonfigurovaná. Opýtajte sa vášho správcu na podporované vyhľadávacie bázy."
 
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "This server does not support LDAPv3 schema information."
@@ -91,8 +72,7 @@ msgid "This address book will be removed permanently."
 msgstr "Tento adresár kontaktov bude navždy odstránený."
 
 # PŠ: treba skontrolovať kolízie akcelerátorov, v celom programe!
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
 msgid "Do _Not Delete"
 msgstr "_Neodstrániť"
 
@@ -101,15 +81,10 @@ msgid "Delete remote address book &quot;{0}&quot;?"
 msgstr "Odstrániť vzdialený adresár kontaktov „{0}“?"
 
 #: ../addressbook/addressbook.error.xml.h:15
-msgid ""
-"This will permanently remove the address book &quot;{0}&quot; from the "
-"server. Are you sure you want to proceed?"
-msgstr ""
-"Toto nenávratne odstráni adresár kontaktov „{0}“ zo servera. Naozaj to "
-"chcete vykonať?"
+msgid "This will permanently remove the address book &quot;{0}&quot; from the server. Are you sure you want 
to proceed?"
+msgstr "Toto nenávratne odstráni adresár kontaktov „{0}“ zo servera. Naozaj to chcete vykonať?"
 
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../addressbook/addressbook.error.xml.h:16 ../calendar/calendar.error.xml.h:61
 msgid "_Delete From Server"
 msgstr "O_dstrániť zo servera"
 
@@ -128,144 +103,123 @@ msgid "Unable to perform search."
 msgstr "Nepodarilo sa vykonať vyhľadanie."
 
 #: ../addressbook/addressbook.error.xml.h:20
+#, fuzzy
+#| msgid "Unable to open address book"
+msgid "Failed to refresh address book '{0}'"
+msgstr "Nepodarilo sa otvoriť adresár kontaktov"
+
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "Chcete uložiť vaše zmeny?"
 
-#: ../addressbook/addressbook.error.xml.h:21
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "Urobili ste úpravy tohoto kontaktu. Chcete uložiť tieto zmeny?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "Nedá sa presunúť kontakt."
 
-#: ../addressbook/addressbook.error.xml.h:24
-msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"Pokúšate sa presunúť kontakt z jedného adresára kontaktov do druhého, ale "
-"tento kontakt nemohol byť zo zdroja odstránený. Chcete namiesto toho uložiť "
-"kópiu?"
-
 #: ../addressbook/addressbook.error.xml.h:25
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr "Obrázok, ktorý ste vybrali, je veľký. Chcete ho zmenšiť a uložiť?"
+msgid "You are attempting to move a contact from one address book to another but it cannot be removed from 
the source. Do you want to save a copy instead?"
+msgstr "Pokúšate sa presunúť kontakt z jedného adresára kontaktov do druhého, ale tento kontakt nemohol byť 
zo zdroja odstránený. Chcete namiesto toho uložiť kópiu?"
 
 #: ../addressbook/addressbook.error.xml.h:26
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Obrázok, ktorý ste vybrali, je veľký. Chcete ho zmenšiť a uložiť?"
+
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Zmeniť veľkosť"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "_Použiť ako je"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "_Neuložiť"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Nepodarilo sa uložiť {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Chyba pri ukladaní {0} do {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Address '{0}' already exists."
 msgstr "Adresa „{0}“ už existuje."
 
-#: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"Kontakt s touto adresou už existuje. Chcete aj napriek tomu pridať novú "
-"vizitku s takou istou adresou?"
-
 #: ../addressbook/addressbook.error.xml.h:33
-#: ../e-util/e-name-selector-dialog.c:997 ../mail/em-vfolder-editor-rule.c:393
-#: ../modules/mail/em-composer-prefs.c:444
+msgid "A contact already exists with this address. Would you like to add a new card with the same address 
anyway?"
+msgstr "Kontakt s touto adresou už existuje. Chcete aj napriek tomu pridať novú vizitku s takou istou 
adresou?"
+
+#: ../addressbook/addressbook.error.xml.h:34 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8 
../addressbook/gui/widgets/eab-contact-merging.c:723
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4 ../calendar/gui/dialogs/event-page.ui.h:22 
../calendar/gui/dialogs/recurrence-page.ui.h:19 ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../e-util/e-mail-signature-manager.c:327 ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16 
../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
+#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625 ../mail/mail-config.ui.h:53 
../modules/mail/em-composer-prefs.c:397 ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../plugins/email-custom-header/email-custom-header.c:839 
../plugins/publish-calendar/publish-calendar.ui.h:32 ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "_Pridať"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "Niektorá z adries už existuje v tomto zozname kontaktov."
 
-#: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
-msgstr ""
-"Pokúšate sa pridať adresy, z ktorých časť už existuje v zozname. Chcete ich "
-"aj tak pridať?"
-
 #: ../addressbook/addressbook.error.xml.h:36
+msgid "You are trying to add addresses that are part of this list already. Would you like to add them 
anyway?"
+msgstr "Pokúšate sa pridať adresy, z ktorých časť už existuje v zozname. Chcete ich aj tak pridať?"
+
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Preskočiť rovnaké"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Pridať aj rovnaké"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
 msgstr "Zoznam „{0}“ už existuje v tomto zozname kontaktov."
 
-#: ../addressbook/addressbook.error.xml.h:39
-msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
-msgstr ""
-"Zoznam kontaktov s názvom „{0}“ už existuje v tomto zozname kontaktov. "
-"Chcete ho aj tak pridať?"
-
 #: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1251
+msgid "A contact list named '{0}' is already in this contact list. Would you like to add it anyway?"
+msgstr "Zoznam kontaktov s názvom „{0}“ už existuje v tomto zozname kontaktov. Chcete ho aj tak pridať?"
+
+#: ../addressbook/addressbook.error.xml.h:41 ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "Odstránenie kontaktov zlyhalo"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nemáte oprávnenie odstrániť kontakty z tohto adresára kontaktov."
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "Nedá sa pridať nový kontakt"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:44
-msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
-msgstr ""
-"Adresár kontaktov „{0}“ je iba na čítanie a teda nemôže byť upravovaný. "
-"Vyberte si iný adresár kontaktov z bočného panelu v pohľade Kontakty."
-
 #: ../addressbook/addressbook.error.xml.h:45
+msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from 
the side bar in the Contacts view."
+msgstr "Adresár kontaktov „{0}“ je iba na čítanie a teda nemôže byť upravovaný. Vyberte si iný adresár 
kontaktov z bočného panelu v pohľade Kontakty."
+
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr ""
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
-msgid ""
-"Cannot save a contact to the address book '{0}', because it is still "
-"opening. Either wait till it's opened, or select a different address book."
+#: ../addressbook/addressbook.error.xml.h:48
+msgid "Cannot save a contact to the address book '{0}', because it is still opening. Either wait till it's 
opened, or select a different address book."
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:652
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:674
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2955
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1 
../addressbook/gui/contact-editor/e-contact-editor.c:722 
../addressbook/gui/contact-editor/e-contact-editor.c:744
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
@@ -281,15 +235,11 @@ msgstr "Pre_zývka:"
 msgid "_File under:"
 msgstr "Za_radiť pod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Where:"
 msgstr "_Kam:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6 ../calendar/gui/dialogs/event-page.ui.h:16 
../calendar/gui/dialogs/memo-page.ui.h:1 ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "Ka_tegórie…"
 
@@ -297,82 +247,76 @@ msgstr "Ka_tegórie…"
 msgid "Full _Name..."
 msgstr "_Celé meno…"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "Chce prijímať _HTML poštu"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/eab-contact-merging.c:409
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8 
../addressbook/gui/widgets/eab-contact-formatter.c:749 ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:966
 msgid "Email"
 msgstr "Email"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "Chce prijímať _HTML poštu"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "Telefón"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#, fuzzy
+#| msgid "Address"
+msgid "SIP Address"
+msgstr "Adresa"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "Priama komunikácia"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1003
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13 
../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "_Domovská stránka:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:711
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1885
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15 ../calendar/gui/dialogs/event-page.c:709 
../calendar/gui/dialogs/event-page.ui.h:25 ../modules/itip-formatter/itip-view.c:1881
 msgid "_Calendar:"
 msgstr "_Kalendár:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "_Diár:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "_Video rozhovor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "Domovská stránka:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:97
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19 
../modules/cal-config-google/e-cal-config-google.c:93
 msgid "Calendar:"
 msgstr "Kalendár:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "Diár:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "Video rozhovor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
 msgstr "_Blog:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Blog:"
 msgstr "Blog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Addresses"
-msgstr "Webové adresy"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
+msgid "Web Addresses"
 msgstr "Webové adresy"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
@@ -393,21 +337,21 @@ msgid "_Department:"
 msgstr "_Oddelenie:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+msgid "_Office:"
+msgstr "_Kancelária:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Manager:"
 msgstr "_Manažér:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Assistant:"
 msgstr "_Asistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Job"
 msgstr "Zamestnanie"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-msgid "_Office:"
-msgstr "_Kancelária:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Spouse:"
 msgstr "Ma_nžel(ka):"
@@ -420,9 +364,7 @@ msgstr "Dátum na_rodenia:"
 msgid "_Anniversary:"
 msgstr "_Výročie:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37 
../addressbook/gui/widgets/eab-contact-formatter.c:875 ../calendar/gui/e-calendar-view.c:1996
 msgid "Anniversary"
 msgstr "Výročie"
 
@@ -431,9 +373,7 @@ msgstr "Výročie"
 #. Get the icon file for some default category.  Doesn't matter
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
-#: ../calendar/gui/e-calendar-view.c:2277 ../shell/main.c:128
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38 
../addressbook/gui/widgets/eab-contact-formatter.c:874 ../calendar/gui/e-calendar-view.c:1995 
../shell/main.c:127
 msgid "Birthday"
 msgstr "Dátum narodenia"
 
@@ -469,29 +409,18 @@ msgstr "_PO Box:"
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/e-contact-map.c:372
-#: ../addressbook/gui/widgets/eab-contact-display.c:357
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47 
../addressbook/gui/widgets/eab-contact-display.c:356 ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "Domov"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:385
-#: ../addressbook/gui/widgets/eab-contact-display.c:354
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48 
../addressbook/gui/widgets/eab-contact-display.c:353 ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842 ../addressbook/gui/widgets/e-contact-map.c:382
 msgid "Work"
 msgstr "Práca"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:719
-#: ../calendar/gui/e-cal-model.c:3958
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49 
../addressbook/gui/widgets/eab-contact-formatter.c:83 ../addressbook/gui/widgets/eab-contact-formatter.c:512
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909 ../calendar/gui/e-cal-model.c:3034
 msgid "Other"
 msgstr "Iné"
 
@@ -503,79 +432,154 @@ msgstr "Poštová adresa"
 msgid "Notes"
 msgstr "Poznámky"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52 ../calendar/gui/dialogs/comp-editor.c:1249 
../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-preferences-window.c:379
+#: ../e-util/e-send-options.ui.h:41 ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2 
../shell/e-shell-window-actions.c:1085
+msgid "_Help"
+msgstr "_Pomocník"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-msgid "Jabber"
-msgstr "Jabber"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53 ../calendar/gui/dialogs/alarm-dialog.ui.h:15 
../mail/mail-config.ui.h:34
+msgid "Options"
+msgstr "Voľby"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Yahoo"
-msgstr "Yahoo"
+#. This is only shown if the EActivity has a GCancellable.
+#. no flags
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54 
../addressbook/gui/contact-editor/e-contact-editor.c:3683 
../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455 
../addressbook/gui/contact-editor/fullname.ui.h:14 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../addressbook/gui/widgets/eab-contact-merging.c:474 ../addressbook/gui/widgets/eab-contact-merging.c:718 
../addressbook/gui/widgets/eab-gui-util.c:318 ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8 ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2 
../calendar/gui/dialogs/e-delegate-dialog.ui.h:2 ../calendar/gui/dialogs/goto-dialog.ui.h:15
+#: ../calendar/gui/dialogs/recurrence-page.c:2322 ../composer/e-composer-actions.c:267 
../e-util/e-activity-bar.c:340 ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:370 ../e-util/e-categories-dialog.c:82 
../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208
+#: ../e-util/e-charset-combo-box.c:101 ../e-util/e-color-chooser-widget.c:127 
../e-util/e-filter-datespec.c:291 ../e-util/e-html-editor-actions.c:480 ../e-util/e-html-editor-actions.c:573
+#: ../e-util/e-image-chooser-dialog.c:171 ../e-util/e-mail-signature-script-dialog.c:365 
../e-util/e-passwords.c:470 ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180 
../e-util/e-rule-editor.c:282
+#: ../e-util/e-rule-editor.c:776 ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379 
../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548 ../e-util/e-table-config.ui.h:1
+#: ../e-util/e-timezone-dialog.ui.h:2 ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3044 
../e-util/gal-view-instance-save-as-dialog.c:269 ../mail/e-mail-config-window.c:330
+#: ../mail/e-mail-label-dialog.c:196 ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317 
../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738 ../mail/mail-send-recv.c:820
+#: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270 
../modules/backup-restore/evolution-backup-tool.c:886 
../modules/cal-config-caldav/e-caldav-chooser-dialog.c:363
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:187 
../modules/calendar/e-cal-attachment-handler.c:285 
../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3 ../plugins/face/face.c:291
+#: ../plugins/mail-to-task/mail-to-task.c:593 ../plugins/publish-calendar/publish-calendar.c:806 
../plugins/publish-calendar/url-editor-dialog.c:421 ../plugins/save-calendar/save-calendar.c:187
+#: ../shell/e-shell-content.c:659 ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70 
../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652 ../smime/gui/certificate-manager.c:729
+#: ../smime/gui/certificate-manager.c:953 ../smime/gui/certificate-manager.c:1335 
../smime/gui/e-cert-selector.c:237 ../smime/gui/smime-ui.ui.h:23
+#, fuzzy
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "Zrušiť"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18 
../addressbook/gui/widgets/eab-contact-merging.c:721
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/dialogs/comp-editor.c:1277 
../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:395 ../e-util/e-attachment-store.c:636
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3045 
../e-util/gal-view-instance-save-as-dialog.c:270 ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+#: ../smime/gui/certificate-manager.c:653 ../smime/gui/certificate-manager.c:730
+msgid "_Save"
+msgstr "_Uložiť"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+#, fuzzy
+#| msgid "Telephone"
+msgid "Show Telephone"
+msgstr "Telefón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
-msgid "ICQ"
-msgstr "ICQ"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#, fuzzy
+#| msgid "_To This Address"
+msgid "Show SIP Address"
+msgstr "_Pre túto adresu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#, fuzzy
+#| msgid "Instant Messaging"
+msgid "Show Instant Messaging"
+msgstr "Priama komunikácia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "Skype"
-msgstr "Skype"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#, fuzzy
+#| msgid "Web Addresses"
+msgid "Show Web Addresses"
+msgstr "Webové adresy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
-msgid "Twitter"
-msgstr "Twitter"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#, fuzzy
+#| msgid "Show the second time zone"
+msgid "Show Job section"
+msgstr "Zobraziť druhé časové pásmo"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#, fuzzy
+#| msgid "Miscellaneous"
+msgid "Show Miscellaneous"
+msgstr "Rôzne"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#, fuzzy
+#| msgid "Mailing Address"
+msgid "Show Home Mailing Address"
+msgstr "Poštová adresa"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#, fuzzy
+#| msgid "Mailing Address"
+msgid "Show Work Mailing Address"
+msgstr "Poštová adresa"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#, fuzzy
+#| msgid "Mailing Address"
+msgid "Show Other Mailing Address"
+msgstr "Poštová adresa"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+#, fuzzy
+#| msgid "Show %s"
+msgid "Show Notes"
+msgstr "Zobraziť %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257 ../calendar/gui/dialogs/comp-editor.c:1298 
../e-util/e-html-editor-actions.c:994
+msgid "_Undo"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259 ../calendar/gui/dialogs/comp-editor.c:1300 
../e-util/e-focus-tracker.c:122
+msgid "Undo"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264 ../calendar/gui/dialogs/comp-editor.c:1305 
../e-util/e-html-editor-actions.c:980
+msgid "_Redo"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266 ../calendar/gui/dialogs/comp-editor.c:1307 
../e-util/e-focus-tracker.c:138
+msgid "Redo"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:231
-#: ../addressbook/gui/widgets/eab-gui-util.c:505
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298 ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Chyba pri pridávaní kontaktu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Error modifying contact"
 msgstr "Chyba pri zmene kontaktu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
 msgid "Error removing contact"
 msgstr "Chyba pri odstraňovaní kontaktu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:668
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2949
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:738 
../addressbook/gui/contact-editor/e-contact-editor.c:3081
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor kontaktov - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3486
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
 msgid "Please select an image for this contact"
 msgstr "Prosím, vyberte si obrázok pre tento kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3487
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684 ../e-util/e-attachment-store.c:489 
../e-util/e-category-editor.c:146 ../e-util/e-html-editor-actions.c:481 ../e-util/e-html-editor-actions.c:574
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292 ../shell/e-shell-utils.c:71 
../smime/gui/certificate-manager.c:954
+#, fuzzy
+#| msgid "Open"
+msgid "_Open"
+msgstr "Otvoriť"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
 msgid "_No image"
 msgstr "_Bez obrázka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3845
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -583,48 +587,61 @@ msgstr ""
 "Údaje kontaktu sú neplatné:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3851
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ má neplatný tvar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3859
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "„%s“ nemôže byť dátum z budúcnosti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3867
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ má neplatný tvar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3880
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3894
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069 
../addressbook/gui/contact-editor/e-contact-editor.c:4083
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ je prázdny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3909
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
 msgid "Invalid contact."
 msgstr "Neplatný kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224 
../addressbook/gui/contact-editor/e-contact-quick-add.c:456 ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/widgets/eab-gui-util.c:319 ../calendar/gui/dialogs/alarm-dialog.ui.h:9 
../calendar/gui/dialogs/alarm-list-dialog.ui.h:3 ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:2323 ../e-util/e-attachment-dialog.c:313 
../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
+#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292 
../e-util/e-html-editor-link-dialog.c:370 ../e-util/e-passwords.c:471 ../e-util/e-rule-context.c:816 
../e-util/e-rule-editor.c:181
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777 ../e-util/e-send-options.ui.h:43 
../e-util/e-source-config-dialog.c:380 ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3 ../mail/e-mail-config-window.c:331 
../mail/e-mail-tag-editor.c:243 ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
+#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149 ../mail/mail-vfolder-ui.c:271 
../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
+#: ../plugins/publish-calendar/url-editor-dialog.c:422 ../shell/e-shell-content.c:661 
../shell/e-shell-content.c:767 ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
+#, fuzzy
+#| msgid "OK"
+msgid "_OK"
+msgstr "Ok"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
 msgid "Contact Quick-Add"
 msgstr "Rýchly kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "_Edit Full"
 msgstr "_Upraviť celé"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "_Celé meno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:521
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:534
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "_Vyberte adresár kontaktov"
 
@@ -672,34 +689,32 @@ msgstr "III"
 msgid "Esq."
 msgstr "Váž. pán"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:12
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Full Name"
 msgstr "Celé meno"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "_Krstné:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "_Titul:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "_Stredné:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "_Priezvisko:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:19
 msgid "_Suffix:"
 msgstr "T_itul za menom:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1 
../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
@@ -725,20 +740,46 @@ msgid "Add an email to the List"
 msgstr "Pridá email do zoznamu"
 
 # tooltip
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Remove an email address from the List"
 msgstr "Odstráni emailovú adresu zo zoznamu"
 
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10 
../calendar/gui/dialogs/alarm-list-dialog.ui.h:5 ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:21 ../calendar/gui/dialogs/task-page.ui.h:31 
../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391 
../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:54
+#: ../plugins/attachment-reminder/attachment-reminder.c:567 
../plugins/email-custom-header/email-custom-header.c:849 ../plugins/publish-calendar/publish-calendar.c:807
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34 ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "O_dstrániť"
+
 # tooltip
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "Pridá emailové adresy z adresára kontaktov"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "_Select..."
 msgstr "_Vybrať…"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:943
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13 ../e-util/filter.ui.h:19
+msgid "_Top"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14 ../e-util/filter.ui.h:20
+#, fuzzy
+#| msgid "_Update"
+msgid "_Up"
+msgstr "Ak_tualizovať"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15 ../e-util/filter.ui.h:21
+msgid "_Down"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16 ../e-util/filter.ui.h:22
+msgid "_Bottom"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
 msgid "Contact List Members"
 msgstr "Členovia zoznamu kontaktov"
 
@@ -758,85 +799,352 @@ msgstr "Chyba pri zmene zoznamu"
 msgid "Error removing list"
 msgstr "Chyba pri odstraňovaní zoznamu"
 
-#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:1
-msgid "Duplicate Contact Detected"
-msgstr "Nájdený duplicitný kontakt"
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1 ../modules/addressbook/e-book-shell-view-actions.c:1195
+msgid "Name contains"
+msgstr "Meno obsahuje"
 
-#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:2
-msgid ""
-"The name or email of this contact already exists in this folder. Would you "
-"like to save the changes anyway?"
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2 ../modules/addressbook/e-book-shell-view-actions.c:1188
+msgid "Email begins with"
+msgstr "Email začína na"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3 ../calendar/gui/caltypes.xml.h:26 
../calendar/gui/memotypes.xml.h:19 ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1181 
../modules/calendar/e-cal-shell-view-actions.c:1611 ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Any field contains"
+msgstr "Ľubovoľné pole obsahuje"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94 ../addressbook/gui/widgets/ea-addressbook-view.c:103 
../addressbook/gui/widgets/ea-minicard-view.c:193
+msgid "evolution address book"
+msgstr "adresár kontaktov evolution"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "Kopírovať _emailovú adresu"
+
+# tooltip
+#: ../addressbook/gui/widgets/eab-contact-display.c:151 ../e-util/e-web-view.c:307
+msgid "Copy the email address to the clipboard"
+msgstr "Kopíruje emailovú adresu do schránky"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:156 ../e-util/e-web-view.c:312
+msgid "_Send New Message To..."
+msgstr "_Poslať novú správu pre…"
+
+# tooltip
+#: ../addressbook/gui/widgets/eab-contact-display.c:158 ../e-util/e-web-view.c:314
+msgid "Send a mail message to this address"
+msgstr "Odošle správu na túto adresu"
+
+# čo je miesto %s? ak je to názov kontaktu môže to znieť čudne
+# Kliknutím pošlete email Kostrianová
+# * https://bugzilla.gnome.org/show_bug.cgi?id=641020
+#: ../addressbook/gui/widgets/eab-contact-display.c:290 ../e-util/e-web-view.c:997
+#, c-format
+msgid "Click to mail %s"
+msgstr "Kliknutím pošlete email na %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "Otvoriť mapu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
 msgstr ""
-"Meno alebo email tohto kontaktu už v tomto priečinku existuje. Chcete aj "
-"napriek tomu uložiť zmeny?"
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=635414
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:4
-msgid "Conflicting Contact:"
-msgstr "Konflikt s kontaktom:"
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "Zoznam členov:"
 
-#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:5
-msgid "Changed Contact:"
-msgstr "Zmenený kontakt:"
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Prezývka"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Spoločnosť"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "Oddelenie"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Kancelária"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "Povolanie"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "Pozícia"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "Manažér"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "Asistent"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+msgstr "Video rozhovor"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827 ../e-util/e-send-options.c:546 
../modules/calendar/e-cal-shell-view-actions.c:181 ../modules/calendar/e-cal-shell-view.c:570
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Kalendár"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828 ../calendar/gui/dialogs/event-editor.c:115 
../calendar/gui/dialogs/event-editor.c:342 ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Diár"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829 
../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "Telefón"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832 
../addressbook/gui/widgets/eab-contact-formatter.c:873 ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "Adresa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "Domovská stránka"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Mobilný telefón"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "Manžel(ka)"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "Osobné"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Poznámka"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "Zoznam členov"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "Pracovná pozícia"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "Domovská stránka"
 
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-merging.c:364
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261 ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "Zrušené"
+
+# window title
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
+msgid "Merge Contact"
+msgstr "Zlúčenie kontaktu"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475 ../addressbook/gui/widgets/eab-contact-merging.c:724
 msgid "_Merge"
 msgstr "_Zlúčiť"
 
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
+msgid "Duplicate Contact Detected"
+msgstr "Nájdený duplicitný kontakt"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
+#, fuzzy
+#| msgid "The name or email of this contact already exists in this folder. Would you like to save the 
changes anyway?"
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder. Would you like to save the changes anyway?"
+msgstr "Meno alebo email tohto kontaktu už v tomto priečinku existuje. Chcete aj napriek tomu uložiť zmeny?"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
+#, fuzzy
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
 msgid ""
 "The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
+"in this folder. Would you like to add it anyway?"
 msgstr ""
 "Meno alebo email tohto kontaktu už v tomto priečinku\n"
 "existuje. Chcete ho aj tak pridať?"
 
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:5
-msgid "Original Contact:"
-msgstr "Pôvodný kontakt:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
+msgid "Changed Contact:"
+msgstr "Zmenený kontakt:"
 
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
 msgid "New Contact:"
 msgstr "Nový kontakt:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:244
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "Zrušené"
+# * https://bugzilla.gnome.org/show_bug.cgi?id=635414
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
+msgid "Conflicting Contact:"
+msgstr "Konflikt s kontaktom:"
 
-# window title
-#: ../addressbook/gui/widgets/eab-contact-merging.c:346
-msgid "Merge Contact"
-msgstr "Zlúčenie kontaktu"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
+#, fuzzy
+#| msgid "Contact: "
+msgid "Old Contact:"
+msgstr "Kontakt: "
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1151
-msgid "Name contains"
-msgstr "Meno obsahuje"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+msgid ""
+"This address book cannot be opened. This either means this book is not marked for offline usage or not yet 
downloaded for offline usage. Please load the address book once in online mode to download its "
+"contents."
+msgstr ""
+"Nedá sa otvoriť tento adresár kontaktov. Zvyčajne to znamená, že buď adresár nie je určený na používanie 
bez pripojenia, alebo ešte nebol prevzatý aby tak mohol byť použitý. Prosím, načítajte adresár "
+"kontaktov aspoň raz keď ste pripojený, aby mohol byť prevzatý jeho obsah."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1144
-msgid "Email begins with"
-msgstr "Email začína na"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are 
set to access it."
+msgstr "Nebolo možné otvoriť tento adresár kontaktov.  Prosím, overte, či cesta %s existuje, a či máte 
dostatočné práva na prístup k nej."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1137
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
-#: ../modules/calendar/e-task-shell-view-actions.c:990
-msgid "Any field contains"
-msgstr "Ľubovoľné pole obsahuje"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an 
LDAP-enabled Evolution package must be installed."
+msgstr "Táto verzia Evolution nemá zakompilovanú podporu LDAP.  Ak chcete používať LDAP v programe 
Evolution, tak musíte nainštalovať balík Evolution s LDAP."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the 
server is unreachable."
+msgstr "Nebolo možné otvoriť tento adresár kontaktov.  Znamená to, že buď ste zadali neplatný identifikátor 
URI, alebo je server nedosiahnuteľný."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "Podrobná správa o chybe:"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Vášmu dotazu zodpovedá viac vizitiek, než dokáže server\n"
+"poslať alebo Evolution zobraziť. Prosím, upresnite svoj\n"
+"dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
+"servera pre tento adresár kontaktov."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"Čas pre vykonanie tejto požiadavky prekročil limit nastavený na serveri\n"
+"alebo pre tento adresár kontaktov. Prosím, upresnite hľadanie alebo zvýšte\n"
+"časový limit v nastavení adresárového servera pre tento adresár kontaktov."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "Obslužný softvér tohto adresára kontaktov nedokázal analyzovať túto požiadavku. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "Obslužný softvér tohto adresára kontaktov odmietol vykonať túto požiadavku. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:237 ../addressbook/gui/widgets/eab-gui-util.c:243
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Táto požiadavka nebola dokončená úspešne. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
+msgid "card.vcf"
+msgstr "vizitka.vcf"
+
+# dialog title
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Výber adresára kontaktov"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "zoznam"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Presunúť kontakt do"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Kopírovať kontakt do"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Presunúť kontakty do"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Kopírovať kontakty do"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Bez kontaktov"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -844,69 +1152,75 @@ msgstr[0] "%d kontaktov"
 msgstr[1] "%d kontakt"
 msgstr[2] "%d kontakty"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:373
+#: ../addressbook/gui/widgets/e-addressbook-model.c:372
 msgid "Error getting book view"
 msgstr "Chyba pri získavaní pohľadu na adresár kontaktov"
 
 # PK: nejde tu o vyhladavanie?
 # MČ: je to možné. Podľa zdrojového kódu prehľadáva AddressBookModel, ale v princípe môže vyhľadávať v 
modeli.
-#: ../addressbook/gui/widgets/e-addressbook-model.c:820
+#: ../addressbook/gui/widgets/e-addressbook-model.c:819
 msgid "Search Interrupted"
 msgstr "Vyhľadávanie prerušené"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:204
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
 msgid "Error modifying card"
 msgstr "Chyba pri zmene vizitky"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Cut selected contacts to the clipboard"
 msgstr "Vystrihne vybrané kontakty do schránky"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../addressbook/gui/widgets/e-addressbook-view.c:654
 msgid "Copy selected contacts to the clipboard"
 msgstr "Skopíruje vybrané kontakty do schránky"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:661
+#: ../addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "Paste contacts from the clipboard"
 msgstr "Vloží kontakty zo schránky"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:667
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666 ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Odstráni vybrané kontakty"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:673
+#: ../addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Select all visible contacts"
 msgstr "Vyberie všetky viditeľné kontakty"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Ste si istý, že chcete odstrániť tieto zoznamy kontaktov?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Ste si istý, že chcete odstrániť tento zoznam kontaktov?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Ste si istý, že chcete odstrániť tento zoznam kontaktov (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Ste si istý, že chcete odstrániť tieto kontakty?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact?"
 msgstr "Ste si istý, že chcete odstrániť tento kontakt?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ste si istý, že chcete odstrániť tento kontakt (%s)?"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331 ../calendar/gui/dialogs/comp-editor.c:1242 
../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:785 ../e-util/evolution-source-viewer.c:805
+#: ../mail/e-mail-account-manager.c:736 ../modules/addressbook/e-book-shell-view-actions.c:1067 
../modules/calendar/e-cal-shell-view-actions.c:1434 ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:788 ../modules/mail/e-mail-shell-view-actions.c:1615 
../shell/e-shell-window-actions.c:943 ../smime/gui/certificate-manager.c:1659
+#: ../smime/gui/smime-ui.ui.h:10
+msgid "_Delete"
+msgstr "O_dstrániť"
+
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -924,11 +1238,11 @@ msgstr[2] ""
 "Otvorenie %d kontaktov tiež otvorí %d nové okná.\n"
 "Naozaj chcete zobraziť všetky tieto kontakty?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "_Nezobraziť"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "Zobraziť _všetky kontakty"
 
@@ -945,11 +1259,6 @@ msgstr "Krstné meno"
 msgid "Family Name"
 msgstr "Priezvisko"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
-msgid "Nickname"
-msgstr "Prezývka"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "Email 2"
@@ -1002,11 +1311,6 @@ msgstr "Domáci fax"
 msgid "ISDN Phone"
 msgstr "ISDN telefón"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
-msgid "Mobile Phone"
-msgstr "Mobilný telefón"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Iný telefón"
@@ -1041,39 +1345,18 @@ msgstr "Telex"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
-msgid "Company"
-msgstr "Spoločnosť"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Jednotka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Office"
-msgstr "Kancelária"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titul"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:667
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38 ../calendar/gui/e-meeting-list-view.c:666 
../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rola"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
-msgid "Manager"
-msgstr "Manažér"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
-msgid "Assistant"
-msgstr "Asistent"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Webové stránky"
@@ -1082,29 +1365,67 @@ msgstr "Webové stránky"
 msgid "Journal"
 msgstr "Žurnál"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43 ../calendar/gui/dialogs/event-page.ui.h:20 
../calendar/gui/e-calendar-table.etspec.h:12 ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "Kategórie"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
-msgid "Spouse"
-msgstr "Manžel(ka)"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "Otvoriť"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
-msgid "Note"
-msgstr "Poznámka"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "Zoznam kontaktov: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "Kontakt: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "minivizitka evolution"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "Nový kontakt"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "Nový zoznam kontaktov"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "aktuálny priečinok adresára kontaktov %s obsahuje %d vizitiek"
+msgstr[1] "aktuálny priečinok adresára kontaktov %s obsahuje %d vizitku"
+msgstr[2] "aktuálny priečinok adresára kontaktov %s obsahuje %d vizitky"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:374
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
 msgstr "Mapa kontaktov"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#. Zoom-in button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
+#, fuzzy
+#| msgid "_Zoom In"
+msgid "Zoom _In"
+msgstr "_Zväčšiť"
+
+#. Zoom-out button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420 ../mail/e-mail-reader.c:2360
+msgid "Zoom _Out"
+msgstr "Zme_nšiť"
+
+#. Search button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450 ../e-util/e-html-editor-actions.c:1972 
../e-util/e-html-editor-find-dialog.c:195 ../shell/e-shell-window-actions.c:1020
+#, fuzzy
+#| msgid "_Find Now"
+msgid "_Find"
+msgstr "_Nájsť teraz"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -1114,7 +1435,7 @@ msgstr ""
 "\n"
 "Vyhľadávajú sa kontakty…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1128,7 +1449,7 @@ msgstr ""
 "\n"
 "alebo dvojitým kliknutím vytvorte nový kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:197
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1142,7 +1463,7 @@ msgstr ""
 "\n"
 "Dvojitým kliknutím vytvoríte nový kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:201
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1152,7 +1473,7 @@ msgstr ""
 "\n"
 "Vyhľadať kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1162,398 +1483,267 @@ msgstr ""
 "\n"
 "V tomto pohľade nie sú žiadne položky."
 
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Work Email"
-msgstr "Pracovný email"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-msgid "Home Email"
-msgstr "Domáci email"
-
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:828
-msgid "Other Email"
-msgstr "Ďalší email"
-
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:194
-msgid "evolution address book"
-msgstr "adresár kontaktov evolution"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact"
-msgstr "Nový kontakt"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
-msgid "New Contact List"
-msgstr "Nový zoznam kontaktov"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:177
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "aktuálny priečinok adresára kontaktov %s obsahuje %d vizitiek"
-msgstr[1] "aktuálny priečinok adresára kontaktov %s obsahuje %d vizitku"
-msgstr[2] "aktuálny priečinok adresára kontaktov %s obsahuje %d vizitky"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:34
-msgid "Open"
-msgstr "Otvoriť"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact List: "
-msgstr "Zoznam kontaktov: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:161
-msgid "Contact: "
-msgstr "Kontakt: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:188
-msgid "evolution minicard"
-msgstr "minivizitka evolution"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:150
-msgid "Copy _Email Address"
-msgstr "Kopírovať _emailovú adresu"
-
-# tooltip
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:305
-msgid "Copy the email address to the clipboard"
-msgstr "Kopíruje emailovú adresu do schránky"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:157
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:310
-msgid "_Send New Message To..."
-msgstr "_Poslať novú správu pre…"
-
-# tooltip
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:312
-msgid "Send a mail message to this address"
-msgstr "Odošle správu na túto adresu"
-
-# čo je miesto %s? ak je to názov kontaktu môže to znieť čudne
-# Kliknutím pošlete email Kostrianová
-# * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:988
-#, c-format
-msgid "Click to mail %s"
-msgstr "Kliknutím pošlete email na %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
-msgid "Open map"
-msgstr "Otvoriť mapu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
-msgid "List Members:"
-msgstr "Zoznam členov:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
-msgid "Department"
-msgstr "Oddelenie"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
-msgid "Profession"
-msgstr "Povolanie"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
-msgid "Position"
-msgstr "Pozícia"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Video Chat"
-msgstr "Video rozhovor"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-#: ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:591
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Kalendár"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:343
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Diár"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
-msgid "Phone"
-msgstr "Telefón"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-msgid "Fax"
-msgstr "Fax"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
-msgid "Address"
-msgstr "Adresa"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
-msgid "Home Page"
-msgstr "Domovská stránka"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
-msgid "Web Log"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
-msgid "Personal"
-msgstr "Osobné"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:930
-msgid "List Members"
-msgstr "Zoznam členov"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:951
-msgid "Job Title"
-msgstr "Pracovná pozícia"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:992
-msgid "Home page"
-msgstr "Domovská stránka"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1002
-msgid "Blog"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Nedá sa otvoriť tento adresár kontaktov. Zvyčajne to znamená, že buď adresár "
-"nie je určený na používanie bez pripojenia, alebo ešte nebol prevzatý aby "
-"tak mohol byť použitý. Prosím, načítajte adresár kontaktov aspoň raz keď ste "
-"pripojený, aby mohol byť prevzatý jeho obsah."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:142
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Nebolo možné otvoriť tento adresár kontaktov.  Prosím, overte, či cesta %s "
-"existuje, a či máte dostatočné práva na prístup k nej."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:155
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Táto verzia Evolution nemá zakompilovanú podporu LDAP.  Ak chcete používať "
-"LDAP v programe Evolution, tak musíte nainštalovať balík Evolution s LDAP."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Nebolo možné otvoriť tento adresár kontaktov.  Znamená to, že buď ste zadali "
-"neplatný identifikátor URI, alebo je server nedosiahnuteľný."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
-msgid "Detailed error message:"
-msgstr "Podrobná správa o chybe:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:213
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Vášmu dotazu zodpovedá viac vizitiek, než dokáže server\n"
-"poslať alebo Evolution zobraziť. Prosím, upresnite svoj\n"
-"dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
-"servera pre tento adresár kontaktov."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:220
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"Čas pre vykonanie tejto požiadavky prekročil limit nastavený na serveri\n"
-"alebo pre tento adresár kontaktov. Prosím, upresnite hľadanie alebo zvýšte\n"
-"časový limit v nastavení adresárového servera pre tento adresár kontaktov."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:228
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr ""
-"Obslužný softvér tohto adresára kontaktov nedokázal analyzovať túto "
-"požiadavku. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:233
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr ""
-"Obslužný softvér tohto adresára kontaktov odmietol vykonať túto požiadavku. "
-"%s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:239
-#: ../addressbook/gui/widgets/eab-gui-util.c:245
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "Táto požiadavka nebola dokončená úspešne. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:267
-msgid "card.vcf"
-msgstr "vizitka.vcf"
-
-# dialog title
-#: ../addressbook/gui/widgets/eab-gui-util.c:318
-msgid "Select Address Book"
-msgstr "Výber adresára kontaktov"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:400
-msgid "list"
-msgstr "zoznam"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Move contact to"
-msgstr "Presunúť kontakt do"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
-msgid "Copy contact to"
-msgstr "Kopírovať kontakt do"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Move contacts to"
-msgstr "Presunúť kontakty do"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
-msgid "Copy contacts to"
-msgstr "Kopírovať kontakty do"
-
-#: ../addressbook/importers/evolution-csv-importer.c:747
-#: ../addressbook/importers/evolution-ldif-importer.c:549
-#: ../addressbook/importers/evolution-vcard-importer.c:281
-#: ../calendar/importers/icalendar-importer.c:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:746 
../addressbook/importers/evolution-ldif-importer.c:548 ../addressbook/importers/evolution-vcard-importer.c:249
+#: ../calendar/importers/icalendar-importer.c:440 ../calendar/importers/icalendar-importer.c:935 
../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importuje sa…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Kontakty Outlook vo formáte CSV alebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1083
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Importovací nástroj kontaktov Outlook vo formáte CSV a Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Kontakty Mozilla vo formáte CSV alebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1092
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Importovací nástroj kontaktov Mozilla vo formáte CSV a Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Kontakty Evolution vo formáte CSV alebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1101
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Importovací nástroj kontaktov Evolution vo formáte CSV a Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:808
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "Evolution LDIF importer"
 msgstr "Importovací nástroj Evolution LDIF"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:666
+#: ../addressbook/importers/evolution-vcard-importer.c:634
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:667
+#: ../addressbook/importers/evolution-vcard-importer.c:635
 msgid "Evolution vCard Importer"
 msgstr "Importovací nástroj Evolution vCard"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:764
+#: ../addressbook/printing/e-contact-print.c:874
 #, c-format
 msgid "Page %d"
 msgstr "Strana %d"
 
 # cmd desc
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "Určí výstupný súbor namiesto štandardného výstupu"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "VÝSTUPNÝSÚBOR"
 
 # cmd desc
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "Vypíše priečinky miestnych adresárov kontaktov"
 
 # cmd desc
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "Zobrazí vizitky ako vcard alebo csv súbor"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:134
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Chyba argumentov na príkazovom riadku. Použite --help a pozrite si použitie."
+#: ../addressbook/tools/evolution-addressbook-export.c:111
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Chyba argumentov na príkazovom riadku. Použite --help a pozrite si použitie."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:148
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "Podporuje len formáty csv alebo vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:179
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "Nezachytená chyba"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635 
../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "Nedá sa otvoriť súbor"
 
 # c-format
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Zlyhalo otvorenie klienta „%s“: %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
+#: ../addressbook/util/eab-book-util.c:36
+#, fuzzy
+#| msgid "Work Email"
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "Pracovný email"
+
+#: ../addressbook/util/eab-book-util.c:37
+#, fuzzy
+#| msgid "Home Email"
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "Domáci email"
+
+#: ../addressbook/util/eab-book-util.c:38
+#, fuzzy
+#| msgid "Other Email"
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "Ďalší email"
+
+#: ../addressbook/util/eab-book-util.c:44
+#, fuzzy
+#| msgid "Work"
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "Práca"
+
+#: ../addressbook/util/eab-book-util.c:45
+#, fuzzy
+#| msgid "Home Page"
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "Domovská stránka"
+
+#: ../addressbook/util/eab-book-util.c:46
+#, fuzzy
+#| msgid "Other"
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "Iné"
+
+#: ../addressbook/util/eab-book-util.c:74
+#, fuzzy
+#| msgid "AIM"
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/util/eab-book-util.c:75
+#, fuzzy
+#| msgid "Jabber"
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/util/eab-book-util.c:76
+#, fuzzy
+#| msgid "Yahoo"
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/util/eab-book-util.c:77
+#, fuzzy
+#| msgid "Gadu-Gadu"
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/util/eab-book-util.c:78
+#, fuzzy
+#| msgid "MSN"
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/util/eab-book-util.c:79
+#, fuzzy
+#| msgid "ICQ"
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/util/eab-book-util.c:80
+#, fuzzy
+#| msgid "GroupWise"
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/util/eab-book-util.c:81
+#, fuzzy
+#| msgid "Skype"
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/util/eab-book-util.c:82
+#, fuzzy
+#| msgid "Twitter"
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/util/eab-book-util.c:83
+#, fuzzy
+#| msgid "Google Features"
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Funkcie Google"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:126
+#, fuzzy
+#| msgid "Email"
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "Email"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../addressbook/util/eab-book-util.c:173
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr ""
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+#, fuzzy
+#| msgid "AIM"
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "AIM"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:271
+#, fuzzy
+#| msgid "Phone"
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "Telefón"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minút"
 msgstr[1] "minúta"
 msgstr[2] "minúty"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodín"
@@ -1563,15 +1753,14 @@ msgstr[2] "hodiny"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:131 ../calendar/gui/dialogs/recurrence-page.c:1249
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dní"
 msgstr[1] "deň"
 msgstr[2] "dni"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:344
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
 msgid "Start time"
 msgstr "Čas začiatku"
 
@@ -1587,74 +1776,71 @@ msgstr "Odmietnuť _všetky"
 msgid "_Snooze"
 msgstr "_Odložiť"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:166
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6 
../calendar/gui/dialogs/comp-editor.c:1321 ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../calendar/gui/dialogs/task-page.ui.h:32 
../e-util/e-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1003 
../e-util/e-mail-signature-manager.c:357
+#: ../e-util/filter.ui.h:17 ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170 
../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:58
+#: ../plugins/attachment-reminder/attachment-reminder.c:562 
../plugins/email-custom-header/email-custom-header.c:844 ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33 ../plugins/templates/templates.c:458 
../shell/e-shell-window-actions.c:1071 ../smime/gui/smime-ui.ui.h:13
+msgid "_Edit"
+msgstr "_Upraviť"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#, fuzzy
+#| msgid "Print"
+msgid "_Print"
+msgstr "Tlačiť"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "O_dmietnuť"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1836
-#: ../calendar/alarm-notify/alarm-queue.c:1846
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:241
-#: ../modules/itip-formatter/itip-view.c:1497
-#: ../modules/itip-formatter/itip-view.c:1608
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7 ../calendar/alarm-notify/alarm-queue.c:1844 
../calendar/alarm-notify/alarm-queue.c:1854 ../modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../modules/itip-formatter/itip-view.c:1493 ../modules/itip-formatter/itip-view.c:1604
 msgid "Location:"
 msgstr "Miesto:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "miesto schôdzky"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 msgid "Snooze _time:"
 msgstr "Ča_s odloženia:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:143
-#: ../modules/calendar/e-cal-shell-view-actions.c:352
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10 ../calendar/gui/dialogs/alarm-dialog.ui.h:6 
../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:326
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "dní"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:141
+#: ../calendar/alarm-notify/alarm-notify.ui.h:11 ../calendar/gui/dialogs/alarm-dialog.ui.h:5 
../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "hodín"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:139
-#: ../mail/e-mail-config-provider-page.c:527
+#: ../calendar/alarm-notify/alarm-notify.ui.h:12 ../calendar/gui/dialogs/alarm-dialog.ui.h:4 
../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
+#: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "minút"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1679
-#: ../calendar/alarm-notify/alarm-queue.c:1816
+#: ../calendar/alarm-notify/alarm-queue.c:1687 ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "Súhrn nie je k dispozícii."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1688
-#: ../calendar/alarm-notify/alarm-queue.c:1690
+#: ../calendar/alarm-notify/alarm-queue.c:1696 ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "Popis nie je k dispozícii."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1698
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "Informácia o mieste nie je k dispozícii."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1703
-#: ../calendar/alarm-notify/alarm-queue.c:1807
-#: ../calendar/alarm-notify/alarm-queue.c:2148
+#: ../calendar/alarm-notify/alarm-queue.c:1711 ../calendar/alarm-notify/alarm-queue.c:1815 
../calendar/alarm-notify/alarm-queue.c:2156
 msgid "Evolution Reminders"
 msgstr "Pripomienky Evolution"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1747
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -1662,39 +1848,44 @@ msgstr[0] "Máte %d pripomenutí"
 msgstr[1] "Máte %d pripomenutie"
 msgstr[2] "Máte %d pripomenutia"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1972
+#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21 ../mail/mail.error.xml.h:139 
../modules/mailto-handler/evolution-mailto-handler.c:114
+msgid "_No"
+msgstr "_Nie"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138 
../modules/mailto-handler/evolution-mailto-handler.c:115
+msgid "_Yes"
+msgstr "Án_o"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following 
program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Práve sa má vyvolať pripomenutie kalendára Evolution. Je nastavené tak, že "
-"sa má spustiť tento program:\n"
+"Práve sa má vyvolať pripomenutie kalendára Evolution. Je nastavené tak, že sa má spustiť tento program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Ste si istý, že chcete tento program spustiť?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1987
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "Pre tento program túto správu už nezobrazovať."
 
-#: ../calendar/alarm-notify/util.c:44
+#: ../calendar/alarm-notify/util.c:43
 msgid "invalid time"
 msgstr "neplatný čas"
 
 # PŠ podľa vysvetlivky by to malo byť "1 hodinu", lenže len pre jeden reťazec z 3. treba vyžiadať rozdelenie 
(kontext)
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
-#: ../calendar/gui/misc.c:96
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382 ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1704,8 +1895,7 @@ msgstr[2] "%d hodiny"
 
 # PŠ podľa vysvetlivky by to malo byť "1 minútu", lenže len pre jeden reťazec z 3. treba vyžiadať rozdelenie 
(kontext)
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
-#: ../calendar/gui/misc.c:102
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388 ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1717,8 +1907,7 @@ msgstr[2] "%d minúty"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
-#: ../calendar/gui/misc.c:106
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394 ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1731,12 +1920,8 @@ msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Chcete poslať oznámenie o zrušení všetkým účastníkom?"
 
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr ""
-"Ak nepošlete oznámenie o zrušení stretnutia, ostatní účastníci sa o tom "
-"nemusia dovedieť."
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgstr "Ak nepošlete oznámenie o zrušení stretnutia, ostatní účastníci sa o tom nemusia dovedieť."
 
 #: ../calendar/calendar.error.xml.h:3
 msgid "Do _not Send"
@@ -1746,59 +1931,44 @@ msgstr "_Neposielať"
 msgid "_Send Notice"
 msgstr "P_oslať oznámenie"
 
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/dialogs/delete-comp.c:192
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ste si istý, že chcete odstrániť toto stretnutie?"
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"Všetky informácie v tomto stretnutí budú odstránené a nebudú sa dať obnoviť."
+msgid "All information on this meeting will be deleted and can not be restored."
+msgstr "Všetky informácie v tomto stretnutí budú odstránené a nebudú sa dať obnoviť."
 
 #: ../calendar/calendar.error.xml.h:8
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"Ak nepošlete oznámenie o zrušení úlohy, ostatní účastníci sa o tom nemusia "
-"dozvedieť."
+msgid "If you do not send a cancelation notice, the other participants may not know the task has been 
deleted."
+msgstr "Ak nepošlete oznámenie o zrušení úlohy, ostatní účastníci sa o tom nemusia dozvedieť."
 
-#: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:196
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/dialogs/delete-comp.c:195
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Ste si istý, že chcete odstrániť túto úlohu?"
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"Všetky informácie v tejto úlohe budú odstránené a nebudú sa dať obnoviť."
+msgstr "Všetky informácie v tejto úlohe budú odstránené a nebudú sa dať obnoviť."
 
 #: ../calendar/calendar.error.xml.h:11
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Chcete poslať oznámenie o zrušení tejto poznámky?"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
-msgstr ""
-"Ak nepošlete oznámenie o zrušení poznámky, ostatní účastníci sa o tom "
-"nemusia dozvedieť."
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been 
deleted."
+msgstr "Ak nepošlete oznámenie o zrušení poznámky, ostatní účastníci sa o tom nemusia dozvedieť."
 
-#: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:199
+#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/dialogs/delete-comp.c:198
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Ste si istý, že chcete odstrániť túto poznámku?"
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr ""
-"Všetky informácie v tejto poznámke budú odstránené a nebudú sa dať obnoviť."
+msgstr "Všetky informácie v tejto poznámke budú odstránené a nebudú sa dať obnoviť."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
@@ -1809,10 +1979,8 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Ste si istý, že chcete odstrániť schôdzku nazvanú „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:17
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Všetky informácie v tejto schôdzke budú odstránené a nebudú sa dať obnoviť."
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "Všetky informácie v tejto schôdzke budú odstránené a nebudú sa dať obnoviť."
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this appointment?"
@@ -1828,20 +1996,15 @@ msgstr "Ste si istý, že chcete odstrániť poznámku „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:21
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"Všetky informácie v tejto poznámke budú odstránené a nebudú sa dať obnoviť."
+msgstr "Všetky informácie v tejto poznámke budú odstránené a nebudú sa dať obnoviť."
 
 #: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Ste si istý, že chcete odstrániť tieto {0} schôdzky?"
 
 #: ../calendar/calendar.error.xml.h:23
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"Všetky informácie v týchto schôdzkach budú odstránené a nebúdu sa dať "
-"obnoviť."
+msgid "All information on these appointments will be deleted and can not be restored."
+msgstr "Všetky informácie v týchto schôdzkach budú odstránené a nebúdu sa dať obnoviť."
 
 #: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete these {0} tasks?"
@@ -1849,8 +2012,7 @@ msgstr "Ste si istý, že chcete odstrániť tieto {0} úlohy?"
 
 #: ../calendar/calendar.error.xml.h:25
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"Všetky informácie v týchto úlohách budú odstránené a nebudú sa dať obnoviť."
+msgstr "Všetky informácie v týchto úlohách budú odstránené a nebudú sa dať obnoviť."
 
 #: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to delete these {0} memos?"
@@ -1858,9 +2020,7 @@ msgstr "Ste si istý, že chcete odstrániť tieto {0} poznámky?"
 
 #: ../calendar/calendar.error.xml.h:27
 msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"Všetky informácie v týchto poznámkach budú odstránené a nebudú sa dať "
-"obnoviť."
+msgstr "Všetky informácie v týchto poznámkach budú odstránené a nebudú sa dať obnoviť."
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Would you like to save your changes to this meeting?"
@@ -1874,8 +2034,7 @@ msgstr "Zmenili ste toto stretnutie, ale ešte ste ho neuložili."
 msgid "_Save Changes"
 msgstr "_Uložiť zmeny"
 
-#: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:16
 msgid "_Discard Changes"
 msgstr "_Zahodiť zmeny"
 
@@ -1908,14 +2067,10 @@ msgid "Would you like to send meeting invitations to participants?"
 msgstr "Chcete poslať pozvánky na stretnutie jeho účastníkom?"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
-msgstr ""
-"Poštová pozvánka bude poslaná všetkým účastníkom a umožní im odpovedať."
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "Poštová pozvánka bude poslaná všetkým účastníkom a umožní im odpovedať."
 
-#: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8 
../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Poslať"
 
@@ -1924,64 +2079,40 @@ msgid "Would you like to send updated meeting information to participants?"
 msgstr "Chcete poslať aktualizované informácie o stretnutí jeho účastníkom?"
 
 #: ../calendar/calendar.error.xml.h:42
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Poslanie aktualizovanej informácie umožní ostatním účastníkom zachovať si "
-"svoje kalendáre aktualizované."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "Poslanie aktualizovanej informácie umožní ostatním účastníkom zachovať si svoje kalendáre 
aktualizované."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Would you like to send this task to participants?"
 msgstr "Chcete poslať túto úlohu jej účastníkom?"
 
 #: ../calendar/calendar.error.xml.h:44
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Poštová pozvánka bude poslaná všetkým účastníkom a umožní im akceptovať túto "
-"úlohu."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "Poštová pozvánka bude poslaná všetkým účastníkom a umožní im akceptovať túto úlohu."
 
 #: ../calendar/calendar.error.xml.h:45
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Prebieha prevzatie. Chcete uložiť túto úlohu?"
 
 #: ../calendar/calendar.error.xml.h:46
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Niektoré prílohy sa práve preberajú. Uloženie úlohy by viedlo k strate "
-"týchto príloh."
-
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
-msgid "_Save"
-msgstr "_Uložiť"
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgstr "Niektoré prílohy sa práve preberajú. Uloženie úlohy by viedlo k strate týchto príloh."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Prebieha prevzatie. Chcete uložiť toto stretnutie?"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Niektoré prílohy sa práve preberajú. Uloženie schôdzky by viedlo k "
-"stratetýchto príloh."
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these 
attachments."
+msgstr "Niektoré prílohy sa práve preberajú. Uloženie schôdzky by viedlo k stratetýchto príloh."
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "Would you like to send updated task information to participants?"
 msgstr "Chcete poslať aktualizované informácie o úlohe jej účastníkom?"
 
 #: ../calendar/calendar.error.xml.h:51
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Poslanie aktualizovanej informácie umožní ostatním účastníkom zachovať si "
-"svoje zoznamy úloh aktualizované."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "Poslanie aktualizovanej informácie umožní ostatním účastníkom zachovať si svoje zoznamy úloh 
aktualizované."
 
 #: ../calendar/calendar.error.xml.h:52
 msgid "Editor could not be loaded."
@@ -2016,59 +2147,40 @@ msgid "Delete remote calendar '{0}'?"
 msgstr "Odstrániť vzdialený kalendár „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:60
-msgid ""
-"This will permanently remove the calendar '{0}' from the server. Are you "
-"sure you want to proceed?"
-msgstr ""
-"Toto nenávratne odstráni kalendár „{0}“ zo servera. Naozaj to chcete vykonať?"
+msgid "This will permanently remove the calendar '{0}' from the server. Are you sure you want to proceed?"
+msgstr "Toto nenávratne odstráni kalendár „{0}“ zo servera. Naozaj to chcete vykonať?"
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "Delete remote task list '{0}'?"
 msgstr "Odstrániť vzdialený zoznam úloh „{0}“"
 
 #: ../calendar/calendar.error.xml.h:63
-msgid ""
-"This will permanently remove the task list '{0}' from the server. Are you "
-"sure you want to proceed?"
-msgstr ""
-"Toto nenávratne odstráni zoznam úloh „{0}“ zo servera. Naozaj to chcete "
-"vykonať?"
+msgid "This will permanently remove the task list '{0}' from the server. Are you sure you want to proceed?"
+msgstr "Toto nenávratne odstráni zoznam úloh „{0}“ zo servera. Naozaj to chcete vykonať?"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "Delete remote memo list '{0}'?"
 msgstr "Odstrániť vzdialený zoznam poznámok „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:65
-msgid ""
-"This will permanently remove the memo list '{0}' from the server. Are you "
-"sure you want to proceed?"
-msgstr ""
-"Toto nenávratne odstráni zoznam poznámok „{0}“ zo servera. Naozaj to chcete "
-"vykonať?"
+msgid "This will permanently remove the memo list '{0}' from the server. Are you sure you want to proceed?"
+msgstr "Toto nenávratne odstráni zoznam poznámok „{0}“ zo servera. Naozaj to chcete vykonať?"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Ste si istý, že chcete uložiť stretnutie bez súhrnu?"
 
 #: ../calendar/calendar.error.xml.h:67
-msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
-msgstr ""
-"Pridanie zmysluplného súhrnu k vášmu stretnutiu vám pomôže mať na zreteli o "
-"čom je."
+msgid "Adding a meaningful summary to your appointment will give you an idea of what your appointment is 
about."
+msgstr "Pridanie zmysluplného súhrnu k vášmu stretnutiu vám pomôže mať na zreteli o čom je."
 
 #: ../calendar/calendar.error.xml.h:68
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Ste si istý, že chcete uložiť úlohu bez súhrnu?"
 
 #: ../calendar/calendar.error.xml.h:69
-msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
-msgstr ""
-"Pridanie zmysluplného súhrnu k vašej úlohe vám pomôže mať na zreteli o čom "
-"je."
+msgid "Adding a meaningful summary to your task will give you an idea of what your task is about."
+msgstr "Pridanie zmysluplného súhrnu k vašej úlohe vám pomôže mať na zreteli o čom je."
 
 #: ../calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the memo without a summary?"
@@ -2090,12 +2202,8 @@ msgstr "Nedá sa uložiť udalosť"
 # PK: ktory moze akceptovat schodky
 #. Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:76
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
-"Kalendár „{0}“ je len na čítanie a nemôže byť upravovaný. Prosím, vyberte si "
-"iný kalendár, v ktorom môžete akceptovať schôdzky."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can 
accept appointments."
+msgstr "Kalendár „{0}“ je len na čítanie a nemôže byť upravovaný. Prosím, vyberte si iný kalendár, v ktorom 
môžete akceptovať schôdzky."
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "Cannot save task"
@@ -2103,8 +2211,7 @@ msgstr "Nedá sa uložiť úloha"
 
 #. Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:79
-msgid ""
-"'{0}' does not support assigned tasks, please select a different task list."
+msgid "'{0}' does not support assigned tasks, please select a different task list."
 msgstr "„{0}“ nepodporuje priradené úlohy, prosím, vyberte si iný zoznam úloh."
 
 #. Translators: {0} is the name of the task list.
@@ -2127,91 +2234,257 @@ msgstr "Zoznam poznámok nie je určený na použitie v odpojenom režime."
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:87
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to open calendar '{0}'"
+msgstr "Zlyhalo kopírovanie udalosti do kalendára „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+#, fuzzy
+#| msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to open memo list '{0}'"
+msgstr "Zlyhalo kopírovanie poznámky do zoznamu poznámok „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+#, fuzzy
+#| msgid "Failed to copy a task into the task list '{0}'"
+msgid "Failed to open task list '{0}'"
+msgstr "Zlyhalo kopírovanie úlohy do zoznamu úloh „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to create an event in a calendar '{0}'"
+msgstr "Zlyhalo kopírovanie udalosti do kalendára „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:95
+#, fuzzy
+#| msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to create a memo in a memo list '{0}'"
+msgstr "Zlyhalo kopírovanie poznámky do zoznamu poznámok „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:97
+#, fuzzy
+#| msgid "Failed to copy a task into the task list '{0}'"
+msgid "Failed to create a task in a task list '{0}'"
+msgstr "Zlyhalo kopírovanie úlohy do zoznamu úloh „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to modify an event in a calendar '{0}'"
+msgstr "Zlyhalo presunutie udalosti do kalendára „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:101
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to modify a memo in a memo list '{0}'"
+msgstr "Zlyhalo presunutie poznámky do zoznamu poznámok „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:103
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to modify a task in a task list '{0}'"
+msgstr "Zlyhalo presunutie úlohy do zoznamu úloh „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to delete an event in a calendar '{0}'"
+msgstr "Zlyhalo presunutie udalosti do kalendára „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:107
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to delete a memo in a memo list '{0}'"
+msgstr "Zlyhalo presunutie poznámky do zoznamu poznámok „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:109
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to delete a task in a task list '{0}'"
+msgstr "Zlyhalo presunutie úlohy do zoznamu úloh „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:111
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to update an event in a calendar '{0}'"
+msgstr "Zlyhalo presunutie udalosti do kalendára „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:113
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to update a memo in a memo list '{0}'"
+msgstr "Zlyhalo presunutie poznámky do zoznamu poznámok „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:115
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to update a task in a task list '{0}'"
+msgstr "Zlyhalo presunutie úlohy do zoznamu úloh „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:117
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to send an event to a calendar '{0}'"
+msgstr "Zlyhalo presunutie udalosti do kalendára „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:119
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to send a memo to a memo list '{0}'"
+msgstr "Zlyhalo presunutie poznámky do zoznamu poznámok „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:121
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to send a task to a task list '{0}'"
+msgstr "Zlyhalo presunutie úlohy do zoznamu úloh „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:123
+#, fuzzy
+#| msgid "Error loading calendar '{0}'"
+msgid "Error creating view for a calendar '{0}'"
+msgstr "Chyba pri načítavaní kalendára „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:125
+#, fuzzy
+#| msgid "Error loading task list '{0}'"
+msgid "Error creating view for a task list '{0}'"
+msgstr "Chyba pri načítavaní zoznamu úloh „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+#, fuzzy
+#| msgid "Error loading memo list '{0}'"
+msgid "Error creating view for a memo list '{0}'"
+msgstr "Chyba pri načítavaní zoznamu poznámok „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "Zlyhalo kopírovanie udalosti do kalendára „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "Zlyhalo kopírovanie úlohy do zoznamu úloh „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
 msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr "Zlyhalo kopírovanie poznámky do zoznamu poznámok „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:135
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "Zlyhalo presunutie udalosti do kalendára „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to move a task into the task list '{0}'"
 msgstr "Zlyhalo presunutie úlohy do zoznamu úloh „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr "Zlyhalo presunutie poznámky do zoznamu poznámok „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:141
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Kopíruje sa udalosť do kalendára „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:143
 msgid "Copying a task into the task list '{0}'"
 msgstr "Kopíruje sa úloha do zoznamu úloh „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:145
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Kopíruje sa poznámka do zoznamu poznámok „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:147
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Presúva sa udalosť do kalendára „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:149
 msgid "Moving a task into the task list '{0}'"
 msgstr "Presúva sa úloha do zoznamu úloh „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:151
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Presúva sa poznámka do zoznamu poznámok „{0}“"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:153
+#, fuzzy
+#| msgid "Delete remote calendar '{0}'?"
+msgid "Failed to refresh calendar '{0}'"
+msgstr "Odstrániť vzdialený kalendár „{0}“?"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:155
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to refresh task list '{0}'"
+msgstr "Zlyhalo presunutie úlohy do zoznamu úloh „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:157
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to refresh memo list '{0}'"
+msgstr "Zlyhalo presunutie poznámky do zoznamu poznámok „{0}“"
+
+#: ../calendar/calendar.error.xml.h:158
+#, fuzzy
+#| msgid "Make this Occurrence _Movable"
+msgid "Failed to make an occurrence movable"
+msgstr "Nastaviť tento výskyt ako _presunuteľný"
+
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-table.etspec.h:4 
../calendar/gui/e-cal-list-view.etspec.h:3 ../calendar/gui/e-memo-table.etspec.h:2 
../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "Súhrn"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:2 
../mail/filtertypes.xml.in.h:2 ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "obsahuje"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:3 
../mail/filtertypes.xml.in.h:3 ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4 
../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-table-config.ui.h:7 ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Popis"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:7
 msgid "Any Field"
 msgstr "Akékoľvek pole"
 
@@ -2219,86 +2492,65 @@ msgstr "Akékoľvek pole"
 msgid "Classification"
 msgstr "Klasifikácia"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8 ../calendar/gui/tasktypes.xml.h:9 
../mail/filtertypes.xml.in.h:4 ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "je"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9 ../calendar/gui/tasktypes.xml.h:10 
../mail/filtertypes.xml.in.h:5 ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "nie je"
 
 #. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
-#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2 
../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278 ../calendar/gui/e-cal-model.c:285
+#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Verejný"
 
 # je tu správny rod
 # PK: mal by byt
 #. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4 
../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287 ../calendar/gui/e-task-table.c:499
+#: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Súkromný"
 
 #. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
-#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6 
../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289 ../calendar/gui/e-task-table.c:500
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:114 
../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Dôverný"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6 ../calendar/gui/tasktypes.xml.h:5
 msgid "Organizer"
 msgstr "Organizátor"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-#: ../calendar/gui/tasktypes.xml.h:6
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/e-meeting-time-sel.etspec.h:2 
../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "Účastník"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:904
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5 
../mail/message-list.etspec.h:14 ../plugins/publish-calendar/publish-calendar.c:903
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22 ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13 ../calendar/gui/tasktypes.xml.h:23 
../e-util/e-categories-selector.c:327
 msgid "Category"
 msgstr "Kategória"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
-#: ../em-format/e-mail-formatter-print-headers.c:204
-#: ../mail/em-filter-i18n.h:6
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14 ../calendar/gui/tasktypes.xml.h:15 
../em-format/e-mail-formatter-print.c:53 ../em-format/e-mail-formatter-print-headers.c:203
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
 msgid "Attachments"
 msgstr "Prílohy"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15 ../calendar/gui/tasktypes.xml.h:16 
../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Exist"
 msgstr "Existuje"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16 ../calendar/gui/tasktypes.xml.h:17 
../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Do Not Exist"
 msgstr "Neexistuje"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-editor.c:331
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/dialogs/event-editor.c:309 
../calendar/gui/dialogs/event-editor.c:330 ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Opakovanie"
 
@@ -2318,53 +2570,47 @@ msgstr "presne"
 msgid "More Than"
 msgstr "viac ako"
 
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17 ../calendar/gui/tasktypes.xml.h:28
 msgid "Summary Contains"
 msgstr "Obsah súhrnu"
 
-#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18 ../calendar/gui/tasktypes.xml.h:29
 msgid "Description Contains"
 msgstr "Obsah popisu"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:669
+#: ../calendar/gui/dialogs/alarm-dialog.c:668
 msgid "Edit Reminder"
 msgstr "Upraviť pripomenutie"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/dialogs/alarm-dialog.c:896 ../calendar/gui/e-alarm-list.c:424
 msgid "Pop up an alert"
 msgstr "Zobraziť varovanie"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/dialogs/alarm-dialog.c:897 ../calendar/gui/e-alarm-list.c:420
 msgid "Play a sound"
 msgstr "Prehrať zvuk"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/dialogs/alarm-dialog.c:898 ../calendar/gui/e-alarm-list.c:432
 msgid "Run a program"
 msgstr "Spustiť program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:900
-#: ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/dialogs/alarm-dialog.c:899 ../calendar/gui/e-alarm-list.c:428
 msgid "Send an email"
 msgstr "Poslať email"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
+#: ../calendar/gui/dialogs/alarm-dialog.c:908
 msgid "before"
 msgstr "pred"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:910
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
 msgid "after"
 msgstr "po"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
+#: ../calendar/gui/dialogs/alarm-dialog.c:918
 msgid "start of appointment"
 msgstr "začatí(m) schôdzky"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:920
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
 msgid "end of appointment"
 msgstr "skončení(m) schôdzky"
 
@@ -2387,619 +2633,554 @@ msgstr "deň/dní"
 msgid "Add Reminder"
 msgstr "Pridať pripomenutie"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-editor.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../calendar/gui/dialogs/event-editor.c:352
 msgid "Reminder"
 msgstr "Pripomenutie"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Repeat"
 msgstr "Opakovať"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the reminder"
 msgstr "_Opakovať pripomenutie"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "extra times every"
 msgstr "razy navyše každých"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
-msgid "Options"
-msgstr "Voľby"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "Vlastná _správa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "Mes_sage:"
 msgstr "_Správa:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Custom reminder sound"
 msgstr "Vlastný zvuk pripomenutia"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Sound:"
 msgstr "_Zvuk:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "Select A File"
 msgstr "Vybrať súbor"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 msgid "_Arguments:"
 msgstr "_Parametre:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "Send To:"
 msgstr "Adresát:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
 msgid "Action/Trigger"
 msgstr "Akcia/spúšťač"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1 ../calendar/gui/dialogs/event-page.ui.h:28 
../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "Pripomenutia"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-msgid "A_dd"
-msgstr "_Pridať"
-
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Táto udalosť bola odstránená."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Táto úloha bola odstránená."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Táto poznámka bola odstránená."
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Urobili ste zmeny. Chcete ich zahodiť a zatvoriť editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny, chcete zatvoriť editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:85
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Táto udalosť bola zmenená."
 
-#: ../calendar/gui/dialogs/changed-comp.c:89
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Táto úloha bola zmenená."
 
-#: ../calendar/gui/dialogs/changed-comp.c:93
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Táto poznámka bola zmenená."
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Urobili ste zmeny. Chcete ich zahodiť a aktualizovať editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny. Chcete aktualizovať editor?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:271
 msgid "Could not save attachments"
 msgstr "Nepodarilo sa uložiť prílohy"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:755
+#: ../calendar/gui/dialogs/comp-editor.c:759
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Meeting - %s"
 msgstr "Stretnutie - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:764
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Priradená úloha - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:781
 #, c-format
 msgid "Memo - %s"
 msgstr "Poznámka - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:793
+#: ../calendar/gui/dialogs/comp-editor.c:797
 msgid "No Summary"
 msgstr "Žiadny súhrn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:914
+#: ../calendar/gui/dialogs/comp-editor.c:918
 msgid "Keep original item?"
 msgstr "Chcete zachovať pôvodnú položku?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1077
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1081 ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Unable to synchronize with the server"
 msgstr "Nepodarilo sa synchronizovať so serverom"
 
+#. == Button box ==
+#: ../calendar/gui/dialogs/comp-editor.c:1221 ../calendar/gui/dialogs/event-editor.c:116 
../calendar/gui/dialogs/event-editor.c:310 ../calendar/gui/dialogs/event-page.ui.h:29
+#: ../composer/e-composer-actions.c:374 ../e-util/e-html-editor-dialog.c:196 
../e-util/e-mail-signature-editor.c:295 ../e-util/e-name-selector-dialog.c:551 
../e-util/e-preferences-window.c:388
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126 
../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714 
../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908 
../smime/gui/certificate-manager.c:2064
+msgid "_Close"
+msgstr "Za_vrieť"
+
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1219
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "Close the current window"
 msgstr "Zavrie aktuálne okno"
 
+#. copy menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775 
../e-util/e-html-editor-actions.c:959 ../e-util/e-text.c:2089 ../e-util/e-web-view.c:339 
../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:929
+#, fuzzy
+#| msgid "_Copy..."
+msgid "_Copy"
+msgstr "_Kopírovať…"
+
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1226 ../e-util/e-focus-tracker.c:121
-#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
-#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:339
-#: ../e-util/e-web-view.c:1303 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:888
+#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175 
../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284 ../e-util/e-focus-tracker.c:776 
../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1326 ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Skopíruje výber"
 
+#. cut menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770 
../e-util/e-html-editor-actions.c:966 ../e-util/e-text.c:2075 ../mail/e-mail-browser.c:140 
../shell/e-shell-window-actions.c:936
+msgid "Cu_t"
+msgstr ""
+
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1233 ../e-util/e-focus-tracker.c:114
-#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1297 ../mail/e-mail-browser.c:143
-#: ../shell/e-shell-window-actions.c:895
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168 
../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278 ../e-util/e-focus-tracker.c:771 
../e-util/e-web-view.c:1320
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Vystrihne výber"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1240 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189 
../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786 ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "Odstráni výber"
 
 #  tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1247
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
 msgstr "Zobrazí pomocníka"
 
+#. paste menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780 
../e-util/e-html-editor-actions.c:973 ../e-util/e-text.c:2101 ../mail/e-mail-browser.c:147 
../shell/e-shell-window-actions.c:964
+#, fuzzy
+#| msgid "_Pascal"
+msgid "_Paste"
+msgstr "_Pascal"
+
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1254 ../e-util/e-focus-tracker.c:128
-#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1309 ../mail/e-mail-browser.c:150
-#: ../shell/e-shell-window-actions.c:923
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182 
../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290 ../e-util/e-focus-tracker.c:781 
../e-util/e-web-view.c:1332
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Vloží obsah schránky"
 
+#: ../calendar/gui/dialogs/comp-editor.c:1263 ../composer/e-composer-actions.c:428 
../mail/e-mail-reader.c:2262 ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1219
+msgid "_Print..."
+msgstr "_Tlačiť…"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269 
../modules/addressbook/e-book-shell-view-actions.c:1212 ../modules/calendar/e-cal-shell-view-actions.c:1642
+#: ../modules/calendar/e-memo-shell-view-actions.c:764 ../modules/calendar/e-task-shell-view-actions.c:964
+#, fuzzy
+#| msgid "Preview"
+msgid "Pre_view..."
+msgstr "Náhľad"
+
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
 msgstr "Uloží aktuálne zmeny"
 
 # label
-#: ../calendar/gui/dialogs/comp-editor.c:1280
-#: ../e-util/e-mail-signature-editor.c:317
+#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "Uložiť a zavrieť"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Save current changes and close editor"
 msgstr "Uloží aktuálne zmeny a zavrie editor"
 
+#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790 
../e-util/e-html-editor-actions.c:987 ../e-util/e-web-view.c:349 ../mail/e-mail-browser.c:154
+#: ../shell/e-shell-window-actions.c:1041
+#, fuzzy
+#| msgid "Select All"
+msgid "Select _All"
+msgstr "Vybrať všetko"
+
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1289 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
-#: ../shell/e-shell-window-actions.c:1000
+#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196 
../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791 ../mail/e-mail-browser.c:156
+#: ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Vyberie celý text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "_Classification"
 msgstr "_Klasifikácia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1303
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../mail/e-mail-browser.c:171
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1028
-msgid "_Edit"
-msgstr "_Upraviť"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1310
-#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:1035
+#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-html-editor-actions.c:1010 
../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163 ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
-#: ../shell/e-shell-window-actions.c:1042
-msgid "_Help"
-msgstr "_Pomocník"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1342 ../e-util/e-html-editor-actions.c:1031
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1331
-#: ../composer/e-composer-actions.c:320
+#: ../calendar/gui/dialogs/comp-editor.c:1349 ../composer/e-composer-actions.c:418
 msgid "_Options"
 msgstr "_Voľby"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1356 ../e-util/e-html-editor-actions.c:1052 
../mail/e-mail-browser.c:177 ../shell/e-shell-window-actions.c:1120 ../smime/gui/certificate-manager.c:1649
+#: ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Zobraziť"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1348
-#: ../composer/e-composer-actions.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../composer/e-composer-actions.c:367
 msgid "_Attachment..."
 msgstr "_Príloha…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1368 ../composer/e-composer-actions.c:369 
../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "Priloží súbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1358
+#: ../calendar/gui/dialogs/comp-editor.c:1376
 msgid "_Categories"
 msgstr "_Kategórie"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1378
 msgid "Toggles whether to display categories"
 msgstr "Prepína, či majú byť zobrazené kategórie"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "Time _Zone"
 msgstr "Časové _pásmo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1386
 msgid "Toggles whether the time zone is displayed"
 msgstr "Prepína, či má byť zobrazené časové pásmo"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Pu_blic"
 msgstr "_Verejný"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Classify as public"
 msgstr "Klasifikuje ako verejný"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Private"
 msgstr "_Súkromný"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "Classify as private"
 msgstr "Klasifikuje ako súkromný"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/gui/dialogs/comp-editor.c:1391
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Confidential"
 msgstr "_Tajný"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/gui/dialogs/comp-editor.c:1393
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Classify as confidential"
 msgstr "Klasifikuje ako tajný"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1401
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "R_ole Field"
 msgstr "Pole R_ola"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1421
 msgid "Toggles whether the Role field is displayed"
 msgstr "Prepína, či má byť zobrazené pole Rola"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "_RSVP"
 msgstr "„_Vyžadované potvrdenie“"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1411
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Prepína, či má byť zobrazené pole „Vyžadované potrvdenie“"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417
+#: ../calendar/gui/dialogs/comp-editor.c:1435
 msgid "_Status Field"
 msgstr "Pole _stav"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "Toggles whether the Status field is displayed"
 msgstr "Prepína, či má byť zobrazené pole stav"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1425
+#: ../calendar/gui/dialogs/comp-editor.c:1443
 msgid "_Type Field"
 msgstr "Pole _Typ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Prepína, či má byť zobrazené pole typ účastníka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2208
-#: ../composer/e-composer-actions.c:488
+#: ../calendar/gui/dialogs/comp-editor.c:2232 ../composer/e-composer-actions.c:636
 msgid "Attach"
 msgstr "Priložiť"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2538
-#: ../calendar/gui/dialogs/comp-editor.c:2748
-#: ../calendar/gui/dialogs/comp-editor.c:3761
+#: ../calendar/gui/dialogs/comp-editor.c:2563 ../calendar/gui/dialogs/comp-editor.c:2773 
../calendar/gui/dialogs/comp-editor.c:3786
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Zmeny tejto položky môžu byť zahodné v prípade, ak príde aktualizácia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3723
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:3748 ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "príloha"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3793
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "Nie je možné použiť aktuálnu verziu!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:441
+#: ../calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Chyba kontroly platnosti: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:121
-msgid "Could not open destination"
-msgstr "Nepodarilo sa otvoriť cieľ"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:131
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129 ../calendar/gui/e-cal-ops.c:1940
 msgid "Destination is read only"
 msgstr "Cieľ je len na čítanie"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:173
-msgid "Cannot create object"
-msgstr "Nedá sa vytvoriť objekt"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, fuzzy, c-format
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying events to the calendar '%s'"
+msgstr "Kopíruje sa udalosť do kalendára „{0}“"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, fuzzy, c-format
+#| msgid "Copying a memo into the memo list '{0}'"
+msgid "Copying memos to the memo list '%s'"
+msgstr "Kopíruje sa poznámka do zoznamu poznámok „{0}“"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:204
-msgid "Could not open source"
-msgstr "Nepodarilo sa otvoriť zdroj"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#, fuzzy, c-format
+#| msgid "Copying a task into the task list '{0}'"
+msgid "Copying tasks to the task list '%s'"
+msgstr "Kopíruje sa úloha do zoznamu úloh „{0}“"
 
-#: ../calendar/gui/dialogs/delete-comp.c:216
+#: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "O_dstrániť túto položku zo všetkých ostatných priečinkov príjemcu?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:219
+#: ../calendar/gui/dialogs/delete-comp.c:218
 msgid "_Retract comment"
 msgstr "_Odvolať komentár"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:55
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "Udalosť sa nepodarilo odstrániť kvôli chybe systému dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:59
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "Úlohu sa nepodarilo odstrániť kvôli chybe systému dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:63
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "Poznámku sa nepodarilo odstrániť kvôli chybe systému dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:67
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "Položku sa nepodarilo odstrániť kvôli chybe systému dbus: %s"
-
-#: ../calendar/gui/dialogs/delete-error.c:74
-msgid "The event could not be deleted because permission was denied"
-msgstr "Udalosť sa nepodarilo odstrániť kvôli nedostatočným právam"
-
-#: ../calendar/gui/dialogs/delete-error.c:77
-msgid "The task could not be deleted because permission was denied"
-msgstr "Úlohu sa nepodarilo odstrániť kvôli nedostatočným právam"
-
-#: ../calendar/gui/dialogs/delete-error.c:80
-msgid "The memo could not be deleted because permission was denied"
-msgstr "Poznámku sa nepodarilo odstrániť kvôli nedostatočným právam"
-
-#: ../calendar/gui/dialogs/delete-error.c:83
-msgid "The item could not be deleted because permission was denied"
-msgstr "Položku sa nepodarilo odstrániť kvôli nedostatočným právam"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:91
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "Udalosť sa nepodarilo odstrániť kvôli chybe: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:95
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "Úlohu sa nepodarilo odstrániť kvôli chybe: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:99
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "Poznámku sa nepodarilo odstrániť kvôli chybe: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:103
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "Položku sa nepodarilo odstrániť kvôli chybe: %s"
-
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Enter Delegate"
 msgstr "Zadajte na koho postúpiť"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
 msgid "Delegate To:"
 msgstr "Postúpiť na:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
 msgid "Contacts..."
 msgstr "Kontakty…"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "_Reminders"
 msgstr "_Pripomenutia"
 
 # tooltip
-#: ../calendar/gui/dialogs/event-editor.c:207
+#: ../calendar/gui/dialogs/event-editor.c:206
 msgid "Set or unset reminders for this event"
 msgstr "Nastavíte alebo zrušíte pripomenutia pre túto udalosť"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Show Time as _Busy"
 msgstr "Zobraziť čas ako _obsadený"
 
 # tooltip
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "Toggles whether to show time as busy"
 msgstr "Prepína, či má byť čas zobrazený ako obsadený"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "_Recurrence"
 msgstr "_Opakovanie"
 
 # tooltip
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Make this a recurring event"
 msgstr "Vytvorí opakujúcu sa udalosť"
 
-#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Voľby posielania"
 
 # tooltip
-#: ../calendar/gui/dialogs/event-editor.c:235
-#: ../calendar/gui/dialogs/task-editor.c:96
+#: ../calendar/gui/dialogs/event-editor.c:234 ../calendar/gui/dialogs/task-editor.c:95
 msgid "Insert advanced send options"
 msgstr "Vloží pokročilé voľby posielania"
 
-#: ../calendar/gui/dialogs/event-editor.c:243
+#: ../calendar/gui/dialogs/event-editor.c:242
 msgid "All _Day Event"
 msgstr "Celo_denná udalosť"
 
 # tooltip
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "Toggles whether to have All Day Event"
 msgstr "Prepína, či má byť celodennou udalosťou"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:253
 msgid "_Free/Busy"
 msgstr "_Diár"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "Query free / busy information for the attendees"
 msgstr "Dopyt na informácie do diára pre účastníkov"
 
-#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3497
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "Schôdzka"
 
-#: ../calendar/gui/dialogs/event-editor.c:377
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/dialogs/event-editor.c:376 ../calendar/gui/dialogs/event-page.ui.h:27 
../calendar/gui/e-meeting-list-view.c:164
 msgid "Attendees"
 msgstr "Účastníci"
 
-#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../calendar/gui/dialogs/event-editor.c:573
 msgid "Print this event"
 msgstr "Vytlačiť túto udalosť"
 
-#: ../calendar/gui/dialogs/event-page.c:559
+#: ../calendar/gui/dialogs/event-page.c:557
 msgid "Event's start time is in the past"
 msgstr "Začiatočný čas udalosti je v minulosti"
 
-#: ../calendar/gui/dialogs/event-page.c:636
+#: ../calendar/gui/dialogs/event-page.c:634
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Udalosť sa nedá upravovať, pretože vybraný kalendár je len na čítanie"
 
-#: ../calendar/gui/dialogs/event-page.c:640
+#: ../calendar/gui/dialogs/event-page.c:638
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Udalosť sa nedá celá upravovať, pretože nie ste organizátor"
 
-#: ../calendar/gui/dialogs/event-page.c:652
-#: ../calendar/gui/dialogs/event-page.c:3169
+#: ../calendar/gui/dialogs/event-page.c:650 ../calendar/gui/dialogs/event-page.c:3178
 msgid "This event has reminders"
 msgstr "Táto udalosť má pripomenutia"
 
-#: ../calendar/gui/dialogs/event-page.c:719
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.c:717 ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "Or_ganizátor:"
 
-#: ../calendar/gui/dialogs/event-page.c:1304
+#: ../calendar/gui/dialogs/event-page.c:1309
 msgid "Event with no start date"
 msgstr "Udalosť bez dátumu začiatku"
 
-#: ../calendar/gui/dialogs/event-page.c:1307
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "Event with no end date"
 msgstr "Udalosť bez dátumu konca"
 
-#: ../calendar/gui/dialogs/event-page.c:1480
-#: ../calendar/gui/dialogs/memo-page.c:724
-#: ../calendar/gui/dialogs/task-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1490 ../calendar/gui/dialogs/memo-page.c:732 
../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "Dátum začiatku je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:1491
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End date is wrong"
 msgstr "Dátum konca je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:1515
+#: ../calendar/gui/dialogs/event-page.c:1525
 msgid "Start time is wrong"
 msgstr "Čas začiatku je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:1523
+#: ../calendar/gui/dialogs/event-page.c:1533
 msgid "End time is wrong"
 msgstr "Čas konca je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:1687
-#: ../calendar/gui/dialogs/memo-page.c:763
-#: ../calendar/gui/dialogs/task-page.c:1081
+#: ../calendar/gui/dialogs/event-page.c:1697 ../calendar/gui/dialogs/memo-page.c:771 
../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "Organizátor je vyžadovaný."
 
-#: ../calendar/gui/dialogs/event-page.c:1722
-#: ../calendar/gui/dialogs/task-page.c:1116
+#: ../calendar/gui/dialogs/event-page.c:1732 ../calendar/gui/dialogs/task-page.c:1121
 msgid "At least one attendee is required."
 msgstr "Potrebný je aspoň jeden účastník."
 
-#: ../calendar/gui/dialogs/event-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:1938
 #, fuzzy
 msgid "_Delegatees"
 msgstr "_Poverenia"
 
-#: ../calendar/gui/dialogs/event-page.c:1930
+#: ../calendar/gui/dialogs/event-page.c:1940
 msgid "Atte_ndees"
 msgstr "Účast_níci"
 
-#: ../calendar/gui/dialogs/event-page.c:3449
+#: ../calendar/gui/dialogs/event-page.c:3458
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -3007,7 +3188,7 @@ msgstr[0] "%d dní pred schôdzkou"
 msgstr[1] "%d deň pred schôdzkou"
 msgstr[2] "%d dni pred schôdzkou"
 
-#: ../calendar/gui/dialogs/event-page.c:3455
+#: ../calendar/gui/dialogs/event-page.c:3464
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -3015,7 +3196,7 @@ msgstr[0] "%d hodín pred schôdzkou"
 msgstr[1] "%d hodinu pred schôdzkou"
 msgstr[2] "%d hodiny pred schôdzkou"
 
-#: ../calendar/gui/dialogs/event-page.c:3461
+#: ../calendar/gui/dialogs/event-page.c:3470
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -3023,12 +3204,15 @@ msgstr[0] "%d minút pred schôdzkou"
 msgstr[1] "%d minútu pred schôdzkou"
 msgstr[2] "%d minúty pred schôdzkou"
 
-#: ../calendar/gui/dialogs/event-page.c:3482
-msgid "Customize"
-msgstr "Prispôsobiť"
+# vlastné usporiadanie
+#: ../calendar/gui/dialogs/event-page.c:3491
+#, fuzzy
+#| msgid "_Custom"
+msgid "Custom"
+msgstr "_Vlastné"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3489
+#: ../calendar/gui/dialogs/event-page.c:3498
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Žiadna"
@@ -3067,10 +3251,8 @@ msgstr "1 deň pred schôdzkou"
 msgid "_Location:"
 msgstr "_Miesto:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:29
-#: ../e-util/e-attachment-dialog.c:357
+#: ../calendar/gui/dialogs/event-page.ui.h:12 ../calendar/gui/dialogs/memo-page.ui.h:2 
../calendar/gui/dialogs/task-page.ui.h:29 ../e-util/e-attachment-dialog.c:356 
../e-util/e-html-editor-image-dialog.c:514
+#: ../e-util/e-html-editor-link-dialog.c:356
 msgid "_Description:"
 msgstr "P_opis:"
 
@@ -3078,8 +3260,7 @@ msgstr "P_opis:"
 msgid "_Time:"
 msgstr "Č_as:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:15 ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "Časové _pásmo:"
 
@@ -3091,20 +3272,14 @@ msgstr "_Súhrn:"
 msgid "Event Description"
 msgstr "Popis udalosti"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:30
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../calendar/gui/dialogs/task-page.ui.h:33 
../calendar/gui/e-meeting-time-sel.c:549
 msgid "Atte_ndees..."
 msgstr "Účast_níci…"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/event-page.ui.h:30
 msgid "_Reminder"
 msgstr "P_ripomenutie"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-msgid "Custom Reminder:"
-msgstr "Vlastné pripomenutie:"
-
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
 msgid "January"
 msgstr "Január"
@@ -3157,50 +3332,40 @@ msgstr "December"
 msgid "Select Date"
 msgstr "Výber dátumu"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "Vybrať _dnešok"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3501
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "Poznámka"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:155
 msgid "Print this memo"
 msgstr "Vytlačiť túto poznámku"
 
-#: ../calendar/gui/dialogs/memo-page.c:421
+#: ../calendar/gui/dialogs/memo-page.c:424
 msgid "Memo's start date is in the past"
 msgstr "Dátum začiatku poznámky je v minulosti"
 
-#: ../calendar/gui/dialogs/memo-page.c:457
+#: ../calendar/gui/dialogs/memo-page.c:460
 msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr ""
-"Poznámka nemôže byť upravená, pretože vybraný zoznam poznámok je len na "
-"čítanie"
+msgstr "Poznámka nemôže byť upravená, pretože vybraný zoznam poznámok je len na čítanie"
 
-#: ../calendar/gui/dialogs/memo-page.c:461
+#: ../calendar/gui/dialogs/memo-page.c:464
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Poznámka sa nedá celá upravovať, pretože nie ste organizátor"
 
-#: ../calendar/gui/dialogs/memo-page.c:1158
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
+#: ../calendar/gui/dialogs/memo-page.c:1166 ../em-format/e-mail-formatter-utils.c:201 
../em-format/e-mail-formatter-utils.c:218 ../em-format/e-mail-part-headers.c:48 
../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11 ../modules/mail/em-mailer-prefs.c:64
 msgid "To"
 msgstr "Komu"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:428
-#: ../calendar/gui/dialogs/task-page.ui.h:31
+#: ../calendar/gui/dialogs/memo-page.ui.h:3 ../calendar/gui/dialogs/task-page.c:426 
../calendar/gui/dialogs/task-page.ui.h:34
 msgid "_List:"
 msgstr "_Zoznam:"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:436
-#: ../calendar/gui/dialogs/task-page.ui.h:24
+#: ../calendar/gui/dialogs/memo-page.ui.h:4 ../calendar/gui/dialogs/task-page.c:434 
../calendar/gui/dialogs/task-page.ui.h:24
 msgid "Organi_zer:"
 msgstr "Organi_zátor:"
 
@@ -3208,67 +3373,65 @@ msgstr "Organi_zátor:"
 msgid "T_o:"
 msgstr "_Pre:"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:26
+#: ../calendar/gui/dialogs/memo-page.ui.h:6 ../calendar/gui/dialogs/task-page.ui.h:26
 msgid "Sta_rt date:"
 msgstr "Dátum _začiatku:"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:23
+#: ../calendar/gui/dialogs/memo-page.ui.h:7 ../calendar/gui/dialogs/task-page.ui.h:23
 msgid "Su_mmary:"
 msgstr "_Súhrn:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Upravujete opakujúcu sa udalosť. Čo chcete zmeniť?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Zverujete opakujúcu sa udalosť. Čo chcete zveriť?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:58
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Upravujete opakujúcu sa úlohu. Čo chcete zmeniť?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:62
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Upravujete opakujúcu sa poznámku. Čo chcete zmeniť?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Iba tento výskyt"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Tento a predchádzajúce výskyty"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Tento a budúce výskyty"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Všetky výskyty"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Táto schôdzka obsahuje opakovania, ktoré Evolution nedokáže upraviť."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1001
 msgid "Recurrence date is invalid"
 msgstr "Dátum opakovania je neplatný"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "End time of the recurrence was before event's start"
 msgstr "Čas konca opakovania bol pred pred začiatkom udalosti"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "on"
 msgstr "v"
 
@@ -3276,7 +3439,7 @@ msgstr "v"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1156
+#: ../calendar/gui/dialogs/recurrence-page.c:1155
 msgid "first"
 msgstr "prvý(ú)"
 
@@ -3285,7 +3448,7 @@ msgstr "prvý(ú)"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1162
+#: ../calendar/gui/dialogs/recurrence-page.c:1161
 msgid "second"
 msgstr "druhý(ú)"
 
@@ -3293,7 +3456,7 @@ msgstr "druhý(ú)"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1167
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "third"
 msgstr "tretí(u)"
 
@@ -3301,7 +3464,7 @@ msgstr "tretí(u)"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1172
+#: ../calendar/gui/dialogs/recurrence-page.c:1171
 msgid "fourth"
 msgstr "štvrtý(ú)"
 
@@ -3309,7 +3472,7 @@ msgstr "štvrtý(ú)"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1177
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "fifth"
 msgstr "piaty(u)"
 
@@ -3317,13 +3480,13 @@ msgstr "piaty(u)"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1182
+#: ../calendar/gui/dialogs/recurrence-page.c:1181
 msgid "last"
 msgstr "posledný(ú)"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1206
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 msgid "Other Date"
 msgstr "Iný dátum"
 
@@ -3331,7 +3494,7 @@ msgstr "Iný dátum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1212
+#: ../calendar/gui/dialogs/recurrence-page.c:1211
 msgid "1st to 10th"
 msgstr "1. až 10."
 
@@ -3339,7 +3502,7 @@ msgstr "1. až 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1218
+#: ../calendar/gui/dialogs/recurrence-page.c:1217
 msgid "11th to 20th"
 msgstr "11. až 20."
 
@@ -3347,74 +3510,67 @@ msgstr "11. až 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1224
+#: ../calendar/gui/dialogs/recurrence-page.c:1223
 msgid "21st to 31st"
 msgstr "21. až 31."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1250 ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Pondelok"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1251 ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../calendar/gui/dialogs/recurrence-page.c:1252 ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Stredu"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1253 ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1254 ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Piatok"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../calendar/gui/dialogs/recurrence-page.c:1255 ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Sobotu"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1257
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1256 ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Nedeľu"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1388
+#: ../calendar/gui/dialogs/recurrence-page.c:1387
 msgid "on the"
 msgstr "v"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/gui/dialogs/recurrence-page.c:1573
+#: ../calendar/gui/dialogs/recurrence-page.c:1572
 msgid "occurrences"
 msgstr "výskytov"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2343
+#: ../calendar/gui/dialogs/recurrence-page.c:2342
 msgid "Add exception"
 msgstr "Pridať výnimku"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2385
+#: ../calendar/gui/dialogs/recurrence-page.c:2384
 msgid "Could not get a selection to modify."
 msgstr "Nepodarilo sa získať výber na úpravu."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2391
+#: ../calendar/gui/dialogs/recurrence-page.c:2390
 msgid "Modify exception"
 msgstr "Upraviť výnimku"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2437
+#: ../calendar/gui/dialogs/recurrence-page.c:2436
 msgid "Could not get a selection to delete."
 msgstr "Nepodarilo sa získať výber na odstránenie."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2578
+#: ../calendar/gui/dialogs/recurrence-page.c:2577
 msgid "Date/Time"
 msgstr "Dátum/Čas"
 
@@ -3481,140 +3637,103 @@ msgstr "Každý(ch)"
 msgid "Exceptions"
 msgstr "Výnimky"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
 msgid "Preview"
 msgstr "Náhľad"
 
-#: ../calendar/gui/dialogs/send-comp.c:173
-#: ../calendar/gui/dialogs/send-comp.c:255
+#: ../calendar/gui/dialogs/send-comp.c:172 ../calendar/gui/dialogs/send-comp.c:254
 msgid "Send my reminders with this event"
 msgstr "Poslať moje pripomenutia s touto udalosťou"
 
-#: ../calendar/gui/dialogs/send-comp.c:175
-#: ../calendar/gui/dialogs/send-comp.c:257
+#: ../calendar/gui/dialogs/send-comp.c:174 ../calendar/gui/dialogs/send-comp.c:256
 msgid "Notify new attendees _only"
 msgstr "Oznámiť _len novým účastníkom"
 
-#: ../calendar/gui/dialogs/task-editor.c:94
+#: ../calendar/gui/dialogs/task-editor.c:93
 msgid "_Send Options"
 msgstr "Voľby _posielania"
 
-#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3499
-#: ../e-util/e-send-options.c:553
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488 ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Úloha"
 
-#: ../calendar/gui/dialogs/task-editor.c:286
+#: ../calendar/gui/dialogs/task-editor.c:285
 msgid "Print this task"
 msgstr "Vytlačiť túto úlohu"
 
-#: ../calendar/gui/dialogs/task-page.c:332
+#: ../calendar/gui/dialogs/task-page.c:330
 msgid "Task's start date is in the past"
 msgstr "Dátum začiatku úlohy je v minulosti"
 
-#: ../calendar/gui/dialogs/task-page.c:333
+#: ../calendar/gui/dialogs/task-page.c:331
 msgid "Task's due date is in the past"
 msgstr "Dátum termínu úlohy je v minulosti"
 
-#: ../calendar/gui/dialogs/task-page.c:366
+#: ../calendar/gui/dialogs/task-page.c:364
 msgid "Task cannot be edited, because the selected task list is read only"
-msgstr ""
-"Úloha nemôže byť upravená, pretože vybraný zoznam úloh je len na čítanie"
+msgstr "Úloha nemôže byť upravená, pretože vybraný zoznam úloh je len na čítanie"
 
-#: ../calendar/gui/dialogs/task-page.c:370
+#: ../calendar/gui/dialogs/task-page.c:368
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Úloha sa nedá celá upravovať, pretože nie ste organizátor"
 
-#: ../calendar/gui/dialogs/task-page.c:374
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr ""
-"Úloha nemôže byť upravená, pretože vybraný zoznam úloh nepodporuje priradené "
-"úlohy"
+#: ../calendar/gui/dialogs/task-page.c:372
+msgid "Task cannot be edited, because the selected task list does not support assigned tasks"
+msgstr "Úloha nemôže byť upravená, pretože vybraný zoznam úloh nepodporuje priradené úlohy"
 
-#: ../calendar/gui/dialogs/task-page.c:1008
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr "Termín je neplatný"
 
-#: ../calendar/gui/dialogs/task-page.c:1176
-#: ../calendar/gui/dialogs/task-page.c:1201
+#: ../calendar/gui/dialogs/task-page.c:1181 ../calendar/gui/dialogs/task-page.c:1206
 msgid "Completed date is wrong"
 msgstr "Dátum dokončenia je neplatný"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:310
+#: ../calendar/gui/dialogs/task-page.ui.h:8 ../calendar/gui/e-cal-component-preview.c:338 
../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19 ../e-util/e-send-options.ui.h:2
+#: ../mail/message-list.c:313
 msgid "High"
 msgstr "Vysoká"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:339
-#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
-#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:309
+#: ../calendar/gui/dialogs/task-page.ui.h:10 ../calendar/gui/e-cal-component-preview.c:340 
../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525 ../calendar/gui/tasktypes.xml.h:20
+#: ../e-util/e-send-options.ui.h:5 ../mail/message-list.c:312
 msgid "Normal"
 msgstr "Normálna"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:341
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:308
+#: ../calendar/gui/dialogs/task-page.ui.h:12 ../calendar/gui/e-cal-component-preview.c:342 
../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21 ../e-util/e-send-options.ui.h:4
+#: ../mail/message-list.c:311
 msgid "Low"
 msgstr "Nízka"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:14 ../calendar/gui/e-task-table.c:527 
../calendar/gui/tasktypes.xml.h:22 ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:322
-#: ../calendar/gui/e-cal-model-tasks.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:553 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3583 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/dialogs/task-page.ui.h:16 ../calendar/gui/e-cal-component-preview.c:323 
../calendar/gui/e-cal-model-tasks.c:310 ../calendar/gui/e-cal-model-tasks.c:552 
../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607 ../calendar/gui/print.c:3573 
../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Nezačala"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:313
-#: ../calendar/gui/e-cal-model-tasks.c:555
-#: ../calendar/gui/e-cal-model-tasks.c:636 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3586
+#: ../calendar/gui/dialogs/task-page.ui.h:18 ../calendar/gui/e-cal-component-preview.c:313 
../calendar/gui/e-cal-model-tasks.c:312 ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209 
../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608 ../calendar/gui/print.c:3576
 msgid "In Progress"
 msgstr "Prebieha"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model-tasks.c:315
-#: ../calendar/gui/e-cal-model-tasks.c:557
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3589
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../calendar/gui/dialogs/task-page.ui.h:20 ../calendar/gui/e-cal-component-preview.c:316 
../calendar/gui/e-cal-model-tasks.c:314 ../calendar/gui/e-cal-model-tasks.c:556 
../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:227 ../calendar/gui/e-task-table.c:211 
../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
+#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "Dokončená"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-cal-model-tasks.c:317
-#: ../calendar/gui/e-cal-model-tasks.c:559 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3592 ../mail/mail-send-recv.c:860
+#: ../calendar/gui/dialogs/task-page.ui.h:22 ../calendar/gui/e-cal-component-preview.c:319 
../calendar/gui/e-cal-model-tasks.c:316 ../calendar/gui/e-cal-model-tasks.c:558 
../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610 ../calendar/gui/print.c:3582 
../mail/mail-send-recv.c:958
 msgid "Canceled"
 msgstr "Zrušená"
 
@@ -3626,80 +3745,80 @@ msgstr "_Termín:"
 msgid "Time zone:"
 msgstr "Časové pásmo:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../calendar/gui/dialogs/task-page.ui.h:35
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:33
+#: ../calendar/gui/dialogs/task-page.ui.h:36
 msgid "Date _completed:"
 msgstr "_Dátum dokončenia:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:34
+#: ../calendar/gui/dialogs/task-page.ui.h:37
 msgid "_Percent complete:"
 msgstr "Dokončených _percent:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:35
+#: ../calendar/gui/dialogs/task-page.ui.h:38
 msgid "Priorit_y:"
 msgstr "Priorit_a:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:36
+#: ../calendar/gui/dialogs/task-page.ui.h:39
 msgid "C_lassification:"
 msgstr "_Zaradenie:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:37
+#: ../calendar/gui/dialogs/task-page.ui.h:40
 msgid "_Web Page:"
 msgstr "_Webová stránka:"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "Nová schôdzka"
 
-#: ../calendar/gui/ea-cal-view.c:325
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "Nová celodenná udalosť"
 
-#: ../calendar/gui/ea-cal-view.c:326
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: ../calendar/gui/ea-cal-view.c:327
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "Prejsť na dnešný dátum"
 
-#: ../calendar/gui/ea-cal-view.c:328
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "Prejsť na dátum"
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "Má pripomenutia."
 
-#: ../calendar/gui/ea-cal-view-event.c:301
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "Má opakovania."
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "Je to stretnutie."
 
-#: ../calendar/gui/ea-cal-view-event.c:311
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Udalosť v kalendári: Súhrn je %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:314
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "Udalosti v kalendári: Nemá súhrn."
 
-#: ../calendar/gui/ea-cal-view-event.c:337
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "pohľad na udalosti v kalendári"
 
-#: ../calendar/gui/ea-cal-view-event.c:569
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Získať zameranie"
 
-#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3709,99 +3828,42 @@ msgstr[2] "Obsahuje %d udalosti."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "Neobsahuje udalosti."
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Pohľad na pracovný týždeň: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:176
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Pohľad na deň: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:210
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "pohľad na kalendár pre pracovný týždeň"
 
-#: ../calendar/gui/ea-day-view.c:212
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "pohľad na kalendár pre jeden alebo viac dní"
 
-#: ../calendar/gui/ea-day-view-main-item.c:327
-#: ../calendar/gui/ea-week-view-main-item.c:354
+#: ../calendar/gui/ea-day-view-main-item.c:266 ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "tabuľka na zobrazenie a výber aktuálneho časového rozpätia"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1108
-msgid "Gnome Calendar"
-msgstr "Kalendár Gnome"
-
-#: ../calendar/gui/ea-gnome-calendar.c:207
-#: ../modules/calendar/e-cal-shell-view-private.c:1191
-msgid "%A %d %b %Y"
-msgstr "%A, %d. %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:211 ../calendar/gui/e-day-view.c:2796
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:1195
-msgid "%a %d %b"
-msgstr "%a %d. %b"
-
-#: ../calendar/gui/ea-gnome-calendar.c:214
-#: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../calendar/gui/ea-gnome-calendar.c:223
-#: ../modules/calendar/e-cal-shell-view-private.c:1198
-#: ../modules/calendar/e-cal-shell-view-private.c:1204
-#: ../modules/calendar/e-cal-shell-view-private.c:1207
-msgid "%a %d %b %Y"
-msgstr "%a, %d. %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../calendar/gui/ea-gnome-calendar.c:250
-#: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../calendar/gui/ea-gnome-calendar.c:260
-#: ../modules/calendar/e-cal-shell-view-private.c:1224
-#: ../modules/calendar/e-cal-shell-view-private.c:1235
-#: ../modules/calendar/e-cal-shell-view-private.c:1242
-#: ../modules/calendar/e-cal-shell-view-private.c:1245
-msgid "%d %b %Y"
-msgstr "%d. %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:247 ../calendar/gui/e-day-view.c:2812
-#: ../calendar/gui/e-day-view-top-item.c:863
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1231
-msgid "%d %b"
-msgstr "%d %b"
-
-#: ../calendar/gui/ea-jump-button.c:151
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Tlačidlo skoku"
 
-#: ../calendar/gui/ea-jump-button.c:160
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "Kliknutím sem môžete nájsť viac udalostí."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:358
+#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3810,7 +3872,7 @@ msgstr[1] "%d deň"
 msgstr[2] "%d dni"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:364
+#: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3818,133 +3880,133 @@ msgstr[0] "%d týždňov"
 msgstr[1] "%d týždeň"
 msgstr[2] "%d týždne"
 
-#: ../calendar/gui/e-alarm-list.c:426
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Unknown action to be performed"
 msgstr "Má sa vykonať neznáma akcia"
 
-#: ../calendar/gui/e-alarm-list.c:441
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pred začiatkom schôdzky"
 
-#: ../calendar/gui/e-alarm-list.c:447
+#: ../calendar/gui/e-alarm-list.c:459
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po začiatku schôdzky"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na začiatku schôdzky"
 
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pred koncom schôdzky"
 
-#: ../calendar/gui/e-alarm-list.c:472
+#: ../calendar/gui/e-alarm-list.c:484
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po skončení schôdzky"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na konci schôdzky"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:503
+#: ../calendar/gui/e-alarm-list.c:515
 #, c-format
 msgid "%s at %s"
 msgstr "%s o %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:511
+#: ../calendar/gui/e-alarm-list.c:523
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pre neznámy typ spustenia"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Pohľad na mesiac: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:168
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Pohľad na týždeň: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:202
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "pohľad na kalendár pre mesiac"
 
-#: ../calendar/gui/ea-week-view.c:204
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "pohľad na kalendár pre jeden alebo viac týždňov"
 
-#: ../calendar/gui/e-cal-component-preview.c:223 ../e-util/e-filter-rule.c:754
-#: ../mail/e-mail-config-page.c:126
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:758 
../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:230
 msgid "Categories:"
 msgstr "Kategórie:"
 
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Summary:"
 msgstr "Súhrn:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:273
 msgid "Start Date:"
 msgstr "Dátum začiatku:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:285
 msgid "End Date:"
 msgstr "Dátum konca:"
 
-#: ../calendar/gui/e-cal-component-preview.c:296
+#: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "Termín:"
 
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../modules/itip-formatter/itip-view.c:1500
-#: ../modules/itip-formatter/itip-view.c:1617
+#: ../calendar/gui/e-cal-component-preview.c:309 ../modules/itip-formatter/itip-view.c:1496 
../modules/itip-formatter/itip-view.c:1613
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../calendar/gui/e-cal-component-preview.c:335
+#: ../calendar/gui/e-cal-component-preview.c:336
 msgid "Priority:"
 msgstr "Priorita:"
 
-#: ../calendar/gui/e-cal-component-preview.c:360
-#: ../mail/e-mail-config-service-page.c:672
+#: ../calendar/gui/e-cal-component-preview.c:361 ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../calendar/gui/e-cal-component-preview.c:391
+#: ../calendar/gui/e-cal-component-preview.c:392
 msgid "Web Page:"
 msgstr "Webová stránka:"
 
-#: ../calendar/gui/e-calendar-selector.c:358
-#: ../modules/calendar/e-cal-shell-view-private.c:1097
+#: ../calendar/gui/e-cal-data-model.c:1608
 #, fuzzy, c-format
-#| msgid "Copying an event into the calendar '{0}'"
-msgid "Copying an event into the calendar %s"
-msgstr "Kopíruje sa udalosť do kalendára „{0}“"
+#| msgid "Opening calendar '%s'"
+msgid "Creating view for calendar '%s'"
+msgstr "Otvára sa kalendár „%s“"
 
-#: ../calendar/gui/e-calendar-selector.c:359
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-cal-data-model.c:1612
 #, fuzzy, c-format
-#| msgid "Moving an event into the calendar '{0}'"
-msgid "Moving an event into the calendar %s"
-msgstr "Presúva sa udalosť do kalendára „{0}“"
+#| msgid "Opening task list '%s'"
+msgid "Creating view for task list '%s'"
+msgstr "Otvára sa zoznam úloh „%s“"
+
+#: ../calendar/gui/e-cal-data-model.c:1616
+#, fuzzy, c-format
+#| msgid "Opening memo list '%s'"
+msgid "Creating view for memo list '%s'"
+msgstr "Otvára sa zoznam poznámok „%s“"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
@@ -3954,12 +4016,8 @@ msgstr "Kliknutím pridáte úlohu"
 msgid "Start date"
 msgstr "Dátum začiatku"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:653
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:586
-#: ../mail/e-mail-account-tree-view.c:159
+#: ../calendar/gui/e-calendar-table.etspec.h:3 ../calendar/gui/e-meeting-list-view.c:652 
../calendar/gui/e-meeting-time-sel.etspec.h:4 ../calendar/gui/e-memo-table.etspec.h:3
+#: ../e-util/e-attachment-tree-view.c:585 ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Typ"
 
@@ -3967,7 +4025,7 @@ msgstr "Typ"
 msgid "Completion date"
 msgstr "Dátum dokončenia"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:862
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
 msgid "Complete"
 msgstr "Hotovo"
 
@@ -3980,68 +4038,78 @@ msgstr "Termín"
 msgid "% Complete"
 msgstr "% hotových"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../calendar/gui/e-calendar-table.etspec.h:10 ../calendar/gui/tasktypes.xml.h:18 
../plugins/save-calendar/csv-format.c:386
 msgid "Priority"
 msgstr "Priorita"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4012
-#: ../calendar/gui/e-meeting-list-view.c:696
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
-#: ../mail/message-list.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:11 ../calendar/gui/e-cal-model.c:3088 
../calendar/gui/e-meeting-list-view.c:695 ../calendar/gui/e-meeting-time-sel.etspec.h:9 
../calendar/gui/tasktypes.xml.h:8
+#: ../mail/filtertypes.xml.in.h:34 ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36 
../mail/vfoldertypes.xml.in.h:36
 msgid "Status"
 msgstr "Stav"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../calendar/gui/e-calendar-table.etspec.h:13 ../calendar/gui/e-cal-list-view.etspec.h:7 
../calendar/gui/e-memo-table.etspec.h:6 ../plugins/save-calendar/csv-format.c:380
 msgid "Created"
 msgstr "Vytvorené"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:14 ../calendar/gui/e-cal-list-view.etspec.h:8 
../calendar/gui/e-memo-table.etspec.h:7
 msgid "Last modified"
 msgstr "Naposledy zmenené"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "Vystrihne vybrané udalosti do schránky"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "Kopíruje vybrané udalosti do schránky"
 
-#: ../calendar/gui/e-calendar-view.c:458
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "Vloží udalosti zo schránky"
 
-#: ../calendar/gui/e-calendar-view.c:464
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "Odstráni vybrané udalosti"
 
-#: ../calendar/gui/e-calendar-view.c:484 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:270
-msgid "Deleting selected objects"
-msgstr "Odstráňujú sa vybrané objekty"
+#: ../calendar/gui/e-calendar-view.c:810
+msgid "Pasted text doesn't contain valid iCalendar data"
+msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:646 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1176
-msgid "Updating objects"
-msgstr "Aktualizujú sa objekty"
+#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+#, fuzzy
+#| msgid "Default User Calendar"
+msgid "Default calendar not found"
+msgstr "Prednastavený kalendár používateľa"
+
+#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+#, fuzzy
+#| msgid "Mark as default memo list"
+msgid "Default memo list not found"
+msgstr "Označiť ako predvolený zoznam poznámok"
+
+#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+#, fuzzy
+#| msgid "Mark as default task list"
+msgid "Default task list not found"
+msgstr "Označiť ako predvolený zoznam úloh"
+
+#: ../calendar/gui/e-calendar-view.c:918
+msgid "No suitable component found"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:988
+#, fuzzy
+#| msgid "Save as iCalendar"
+msgid "Pasting iCalendar data"
+msgstr "Uložiť ako iCalendar"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:2084 ../calendar/gui/e-memo-table.c:553
-#: ../calendar/gui/e-task-table.c:840
+#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495 
../calendar/gui/e-task-table.c:796
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizátor: %s <%s>"
@@ -4049,27 +4117,55 @@ msgstr "Organizátor: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2088 ../calendar/gui/e-memo-table.c:558
-#: ../calendar/gui/e-task-table.c:844
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500 
../calendar/gui/e-task-table.c:800
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizátor: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2104
-#: ../calendar/gui/e-meeting-time-sel.c:2668 ../calendar/gui/print.c:3537
+#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-meeting-time-sel.c:2663 
../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "Miesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2135
+#: ../calendar/gui/e-calendar-view.c:1851
 #, c-format
 msgid "Time: %s %s"
 msgstr "Čas: %s %s"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/e-calendar-view.c:2235 
../calendar/gui/e-calendar-view.c:2242 ../calendar/gui/e-calendar-view.c:2245
+msgid "%d %b %Y"
+msgstr "%d. %b %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943 
../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+msgid "%A %d %b %Y"
+msgstr "%A, %d. %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927 
../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%a %d. %b"
+
+#: ../calendar/gui/e-calendar-view.c:2262 ../calendar/gui/e-calendar-view.c:2268 
../calendar/gui/e-calendar-view.c:2271
+msgid "%a %d %b %Y"
+msgstr "%a, %d. %b %Y"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:1 ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Dátum začiatku"
 
@@ -4079,83 +4175,84 @@ msgstr "Dátum konca"
 
 # je tu správny rod?
 # PK: netusim, uvidim, ci rozdelia niektore stringy, ak ano, tak potom snad aj tento
-#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
-#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3504
-#: ../modules/itip-formatter/itip-view.c:6091
-#: ../modules/plugin-manager/evolution-plugin-manager.c:100
+#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184 
../calendar/gui/e-meeting-list-view.c:198 ../calendar/gui/e-meeting-store.c:134 
../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250 ../calendar/gui/print.c:1267 
../e-util/e-charset.c:51 ../modules/itip-formatter/itip-view.c:3500
+#: ../modules/itip-formatter/itip-view.c:6088 ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../calendar/gui/e-cal-model.c:1668
+#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586 ../calendar/gui/e-cal-ops.c:1209 
../modules/calendar/e-cal-base-shell-backend.c:361
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr ""
+
+# tooltip
+#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184 ../calendar/gui/e-cal-ops.c:1325
+#, fuzzy
+#| msgid "Create a new all day event"
+msgid "Creating an event"
+msgstr "Vytvorí novú celodennú udalosť"
+
+#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188 ../calendar/gui/e-cal-ops.c:1329
+#, fuzzy
+#| msgid "Create a Mem_o"
+msgid "Creating a memo"
+msgstr "Vytvoriť _poznámku"
+
+#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192 ../calendar/gui/e-cal-ops.c:1333
+#, fuzzy
+#| msgid "Create a _Task"
+msgid "Creating a task"
+msgstr "Vytvoriť ú_lohu"
+
+#: ../calendar/gui/e-cal-model.c:1645
 msgid "Recurring"
 msgstr "Opakovaný"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../calendar/gui/e-cal-model.c:1670
+#: ../calendar/gui/e-cal-model.c:1647
 msgid "Assigned"
 msgstr "Priradený"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1166
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1024
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139 
../calendar/gui/e-meeting-list-view.c:208 ../calendar/gui/e-meeting-store.c:176 
../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Áno"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1166
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139 
../calendar/gui/e-meeting-list-view.c:209 ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Nie"
 
-#: ../calendar/gui/e-cal-model.c:3953
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../modules/itip-formatter/itip-view.c:6079
+#: ../calendar/gui/e-cal-model.c:3029 ../calendar/gui/e-meeting-list-view.c:220 
../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219 
../modules/itip-formatter/itip-view.c:6076
 msgid "Accepted"
 msgstr "Prijatý"
 
-#: ../calendar/gui/e-cal-model.c:3954
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../modules/itip-formatter/itip-view.c:6085
+#: ../calendar/gui/e-cal-model.c:3030 ../calendar/gui/e-meeting-list-view.c:221 
../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221 
../modules/itip-formatter/itip-view.c:6082
 msgid "Declined"
 msgstr "Odmietnutý"
 
-#: ../calendar/gui/e-cal-model.c:3955
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-cal-model.c:3031 ../calendar/gui/e-meeting-list-view.c:222 
../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223 
../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "Predbežný"
 
-#: ../calendar/gui/e-cal-model.c:3956
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../calendar/gui/e-cal-model.c:3032 ../calendar/gui/e-meeting-list-view.c:223 
../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225 
../modules/itip-formatter/itip-view.c:6085
 #, fuzzy
 msgid "Delegated"
 msgstr "Poverený"
 
-#: ../calendar/gui/e-cal-model.c:3957
+#: ../calendar/gui/e-cal-model.c:3033
 msgid "Needs action"
 msgstr "Vyžaduje akciu"
 
-#: ../calendar/gui/e-cal-model-calendar.c:125
-#: ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:123 ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Voľný"
 
-#: ../calendar/gui/e-cal-model-calendar.c:128
-#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
+#: ../calendar/gui/e-cal-model-calendar.c:126 ../calendar/gui/e-meeting-time-sel.c:530 
../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Obsadený"
 
-#: ../calendar/gui/e-cal-model-tasks.c:499
+#: ../calendar/gui/e-cal-model-tasks.c:498
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4166,22 +4263,238 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:551
+#: ../calendar/gui/e-cal-model-tasks.c:550
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Žiadny"
 
+#: ../calendar/gui/e-cal-ops.c:283
+msgid "Modifying an event"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:287
+#, fuzzy
+msgid "Modifying a memo"
+msgstr "Chýba názov."
+
+#: ../calendar/gui/e-cal-ops.c:291
+msgid "Modifying a task"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:387
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing an event"
+msgstr "Odstraňujú sa prílohy"
+
+#: ../calendar/gui/e-cal-ops.c:391
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing a memo"
+msgstr "Odstraňujú sa prílohy"
+
+#: ../calendar/gui/e-cal-ops.c:395
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing a task"
+msgstr "Odstraňujú sa prílohy"
+
+#: ../calendar/gui/e-cal-ops.c:484
+#, c-format
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "Odstraňuje sa %d udalostí"
+msgstr[1] "Odstraňuje sa jedna udalosť"
+msgstr[2] "Odstraňujú sa %d udalosti"
+
+#: ../calendar/gui/e-cal-ops.c:488
+#, fuzzy, c-format
+#| msgid "Delete Memo"
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "Odstrániť poznámku"
+msgstr[1] "Odstrániť poznámku"
+msgstr[2] "Odstrániť poznámku"
+
+#: ../calendar/gui/e-cal-ops.c:492
+#, fuzzy, c-format
+#| msgid "Delete Task"
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "Odstrániť úlohu"
+msgstr[1] "Odstrániť úlohu"
+msgstr[2] "Odstrániť úlohu"
+
+#: ../calendar/gui/e-cal-ops.c:692
+#, fuzzy, c-format
+#| msgid "Print this event"
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "Vytlačiť túto udalosť"
+msgstr[1] "Vytlačiť túto udalosť"
+msgstr[2] "Vytlačiť túto udalosť"
+
+#: ../calendar/gui/e-cal-ops.c:707
+#, fuzzy, c-format
+#| msgid "Print this memo"
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "Vytlačiť túto poznámku"
+msgstr[1] "Vytlačiť túto poznámku"
+msgstr[2] "Vytlačiť túto poznámku"
+
+#: ../calendar/gui/e-cal-ops.c:722
+#, fuzzy, c-format
+#| msgid "Print this task"
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "Vytlačiť túto úlohu"
+msgstr[1] "Vytlačiť túto úlohu"
+msgstr[2] "Vytlačiť túto úlohu"
+
+#: ../calendar/gui/e-cal-ops.c:820
+#, fuzzy
+#| msgid "Updating objects"
+msgid "Updating an event"
+msgstr "Aktualizujú sa objekty"
+
+#: ../calendar/gui/e-cal-ops.c:824
+#, fuzzy
+#| msgid "Updating objects"
+msgid "Updating a memo"
+msgstr "Aktualizujú sa objekty"
+
+#: ../calendar/gui/e-cal-ops.c:828
+#, fuzzy
+#| msgid "Updating objects"
+msgid "Updating a task"
+msgstr "Aktualizujú sa objekty"
+
+#: ../calendar/gui/e-cal-ops.c:933
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "Presúva sa udalosť do kalendára „{0}“"
+
+#: ../calendar/gui/e-cal-ops.c:937
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr "Presúva sa poznámka do zoznamu poznámok „{0}“"
+
+#: ../calendar/gui/e-cal-ops.c:941
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr "Presúva sa úloha do zoznamu úloh „{0}“"
+
+#: ../calendar/gui/e-cal-ops.c:962
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Purging events in the calendar '%s'"
+msgstr "Presúva sa udalosť do kalendára „{0}“"
+
+#: ../calendar/gui/e-cal-ops.c:966
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Purging memos in the memo list '%s'"
+msgstr "Presúva sa poznámka do zoznamu poznámok „{0}“"
+
+#: ../calendar/gui/e-cal-ops.c:970
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Purging tasks in the task list '%s'"
+msgstr "Presúva sa úloha do zoznamu úloh „{0}“"
+
+#: ../calendar/gui/e-cal-ops.c:1068
+#, fuzzy
+#| msgid "Purging"
+msgid "Purging events"
+msgstr "Čistí sa"
+
+#: ../calendar/gui/e-cal-ops.c:1072
+#, fuzzy
+#| msgid "Print Memos"
+msgid "Purging memos"
+msgstr "Tlač poznámok"
+
+#: ../calendar/gui/e-cal-ops.c:1076
+#, fuzzy
+#| msgid "Print Tasks"
+msgid "Purging tasks"
+msgstr "Tlač úloh"
+
+# <long>Whether to hide completed tasks in the tasks view.</long>
+#: ../calendar/gui/e-cal-ops.c:1178
+#, fuzzy
+#| msgid "Hide completed tasks"
+msgid "Expunging completed tasks"
+msgstr "Skryť dokončené úlohy"
+
+#: ../calendar/gui/e-cal-ops.c:2034
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../calendar/gui/e-cal-ops.c:2035
+#, fuzzy, c-format
+#| msgid "Copying Items"
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "Kopírujú sa položky"
+msgstr[1] "Kopírujú sa položky"
+msgstr[2] "Kopírujú sa položky"
+
+#: ../calendar/gui/e-cal-ops.c:2041
+#, fuzzy, c-format
+#| msgid "Moving Items"
+msgid "Moving an memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Presúvajú sa položky"
+msgstr[1] "Presúvajú sa položky"
+msgstr[2] "Presúvajú sa položky"
+
+#: ../calendar/gui/e-cal-ops.c:2042
+#, fuzzy, c-format
+#| msgid "Copying Items"
+msgid "Copying an memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Kopírujú sa položky"
+msgstr[1] "Kopírujú sa položky"
+msgstr[2] "Kopírujú sa položky"
+
+#: ../calendar/gui/e-cal-ops.c:2048
+#, fuzzy, c-format
+#| msgid "Moving Items"
+msgid "Moving an task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Presúvajú sa položky"
+msgstr[1] "Presúvajú sa položky"
+msgstr[2] "Presúvajú sa položky"
+
+#: ../calendar/gui/e-cal-ops.c:2049
+#, fuzzy, c-format
+#| msgid "Copying Items"
+msgid "Copying an task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Kopírujú sa položky"
+msgstr[1] "Kopírujú sa položky"
+msgstr[2] "Kopírujú sa položky"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:159
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:168
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:170
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4191,16 +4504,12 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1541
-#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
-#: ../calendar/gui/print.c:2634 ../calendar/gui/print.c:2654
+#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692 ../calendar/gui/print.c:1073 
../calendar/gui/print.c:1092 ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1989 ../calendar/gui/e-week-view.c:1544
-#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
-#: ../calendar/gui/print.c:2639 ../calendar/gui/print.c:2656
+#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695 ../calendar/gui/print.c:1078 
../calendar/gui/print.c:1094 ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "pm"
 
@@ -4210,13 +4519,12 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:2779 ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2090
+#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851 
../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 msgid "%A %d %B"
 msgstr "%A %d. %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3438
+#: ../calendar/gui/e-day-view.c:3574
 #, c-format
 msgid "Week %d"
 msgstr "Týždeň č. %d"
@@ -4227,191 +4535,164 @@ msgstr "Týždeň č. %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:801
+#: ../calendar/gui/e-day-view-time-item.c:802
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minútové úseky"
 
-#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "Zobraziť druhé časové pásmo"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:843
-#: ../modules/calendar/e-calendar-preferences.c:306
-#: ../modules/calendar/e-calendar-preferences.c:358
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../calendar/gui/e-day-view-time-item.c:844 ../modules/calendar/e-calendar-preferences.c:305 
../modules/calendar/e-calendar-preferences.c:357 ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Žiadne"
 
-#: ../calendar/gui/e-day-view-time-item.c:877
-#: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:389
+#: ../calendar/gui/e-day-view-time-item.c:878 ../calendar/gui/e-timezone-entry.c:323 
../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
 msgstr "Vybrať…"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:63
 msgid "Chair Persons"
 msgstr "Predsedajúci"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Required Participants"
 msgstr "Vyžadovaní účastníci"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Optional Participants"
 msgstr "Nepovinní účastníci"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Resources"
 msgstr "Zdroje"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
+#: ../calendar/gui/e-meeting-list-view.c:180 ../calendar/gui/e-meeting-store.c:109 
../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
 msgid "Individual"
 msgstr "Individuálne"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
+#: ../calendar/gui/e-meeting-list-view.c:181 ../calendar/gui/e-meeting-store.c:111 
../calendar/gui/e-meeting-store.c:128 ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Skupina"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:182 ../calendar/gui/e-meeting-store.c:113 
../calendar/gui/e-meeting-store.c:130 ../calendar/gui/print.c:1248
 msgid "Resource"
 msgstr "Zdroj"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-list-view.c:183 ../calendar/gui/e-meeting-store.c:115 
../calendar/gui/e-meeting-store.c:132 ../calendar/gui/print.c:1249
 msgid "Room"
 msgstr "Miestnosť"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1264
+#: ../calendar/gui/e-meeting-list-view.c:194 ../calendar/gui/e-meeting-store.c:144 
../calendar/gui/e-meeting-store.c:161 ../calendar/gui/print.c:1263
 msgid "Chair"
 msgstr "Predseda"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
+#: ../calendar/gui/e-meeting-list-view.c:195 ../calendar/gui/e-meeting-store.c:146 
../calendar/gui/e-meeting-store.c:163 ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
 msgid "Required Participant"
 msgstr "Vyžadovaný účastník"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/e-meeting-list-view.c:196 ../calendar/gui/e-meeting-store.c:148 
../calendar/gui/e-meeting-store.c:165 ../calendar/gui/print.c:1265
 msgid "Optional Participant"
 msgstr "Nepovinný účastník"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1267
+#: ../calendar/gui/e-meeting-list-view.c:197 ../calendar/gui/e-meeting-store.c:150 
../calendar/gui/e-meeting-store.c:167 ../calendar/gui/print.c:1266
 msgid "Non-Participant"
 msgstr "Bez účasti"
 
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1031
+#: ../calendar/gui/e-meeting-list-view.c:219 ../calendar/gui/e-meeting-store.c:194 
../calendar/gui/e-meeting-store.c:217 ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Vyžaduje akciu"
 
-#: ../calendar/gui/e-meeting-list-view.c:627
+#: ../calendar/gui/e-meeting-list-view.c:626
 msgid "Attendee                          "
 msgstr "Prítomný                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:682
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/e-meeting-list-view.c:681 ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Vyžadované potvrdenie"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 msgid "In Process"
 msgstr "Prebieha"
 
-#: ../calendar/gui/e-meeting-store.c:1910
+#: ../calendar/gui/e-meeting-store.c:1909
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
-msgstr ""
-"Zadajte heslo na prístup k informáciám diára na serveri %s pre používateľa %s"
+msgstr "Zadajte heslo na prístup k informáciám diára na serveri %s pre používateľa %s"
 
-#: ../calendar/gui/e-meeting-store.c:1920
+#: ../calendar/gui/e-meeting-store.c:1919
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Dôvod zlyhania: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1925
-#: ../plugins/publish-calendar/publish-calendar.c:352
-#: ../smime/gui/component.c:64
+#: ../calendar/gui/e-meeting-store.c:1924 ../plugins/publish-calendar/publish-calendar.c:351 
../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Zadajte heslo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:528
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "Out of Office"
 msgstr "Mimo kancelárie"
 
-#: ../calendar/gui/e-meeting-time-sel.c:530
+#: ../calendar/gui/e-meeting-time-sel.c:533
 msgid "No Information"
 msgstr "Žiadna informácia"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "O_ptions"
 msgstr "_Voľby"
 
-#: ../calendar/gui/e-meeting-time-sel.c:590
+#: ../calendar/gui/e-meeting-time-sel.c:588
 msgid "Show _only working hours"
 msgstr "Zobraziť _iba pracovné hodiny"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:601
 msgid "Show _zoomed out"
 msgstr "Zobraziť _zmenšené"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Update free/busy"
 msgstr "_Aktualizovať diár"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:636
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:658
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "_Autovýber"
 
-#: ../calendar/gui/e-meeting-time-sel.c:675
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:696
+#: ../calendar/gui/e-meeting-time-sel.c:694
 msgid "_All people and resources"
 msgstr "Všetky osoby _a zdroje"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "Všetky _osoby a jeden zdroj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "_Vyžadované osoby"
 
-#: ../calendar/gui/e-meeting-time-sel.c:728
+#: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "Required people and _one resource"
 msgstr "Vyžadované osoby a j_eden zdroj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:767
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "Čas _začiatku:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:796
+#: ../calendar/gui/e-meeting-time-sel.c:794
 msgid "_End time:"
 msgstr "Čas _konca:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2664
+#: ../calendar/gui/e-meeting-time-sel.c:2659
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4420,7 +4701,7 @@ msgstr ""
 "Súhrn: %s\n"
 "Miesto: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2666 ../calendar/gui/print.c:3526
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "Súhrn: %s"
@@ -4452,46 +4733,42 @@ msgstr "Spoločný názov"
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../calendar/gui/e-memo-table.c:434
-#: ../modules/calendar/e-cal-shell-content.c:482
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
-#: ../modules/calendar/e-memo-shell-view.c:307
+#: ../calendar/gui/e-memo-table.c:371 ../modules/calendar/e-cal-shell-content.c:1573 
../modules/calendar/e-memo-shell-view-actions.c:180 ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view.c:308
 msgid "Memos"
 msgstr "Poznámky"
 
-#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
 msgid "* No Summary *"
 msgstr "* Žiadny súhrn *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
+#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
 msgid "Start: "
 msgstr "Začiatok: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
+#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
 msgid "Due: "
 msgstr "Termín: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:684
 msgid "Cut selected memos to the clipboard"
 msgstr "Vystrihne vybrané poznámky do schránky"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:690
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopíruje vybrané poznámky do schránky"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:696
 msgid "Paste memos from the clipboard"
 msgstr "Vloží poznámky zo schránky"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../calendar/gui/e-memo-table.c:702 ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "Odstráni vybrané poznámky"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:708
 msgid "Select all visible memos"
 msgstr "Vyberie všetky viditeľné poznámky"
 
@@ -4503,60 +4780,49 @@ msgstr "Kliknutím pridáte poznámku"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:604
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2415
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1072
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:439
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
-#: ../modules/calendar/e-task-shell-view.c:462
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404 
../calendar/importers/icalendar-importer.c:78 ../calendar/importers/icalendar-importer.c:1072
+#: ../modules/calendar/e-calendar-preferences.ui.h:62 ../modules/calendar/e-cal-shell-content.c:1531 
../modules/calendar/e-task-shell-view-actions.c:203 ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view.c:466
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: ../calendar/gui/e-task-table.c:1040
+#: ../calendar/gui/e-task-table.c:999
 msgid "Cut selected tasks to the clipboard"
 msgstr "Vystrihne vybrané úlohy do schránky"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1005
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopíruje vybrané úlohy do schránky"
 
-#: ../calendar/gui/e-task-table.c:1052
+#: ../calendar/gui/e-task-table.c:1011
 msgid "Paste tasks from the clipboard"
 msgstr "Vloží úlohy zo schránky"
 
-#: ../calendar/gui/e-task-table.c:1058
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../calendar/gui/e-task-table.c:1017 ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "Odstráni vybrané úlohy"
 
-#: ../calendar/gui/e-task-table.c:1064
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Select all visible tasks"
 msgstr "Vyberie všetky viditeľné úlohy"
 
-#: ../calendar/gui/e-timezone-entry.c:335
+#: ../calendar/gui/e-timezone-entry.c:334
 msgid "Select Timezone"
 msgstr "Vyberte časové pásmo"
 
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2069
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:2372
-msgid "Purging"
-msgstr "Čistí sa"
-
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707 ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
 msgstr "Organizátor musí byť nastavený."
 
@@ -4665,140 +4931,160 @@ msgstr "Informácie o diári (%s do %s)"
 msgid "iCalendar information"
 msgstr "Informácie o iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1147
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Nedá sa zarezervovať zdroj, nová udalosť koliduje s nejakou inou."
 
-#: ../calendar/gui/itip-utils.c:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
+#: ../calendar/gui/itip-utils.c:1153
+#, fuzzy
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to book a resource, error: "
 msgstr "Nedá sa zarezervovať zdroj, chyba: %s"
 
-#: ../calendar/gui/itip-utils.c:1327
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/itip-utils.c:1917
+#, fuzzy
+#| msgid "Sending message"
+msgid "Sending an event"
+msgstr "Posiela sa správa"
+
+#: ../calendar/gui/itip-utils.c:1921
+#, fuzzy
+#| msgid "Sending message"
+msgid "Sending a memo"
+msgstr "Posiela sa správa"
+
+#: ../calendar/gui/itip-utils.c:1925
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Sending a task"
+msgstr "Posielanie pošty"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31."
 
@@ -4806,102 +5092,102 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Po"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Ut"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "St"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "Št"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Pi"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "So"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:736
 msgid "Su"
 msgstr "Ne"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3320
+#: ../calendar/gui/print.c:3309
 msgid " to "
 msgstr " do "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3330
+#: ../calendar/gui/print.c:3319
 msgid " (Completed "
 msgstr " (Dokončený "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3336
+#: ../calendar/gui/print.c:3325
 msgid "Completed "
 msgstr "Dokončený "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3346
+#: ../calendar/gui/print.c:3335
 msgid " (Due "
 msgstr " (Termín do "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3353
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "Termín do "
 
-#: ../calendar/gui/print.c:3556
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
 msgstr "Účastníci: "
 
-#: ../calendar/gui/print.c:3600
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: ../calendar/gui/print.c:3616
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorita: %s"
 
-#: ../calendar/gui/print.c:3634
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Dokončenie v percentách: %i"
 
-#: ../calendar/gui/print.c:3648
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3662
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategórie: %s"
 
-#: ../calendar/gui/print.c:3673
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "Kontakty: "
 
@@ -4914,20 +5200,19 @@ msgstr "Prebieha"
 msgid "% Completed"
 msgstr "% hotových"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31 ../mail/searchtypes.xml.in.h:33 
../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "je viac než"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32 ../mail/searchtypes.xml.in.h:34 
../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "je menej než"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:77
 msgid "Appointments and Meetings"
 msgstr "Schôdzky a stretnutia"
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:462 ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "Otvára sa kalendár"
 
@@ -4955,30 +5240,30 @@ msgstr "Importovací nástroj Evolution vCalendar"
 msgid "Calendar Events"
 msgstr "Udalosti kalendára"
 
+#: ../calendar/importers/icalendar-importer.c:1108
+msgid "Gnome Calendar"
+msgstr "Kalendár Gnome"
+
 #: ../calendar/importers/icalendar-importer.c:1109
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentný importovací nástroj kalendára Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1180 ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1180 ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../calendar/importers/icalendar-importer.c:1183
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1183 ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Úloha"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1496
+#: ../calendar/importers/icalendar-importer.c:1186 ../calendar/importers/icalendar-importer.c:1496
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Poznámka"
@@ -5030,8 +5315,7 @@ msgid "Classification"
 msgstr "Klasifikácia"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1238
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../calendar/importers/icalendar-importer.c:1238 ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Súhrn"
@@ -5043,8 +5327,7 @@ msgid "Location"
 msgstr "Miesto"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1252
-#: ../calendar/importers/icalendar-importer.c:1533
+#: ../calendar/importers/icalendar-importer.c:1252 ../calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Začiatok"
@@ -5080,15 +5363,13 @@ msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1328
-#: ../calendar/importers/icalendar-importer.c:1331
+#: ../calendar/importers/icalendar-importer.c:1328 ../calendar/importers/icalendar-importer.c:1331
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizátor"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1351
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1351 ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Účastníci"
@@ -5105,18 +5386,17 @@ msgstr "Typ"
 
 #.
 #. *
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
+#. * This program is free software; you can redistribute it and/or modify it
+#. * under the terms of the GNU Lesser General Public License as published by
+#. * the Free Software Foundation.
 #. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
+#. * This program is distributed in the hope that it will be useful, but
+#. * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#. * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#. * for more details.
 #. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. * You should have received a copy of the GNU Lesser General Public License
+#. * along with this program; if not, see <http://www.gnu.org/licenses/>.
 #. *
 #. *
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -5127,1776 +5407,1760 @@ msgstr "Typ"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidžan"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "Afrika/Akra"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Addis_Abeba"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "Afrika/Alžír"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "Africa/Banjul"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "Africa/Bissau"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "Africa/Blantyre"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "Africa/Brazzaville"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "Africa/Bujumbura"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "Africa/Káhira"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "Africa/Casablanca"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "Africa/Ceuta"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "Africa/Conakry"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "Afrika/Džibuti"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripolis"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:77
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:85
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:86
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:89
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "Amerika/Kostarika"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Danmarkshavn"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:106
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "Amerika/Guajana"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:123
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "Amerika/Jamajka"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:138
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:142
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "Amerika/Martinik"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:148
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:156
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:158
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/North_Dakota/Center"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:161
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Portoriko"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:171
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:172
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:187
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "Antarktída/Casey"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "Antarktída/Davis"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktída/DumontDUrville"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "Antarktída/Mawson"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "Antarktída/McMurdo"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "Antarktída/Palmer"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "Antarktída/Južný pól"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "Antarktída/Syowa"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "Antarktída/Vostok"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "Arktída/Longyearbyen"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "Ázia/Aden"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "Ázia/Almaty"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "Ázia/Ammán"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "Ázia/Anadyr"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "Ázia/Aqtau"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "Ázia/Aqtobe"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "Ázia/Ashgabat"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "Ázia/Bagdád"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "Ázia/Bahrajn"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "Ázia/Baku"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "Ázia/Bangkok"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "Ázia/Bejrút"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "Ázia/Biškek"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "Ázia/Brunei"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "Ázia/Kalkata"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "Ázia/Choibalsan"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "Ázia/Chongqing"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "Ázia/Colombo"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "Ázia/Damašok"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "Ázia/Dháka"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "Ázia/Dilí"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "Ázia/Dubai"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "Ázia/Dušanbe"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "Ázia/Gaza"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "Ázia/Harbin"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "Ázia/Hong_Kong"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "Ázia/Hovd"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "Ázia/Irkutsk"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "Ázia/Istanbul"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "Ázia/Jakarta"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "Ázia/Jayapura"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "Ázia/Jeruzalém"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "Ázia/Kábul"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "Ázia/Kamčatka"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "Ázia/Karáčí"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "Ázia/Kašgar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:242
 msgid "Asia/Katmandu"
 msgstr "Ázia/Katmandu"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "Ázia/Krasnojarsk"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "Ázia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "Ázia/Kuching"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "Ázia/Kuvajt"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "Ázia/Makao"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "Ázia/Macao"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "Ázia/Magadan"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "Ázia/Makasar"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "Ázia/Manila"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "Ázia/Muscat"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "Ázia/Nikózia"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "Ázia/Novosibirsk"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "Ázia/Omsk"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "Ázia/Oral"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "Ázia/Phnom_Penh"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "Ázia/Pontianak"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "Ázia/Pchjongjang"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "Ázia/Katar"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "Ázia/Qyzylorda"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "Ázia/Rangoon"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "Ázia/Riyád"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "Ázia/Saigon"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "Ázia/Sachalin"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "Ázia/Samarkand"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "Ázia/Soul"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "Ázia/Šanghaj"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "Ázia/Singapur"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "Ázia/Taipei"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "Ázia/Taškent"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "Ázia/Tbilisi"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "Ázia/Teherán"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "Ázia/Thimphu"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "Ázia/Tokio"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "Ázia/Ujung_Pandang"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "Ázia/Ulanbátár"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "Ázia/Urumqi"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "Ázia/Vientiane"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "Ázia/Vladivostok"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "Ázia/Jakutsk"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "Ázia/Jekaterinburg"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "Ázia/Jerevan"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azorské ostrovy"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermudy"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanárske ostrovy"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Kapverdy"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faerské ostrovy"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Rejkjavík"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/Južná_Georgia"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Svätá Helena"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "Austrália/Adelaide"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "Austrália/Brisbane"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "Austrália/Broken_Hill"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "Austrália/Darwin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "Austrália/Hobart"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "Austrália/Lindeman"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "Austrália/Lord_Howe"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "Austrália/Melbourne"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "Austrália/Perth"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "Austrália/Sydney"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "Európa/Amsterdam"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "Európa/Andorra"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "Európa/Atény"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "Európa/Belfast"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "Európa/Belehrad"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "Európa/Berlín"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "Európa/Bratislava"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "Európa/Brusel"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "Európa/Bukurešť"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "Európa/Budapešť"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "Európa/Chisinau"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "Európa/Kodaň"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "Európa/Dublin"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "Európa/Gibraltar"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "Európa/Helsinki"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "Európa/Istanbul"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "Európa/Kaliningrad"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "Európa/Kyjev"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "Európa/Lisabon"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "Európa/Ľubľana"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:325
 msgid "Europe/London"
 msgstr "Európa/Londýn"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "Európa/Luxembourg"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "Európa/Madrid"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "Európa/Malta"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "Európa/Minsk"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "Európa/Monako"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "Európa/Moskva"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "Európa/Nikózia"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "Európa/Oslo"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "Európa/Paríž"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "Európa/Praha"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "Európa/Riga"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "Európa/Rím"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "Európa/Samara"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "Európa/San_Maríno"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "Európa/Sarajevo"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "Európa/Simferopol"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "Európa/Skopje"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "Európa/Sofia"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "Európa/Štokholm"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "Európa/Talin"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "Európa/Tirana"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "Európa/Užhorod"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "Európa/Vaduz"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "Európa/Vatikán"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "Európa/Viedeň"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "Európa/Vilňus"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "Európa/Varšava"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "Európa/Záhreb"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "Európa/Záporožie"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "Európa/Curych"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "Indický oceán/Antananarivo"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "Indický oceán/Chagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "Indický oceán/Vianočné ostrovy"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "Indický oceán/Kokosové ostrovy"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "Indický oceán/Komory"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "Indický oceán/Kerguelen"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "Indický oceán/Mahe"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "Indický oceán/Maledivy"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "Indický oceán/Maurícius"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "Indický oceán/Mayotte"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "Indický oceán/Reunion"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "Tichý oceán/Apia"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "Tichý oceán/Auklandy"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "Tichý oceán/Chatham"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "Tichý oceán/Veľkonočné ostrovy"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "Tichý oceán/Efate"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "Tichý oceán/Enderbury"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "Tichý oceán/Fakaofo"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "Tichý oceán/Fidži"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "Tichý oceán/Funafuti"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "Tichý oceán/Galapágy"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "Tichý oceán/Gambier"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "Tichý oceán/Guadalcanal"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "Tichý oceán/Guam"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "Tichý oceán/Honolulu"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "Tichý oceán/Johnston"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "Tichý oceán/Kiritimati"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "Tichý oceán/Kosrae"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "Tichý oceán/Kwajalein"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "Tichý oceán/Majuro"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "Tichý oceán/Marquesas"
 
-#: ../calendar/zones.h:388
+#: ../calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "Tichý oceán/Midway"
 
-#: ../calendar/zones.h:389
+#: ../calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "Tichý oceán/Nauru"
 
-#: ../calendar/zones.h:390
+#: ../calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "Tichý oceán/Niue"
 
-#: ../calendar/zones.h:391
+#: ../calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "Tichý oceán/Norfolk"
 
-#: ../calendar/zones.h:392
+#: ../calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "Tichý oceán/Noumea"
 
-#: ../calendar/zones.h:393
+#: ../calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "Tichý oceán/Pago_Pago"
 
-#: ../calendar/zones.h:394
+#: ../calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "Tichý oceán/Palau"
 
-#: ../calendar/zones.h:395
+#: ../calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "Tichý oceán/Pitcairn"
 
-#: ../calendar/zones.h:396
+#: ../calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "Tichý oceán/Ponape"
 
-#: ../calendar/zones.h:397
+#: ../calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "Tichý oceán/Port_Moresby"
 
-#: ../calendar/zones.h:398
+#: ../calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "Tichý oceán/Rarotonga"
 
-#: ../calendar/zones.h:399
+#: ../calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "Tichý oceán/Saipan"
 
-#: ../calendar/zones.h:400
+#: ../calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "Tichý oceán/Tahiti"
 
-#: ../calendar/zones.h:401
+#: ../calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "Tichý oceán/Tarawa"
 
-#: ../calendar/zones.h:402
+#: ../calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "Tichý oceán/Tongatapu"
 
-#: ../calendar/zones.h:403
+#: ../calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "Tichý oceán/Truk"
 
-#: ../calendar/zones.h:404
+#: ../calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "Tichý oceán/Wake"
 
-#: ../calendar/zones.h:405
+#: ../calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "Tichý oceán/Wallis"
 
-#: ../calendar/zones.h:406
+#: ../calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
-#: ../composer/e-composer-actions.c:203
+#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131 
../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Túto správu už znovu nezobrazovať"
+
+#: ../composer/e-composer-actions.c:265
 msgid "Save as..."
 msgstr "Uložiť ako…"
 
-#: ../composer/e-composer-actions.c:276
-#: ../e-util/e-mail-signature-editor.c:308
-msgid "_Close"
-msgstr "Za_vrieť"
-
-#: ../composer/e-composer-actions.c:278
+#: ../composer/e-composer-actions.c:376
 msgid "Close the current file"
 msgstr "Zavri aktuálny súbor"
 
-#: ../composer/e-composer-actions.c:283
+#: ../composer/e-composer-actions.c:381
 msgid "New _Message"
 msgstr "Nová _správa"
 
-#: ../composer/e-composer-actions.c:285
+#: ../composer/e-composer-actions.c:383
 msgid "Open New Message window"
 msgstr "Otvorí okno novej správy"
 
-#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
+#: ../composer/e-composer-actions.c:388 ../shell/e-shell-window-actions.c:978
+#, fuzzy
+#| msgid "Mail Preferences"
+msgid "_Preferences"
+msgstr "Nastavenia pošty"
+
+#: ../composer/e-composer-actions.c:390 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Nastaviť Evolution"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:397
 msgid "Save the current file"
 msgstr "Uloží aktuálny súbor"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:402
 msgid "Save _As..."
 msgstr "Uložiť _ako…"
 
-#: ../composer/e-composer-actions.c:306
+#: ../composer/e-composer-actions.c:404
 msgid "Save the current file with a different name"
 msgstr "Uloží aktuálny súbor pod iným názovm"
 
-#: ../composer/e-composer-actions.c:313
+#: ../composer/e-composer-actions.c:411
 msgid "Character _Encoding"
 msgstr "Znaková _sada"
 
-#: ../composer/e-composer-actions.c:330
-msgid "_Print..."
-msgstr "_Tlačiť…"
-
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:435
 msgid "Print Pre_view"
 msgstr "Ná_hľad tlače"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:442
 msgid "Save as _Draft"
 msgstr "Uložiť ako _koncept"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:444
 msgid "Save as draft"
 msgstr "Uloží ako koncept"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:449
 msgid "S_end"
 msgstr "P_oslať"
 
 # tooltip
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:451
 msgid "Send this message"
 msgstr "Pošle túto správu"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:459
 msgid "PGP _Encrypt"
 msgstr "Šifrovani_e PGP"
 
 # tooltip
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with PGP"
 msgstr "Zašifruje túto správu pomocou PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:467
 msgid "PGP _Sign"
 msgstr "Podpi_s PGP"
 
 # tooltip
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your PGP key"
 msgstr "Podpíše túto správu vašim PGP kľúčom"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:475
 msgid "_Picture Gallery"
 msgstr "_Obrázková galéria"
 
 # tooltip
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:477
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Zobrazí kolekciu obrázkov, ktoré môžete presunutím vložiť do správy"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:483
 msgid "_Prioritize Message"
 msgstr "U_prednostniť správu"
 
 # tooltip
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:485
 msgid "Set the message priority to high"
 msgstr "Nastaví vysokú prioritu správy"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:491
 msgid "Re_quest Read Receipt"
 msgstr "Požadovať správu o prečí_taní"
 
 # PK: toto co robi, nedava to moc zmysel. doruci sa to ked sa to precita?
 # tooltip
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:493
 #, fuzzy
 msgid "Get delivery notification when your message is read"
 msgstr "Získa oznámenie o doručení, keď je vaša správa prečítaná"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:499
 msgid "S/MIME En_crypt"
 msgstr "Šif_rovanie S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:501
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Zašifruje túto správu vaším šifrovacím certifikátom S/MIME"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:507
 msgid "S/MIME Sig_n"
 msgstr "Po_dpis S/MIME"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:509
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpíše túto správu podpisovým certifikátor S/MIME"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:563
 msgid "_Bcc Field"
 msgstr "Pole _skrytá kópia"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:565
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Prepína, či má byť zobrazené pole Skrytá kópia"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:571
 msgid "_Cc Field"
 msgstr "Pole _kópia"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:573
 msgid "Toggles whether the CC field is displayed"
 msgstr "Prepína, či má byť zobrazené pole Kópia"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:579
 msgid "_Reply-To Field"
 msgstr "Pole komu odpo_vedať"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:581
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prepína, či má byť zobrazené pole Komu odpovedať"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:642
 msgid "Save Draft"
 msgstr "Uložiť koncept"
 
-#: ../composer/e-composer-header-table.c:39
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
 
-#: ../composer/e-composer-header-table.c:44
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr ""
-"Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname "
-"adresátov správy"
+#: ../composer/e-composer-header-table.c:43
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient 
list of the message"
+msgstr "Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname adresátov správy"
 
-#: ../composer/e-composer-header-table.c:772
+#: ../composer/e-composer-header-table.c:770
 msgid "Fr_om:"
 msgstr "_Od:"
 
-#: ../composer/e-composer-header-table.c:779
+#: ../composer/e-composer-header-table.c:777
 msgid "_Reply-To:"
 msgstr "Komu odpo_vedať:"
 
 # Komu?
-#: ../composer/e-composer-header-table.c:784
+#: ../composer/e-composer-header-table.c:782
 msgid "_To:"
 msgstr "_Pre:"
 
-#: ../composer/e-composer-header-table.c:790
+#: ../composer/e-composer-header-table.c:788
 msgid "_Cc:"
 msgstr "_Kópia:"
 
-#: ../composer/e-composer-header-table.c:796
+#: ../composer/e-composer-header-table.c:794
 msgid "_Bcc:"
 msgstr "_Skrytá kópia:"
 
 # čo je toto za pole? je to dobre?
 #  PK: podla mna je to ok, aj podla netu co som overoval
-#: ../composer/e-composer-header-table.c:801
+#: ../composer/e-composer-header-table.c:799
 msgid "_Post To:"
 msgstr "Poslať _do:"
 
-#: ../composer/e-composer-header-table.c:805
+#: ../composer/e-composer-header-table.c:803
 msgid "S_ubject:"
 msgstr "P_redmet:"
 
-#: ../composer/e-composer-header-table.c:813
-#: ../mail/e-mail-config-identity-page.c:489
+#: ../composer/e-composer-header-table.c:811 ../mail/e-mail-config-identity-page.c:505
 msgid "Si_gnature:"
 msgstr "Podp_is:"
 
-#: ../composer/e-composer-name-header.c:235
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Kliknutím sem zobrazíte adresár kontaktov"
 
-#: ../composer/e-composer-post-header.c:184
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "Kliknutím sem vyberiete priečinky na odoslanie"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:858
 #, c-format
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Odchádzajúca správa sa nedá podpísať: Nie je nastavený žiadny podpisovací "
-"certifikát pre tento účet"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Odchádzajúca správa sa nedá podpísať: Nie je nastavený žiadny podpisovací certifikát pre tento účet"
 
-#: ../composer/e-msg-composer.c:888
+#: ../composer/e-msg-composer.c:867
 #, c-format
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Odchádzajúca správa sa nedá zašifrovať: Nie je nastavený žiadny šifrovací "
-"certifikát pre tento účet"
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Odchádzajúca správa sa nedá zašifrovať: Nie je nastavený žiadny šifrovací certifikát pre tento účet"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../composer/e-msg-composer.c:1582 ../composer/e-msg-composer.c:2148
 msgid "Compose Message"
 msgstr "Napísať správu"
 
-#: ../composer/e-msg-composer.c:4243
+#: ../composer/e-msg-composer.c:4391
 msgid "The composer contains a non-text message body, which cannot be edited."
-msgstr ""
-"Editor správ obsahuje netextové telo správy, ktoré nie je možné upraviť."
-
-#: ../composer/e-msg-composer.c:4943
-msgid "Untitled Message"
-msgstr "Správa bez názvu"
+msgstr "Editor správ obsahuje netextové telo správy, ktoré nie je možné upraviť."
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
@@ -6920,12 +7184,8 @@ msgid "Do you want to recover unfinished messages?"
 msgstr "Chcete obnoviť nedokončené správy?"
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolution bol ukončený neočakávane počas vytvárania novej správy. Odbnova "
-"správy sprístupní aby ste mohli pokračovať, kde ste skončili."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow 
you to continue where you left off."
+msgstr "Evolution bol ukončený neočakávane počas vytvárania novej správy. Odbnova správy sprístupní aby ste 
mohli pokračovať, kde ste skončili."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "_Do not Recover"
@@ -6950,28 +7210,16 @@ msgstr "Prebieha preberanie. Chcete poslať túto poštu?"
 # PK: medzera na konci je naco?
 # MČ_ netuším, ale v XML je špecialne vyžiadané aby sa zachovali. xml:space preserve
 #: ../composer/mail-composer.error.xml.h:12
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-" Je tu niekoľko príloh, ktoré sa ešte preberajú. Poslanie tohoto emailu "
-"spôsobí, že správa bude odoslaná bez týchto očakávaných príloh "
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent 
without those pending attachments "
+msgstr " Je tu niekoľko príloh, ktoré sa ešte preberajú. Poslanie tohoto emailu spôsobí, že správa bude 
odoslaná bez týchto očakávaných príloh "
 
 #: ../composer/mail-composer.error.xml.h:14
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "Ste si istý, že chcete zahodiť správu pomenovanú „{0}“, ktorú píšete?"
 
 #: ../composer/mail-composer.error.xml.h:15
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
-msgstr ""
-"Uzavretím okna písania správy zrušíte správu navždy, pokiaľ si nevyberiete "
-"uloženie správy do vášho priečinka Koncepty. Ak ju uložíte, budete môcť "
-"pokračovať v písaní aj neskôr."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the 
message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr "Uzavretím okna písania správy zrušíte správu navždy, pokiaľ si nevyberiete uloženie správy do vášho 
priečinka Koncepty. Ak ju uložíte, budete môcť pokračovať v písaní aj neskôr."
 
 #. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:18
@@ -6983,81 +7231,86 @@ msgid "_Save Draft"
 msgstr "_Uložiť koncept"
 
 #: ../composer/mail-composer.error.xml.h:20
+#, fuzzy
+#| msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "Ste si istý, že chcete zahodiť správu pomenovanú „{0}“, ktorú píšete?"
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid "Could not create message."
 msgstr "Nepodarilo sa vytvoriť správu."
 
 # "Z dôvodu" asi bude lepšie - podľa toho, čím sa nahradí {0}
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Kvôli &quot;{1}&quot;, budete musieť vybrať iné nastavenia pošty."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Nepodarilo sa prečítať súbor s podpisom &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:24
 msgid "All accounts have been removed."
 msgstr "Všetky účty boli odstránené."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Predtým, ako začnete písať správu, musíte nastaviť účet."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:26
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Vyskytla sa chyba pri ukladaní do vášho priečinka Pošta na odoslanie."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:27
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "Ohlásená chyba bola „{0}“. Správa nebola odoslaná."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Vyskytla sa chyba pri ukladaní do vášho priečinka Návrhy."
 
-#: ../composer/mail-composer.error.xml.h:28
-msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
-msgstr ""
-"Ohlásená chyba bola „{0}. Správa s najväčšou pravdepodobnosťou nebola "
-"uložená."
-
 #: ../composer/mail-composer.error.xml.h:29
+msgid "The reported error was &quot;{0}&quot;. The message has most likely not been saved."
+msgstr "Ohlásená chyba bola „{0}. Správa s najväčšou pravdepodobnosťou nebola uložená."
+
+#: ../composer/mail-composer.error.xml.h:30
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Vyskytla sa chyba pri odosielaní. Ako chcete pokračovať?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Ohlásená chyba bola „{0}."
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save to Outbox"
 msgstr "_Uložiť do Pošty na odoslanie"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Try Again"
 msgstr "_Skúsiť znovu"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Your message was sent, but an error occurred during post-processing."
-msgstr ""
-"Vaša správa bolo odoslaná, ale vyskytla sa chyba počas následného "
-"spracovania."
+msgstr "Vaša správa bolo odoslaná, ale vyskytla sa chyba počas následného spracovania."
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "Saving message to Outbox."
 msgstr "Ukladá sa správa do Pošty na odoslanie."
 
-#: ../composer/mail-composer.error.xml.h:35
-msgid ""
-"The message will be saved to your local Outbox folder, because the "
-"destination service is currently unavailable. You can send the message by "
-"clicking the Send/Receive button in Evolution's toolbar."
+#: ../composer/mail-composer.error.xml.h:36
+msgid "The message will be saved to your local Outbox folder, because the destination service is currently 
unavailable. You can send the message by clicking the Send/Receive button in Evolution's toolbar."
+msgstr "Správa bude uložená do vášho miestneho priečinka Odoslaná pošta, pretože cieľová služba je 
nedostupná. Správu môžete odoslať kliknutím na tlačidlo Poslať/prijať v lište nástrojov programu Evolution."
+
+#: ../composer/mail-composer.error.xml.h:37
+#, fuzzy
+#| msgid "Are you sure you want to open %d message at once?"
+#| msgid_plural "Are you sure you want to open %d messages at once?"
+msgid "Are you sure you want to send the message?"
+msgstr "Ste si istý, že chcete naraz otvoriť %d správ?"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid "A keyboard accelerator to send the message has been pressed. Either cancel sending the message, if it 
was done by an accident, or send the message."
 msgstr ""
-"Správa bude uložená do vášho miestneho priečinka Odoslaná pošta, pretože "
-"cieľová služba je nedostupná. Správu môžete odoslať kliknutím na tlačidlo "
-"Poslať/prijať v lište nástrojov programu Evolution."
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -7067,27 +7320,11 @@ msgstr "Nástroj na oznámenie pre Evolution"
 msgid "Calendar event notifications"
 msgstr "Oznamuje o udalostiach z kalendára"
 
-#: ../data/evolution.appdata.xml.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-
-#: ../data/evolution.appdata.xml.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:243
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032 
../modules/mailto-handler/evolution-mailto-handler.c:210 ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "Program na podporu spolupráce"
 
@@ -7110,11 +7347,8 @@ msgid "Enable address formatting"
 msgstr "Povoliť formátovanie adresy"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
-msgstr ""
-"Určuje, či adresy budú preformátované podľa štandardov cieľovej krajiny"
+msgid "Whether addresses should be formatted according to standard in their destination country"
+msgstr "Určuje, či adresy budú preformátované podľa štandardov cieľovej krajiny"
 
 # kratky popis kluca gconf, ze po akej dlzke sa ma zacat doplnovat z adresara kontaktov
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
@@ -7122,24 +7356,16 @@ msgid "Autocomplete length"
 msgstr "Dĺžka automatického dopĺňania"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"Počet znakov, ktoré musia byť napísané aby Evolution spustil automatické "
-"dopĺňanie."
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgstr "Počet znakov, ktoré musia byť napísané aby Evolution spustil automatické dopĺňanie."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
 msgid "Show autocompleted name with an address"
 msgstr "Zobraziť automaticky dokončované meno s adresou"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Určuje, či vnucovať zobrazovanie poštovej adresy ku menu dopĺňanému "
-"automatickým dokončovaním."
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+msgstr "Určuje, či vnucovať zobrazovanie poštovej adresy ku menu dopĺňanému automatickým dokončovaním."
 
 # PK: bug? ten nazov by mal byt kratsi
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
@@ -7157,15 +7383,11 @@ msgstr "Štýl rozloženia kontaktov"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
+"The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic 
View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview "
+"pane next to the contact list."
 msgstr ""
-"Štýl rozloženia určuje ako bude umiestený panel náhľadu kontaktu v "
-"spojitosti so zoznamom kontaktov. „0“ (Klasický pohľad) umiestňuje panel "
-"náhľadu pod zoznam kontaktov. „1“ (Zvislý pohľad) umiestňuje panel náhľadu "
-"vedľa zoznamu kontaktov."
+"Štýl rozloženia určuje ako bude umiestený panel náhľadu kontaktu v spojitosti so zoznamom kontaktov. „0“ 
(Klasický pohľad) umiestňuje panel náhľadu pod zoznam kontaktov. „1“ (Zvislý pohľad) umiestňuje panel "
+"náhľadu vedľa zoznamu kontaktov."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
 msgid "Contact preview pane position (horizontal)"
@@ -7198,12 +7420,8 @@ msgstr "Hlavný adresár kontaktov"
 #  PK: ako je pouzite to primary?
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
 #, fuzzy
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view"
-msgstr ""
-"Jednoznačný identifikátor vybraného (alebo „hlavného“) adresára kontaktov v "
-"bočnom paneli náhľadu „Kontakty“"
+msgid "The UID of the selected (or \"primary\") address book in the sidebar of the \"Contacts\" view"
+msgstr "Jednoznačný identifikátor vybraného (alebo „hlavného“) adresára kontaktov v bočnom paneli náhľadu 
„Kontakty“"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
 msgid "Show preview pane"
@@ -7213,18 +7431,78 @@ msgstr "Zobraziť panel náhľadu"
 msgid "Whether to show the preview pane."
 msgstr "Určuje, či sa má zobraziť panel náhľadu."
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+#, fuzzy
+#| msgid "Whether to show timezone field in the event/meeting editor"
+msgid "Whether to show phone numbers in the editor"
+msgstr "Určuje, či sa má zobraziť pole „Časové pásmo“ v editore udalostí/stretnutí"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show SIP addresses in the editor"
+msgstr "Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show IM addresses in the editor"
+msgstr "Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Web Addresses in the editor"
+msgstr "Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+#, fuzzy
+#| msgid "Whether to show timezone field in the event/meeting editor"
+msgid "Whether to show job information in the editor"
+msgstr "Určuje, či sa má zobraziť pole „Časové pásmo“ v editore udalostí/stretnutí"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show notes in the editor"
+msgstr "Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
+
 # kratky popis gconf kluca
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Konverovať poštové správy na Unicode"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Skonvertuje text správ do kódovania Unicode UTF-8, pre zjednotenie tokenov "
-"nevyžiadaných správ z rôznych znakových sád."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgstr "Skonvertuje text správ do kódovania Unicode UTF-8, pre zjednotenie tokenov nevyžiadaných správ z 
rôznych znakových sád."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
@@ -7251,24 +7529,16 @@ msgid "Birthday and anniversary reminder units"
 msgstr "Pripomienkovač narodenín a výročí - jednotky"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
-msgstr ""
-"Jednotky pre pripomienkovač narodenín a výročí: „minutes“ (minúty), "
-"„hours“ (hodiny), alebo „days“ (dni)"
+msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\""
+msgstr "Jednotky pre pripomienkovač narodenín a výročí: „minutes“ (minúty), „hours“ (hodiny), alebo „days“ 
(dni)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
 msgid "Compress weekends in month view"
 msgstr "Zhustiť víkendy v mesačnom pohľade"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
-msgstr ""
-"Učruje, či sa majú zhustiť víkendové dni v mesačnom prehľade tak, že sobotu "
-"a nedeľu zlúči do jedného priestoru"
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one 
weekday"
+msgstr "Učruje, či sa majú zhustiť víkendové dni v mesačnom prehľade tak, že sobotu a nedeľu zlúči do 
jedného priestoru"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
 msgid "Ask for confirmation when deleting items"
@@ -7276,8 +7546,7 @@ msgstr "Pýtať sa na potvrdenie pri odstraňovaní položiek"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
 msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr ""
-"Určuje, či sa má pýtať na potvrdenie pri odstraňovaní schôdzky alebo úlohy"
+msgstr "Určuje, či sa má pýtať na potvrdenie pri odstraňovaní schôdzky alebo úlohy"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
 msgid "Confirm expunge"
@@ -7292,12 +7561,8 @@ msgid "Month view vertical pane position"
 msgstr "Pozícia zvislého panelu mesačného pohľadu"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
-msgstr ""
-"Pozícia zvislého panelu, medzi zoznammi kaledára a dátumovou navigáciou "
-"kalendára"
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar"
+msgstr "Pozícia zvislého panelu, medzi zoznammi kaledára a dátumovou navigáciou kalendára"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
 msgid "Workday end hour"
@@ -7305,8 +7570,7 @@ msgstr "Posledná hodina pracovného dňa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
-msgstr ""
-"Hodina, ktorou končí pracovný deň, v dvadsaťštyrihodinovom formáte, 0 až 23"
+msgstr "Hodina, ktorou končí pracovný deň, v dvadsaťštyrihodinovom formáte, 0 až 23"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
 msgid "Workday end minute"
@@ -7322,8 +7586,7 @@ msgstr "Začiatočná hodina pracovného dňa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Hodina, ktorou začína pracovný deň, v dvadsaťstyrihodinovom formáte, 0 až 23."
+msgstr "Hodina, ktorou začína pracovný deň, v dvadsaťstyrihodinovom formáte, 0 až 23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
 msgid "Workday start minute"
@@ -7338,12 +7601,8 @@ msgid "The second timezone for a Day View"
 msgstr "Druhé časové pásmo pre denný náhľad"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key"
-msgstr ""
-"Ak je nastavené, tak zobrazí druhé časové pásmo pre denný náhľad. Hodnota je "
-"podobná klúču „timezone“ (časové pásmo)"
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key"
+msgstr "Ak je nastavené, tak zobrazí druhé časové pásmo pre denný náhľad. Hodnota je podobná klúču 
„timezone“ (časové pásmo)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
 msgid "Recently used second time zones in a Day View"
@@ -7358,12 +7617,8 @@ msgid "Maximum number of recently used timezones to remember"
 msgstr "Maximálny počet naposledy použitých časových pásiem, ktoré si pamätať"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-msgid ""
-"Maximum number of recently used timezones to remember in a 'day-second-"
-"zones' list"
-msgstr ""
-"Maximálny počet naposledy použitých časových pásiem, ktoré si pamätať v "
-"zozname kľúča „day-second-zones“"
+msgid "Maximum number of recently used timezones to remember in a 'day-second-zones' list"
+msgstr "Maximálny počet naposledy použitých časových pásiem, ktoré si pamätať v zozname kľúča 
„day-second-zones“"
 
 # <long>Number of units for determining a default reminder.</long>
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
@@ -7381,9 +7636,7 @@ msgstr "Prednastavené upozornenie - jednotky"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-msgstr ""
-"Jednotky pre prednastavenú pripomienku: „minutes“ (minúty), "
-"„hours“ (hodiny), alebo „days“ (dni)"
+msgstr "Jednotky pre prednastavenú pripomienku: „minutes“ (minúty), „hours“ (hodiny), alebo „days“ (dni)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
 msgid "Show categories field in the event/meeting/task editor"
@@ -7391,8 +7644,7 @@ msgstr "Zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
-"Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
+msgstr "Učruje, či sa má zobraziť pole „Kategórie“ v editore udalostí/stretnutí"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
 msgid "Show Role field in the event/task/meeting editor"
@@ -7400,21 +7652,17 @@ msgstr "Zobraziť pole „Rola“ v editore udalostí/úloh/stretnutí"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Určuje, či sa má zobraziť pole „Rola“ v editore udalostí/úloh/stretnutí"
+msgstr "Určuje, či sa má zobraziť pole „Rola“ v editore udalostí/úloh/stretnutí"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Zobraziť pole „Vyžadované potvrdenie“ v editore udalostí/úloh/stretnutí"
+msgstr "Zobraziť pole „Vyžadované potvrdenie“ v editore udalostí/úloh/stretnutí"
 
 # MČ: asi bude vhodnejšie "Vyžadované potvrdenie", ide o potvrdenie účasti na stretnutí
 # Skratke RSVP asi nebude nikto rozumieť, netreba to všade nahradiť "Odpovedzte prosím"?
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Určuje, či  sa má zobraziť pole „Vyžadované potvrdenie“ v editore udalostí/"
-"úloh/stretnutí"
+msgstr "Určuje, či  sa má zobraziť pole „Vyžadované potvrdenie“ v editore udalostí/úloh/stretnutí"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
 msgid "Show status field in the event/task/meeting editor"
@@ -7422,8 +7670,7 @@ msgstr "Zobraziť pole „Stav“ v editore udalostí/úloh/stretnutí"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Určuje, či sa má zobraziť pole „Stav“ v editore udalostí/úloh/stretnutí"
+msgstr "Určuje, či sa má zobraziť pole „Stav“ v editore udalostí/úloh/stretnutí"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
 msgid "Show timezone field in the event/meeting editor"
@@ -7431,8 +7678,7 @@ msgstr "Zobraziť pole „Časové pásmo“ v editore udalostí/stretnutí"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"Určuje, či sa má zobraziť pole „Časové pásmo“ v editore udalostí/stretnutí"
+msgstr "Určuje, či sa má zobraziť pole „Časové pásmo“ v editore udalostí/stretnutí"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
 msgid "Show type field in the event/task/meeting editor"
@@ -7457,11 +7703,8 @@ msgid "Hide task units"
 msgstr "Skryť úlohy - jednotky"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
-msgstr ""
-"Jednotky, ktoré určia kedy sa majú úlohy skrývať: „minutes“ (minúty), "
-"„hours“ (hodiny), alebo „days“ (dni)"
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
+msgstr "Jednotky, ktoré určia kedy sa majú úlohy skrývať: „minutes“ (minúty), „hours“ (hodiny), alebo „days“ 
(dni)"
 
 # <long>Number of units for determining when to hide tasks.</long>
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
@@ -7477,12 +7720,8 @@ msgid "Horizontal pane position"
 msgstr "Pozícia vodorovného panelu"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels"
-msgstr ""
-"Pozícia vodorovného panelu, medzi dátumovou navigáciou kaledára a zoznamom "
-"úloh, keď nie je mesačný pohľad, v pixeloch"
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in 
the month view, in pixels"
+msgstr "Pozícia vodorovného panelu, medzi dátumovou navigáciou kaledára a zoznamom úloh, keď nie je mesačný 
pohľad, v pixeloch"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid "Last reminder time"
@@ -7498,9 +7737,7 @@ msgstr "Farba indikátora aktuálneho dátumu a času - Denný náhľad"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Color to draw the Marcus Bains line in the Day View"
-msgstr ""
-"Farba, ktorou sa má kresliť indikátor aktuálneho dátumu a času (Marcus Bains "
-"line) v dennom náhľade"
+msgstr "Farba, ktorou sa má kresliť indikátor aktuálneho dátumu a času (Marcus Bains line) v dennom náhľade"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Marcus Bains Line Color - Time bar"
@@ -7508,20 +7745,15 @@ msgstr "Farba indikátora aktuálneho dátumu a času - Časová tabuľka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr ""
-"Farba, ktorou sa má kresliť indikátor aktuálneho dátumu a času (Marcus Bains "
-"line) v časovej tabuľke (prázdne ak prednastavená)"
+msgstr "Farba, ktorou sa má kresliť indikátor aktuálneho dátumu a času (Marcus Bains line) v časovej tabuľke 
(prázdne ak prednastavená)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
 msgid "Marcus Bains Line"
 msgstr "Indikátor aktuálneho dátumu a času"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
-msgstr ""
-"Určuje, či sa má kresliť Marcus Bains line (čiara v mieste aktuálneho času) "
-"v kaledári"
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr "Určuje, či sa má kresliť Marcus Bains line (čiara v mieste aktuálneho času) v kaledári"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 msgid "Memo preview pane position (horizontal)"
@@ -7539,14 +7771,11 @@ msgstr "Štýl rozloženia poznámky"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list"
+"The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic 
View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane next "
+"to the memo list"
 msgstr ""
-"Štýl rozloženia určuje kde bude umiestený panel náhľadu v spojitosti so "
-"zoznamom poznámok. „0“ (Klasický pohľad) umiestňuje panel náhľadu pod zoznam "
-"poznámok. „1“ (Zvislý pohľad) umiestňuje panel náhľadu vedľa zoznamu "
-"poznámok."
+"Štýl rozloženia určuje kde bude umiestený panel náhľadu v spojitosti so zoznamom poznámok. „0“ (Klasický 
pohľad) umiestňuje panel náhľadu pod zoznam poznámok. „1“ (Zvislý pohľad) umiestňuje panel náhľadu "
+"vedľa zoznamu poznámok."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 msgid "Memo preview pane position (vertical)"
@@ -7561,12 +7790,8 @@ msgid "Month view horizontal pane position"
 msgstr "Pozícia panelu vodorovného mesačného náhľadu"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
-msgstr ""
-"Pozícia vodorovného panelu, medzi náhľadom a navigátorom dátumov kalendára a "
-"zoznamu úloh v mesačnom pohľade, v pixeloch"
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in 
the month view, in pixels"
+msgstr "Pozícia vodorovného panelu, medzi náhľadom a navigátorom dátumov kalendára a zoznamu úloh v mesačnom 
pohľade, v pixeloch"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 msgid "Scroll Month View by a week, not by a month"
@@ -7574,8 +7799,7 @@ msgstr "Posun mesačného náhľadu po týždňoch, nie po mesiacoch"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Whether to scroll a Month View by a week, not by a month"
-msgstr ""
-"Určuje, či sa má posúvať v mesačnom pohľade po týždňoch a nie po mesiacoch"
+msgstr "Určuje, či sa má posúvať v mesačnom pohľade po týždňoch a nie po mesiacoch"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 msgid "Reminder programs"
@@ -7591,8 +7815,7 @@ msgstr "Zobraziť pripomenutia v oblasti oznámení"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Whether or not to use the notification tray for display reminders"
-msgstr ""
-"Určuje, či sa majú alebo nemajú zobrazovať pripomienky v oblasti oznámení"
+msgstr "Určuje, či sa majú alebo nemajú zobrazovať pripomienky v oblasti oznámení"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid "Preferred New button item"
@@ -7608,12 +7831,8 @@ msgstr "Hlavný kalendár"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 #, fuzzy
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view"
-msgstr ""
-"Jednoznačný identifikátor vybraného (alebo „hlavného“) kalendára v bočnom "
-"paneli náhľadu „Kalendár“"
+msgid "The UID of the selected (or \"primary\") calendar in the sidebar of the \"Calendar\" view"
+msgstr "Jednoznačný identifikátor vybraného (alebo „hlavného“) kalendára v bočnom paneli náhľadu „Kalendár“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 msgid "Primary memo list"
@@ -7621,12 +7840,8 @@ msgstr "Hlavný zoznam poznámok"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 #, fuzzy
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view"
-msgstr ""
-"Jednoznačný identifikátor vybraného (alebo „hlavného“) zoznamu poznámok v "
-"bočnom paneli náhľadu „Poznámky“"
+msgid "The UID of the selected (or \"primary\") memo list in the sidebar of the \"Memos\" view"
+msgstr "Jednoznačný identifikátor vybraného (alebo „hlavného“) zoznamu poznámok v bočnom paneli náhľadu 
„Poznámky“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid "Primary task list"
@@ -7634,12 +7849,8 @@ msgstr "Hlavný zoznam úloh"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 #, fuzzy
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view"
-msgstr ""
-"Jednoznačný identifikátor vybraného (alebo „hlavného“) zoznamu úloh v bočnom "
-"paneli náhľadu „Úlohy“"
+msgid "The UID of the selected (or \"primary\") task list in the sidebar of the \"Tasks\" view"
+msgstr "Jednoznačný identifikátor vybraného (alebo „hlavného“) zoznamu úloh v bočnom paneli náhľadu „Úlohy“"
 
 # <long>The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail 
address and %d is replaced by the domain.</long>
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
@@ -7648,12 +7859,8 @@ msgstr "URL šablóny diára"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 #, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain"
-msgstr ""
-"URL šablóny použitej ako záloha údajov diára, %u je nahradené časťou "
-"emailovej adresy s používateľom a %d je nahradené doménou"
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail 
address and %d is replaced by the domain"
+msgstr "URL šablóny použitej ako záloha údajov diára, %u je nahradené časťou emailovej adresy s používateľom 
a %d je nahradené doménou"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Recurrent Events in Italic"
@@ -7661,23 +7868,15 @@ msgstr "Opakujúce sa udalosti skloneným písmom"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid "Show days with recurrent events in italic font in bottom left calendar"
-msgstr ""
-"Zobrazí dni obsahujúce opakujúcu sa udalosť skloneným písmom v kalendárovom "
-"prehľade vľavo dole"
+msgstr "Zobrazí dni obsahujúce opakujúcu sa udalosť skloneným písmom v kalendárovom prehľade vľavo dole"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Search range for time-based searching in years"
 msgstr "Rozsah hľadania pre časovo založené hľadanie v rokoch"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid ""
-"How many years can the time-based search go forward or backward from "
-"currently selected day when searching for another occurrence; default is ten "
-"years"
-msgstr ""
-"Ako veľa rokov môže časovo založené hľadanie prezerať dopredu a dozadu od "
-"aktuálne vybraného dňa, keď sa hľadá iný výskyt opakovania; prednastavené je "
-"desať rokov"
+msgid "How many years can the time-based search go forward or backward from currently selected day when 
searching for another occurrence; default is ten years"
+msgstr "Ako veľa rokov môže časovo založené hľadanie prezerať dopredu a dozadu od aktuálne vybraného dňa, 
keď sa hľadá iný výskyt opakovania; prednastavené je desať rokov"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Show appointment end times in week and month views"
@@ -7685,8 +7884,7 @@ msgstr "Zobraziť koncové časy schôdzok v týždennom a mesačnom zobrazení"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Whether to display the end time of events in the week and month views"
-msgstr ""
-"Určuje, či zobraziť koncové časy udalostí v týždennom a mesačnom zobrazení"
+msgstr "Určuje, či zobraziť koncové časy udalostí v týždennom a mesačnom zobrazení"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show the memo preview pane"
@@ -7706,9 +7904,7 @@ msgstr "Ak je „true“, tak sa zobrazí panel náhľadu úlohy v hlavnom okne"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr ""
-"Zobraziť čísla týždňov v dennom pohľade, v pohľade pracovného týždňa a v "
-"navigátorovi dátumov"
+msgstr "Zobraziť čísla týždňov v dennom pohľade, v pohľade pracovného týždňa a v navigátorovi dátumov"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "Whether to show week numbers in various places in the Calendar"
@@ -7723,23 +7919,16 @@ msgid "Highlight tasks due today"
 msgstr "Zvýrazniť úlohy s dnešným termínom"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-msgid ""
-"Whether highlight tasks due today with a special color (task-due-today-color)"
-msgstr ""
-"Určuje, či zvýrazniť úlohy s dnešným termínom šeciálnou farbou (task-due-"
-"today-color)"
+msgid "Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr "Určuje, či zvýrazniť úlohy s dnešným termínom šeciálnou farbou (task-due-today-color)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "Tasks due today color"
 msgstr "Farba úloh s dnešným termínom"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-msgid ""
-"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-"together with task-due-today-highlight"
-msgstr ""
-"Farba pozadia pre úlohy, ktoré majú dnešný termín, vo formáte „#rrggbb“. "
-"Používať spoločne s task-due-today-highlight"
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format. Used together with 
task-due-today-highlight"
+msgstr "Farba pozadia pre úlohy, ktoré majú dnešný termín, vo formáte „#rrggbb“. Používať spoločne s 
task-due-today-highlight"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Task preview pane position (horizontal)"
@@ -7751,13 +7940,11 @@ msgstr "Štýl rozloženia úlohy"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list"
+"The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic 
View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane next "
+"to the task list"
 msgstr ""
-"Štýl rozloženia určuje kde bude umiestený panel náhľadu v spojitosti so "
-"zoznamom úloh. „0“ (Klasický pohľad) umiestňuje panel náhľadu pod zoznam "
-"úloh. „1“ (Zvislý pohľad) umiestňuje panel náhľadu vedľa zoznamu úloh."
+"Štýl rozloženia určuje kde bude umiestený panel náhľadu v spojitosti so zoznamom úloh. „0“ (Klasický 
pohľad) umiestňuje panel náhľadu pod zoznam úloh. „1“ (Zvislý pohľad) umiestňuje panel náhľadu vedľa "
+"zoznamu úloh."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Task preview pane position (vertical)"
@@ -7772,23 +7959,16 @@ msgid "Highlight overdue tasks"
 msgstr "Zvýrazniť úlohy po termíne"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-msgid ""
-"Whether highlight overdue tasks with a special color (task-overdue-color)"
-msgstr ""
-"Určuje, či zvýrazňovať úlohy po termíne špeciálnou farbou (task-overdue-"
-"color)"
+msgid "Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgstr "Určuje, či zvýrazňovať úlohy po termíne špeciálnou farbou (task-overdue-color)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Overdue tasks color"
 msgstr "Farba úloh po termíne"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-msgid ""
-"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-"together with task-overdue-highlight."
-msgstr ""
-"Farba pozadia pre úlohy, ktoré sú po termíne, vo formáte „#rrggbb“. Používať "
-"zároveň s task-overdue-highlight."
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format. Used together with 
task-overdue-highlight."
+msgstr "Farba pozadia pre úlohy, ktoré sú po termíne, vo formáte „#rrggbb“. Používať zároveň s 
task-overdue-highlight."
 
 # <long>Intervals shown in Day and Work Week views, in minutes.</long>
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
@@ -7804,13 +7984,8 @@ msgid "Timezone"
 msgstr "Časové pásmo"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olson timezone database location like \"America/New York\""
-msgstr ""
-"Prednastavené časové pásmo používané pre dátumy a časy v kalendári, ako "
-"pozícia z nepreloženej Olsonovej databázy časových pásiem napr. „Europe/"
-"Bratislava“"
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olson timezone 
database location like \"America/New York\""
+msgstr "Prednastavené časové pásmo používané pre dátumy a časy v kalendári, ako pozícia z nepreloženej 
Olsonovej databázy časových pásiem napr. „Europe/Bratislava“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Twenty four hour time format"
@@ -7818,9 +7993,7 @@ msgstr "Dvadsaťštyrihodinový formát"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
-msgstr ""
-"Určuje, či zobraziť časy v dvadsaťštyrihodinovom formáte namiesto použitia "
-"dopoludnia/popoludní"
+msgstr "Určuje, či zobraziť časy v dvadsaťštyrihodinovom formáte namiesto použitia dopoludnia/popoludní"
 
 # <long>Whether to set a reminder for birthdays and anniversaries.</long>
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
@@ -7845,9 +8018,7 @@ msgstr "Použiť časové pásmo systému"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Use the system timezone instead of the timezone selected in Evolution"
-msgstr ""
-"Použiť časové pásmo systému namiesto časového pásma vybraného v programe "
-"Evolution"
+msgstr "Použiť časové pásmo systému namiesto časového pásma vybraného v programe Evolution"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "First day of the week"
@@ -7883,16 +8054,11 @@ msgstr "Nedeľa je pracovný deň"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
-msgstr ""
-"(Zavrhnuté) Ďeň v týždni, ktorým týždeň začína, od nedele (0) do soboty (6)"
+msgstr "(Zavrhnuté) Ďeň v týždni, ktorým týždeň začína, od nedele (0) do soboty (6)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"week-start-day-name\" instead."
-msgstr ""
-"Tento kľúč je zavrhnutý vo verzii 3.10 a nemal by byť naďalej používaný. "
-"Použite miesto neho „week-start-day-name“."
+msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"week-start-day-name\" 
instead."
+msgstr "Tento kľúč je zavrhnutý vo verzii 3.10 a nemal by byť naďalej používaný. Použite miesto neho 
„week-start-day-name“."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid "(Deprecated) Work days"
@@ -7900,27 +8066,19 @@ msgstr "(Zavrhnuté) Pracovné dni"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid ""
-"Days on which the start and end of work hours should be indicated. (This key "
-"was deprecated in version 3.10 and should no longer be used. Use the \"work-"
-"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+"Days on which the start and end of work hours should be indicated. (This key was deprecated in version 3.10 
and should no longer be used. Use the \"work-day-monday\", \"work-day-tuesday\", etc. keys "
+"instead.)"
 msgstr ""
-"Dni, ktorých bude vyznačený začiatok a koniec pracovnej doby. (Tento kľúč je "
-"zavrhnutý vo verzii 3.10 a nemal by byť naďalej používaný. Použite namiesto "
-"neho kľúče „work-day-monday“, „work-day-tuesday“, atď.)"
+"Dni, ktorých bude vyznačený začiatok a koniec pracovnej doby. (Tento kľúč je zavrhnutý vo verzii 3.10 a 
nemal by byť naďalej používaný. Použite namiesto neho kľúče „work-day-monday“, „work-day-tuesday“, "
+"atď.)"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
 msgid "Previous Evolution version"
 msgstr "Predchádzajúca verzia Evolution"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-msgid ""
-"The most recently used version of Evolution, expressed as \"major.minor.micro"
-"\". This is used for data and settings migration from older to newer "
-"versions."
-msgstr ""
-"Najvyššia nedávno používaná verzia Evolution, vyjadrený ako „major.minor."
-"micro“. Toto je použité pre migráciu údajov a nastavení zo staršej do novšej "
-"verzie."
+msgid "The most recently used version of Evolution, expressed as \"major.minor.micro\". This is used for 
data and settings migration from older to newer versions."
+msgstr "Najvyššia nedávno používaná verzia Evolution, vyjadrený ako „major.minor.micro“. Toto je použité pre 
migráciu údajov a nastavení zo staršej do novšej verzie."
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
 msgid "List of disabled plugins"
@@ -7971,11 +8129,8 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Skontrolovať, či je Evolution predvoleným emailovým klientom"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Pri každom spustení Evolution, skontroluje či je alebo nie je predvoleným "
-"poštovým klientom."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Pri každom spustení Evolution, skontroluje či je alebo nie je predvoleným poštovým klientom."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
 msgid "Default charset in which to compose messages"
@@ -7990,14 +8145,10 @@ msgid "Path where picture gallery should search for its content"
 msgstr "Cesta, kde by mala galéria obrázkov hľadať svoj obsah"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder"
+msgid "This value can be an empty string, which means it'll use the system Picture folder, usually set to 
~/Pictures. This folder will be also used when the set path is not pointing to the existent folder"
 msgstr ""
-"Táto hodnota môže byť prázdny reťazec, ktorý znamená, že sa použije "
-"systémový pričinok obrázkov, zvyčajne ~/Obrázky. Tento priečinok bude tiež "
-"použitý pokiaľ nastavená cesta bude smerovať na neexistujúci priečinok"
+"Táto hodnota môže byť prázdny reťazec, ktorý znamená, že sa použije systémový pričinok obrázkov, zvyčajne 
~/Obrázky. Tento priečinok bude tiež použitý pokiaľ nastavená cesta bude smerovať na neexistujúci "
+"priečinok"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
 msgid "Spell check inline"
@@ -8028,36 +8179,24 @@ msgid "Attribute message"
 msgstr "Vysvetľujúca správa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
-msgstr ""
-"Text, ktorý je vložený keď je odpovedané na správu, vysvetľujúca správa pre "
-"pôvodného autora"
+msgid "The text that is inserted when replying to a message, attributing the message to the original author"
+msgstr "Text, ktorý je vložený keď je odpovedané na správu, vysvetľujúca správa pre pôvodného autora"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Forward message"
 msgstr "Preposielacia správa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
-msgstr ""
-"Text, ktorý je vložený keď je preposielaná správa, vraví, že preposielaná "
-"správa nasleduje"
+msgid "The text that is inserted when forwarding a message, saying that the forwarded message follows"
+msgstr "Text, ktorý je vložený keď je preposielaná správa, vraví, že preposielaná správa nasleduje"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Original message"
 msgstr "Pôvodná správa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
-msgstr ""
-"Text, ktorý je vložený keď je odpovedané na správu (pripisovaná hore), "
-"vraví, že pôvodná správa nasleduje"
+msgid "The text that is inserted when replying to a message (top posting), saying that the original message 
follows"
+msgstr "Text, ktorý je vložený keď je odpovedané na správu (pripisovaná hore), vraví, že pôvodná správa 
nasleduje"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Group Reply replies to list"
@@ -8065,29 +8204,19 @@ msgstr "Odpovedať skupine odpovie do konferencie"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
+"Instead of the normal \"Reply to All\" behaviour, this option will make the 'Group Reply' toolbar button 
try to reply only to the mailing list through which you happened to receive the copy of the message "
+"to which you're replying."
 msgstr ""
-"Namiesto normálneho „Odpovedať všetkým“ správania, táto voľba spôsobí, že "
-"tlačidlo nástrojovej lišty „Odpovedať skupine“ sa pokúsi odpovedať, len do "
-"poštovej konferencie, cez ktorú ste prijali kópiu správy, na ktorú "
-"odpovedáte."
+"Namiesto normálneho „Odpovedať všetkým“ správania, táto voľba spôsobí, že tlačidlo nástrojovej lišty 
„Odpovedať skupine“ sa pokúsi odpovedať, len do poštovej konferencie, cez ktorú ste prijali kópiu správy, "
+"na ktorú odpovedáte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Put the cursor at the bottom of replies"
 msgstr "Umiestniť kurzor na spodok odpovedí"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-msgid ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
-msgstr ""
-"Používatelia sú ochotný biť sa za to, kde by mal byť kurzor pri odpovedaní "
-"na správu. Toto určuje, či má byť kurzor umiestnený na vrchu správy, alebo "
-"na jej spodku."
+msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines 
whether the cursor is placed at the top of the message or the bottom."
+msgstr "Používatelia sú ochotný biť sa za to, kde by mal byť kurzor pri odpovedaní na správu. Toto určuje, 
či má byť kurzor umiestnený na vrchu správy, alebo na jej spodku."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Always request read receipt"
@@ -8095,8 +8224,7 @@ msgstr "Vždy poslať žiadosť na správu o prečítaní"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 msgid "Whether a read receipt request gets added to every message by default."
-msgstr ""
-"Určuje, či žiadosť na správu o prečítaní bude pridaná do každej správy."
+msgstr "Určuje, či žiadosť na správu o prečítaní bude pridaná do každej správy."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Send HTML mail by default"
@@ -8107,135 +8235,98 @@ msgid "Send HTML mail by default."
 msgstr "Predvolene posielať HTML poštu."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "Farba kontroly pravopisu"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
-"Farba podčiarknutia pre nesprávne slová pri zapnutej kontrole pravopisu."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr "Jazyk kontroly pravopisu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Zoznam jazykových kódov slovníkov použitých pri kontrole pravopisu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Zobraziť pole „Skrytá kópia“ pri posielaní poštovej správy"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Zobrazí pole „Skrytá kópia“ pri posielaní poštovej správy. Toto je ovládané "
-"z ponuky Zobraziť keď je vybratý poštový účet."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail 
account is chosen."
+msgstr "Zobrazí pole „Skrytá kópia“ pri posielaní poštovej správy. Toto je ovládané z ponuky Zobraziť keď je 
vybratý poštový účet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Zobraziť pole „Kópia“ pri posielaní poštovej správy"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Zobrazí pole „Kópia“ pri posielaní poštovej správy. Toto je ovládané z "
-"ponuky Zobraziť keď je vybratý poštový účet."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail 
account is chosen."
+msgstr "Zobrazí pole „Kópia“ pri posielaní poštovej správy. Toto je ovládané z ponuky Zobraziť keď je 
vybratý poštový účet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Zobraziť pole „Odpoveď pre“ pri posielaní poštovej správy"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-msgstr ""
-"Zobrazí pole „Odpoveď pre“ pri posielaní poštovej správy. Toto je ovládané z "
-"ponuky Zobraziť keď je vybratý poštový účet."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a 
mail account is chosen."
+msgstr "Zobrazí pole „Odpoveď pre“ pri posielaní poštovej správy. Toto je ovládané z ponuky Zobraziť keď je 
vybratý poštový účet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Zobraziť pole „Od“ pri posielaní do poštovej konferencie"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-"Zobrazí pole „Od“ pri posielaní do poštovej konferencie. Toto je ovládané z "
-"ponuky Zobraziť keď je vybratý účet konferencie."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a 
news account is chosen."
+msgstr "Zobrazí pole „Od“ pri posielaní do poštovej konferencie. Toto je ovládané z ponuky Zobraziť keď je 
vybratý účet konferencie."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Zobraziť pole „Odpoveď pre“ pri posielaní do poštovej konferencie"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
-msgstr ""
-"Zobrazí pole „Odpoveď pre“ pri posielaní do poštovej konferencie. Toto je "
-"ovládané z ponuky Zobraziť keď je vybratý účet konferencie."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a 
news account is chosen."
+msgstr "Zobrazí pole „Odpoveď pre“ pri posielaní do poštovej konferencie. Toto je ovládané z ponuky Zobraziť 
keď je vybratý účet konferencie."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Digitálne podpísať odpoveď pokiaľ pôvodná správa bola podpísaná"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+msgid "Automatically enable PGP or S/MIME signatures when replying to a message which is also PGP or S/MIME 
signed."
+msgstr "Automaticky povolí PGP alebo S/MIME podpisovanie pokiaľ je odpovedané na správu, ktorá bola tiež 
podpísaná pomocou PGP alebo S/MIME."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+msgid "Encode filenames in an Outlook/GMail way"
+msgstr "Kódovať názvy súborov v štýle Outlook/GMail"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
+"Encode filenames in the mail headers same as Outlook or GMail do, to let them display correctly filenames 
with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect "
+"RFC 2047 standard."
 msgstr ""
-"Automaticky povolí PGP alebo S/MIME podpisovanie pokiaľ je odpovedané na "
-"správu, ktorá bola tiež podpísaná pomocou PGP alebo S/MIME."
+"Kódovať názvy súborov v hlavičke správy tak ako to robí Outlook alebo GMail, aby sa potom správne 
zobrazovali názvy súborov s písmenami v UTF-8 posielané Evolution, pretože oni nespĺňajú RFC 2231, ale "
+"používajú nevhodný štandard RFC 2047."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-msgid "Encode filenames in an Outlook/GMail way"
-msgstr "Kódovať názvy súborov v štýle Outlook/GMail"
+#, fuzzy
+#| msgid "Saving message to Outbox."
+msgid "Send messages through Outbox folder"
+msgstr "Ukladá sa správa do Pošty na odoslanie."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-msgid ""
-"Encode filenames in the mail headers same as Outlook or GMail do, to let "
-"them display correctly filenames with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+msgid "Always save messages to Outbox folder when sending, to let a user choose when the messages should be 
sent."
 msgstr ""
-"Kódovať názvy súborov v hlavičke správy tak ako to robí Outlook alebo GMail, "
-"aby sa potom správne zobrazovali názvy súborov s písmenami v UTF-8 posielané "
-"Evolution, pretože oni nespĺňajú RFC 2231, ale používajú nevhodný štandard "
-"RFC 2047."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Put personalized signatures at the top of replies"
 msgstr "Vložiť zosobnené podpisy na vrh odpovede"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-msgid ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
-msgstr ""
-"Používatelia sú ochotný biť sa za to, kde by mal byť ich podpis pri "
-"odpovedaní na správu. Toto určuje, či má byť podis umiestnený na vrchu "
-"správy, alebo na jej spodku."
+msgid "Users get all up in arms over where their signature should go when replying to a message. This 
determines whether the signature is placed at the top of the message or the bottom."
+msgstr "Používatelia sú ochotný biť sa za to, kde by mal byť ich podpis pri odpovedaní na správu. Toto 
určuje, či má byť podis umiestnený na vrchu správy, alebo na jej spodku."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 msgid "Do not add signature delimiter"
 msgstr "Nepridávať oddeľovač podpisu"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-"Nastavte na PRAVDA (TRUE) v prípade ak nechcete pridať oddelovač podpisu "
-"pred váš podpis, keď píšete email."
+msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a 
mail."
+msgstr "Nastavte na PRAVDA (TRUE) v prípade ak nechcete pridať oddelovač podpisu pred váš podpis, keď píšete 
email."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Ignore list Reply-To:"
@@ -8243,13 +8334,9 @@ msgstr "Ignorovať Reply-To: z konferecie"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+"Some mailing lists set a Reply-To: header to trick users into sending replies to the list, even when they 
ask Evolution to make a private reply. Setting this option to TRUE will attempt to ignore such Reply-"
+"To: headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply 
privately, while if you use the 'Reply to List' action it will do that. It works by comparing the "
+"Reply-To: header with a List-Post: header, if there is one."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
@@ -8257,872 +8344,733 @@ msgid "List of localized 'Re'"
 msgstr "Zoznam lokalizovaných „Re“"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-msgid ""
-"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-"text when replying to a message, as an addition to the standard \"Re\" "
-"prefix. An example is 'SV,AV'."
+msgid "Comma-separated list of localized 'Re' abbreviations to skip in a subject text when replying to a 
message, as an addition to the standard \"Re\" prefix. An example is 'SV,AV'."
+msgstr "Čiarkami oddelený zoznam lokalizovaných „Re“ skratiek, aby pri odpovedaní nebola pred Predmet 
pridaná ďalšia „Re“ predpona. Napríklad „Odp,SV,AV“."
+
+# <long>Flag that enables a much simplified user interface.</long>
+# je nejaký dôvod nepreložiť express? chce to TC
+# a ked tak, tak režim "express"
+# asi je to pomenované podľa Outlook Express...
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#, fuzzy
+#| msgid "Enable express mode"
+msgid "Enable developer mode"
+msgstr "Povoliť režim „express“"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid "Enables some hidden actions and tools aimed for development and debugging."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Number of characters for wrapping"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid "Will autowrap lines after given number of characters."
 msgstr ""
-"Čiarkami oddelený zoznam lokalizovaných „Re“ skratiek, aby pri odpovedaní "
-"nebola pred Predmet pridaná ďalšia „Re“ predpona. Napríklad „Odp,SV,AV“."
 
 # PK: pretiahni a pust asi, necham na peta
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Save file format for drag-and-drop operation"
 msgstr "Uchovať formát súboru pre operáciu ťahaj-a-pusť"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Môže byť buď „mbox“ alebo „pdf“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Show image animations"
 msgstr "Zobraziť animácie obrázka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr ""
-"Povolí animované obrázky v HTML emailoch. Mnoho používateľov vníma animované "
-"obrázky ako otravné a radšej chce vidieť statický obrázok."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a 
static image instead."
+msgstr "Povolí animované obrázky v HTML emailoch. Mnoho používateľov vníma animované obrázky ako otravné a 
radšej chce vidieť statický obrázok."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Enable or disable type ahead search feature"
 msgstr "Povoliť alebo zakázať hľadanie počas písania"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
-msgstr ""
-"Povolí pre hľadanie v bočnom paneli dostupnosť interaktívneho hladania názvu "
-"priečinka."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid "Enable the side bar search feature to allow interactive searching of folder names."
+msgstr "Povolí pre hľadanie v bočnom paneli dostupnosť interaktívneho hladania názvu priečinka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Povoliť alebo zakázať magickú medzeru"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-"Toto povolí použitie medzerníka na posúvanie v náhľade právy, zozname správ "
-"a priečinkov."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+msgstr "Toto povolí použitie medzerníka na posúvanie v náhľade právy, zozname správ a priečinkov."
 
 #  PK: zas dve podobne hlasky
 # MČ: rozdiel je v bodke na konci. Stretávan sa s tým dosť často.
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 #, fuzzy
 msgid "Enable to use a similar message list view settings for all folders"
-msgstr ""
-"Povoliť použitie obdobné nastavenia pohľadu na zoznam správ pre všetky "
-"priečinky"
+msgstr "Povoliť použitie obdobné nastavenia pohľadu na zoznam správ pre všetky priečinky"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Enable to use a similar message list view settings for all folders."
-msgstr ""
-"Povoliť použitie obdobné nastavenia pohľadu na zoznam správ pre všetky "
-"priečinky."
+msgstr "Povoliť použitie obdobné nastavenia pohľadu na zoznam správ pre všetky priečinky."
 
 #  PK: preco vysklonovane?
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 #, fuzzy
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označiť citácie „Náhľade“ správy"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 #, fuzzy
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označí citácie „Náhľade“ správy."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Citation highlight color"
 msgstr "Farba zvýraznenia citácie"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Citation highlight color."
 msgstr "Farba zvýraznenia citácie."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable/disable caret mode"
 msgstr "Povoliť/zakázať režim kurzora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Povolí režim kurzora, že môžete vidieť kurzor počas čítania emailu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Default charset in which to display messages"
 msgstr "Predvolená znaková sada, v ktorej zobrazovať správy"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Default charset in which to display messages."
 msgstr "Predvolená znaková sada, v ktorej zobrazovať správy."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Automaticky načítať obrázky HTML správ cez HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Show Animations"
 msgstr "Zobraziť animácie"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show animated images as animations."
 msgstr "Zobraziť animované obrázky ako animácie."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show all message headers"
 msgstr "Zobraziť všetky hlavičky správy"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show all the headers when viewing a messages."
 msgstr "Zobraziť všetky hlavičky pri prezeraní správ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "List of headers to show when viewing a message."
 msgstr "Zoznam hlavičiek na zobrazenie pri prezeraní správy."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid ""
-"Each header is represented as a pair: the header name, and a boolean "
-"indicating whether the header is enabled. Disabled headers are not shown "
-"when viewing a message, but are still listed in Preferences."
-msgstr ""
-"Každá hlavička je určená párom: názov hlavičky a pravdivostná hodnota určuje "
-"či je hlavička povolená. Zakázané hlavičky sa nezobrazujú pri prezeraní "
-"správy, ale zostanú v zozname Nastavenia."
+"Each header is represented as a pair: the header name, and a boolean indicating whether the header is 
enabled. Disabled headers are not shown when viewing a message, but are still listed in Preferences."
+msgstr "Každá hlavička je určená párom: názov hlavičky a pravdivostná hodnota určuje či je hlavička 
povolená. Zakázané hlavičky sa nezobrazujú pri prezeraní správy, ale zostanú v zozname Nastavenia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show photo of the sender"
 msgstr "Zobraziť fotografiu odosielateľa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Zobraziť fotografiu odosielateľa v paneli čítania správ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#, fuzzy
+#| msgid "Show photo of the sender"
+msgid "Search gravatar.com for photo of the sender"
+msgstr "Zobraziť fotografiu odosielateľa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Označiť ako prečítané po určenej dobe"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Označí ako prečítané po určenej dobe."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Timeout for marking messages as seen"
 msgstr "Časový limit pre označenie správ ako prečítaných"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Časový limit v milisekundách pre označenie správ ako prečítaných."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Sender email-address column in the message list"
 msgstr "Stĺpec emailovej adresy odosielateľa v zozname správ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr ""
-"Zobrazí emailovú adresu odosielateľa v samostatnom stĺpci v zozname správ."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+msgid "Show the email-address of the sender in a separate column in the message list."
+msgstr "Zobrazí emailovú adresu odosielateľa v samostatnom stĺpci v zozname správ."
 
 #  PK: zas podobne hlasky
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 #, fuzzy
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-msgstr ""
-"Určí, či sa použije rovnaké písmo pre oba riadky „Od“ a „Predmet“ v stĺpci "
-"„Správy“ vo zvislom pohľade"
+msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" 
column in vertical view"
+msgstr "Určí, či sa použije rovnaké písmo pre oba riadky „Od“ a „Predmet“ v stĺpci „Správy“ vo zvislom 
pohľade"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-"Určí, či sa použije rovnaké písmo pre oba riadky „Od“ a „Predmet“ v stĺpci "
-"„Správy“ vo zvislom pohľade."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" 
column in vertical view."
+msgstr "Určí, či sa použije rovnaké písmo pre oba riadky „Od“ a „Predmet“ v stĺpci „Správy“ vo zvislom 
pohľade."
 
 # asi by tu malo byť zmazané lebo tie správy ešte nie sú odstránené
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show deleted messages in the message-list"
 msgstr "Zobraziť odstránené správy v zozname správ"
 
 # asi by tu malo byť zmazané lebo tie správy ešte nie sú odstránené
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Zobraziť odstránené (preškrtnuté) správy v zozname správ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Enable Unmatched search folder"
 msgstr "Povoliť vyhľadávací priečinok Nevyhovujúce"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
-msgid ""
-"Enable Unmatched search folder within Search Folders. It does nothing if "
-"Search Folders are disabled."
-msgstr ""
-"Povolí vyhľadávací priečinok Nevyhovujúce v rámci Vyhľadávacích priečinkov. "
-"Neurobí to nič, ak sú vypnuté Vyhľadávacie priečinky."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid "Enable Unmatched search folder within Search Folders. It does nothing if Search Folders are disabled."
+msgstr "Povolí vyhľadávací priečinok Nevyhovujúce v rámci Vyhľadávacích priečinkov. Neurobí to nič, ak sú 
vypnuté Vyhľadávacie priečinky."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and 
removes the preview for that folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Height of the message-list pane"
 msgstr "Výška panelu so zoznamom správ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Height of the message-list pane."
 msgstr "Výška panelu so zoznamom správ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Určuje, či hlavičky správy sú zbalené v používateľskom rozhraní"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Width of the message-list pane"
 msgstr "Šírka panelu so zoznamom správ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Width of the message-list pane."
 msgstr "Šírka panelu so zoznamom správ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Layout style"
 msgstr "Štýl rozloženia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
+"The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic 
View) places the preview pane below the message list. \"1\" (Vertical View) places the preview "
+"pane next to the message list."
 msgstr ""
-"Štýl rozloženia určuje kde sa má umiestniť panel náhľadu v závislosti od "
-"zoznamu správ. „0“ (Klasický pohľad) umiestni panel náhľadu pod zoznam "
-"správ. „1“ (Zvislý pohľad) umiestni panel náhľadu vedľa zoznamu správ."
+"Štýl rozloženia určuje kde sa má umiestniť panel náhľadu v závislosti od zoznamu správ. „0“ (Klasický 
pohľad) umiestni panel náhľadu pod zoznam správ. „1“ (Zvislý pohľad) umiestni panel náhľadu vedľa "
+"zoznamu správ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Variable width font"
 msgstr "Písmo s premenlivou šírkou"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "The variable width font for mail display."
 msgstr "Písmo s premenlivou šírkou na zobrazenie pošty."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Terminal font"
 msgstr "Písmo terminálu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "The terminal font for mail display."
 msgstr "Písmo ako v termináli na zobrazenie pošty."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Use custom fonts"
 msgstr "Použiť vlastné písma"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Use custom fonts for displaying mail."
 msgstr "Použiť vlastné písma na zobrazovanie pošty."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Komprimovať zobrazenie adries v Pre/Kópia/Slepá kópia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Komprimuje zobrazenie adries v Pre/Kópia/Skrytá kópia do počtu "
-"špecifikovaného v address_count."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+msgstr "Komprimuje zobrazenie adries v Pre/Kópia/Skrytá kópia do počtu špecifikovaného v address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Počet adries na zobrazenie v Pre/Kópia/Slepá kópia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Toto nastaví počet adries, ktoré bude vidno v prednastavenom náhľade zoznamu "
-"správ, namiesto tých navyše sa zobrazí „…“."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is 
shown."
+msgstr "Toto nastaví počet adries, ktoré bude vidno v prednastavenom náhľade zoznamu správ, namiesto tých 
navyše sa zobrazí „…“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Thread the message-list based on Subject"
 msgstr "Vlákna zoznamu správ podľa predmetu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Určuje, či má alebo nie ako zálohu vytvárať vlákna podľa predmetu správ, keď "
-"neobsahujú hlavičku In-Reply-To alebo References."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or 
References headers."
+msgstr "Určuje, či má alebo nie ako zálohu vytvárať vlákna podľa predmetu správ, keď neobsahujú hlavičku 
In-Reply-To alebo References."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Default value for thread expand state"
 msgstr "Prednastavená hodnota pre stav rozbalenia vlákna"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"Toto nastavenie určuje či vlákna majú byť v stave rozbalené, alebo zbalené. "
-"Evolution vyžaduje reštart."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. 
Evolution requires a restart."
+msgstr "Toto nastavenie určuje či vlákna majú byť v stave rozbalené, alebo zbalené. Evolution vyžaduje 
reštart."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Určuje, či usporiadavať vlákna na základe poslednej správy vo vlákne"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"Toto nastavenie určuje či vlákna majú byť usporiadané na základe poslednej "
-"správy v každom vlákne, radšej ako dátumu správy. Evolution vyžaduje restart."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, 
rather than by message's date. Evolution requires a restart."
+msgstr "Toto nastavenie určuje či vlákna majú byť usporiadané na základe poslednej správy v každom vlákne, 
radšej ako dátumu správy. Evolution vyžaduje restart."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Usporiadať účty abecedne v strome priečinkov"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user"
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to true accounts are sorted 
alphabetically, with an exception of On This Computer and Search folders, otherwise accounts are sorted "
+"based on an order given by a user"
 msgstr ""
-"Hovorí ako usporiadať účty v strome priečinkov v pohľade Pošta. Keď je "
-"nastavené na pravda (true) účty sú usporiadané abecedne, s výhradou „Na "
-"tomto počítači“ a „Vyhľadávacie priečinky“, inak účty sú usporiadané podľa "
-"poradia určeného používateľom"
+"Hovorí ako usporiadať účty v strome priečinkov v pohľade Pošta. Keď je nastavené na pravda (true) účty sú 
usporiadané abecedne, s výhradou „Na tomto počítači“ a „Vyhľadávacie priečinky“, inak účty sú "
+"usporiadané podľa poradia určeného používateľom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Log filter actions"
 msgstr "Zaznamenať akcie filtra"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Log filter actions to the specified log file."
 msgstr "Zaznamenať akcie filtra do zadaného súboru záznamov."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "Súbor záznamov pre zaznamenanie akcií filtra"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Logfile to log filter actions."
 msgstr "Súbor záznamov pre zaznamenanie akcií filtra."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Flush Outbox after filtering"
 msgstr "Vyprázniť Pošta na odoslanie po filtrovaní"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 #, fuzzy
-msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
-msgstr ""
-"Určuje, či vyprázdni priečinok „Pošta na odoslanie“ po ukončení filtrovania."
+msgid "Whether to flush Outbox after filtering is done. Outbox flush will happen only when there was used 
any 'Forward to' filter action and approximately one minute after the last action invocation."
+msgstr "Určuje, či vyprázdni priečinok „Pošta na odoslanie“ po ukončení filtrovania."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Default forward style"
 msgstr "Predvolený štýl posielania ďalej"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Default reply style"
 msgstr "Predvolený štýl odpovede"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#, fuzzy
+#| msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message with a key accelerator."
+msgstr "Pýta sa používateľa keď sa bude pokúšať odoslať správu bez vyplneného Predmetu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Prompt on empty subject"
 msgstr "Pýtať sa pri prázdnom predmete"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"Pýta sa používateľa keď sa bude pokúšať odoslať správu bez vyplneného "
-"Predmetu."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Pýta sa používateľa keď sa bude pokúšať odoslať správu bez vyplneného Predmetu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when emptying the trash"
 msgstr "Pýtať sa pri vyprázdňovaní koša"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Pýta sa používateľa keď sa pokúsi vyprázdniť kôš."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt when user expunges"
 msgstr "Pýtať sa pri používateľskom čistení"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pýta sa používateľa pri jeho pokuse o vyčistenie priečinka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr ""
-"Pýtať sa pred posielaním príjemcom, ktorí nie sú zadaní ako emailová adresa"
+msgstr "Pýtať sa pred posielaním príjemcom, ktorí nie sú zadaní ako emailová adresa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-msgstr ""
-"Zakáže/povolí opakované pýtanie sa upozornením, že sa pokúšate poslať správu "
-"príjemcom bez zadania emailovej adresy"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+msgid "It disables/enables the repeated prompts to warn that you are trying to send a message to recipients 
not entered as mail addresses"
+msgstr "Zakáže/povolí opakované pýtanie sa upozornením, že sa pokúšate poslať správu príjemcom bez zadania 
emailovej adresy"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when user only fills Bcc"
 msgstr "Pýtať sa, keď používateľ vyplní len skrytú kópiu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Pýtať sa pri posielaní správ bez adresátov v poli Pre alebo Kópia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pýtať sa, keď sa používateľ pokúsi poslať nechcené HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Pýtať sa pri posielaní HTML správ adresátom, ktorý nechcú prijímať HTML "
-"správy."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgstr "Pýtať sa pri posielaní HTML správ adresátom, ktorý nechcú prijímať HTML správy."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Pýtať sa, keď sa používateľ snaží naraz otvoriť 10 a viac správ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-"Ak sa používateľ pokúsi otvoriť 10 a viac správ naraz, opýta sa používateľa "
-"či to naozaj chce urobiť."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+msgstr "Ak sa používateľ pokúsi otvoriť 10 a viac správ naraz, opýta sa používateľa či to naozaj chce 
urobiť."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt while marking multiple messages"
 msgstr "Pýtať sa počas označovania násobných správ"
 
 # MČ: typo? whilst - while
 # PK: podla mna dobre
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Povolí alebo zakáže dopyt počas označovania násobných správ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when deleting messages in search folder"
 msgstr "Pýtať sa pri odstraňovaní správ vo vyhľadávacom priečinku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"Zakáže/povolí opakované pýtanie sa upozornením, že mazanie správy z "
-"vyhľadávacieho priečinka úplne odstráni správu, nie len že vymaže z "
-"vyhľadávacích výsledkov."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder 
permanently deletes the message, not simply removing it from the search results."
+msgstr "Zakáže/povolí opakované pýtanie sa upozornením, že mazanie správy z vyhľadávacieho priečinka úplne 
odstráni správu, nie len že vymaže z vyhľadávacích výsledkov."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
-msgstr ""
-"Otázky či kopírovať priečinok pomocou preťiahni a pusť v strome priečinkov"
+msgstr "Otázky či kopírovať priečinok pomocou preťiahni a pusť v strome priečinkov"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
-"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
-"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
-"folders in folder tree without asking, or 'ask' - (or any other value) will "
-"ask user."
+"Possible values are: 'never' - do not allow copy with drag &amp; drop of folders in folder tree, 'always' - 
allow copy with drag &amp; drop of folders in folder tree without asking, or 'ask' - (or any other "
+"value) will ask user."
 msgstr ""
-"Dostupné hodnoty sú: „never“ (nikdy) - nie je povolené kopírovať pomocou "
-"pretiahni a pusť v strome priečinkov, „always“ (vždy) - povolí kopírovanie "
-"priečinkov pomocou pretiahni a pusť v strome priečinkov bez pýtania, alebo "
-"„ask“ (pýtať sa) - (prípadne akákoľvek iná hodnota) bude sa pýtať "
-"používateľa."
+"Dostupné hodnoty sú: „never“ (nikdy) - nie je povolené kopírovať pomocou pretiahni a pusť v strome 
priečinkov, „always“ (vždy) - povolí kopírovanie priečinkov pomocou pretiahni a pusť v strome priečinkov "
+"bez pýtania, alebo „ask“ (pýtať sa) - (prípadne akákoľvek iná hodnota) bude sa pýtať používateľa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
-msgstr ""
-"Otázky či presunúť priečinok pomocou pretiahni a pusť v strome priečinkov"
+msgstr "Otázky či presunúť priečinok pomocou pretiahni a pusť v strome priečinkov"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
-"Possible values are: 'never' - do not allow move with drag &amp; drop of "
-"folders in folder tree, 'always' - allow move with drag &amp; drop of "
-"folders in folder tree without asking, or 'ask' - (or any other value) will "
-"ask user."
+"Possible values are: 'never' - do not allow move with drag &amp; drop of folders in folder tree, 'always' - 
allow move with drag &amp; drop of folders in folder tree without asking, or 'ask' - (or any other "
+"value) will ask user."
 msgstr ""
-"Dostupné hodnoty sú: „never“ (nikdy) - nie je povolené presúvať pomocou "
-"pretiahni a pusť v strome priečinkov, „always“ (vždy) - povolí presúvanie "
-"priečinkov pomocou pretiahni a pusť v strome priečinkov bez pýtania, alebo "
-"„ask“ (pýtať sa) - (prípadne akákoľvek iná hodnota) bude sa pýtať "
-"používateľa."
+"Dostupné hodnoty sú: „never“ (nikdy) - nie je povolené presúvať pomocou pretiahni a pusť v strome 
priečinkov, „always“ (vždy) - povolí presúvanie priečinkov pomocou pretiahni a pusť v strome priečinkov bez "
+"pýtania, alebo „ask“ (pýtať sa) - (prípadne akákoľvek iná hodnota) bude sa pýtať používateľa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when replying privately to list messages"
 msgstr "Pýtať sa pri súkromnom odpovedaní do poštovej konferencie"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-msgstr ""
-"Zakáže/povolí opakované pýtanie sa upozornením, že posielate súkromnú "
-"odpoveď na správu, ktorá bola prijatá cez poštovú konferenciu."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+msgid "It disables/enables the repeated prompts to warn that you are sending a private reply to a message 
which arrived via a mailing list."
+msgstr "Zakáže/povolí opakované pýtanie sa upozornením, že posielate súkromnú odpoveď na správu, ktorá bola 
prijatá cez poštovú konferenciu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Pýtať sa keď poštová konferencia unesie súkromné odpovede"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
+"It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message 
which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply "
+"back to the list"
 msgstr ""
-"Zakáže/povolí opakované pýtanie sa upozornením, že sa pokúšate poslať "
-"súkromnú odpoveď na správu, ktorá bola prijatá cez poštovú konferenciu, ale "
-"konferencia nastavuje hlavičku Reply-To: tak, že presmerováva odpoveď späť "
-"do konferencie"
+"Zakáže/povolí opakované pýtanie sa upozornením, že sa pokúšate poslať súkromnú odpoveď na správu, ktorá 
bola prijatá cez poštovú konferenciu, ale konferencia nastavuje hlavičku Reply-To: tak, že "
+"presmerováva odpoveď späť do konferencie"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when replying to many recipients"
 msgstr "Pýtať sa pri odpovedaní mnohým adresátom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr ""
-"Zakáže/povolí opakované pýtanie sa upozornením, že sa posielate odpoveď  "
-"priveľa ľuďom."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+msgid "It disables/enables the repeated prompts to warn that you are sending a reply to many people."
+msgstr "Zakáže/povolí opakované pýtanie sa upozornením, že sa posielate odpoveď  priveľa ľuďom."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-msgid ""
-"Policy for automatically closing the message browser window when forwarding "
-"or replying to the displayed message."
-msgstr ""
-"Politika pre automatické zatváranie okna prehliadača správ keď sa preposiela "
-"alebo sa odpovedá na zobrazenú správu."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+msgid "Policy for automatically closing the message browser window when forwarding or replying to the 
displayed message."
+msgstr "Politika pre automatické zatváranie okna prehliadača správ keď sa preposiela alebo sa odpovedá na 
zobrazenú správu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Empty Trash folders on exit"
 msgstr "Vyprázdniť priečinky Kôš pri ukončení"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vyprázdniť všetky priečinky Kôš pri ukončení programu Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Mimumum dní medzi vyprázdňovaniami koša pri ukončení"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Mimumum dní medzi vyprázdňovaniami koša pri ukončení, v dňoch."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Last time Empty Trash was run"
 msgstr "Kedy bol Kôš naposledy vyprázdnený"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-"Čas kedy naposledy prebehlo vyprázdňovanie Koša, v dňoch od 1. januára 1970."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "Čas kedy naposledy prebehlo vyprázdňovanie Koša, v dňoch od 1. januára 1970."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Ako dlho, v sekundách, má byť zobrazená chyba v stavovom riadku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Level beyond which the message should be logged."
 msgstr "Úroveň, od ktorej sa majú správy zaznamenávať."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"Môže nadobúdať tieto hodnoty. „0“ pre chyby. „1“ pre upozornenia. „2“ pre "
-"odlaďovacie správy."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
+msgstr "Môže nadobúdať tieto hodnoty. „0“ pre chyby. „1“ pre upozornenia. „2“ pre odlaďovacie správy."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Show original \"Date\" header value."
 msgstr "Zobraziť pôvodnú hodnotu hlavičky „Date“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-msgid ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
-msgstr ""
-"Ukáže pôvodnú hlavičku „Date“ (s miestnym časom, ak je časové pásmo "
-"rozdielne). Inak vždy zobrazuje hodnotu hlavičky „Date“ vo formáte "
-"uprednostňovanom používateľom a miestnom časovom pásme."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always 
show \"Date\" header value in a user preferred format and local time zone."
+msgstr "Ukáže pôvodnú hlavičku „Date“ (s miestnym časom, ak je časové pásmo rozdielne). Inak vždy zobrazuje 
hodnotu hlavičky „Date“ vo formáte uprednostňovanom používateľom a miestnom časovom pásme."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "List of Labels and their associated colors"
 msgstr "Zoznam menoviek a im pridelených farieb"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"Zoznam menoviek známy poštovej komponente Evolution. Zoznam obsahuje reťazce "
-"v tvare názov:farba, kde farba používa šestnástkové kódovanie z HTML."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing 
name:color where color uses the HTML hex encoding."
+msgstr "Zoznam menoviek známy poštovej komponente Evolution. Zoznam obsahuje reťazce v tvare názov:farba, 
kde farba používa šestnástkové kódovanie z HTML."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Check incoming mail being junk"
 msgstr "Kontrolovať prichádzajúcu poštu na SPAM"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Run junk test on incoming mail."
 msgstr "Spustí test na SPAM pre prichádzajúcu poštu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Empty Junk folders on exit"
 msgstr "Vyprázdniť priečinky Nevyžiadaná pošta pri ukončení"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Empty all Junk folders when exiting Evolution."
-msgstr ""
-"Vyprázdniť všetky priečinky Nevyžiadaná pošta pri ukončení programu "
-"Evolution."
+msgstr "Vyprázdniť všetky priečinky Nevyžiadaná pošta pri ukončení programu Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Minimum days between emptying the junk on exit"
-msgstr ""
-"Minimálny počet dní medzi vyprázdňovaním Nevyžiadanej pošty pri ukončení"
+msgstr "Minimálny počet dní medzi vyprázdňovaním Nevyžiadanej pošty pri ukončení"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Minimum time between emptying the junk on exit, in days."
-msgstr ""
-"Minimálny čas medzi vyprázdňovaním Nevyžiadanej pošty pri ukončení, v dňoch."
+msgstr "Minimálny čas medzi vyprázdňovaním Nevyžiadanej pošty pri ukončení, v dňoch."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Last time Empty Junk was run"
 msgstr "Kedy bola Nevyžiadaná pošta naposledy vyprázdnená"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-"Čas posledného vyprázdnenia Nevyžiadanej pošty. V dňoch od 1.1.1970 (Epocha)."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "Čas posledného vyprázdnenia Nevyžiadanej pošty. V dňoch od 1.1.1970 (Epocha)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "The default plugin for Junk hook"
 msgstr "Prednastavený zásuvný modul pre spracovanie Nevyžiadanej pošty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default 
listed plugin is disabled, then it won't fall back to the other available plugins."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Určuje, či nahliadnuť do adresára kontaktov pre odosielateľa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #, fuzzy
 msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"Určuje, či hladať v adresári kontaktov email odosielateľa. Ak je nájdený, "
-"tak to nie je nevyžiadané pošta."
+"Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks 
up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are "
+"marked for autocompletion."
+msgstr "Určuje, či hladať v adresári kontaktov email odosielateľa. Ak je nájdený, tak to nie je nevyžiadané 
pošta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-"Určuje, či nahliadnuť do iba miestneho adresára kontaktov pre filtrovanie "
-"nevyžiadanej pošty"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
+msgstr "Určuje, či nahliadnuť do iba miestneho adresára kontaktov pre filtrovanie nevyžiadanej pošty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up 
addresses in local address book only to exclude mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Určuje, či použiť vlastné hlavičky pre kontrolu nevyžiadanej pošty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers 
are mentioned, it will be improve the junk checking speed."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Custom headers to use while checking for junk."
 msgstr "Vlastné hlavičky použité na kontrolu nevyžiadanej pošty."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-"Vlastné hlavičky použité na kontrolu nevyžiadanej pošty. Zoznam položiek je "
-"reťazec vo formáte „názovhlavičky=hodnota“."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+msgid "Custom headers to use while checking for junk. The list elements are string in the format 
\"headername=value\"."
+msgstr "Vlastné hlavičky použité na kontrolu nevyžiadanej pošty. Zoznam položiek je reťazec vo formáte 
„názovhlavičky=hodnota“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "UID string of the default account."
 msgstr "Reťazec UID predvoleného účtu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Save directory"
 msgstr "Priečinok ukladania"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Directory for saving mail component files."
 msgstr "Priečinok pre ukladanie súborov poštovej komponenty."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Composer load/attach directory"
 msgstr "Priečinok načítať/uložiť editora správ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Directory for loading/attaching files to composer."
 msgstr "Priečinok pre načítavanie/prikladanie súborov do editora správ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Check for new messages on start"
 msgstr "Kontrolovať nové správy pri spustení"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-msgid ""
-"Whether to check for new messages when Evolution is started. This includes "
-"also sending messages from Outbox."
-msgstr ""
-"Určuje, či kontrolovať nové správy, pri spúšťaní Evolution. Toto zahŕňa tiež "
-"odoslanie správ z priečinka Pošta na odoslanie."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+msgid "Whether to check for new messages when Evolution is started. This includes also sending messages from 
Outbox."
+msgstr "Určuje, či kontrolovať nové správy, pri spúšťaní Evolution. Toto zahŕňa tiež odoslanie správ z 
priečinka Pošta na odoslanie."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Check for new messages in all active accounts"
 msgstr "Kontrolovať nové správy vo všetkých aktívnych účtoch"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
-"Whether to check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
+"Whether to check for new messages in all active accounts regardless of the account \"Check for new messages 
every X minutes\" option when Evolution is started. This option is used only together with "
+"'send_recv_on_start' option."
 msgstr ""
-"Určuje, či kontrolovať nové správy na všetkých aktívnych účtoch bez ohľadu "
-"na voľbu „Kontrolovať na nové správy každých X minút“ pri štarte Evolution. "
-"Táto voľba je použitá iba zároveň s voľbou „send_recv_on_start“."
+"Určuje, či kontrolovať nové správy na všetkých aktívnych účtoch bez ohľadu na voľbu „Kontrolovať na nové 
správy každých X minút“ pri štarte Evolution. Táto voľba je použitá iba zároveň s voľbou "
+"„send_recv_on_start“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Server synchronization interval"
 msgstr "Interval synchronizácie so serverom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must 
be at least 30 seconds."
+msgstr "Ovláda ako často miestne zmeny majú byť synchronizované so vzdialeným poštovým serverom. Interval 
musí byť minimálne 30 sekúnd."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#, fuzzy
+#| msgid "Confirm _when expunging a folder"
+msgid "Allow expunge in virtual folders"
+msgstr "_Potvrdenie pri čistení priečinka"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
+"Enables Expunge in virtual folders, which means that the Folder->Expunge will be callable in virtual 
folders, while the expunge itself will be done in all folders for all deleted messages within the virtual "
+"folder, not only for deleted messages belonging to the virtual folder."
 msgstr ""
-"Ovláda ako často miestne zmeny majú byť synchronizované so vzdialeným "
-"poštovým serverom. Interval musí byť minimálne 30 sekúnd."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid "An Archive folder for On This Computer folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+msgid "An Archive folder to use for Messages|Archive... feature when in an On This Computer folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "(Deprecated) Default forward style"
 msgstr "(Zavrhnuté) Predvolený štýl posielania ďalej"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"forward-style-name\" instead."
-msgstr ""
-"Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. "
-"Namiesto neho použite „forward-style-name“."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"forward-style-name\" 
instead."
+msgstr "Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. Namiesto neho použite 
„forward-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "(Deprecated) Default reply style"
 msgstr "(Zavrhnuté) Predvolený štýl odpovede"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"reply-style-name\" instead."
-msgstr ""
-"Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. "
-"Namiesto neho použite „reply-style-name“."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"reply-style-name\" 
instead."
+msgstr "Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. Namiesto neho použite 
„reply-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Zavrhnuté) Zoznam vlastných hlavičiek a či majú byť povolené."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"show-headers\" instead."
-msgstr ""
-"Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. "
-"Namiesto neho použite „show-headers“."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"show-headers\" instead."
+msgstr "Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. Namiesto neho použite 
„show-headers“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Zavrhnuté) Načítať obrázky HTML správ cez HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"image-loading-policy\" instead."
-msgstr ""
-"Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. "
-"Namiesto neho použite „image-loading-policy“."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"image-loading-policy\" 
instead."
+msgstr "Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. Namiesto neho použite 
„image-loading-policy“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
-msgid ""
-"(Deprecated) Asks whether to close the message window when the user forwards "
-"or replies to the message shown in the window"
-msgstr ""
-"(Zavrhnuté) Otázky či zatvárať okno so správou keď používateľ preposiela "
-"ďalej alebo odpovedá na zobrazenú správu v okne"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+msgid "(Deprecated) Asks whether to close the message window when the user forwards or replies to the 
message shown in the window"
+msgstr "(Zavrhnuté) Otázky či zatvárať okno so správou keď používateľ preposiela ďalej alebo odpovedá na 
zobrazenú správu v okne"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"browser-close-on-reply-policy\" instead."
-msgstr ""
-"Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. "
-"Namiesto neho použite „browser-close-on-reply-policy“."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+msgid "This key was deprecated in version 3.10 and should no longer be used. Use 
\"browser-close-on-reply-policy\" instead."
+msgstr "Tento kľúč bol zavrhnutý vo verzii 3.10 a už nemá byť naďalej používaný. Namiesto neho použite 
„browser-close-on-reply-policy“."
 
 #. Translators: This is the a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
@@ -9133,20 +9081,12 @@ msgstr "['priložený','prilozeny','prikladám','prikladam']"
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 #, fuzzy
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr ""
-"Zoznam pomôcok pre zásuvný modul upozornenia na prílohy, ktoré hľadá v tele "
-"správy"
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgstr "Zoznam pomôcok pre zásuvný modul upozornenia na prílohy, ktoré hľadá v tele správy"
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Zoznam pomôcok pre zásuvný modul upozornenia na prílohy, ktoré hľadá v tele "
-"správy."
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
+msgstr "Zoznam pomôcok pre zásuvný modul upozornenia na prílohy, ktoré hľadá v tele správy."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
 msgid "Address book source"
@@ -9154,8 +9094,7 @@ msgstr "Zdroj adresára kontaktov"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
 msgid "Address book to use for storing automatically synced contacts."
-msgstr ""
-"Adresár kontaktov pre automatické ukladanie synchronizovaných kontaktov."
+msgstr "Adresár kontaktov pre automatické ukladanie synchronizovaných kontaktov."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
 msgid "Auto sync Pidgin contacts"
@@ -9163,30 +9102,23 @@ msgstr "Automaticky synchronizovať kontakty z Pidginu"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
 msgid "Whether Pidgin contacts should be automatically synced."
-msgstr ""
-"Určuje, či majú byť automaticky synchronizované kontakty z programu Pidgin."
+msgstr "Určuje, či majú byť automaticky synchronizované kontakty z programu Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
 msgid "Enable autocontacts"
 msgstr "Povoliť automatické kontakty"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-msgid ""
-"Whether contacts should be automatically added to the user's address book."
-msgstr ""
-"Určuje, či má byť povolené automatické pridávanie kontaktov do "
-"používateľského adresára kontaktov."
+msgid "Whether contacts should be automatically added to the user's address book."
+msgstr "Určuje, či má byť povolené automatické pridávanie kontaktov do používateľského adresára kontaktov."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
 msgid "Pidgin address book source"
 msgstr "Zdroj adresára kontaktov Pidginu"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid ""
-"Address book to use for storing automatically synced contacts from Pidgin."
-msgstr ""
-"Adresár kontaktov pre automatické ukladanie synchronizovaných kontaktov z "
-"programu Pidgin."
+msgid "Address book to use for storing automatically synced contacts from Pidgin."
+msgstr "Adresár kontaktov pre automatické ukladanie synchronizovaných kontaktov z programu Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
 msgid "Pidgin check interval"
@@ -9218,13 +9150,11 @@ msgstr "Zoznam vlastných hlavičiek"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
 msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
+"The key specifies the list of custom headers that you can add to an outgoing message. The format for 
specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values "
+"separated by \";\""
 msgstr ""
-"Kľúč určuje zoznam používateľských hlavičiek, ktoré je možno pridať do "
-"odchádzajúcej správy. Formát pre určenie hlavičky a jej hodnoty je: názov "
-"používateľskej hlavičky nasledovaný „=“ a hodnoty oddelené znakom „;“"
+"Kľúč určuje zoznam používateľských hlavičiek, ktoré je možno pridať do odchádzajúcej správy. Formát pre 
určenie hlavičky a jej hodnoty je: názov používateľskej hlavičky nasledovaný „=“ a hodnoty oddelené "
+"znakom „;“"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
 msgid "Default External Editor"
@@ -9240,20 +9170,15 @@ msgstr "Automaticky spustiť pri upravovaní novej pošty"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
 msgid "Automatically launch editor when key is pressed in the mail composer."
-msgstr ""
-"Automaticky spustiť textový editor pri stlačení klávesu v editore správ."
+msgstr "Automaticky spustiť textový editor pri stlačení klávesu v editore správ."
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
 msgid "Insert Face picture by default"
 msgstr "Prednastavenie vkladanie obrázku s tvárou"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
-msgstr ""
-"Určuje, či bežne vkladať obrázok s tvárou do odchádzajúcich správ. Obrázok "
-"by mal byť nastavený pred potvrdením tohoto kľúča, inak sa nič nestane."
+msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before 
checking this, otherwise nothing happens."
+msgstr "Určuje, či bežne vkladať obrázok s tvárou do odchádzajúcich správ. Obrázok by mal byť nastavený pred 
potvrdením tohoto kľúča, inak sa nič nestane."
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
 msgid "Delete processed"
@@ -9301,13 +9226,10 @@ msgstr "Povoliť zvukové oznámenia, keď prídu nové správy."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
 msgid ""
-"Whether to make a sound of any kind when new messages arrive. If \"false\", "
-"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
-"and \"notify-sound-use-theme\" keys are disregarded."
+"Whether to make a sound of any kind when new messages arrive. If \"false\", the \"notify-sound-beep\", 
\"notify-sound-file\", \"notify-sound-play-file\" and \"notify-sound-use-theme\" keys are disregarded."
 msgstr ""
-"Určuje, či prehrať akýkoľvek zvuk pri príchode novej správy. Ak "
-"„false“ (nepravda), tak kľúče „notify-sound-beep“, „notify-sound-file“, "
-"„notify-sound-play-file“, a „notify-sound-use-theme“ sa nebudú brať do úvahy."
+"Určuje, či prehrať akýkoľvek zvuk pri príchode novej správy. Ak „false“ (nepravda), tak kľúče 
„notify-sound-beep“, „notify-sound-file“, „notify-sound-play-file“, a „notify-sound-use-theme“ sa nebudú brať 
do "
+"úvahy."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
 msgid "Whether to emit a beep."
@@ -9322,24 +9244,16 @@ msgid "Sound filename to be played."
 msgstr "Názov zvukového súboru, ktorý sa má prehrať."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-msgid ""
-"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
-"\" is \"true\"."
-msgstr ""
-"Zvukový súbor, ktorý sa má prehrať, keď prídu nové správy, ak kľúč „notify-"
-"sound-play-file“ je nastavený na „true“ (pravda)."
+msgid "Sound file to be played when new messages arrive, if \"notify-sound-play-file\" is \"true\"."
+msgstr "Zvukový súbor, ktorý sa má prehrať, keď prídu nové správy, ak kľúč „notify-sound-play-file“ je 
nastavený na „true“ (pravda)."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
 msgid "Whether to play a sound file."
 msgstr "Určuje, či prehrať zvukový súbor."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-msgid ""
-"Whether to play a sound file when new messages arrive. The name of the sound "
-"file is given by the 'notify-sound-file' key."
-msgstr ""
-"Určuje, či prehrať zvukový súbor, keď prídu nové správy. Názov zvukového "
-"súboru je v kľúči „notify-sound-file“."
+msgid "Whether to play a sound file when new messages arrive. The name of the sound file is given by the 
'notify-sound-file' key."
+msgstr "Určuje, či prehrať zvukový súbor, keď prídu nové správy. Názov zvukového súboru je v kľúči 
„notify-sound-file“."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 msgid "Use sound theme"
@@ -9347,8 +9261,7 @@ msgstr "Použiť zvukovú tému"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr ""
-"Prehrať zvuk z témy, keď príde nová správa, ak nie je v režime pípania."
+msgstr "Prehrať zvuk z témy, keď príde nová správa, ak nie je v režime pípania."
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
 msgid "Mode to use when displaying mails"
@@ -9358,14 +9271,11 @@ msgstr "Režim používaný pre zobrazovanie pošty."
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
 #, fuzzy
 msgid ""
-"The mode to use for displaying mails. \"normal\" makes Evolution choose the "
-"best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"and \"only_plain\" forces Evolution to only show plain text"
+"The mode to use for displaying mails. \"normal\" makes Evolution choose the best part to show, 
\"prefer_plain\" makes it use the text part, if present, and \"only_plain\" forces Evolution to only show 
plain "
+"text"
 msgstr ""
-"Režim používaný pre zobrazovanie pošty. „normálny“ Evolution sa sám "
-"rozhodne, ktorá časť správy sa zobrazí, „uprednostniť_text“ spôsobí, že bude "
-"uprednostnená textová časť správy a „len_text“ spôsobí, že bude zobrazená "
-"len textová časť"
+"Režim používaný pre zobrazovanie pošty. „normálny“ Evolution sa sám rozhodne, ktorá časť správy sa zobrazí, 
„uprednostniť_text“ spôsobí, že bude uprednostnená textová časť správy a „len_text“ spôsobí, že "
+"bude zobrazená len textová časť"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
 msgid "Whether to show suppressed HTML output"
@@ -9376,43 +9286,28 @@ msgid "List of Destinations for publishing"
 msgstr "Zoznam cieľov pre zverejňovanie"
 
 #: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
-msgid ""
-"The key specifies the list of destinations to where publish calendars. Each "
-"values specifies an XML with setup for publishing to one destination."
-msgstr ""
-"Kľúč určuje zoznam cieľov, kde budú kalendáre zverejňované. Každá hodnota "
-"určuje XML s nastavením zverejňovania na jeden cieľ."
+msgid "The key specifies the list of destinations to where publish calendars. Each values specifies an XML 
with setup for publishing to one destination."
+msgstr "Kľúč určuje zoznam cieľov, kde budú kalendáre zverejňované. Každá hodnota určuje XML s nastavením 
zverejňovania na jeden cieľ."
 
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-msgstr ""
-"Zoznam párov kľúč/hodnota pre zásuvný modul Šablóny, ktorý určuje náhrady v "
-"tele správy."
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgstr "Zoznam párov kľúč/hodnota pre zásuvný modul Šablóny, ktorý určuje náhrady v tele správy."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
 msgid "Skip development warning dialog"
 msgstr "Preskočiť dialógové okno s upozornením pre vývojárov"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Určuje, či vo vývojových verziách Evolution preskočiť dialógové okno s "
-"upozornením."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "Určuje, či vo vývojových verziách Evolution preskočiť dialógové okno s upozornením."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
 msgid "Initial attachment view"
 msgstr "Počiatočné zobrazenie príloh"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-msgstr ""
-"Počiatočné zobrazenie príloh v paneli. „0“ je ikonkový náhľad, „1“ je "
-"zoznamový náhľad."
+msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgstr "Počiatočné zobrazenie príloh v paneli. „0“ je ikonkový náhľad, „1“ je zoznamový náhľad."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
 msgid "Initial file chooser folder"
@@ -9428,20 +9323,15 @@ msgstr "Spustiť v odpojenom režime"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Určuje, či sa bude Evolution spúšťať v odpojenom režime namiesto v "
-"pripojenom."
+msgstr "Určuje, či sa bude Evolution spúšťať v odpojenom režime namiesto v pripojenom."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
 msgid "Offline folder paths"
 msgstr "Cesty priečinkov odpojeného režimu"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage."
-msgstr ""
-"Zoznam ciest pre priečinky, ktoré sa budú synchronizovať na disk pre "
-"použitie v odpojenom režime."
+msgid "List of paths for the folders to be synchronized to disk for offline usage."
+msgstr "Zoznam ciest pre priečinky, ktoré sa budú synchronizovať na disk pre použitie v odpojenom režime."
 
 # <long>Flag that enables a much simplified user interface.</long>
 # je nejaký dôvod nepreložiť express? chce to TC
@@ -9468,14 +9358,8 @@ msgid "Window button style"
 msgstr "Štýl tlačidiel v oknách"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"Štýl tlačidiel v okne. Môže byť „text“, „icons“ (ikonky), „both“ (oboje), "
-"„toolbar“ (lišta nástrojov). Ak je nastavené „toolbar“, tak štýl zavisí od "
-"nastavenia listy nástrojov GNOME."
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is 
set, the style of the buttons is determined by the GNOME toolbar setting."
+msgstr "Štýl tlačidiel v okne. Môže byť „text“, „icons“ (ikonky), „both“ (oboje), „toolbar“ (lišta 
nástrojov). Ak je nastavené „toolbar“, tak štýl zavisí od nastavenia listy nástrojov GNOME."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "Toolbar is visible"
@@ -9503,8 +9387,7 @@ msgstr "Určuje, či má byť viditeľná stavová lišta."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-"Identifikátor alebo alias komponenty, ktorá má byť zobrazená pri štarte."
+msgstr "Identifikátor alebo alias komponenty, ktorá má byť zobrazená pri štarte."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Default sidebar width"
@@ -9522,9 +9405,7 @@ msgstr "Použiť len lokálne testy na nevyžiadanú poštu."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Použiť len lokálne testy na nevyžiadanú poštu (bez DNS)."
 
-#: ../em-format/e-mail-formatter-attachment.c:397
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../em-format/e-mail-formatter-attachment.c:405 ../e-util/e-attachment-bar.c:101 
../e-util/e-attachment-bar.c:106 ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -9533,245 +9414,188 @@ msgstr[1] "Príloha"
 msgstr[2] "Prílohy"
 
 # desc
-#: ../em-format/e-mail-formatter-attachment.c:398
+#: ../em-format/e-mail-formatter-attachment.c:406
 msgid "Display as attachment"
 msgstr "Zobrazí ako prílohu"
 
-#: ../em-format/e-mail-formatter-audio.c:144
+#: ../em-format/e-mail-formatter-audio.c:152
 msgid "Audio Player"
 msgstr "Zvukový prehrávač"
 
-#: ../em-format/e-mail-formatter-audio.c:145
+#: ../em-format/e-mail-formatter-audio.c:153
 msgid "Play the attachment in embedded audio player"
 msgstr "Prehrať prílohu v zabudovanom zvukovom prehrávači"
 
-#: ../em-format/e-mail-formatter-headers.c:103
-#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-formatter-headers.c:102 ../em-format/e-mail-part-headers.c:46 
../mail/e-mail-tag-editor.c:277 ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
 msgid "From"
 msgstr "Od"
 
-#: ../em-format/e-mail-formatter-headers.c:129
+#: ../em-format/e-mail-formatter-headers.c:128
 msgid "(no subject)"
 msgstr "(žiadny predmet)"
 
-#: ../em-format/e-mail-formatter-headers.c:329
+#: ../em-format/e-mail-formatter-headers.c:328
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Táto správa bola odoslaná kontaktom %s v mene kontaktu %s"
 
-#: ../em-format/e-mail-formatter-image.c:152
+#: ../em-format/e-mail-formatter-image.c:170
 msgid "Regular Image"
 msgstr "Normálny obrázok"
 
-#: ../em-format/e-mail-formatter-image.c:153
+#: ../em-format/e-mail-formatter-image.c:171
 msgid "Display part as an image"
 msgstr "Zobrazí časť ako obrázok"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:246
+#: ../em-format/e-mail-formatter-message-rfc822.c:254
 msgid "RFC822 message"
 msgstr "Správa spĺňajúca RFC822"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:247
+#: ../em-format/e-mail-formatter-message-rfc822.c:255
 msgid "Format part as an RFC822 message"
 msgstr "Formátovať časť ako správu spĺňajúcu RFC822"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../e-util/gal-view-instance-save-as-dialog.c:95
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1324
-#: ../modules/cal-config-google/e-google-chooser.c:237
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../em-format/e-mail-formatter-print.c:53 ../e-util/gal-view-instance-save-as-dialog.c:94 
../mail/e-mail-label-tree-view.c:98 ../modules/cal-config-caldav/e-caldav-chooser.c:1295
+#: ../modules/cal-config-google/e-google-chooser.c:236 
../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Názov"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:53 ../e-util/e-attachment-tree-view.c:573 
../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Veľkosť"
 
 # MČ: „zabezpečenie“
 # PK: rod
-#: ../em-format/e-mail-formatter-print-headers.c:144
+#: ../em-format/e-mail-formatter-print-headers.c:143
 msgid "GPG signed"
 msgstr "Podpísané pomocou GPG"
 
-#: ../em-format/e-mail-formatter-print-headers.c:150
+#: ../em-format/e-mail-formatter-print-headers.c:149
 msgid "GPG encrpyted"
 msgstr "Zašifrované pomocou GPG"
 
-#: ../em-format/e-mail-formatter-print-headers.c:156
+#: ../em-format/e-mail-formatter-print-headers.c:155
 msgid "S/MIME signed"
 msgstr "Podpísané pomocou S/MIME"
 
-#: ../em-format/e-mail-formatter-print-headers.c:162
+#: ../em-format/e-mail-formatter-print-headers.c:161
 msgid "S/MIME encrpyted"
 msgstr "Zašifrované pomocou S/MIME"
 
-#: ../em-format/e-mail-formatter-print-headers.c:171
-#: ../mail/e-mail-config-security-page.c:645
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+#: ../em-format/e-mail-formatter-print-headers.c:170 ../mail/e-mail-config-security-page.c:736 
../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
 msgid "Security"
 msgstr "Zabezpečenie"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:168
-#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:69
+#: ../em-format/e-mail-formatter-quote-headers.c:174 ../em-format/e-mail-part-headers.c:51 
../mail/e-mail-tag-editor.c:282 ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
+#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17 ../modules/mail/em-mailer-prefs.c:67 
../smime/gui/certificate-manager.c:1630
 msgid "Subject"
 msgstr "Predmet"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:187
-#: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1145
+#: ../em-format/e-mail-formatter-quote-headers.c:193 ../em-format/e-mail-formatter-utils.c:342 
../modules/mail/em-mailer-prefs.c:1166
 msgid "Mailer"
 msgstr "Poštový klient"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
-#: ../em-format/e-mail-formatter-text-enriched.c:98
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94 ../em-format/e-mail-formatter-text-enriched.c:98
 msgid "Richtext"
 msgstr "Formátovaný text (richtext)"
 
 # PK: som pozeral wiki a ze to neni to iste, ked tak nahlas bug
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
-#: ../em-format/e-mail-formatter-text-enriched.c:99
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95 ../em-format/e-mail-formatter-text-enriched.c:99
 #, fuzzy
 msgid "Display part as enriched text"
 msgstr "Zobraziť časť ako formátovaný text (richtext)"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:90
-#: ../em-format/e-mail-formatter-text-html.c:349
+#: ../em-format/e-mail-formatter-quote-text-html.c:95 ../em-format/e-mail-formatter-text-html.c:359
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:91
-#: ../em-format/e-mail-formatter-text-html.c:350
+#: ../em-format/e-mail-formatter-quote-text-html.c:96 ../em-format/e-mail-formatter-text-html.c:360
 msgid "Format part as HTML"
 msgstr "Formátovať časť ako HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:115
-#: ../em-format/e-mail-formatter-text-plain.c:185
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123 ../em-format/e-mail-formatter-text-plain.c:197 
../e-util/e-html-editor-actions.c:1408
 msgid "Plain Text"
 msgstr "Obyčajný text"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:116
-#: ../em-format/e-mail-formatter-text-plain.c:186
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124 ../em-format/e-mail-formatter-text-plain.c:198
 msgid "Format part as plain text"
 msgstr "Formátovať časť ako obyčajný text"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:51
 msgid "Unsigned"
 msgstr "Nepodpísané"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: ../em-format/e-mail-formatter-secure-button.c:51
+msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "Táto správa nie je podpísaná. Nie je záruka, že táto správa je pravá."
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Valid signature"
 msgstr "Platný podpis"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Táto správa je digitálne podpísaná a podpis je platný. To znamená, že je "
-"veľmi pravdepodobné, že správa je pravá."
+#: ../em-format/e-mail-formatter-secure-button.c:52
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "Táto správa je digitálne podpísaná a podpis je platný. To znamená, že je veľmi pravdepodobné, že 
správa je pravá."
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
 msgstr "Neplatný podpis"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"Podpis v tejto správe nemožno overiť, je možné, že správa bola zmenená pri "
-"prenose."
+#: ../em-format/e-mail-formatter-secure-button.c:53
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "Podpis v tejto správe nemožno overiť, je možné, že správa bola zmenená pri prenose."
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Valid signature, but cannot verify sender"
 msgstr "Platný popis, ale nie je možné overiť odosielateľa"
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"Táto správa je digitálne podpísaná a podpis je platný, ale odosielateľa "
-"správy nemožno overiť."
+#: ../em-format/e-mail-formatter-secure-button.c:54
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "Táto správa je digitálne podpísaná a podpis je platný, ale odosielateľa správy nemožno overiť."
 
-#: ../em-format/e-mail-formatter-secure-button.c:56
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Signature exists, but need public key"
 msgstr "Podpis existuje, ale potrebuje verejný kľúč"
 
-#: ../em-format/e-mail-formatter-secure-button.c:56
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr ""
-"Táto správa je digitálne podpísaná a podpis je platný, ale nie je k "
-"dispozícii vyhovujúci verejný kľúč."
+#: ../em-format/e-mail-formatter-secure-button.c:55
+msgid "This message is signed with a signature, but there is no corresponding public key."
+msgstr "Táto správa je digitálne podpísaná a podpis je platný, ale nie je k dispozícii vyhovujúci verejný 
kľúč."
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Unencrypted"
 msgstr "Nezašifrované"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"Táto správa nie je zašifrovaná. Jej obsah môže byť prečítaný počas prenosu "
-"po internete."
+#: ../em-format/e-mail-formatter-secure-button.c:62
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+msgstr "Táto správa nie je zašifrovaná. Jej obsah môže byť prečítaný počas prenosu po internete."
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Encrypted, weak"
 msgstr "Zašifrované, slabo"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"Táto správa je zašifrovaná, ale slabým šifrovacím algoritmom. Pre "
-"nezasväteného je ťažké, ale nie nemožné, zobraziť obsah tejto správy v "
-"rozumnom čase."
+#: ../em-format/e-mail-formatter-secure-button.c:63
+msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not 
impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr "Táto správa je zašifrovaná, ale slabým šifrovacím algoritmom. Pre nezasväteného je ťažké, ale nie 
nemožné, zobraziť obsah tejto správy v rozumnom čase."
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted"
 msgstr "Zašifrované"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"Táto správa je zašifrovaná. Pre cudzieho človeka bude náročné prečítať obsah "
-"tejto správy."
+#: ../em-format/e-mail-formatter-secure-button.c:64
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this 
message."
+msgstr "Táto správa je zašifrovaná. Pre cudzieho človeka bude náročné prečítať obsah tejto správy."
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted, strong"
 msgstr "Zašifrované, silno"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"Táto správa je zašifrovaná silným šifrovacím algoritmom. Pre nezasväteného "
-"bude zložité pozrieť obsah tejto správy v rozumnom čase."
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an 
outsider to view the content of this message in a practical amount of time."
+msgstr "Táto správa je zašifrovaná silným šifrovacím algoritmom. Pre nezasväteného bude zložité pozrieť 
obsah tejto správy v rozumnom čase."
 
-#: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../em-format/e-mail-formatter-secure-button.c:187 ../shell/shell.error.xml.h:23 
../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "_Zobraziť certifikát"
 
@@ -9779,701 +9603,414 @@ msgstr "_Zobraziť certifikát"
 msgid "This certificate is not viewable"
 msgstr "Tento certifikát nie je zobraziteľný"
 
-#: ../em-format/e-mail-formatter-source.c:115
+#: ../em-format/e-mail-formatter-source.c:120
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../em-format/e-mail-formatter-source.c:116
+#: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "Zobraziť zdroj časti MIME"
 
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-utils.c:202 ../em-format/e-mail-formatter-utils.c:219 
../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
 msgid "Cc"
 msgstr "Kópia"
 
-#: ../em-format/e-mail-formatter-utils.c:204
-#: ../em-format/e-mail-formatter-utils.c:221
-#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-utils.c:203 ../em-format/e-mail-formatter-utils.c:220 
../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
 msgstr "Skrytá kópia"
 
-#: ../em-format/e-mail-parser-application-mbox.c:88
+#: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Chyba pri analýze časti MBOX: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:84
+#: ../em-format/e-mail-parser-application-smime.c:83
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "Nepodarilo sa analyzovať správu S/MIME: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Nepodarilo sa analyzovať správu PGP: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
-#: ../em-format/e-mail-parser-multipart-signed.c:136
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80 ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Chyba overovania podpisu: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:69
+#: ../em-format/e-mail-parser-message-external.c:68
 msgid "Malformed external-body part"
 msgstr "Zle formátovaná časť externého tela"
 
-#: ../em-format/e-mail-parser-message-external.c:102
+#: ../em-format/e-mail-parser-message-external.c:101
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:113
+#: ../em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lokálny súbor (%s) platný na serveri „%s“"
 
-#: ../em-format/e-mail-parser-message-external.c:115
+#: ../em-format/e-mail-parser-message-external.c:114
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:134
+#: ../em-format/e-mail-parser-message-external.c:133
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené údaje (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:152
+#: ../em-format/e-mail-parser-message-external.c:151
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé údaje (typ „%s“)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:67
-#: ../em-format/e-mail-parser-multipart-signed.c:84
+#: ../em-format/e-mail-parser-multipart-encrypted.c:66 ../em-format/e-mail-parser-multipart-signed.c:83
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nepodarilo sa analyzovať správu MIME. Zobrazuje sa ako zdrojový kód."
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:83
+#: ../em-format/e-mail-parser-multipart-encrypted.c:82
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodporovaný typ šifrovania pre multipart/encrypted"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:102
+#: ../em-format/e-mail-parser-multipart-encrypted.c:101
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "Nepodarilo sa analyzovať správu PGP/MIME: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:122
+#: ../em-format/e-mail-parser-multipart-signed.c:121
 msgid "Unsupported signature format"
 msgstr "Nepodporovaný formát podpisu"
 
-#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
 msgid "Reply-To"
 msgstr "Komu odpovedať"
 
-#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
-#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549 ../e-util/e-dateedit.c:572 
../mail/message-list.etspec.h:7 ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "Dátum"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
 msgid "Newsgroups"
 msgstr "Konferencie"
 
-#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70 
../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Tvár"
 
-#: ../em-format/e-mail-part-utils.c:500
+#: ../em-format/e-mail-part-utils.c:508
 #, c-format
 msgid "%s attachment"
 msgstr "Príloha %s"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Predvolené"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Patentované"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Tajné"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Prísne tajné"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Len pre vaše oči"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Žiadne"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Príjem pošty"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "V_yžadovaná odpoveď"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "V _rámci"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "dní"
-
-# PK: ked je to vhodne
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "_Keď je to vhodné"
-
-# je to za zahrnúť vlákna
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:844
-msgid "Replies"
-msgstr "Odpovede"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Oneskoriť doručenie správy"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Po"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "dňoch"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "_Nastaviť dátum vypršania platnosti"
-
-# Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Do"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Voľby doručenia"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "_Priorita:"
-
-# nebude lepšie Zaradenie?
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Klasifikácia:"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Všeo_becné voľby"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "V_ytvoriť posielaciu položku pre sledovanie informácie"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Doručené"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "D_oručené a otvorené"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Všetky informácie"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "A_utomaticky odstrániť odoslanú položku"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Sledovanie stavu"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "_Pri otvorení:"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Pri _odmietnutí:"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Pri doko_nčení:"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "Pri akce_ptovaní:"
-
-# PŠ: je to dobre?
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Oznámenie o vrátení"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Sledovanie s_tavu"
-
-#: ../e-util/e-table-config.ui.h:1
-msgid "_Sort..."
-msgstr "Z_oradiť…"
-
-#: ../e-util/e-table-config.ui.h:2
-msgid "_Group By..."
-msgstr "_Zoskupiť podľa…"
-
-#: ../e-util/e-table-config.ui.h:3
-msgid "_Fields Shown..."
-msgstr "Zo_brazené polia…"
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "Clear _All"
-msgstr "Vymazať _všetko"
-
-#: ../e-util/e-table-config.ui.h:7
-msgid "_Show field in View"
-msgstr "_Zobraziť pole v pohľade"
-
-#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1754
-msgid "Ascending"
-msgstr "Vzostupne"
-
-#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1754
-msgid "Descending"
-msgstr "Zostupne"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "Group Items By"
-msgstr "Zoskupiť položky podľa"
-
-#: ../e-util/e-table-config.ui.h:11
-msgid "Show _field in View"
-msgstr "Zobraziť _pole v pohľade"
-
-#: ../e-util/e-table-config.ui.h:12
-msgid "Then By"
-msgstr "Potom podľa"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Show field i_n View"
-msgstr "Zobraziť po_le v pohľade"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show field in _View"
-msgstr "Zobraziť pole _v pohľade"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Sort"
-msgstr "Zoradiť"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Clear All"
-msgstr "Vymazať všetko"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Sort Items By"
-msgstr "Zoradiť položky podľa"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Vyberte časové pásmo"
-
-#: ../e-util/e-timezone-dialog.ui.h:2
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Pomocou ľavého tlačidla myši môžete zväčšiť oblasť mapy a vybrať časové "
-"pásmo.\n"
-"Na zmenšenie použite pravé tlačidlo myši."
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid "Time Zones"
-msgstr "Časové pásma"
-
-#: ../e-util/e-timezone-dialog.ui.h:5
-msgid "_Selection"
-msgstr "_Výber"
-
-# AtkObject::accessible_name
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Timezone drop-down combination box"
-msgstr "Rozbaľovací zoznam s časovými pásmami"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
-#: ../mail/em-utils.c:231
-msgid "Incoming"
-msgstr "Prijatá"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "aktuálny čas"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "zadaný čas"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "čas relatívny k aktuálnemu času"
-
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:76
-msgid "seconds"
-msgstr "sekúnd"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "týždňov"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "mesiacov"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "rokov"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "dozadu"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "v budúcnosti"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Zobraziť filtre pre poštu:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
-msgid "_Filter Rules"
-msgstr "Pravidlá _filtra"
-
-#: ../e-util/filter.ui.h:17
-msgid "Compare against"
-msgstr "Porovnať s"
-
-#: ../e-util/filter.ui.h:18
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Dátum správy bude porovnaný\n"
-"s aktuálnym časom filtrovania."
-
-#: ../e-util/filter.ui.h:20
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Dátum správy bude porovnaný\n"
-"s dátumom o 12:00, ktorý tu uvediete."
-
-#: ../e-util/filter.ui.h:22
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Dátum správy bude porovnaný s časom\n"
-"relatívnym k okamihu, keď bol filter spustený."
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Vytvoriť novú úlohu"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:417
-#: ../mail/e-mail-config-identity-page.c:311
-#: ../mail/e-mail-config-summary-page.c:341
-msgid "_Name:"
-msgstr "_Názov:"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%d. %B %Y"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Nahradiť existujúci pohľad"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalendár: od %s do %s"
 
-#: ../e-util/e-activity-proxy.c:310
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
-msgid "Cancel"
-msgstr "Zrušiť"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "položka kalendára evolution"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:258
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (zrušená)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:262
+#: ../e-util/e-activity.c:261
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (dokončená)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:264
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (čakajúca)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:269
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (ruší sa)"
 
-#: ../e-util/e-activity.c:271
+#: ../e-util/e-activity.c:270
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:276
+#. Translators: This is a running activity whose percent complete is known.
+#: ../e-util/e-activity.c:275 ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% hotových)"
 
+#: ../e-util/e-activity-proxy.c:352 ../modules/mail/e-mail-shell-view-actions.c:1778
+msgid "Cancel"
+msgstr "Zrušiť"
+
 # tooltip
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:121
+#: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "Zatvorí túto správu (kláves Esc)"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+#: ../e-util/e-alert-sink.c:246
+#, fuzzy
+#| msgid "Failed to mark messages as read."
+msgid "Failed to create a thread: "
+msgstr "Zlyhalo označenie správ ako prečítané."
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
 msgid "Icon View"
 msgstr "Pohľad ikony"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
 msgid "List View"
 msgstr "Pohľad zoznam"
 
-#: ../e-util/e-attachment-dialog.c:318
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:1197
+msgid "Attached message"
+msgstr "Priložená správa"
+
+#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+msgid "Operation was cancelled"
+msgstr "Operácia bola zrušená"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963 ../e-util/e-attachment.c:3334 
../e-util/e-attachment-store.c:691
+msgid "attachment.dat"
+msgstr "príloha.dat"
+
+#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+msgid "A load operation is already in progress"
+msgstr "Operácia načítania ešte stále prebieha"
+
+#: ../e-util/e-attachment.c:2353 ../e-util/e-attachment.c:3402
+msgid "A save operation is already in progress"
+msgstr "Operácia ukladania ešte stále prebieha"
+
+#: ../e-util/e-attachment.c:2473
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Nepodarilo sa načítať „%s“"
+
+#: ../e-util/e-attachment.c:2476
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Nepodarilo sa načítať prílohu"
+
+#: ../e-util/e-attachment.c:2761
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Nepodarilo sa otvoriť „%s“"
+
+#: ../e-util/e-attachment.c:2764
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Nepodarilo sa otvoriť prílohu"
+
+#: ../e-util/e-attachment.c:3411
+msgid "Attachment contents not loaded"
+msgstr "Obsah prílohy sa nenačítal"
+
+#: ../e-util/e-attachment.c:3502
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Nepodarilo sa uložiť „%s“"
+
+#: ../e-util/e-attachment.c:3505
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Nepodarilo sa uložiť prílohu"
+
+#: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Vlastnosti prílohy"
 
-#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "Náz_ov súboru:"
 
-#: ../e-util/e-attachment-dialog.c:375
+#: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "Typ MIME:"
 
-#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
 msgid "_Suggest automatic display of attachment"
 msgstr "_Navrhnúť automatické zobrazovanie príloh"
 
-#: ../e-util/e-attachment-handler-image.c:97
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "Nepodarilo sa nastaviť ako pozadie"
 
-#: ../e-util/e-attachment-handler-image.c:147
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Nastaviť ako _pozadie"
 
-#: ../e-util/e-attachment-icon-view.c:166
-#: ../e-util/e-attachment-tree-view.c:549
+#: ../e-util/e-attachment-icon-view.c:168 ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "Načítava sa"
 
-#: ../e-util/e-attachment-icon-view.c:178
-#: ../e-util/e-attachment-tree-view.c:561
+#: ../e-util/e-attachment-icon-view.c:180 ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "Ukladá sa"
 
-#: ../e-util/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "Skryť _lištu príloh"
 
-#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
 msgid "Show Attachment _Bar"
 msgstr "Zobraziť _lištu príloh"
 
-#: ../e-util/e-attachment-store.c:463
+#: ../e-util/e-attachment-store.c:486
 msgid "Add Attachment"
 msgstr "Pridať prílohu"
 
-#: ../e-util/e-attachment-store.c:466
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
 msgstr "P_riložiť"
 
-#: ../e-util/e-attachment-store.c:537
+#: ../e-util/e-attachment-store.c:533
+msgid "Archive selected directories using this format:"
+msgstr ""
+
+#: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Uložiť prílohy"
 msgstr[1] "Uložiť prílohu"
 msgstr[2] "Uložiť prílohy"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2056
-#: ../e-util/e-attachment.c:2719
-msgid "attachment.dat"
-msgstr "príloha.dat"
+#: ../e-util/e-attachment-store.c:653
+#, fuzzy
+#| msgid "Could not load the attachment"
+msgid "Do _not extract files from the attachment"
+msgstr "Nepodarilo sa načítať prílohu"
 
-#: ../e-util/e-attachment-view.c:378
+#: ../e-util/e-attachment-store.c:658
+msgid "Save extracted files _only"
+msgstr ""
+
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files and the original _archive"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
 msgstr "Otvoriť inou aplikáciou…"
 
-#: ../e-util/e-attachment-view.c:385
+#: ../e-util/e-attachment-view.c:384
 msgid "S_ave All"
 msgstr "_Uložiť všetko"
 
-#: ../e-util/e-attachment-view.c:411
+#: ../e-util/e-attachment-view.c:391
+#, fuzzy
+#| msgid "Sa_ve"
+msgid "Sa_ve As"
+msgstr "_Uložiť"
+
+#: ../e-util/e-attachment-view.c:400 ../plugins/save-calendar/save-calendar.c:349 
../plugins/save-calendar/save-calendar.c:380 ../plugins/save-calendar/save-calendar.c:411
+#, fuzzy
+#| msgid "Save _As..."
+msgid "Save _As"
+msgstr "Uložiť _ako…"
+
+#: ../e-util/e-attachment-view.c:410
 msgid "A_dd Attachment..."
 msgstr "Pri_dať prílohu…"
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:417 ../modules/addressbook/e-book-shell-view-actions.c:1071 
../modules/calendar/e-cal-shell-view-actions.c:1240 ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-task-shell-view-actions.c:696 ../modules/mail/e-mail-shell-view-actions.c:1580 
../modules/mail/e-mail-shell-view-actions.c:1650
+msgid "_Properties"
+msgstr "V_lastnosti"
+
+#: ../e-util/e-attachment-view.c:434
 msgid "_Hide"
 msgstr "_Skryť"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:441
 msgid "Hid_e All"
 msgstr "Skryť _všetko"
 
-#: ../e-util/e-attachment-view.c:449
+#: ../e-util/e-attachment-view.c:448
 msgid "_View Inline"
 msgstr "_Zobraziť v texte"
 
-#: ../e-util/e-attachment-view.c:456
+#: ../e-util/e-attachment-view.c:455
 msgid "Vie_w All Inline"
 msgstr "Z_obraziť všetko v texte"
 
-#: ../e-util/e-attachment-view.c:786
+#: ../e-util/e-attachment-view.c:785
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Otvoriť pomocou „%s“"
 
-#: ../e-util/e-attachment-view.c:789
+#: ../e-util/e-attachment-view.c:788
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Otvorí túto prílohu v programe %s"
 
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1106
-msgid "Attached message"
-msgstr "Priložená správa"
-
-#: ../e-util/e-attachment.c:2137 ../e-util/e-attachment.c:3025
-msgid "A load operation is already in progress"
-msgstr "Operácia načítania ešte stále prebieha"
-
-#: ../e-util/e-attachment.c:2145 ../e-util/e-attachment.c:3033
-msgid "A save operation is already in progress"
-msgstr "Operácia ukladania ešte stále prebieha"
-
-#: ../e-util/e-attachment.c:2265
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Nepodarilo sa načítať „%s“"
-
-#: ../e-util/e-attachment.c:2268
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Nepodarilo sa načítať prílohu"
-
-#: ../e-util/e-attachment.c:2572
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Nepodarilo sa otvoriť „%s“"
-
-#: ../e-util/e-attachment.c:2575
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Nepodarilo sa otvoriť prílohu"
-
-#: ../e-util/e-attachment.c:3042
-msgid "Attachment contents not loaded"
-msgstr "Obsah prílohy sa nenačítal"
-
-#: ../e-util/e-attachment.c:3122
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Nepodarilo sa uložiť „%s“"
-
-#: ../e-util/e-attachment.c:3125
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Nepodarilo sa uložiť prílohu"
-
-#: ../e-util/e-book-source-config.c:98
+#: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "Označit ako predvolený adresár kontaktov"
 
-#: ../e-util/e-book-source-config.c:103
+#: ../e-util/e-book-source-config.c:102
 msgid "Autocomplete with this address book"
 msgstr "Automaticky doplňovať z tohto adresára kontaktov"
 
-#: ../e-util/e-book-source-config.c:277
+#: ../e-util/e-book-source-config.c:276
 msgid "Copy book content locally for offline operation"
-msgstr ""
-"Vytvoriť lokálnu kópiu obsahu adresára kontaktov pre prácu v odpojenom režime"
+msgstr "Vytvoriť lokálnu kópiu obsahu adresára kontaktov pre prácu v odpojenom režime"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../e-util/e-buffer-tagger.c:410
+#: ../e-util/e-buffer-tagger.c:407
 msgid "Ctrl-click to open a link"
 msgstr "Stlačením Ctrl a kliknutím otvoríte odkaz"
 
-#: ../e-util/e-cal-source-config.c:170
-msgid "Mark as default calendar"
-msgstr "Označit ako predvolený kalendár"
-
-#: ../e-util/e-cal-source-config.c:173
-msgid "Mark as default task list"
-msgstr "Označiť ako predvolený zoznam úloh"
-
-#: ../e-util/e-cal-source-config.c:176
-msgid "Mark as default memo list"
-msgstr "Označiť ako predvolený zoznam poznámok"
+#: ../e-util/e-calendar.c:195
+msgid "Previous month"
+msgstr "Predchádzajúci mesiac"
 
-#: ../e-util/e-cal-source-config.c:201
-msgid "Color:"
-msgstr "Farba:"
+#: ../e-util/e-calendar.c:220
+msgid "Next month"
+msgstr "Nasledujúci mesiac"
 
-#: ../e-util/e-cal-source-config.c:406
-msgid "Copy calendar contents locally for offline operation"
-msgstr "Kopírovať obsah kalendára lokálne pre prácu v odpojenom režime"
+#: ../e-util/e-calendar.c:246
+msgid "Previous year"
+msgstr "Predchádzajúci rok"
 
-#: ../e-util/e-cal-source-config.c:410
-msgid "Copy task list contents locally for offline operation"
-msgstr "Kopírovať obsah zoznamu úloh lokálne pre prácu v odpojenom režime"
+#: ../e-util/e-calendar.c:271
+msgid "Next year"
+msgstr "Nasledujúci rok"
 
-#: ../e-util/e-cal-source-config.c:414
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Kopírovať obsah zoznamu poznámok lokálne pre prácu v odpojenom režime"
+#: ../e-util/e-calendar.c:295
+msgid "Month Calendar"
+msgstr "Kalendár mesiaca"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
+#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1329
+#: ../e-util/e-calendar-item.c:1325
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
@@ -10482,98 +10019,110 @@ msgstr "%Y"
 #     $ date "+%B %Y"
 #     október 2011
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1366
+#: ../e-util/e-calendar-item.c:1362
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../e-util/e-calendar.c:190
-msgid "Previous month"
-msgstr "Predchádzajúci mesiac"
+#: ../e-util/e-cal-source-config.c:169
+msgid "Mark as default calendar"
+msgstr "Označit ako predvolený kalendár"
 
-#: ../e-util/e-calendar.c:215
-msgid "Next month"
-msgstr "Nasledujúci mesiac"
+#: ../e-util/e-cal-source-config.c:172
+msgid "Mark as default task list"
+msgstr "Označiť ako predvolený zoznam úloh"
 
-#: ../e-util/e-calendar.c:241
-msgid "Previous year"
-msgstr "Predchádzajúci rok"
+#: ../e-util/e-cal-source-config.c:175
+msgid "Mark as default memo list"
+msgstr "Označiť ako predvolený zoznam poznámok"
 
-#: ../e-util/e-calendar.c:266
-msgid "Next year"
-msgstr "Nasledujúci rok"
+#: ../e-util/e-cal-source-config.c:200
+msgid "Color:"
+msgstr "Farba:"
 
-#: ../e-util/e-calendar.c:290
-msgid "Month Calendar"
-msgstr "Kalendár mesiaca"
+#: ../e-util/e-cal-source-config.c:405
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Kopírovať obsah kalendára lokálne pre prácu v odpojenom režime"
+
+#: ../e-util/e-cal-source-config.c:409
+msgid "Copy task list contents locally for offline operation"
+msgstr "Kopírovať obsah zoznamu úloh lokálne pre prácu v odpojenom režime"
+
+#: ../e-util/e-cal-source-config.c:413
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Kopírovať obsah zoznamu poznámok lokálne pre prácu v odpojenom režime"
 
-#: ../e-util/e-categories-editor.c:224
+#: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "Aktuálne _použité kategórie:"
 
-#: ../e-util/e-categories-editor.c:235
+#: ../e-util/e-categories-editor.c:234
 msgid "_Available Categories:"
 msgstr "_Dostupné kategórie:"
 
-#: ../e-util/e-categories-selector.c:323
+#: ../e-util/e-categories-editor.c:274 ../plugins/mail-to-task/mail-to-task.c:595 
../shell/e-shell-window-actions.c:1099
+msgid "_New"
+msgstr "_Nový"
+
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../e-util/e-category-completion.c:300
+#: ../e-util/e-category-completion.c:307
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Vytvoriť kategóriu „%s“"
 
-#: ../e-util/e-category-editor.c:137
+#: ../e-util/e-category-editor.c:136
 msgid "Category Icon"
 msgstr "Ikona kategórie"
 
-#: ../e-util/e-category-editor.c:141
+#: ../e-util/e-category-editor.c:140
 msgid "_No Image"
 msgstr "_Bez obrázka"
 
-#: ../e-util/e-category-editor.c:178
+#: ../e-util/e-category-editor.c:173
 msgid "Category _Name"
 msgstr "_Názov kategórie"
 
-#: ../e-util/e-category-editor.c:190
+#: ../e-util/e-category-editor.c:185
 msgid "Category _Icon"
 msgstr "_Ikona kategórie"
 
-#: ../e-util/e-category-editor.c:216
+#: ../e-util/e-category-editor.c:211
 msgid "Category Properties"
 msgstr "Vlastnosti kategórie"
 
-#: ../e-util/e-category-editor.c:277
+#: ../e-util/e-category-editor.c:272
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
+msgid "There is already a category '%s' in the configuration. Please use another name"
 msgstr "V konfigurácii už existuje kategória „%s“. Použite iný názov, prosím"
 
-#: ../e-util/e-cell-combo.c:186
+#: ../e-util/e-cell-combo.c:185
 msgid "popup list"
 msgstr "vysúvací zoznam"
 
-#: ../e-util/e-cell-date-edit.c:299
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-date-edit.c:298
 msgid "Now"
 msgstr "Teraz"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
-#: ../modules/calendar/e-cal-shell-view-actions.c:1900
-#: ../modules/itip-formatter/itip-view.c:226
+#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208 
../modules/calendar/e-cal-shell-view-actions.c:1740 ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "Dnes"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:317
+#: ../e-util/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "Žiadny"
 
-#: ../e-util/e-cell-date-edit.c:325
+#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "Ok"
 
@@ -10582,166 +10131,340 @@ msgstr "Ok"
 msgid "The time must be in the format: %s"
 msgstr "Čas musí byť vo formáte: %s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1840
-msgid "?"
-msgstr "?"
-
-#: ../e-util/e-cell-percent.c:80
+#: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Percentuálna hodnota musí byť v rozsahu 0 až 100, vrátane"
 
-#: ../e-util/e-charset-combo-box.c:100
-msgid "Character Encoding"
-msgstr "Znaková sada"
-
-#: ../e-util/e-charset-combo-box.c:123
-msgid "Enter the character set to use"
-msgstr "Zadajte znakovú sadu, ktorú chcete použiť"
-
-#: ../e-util/e-charset-combo-box.c:342
-msgid "Other..."
-msgstr "Iné…"
-
 # znakova sada
-#: ../e-util/e-charset.c:53
+#: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Arabská"
 
-#: ../e-util/e-charset.c:54
+#: ../e-util/e-charset.c:53
 msgid "Baltic"
 msgstr "Pobaltská"
 
-#: ../e-util/e-charset.c:55
+#: ../e-util/e-charset.c:54
 msgid "Central European"
 msgstr "Stredoeurópska"
 
-#: ../e-util/e-charset.c:56
+#: ../e-util/e-charset.c:55
 msgid "Chinese"
 msgstr "Čínska"
 
-#: ../e-util/e-charset.c:57
+#: ../e-util/e-charset.c:56
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: ../e-util/e-charset.c:58
+#: ../e-util/e-charset.c:57
 msgid "Greek"
 msgstr "Grécka"
 
-#: ../e-util/e-charset.c:59
+#: ../e-util/e-charset.c:58
 msgid "Hebrew"
 msgstr "Hebrejská"
 
-#: ../e-util/e-charset.c:60
+#: ../e-util/e-charset.c:59
 msgid "Japanese"
 msgstr "Japonská"
 
-#: ../e-util/e-charset.c:61
+#: ../e-util/e-charset.c:60
 msgid "Korean"
 msgstr "Kórejská"
 
-#: ../e-util/e-charset.c:62
+#: ../e-util/e-charset.c:61
 msgid "Thai"
 msgstr "Thajská"
 
-#: ../e-util/e-charset.c:63
+#: ../e-util/e-charset.c:62
 msgid "Turkish"
 msgstr "Turecká"
 
-#: ../e-util/e-charset.c:64
+#: ../e-util/e-charset.c:63
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../e-util/e-charset.c:65
+#: ../e-util/e-charset.c:64
 msgid "Western European"
 msgstr "Západoeurópska"
 
-#: ../e-util/e-charset.c:66
+#: ../e-util/e-charset.c:65
 msgid "Western European, New"
 msgstr "Západoeurópska, nová"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
 msgid "Traditional"
 msgstr "Tradičná"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
-#: ../e-util/e-charset.c:97
+#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94 ../e-util/e-charset.c:96
 msgid "Simplified"
 msgstr "Zjednodušená"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:101
+#: ../e-util/e-charset.c:100
 msgid "Ukrainian"
 msgstr "Ukrajinská"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:105
+#: ../e-util/e-charset.c:104
 msgid "Visual"
 msgstr "Vizuálna"
 
-#: ../e-util/e-client-cache.c:1162
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "Znaková sada"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Zadajte znakovú sadu, ktorú chcete použiť"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Iné…"
+
+#: ../e-util/e-client-cache.c:1266
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Nedá sa vytvoriť objekt klienta z názvu rozšírenia „%s“"
 
-#: ../e-util/e-dateedit.c:524
+#: ../e-util/e-color-chooser-widget.c:124
+#, fuzzy
+#| msgid "Use custom fonts"
+msgid "Choose custom color"
+msgstr "Použiť vlastné písma"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:88
+msgid "very dark gray"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:90
+#, fuzzy
+#| msgid "Mark as _Unread"
+msgid "dark red"
+msgstr "Označiť ako _neprečítanú"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:99
+#, fuzzy
+#| msgid "3rd"
+msgid "red"
+msgstr "3."
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:108
+#, fuzzy
+#| msgid "Image"
+msgid "magenta"
+msgstr "Obrázok"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:114
+#, fuzzy
+#| msgid "_Required people"
+msgid "red purple"
+msgstr "_Vyžadované osoby"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+msgstr ""
+
+# * https://bugzilla.gnome.org/show_bug.cgi?id=641020
+#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134 
../mail/e-mail-config-security-page.c:426 ../mail/e-mail-config-security-page.c:566 
../mail/e-mail-reader.c:3857
+#: ../mail/mail-config.ui.h:68
+msgid "Default"
+msgstr "Predvolený"
+
+#: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Dátum a čas"
 
-#: ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:548
 msgid "Text entry to input date"
 msgstr "Textový vstup na zadanie dátumu"
 
-#: ../e-util/e-dateedit.c:572
+#: ../e-util/e-dateedit.c:571
 msgid "Click this button to show a calendar"
 msgstr "Kliknutím na toto tlačidlo zobrazíte kalendár"
 
 # description atk
-#: ../e-util/e-dateedit.c:626
+#: ../e-util/e-dateedit.c:625
 msgid "Drop-down combination box to select time"
 msgstr "Rozbaľovací zoznam na výber času"
 
-#: ../e-util/e-dateedit.c:627
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:626 ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Čas"
 
-#: ../e-util/e-dateedit.c:701
+#: ../e-util/e-dateedit.c:700
 msgid "No_w"
 msgstr "_Aktuálny"
 
-#: ../e-util/e-dateedit.c:708
+#: ../e-util/e-dateedit.c:707
 msgid "_Today"
 msgstr "_Dnešný"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:717
+#: ../e-util/e-dateedit.c:716
 msgid "_None"
 msgstr "Žiad_ny"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
+#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
 msgctxt "date"
 msgid "None"
 msgstr "Žiadny"
 
-#: ../e-util/e-dateedit.c:1953
+#: ../e-util/e-dateedit.c:1978
 msgid "Invalid Date Value"
 msgstr "Neplatná hodnota pre dátum"
 
-#: ../e-util/e-dateedit.c:1998
+#: ../e-util/e-dateedit.c:2023
 msgid "Invalid Time Value"
 msgstr "Neplatná hodnota pre čas"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:254
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
 msgid "Tomorrow"
 msgstr "Zajtra"
 
-#: ../e-util/e-datetime-format.c:222
+#: ../e-util/e-datetime-format.c:221
 msgid "Yesterday"
 msgstr "Včera"
 
@@ -10749,7 +10472,7 @@ msgstr "Včera"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:230
+#: ../e-util/e-datetime-format.c:229
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Nasledujúci pondelok"
@@ -10757,7 +10480,7 @@ msgstr "Nasledujúci pondelok"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:236
+#: ../e-util/e-datetime-format.c:235
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Nasledujúci utorok"
@@ -10765,7 +10488,7 @@ msgstr "Nasledujúci utorok"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:242
+#: ../e-util/e-datetime-format.c:241
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Nasledujúca streda"
@@ -10773,7 +10496,7 @@ msgstr "Nasledujúca streda"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:248
+#: ../e-util/e-datetime-format.c:247
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Nasledujúci štvrtok"
@@ -10781,7 +10504,7 @@ msgstr "Nasledujúci štvrtok"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:254
+#: ../e-util/e-datetime-format.c:253
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Nasledujúci piatok"
@@ -10790,7 +10513,7 @@ msgstr "Nasledujúci piatok"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:260
+#: ../e-util/e-datetime-format.c:259
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Nasledujúca sobota"
@@ -10799,40 +10522,150 @@ msgstr "Nasledujúca sobota"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:266
+#: ../e-util/e-datetime-format.c:265
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Nasledujúca nedeľa"
 
-#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
-#: ../e-util/e-datetime-format.c:372
+#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362 ../e-util/e-datetime-format.c:371
 msgid "Use locale default"
 msgstr "Použiť predvolené miestne nastavenia"
 
-#: ../e-util/e-datetime-format.c:577
+#: ../e-util/e-datetime-format.c:576
 msgid "Format:"
 msgstr "Formát:"
 
-#: ../e-util/e-file-utils.c:121
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:39
+msgid "_Smile"
+msgstr ""
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:41
+msgid "S_ad"
+msgstr ""
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:43
+#, fuzzy
+#| msgid "_Window"
+msgid "_Wink"
+msgstr "_Okno"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:45
+msgid "Ton_gue"
+msgstr ""
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:47
+msgid "Laug_h"
+msgstr ""
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:49
+#, fuzzy
+#| msgid "_Plain text"
+msgid "_Plain"
+msgstr "_Obyčajný text"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:51
+msgid "Smi_rk"
+msgstr ""
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:53
+msgid "_Embarrassed"
+msgstr ""
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:55
+msgid "_Big Smile"
+msgstr ""
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:57
+msgid "Uncer_tain"
+msgstr ""
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:59
+msgid "S_urprise"
+msgstr ""
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:61
+msgid "W_orried"
+msgstr ""
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:63
+msgid "_Kiss"
+msgstr ""
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:65
+msgid "A_ngry"
+msgstr ""
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:67
+msgid "_Cool"
+msgstr ""
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:69
+msgid "Ange_l"
+msgstr ""
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:71
+msgid "Cr_ying"
+msgstr ""
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:73
+msgid "S_ick"
+msgstr ""
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:75
+msgid "Tire_d"
+msgstr ""
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:77
+msgid "De_vilish"
+msgstr ""
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:79
+#, fuzzy
+#| msgid "_Mon"
+msgid "_Monkey"
+msgstr "_Po"
+
+#: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Neznámy názov súboru)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:125
+#: ../e-util/e-file-utils.c:124
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Zapisuje sa „%s“"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:130
+#: ../e-util/e-file-utils.c:129
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Zapisuje sa „%s“ na %s"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../e-util/e-filter-datespec.c:67
+#: ../e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10840,7 +10673,7 @@ msgstr[0] "Pred %d sekundami"
 msgstr[1] "Pred sekundou"
 msgstr[2] "Pred %d sekundami"
 
-#: ../e-util/e-filter-datespec.c:68
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -10848,7 +10681,7 @@ msgstr[0] "%d sekúnd v budúcnosti"
 msgstr[1] "1 sekunda v budúcnosti"
 msgstr[2] "%d sekundy v budúcnosti"
 
-#: ../e-util/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10856,7 +10689,7 @@ msgstr[0] "Pred %d minútami"
 msgstr[1] "Pred minútou"
 msgstr[2] "Pred %d minútami"
 
-#: ../e-util/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -10864,7 +10697,7 @@ msgstr[0] "%d minút v budúcnosti"
 msgstr[1] "1 minúta v budúcnosti"
 msgstr[2] "%d minúty v budúcnosti"
 
-#: ../e-util/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10872,7 +10705,7 @@ msgstr[0] "Pred %d hodinami"
 msgstr[1] "Pred hodinou"
 msgstr[2] "Pred %d hodinami"
 
-#: ../e-util/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -10880,7 +10713,7 @@ msgstr[0] "%d hodín v budúcnosti"
 msgstr[1] "1 hodina v budúcnosti"
 msgstr[2] "%d hodiny v budúcnosti"
 
-#: ../e-util/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10888,7 +10721,7 @@ msgstr[0] "Pred %d dňami"
 msgstr[1] "Včera"
 msgstr[2] "Pred %d dňami"
 
-#: ../e-util/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -10896,7 +10729,7 @@ msgstr[0] "%d dní v budúcnosti"
 msgstr[1] "Zajtra"
 msgstr[2] "%d dni v budúcnosti"
 
-#: ../e-util/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10904,7 +10737,7 @@ msgstr[0] "Pred %d týždňami"
 msgstr[1] "Pred týždňom"
 msgstr[2] "Pred %d týždňami"
 
-#: ../e-util/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -10912,7 +10745,7 @@ msgstr[0] "O %d týždňov"
 msgstr[1] "O týždeň"
 msgstr[2] "O %d týždne"
 
-#: ../e-util/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10920,7 +10753,7 @@ msgstr[0] "Pred %d mesiacmi"
 msgstr[1] "Pred mesiacom"
 msgstr[2] "Pred %d mesiacmi"
 
-#: ../e-util/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -10928,7 +10761,7 @@ msgstr[0] "O %d mesiacov"
 msgstr[1] "O mesiac"
 msgstr[2] "O %d mesiace"
 
-#: ../e-util/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10936,7 +10769,7 @@ msgstr[0] "Pred %d rokmi"
 msgstr[1] "Pred rokom"
 msgstr[2] "Pred %d rokmi"
 
-#: ../e-util/e-filter-datespec.c:80
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -10944,45 +10777,44 @@ msgstr[0] "O %d rokov"
 msgstr[1] "O rok"
 msgstr[2] "O %d roky"
 
-#: ../e-util/e-filter-datespec.c:130
+#: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<kliknutím vyberiete dátum>"
 
-#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
-#: ../e-util/e-filter-datespec.c:155
+#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143 ../e-util/e-filter-datespec.c:154
 msgid "now"
 msgstr "teraz"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../e-util/e-filter-datespec.c:140
+#: ../e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d.%m.%Y"
 
-#: ../e-util/e-filter-datespec.c:289
+#: ../e-util/e-filter-datespec.c:288
 msgid "Select a time to compare against"
 msgstr "Vyberte čas, s ktorým sa má porovnávať"
 
-#: ../e-util/e-filter-file.c:187
+#: ../e-util/e-filter-file.c:186
 msgid "Choose a File"
 msgstr "Zvoľte súbor"
 
-#: ../e-util/e-filter-rule.c:747
+#: ../e-util/e-filter-rule.c:751
 msgid "R_ule name:"
 msgstr "Názov prav_idla:"
 
-#: ../e-util/e-filter-rule.c:797
+#: ../e-util/e-filter-rule.c:801
 msgid "all the following conditions"
 msgstr "všetky nasledujúce požiadavky"
 
-#: ../e-util/e-filter-rule.c:798
+#: ../e-util/e-filter-rule.c:802
 msgid "any of the following conditions"
 msgstr "niektorú z nasledujúcich požiadaviek"
 
-#: ../e-util/e-filter-rule.c:804
+#: ../e-util/e-filter-rule.c:808
 msgid "_Find items which match:"
 msgstr "_Nájsť položky, ktoré spĺňajú:"
 
-#: ../e-util/e-filter-rule.c:827
+#: ../e-util/e-filter-rule.c:831
 msgid "Find items that meet the following conditions"
 msgstr "Nájsť položky, ktoré spĺňajú nasledujúce požiadavky"
 
@@ -10993,58 +10825,1205 @@ msgstr "Nájsť položky, ktoré spĺňajú nasledujúce požiadavky"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:842 ../e-util/e-mail-identity-combo-box.c:474
-#: ../e-util/e-mail-signature-combo-box.c:369 ../e-util/e-proxy-editor.c:550
-#: ../libemail-engine/camel-null-store.c:28
-#: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:60 
../e-util/e-mail-identity-combo-box.c:472 ../e-util/e-mail-signature-combo-box.c:367 
../e-util/e-proxy-editor.c:560
+#: ../libemail-engine/camel-null-store.c:27 ../mail/e-mail-config-summary-page.c:138 
../modules/book-config-ldap/evolution-book-config-ldap.c:616
 msgid "None"
 msgstr "Žiadne"
 
 # je to za zahrnúť vlákna:
-#: ../e-util/e-filter-rule.c:843
+#: ../e-util/e-filter-rule.c:847
 msgid "All related"
 msgstr "Všetky súvisiace"
 
 # je to za zahrnúť vlákna
-#: ../e-util/e-filter-rule.c:845
+#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Odpovede"
+
+# je to za zahrnúť vlákna
+#: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
 msgstr "Odpovede a rodičia"
 
 # je to za zahrnúť vlákna
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:850
 msgid "No reply or parent"
 msgstr "Žiadna odpoveď alebo rodič"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:853
 msgid "I_nclude threads:"
 msgstr "_Zahrnúť vlákna:"
 
-#: ../e-util/e-filter-rule.c:926
+#: ../e-util/e-filter-rule.c:930
 msgid "A_dd Condition"
 msgstr "Pri_dať podmienku"
 
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:232
+#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1 ../mail/em-utils.c:229
+msgid "Incoming"
+msgstr "Prijatá"
+
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "Odchádzajúca"
 
-#: ../e-util/e-import-assistant.c:256
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
+#: ../e-util/e-html-editor-actions.c:57
+#, fuzzy
+#| msgid "Failed to open folder."
+msgid "Failed to insert HTML file."
+msgstr "Zlyhalo otvorenie priečinka."
+
+#: ../e-util/e-html-editor-actions.c:94
+#, fuzzy
+#| msgid "Failed to import certificate"
+msgid "Failed to insert text file."
+msgstr "Zlyhal import certifikátu"
+
+#: ../e-util/e-html-editor-actions.c:478
+msgid "Insert HTML File"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:484
+#, fuzzy
+#| msgid "HTML _Mode"
+msgid "HTML file"
+msgstr "_Režim HTML"
+
+#: ../e-util/e-html-editor-actions.c:511 ../e-util/e-html-editor-actions.c:1292
+#, fuzzy
+#| msgid "Inline Image"
+msgid "Insert Image"
+msgstr "Vložený obrázok"
+
+#: ../e-util/e-html-editor-actions.c:571
+#, fuzzy
+#| msgid "Increase the text size"
+msgid "Insert text file"
+msgstr "Zväčší veľkosť písma"
+
+#: ../e-util/e-html-editor-actions.c:577
+#, fuzzy
+#| msgid "Select a file"
+msgid "Text file"
+msgstr "Vybrať súbor"
+
+#: ../e-util/e-html-editor-actions.c:961
+#, fuzzy
+#| msgid "Copy selected events to the clipboard"
+msgid "Copy selected text to the clipboard"
+msgstr "Kopíruje vybrané udalosti do schránky"
+
+#: ../e-util/e-html-editor-actions.c:968
+#, fuzzy
+#| msgid "Cut selected events to the clipboard"
+msgid "Cut selected text to the clipboard"
+msgstr "Vystrihne vybrané udalosti do schránky"
+
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:975
+#, fuzzy
+#| msgid "Paste events from the clipboard"
+msgid "Paste text from the clipboard"
+msgstr "Vloží udalosti zo schránky"
+
+#: ../e-util/e-html-editor-actions.c:982
+msgid "Redo the last undone action"
+msgstr ""
+
+# tooltip
+#: ../e-util/e-html-editor-actions.c:996
+#, fuzzy
+#| msgid "Copy the selection"
+msgid "Undo the last action"
+msgstr "Skopíruje výber"
+
+#: ../e-util/e-html-editor-actions.c:1017
+msgid "For_mat"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1024
+#, fuzzy
+#| msgid "Tool_bar Style"
+msgid "_Paragraph Style"
+msgstr "Štýl _lišty nástrojov"
+
+#: ../e-util/e-html-editor-actions.c:1038 ../e-util/e-html-editor-image-dialog.c:591
+#, fuzzy
+#| msgid "A_lignment"
+msgid "_Alignment"
+msgstr "Za_rovnanie"
+
+#: ../e-util/e-html-editor-actions.c:1045
+msgid "Current _Languages"
+msgstr "Aktuálne _jazyky"
+
+#: ../e-util/e-html-editor-actions.c:1062
+msgid "_Increase Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1064
+msgid "Increase Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1069
+msgid "_HTML File..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1076
+msgid "Te_xt File..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1083
+msgid "Paste _Quotation"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1090
+#, fuzzy
+#| msgid "_Find in Memo..."
+msgid "_Find..."
+msgstr "_Nájsť v poznámke…"
+
+#: ../e-util/e-html-editor-actions.c:1092
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Search for the Contact."
+msgid "Search for text"
+msgstr ""
+"\n"
+"\n"
+"Vyhľadať kontakt."
+
+#: ../e-util/e-html-editor-actions.c:1097
+msgid "Find A_gain"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1104
+#, fuzzy
+#| msgid "_Replace"
+msgid "Re_place..."
+msgstr "_Nahradiť"
+
+#: ../e-util/e-html-editor-actions.c:1106
+#, fuzzy
+#| msgid "Search for text in the displayed contact"
+msgid "Search for and replace text"
+msgstr "Vyhľadá v texte zobrazeného kontaktu"
+
+#: ../e-util/e-html-editor-actions.c:1111
+#, fuzzy
+#| msgid "Canceling..."
+msgid "Check _Spelling..."
+msgstr "Ruší sa…"
+
+#: ../e-util/e-html-editor-actions.c:1118
+msgid "_Decrease Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1120
+msgid "Decrease Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1125
+msgid "_Wrap Lines"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1132
+msgid "Open Inspector"
+msgstr ""
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1142 ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1144
+#, fuzzy
+#| msgid "A_lignment"
+msgid "Center Alignment"
+msgstr "Za_rovnanie"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1149 ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1151
+#, fuzzy
+#| msgid "A_lignment"
+msgid "Left Alignment"
+msgstr "Za_rovnanie"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1156 ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1158
+#, fuzzy
+#| msgid "A_lignment"
+msgid "Right Alignment"
+msgstr "Za_rovnanie"
+
+#: ../e-util/e-html-editor-actions.c:1166 ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1168
+msgid "HTML editing mode"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1173
+#, fuzzy
+#| msgid "Plain Text"
+msgid "Plain _Text"
+msgstr "Obyčajný text"
+
+#: ../e-util/e-html-editor-actions.c:1175
+#, fuzzy
+#| msgid "Plain Text Mode"
+msgid "Plain text editing mode"
+msgstr "Režim obyčajného textu"
+
+#: ../e-util/e-html-editor-actions.c:1183
+#, fuzzy
+#| msgid "Normal"
+msgid "_Normal"
+msgstr "Normálna"
+
+#: ../e-util/e-html-editor-actions.c:1190
+msgid "Header _1"
+msgstr "Hlavička _1"
+
+#: ../e-util/e-html-editor-actions.c:1197
+msgid "Header _2"
+msgstr "Hlavička _2"
+
+#: ../e-util/e-html-editor-actions.c:1204
+msgid "Header _3"
+msgstr "Hlavička _3"
+
+#: ../e-util/e-html-editor-actions.c:1211
+msgid "Header _4"
+msgstr "Hlavička _4"
+
+#: ../e-util/e-html-editor-actions.c:1218
+msgid "Header _5"
+msgstr "Hlavička _5"
+
+#: ../e-util/e-html-editor-actions.c:1225
+msgid "Header _6"
+msgstr "Hlavička _6"
+
+#: ../e-util/e-html-editor-actions.c:1232
+msgid "_Preformatted"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1239
+#, fuzzy
+#| msgid "Address"
+msgid "A_ddress"
+msgstr "Adresa"
+
+#: ../e-util/e-html-editor-actions.c:1246
+msgid "_Blockquote"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1253
+#, fuzzy
+#| msgid "D_elete Memo List"
+msgid "_Bulleted List"
+msgstr "O_dstrániť zoznam poznámok"
+
+#: ../e-util/e-html-editor-actions.c:1260
+msgid "_Roman Numeral List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1267
+msgid "Numbered _List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1274
+msgid "_Alphabetical List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1290 ../e-util/e-html-editor-actions.c:1327
+#, fuzzy
+#| msgid "Save _Image..."
+msgid "_Image..."
+msgstr "Uložiť _obrázok…"
+
+#: ../e-util/e-html-editor-actions.c:1297 ../e-util/e-html-editor-actions.c:1334
+msgid "_Link..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1299
+#, fuzzy
+#| msgid "_Insert"
+msgid "Insert Link"
+msgstr "_Vložiť"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1305 ../e-util/e-html-editor-actions.c:1349
+#, fuzzy
+#| msgid "_Rename..."
+msgid "_Rule..."
+msgstr "P_remenovať…"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1308
+#, fuzzy
+#| msgid "_Insert"
+msgid "Insert Rule"
+msgstr "_Vložiť"
+
+#: ../e-util/e-html-editor-actions.c:1313 ../e-util/e-html-editor-actions.c:1356
+#, fuzzy
+#| msgid "_Rename..."
+msgid "_Table..."
+msgstr "P_remenovať…"
+
+#: ../e-util/e-html-editor-actions.c:1315
+#, fuzzy
+#| msgid "_Insert"
+msgid "Insert Table"
+msgstr "_Vložiť"
+
+#: ../e-util/e-html-editor-actions.c:1320
+msgid "_Cell..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1341
+#, fuzzy
+#| msgid "Save _Image..."
+msgid "Pa_ge..."
+msgstr "Uložiť _obrázok…"
+
+#: ../e-util/e-html-editor-actions.c:1365
+msgid "Font _Size"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1372
+#, fuzzy
+#| msgid "_Forward style:"
+msgid "_Font Style"
+msgstr "Štýl _posielania ďalej:"
+
+#: ../e-util/e-html-editor-actions.c:1379
+msgid "Paste As _Text"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1390 ../e-util/e-html-editor-text-dialog.c:214
+msgid "_Bold"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1392
+msgid "Bold"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1398 ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1400
+msgid "Italic"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1406
+#, fuzzy
+#| msgid "Plain Text"
+msgid "_Plain Text"
+msgstr "Obyčajný text"
+
+#: ../e-util/e-html-editor-actions.c:1414 ../e-util/e-html-editor-text-dialog.c:246
+msgid "_Strikethrough"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1416
+msgid "Strikethrough"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1422 ../e-util/e-html-editor-text-dialog.c:236
+#, fuzzy
+#| msgid "Undefined"
+msgid "_Underline"
+msgstr "Nedefinovaná"
+
+#: ../e-util/e-html-editor-actions.c:1424
+#, fuzzy
+#| msgid "Undefined"
+msgid "Underline"
+msgstr "Nedefinovaná"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1434
+msgid "-2"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1442
+msgid "-1"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1450
+msgid "+0"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1458
+msgid "+1"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1466
+msgid "+2"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1474
+msgid "+3"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1482
+msgid "+4"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1501
+#, fuzzy
+#| msgid "_Contents"
+msgid "Cell Contents"
+msgstr "Ob_sah"
+
+#: ../e-util/e-html-editor-actions.c:1508
+#, fuzzy
+#| msgid "Add a Column"
+msgid "Column"
+msgstr "Pridať stĺpec"
+
+#: ../e-util/e-html-editor-actions.c:1515
+#, fuzzy
+#| msgid "Low"
+msgid "Row"
+msgstr "Nízka"
+
+#: ../e-util/e-html-editor-actions.c:1522 ../e-util/e-html-editor-actions.c:1607
+#, fuzzy
+#| msgid "Table Cell"
+msgid "Table"
+msgstr "Bunka tabuľky"
+
+#. Translators: Popup menu item caption, containing all the Delete options for a table
+#: ../e-util/e-html-editor-actions.c:1532
+#, fuzzy
+#| msgid "Table Cell"
+msgid "Table Delete"
+msgstr "Bunka tabuľky"
+
+#: ../e-util/e-html-editor-actions.c:1539 ../e-util/e-text.c:2127
+msgid "Input Methods"
+msgstr "Metódy vstupu"
+
+#. Translators: Popup menu item caption, containing all the Insert options for a table
+#: ../e-util/e-html-editor-actions.c:1547
+#, fuzzy
+#| msgid "Table Cell"
+msgid "Table Insert"
+msgstr "Bunka tabuľky"
+
+#: ../e-util/e-html-editor-actions.c:1554
+#, fuzzy
+#| msgid "_Properties"
+msgid "Properties"
+msgstr "V_lastnosti"
+
+#: ../e-util/e-html-editor-actions.c:1572
+msgid "Column After"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1579
+msgid "Column Before"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1586
+#, fuzzy
+#| msgid "_Insert"
+msgid "Insert _Link"
+msgstr "_Vložiť"
+
+#: ../e-util/e-html-editor-actions.c:1593
+msgid "Row Above"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1600
+msgid "Row Below"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1614
+msgid "Cell..."
 msgstr ""
-"Zvoľte súbor, ktorý chcete importovať do Evolution a vyberte jeho typ zo "
-"zoznamu."
 
-#: ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-actions.c:1621
+#, fuzzy
+#| msgid "Image"
+msgid "Image..."
+msgstr "Obrázok"
+
+#: ../e-util/e-html-editor-actions.c:1628
+msgid "Link..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1635
+#, fuzzy
+#| msgid "Pager"
+msgid "Page..."
+msgstr "Pager"
+
+#: ../e-util/e-html-editor-actions.c:1642
+msgid "Paragraph..."
+msgstr ""
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1650
+#, fuzzy
+#| msgid "Full _Name..."
+msgid "Rule..."
+msgstr "_Celé meno…"
+
+#: ../e-util/e-html-editor-actions.c:1657
+msgid "Table..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1664
+#, fuzzy
+#| msgid "Select..."
+msgid "Text..."
+msgstr "Vybrať…"
+
+#: ../e-util/e-html-editor-actions.c:1671
+#, fuzzy
+#| msgid "_Remove"
+msgid "Remove Link"
+msgstr "O_dstrániť"
+
+#: ../e-util/e-html-editor-actions.c:1688
+#, fuzzy
+#| msgid "Add \"%s\" to Dictionary"
+msgid "Add Word to Dictionary"
+msgstr "Pridať „%s“ do slovníka"
+
+#: ../e-util/e-html-editor-actions.c:1695
+#, fuzzy
+#| msgid "Color for _misspelled words:"
+msgid "Ignore Misspelled Word"
+msgstr "Farba pre ne_správne slová:"
+
+#: ../e-util/e-html-editor-actions.c:1702
+msgid "Add Word To"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1711
+#, fuzzy
+#| msgid "(no suggestions)"
+msgid "More Suggestions"
+msgstr "(žiadne návrhy)"
+
+#. Translators: %s will be replaced with the actual dictionary
+#. * name, where a user can add a word to. This is part of an
+#. * "Add Word To" submenu.
+#: ../e-util/e-html-editor-actions.c:1819
+#, fuzzy, c-format
+#| msgid "Add \"%s\" to Dictionary"
+msgid "%s Dictionary"
+msgstr "Pridať „%s“ do slovníka"
+
+#: ../e-util/e-html-editor-actions.c:1906
+msgid "_Emoticon"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1907
+#, fuzzy
+#| msgid "Restart Evolution"
+msgid "Insert Emoticon"
+msgstr "Reštartovať Evolution"
+
+#: ../e-util/e-html-editor-actions.c:1975
+#, fuzzy
+#| msgid "_Replace"
+msgid "Re_place"
+msgstr "_Nahradiť"
+
+#: ../e-util/e-html-editor-actions.c:1978
+#, fuzzy
+#| msgid "Image"
+msgid "_Image"
+msgstr "Obrázok"
+
+#: ../e-util/e-html-editor-actions.c:1981
+msgid "_Link"
+msgstr ""
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1985
+#, fuzzy
+#| msgid "Add Rule"
+msgid "_Rule"
+msgstr "Pridať pravidlo"
+
+#: ../e-util/e-html-editor-actions.c:1988 ../e-util/e-html-editor-cell-dialog.c:658
+#, fuzzy
+#| msgid "E_nable"
+msgid "_Table"
+msgstr "_Povoliť"
+
+#: ../e-util/e-html-editor.c:669
+msgid "Paragraph Style"
+msgstr ""
+
+#: ../e-util/e-html-editor.c:683
+#, fuzzy
+#| msgid "Edit Reminder"
+msgid "Editing Mode"
+msgstr "Upraviť pripomenutie"
+
+#: ../e-util/e-html-editor.c:695
+#, fuzzy
+#| msgid "Unset Color"
+msgid "Font Color"
+msgstr "Zrušiť nastavenie farby"
+
+#: ../e-util/e-html-editor.c:713
+#, fuzzy
+#| msgid "Size"
+msgid "Font Size"
+msgstr "Veľkosť"
+
+#: ../e-util/e-html-editor-cell-dialog.c:618
+msgid "<b>Scope</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:632
+msgid "C_ell"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:645
+msgid "_Row"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:671
+msgid "Col_umn"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:681
+msgid "<b>Alignment &amp; Behavior</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:694 ../e-util/e-html-editor-hrule-dialog.c:384 
../e-util/e-html-editor-table-dialog.c:819
+msgid "Left"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:695 ../e-util/e-html-editor-hrule-dialog.c:386 
../e-util/e-html-editor-table-dialog.c:820
+msgid "Center"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:696 ../e-util/e-html-editor-hrule-dialog.c:388 
../e-util/e-html-editor-table-dialog.c:821
+msgid "Right"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:704
+msgid "_Horizontal:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:712 ../e-util/e-html-editor-image-dialog.c:581
+#, fuzzy
+#| msgid "To"
+msgid "Top"
+msgstr "Komu"
+
+#: ../e-util/e-html-editor-cell-dialog.c:713 ../e-util/e-html-editor-image-dialog.c:582
+#, fuzzy
+#| msgid "_Middle:"
+msgid "Middle"
+msgstr "_Stredné:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:714 ../e-util/e-html-editor-image-dialog.c:583
+msgid "Bottom"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:722
+#, fuzzy
+#| msgid "_Vertical View"
+msgid "_Vertical:"
+msgstr "_Vertikálne zobrazenie"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:728
+#, fuzzy
+#| msgid "Plain Text"
+msgid "_Wrap Text"
+msgstr "Obyčajný text"
+
+# title of column
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:736
+msgid "_Header Style"
+msgstr "Štýl _hlavičky"
+
+#: ../e-util/e-html-editor-cell-dialog.c:750 ../e-util/e-html-editor-image-dialog.c:521 
../e-util/e-html-editor-table-dialog.c:731
+msgid "<b>Layout</b>"
+msgstr ""
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:761
+msgid "_Width"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:800
+msgid "Row S_pan:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:814
+msgid "Co_lumn Span:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:821 ../e-util/e-html-editor-table-dialog.c:835
+msgid "<b>Background</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:834 ../e-util/e-html-editor-table-dialog.c:848
+msgid "Transparent"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:842
+msgid "C_olor:"
+msgstr "_Farba:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:850 ../e-util/e-html-editor-image-dialog.c:483 
../e-util/e-html-editor-table-dialog.c:864
+#, fuzzy
+#| msgid "Could not set as background"
+msgid "Choose Background Image"
+msgstr "Nepodarilo sa nastaviť ako pozadie"
+
+#: ../e-util/e-html-editor-cell-dialog.c:855 ../e-util/e-html-editor-image-dialog.c:489 
../e-util/e-html-editor-table-dialog.c:869
+#, fuzzy
+#| msgid "Image"
+msgid "Images"
+msgstr "Obrázok"
+
+#: ../e-util/e-html-editor-cell-dialog.c:868
+#, fuzzy
+#| msgid "Image"
+msgid "_Image:"
+msgstr "Obrázok"
+
+#: ../e-util/e-html-editor-cell-dialog.c:875 ../e-util/e-html-editor-page-dialog.c:516 
../e-util/e-html-editor-table-dialog.c:889
+#, fuzzy
+#| msgid "_No image"
+msgid "_Remove image"
+msgstr "_Bez obrázka"
+
+#: ../e-util/e-html-editor-cell-dialog.c:895
+#, fuzzy
+#| msgid "_Properties"
+msgid "Cell Properties"
+msgstr "V_lastnosti"
+
+#: ../e-util/e-html-editor-find-dialog.c:105 ../e-util/e-html-editor-replace-dialog.c:90 
../e-util/e-html-editor-replace-dialog.c:108
+msgid "No match found"
+msgstr ""
+
+#: ../e-util/e-html-editor-find-dialog.c:160 ../e-util/e-html-editor-replace-dialog.c:229
+#, fuzzy
+#| msgid "Search _Folders"
+msgid "Search _backwards"
+msgstr "Vyhľadávacie _priečinky"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+msgid "Case _Sensitive"
+msgstr ""
+
+#: ../e-util/e-html-editor-find-dialog.c:174
+#, fuzzy
+#| msgid "_Search"
+msgid "_Wrap Search"
+msgstr "_Nájsť"
+
+#: ../e-util/e-html-editor-find-dialog.c:213
+#, fuzzy
+#| msgid "_Find Now"
+msgid "Find"
+msgstr "_Nájsť teraz"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:319
+msgid "<b>Size</b>"
+msgstr ""
+
+#. Width
+#: ../e-util/e-html-editor-hrule-dialog.c:339 ../e-util/e-html-editor-image-dialog.c:539 
../e-util/e-html-editor-table-dialog.c:742
+msgid "_Width:"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:364
+#, fuzzy
+#| msgid "Size"
+msgid "_Size:"
+msgstr "Veľkosť"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:371
+msgid "<b>Style</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:396 ../e-util/e-html-editor-table-dialog.c:828
+#, fuzzy
+#| msgid "A_lignment"
+msgid "_Alignment:"
+msgstr "Za_rovnanie"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:402
+msgid "S_haded"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:419
+#, fuzzy
+#| msgid "Folder Properties"
+msgid "Rule properties"
+msgstr "Vlastnosti priečinka"
+
+#: ../e-util/e-html-editor-image-dialog.c:471 ../e-util/e-html-editor-paragraph-dialog.c:66 
../e-util/e-html-editor-table-dialog.c:685
+#, fuzzy
+#| msgid "General"
+msgid "<b>General</b>"
+msgstr "Všeobecné"
+
+#: ../e-util/e-html-editor-image-dialog.c:500
+#, fuzzy
+#| msgid "Source"
+msgid "_Source:"
+msgstr "Zdroj"
+
+#: ../e-util/e-html-editor-image-dialog.c:563
+msgid "_Height:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:604
+msgid "_X-Padding:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:620
+msgid "_Y-Padding:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:636 ../e-util/e-html-editor-table-dialog.c:809
+msgid "_Border:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:646
+msgid "<b>Link</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:664 ../e-util/e-html-editor-link-dialog.c:334
+#, fuzzy
+#| msgid "URL:"
+msgid "_URL:"
+msgstr "URL:"
+
+#: ../e-util/e-html-editor-image-dialog.c:669 ../e-util/e-html-editor-link-dialog.c:339
+msgid "_Test URL..."
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:686
+#, fuzzy
+#| msgid "Category Properties"
+msgid "Image Properties"
+msgstr "Vlastnosti kategórie"
+
+#: ../e-util/e-html-editor-link-dialog.c:363
+#, fuzzy
+#| msgid "_Remove"
+msgid "_Remove Link"
+msgstr "O_dstrániť"
+
+#: ../e-util/e-html-editor-link-dialog.c:388
+#, fuzzy
+#| msgid "_Properties"
+msgid "Link Properties"
+msgstr "V_lastnosti"
+
+#: ../e-util/e-html-editor-page-dialog.c:69
+msgid "Perforated Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:78
+msgid "Blue Ink"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:87
+msgid "Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:96
+msgid "Ribbon"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:105
+msgid "Midnight"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:36 ../mail/searchtypes.xml.in.h:39 
../mail/vfoldertypes.xml.in.h:39
+msgid "Draft"
+msgstr "Koncept"
+
+#: ../e-util/e-html-editor-page-dialog.c:132
+msgid "Graph Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:415
+msgid "<b>Colors</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:434
+#, fuzzy
+#| msgid "_Text Only"
+msgid "_Text:"
+msgstr "Len _text"
+
+#: ../e-util/e-html-editor-page-dialog.c:449
+msgid "_Link:"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:464
+#, fuzzy
+#| msgid "Set as _Background"
+msgid "_Background:"
+msgstr "Nastaviť ako _pozadie"
+
+#: ../e-util/e-html-editor-page-dialog.c:472
+msgid "<b>Background Image</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:494
+#, fuzzy
+#| msgid "Template:"
+msgid "_Template:"
+msgstr "Šablóna:"
+
+#: ../e-util/e-html-editor-page-dialog.c:502 ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "Vybrať súbor"
 
+# vlastné usporiadanie
+#: ../e-util/e-html-editor-page-dialog.c:509
+#, fuzzy
+#| msgid "_Custom"
+msgid "_Custom:"
+msgstr "_Vlastné"
+
+#: ../e-util/e-html-editor-page-dialog.c:536
+#, fuzzy
+#| msgid "_Properties"
+msgid "Page Properties"
+msgstr "V_lastnosti"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+#, fuzzy
+#| msgid "_Reply style:"
+msgid "_Style:"
+msgstr "Š_týl odpovede:"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+#, fuzzy
+#| msgid "A_lignment"
+msgid "<b>Alignment</b>"
+msgstr "Za_rovnanie"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+#, fuzzy
+#| msgid "Category Properties"
+msgid "Paragraph Properties"
+msgstr "Vlastnosti kategórie"
+
+# * https://bugzilla.gnome.org/show_bug.cgi?id=641020
+#: ../e-util/e-html-editor-replace-dialog.c:148
+#, fuzzy, c-format
+#| msgid "occurrences"
+msgid "%d occurences replaced"
+msgstr "výskytov"
+
+#: ../e-util/e-html-editor-replace-dialog.c:209
+#, fuzzy
+#| msgid "_Replace"
+msgid "R_eplace:"
+msgstr "_Nahradiť"
+
+#: ../e-util/e-html-editor-replace-dialog.c:221
+msgid "_With:"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:233
+msgid "_Case sensitive"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:237
+#, fuzzy
+#| msgid "_Search"
+msgid "Wra_p search"
+msgstr "_Nájsť"
+
+#: ../e-util/e-html-editor-replace-dialog.c:247
+msgid "_Skip"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:255 ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Nahradiť"
+
+#: ../e-util/e-html-editor-replace-dialog.c:263
+#, fuzzy
+#| msgid "Reply to _All"
+msgid "Replace _All"
+msgstr "Odpovedať _všetkým"
+
+#. Replace
+#: ../e-util/e-html-editor-replace-dialog.c:283 ../e-util/e-html-editor-spell-check-dialog.c:536
+#, fuzzy
+#| msgid "_Replace"
+msgid "Replace"
+msgstr "_Nahradiť"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:501
+msgid "<b>Suggestions</b>"
+msgstr ""
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:545
+#, fuzzy
+#| msgid "_Replace"
+msgid "Replace All"
+msgstr "_Nahradiť"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:554 ../mail/mail.error.xml.h:109
+msgid "Ignore"
+msgstr "Ignorovať"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:563
+msgid "Skip"
+msgstr ""
+
+# tooltip
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:572
+#, fuzzy
+#| msgid "Go Back"
+msgid "Back"
+msgstr "Prejde dozadu"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:581
+msgid "<b>Dictionary</b>"
+msgstr ""
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:601
+#, fuzzy
+#| msgid "Add Folder"
+msgid "Add word"
+msgstr "Pridať priečinok"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:618 ../mail/mail-config.ui.h:36
+msgid "Spell Checking"
+msgstr "Kontrola pravopisu"
+
+#: ../e-util/e-html-editor-table-dialog.c:707
+msgid "_Rows:"
+msgstr ""
+
+#: ../e-util/e-html-editor-table-dialog.c:724
+#, fuzzy
+#| msgid "_Table column:"
+msgid "C_olumns:"
+msgstr "Stĺpec _tabuľky:"
+
+#: ../e-util/e-html-editor-table-dialog.c:775
+msgid "_Spacing:"
+msgstr ""
+
+#: ../e-util/e-html-editor-table-dialog.c:792
+#, fuzzy
+#| msgid "Loading"
+msgid "_Padding:"
+msgstr "Načítava sa"
+
+#: ../e-util/e-html-editor-table-dialog.c:856 ../e-util/e-html-editor-text-dialog.c:261
+msgid "_Color:"
+msgstr "F_arba:"
+
+#: ../e-util/e-html-editor-table-dialog.c:882
+#, fuzzy
+#| msgid "Image"
+msgid "Image:"
+msgstr "Obrázok"
+
+#: ../e-util/e-html-editor-table-dialog.c:909
+#, fuzzy
+#| msgid "Calendar Properties"
+msgid "Table Properties"
+msgstr "Vlastnosti kalendára"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+msgid "Si_ze:"
+msgstr ""
+
+#: ../e-util/e-html-editor-text-dialog.c:296
+#, fuzzy
+#| msgid "_Properties"
+msgid "Text Properties"
+msgstr "V_lastnosti"
+
+#: ../e-util/e-html-editor-view.c:3354
+#, fuzzy
+#| msgid "Calendar Properties"
+msgid "Changed property"
+msgstr "Vlastnosti kalendára"
+
+#: ../e-util/e-html-editor-view.c:3355
+#, fuzzy
+#| msgid "Whether to emit a beep."
+msgid "Whether editor changed"
+msgstr "Určuje, či sa má pípnuť."
+
+#: ../e-util/e-html-editor-view.c:7130
+msgid "Turning HTML mode off will cause the text to lose all formatting. Do you want to continue?"
+msgstr ""
+
+#: ../e-util/e-html-editor-view.c:7134
+#, fuzzy
+#| msgid "Address formatting"
+msgid "_Don't lose formatting"
+msgstr "Formátovanie adresy"
+
+#: ../e-util/e-html-editor-view.c:7135
+#, fuzzy
+#| msgid "Address formatting"
+msgid "_Lose formatting"
+msgstr "Formátovanie adresy"
+
+#: ../e-util/e-import-assistant.c:256
+msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the 
list."
+msgstr "Zvoľte súbor, ktorý chcete importovať do Evolution a vyberte jeho typ zo zoznamu."
+
 #: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "_Typ súboru:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
 msgid "Choose the destination for this import"
 msgstr "Vyberte cieľ pre tento import"
 
@@ -11060,23 +12039,17 @@ msgstr "Importovať údaje a nastavenia zo _starších programov"
 msgid "Import a _single file"
 msgstr "Importovať _jeden súbor"
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+#: ../e-util/e-import-assistant.c:403 ../modules/startup-wizard/e-mail-config-import-page.c:200
 msgid "Please select the information that you would like to import:"
 msgstr "Prosím, vyberte informácie, ktoré chcete importovať:"
 
 #: ../e-util/e-import-assistant.c:533
-msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, 
iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
 msgstr ""
-"Evolution skontroloval možnosť importu nastavení z týchto aplikácií: Pine, "
-"Netscape, Elm, iCalendar. Nebolo nájdené žiadne nastavenie, ktoré by bolo "
-"možné importovať. Ak to chcete skúsiť znovu, stlačte „Späť“."
+"Evolution skontroloval možnosť importu nastavení z týchto aplikácií: Pine, Netscape, Elm, iCalendar. Nebolo 
nájdené žiadne nastavenie, ktoré by bolo možné importovať. Ak to chcete skúsiť znovu, stlačte "
+"„Späť“."
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#: ../e-util/e-import-assistant.c:559 ../modules/startup-wizard/e-mail-config-import-page.c:229
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
@@ -11086,78 +12059,74 @@ msgstr "Od %s:"
 msgid "_Cancel Import"
 msgstr "_Zrušiť importovanie"
 
-#: ../e-util/e-import-assistant.c:920
+#: ../e-util/e-import-assistant.c:916
 msgid "Preview data to be imported"
 msgstr "Náhľad správy, ktorú importovať"
 
-#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
-#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
-#: ../e-util/e-import-assistant.c:1377
+#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935 ../e-util/e-import-assistant.c:1288 
../e-util/e-import-assistant.c:1364 ../e-util/e-import-assistant.c:1373
 msgid "Import Data"
 msgstr "Importovať údaje"
 
-#: ../e-util/e-import-assistant.c:934
+#: ../e-util/e-import-assistant.c:930
 msgid "Select what type of file you want to import from the list."
 msgstr "Vyberte zo zoznamu, ktorý typ súboru chcete importovať."
 
-#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
+#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
 msgid "Evolution Import Assistant"
 msgstr "Asistent importu pre Evolution"
 
-#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
 msgid "Import Location"
 msgstr "Umiestnenie importu"
 
-#: ../e-util/e-import-assistant.c:1310
+#: ../e-util/e-import-assistant.c:1306
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
+"With this assistant you will be guided through the process of importing external files into Evolution."
 msgstr ""
 "Vitajte v sprievodcovi pre import do programu Evolution.\n"
-"Tento sprievodca vás prevedie celým procesom importovania externých súborov "
-"do programu Evolution."
+"Tento sprievodca vás prevedie celým procesom importovania externých súborov do programu Evolution."
 
-#: ../e-util/e-import-assistant.c:1327
+#: ../e-util/e-import-assistant.c:1323
 msgid "Importer Type"
 msgstr "Typ nástroja na import"
 
-#: ../e-util/e-import-assistant.c:1337
+#: ../e-util/e-import-assistant.c:1333
 msgid "Select Information to Import"
 msgstr "Vybrať informácie pre import"
 
 # Je to položka v časovom slede operácií v ľavom stĺpci
-#: ../e-util/e-import-assistant.c:1346
+#: ../e-util/e-import-assistant.c:1342
 msgid "Select a File"
 msgstr "Vybrať súbor"
 
-#: ../e-util/e-import-assistant.c:1363
+#: ../e-util/e-import-assistant.c:1359
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Kliknutím na „Potvrdiť“ spustíte import súboru do programu Evolution."
 
-#: ../e-util/e-mail-signature-combo-box.c:378
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "Automaticky generovaný"
 
-#: ../e-util/e-mail-signature-editor.c:310
+#: ../e-util/e-mail-signature-editor.c:297
 msgid "Close"
 msgstr "Zavrieť"
 
-#: ../e-util/e-mail-signature-editor.c:315
+#: ../e-util/e-mail-signature-editor.c:302
 msgid "_Save and Close"
 msgstr "_Uložiť a zavrieť"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:531
 msgid "Edit Signature"
 msgstr "Upraviť podpis"
 
-#: ../e-util/e-mail-signature-editor.c:549
+#: ../e-util/e-mail-signature-editor.c:564
 msgid "_Signature Name:"
 msgstr "Názov _podpisu:"
 
 # V prvých dvoch prípadoch ide o názov podpisu, tretí je názov súboru s podpisom a posledný je názov skriptu
 #     čiže áno, správny rod
-#: ../e-util/e-mail-signature-editor.c:595
+#: ../e-util/e-mail-signature-editor.c:600
 msgid "Unnamed"
 msgstr "Nepomenovaný"
 
@@ -11166,15 +12135,15 @@ msgid "Add _Script"
 msgstr "Pridať _skript"
 
 # ide naozaj o spustiteľný skript, ktorého výstup je použitý ako podpis.
-#: ../e-util/e-mail-signature-manager.c:422
+#: ../e-util/e-mail-signature-manager.c:426
 msgid "Add Signature Script"
 msgstr "Pridať skript pre podpis"
 
-#: ../e-util/e-mail-signature-manager.c:492
+#: ../e-util/e-mail-signature-manager.c:497
 msgid "Edit Signature Script"
 msgstr "Upraviť skript pre podpis"
 
-#: ../e-util/e-mail-signature-script-dialog.c:395
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11183,137 +12152,142 @@ msgstr ""
 "Výstup tohto skriptu sa použije ako váš podpis.\n"
 "Zadaný názov sa použije iba na účely zobrazenia."
 
-#: ../e-util/e-mail-signature-script-dialog.c:446
+#: ../e-util/e-mail-signature-script-dialog.c:415 ../e-util/gal-view-instance-save-as-dialog.ui.h:2 
../mail/e-mail-config-identity-page.c:327 ../mail/e-mail-config-summary-page.c:339
+msgid "_Name:"
+msgstr "_Názov:"
+
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "S_kript:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:477
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "Súbor so skriptom musí byť spustiteľný."
 
-#: ../e-util/e-map.c:886
+#: ../e-util/e-map.c:885
 msgid "World Map"
 msgstr "Mapa sveta"
 
-#: ../e-util/e-map.c:889
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-"Myšou ovládaná interaktívna mapa pre výber časového pásma. Používatelia "
-"klávesnice by mali vybrať časové pásmo z rozbaľovacieho zoznamu nižšie."
+#: ../e-util/e-map.c:888
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the 
timezone from the drop-down combination box below."
+msgstr "Myšou ovládaná interaktívna mapa pre výber časového pásma. Používatelia klávesnice by mali vybrať 
časové pásmo z rozbaľovacieho zoznamu nižšie."
 
-#: ../e-util/e-misc-utils.c:243
+#: ../e-util/e-misc-utils.c:248
 msgid "Could not open the link."
 msgstr "Nepodarilo sa otvoriť odkaz."
 
-#: ../e-util/e-misc-utils.c:290
+#: ../e-util/e-misc-utils.c:295
 msgid "Could not display help for Evolution."
 msgstr "Nepodarilo sa zobraziť pomocníka pre Evolution."
 
-#: ../e-util/e-name-selector-dialog.c:279
+#: ../e-util/e-misc-utils.c:2348
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Otvára sa kalendár „%s“"
+
+#: ../e-util/e-misc-utils.c:2351
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "Otvára sa zoznam poznámok „%s“"
+
+#: ../e-util/e-misc-utils.c:2354
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "Otvára sa zoznam úloh „%s“"
+
+#: ../e-util/e-misc-utils.c:2357
+#, fuzzy, c-format
+#| msgid "Opening calendar '%s'"
+msgid "Opening address book '%s'"
+msgstr "Otvára sa kalendár „%s“"
+
+#: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Zobraziť kontakty"
 
-#: ../e-util/e-name-selector-dialog.c:311
+#: ../e-util/e-name-selector-dialog.c:309
 msgid "Address B_ook:"
 msgstr "_Adresár kontaktov:"
 
-#: ../e-util/e-name-selector-dialog.c:318
+#: ../e-util/e-name-selector-dialog.c:316
 msgid "Cat_egory:"
 msgstr "Kate_gória:"
 
-#: ../e-util/e-name-selector-dialog.c:342
+#: ../e-util/e-name-selector-dialog.c:340
 msgid "_Search:"
 msgstr "_Hľadať:"
 
-#: ../e-util/e-name-selector-dialog.c:368
-#: ../e-util/e-name-selector-dialog.c:1276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../e-util/e-name-selector-dialog.c:366 ../e-util/e-name-selector-dialog.c:1274 
../modules/addressbook/e-book-shell-view-actions.c:1157 ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:709 ../modules/calendar/e-task-shell-view-actions.c:881
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
-#: ../e-util/e-name-selector-dialog.c:370
+#: ../e-util/e-name-selector-dialog.c:368
 msgid "Co_ntacts"
 msgstr "_Kontakty"
 
 # atk name
-#: ../e-util/e-name-selector-dialog.c:447
+#: ../e-util/e-name-selector-dialog.c:445
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../e-util/e-name-selector-dialog.c:450
-#: ../mail/importers/pine-importer.c:428
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:427
 msgid "Address Book"
 msgstr "Adresár kontaktov"
 
-#: ../e-util/e-name-selector-dialog.c:453
-#: ../modules/addressbook/e-book-shell-backend.c:304
-#: ../modules/addressbook/e-book-shell-view.c:372
+#: ../e-util/e-name-selector-dialog.c:451 ../modules/addressbook/e-book-shell-backend.c:303 
../modules/addressbook/e-book-shell-view.c:373
 msgid "Contacts"
 msgstr "Kontakty"
 
 # dialog title
-#: ../e-util/e-name-selector-dialog.c:578
+#: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "Výber kontaktov z adresára kontaktov"
 
-#: ../e-util/e-name-selector-dialog.c:1001
-msgid "_Remove"
-msgstr "O_dstrániť"
-
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3040
+#: ../e-util/e-name-selector-entry.c:3183
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Roz_baliť %s vo vnútri"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3056
+#: ../e-util/e-name-selector-entry.c:3199
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ko_pírovať %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3067
+#: ../e-util/e-name-selector-entry.c:3210
 #, c-format
 msgid "C_ut %s"
 msgstr "_Vystrihnúť %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3085
+#: ../e-util/e-name-selector-entry.c:3228
 #, c-format
 msgid "_Edit %s"
 msgstr "_Upraviť %s"
 
-#: ../e-util/e-name-selector-list.c:584
+#: ../e-util/e-name-selector-list.c:583
 #, c-format
 msgid "_Delete %s"
 msgstr "O_dstrániť %s"
 
-#: ../e-util/e-online-button.c:31
+#: ../e-util/e-online-button.c:32
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"Evolution je momentálne pripojený.  Stlačením tohto tlačidla prejdete do "
-"odpojeného režimu."
+msgstr "Evolution je momentálne pripojený.  Stlačením tohto tlačidla prejdete do odpojeného režimu."
 
-#: ../e-util/e-online-button.c:34
+#: ../e-util/e-online-button.c:35
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr ""
-"Evolution je momentálne odpojený.  Stlačením tohto tlačidla prejdete do "
-"pripojeného režimu."
+msgstr "Evolution je momentálne odpojený.  Stlačením tohto tlačidla prejdete do pripojeného režimu."
 
-#: ../e-util/e-online-button.c:37
+#: ../e-util/e-online-button.c:38
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution je momentálne odpojený, pretože nie je dostupná sieť."
 
 #: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
-msgstr ""
-"Kľúč z kľúčenky je nepoužiteľný: chýba používateľ, alebo názov hostiteľa"
+msgstr "Kľúč z kľúčenky je nepoužiteľný: chýba používateľ, alebo názov hostiteľa"
 
 #: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
@@ -11339,171 +12313,160 @@ msgstr "Z_apamätať toto heslo na zvyšok tejto relácie"
 msgid "Evolution Preferences"
 msgstr "Nastavenia programu Evolution"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Vyskytla sa chyba pri tlači"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Tlačový systém oznámil nasledujúce podrobnosti o chybe:"
 
-#: ../e-util/e-print.c:174
-msgid ""
-"The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:173
+msgid "The printing system did not report any additional details about the error."
 msgstr "Tlačový systém neoznámil žiadne ďalšie podrobnosti o chybe."
 
-#: ../e-util/e-proxy-editor.c:315
+#: ../e-util/e-proxy-editor.c:325
 #, fuzzy
 #| msgid "Method:"
 msgid "_Method:"
 msgstr "Metóda:"
 
-#: ../e-util/e-proxy-editor.c:337
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr ""
 
-#: ../e-util/e-proxy-editor.c:341
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr ""
 
-#: ../e-util/e-proxy-editor.c:367
+#: ../e-util/e-proxy-editor.c:377
 #, fuzzy
 #| msgid "January"
 msgid "Manual"
 msgstr "Január"
 
-#: ../e-util/e-proxy-editor.c:386
-#, fuzzy
-#| msgid "H_TTP Proxy:"
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
-msgstr "H_TTP proxy:"
+msgstr "_HTTP proxy:"
 
-#: ../e-util/e-proxy-editor.c:417
-#, fuzzy
-#| msgid "H_TTP Proxy:"
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
-msgstr "H_TTP proxy:"
+msgstr "H_TTPS proxy:"
 
-#: ../e-util/e-proxy-editor.c:448
+#: ../e-util/e-proxy-editor.c:458
 #, fuzzy
 #| msgid "SOC_KS Proxy:"
 msgid "_Socks Proxy:"
 msgstr "SOC_KS proxy:"
 
-#: ../e-util/e-proxy-editor.c:479
-#, fuzzy
-#| msgid "Ignore"
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
-msgstr "Ignorovať"
+msgstr "_Ignorovať hostiteľov:"
 
-#: ../e-util/e-proxy-editor.c:505
+#: ../e-util/e-proxy-editor.c:515
 #, fuzzy
 #| msgid "Automatic Contacts"
 msgid "Automatic"
 msgstr "Automatické kontakty"
 
-#: ../e-util/e-proxy-editor.c:524
+#: ../e-util/e-proxy-editor.c:534
 #, fuzzy
 #| msgid "Configuration"
 msgid "Configuration _URL:"
 msgstr "Konfigurácia"
 
-#: ../e-util/e-proxy-editor.c:553
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr ""
 
-#: ../e-util/e-proxy-preferences.c:178
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr ""
 
-#: ../e-util/e-proxy-preferences.c:180
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr ""
 
-#: ../e-util/e-proxy-preferences.c:464
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr ""
 
-#: ../e-util/e-proxy-preferences.c:499
-msgid ""
-"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
-"and apply them to specific accounts"
+#: ../e-util/e-proxy-preferences.c:561
+msgid "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies and apply them to 
specific accounts"
 msgstr ""
 
-#: ../e-util/e-proxy-selector.c:86
+#: ../e-util/e-proxy-selector.c:85
 #, fuzzy
 #| msgid "_Custom binary:"
 msgid "Custom Proxy"
 msgstr "_Vlastná binárka:"
 
-#: ../e-util/e-proxy-selector.c:488
+#: ../e-util/e-proxy-selector.c:487
 #, fuzzy
 #| msgid "Create a new appointment"
 msgid "Create a new proxy profile"
 msgstr "Vytvorí novú schôdzku"
 
-#: ../e-util/e-proxy-selector.c:493
+#: ../e-util/e-proxy-selector.c:492
 #, fuzzy
 #| msgid "Delete the selected memo list"
 msgid "Delete the selected proxy profile"
 msgstr "Odstráni vybraný zoznam poznámok"
 
-#: ../e-util/e-rule-editor.c:185
+#: ../e-util/e-rule-editor.c:184
 msgid "Add Rule"
 msgstr "Pridať pravidlo"
 
-#: ../e-util/e-rule-editor.c:287
+#: ../e-util/e-rule-editor.c:286
 msgid "Edit Rule"
 msgstr "Upraviť pravidlo"
 
-#: ../e-util/e-search-bar.c:81
+#: ../e-util/e-search-bar.c:83
 #, c-format
 msgid "Matches: %u"
 msgstr "Zodpovedá: %u"
 
-#: ../e-util/e-search-bar.c:565
+#: ../e-util/e-search-bar.c:567
 msgid "Close the find bar"
 msgstr "Zavrie panel hľadania"
 
-#: ../e-util/e-search-bar.c:573
+#: ../e-util/e-search-bar.c:575
 msgid "Fin_d:"
 msgstr "_Nájsť:"
 
-#: ../e-util/e-search-bar.c:585
+#: ../e-util/e-search-bar.c:587
 msgid "Clear the search"
 msgstr "Vyčistí hľadanie"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:611
 msgid "_Previous"
 msgstr "_Predchádzajúci"
 
-#: ../e-util/e-search-bar.c:615
+#: ../e-util/e-search-bar.c:614
 msgid "Find the previous occurrence of the phrase"
 msgstr "Nájde predchádzajúci výskyt frázy"
 
-#: ../e-util/e-search-bar.c:624
+#: ../e-util/e-search-bar.c:623
 msgid "_Next"
 msgstr "Nas_ledujúci"
 
-#: ../e-util/e-search-bar.c:630
+#: ../e-util/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "Nájde daľší výskyt frázy"
 
-#: ../e-util/e-search-bar.c:639
+#: ../e-util/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "R_ozlišovať veľkosť písmen"
 
-#: ../e-util/e-search-bar.c:667
+#: ../e-util/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "Dosiahnutý spodný okraj strany, pokračuje sa zvrchu"
 
-#: ../e-util/e-search-bar.c:689
+#: ../e-util/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "Dosiahnutý horný okraj strany, pokračuje sa zospodu"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:328
-#: ../mail/importers/pine-importer.c:421
-#: ../modules/mail/e-mail-shell-view.c:1098
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:420 
../modules/mail/e-mail-shell-view.c:1163 ../smime/gui/certificate-manager.c:1669
 msgid "Mail"
 msgstr "Pošta"
 
@@ -11511,30 +12474,169 @@ msgstr "Pošta"
 msgid "When de_leted:"
 msgstr "Pri odstrá_není:"
 
-#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Predvolené"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Patentované"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Tajné"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Prísne tajné"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Len pre vaše oči"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Žiadne"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Príjem pošty"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "V_yžadovaná odpoveď"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "V _rámci"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dní"
+
+# PK: ked je to vhodne
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "_Keď je to vhodné"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Oneskoriť doručenie správy"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Po"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dňoch"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "_Nastaviť dátum vypršania platnosti"
+
+# Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Do"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Voľby doručenia"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Priorita:"
+
+# nebude lepšie Zaradenie?
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Klasifikácia:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Všeo_becné voľby"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "V_ytvoriť posielaciu položku pre sledovanie informácie"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Doručené"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "D_oručené a otvorené"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Všetky informácie"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "A_utomaticky odstrániť odoslanú položku"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Sledovanie stavu"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Pri otvorení:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Pri _odmietnutí:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Pri doko_nčení:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "Pri akce_ptovaní:"
+
+# PŠ: je to dobre?
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Oznámenie o vrátení"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Sledovanie s_tavu"
+
+#: ../e-util/e-source-config.c:684 ../e-util/e-source-config.c:688
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
+#: ../e-util/e-source-config.c:696 ../e-util/e-source-config.c:700
 msgid "Name:"
 msgstr "Meno:"
 
 # MČ: chcelo by to plurals. Asi.
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1302
+#: ../e-util/e-source-config.c:1305
 msgid "Refresh every"
 msgstr "Obnoviť každých"
 
-#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
+#: ../e-util/e-source-config.c:1335 ../e-util/e-source-config.c:1405
 msgid "Use a secure connection"
 msgstr "Použiť zabezpečené pripojenie"
 
-#: ../e-util/e-source-config.c:1428
+#: ../e-util/e-source-config.c:1431
 msgid "Unset _trust for SSL certificate"
 msgstr "Zrušíť _dôveru k SSL certifikátu"
 
-#: ../e-util/e-source-config.c:1464
+#: ../e-util/e-source-config.c:1467
 msgid "User"
 msgstr "Používateľ"
 
@@ -11546,28 +12648,48 @@ msgstr "_Cieľ"
 msgid "Select destination"
 msgstr "Vybrať cieľ"
 
+# je tu správny rod?
+# PK: netusim, uvidim, ci rozdelia niektore stringy, ak ano, tak potom snad aj tento
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, fuzzy, c-format
+#| msgid "Unknown"
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Neznámy"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, fuzzy, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u%s)"
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%u%s)"
+
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:384
+#: ../e-util/e-spell-entry.c:379
 msgid "(no suggestions)"
 msgstr "(žiadne návrhy)"
 
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:403
 msgid "More..."
 msgstr "Viac…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:479
+#: ../e-util/e-spell-entry.c:488
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Pridať „%s“ do slovníka"
 
 # MČ: odhadujem, že ide o návrhy
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:530
+#: ../e-util/e-spell-entry.c:537
 msgid "Ignore All"
 msgstr "Ignorovať všetky"
 
-#: ../e-util/e-spell-entry.c:558
+#: ../e-util/e-spell-entry.c:569
 msgid "Spelling Suggestions"
 msgstr "Hláskovanie návrhov"
 
@@ -11576,14 +12698,9 @@ msgid "A file named \"{0}\" already exists. Do you want to replace it?"
 msgstr "Súbor pomenovaný ako „{0}“ už existuje. Chcete ho nahradiť?"
 
 #: ../e-util/e-system.error.xml.h:2
-msgid ""
-"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgid "The file already exists in \"{0}\". Replacing it will overwrite its contents."
 msgstr "Súbor už existuje v „{0}“. Jeho nahradenie prepíše jeho obsah."
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Nahradiť"
-
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "Nedá sa uložiť súbor „{0}“."
@@ -11614,25 +12731,20 @@ msgid "Failed to delete resource &quot;{0}&quot;."
 msgstr "Zlyhalo odstránenie zdroja „{0}“."
 
 #: ../e-util/e-system.error.xml.h:11
-msgid ""
-"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgstr "Obslužný softvér adresára kontaktov „{0}“ neočakávane skončil."
 
 #: ../e-util/e-system.error.xml.h:12
-msgid ""
-"Some of your contacts may not be available until Evolution is restarted."
-msgstr ""
-"Niektoré vaše kontakty nemôžu byť dostupné kým nereštartujete Evolution."
+msgid "Some of your contacts may not be available until Evolution is restarted."
+msgstr "Niektoré vaše kontakty nemôžu byť dostupné kým nereštartujete Evolution."
 
 #: ../e-util/e-system.error.xml.h:13
 msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgstr "Obslužný softvér kalendára „{0}“ neočakávane skončil."
 
 #: ../e-util/e-system.error.xml.h:14
-msgid ""
-"Some of your appointments may not be available until Evolution is restarted."
-msgstr ""
-"Niektoré vaše schôdzky nemôžu byť dostupné kým nereštartujete Evolution."
+msgid "Some of your appointments may not be available until Evolution is restarted."
+msgstr "Niektoré vaše schôdzky nemôžu byť dostupné kým nereštartujete Evolution."
 
 #: ../e-util/e-system.error.xml.h:15
 msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
@@ -11640,8 +12752,7 @@ msgstr "Obslužný softvér zoznamu poznámok „{0}“ neočakávane skončil."
 
 #: ../e-util/e-system.error.xml.h:16
 msgid "Some of your memos may not be available until Evolution is restarted."
-msgstr ""
-"Niektoré vaše poznámky nemôžu byť dostupné kým nereštartujete Evolution."
+msgstr "Niektoré vaše poznámky nemôžu byť dostupné kým nereštartujete Evolution."
 
 #: ../e-util/e-system.error.xml.h:17
 msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
@@ -11652,8 +12763,7 @@ msgid "Some of your tasks may not be available until Evolution is restarted."
 msgstr "Niektoré vaše úlohy nemôžu byť dostupné kým nereštartujete Evolution."
 
 #: ../e-util/e-system.error.xml.h:19
-msgid ""
-"The address book backend servicing &quot;{0}&quot; encountered an error."
+msgid "The address book backend servicing &quot;{0}&quot; encountered an error."
 msgstr "Obslužný softvér adresára kontaktov „{0}“ narazil na chybu."
 
 #: ../e-util/e-system.error.xml.h:20
@@ -11668,61 +12778,121 @@ msgstr "Obslužný softvér zoznamu poznámok „{0}“ narazil na chybu."
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "Obslužný softvér zoznamu úloh „{0}“ narazil na chybu."
 
-#: ../e-util/e-table-click-to-add.c:681
-#: ../e-util/gal-a11y-e-table-click-to-add.c:62
-#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+#: ../e-util/e-table-click-to-add.c:684 ../e-util/gal-a11y-e-table-click-to-add.c:61 
../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "pridať kliknutím"
 
-#: ../e-util/e-table-column-selector.c:266
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "Presunie vybrané názvy stĺpcov navrch"
 
-#: ../e-util/e-table-column-selector.c:271
+#: ../e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "Presunie vybrané názvy stĺpcov hore o jednu položku"
 
-#: ../e-util/e-table-column-selector.c:276
+#: ../e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "Presunie vybrané názvy stĺpcov dolu o jednu položku"
 
-#: ../e-util/e-table-column-selector.c:281
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "Presunie vybrané názvy stĺpcov naspodok"
 
-#: ../e-util/e-table-column-selector.c:286
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "Vyberie všetky názvy stĺpcov"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr "(Vzostupne)"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr "(Zostupne)"
 
-#: ../e-util/e-table-config.c:396
+#: ../e-util/e-table-config.c:395
 msgid "Not sorted"
 msgstr "Nezoradené"
 
-#: ../e-util/e-table-config.c:441
+#: ../e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "Bez zoskupovania"
 
-#: ../e-util/e-table-config.c:546
+#: ../e-util/e-table-config.c:545
 msgid "Show Fields"
 msgstr "Zobraziť polia"
 
-#: ../e-util/e-table-config.c:562
+#: ../e-util/e-table-config.c:559
 msgid "Choose the order of information to appear in the message list."
 msgstr "Zvoľte poradie informácií na zobrazenie v zozname správ."
 
-#: ../e-util/e-table-field-chooser-dialog.c:227
-msgid "Add a Column"
-msgstr "Pridať stĺpec"
+#: ../e-util/e-table-config.ui.h:2 ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:367 
../modules/cal-config-google/e-google-chooser-dialog.c:191
+#, fuzzy
+#| msgid "_Append"
+msgid "_Apply"
+msgstr "_Pripojiť"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "Z_oradiť…"
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "_Zoskupiť podľa…"
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "Zo_brazené polia…"
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "Vymazať _všetko"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "_Zobraziť pole v pohľade"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "Vzostupne"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "Zostupne"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "Zoskupiť položky podľa"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "Zobraziť _pole v pohľade"
 
-#: ../e-util/e-table-field-chooser.c:167
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "Potom podľa"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "Zobraziť po_le v pohľade"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "Zobraziť pole _v pohľade"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Zoradiť"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Vymazať všetko"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "Zoradiť položky podľa"
+
+#: ../e-util/e-table-field-chooser.c:166
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -11730,7 +12900,11 @@ msgstr ""
 "Na pridanie stĺpca do vašej tabuľky\n"
 "ho premiestnite na miesto, kde ho chcete mať."
 
-#: ../e-util/e-table-group-container.c:369
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Pridať stĺpec"
+
+#: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -11738,7 +12912,7 @@ msgstr[0] "%s: %s (%d položiek)"
 msgstr[1] "%s: %s (%d položka)"
 msgstr[2] "%s: %s (%d položky)"
 
-#: ../e-util/e-table-group-container.c:383
+#: ../e-util/e-table-group-container.c:382
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -11746,191 +12920,221 @@ msgstr[0] "%s (%d položiek)"
 msgstr[1] "%s (%d položka)"
 msgstr[2] "%s (%d položky)"
 
-#: ../e-util/e-table-header-item.c:1577
+#: ../e-util/e-table-header-item.c:1578
 msgid "Customize Current View"
 msgstr "Prispôsobiť aktuálny pohľad"
 
-#: ../e-util/e-table-header-item.c:1600
+#: ../e-util/e-table-header-item.c:1601
 msgid "Sort _Ascending"
 msgstr "Zoradiť _vzostupne"
 
-#: ../e-util/e-table-header-item.c:1603
+#: ../e-util/e-table-header-item.c:1604
 msgid "Sort _Descending"
 msgstr "Zoradiť _zostupne"
 
-#: ../e-util/e-table-header-item.c:1606
+#: ../e-util/e-table-header-item.c:1607
 msgid "_Unsort"
 msgstr "_Nezoraďovať"
 
-#: ../e-util/e-table-header-item.c:1609
+#: ../e-util/e-table-header-item.c:1610
 msgid "Group By This _Field"
 msgstr "Zoskupiť podľa tohto _poľa"
 
 # MČ: Neviem, v ktorom pohľade sa to dokáže zobraziť. Ale callback kód to nemá žiadny, tak podľa mňa to 
aktuálne nič nerobí
-#: ../e-util/e-table-header-item.c:1612
+#: ../e-util/e-table-header-item.c:1613
 msgid "Group By _Box"
 msgstr "Zoskupiť podľa _kolónky"
 
-#: ../e-util/e-table-header-item.c:1616
+#: ../e-util/e-table-header-item.c:1617
 msgid "Remove This _Column"
 msgstr "Odstrániť tento _stĺpec"
 
-#: ../e-util/e-table-header-item.c:1619
+#: ../e-util/e-table-header-item.c:1620
 msgid "Add a C_olumn..."
 msgstr "Pridať s_tĺpec…"
 
-#: ../e-util/e-table-header-item.c:1623
+#: ../e-util/e-table-header-item.c:1624
 msgid "A_lignment"
 msgstr "Za_rovnanie"
 
 # MČ: Najlepšie využitie šírky stĺpcov. Nenapadá mi vhodný preklad.
-#: ../e-util/e-table-header-item.c:1626
+#: ../e-util/e-table-header-item.c:1627
 msgid "B_est Fit"
 msgstr "Na_jlepšie vyplnenie"
 
-#: ../e-util/e-table-header-item.c:1629
+#: ../e-util/e-table-header-item.c:1630
 msgid "Format Column_s..."
 msgstr "Formát stĺpco_v…"
 
-#: ../e-util/e-table-header-item.c:1633
+#: ../e-util/e-table-header-item.c:1634
 msgid "Custo_mize Current View..."
 msgstr "Prispôsobiť _aktuálny pohľad…"
 
-#: ../e-util/e-table-header-item.c:1704
+#: ../e-util/e-table-header-item.c:1705
 msgid "_Sort By"
 msgstr "_Zoradiť podľa"
 
 # vlastné usporiadanie
 #. Custom
-#: ../e-util/e-table-header-item.c:1727
+#: ../e-util/e-table-header-item.c:1728
 msgid "_Custom"
 msgstr "_Vlastné"
 
-#: ../e-util/e-text.c:2102
+#: ../e-util/e-text.c:2114
 msgid "Select All"
 msgstr "Vybrať všetko"
 
-#: ../e-util/e-text.c:2115
-msgid "Input Methods"
-msgstr "Metódy vstupu"
-
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
-#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
-#: ../e-util/e-timezone-dialog.c:805
+#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428 ../e-util/e-timezone-dialog.c:432 
../e-util/e-timezone-dialog.c:436 ../e-util/e-timezone-dialog.c:804
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-url-entry.c:109
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Vyberte časové pásmo"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Pomocou ľavého tlačidla myši môžete zväčšiť oblasť mapy a vybrať časové pásmo.\n"
+"Na zmenšenie použite pravé tlačidlo myši."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Časové pásma"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Výber"
+
+# AtkObject::accessible_name
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "Rozbaľovací zoznam s časovými pásmami"
+
+#: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Kliknutím sem otvoríte URL"
 
-#: ../e-util/e-url-entry.c:111
+#: ../e-util/e-url-entry.c:110
 msgid "Enter a URL here"
 msgstr "Sem zadajte URL"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:283
+#: ../e-util/evolution-source-viewer.c:637
+msgid "Evolution Source Viewer"
+msgstr "Prehliadač zdroja Evolution"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "Zobrazené meno"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "Značky"
+
+#: ../e-util/evolution-source-viewer.c:728 ../mail/e-mail-config-identity-page.c:722
+msgid "Identity"
+msgstr "Identita"
+
+#: ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "_Kopírovať umiestnenie odkazu"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "Skopíruje odkaz do schránky"
 
-#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:293
+#: ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "_Otvoriť odkaz v prehliadači"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:295
+#: ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "Otvorí odkaz vo webovom priehliadači"
 
-#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:303
+#: ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "_Kopírovať emailovú adresu"
 
-#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:320
+#: ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "_Kopírovať obrázok"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "Skopíruje obrázok do schránky"
 
-#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
-#: ../e-util/e-web-view.c:349 ../e-util/e-web-view.c:1315
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "Uložiť _obrázok…"
+
+# tooltip
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "Uloží obrázok do súboru"
+
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1338
 msgid "Select all text and images"
 msgstr "Vybrať celý text a obrázky"
 
-#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:990
-#: ../e-util/e-web-view.c:992 ../e-util/e-web-view.c:994
+#: ../e-util/e-web-view.c:1002
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknutím zavoláte %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:996
+#: ../e-util/e-web-view.c:1004
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknutím skryjete/zobrazíte adresy"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view.c:1015
+#, fuzzy, c-format
+#| msgid "Enter the recipients of the message"
+msgid "Go to the section %s of the message"
+msgstr "Zadajte adresátov správy"
+
+#: ../e-util/e-web-view.c:1017
+#, fuzzy
+#| msgid "Enter the recipients of the message"
+msgid "Go to the beginning of the message"
+msgstr "Zadajte adresátov správy"
+
+#: ../e-util/e-web-view.c:1021
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknutím otvoríte %s"
 
-#: ../e-util/e-web-view.c:327
-msgid "Save _Image..."
-msgstr "Uložiť _obrázok…"
-
-# tooltip
-#: ../e-util/e-web-view.c:329
-msgid "Save the image to a file"
-msgstr "Uloží obrázok do súboru"
-
-#: ../e-util/e-web-view.c:2892
+#: ../e-util/e-web-view.c:2854
 msgid "Copying image to clipboard"
 msgstr "Kopíruje sa obrázok do schránky"
 
 # window title
-#: ../e-util/e-web-view.c:3080
+#: ../e-util/e-web-view.c:3042
 msgid "Save Image"
 msgstr "Uloženie obrázku"
 
-#: ../e-util/e-web-view.c:3116
+#: ../e-util/e-web-view.c:3078
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Presúva sa obrázok do „%s“"
 
-#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
-msgid "%d %B %Y"
-msgstr "%d. %B %Y"
-
-#: ../e-util/ea-calendar-item.c:327
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalendár: od %s do %s"
-
-#: ../e-util/ea-calendar-item.c:364
-msgid "evolution calendar item"
-msgstr "položka kalendára evolution"
-
-#: ../e-util/evolution-source-viewer.c:635
-msgid "Evolution Source Viewer"
-msgstr "Prehliadač zdroja Evolution"
+#: ../e-util/e-widget-undo.c:429
+msgid "Undo 'Insert text'"
+msgstr ""
 
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:665
-msgid "Display Name"
-msgstr "Zobrazené meno"
+#: ../e-util/e-widget-undo.c:431
+msgid "Redo 'Insert text'"
+msgstr ""
 
-#: ../e-util/evolution-source-viewer.c:674
-msgid "Flags"
-msgstr "Značky"
+#: ../e-util/e-widget-undo.c:445
+msgid "Undo 'Delete text'"
+msgstr ""
 
-#: ../e-util/evolution-source-viewer.c:726
-#: ../mail/e-mail-config-identity-page.c:678
-msgid "Identity"
-msgstr "Identita"
+#: ../e-util/e-widget-undo.c:447
+msgid "Redo 'Delete text'"
+msgstr ""
 
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
@@ -11976,44 +13180,145 @@ msgstr "Názov &quot;{0}&quot; je už použitý."
 msgid "Please choose another name."
 msgstr "Prosím, zvoľte iný názov."
 
+#: ../e-util/filter.error.xml.h:12
+msgid "Missing condition."
+msgstr "Chýba podmienka."
+
+#: ../e-util/filter.error.xml.h:13
+msgid "Filter should have at least one condition."
+msgstr ""
+
+#: ../e-util/filter.error.xml.h:14
+msgid "Missing value."
+msgstr "Chýba hodnota."
+
+#: ../e-util/filter.error.xml.h:15
+msgid "One or more values cannot be empty."
+msgstr ""
+
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "aktuálny čas"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "zadaný čas"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "čas relatívny k aktuálnemu času"
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:85
+msgid "seconds"
+msgstr "sekúnd"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "týždňov"
+
+#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "mesiacov"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "rokov"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "dozadu"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "v budúcnosti"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Zobraziť filtre pre poštu:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "Pravidlá _filtra"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "Porovnať s"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Dátum správy bude porovnaný\n"
+"s aktuálnym časom filtrovania."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Dátum správy bude porovnaný\n"
+"s dátumom o 12:00, ktorý tu uvediete."
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Dátum správy bude porovnaný s časom\n"
+"relatívnym k okamihu, keď bol filter spustený."
+
+#: ../e-util/gal-a11y-e-cell.c:122
+msgid "Table Cell"
+msgstr "Bunka tabuľky"
+
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:128
+#: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "prekryť potomka"
 
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr ""
+
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:180
+#: ../e-util/gal-a11y-e-cell-toggle.c:177
 msgid "toggle the cell"
 msgstr "prepnúť bunku"
 
 # čo  je ETree? netreba to prekladať?
 # MČ: Nepodarilo sa mi to zistiť. Zatiaľ.
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:214
+#: ../e-util/gal-a11y-e-cell-tree.c:213
 msgid "expands the row in the ETree containing this cell"
 msgstr "rozbalí riadok v ETree obsahujúci túto bunku"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:222
+#: ../e-util/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "zbalí riadok v ETree obsahujúci túto bunku"
 
-#: ../e-util/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr "Bunka tabuľky"
-
-#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+#: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "kliknúť"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:163
+#: ../e-util/gal-a11y-e-table-column-header.c:162
 msgid "sort"
 msgstr "zoradiť"
 
-#: ../e-util/gal-view-instance-save-as-dialog.c:296
+#: ../e-util/gal-view-instance-save-as-dialog.c:295
 msgid "Save Current View"
 msgstr "Uloženie aktuálneho pohľadu"
 
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Vytvoriť novú úlohu"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Nahradiť existujúci pohľad"
+
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "Želáte si uložiť vaše zmeny?"
@@ -12050,33 +13355,35 @@ msgstr "Nepodarilo sa načítať podpis."
 msgid "Could not save signature."
 msgstr "Nepodarilo sa uložiť podpis."
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#: ../evolution.appdata.xml.in.h:1
+msgid "Evolution is a personal information management application that provides integrated mail, calendaring 
and address book functionality."
+msgstr ""
+
+#: ../evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and network protocols for information 
exchange, with an emphasis on standards compliance and security. Evolution can also integrate smoothly "
+"with Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:28
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
-msgstr ""
-"Táto voľba sprístupní používanie OAuth 2.0 prístupového tokenu na pripojenie "
-"k serveru"
+msgstr "Táto voľba sprístupní používanie OAuth 2.0 prístupového tokenu na pripojenie k serveru"
 
-#: ../libemail-engine/e-mail-authenticator.c:182
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "Neplatná návratová hodnota (%d) overenia totožnosti"
-
-#: ../libemail-engine/e-mail-folder-utils.c:114
+#: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Ukladá sa správa do priečinka „%s“"
 
 # Preposlané správy?
-#: ../libemail-engine/e-mail-folder-utils.c:572
+#: ../libemail-engine/e-mail-folder-utils.c:571
 msgid "Forwarded messages"
 msgstr "Správy poslané ďalej"
 
-#: ../libemail-engine/e-mail-folder-utils.c:682
-#: ../libemail-engine/e-mail-folder-utils.c:933
+#: ../libemail-engine/e-mail-folder-utils.c:681 ../libemail-engine/e-mail-folder-utils.c:932
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -12084,29 +13391,29 @@ msgstr[0] "Získava sa %d správ"
 msgstr[1] "Získava sa %d správa"
 msgstr[2] "Získavajú sa %d správy"
 
-#: ../libemail-engine/e-mail-folder-utils.c:776
+#: ../libemail-engine/e-mail-folder-utils.c:775
 msgid "Scanning messages for duplicates"
 msgstr "Kontrolujú sa správy na duplicitné"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1183
+#: ../libemail-engine/e-mail-folder-utils.c:1145
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Odstraňuje sa priečinok „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1320
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Súbor „%s“ bol odstránený."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1324
+#: ../libemail-engine/e-mail-folder-utils.c:1329
 msgid "File has been removed."
 msgstr "Súbor bol odstránený."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1383
+#: ../libemail-engine/e-mail-folder-utils.c:1388
 msgid "Removing attachments"
 msgstr "Odstraňujú sa prílohy"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1547
+#: ../libemail-engine/e-mail-folder-utils.c:1552
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -12114,167 +13421,147 @@ msgstr[0] "Ukladá sa %d správ"
 msgstr[1] "Ukladá sa %d správa"
 msgstr[2] "Ukladajú sa %d správy"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1925
+#: ../libemail-engine/e-mail-folder-utils.c:1930
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Neplatný URI priečinka „%s“"
 
-#: ../libemail-engine/e-mail-session-utils.c:540
-msgid "No mail transport service available"
-msgstr "Služba prenosu pošty nie je k dispozícii"
-
-#: ../libemail-engine/e-mail-session-utils.c:640
-#: ../libemail-engine/mail-ops.c:712
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Zlyhalo použitie filtrov pre odosielanú poštu: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:689
-#: ../libemail-engine/mail-ops.c:756
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Zlyhalo pridanie do %s: %s\n"
-"Namiesto toho sa pridá do lokálneho priečinka „Odoslaná pošta“."
-
-#: ../libemail-engine/e-mail-session-utils.c:715
-#: ../libemail-engine/mail-ops.c:780
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Zlyhalo pridanie do lokálneho priečinka „Odoslaná pošta“: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:916
-#: ../libemail-engine/mail-ops.c:911 ../libemail-engine/mail-ops.c:1013
-msgid "Sending message"
-msgstr "Posiela sa správa"
-
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-properties.c:409
-#: ../mail/em-folder-tree-model.c:1139
-#: ../modules/mail/e-mail-shell-view-private.c:1073
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410 
../mail/em-folder-tree-model.c:1174 ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Inbox"
 msgstr "Doručená pošta"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1132
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167 
../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Drafts"
 msgstr "Koncepty"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1143
-#: ../modules/mail/e-mail-shell-view-private.c:1075
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178 
../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Outbox"
 msgstr "Pošta na odoslanie"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1147
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182 
../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "Odoslaná pošta"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1135
-#: ../modules/mail/e-mail-shell-view-private.c:1079
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1079 ../plugins/templates/templates.c:1378
-#: ../plugins/templates/templates.c:1388
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170 
../modules/mail/e-mail-shell-view-private.c:1080 ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432 
../plugins/templates/templates.c:1442
 msgid "Templates"
 msgstr "Šablóny"
 
-#: ../libemail-engine/e-mail-session.c:1246
+#: ../libemail-engine/e-mail-session.c:1261
 #, c-format
 msgid "User cancelled operation"
 msgstr "Používateľ zrušil operáciu"
 
-#: ../libemail-engine/e-mail-session.c:1374
+#: ../libemail-engine/e-mail-session.c:1318
 #, c-format
-msgid "%s authentication failed"
-msgstr "%s overenie totožnosti zlyhalo"
+msgid "No destination address provided, forwarding of the message has been cancelled."
+msgstr "Nebola poskytnutá cieľová adresa, posielanie správy ďalej bolo zrušené."
 
-#: ../libemail-engine/e-mail-session.c:1424
+#: ../libemail-engine/e-mail-session.c:1331
 #, c-format
-msgid "No data source found for UID '%s'"
-msgstr "Nebol nájdený žiadny zdroj údajov pre UID „%s“"
+msgid "No identity found to use, forwarding of the message has been cancelled."
+msgstr "Nebola nájdená žiadna použiteľná identita, posielanie správy ďalej bolo zrušené."
+
+#: ../libemail-engine/e-mail-session.c:2343
+#, fuzzy, c-format
+#| msgid "Storing folder '%s'"
+msgid "Waiting for '%s'"
+msgstr "Ukladá sa priečinok „%s“"
+
+#: ../libemail-engine/e-mail-session-utils.c:539
+msgid "No mail transport service available"
+msgstr "Služba prenosu pošty nie je k dispozícii"
+
+#: ../libemail-engine/e-mail-session-utils.c:629 ../libemail-engine/mail-ops.c:718
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Posting message to '%s'"
+msgstr "Presúvajú sa správy do „%s“"
+
+#: ../libemail-engine/e-mail-session-utils.c:666 ../libemail-engine/mail-ops.c:754
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Zlyhalo použitie filtrov pre odosielanú poštu: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:696 ../libemail-engine/e-mail-session-utils.c:731 
../libemail-engine/mail-ops.c:778 ../libemail-engine/mail-ops.c:813
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Storing sent message to '%s'"
+msgstr "Presúvajú sa správy do „%s“"
 
-#: ../libemail-engine/e-mail-session.c:1487
+#: ../libemail-engine/e-mail-session-utils.c:720 ../libemail-engine/mail-ops.c:802
 #, c-format
 msgid ""
-"No destination address provided, forwarding of the message has been "
-"cancelled."
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
 msgstr ""
-"Nebola poskytnutá cieľová adresa, posielanie správy ďalej bolo zrušené."
+"Zlyhalo pridanie do %s: %s\n"
+"Namiesto toho sa pridá do lokálneho priečinka „Odoslaná pošta“."
 
-#: ../libemail-engine/e-mail-session.c:1500
+#: ../libemail-engine/e-mail-session-utils.c:750 ../libemail-engine/mail-ops.c:830
 #, c-format
-msgid "No identity found to use, forwarding of the message has been cancelled."
-msgstr ""
-"Nebola nájdená žiadna použiteľná identita, posielanie správy ďalej bolo "
-"zrušené."
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Zlyhalo pridanie do lokálneho priečinka „Odoslaná pošta“: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:952 ../libemail-engine/mail-ops.c:978 
../libemail-engine/mail-ops.c:1080
+msgid "Sending message"
+msgstr "Posiela sa správa"
 
-#: ../libemail-engine/e-mail-store-utils.c:190
+#: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Odpája sa od „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:266
+#: ../libemail-engine/e-mail-store-utils.c:265
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Znovu sa pripojája k „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:351
+#: ../libemail-engine/e-mail-store-utils.c:350
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Pripravuje sa účet „%s“ pre odpojený režim"
 
-#: ../libemail-engine/mail-folder-cache.c:1251
-#, c-format
-msgid "Pinging %s"
-msgstr "Prezváňa sa %s"
-
-#: ../libemail-engine/mail-ops.c:91
+#: ../libemail-engine/mail-ops.c:90
 msgid "Filtering Selected Messages"
 msgstr "Filtrujú sa vybrané správy"
 
-#: ../libemail-engine/mail-ops.c:149
+#: ../libemail-engine/mail-ops.c:148
 #, c-format
 msgid ""
-"Failed to filter selected messages. One reason can be that folder location "
-"set in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"Failed to filter selected messages. One reason can be that folder location set in one or more filters is 
invalid. Please check your filters in Edit->Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Zlyhalo filtrovanie vybraných správ. Jedna z príčin môže byť, že umiestnenie "
-"priečinka nastavené v jednom prípadne viacerých filtroch je neplatné. "
-"Skontrolujte, prosím, svoje filtre cez Upraviť->Filtre správ.\n"
+"Zlyhalo filtrovanie vybraných správ. Jedna z príčin môže byť, že umiestnenie priečinka nastavené v jednom 
prípadne viacerých filtroch je neplatné. Skontrolujte, prosím, svoje filtre cez Upraviť->Filtre "
+"správ.\n"
 "Pôvodná chyba bola: %s"
 
-#: ../libemail-engine/mail-ops.c:230
+#: ../libemail-engine/mail-ops.c:229
 #, c-format
 msgid "Fetching mail from '%s'"
 msgstr "Získava sa pošta z „%s“"
 
-#: ../libemail-engine/mail-ops.c:706
+#: ../libemail-engine/mail-ops.c:748
 #, c-format
 msgid ""
-"Failed to apply outgoing filters. One reason can be that folder location set "
-"in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"Failed to apply outgoing filters. One reason can be that folder location set in one or more filters is 
invalid. Please check your filters in Edit->Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Zlyhalo použitie filtrov pre odchádzajúce správy. Jedna z príčin môže byť, "
-"že umiestnenie priečinka nastavené v jednom prípadne viacerých filtroch je "
-"neplatné. Skontrolujte, prosím, svoje filtre cez Upraviť->Filtre správ.\n"
+"Zlyhalo použitie filtrov pre odchádzajúce správy. Jedna z príčin môže byť, že umiestnenie priečinka 
nastavené v jednom prípadne viacerých filtroch je neplatné. Skontrolujte, prosím, svoje filtre cez Upraviť-"
+">Filtre správ.\n"
 "Pôvodná chyba bola: %s"
 
-#: ../libemail-engine/mail-ops.c:922
+#: ../libemail-engine/mail-ops.c:989
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posiela sa správa %d z %d"
 
-#: ../libemail-engine/mail-ops.c:974
+#: ../libemail-engine/mail-ops.c:1041
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -12282,69 +13569,75 @@ msgstr[0] "Zlyhalo posielanie %d z %d správ"
 msgstr[1] "Zlyhalo posielanie %d z %d správy"
 msgstr[2] "Zlyhalo posielanie %d z %d správ"
 
-#: ../libemail-engine/mail-ops.c:980
+#: ../libemail-engine/mail-ops.c:1047
 msgid "Canceled."
 msgstr "Zrušené."
 
-#: ../libemail-engine/mail-ops.c:982
+#: ../libemail-engine/mail-ops.c:1049
 msgid "Complete."
 msgstr "Dokončené."
 
-#: ../libemail-engine/mail-ops.c:1094
+#: ../libemail-engine/mail-ops.c:1163
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Presúvajú sa správy do „%s“"
 
-#: ../libemail-engine/mail-ops.c:1095
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopírujú sa správy do „%s“"
 
-#: ../libemail-engine/mail-ops.c:1214
+#: ../libemail-engine/mail-ops.c:1283
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladá sa priečinok „%s“"
 
-#: ../libemail-engine/mail-ops.c:1342
+#: ../libemail-engine/mail-ops.c:1411
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistí a ukladá sa účet „%s“"
 
-#: ../libemail-engine/mail-ops.c:1343
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Ukladá sa účet „%s“"
 
-#: ../libemail-engine/mail-ops.c:1418
+#: ../libemail-engine/mail-ops.c:1487
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprázdňuje sa kôš v „%s“"
 
-#: ../libemail-engine/mail-tools.c:71
+#: ../libemail-engine/mail-ops.c:1579
+#, fuzzy, c-format
+#| msgid "Storing folder '%s'"
+msgid "Processing folder changes in '%s'"
+msgstr "Ukladá sa priečinok „%s“"
+
+#: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Nepodarilo sa vytvoriť zhromažďovací adresár „%s“: %s"
 
-#: ../libemail-engine/mail-tools.c:111
+#: ../libemail-engine/mail-tools.c:110
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Prebieha pokus o presun správu zo zdroja „%s“, ktorý nie je mbox"
 
-#: ../libemail-engine/mail-tools.c:237
+#: ../libemail-engine/mail-tools.c:236
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Správa poslaná ďalej - %s"
 
-#: ../libemail-engine/mail-tools.c:239
+#: ../libemail-engine/mail-tools.c:238
 msgid "Forwarded message"
 msgstr "Správa poslaná ďalej"
 
-#: ../libemail-engine/mail-vfolder.c:152
+#: ../libemail-engine/mail-vfolder.c:151
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Nastavuje sa vyhľadávací priečinok: %s"
 
-#: ../libemail-engine/mail-vfolder.c:305
+#: ../libemail-engine/mail-vfolder.c:304
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "Aktualizujú sa vyhľadávacie priečinky pre „%s“ – %s"
@@ -12354,11 +13647,10 @@ msgstr "Aktualizujú sa vyhľadávacie priečinky pre „%s“ – %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:669
+#: ../libemail-engine/mail-vfolder.c:668
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
+"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
@@ -12376,78 +13668,80 @@ msgstr "_Otvoriť účty sieťových služieb"
 msgid "This account was created through the Online Accounts service."
 msgstr "Tento účet bol vytvorený cez službu sieťových účtov."
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr ""
 
 # PK: Ucty mozete preskupovat tahanim za nazov
 # PK: takto podobne
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
 msgstr "Účty môžete preusporiadať presúvaním názvu myšou."
 
 # účet
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "_Predvolený"
 
 # PK: nahlas bug
-#: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:1192
-#: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:897
+#: ../mail/e-mail-account-tree-view.c:83 ../modules/mail/em-composer-prefs.c:1228 
../modules/plugin-manager/evolution-plugin-manager.c:358 ../plugins/publish-calendar/publish-calendar.c:896
 #, fuzzy
 msgid "Enabled"
 msgstr "Povolený"
 
-#: ../mail/e-mail-account-tree-view.c:109
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "Názov účtu"
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=641020
-#: ../mail/e-mail-account-tree-view.c:136
-#: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3534
-#: ../mail/mail-config.ui.h:59
-msgid "Default"
-msgstr "Predvolený"
-
-#: ../mail/e-mail-autoconfig.c:612
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "Neposkytnutá žiadna emailová adresa"
 
-#: ../mail/e-mail-autoconfig.c:621
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "V emailovej adrese chýba doména"
 
-#: ../mail/e-mail-backend.c:735
+#: ../mail/e-mail-backend.c:855
 msgid "Unknown background operation"
 msgstr "Neznáma operácia na pozadí"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
-#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903 ../shell/e-shell-window-actions.c:910 
../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "Zavrie toto okno"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:285
 msgid "(No Subject)"
 msgstr "(Žiadny predmet)"
 
+# tooltip
+#. GtkAssistant's back button label.
+#: ../mail/e-mail-config-assistant.c:46
+#, fuzzy
+#| msgid "Go Back"
+msgid "Go _Back"
+msgstr "Prejde dozadu"
+
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:102
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "_Preskočiť vyhľadanie"
 
-#: ../mail/e-mail-config-assistant.c:562
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Asistent účtov Evolution"
 
+#: ../mail/e-mail-config-assistant.c:952
+#, fuzzy
+#| msgid "_Restore Defaults"
+msgid "_Revise Details"
+msgstr "_Obnoviť predvolené"
+
 # je to nazov tlacidla
-#: ../mail/e-mail-config-auth-check.c:351
+#: ../mail/e-mail-config-auth-check.c:349
 msgid "Check for Supported Types"
 msgstr "Skontrolovať podporované typy"
 
-#: ../mail/e-mail-config-confirm-page.c:157
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12461,106 +13755,112 @@ msgstr ""
 "\n"
 "Kliknutím na „Použiť“ uložíte vaše nastavenia."
 
-#: ../mail/e-mail-config-confirm-page.c:169
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../mail/e-mail-config-defaults-page.c:550
+#: ../mail/e-mail-config-defaults-page.c:549
 msgid "Special Folders"
 msgstr "Špeciálne priečinky"
 
-#: ../mail/e-mail-config-defaults-page.c:559
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Draft Messages _Folder:"
 msgstr "Priečinok _Koncepty:"
 
-#: ../mail/e-mail-config-defaults-page.c:569
+#: ../mail/e-mail-config-defaults-page.c:568
 msgid "Choose a folder for saving draft messages."
 msgstr "Zvolí priečinok pre uchovávanie konceptov správ."
 
-#: ../mail/e-mail-config-defaults-page.c:583
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Sent _Messages Folder:"
 msgstr "Priečinok Odoslané _správy:"
 
-#: ../mail/e-mail-config-defaults-page.c:593
+#: ../mail/e-mail-config-defaults-page.c:592
 msgid "Choose a folder for saving sent messages."
 msgstr "Zvolí priečinok pre uchovávanie odoslaných správ."
 
-#: ../mail/e-mail-config-defaults-page.c:612
+#: ../mail/e-mail-config-defaults-page.c:611
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "_Uchovávať odpovede v priečinku kde je správa, na ktorú sa odpovedalo"
 
-#: ../mail/e-mail-config-defaults-page.c:629
+#: ../mail/e-mail-config-defaults-page.c:628
+#, fuzzy
+#| msgid "Search Folders"
+msgid "Archi_ve Folder:"
+msgstr "Vyhľadávacie priečinky"
+
+# label
+#: ../mail/e-mail-config-defaults-page.c:638 ../modules/mail/em-mailer-prefs.c:1079
+#, fuzzy
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder to archive messages to."
+msgstr "Zvoľte priečinky kam poslať správu."
+
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
 msgstr "_Obnoviť predvolené"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
 msgstr "Použiť skutočný priečinok pre _Kôš:"
 
-#: ../mail/e-mail-config-defaults-page.c:644
+#: ../mail/e-mail-config-defaults-page.c:667
 msgid "Choose a folder for deleted messages."
 msgstr "Zvolí priečinok pre uchovávanie odstránených správ."
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:676
 msgid "Use a Real Folder for _Junk:"
 msgstr "Použiť reálny priečinok pre _Nevyžiadaná pošta:"
 
-#: ../mail/e-mail-config-defaults-page.c:654
+#: ../mail/e-mail-config-defaults-page.c:677
 msgid "Choose a folder for junk messages."
 msgstr "Zvolí priečinok pre uchovávanie nevyžiadaných správ."
 
-#: ../mail/e-mail-config-defaults-page.c:671
+#: ../mail/e-mail-config-defaults-page.c:694
 msgid "Composing Messages"
 msgstr "Písanie správ"
 
-#: ../mail/e-mail-config-defaults-page.c:680
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Vžd_y poslať _kópiu (cc) pre:"
 
-#: ../mail/e-mail-config-defaults-page.c:705
+#: ../mail/e-mail-config-defaults-page.c:728
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Vždy poslať _skrytú kópiu (bcc) pre:"
 
-#: ../mail/e-mail-config-defaults-page.c:740
+#: ../mail/e-mail-config-defaults-page.c:763
 msgid "Message Receipts"
 msgstr "Adresáti správy"
 
-#: ../mail/e-mail-config-defaults-page.c:749
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "S_end message receipts:"
 msgstr "_Poslať správu adresátom:"
 
-#: ../mail/e-mail-config-defaults-page.c:774
+#: ../mail/e-mail-config-defaults-page.c:797
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../mail/e-mail-config-defaults-page.c:780
+#: ../mail/e-mail-config-defaults-page.c:803
 msgid "Always"
 msgstr "Vždy"
 
-#: ../mail/e-mail-config-defaults-page.c:786
+#: ../mail/e-mail-config-defaults-page.c:809
 msgid "Ask for each message"
 msgstr "Opýtať sa pri každej správe"
 
-#: ../mail/e-mail-config-defaults-page.c:857
+#: ../mail/e-mail-config-defaults-page.c:880
 msgid "Defaults"
 msgstr "Prednastavenia"
 
-#: ../mail/e-mail-config-identity-page.c:266
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Prosím, zadajte vaše meno a emailovú adresu. „Nepovinné“ informácie nemusíte "
-"zadať, jedine ak chcete, aby boli posielané vo vašich správach."
+#: ../mail/e-mail-config-identity-page.c:282
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be 
filled in, unless you wish to include this information in email you send."
+msgstr "Prosím, zadajte vaše meno a emailovú adresu. „Nepovinné“ informácie nemusíte zadať, jedine ak 
chcete, aby boli posielané vo vašich správach."
 
-#: ../mail/e-mail-config-identity-page.c:294
-#: ../mail/e-mail-config-summary-page.c:324
+#: ../mail/e-mail-config-identity-page.c:310 ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "Informácie o účte"
 
-#: ../mail/e-mail-config-identity-page.c:303
-#: ../mail/e-mail-config-summary-page.c:333
+#: ../mail/e-mail-config-identity-page.c:319 ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12568,262 +13868,341 @@ msgstr ""
 "Zadajte názov, ktorým chcete tento účet označovať.\n"
 "Napríklad „Pracovný“ alebo „Osobný“."
 
-#: ../mail/e-mail-config-identity-page.c:348
+#: ../mail/e-mail-config-identity-page.c:364
 msgid "Required Information"
 msgstr "Povinné informácie"
 
-#: ../mail/e-mail-config-identity-page.c:357
+#: ../mail/e-mail-config-identity-page.c:373
 msgid "Full Nam_e:"
 msgstr "Celé m_eno:"
 
-#: ../mail/e-mail-config-identity-page.c:384
+#: ../mail/e-mail-config-identity-page.c:400
 msgid "Email _Address:"
 msgstr "Emailová ad_resa:"
 
-#: ../mail/e-mail-config-identity-page.c:431
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../mail/e-mail-config-identity-page.c:447 ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Nepovinné informácie"
 
-#: ../mail/e-mail-config-identity-page.c:440
+#: ../mail/e-mail-config-identity-page.c:456
 msgid "Re_ply-To:"
 msgstr "Komu o_dpovedať:"
 
-#: ../mail/e-mail-config-identity-page.c:467
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Or_ganization:"
 msgstr "Or_ganizácia:"
 
-#: ../mail/e-mail-config-identity-page.c:522
+#: ../mail/e-mail-config-identity-page.c:538
 msgid "Add Ne_w Signature..."
 msgstr "Pridať no_vý podpis…"
 
-#: ../mail/e-mail-config-lookup-page.c:68
+#: ../mail/e-mail-config-identity-page.c:556
+msgid "Try _setup account automatically, based on Email Address"
+msgstr ""
+
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Hľadajú sa podrobnosti účtu…"
 
-#: ../mail/e-mail-config-provider-page.c:485
+#: ../mail/e-mail-config-provider-page.c:484
 msgid "Checking for New Mail"
 msgstr "Kontroluje sa nová pošta"
 
-#: ../mail/e-mail-config-provider-page.c:501
+#: ../mail/e-mail-config-provider-page.c:500
 msgid "Check for _new messages every"
 msgstr "Kontrolovať _nové správy každých"
 
-#: ../mail/e-mail-config-provider-page.c:700
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "Voľby príjmu"
 
-#: ../mail/e-mail-config-receiving-page.c:50
+#: ../mail/e-mail-config-receiving-page.c:49
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:333 ../mail/mail-config.ui.h:24
-#: ../modules/addressbook/autocompletion-config.c:114
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../modules/itip-formatter/plugin/config-ui.c:91
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
+#. The first '%s' is a key ID, the second '%s' is a display name of the key.
+#: ../mail/e-mail-config-security-page.c:251
+#, fuzzy, c-format
+#| msgid "Task - %s"
+msgctxt "PGPKeyDescription"
+msgid "%s - %s"
+msgstr "Úloha - %s"
+
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:28 
../modules/addressbook/autocompletion-config.c:114
+#: ../modules/calendar/e-calendar-preferences.ui.h:46 ../modules/itip-formatter/plugin/config-ui.c:90 
../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../mail/e-mail-config-security-page.c:269
+#: ../mail/e-mail-config-security-page.c:349
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr ""
-"_Nepodpisovať požiadavky na stretnutie (pre kompatibilitu s klientom Outlook)"
+msgstr "_Nepodpisovať požiadavky na stretnutie (pre kompatibilitu s klientom Outlook)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "Identifikátor OpenPGP _kľúča:"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "Algoritmus pod_pisovania:"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:60
+#: ../mail/e-mail-config-security-page.c:429 ../mail/e-mail-config-security-page.c:569 
../mail/mail-config.ui.h:69
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:61
+#: ../mail/e-mail-config-security-page.c:432 ../mail/e-mail-config-security-page.c:572 
../mail/mail-config.ui.h:70
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:62
+#: ../mail/e-mail-config-security-page.c:435 ../mail/e-mail-config-security-page.c:575 
../mail/mail-config.ui.h:71
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:63
+#: ../mail/e-mail-config-security-page.c:438 ../mail/e-mail-config-security-page.c:578 
../mail/mail-config.ui.h:72
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:363
+#: ../mail/e-mail-config-security-page.c:454
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Vždy podpisovať odchádzajúce správy pri použití tohto účtu"
 
-#: ../mail/e-mail-config-security-page.c:375
+#: ../mail/e-mail-config-security-page.c:466
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Vždy ši_frovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: ../mail/e-mail-config-security-page.c:387
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Vždy _dôverovať kľúčom v mojom zväzku kľúčov pri šifrovaní"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:502
 msgid "Secure MIME (S/MIME)"
 msgstr "Zabezpečené MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:511
 msgid "Sig_ning certificate:"
 msgstr "Podpi_sovací cetrifikát:"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:535 ../mail/e-mail-config-security-page.c:641
 msgid "Select"
 msgstr "Vybrať"
 
-#: ../mail/e-mail-config-security-page.c:462
+#: ../mail/e-mail-config-security-page.c:544 ../mail/e-mail-config-security-page.c:650 
../mail/mail-dialogs.ui.h:5 ../shell/e-shell-window-actions.c:1006
+#, fuzzy
+#| msgid "_Clear Flag"
+msgid "_Clear"
+msgstr "V_yčistiť značku"
+
+#: ../mail/e-mail-config-security-page.c:553
 msgid "Signing _algorithm:"
 msgstr "_Algoritmus podpisovania:"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:594
 msgid "Always sign outgoing messages when using this account"
 msgstr "Vždy podpisovať odchádzajúce správy pri použití tohto účtu"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../mail/e-mail-config-security-page.c:617
 msgid "Encryption certificate:"
 msgstr "Certifikát na šifrovanie:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:659
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Vždy šifrovať odchádzajúce správy pri použití tohto účtu"
 
-#: ../mail/e-mail-config-security-page.c:588
+#: ../mail/e-mail-config-security-page.c:679
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Vždy šifrovať kópiu pre seba pri posielaní šifrovanej správy"
 
-#: ../mail/e-mail-config-sending-page.c:50
+#: ../mail/e-mail-config-sending-page.c:49
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: ../mail/e-mail-config-service-page.c:640
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "_Typ servera:"
 
-#: ../mail/e-mail-config-summary-page.c:142
+#: ../mail/e-mail-config-summary-page.c:141
 msgid "SSL"
 msgstr "SSL"
 
-#: ../mail/e-mail-config-summary-page.c:145
+#: ../mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:307
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr ""
-"Toto je súhrn nastavení, ktoré budú použité pri pristupovaní k vašej pošte."
+#: ../mail/e-mail-config-summary-page.c:305
+msgid "This is a summary of the settings which will be used to access your mail."
+msgstr "Toto je súhrn nastavení, ktoré budú použité pri pristupovaní k vašej pošte."
 
-#: ../mail/e-mail-config-summary-page.c:372
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Osobné údaje"
 
-#: ../mail/e-mail-config-summary-page.c:381
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Celé meno:"
 
-#: ../mail/e-mail-config-summary-page.c:395
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Emailová adresa:"
 
 # label
-#: ../mail/e-mail-config-summary-page.c:409
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Príjem"
 
 # label
-#: ../mail/e-mail-config-summary-page.c:421
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Odosielanie"
 
-#: ../mail/e-mail-config-summary-page.c:433
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Typ servera:"
 
-#: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../mail/e-mail-config-summary-page.c:452 ../modules/book-config-ldap/evolution-book-config-ldap.c:602
 msgid "Server:"
 msgstr "Server:"
 
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
+#: ../mail/e-mail-config-summary-page.c:473 ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "Používateľské meno:"
 
-#: ../mail/e-mail-config-summary-page.c:496
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Bezpečnosť:"
 
-#: ../mail/e-mail-config-summary-page.c:787
+#: ../mail/e-mail-config-summary-page.c:785
 msgid "Account Summary"
 msgstr "Súhrn o účte"
 
-#: ../mail/e-mail-config-welcome-page.c:157
+#: ../mail/e-mail-config-welcome-page.c:156
+#, fuzzy
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Continue\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
 "Víta vás asistent nastavením pošty Evolution.\n"
 "\n"
 "Začnite kliknutím na „Pokračovať“."
 
-#: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:152
+#: ../mail/e-mail-config-welcome-page.c:166 ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "Vitajte"
 
-#: ../mail/e-mail-config-window.c:327
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "Editor účtu"
 
-#: ../mail/e-mail-display.c:96
+#: ../mail/e-mail-display.c:97
 msgid "_Add to Address Book..."
 msgstr "_Pridať do adresára kontaktov…"
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:104
 msgid "_To This Address"
 msgstr "_Pre túto adresu"
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:111
 msgid "_From This Address"
 msgstr "_Z tejto adresy"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:118
 msgid "Send _Reply To..."
 msgstr "Poslať _odpoveď…"
 
-#: ../mail/e-mail-display.c:119
+#: ../mail/e-mail-display.c:120
 msgid "Send a reply message to this address"
 msgstr "Pošle odpoveď na túto adresu"
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:127
 msgid "Create Search _Folder"
 msgstr "Vytvoriť vyhľadávací _priečinok"
 
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:298
+#: ../mail/e-mail-folder-create-dialog.c:327
+msgid "Create Folder"
+msgstr "Vytvorenie priečinka"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "Zadajte, kde sa má vytvoriť priečinok:"
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "Vytvo_riť"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+msgstr "_Názov priečinka:"
+
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../mail/e-mail-free-form-exp.c:226
+#, fuzzy
+#| msgid "Answered"
+msgctxt "ffe"
+msgid "Answered"
+msgstr "Odpovedané"
+
+#: ../mail/e-mail-free-form-exp.c:227
+#, fuzzy
+#| msgid "Deleted"
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "Zmazané"
+
+#: ../mail/e-mail-free-form-exp.c:228
+#, fuzzy
+#| msgid "Draft"
+msgctxt "ffe"
+msgid "Draft"
+msgstr "Koncept"
+
+#: ../mail/e-mail-free-form-exp.c:229
+#, fuzzy
+#| msgid "Flagged"
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "Označené"
+
+#: ../mail/e-mail-free-form-exp.c:230
+#, fuzzy
+#| msgid "Seen"
+msgctxt "ffe"
+msgid "Seen"
+msgstr "Prečítané"
+
+#: ../mail/e-mail-free-form-exp.c:231
+#, fuzzy
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "Príloh"
+
+#: ../mail/e-mail-free-form-exp.c:479
+#, fuzzy
+#| msgid "now"
+msgctxt "ffe"
+msgid "no"
+msgstr "teraz"
+
+#: ../mail/e-mail-free-form-exp.c:480
+msgctxt "ffe"
+msgid "false"
+msgstr ""
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "Program na filtrovanie nevyžiadanej pošty:"
 
-#: ../mail/e-mail-label-dialog.c:225
+#: ../mail/e-mail-label-dialog.c:224
 msgid "_Label name:"
 msgstr "_Názov menovky:"
 
@@ -12851,16 +14230,15 @@ msgstr "_Urobiť"
 msgid "_Later"
 msgstr "_Neskôr"
 
-#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:1029
+#: ../mail/e-mail-label-manager.c:171 ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "Add Label"
 msgstr "Pridať menovku"
 
-#: ../mail/e-mail-label-manager.c:221
+#: ../mail/e-mail-label-manager.c:222
 msgid "Edit Label"
 msgstr "Upraviť menovku"
 
-#: ../mail/e-mail-label-manager.c:353
+#: ../mail/e-mail-label-manager.c:354
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -12868,670 +14246,711 @@ msgstr ""
 "Poznámka: Počiarknutie v názve popisku je použité\n"
 "ako mnemotechnický identifikátor v ponuke."
 
-#: ../mail/e-mail-label-tree-view.c:89
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Farba"
 
 # tooltip
-#: ../mail/e-mail-print-config-headers.c:167
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "Presunie vybrané hlavičky na vrch"
 
 # tooltip
-#: ../mail/e-mail-print-config-headers.c:172
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "Presunie vybrané hlavičky hore o jednu položku"
 
 # tooltip
-#: ../mail/e-mail-print-config-headers.c:177
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "Presunie vybrané hlavičky dolu o jednu položku"
 
 # tooltip
-#: ../mail/e-mail-print-config-headers.c:182
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "Presunie vybrané hlavičky na spodok"
 
 # tooltip
-#: ../mail/e-mail-print-config-headers.c:187
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "Vyberie všetky hlavičky"
 
 # title of column
-#: ../mail/e-mail-print-config-headers.c:206
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "Názov hlavičky"
 
 # title of column
-#: ../mail/e-mail-print-config-headers.c:215
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "Hodnota hlavičky"
 
-#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:99
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:113
 msgid "Headers"
 msgstr "Hlavičky"
 
-#: ../mail/e-mail-printer.c:167
+#: ../mail/e-mail-printer.c:166
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: ../mail/e-mail-reader.c:344 ../mail/em-filter-i18n.h:12
-msgid "Copy to Folder"
-msgstr "Kopírovať do priečinka"
-
-#: ../mail/e-mail-reader.c:344 ../mail/em-folder-utils.c:506
-msgid "C_opy"
-msgstr "K_opírovať"
-
-#: ../mail/e-mail-reader.c:844 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
 msgid "Move to Folder"
 msgstr "Presunúť do priečinka"
 
-#: ../mail/e-mail-reader.c:844 ../mail/em-folder-utils.c:506
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+msgid "Copy to Folder"
+msgstr "Kopírovať do priečinka"
+
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Presunúť"
 
-#: ../mail/e-mail-reader.c:1170 ../mail/e-mail-reader.c:1382
-#: ../mail/e-mail-reader.c:1422
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "K_opírovať"
+
+#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480 ../mail/e-mail-reader.c:1520
 msgid "_Do not ask me again."
 msgstr "_Už sa ma znovu nepýtať."
 
-#: ../mail/e-mail-reader.c:1428
+#: ../mail/e-mail-reader.c:1526
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Vždy ingorovať „Odpovedať komu:“ pre poštové konferencie."
 
-#: ../mail/e-mail-reader.c:1630
+#: ../mail/e-mail-reader.c:1728
 msgid "Failed to retrieve message:"
 msgstr "Zlyhalo získavanie správy:"
 
-#: ../mail/e-mail-reader.c:1670 ../mail/e-mail-reader.c:2776
+#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3013
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Získava sa správa „%s“"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1961
 msgid "A_dd Sender to Address Book"
 msgstr "Pri_dať odosielateľa do adresára kontaktov"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1963
 msgid "Add sender to address book"
 msgstr "Pridá odosielateľa do adresára kontaktov"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1968
+msgid "_Archive..."
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1970
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "Presunie vybrané správy do iného priečinka"
+
+#: ../mail/e-mail-reader.c:1975
 msgid "Check for _Junk"
 msgstr "Skontrolovať na _nevyžiadanú poštu"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1977
 msgid "Filter the selected messages for junk status"
 msgstr "Filtruje vybrané správy na nevyžiadanú poštu"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1982
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinka…"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1984
 msgid "Copy selected messages to another folder"
 msgstr "Kopíruje vybrané správy do iného priečinka"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1989
 msgid "_Delete Message"
 msgstr "Z_mazať správu"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1991
 msgid "Mark the selected messages for deletion"
 msgstr "Označí vybrané správy na zmazanie"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1996
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Vytvoriť filtrovacie pravidlo pre _konferenciu…"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Vytvorí pravidlo na filtrovanie správ pre túto poštovú konferenciu"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Vytvoriť filtrovacie pravidlo na _adresátov…"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:2005
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Vytvorí pravidlo na filtrovanie správ týmto adresátom"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Vytvoriť filtrovacie pravidlo na _odosielateľa…"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:2012
 msgid "Create a rule to filter messages from this sender"
 msgstr "Vytvorí pravidlo na filtrovanie správ od tohto odosielateľa"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Vytvoriť filtrovacie pravidlo na p_redmet…"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2019
 msgid "Create a rule to filter messages with this subject"
 msgstr "Vytvorí pravidlo na filtrovanie správ s týmto predmetom"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2024
 msgid "A_pply Filters"
 msgstr "Použiť _filtre"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:2026
 msgid "Apply filter rules to the selected messages"
 msgstr "Použije pravidlá filtrov na vybrané správy"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2031
 msgid "_Find in Message..."
 msgstr "_Nájsť v správe…"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2033
 msgid "Search for text in the body of the displayed message"
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2038
 msgid "_Clear Flag"
 msgstr "V_yčistiť značku"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2040
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Odstráni značku vybaviť z označených správ"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2045
 msgid "_Flag Completed"
 msgstr "O_značiť ako dokončené"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2047
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Nastaví vybrané správy označené na sledovanie ako dokončené"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2052
 msgid "Follow _Up..."
 msgstr "_Sledovať…"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2054
 msgid "Flag the selected messages for follow-up"
 msgstr "Označí vybrané správy pre sledovanie"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2059
 msgid "_Attached"
 msgstr "_Priložené"
 
-#: ../mail/e-mail-reader.c:1951 ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Vybranú správu pošle ďalej niekomu ako prílohu"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2066
 msgid "Forward As _Attached"
 msgstr "Poslať ďalej ako _priložené"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2073
 msgid "_Inline"
 msgstr "_V texte"
 
-#: ../mail/e-mail-reader.c:1965 ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
 msgid "Forward the selected message in the body of a new message"
 msgstr "Pošle ďalej niekomu vybranú správu v tele novej správy"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2080
 msgid "Forward As _Inline"
 msgstr "Poslať ďalej _v texte"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2087
 msgid "_Quoted"
 msgstr "_Citovať"
 
-#: ../mail/e-mail-reader.c:1979 ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
 msgid "Forward the selected message quoted like a reply"
-msgstr ""
-"Pošle ďalej túto správu vloženú do vašej správy podobne ako pri odpovedi"
+msgstr "Pošle ďalej túto správu vloženú do vašej správy podobne ako pri odpovedi"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2094
 msgid "Forward As _Quoted"
 msgstr "Poslať ďalej ako _citované"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2101
 msgid "_Load Images"
 msgstr "_Načítať obrázky"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2103
 msgid "Force images in HTML mail to be loaded"
 msgstr "Vždy načíta obrázky v pošte HTML"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+msgid "_Ignore Subthread"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2110
+msgid "Mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+#, fuzzy
+#| msgid "Next _Thread"
+msgid "_Ignore Thread"
+msgstr "Nasledujúce _vlákno"
+
+#: ../mail/e-mail-reader.c:2117
+msgid "Mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2122
 msgid "_Important"
 msgstr "_Dôležité"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as important"
 msgstr "Označí vybrané správy ako dôležité"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2129
 msgid "_Junk"
 msgstr "_Nevyžiadaná pošta"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as junk"
 msgstr "Označí vybrané správy ako nevyžiadanú poštu"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2136
 msgid "_Not Junk"
 msgstr "_Nie je to nevyžiadaná pošta"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as not being junk"
 msgstr "Odznačí vybrané správy označené ako nevyžiadaná pošta"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2143
 msgid "_Read"
 msgstr "_Prečítaná"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as having been read"
 msgstr "Označí vybrané správy ako už prečítané"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+#, fuzzy
+#| msgid "Could not create publish thread."
+msgid "Do not _Ignore Subthread"
+msgstr "Nepodarilo sa vytvoriť vlákno na zverejnenie."
+
+#: ../mail/e-mail-reader.c:2152
+msgid "Do not mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+msgid "Do not _Ignore Thread"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2159
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2164
 msgid "Uni_mportant"
 msgstr "Nedô_ležité"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2166
 msgid "Mark the selected messages as unimportant"
 msgstr "Označí vybrané správy ako nedôležité"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2171
 msgid "_Unread"
 msgstr "_Neprečítané"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2173
 msgid "Mark the selected messages as not having been read"
 msgstr "Označí vybrané správy ako neprečítané"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2178
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu…"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2180
 msgid "Open the selected messages in the composer for editing"
 msgstr "Otvorí vybrané správy v písaní správy na upravovanie"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2185
 msgid "Compose _New Message"
 msgstr "Napísať _novú správu"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2187
 msgid "Open a window for composing a mail message"
 msgstr "Otvorí okno na písanie správy"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2192
 msgid "_Open in New Window"
 msgstr "_Otvoriť v novom okne"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2194
 msgid "Open the selected messages in a new window"
 msgstr "Otvorí vybrané správy v novom okne"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2199
 msgid "_Move to Folder..."
 msgstr "Pre_sunúť do priečinka…"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2201
 msgid "Move selected messages to another folder"
 msgstr "Presunie vybrané správy do iného priečinka"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2206
 msgid "_Next Message"
 msgstr "Nas_ledujúca správa"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2208
 msgid "Display the next message"
 msgstr "Zobrazí nasledujúcu správu"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2213
 msgid "Next _Important Message"
 msgstr "Nasledujúca _dôležitá správa"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next important message"
 msgstr "Zobrazí nasledujúcu dôležitú správu"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Thread"
 msgstr "Nasledujúce _vlákno"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next thread"
 msgstr "Zobrazí nasledujúce vlákno"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Unread Message"
 msgstr "Nasledujúca _neprečítaná správa"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next unread message"
 msgstr "Zobrazí nasledujúcu neprečítanú správu"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2234
 msgid "_Previous Message"
 msgstr "_Predchádzajúca správa"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the previous message"
 msgstr "Zobrazí predchádzajúcu správu"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2241
 msgid "Pr_evious Important Message"
 msgstr "P_redchádzajúca dôležitá správa"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous important message"
 msgstr "Zobrazí predchádzajúcu dôležitú správu"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2248
 msgid "Previous T_hread"
 msgstr "Predchádzajúce _vlákno"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous thread"
 msgstr "Zobrazí predchádzajúce vlákno"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2255
 msgid "P_revious Unread Message"
 msgstr "P_redchádzajúca neprečítaná správa"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous unread message"
 msgstr "Zobrazí predchádzajúcu neprečítanú správu"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2264
 msgid "Print this message"
 msgstr "Vytlačí túto správu"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2271
 msgid "Preview the message to be printed"
 msgstr "Zobrazí náhľad správy pred tlačou"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2276
 msgid "Re_direct"
 msgstr "_Presmerovať"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2278
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Presmeruje (bounce) vybranú správu niekomu inému"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2283
 msgid "Remo_ve Attachments"
 msgstr "Odstrániť _prílohy"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2285
 msgid "Remove attachments"
 msgstr "Odstráni prílohy"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2290
 msgid "Remove Du_plicate Messages"
 msgstr "Odstrániť du_plicitné správy"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2292
 msgid "Checks selected messages for duplicates"
 msgstr "Kontroluje vybrané správy na duplicitné"
 
-#: ../mail/e-mail-reader.c:2159 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1547
-#: ../modules/mail/e-mail-attachment-handler.c:214
+#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27 
../modules/calendar/e-cal-shell-view-actions.c:1387 ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2299
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Napíše odpoveď všetkým adresátom vybranej správy"
 
-#: ../mail/e-mail-reader.c:2166 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Odpovedať _do zoznamu"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2306
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Napíše odpoveď do poštovej konferencie vybranej správy"
 
-#: ../mail/e-mail-reader.c:2173
-#: ../modules/mail/e-mail-attachment-handler.c:221
+#: ../mail/e-mail-reader.c:2311 ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2313
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Napíše odpoveď odosielateľovi tejto správy"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2318
 msgid "_Save as mbox..."
 msgstr "Uložiť ako m_box…"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2320
 msgid "Save selected messages as an mbox file"
 msgstr "Uloží vybrané správy ako mbox súbor"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2325
 msgid "_Message Source"
 msgstr "_Zdroj správy"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2327
 msgid "Show the raw email source of the message"
 msgstr "Zobrazí zdrojový poštový formát v správe"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2339
 msgid "_Undelete Message"
 msgstr "Obnoviť vyma_zanú správu"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2341
 msgid "Undelete the selected messages"
 msgstr "Obnoví vybrané správy"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2346
 msgid "_Normal Size"
 msgstr "_Normálna veľkosť"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2348
 msgid "Reset the text to its original size"
 msgstr "Vráti text na jeho pôvodnú veľkosť"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2353
 msgid "_Zoom In"
 msgstr "_Zväčšiť"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2355
 msgid "Increase the text size"
 msgstr "Zväčší veľkosť písma"
 
-#: ../mail/e-mail-reader.c:2222
-msgid "Zoom _Out"
-msgstr "Zme_nšiť"
-
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2362
 msgid "Decrease the text size"
 msgstr "Zmenší veľkosť písma"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2369
 msgid "Cre_ate"
 msgstr "V_ytvoriť"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2376
 msgid "Ch_aracter Encoding"
 msgstr "Zn_aková sada"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2383
 msgid "F_orward As"
 msgstr "P_oslať ďalej ako"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2390
 msgid "_Group Reply"
 msgstr "Odpovedať _skupine"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2397
 msgid "_Go To"
 msgstr "Prejsť _na"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2404
 msgid "Mar_k As"
 msgstr "Oz_načiť ako"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2411
 msgid "_Message"
 msgstr "Správ_a"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2418
 msgid "_Zoom"
 msgstr "_Lupa"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2428
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Vytvoriť vyhľadávací priečinok z poštovej kon_ferencie…"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a search folder for this mailing list"
 msgstr "Vytvorí vyhľadávací priečinok pre túto poštovú konferenciu"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Vytvoriť vyhľadávací priečinok z adresá_tov…"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for these recipients"
 msgstr "Vytvorí vyhľadávací priečinok pre týchto adresátov"
 
-#: ../mail/e-mail-reader.c:2304
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Vytvoriť vyhľadávací priečinok z o_dosielateľa…"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for this sender"
 msgstr "Vytvorí vyhľadávací priečinok pre tohoto odosielateľa"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Vytvoriť vyhľadávací priečinok z predmet_u…"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this subject"
 msgstr "Vytvorí vyhľadávací priečinok pre tento predmet"
 
-#: ../mail/e-mail-reader.c:2336
+#: ../mail/e-mail-reader.c:2478
 msgid "Mark for Follo_w Up..."
 msgstr "Označiť na s_ledovanie…"
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2494
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležité"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2498
 msgid "Mark as _Junk"
 msgstr "Označ_iť ako nevyžiadanú poštu"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2502
 msgid "Mark as _Not Junk"
 msgstr "Označiť ako _očakávanú poštu"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2506
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2518
 msgid "Mark as Uni_mportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2522
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: ../mail/e-mail-reader.c:2408
+#: ../mail/e-mail-reader.c:2566
 msgid "_Caret Mode"
 msgstr "Režim _kurzora"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2568
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Zobrazí blikajúci kurzor v texte zobrazenej správy"
 
-#: ../mail/e-mail-reader.c:2416
+#: ../mail/e-mail-reader.c:2574
 msgid "All Message _Headers"
 msgstr "Všetky _hlavičky správy"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2576
 msgid "Show messages with all email headers"
 msgstr "Zobrazí správy so všetkými hlavičkami elektronickej pošty"
 
-#: ../mail/e-mail-reader.c:2782
+#: ../mail/e-mail-reader.c:3019
 msgid "Retrieving message"
 msgstr "Získava sa správa"
 
-#: ../mail/e-mail-reader.c:3704
-#: ../modules/mail/e-mail-attachment-handler.c:207
+#: ../mail/e-mail-reader.c:4027 ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: ../mail/e-mail-reader.c:3705
+#: ../mail/e-mail-reader.c:4028
 msgid "Forward the selected message to someone"
 msgstr "Prepošle niekomu vybranú správu"
 
-#: ../mail/e-mail-reader.c:3724
+#: ../mail/e-mail-reader.c:4047
 msgid "Group Reply"
 msgstr "Odpovedať skupine"
 
-#: ../mail/e-mail-reader.c:3725
+#: ../mail/e-mail-reader.c:4048
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Odpovie do poštovej konferencie alebo všetkým adresátom"
 
-#: ../mail/e-mail-reader.c:3791 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:4114 ../mail/filtertypes.xml.in.h:65
 msgid "Delete"
 msgstr "Zmazať"
 
-#: ../mail/e-mail-reader.c:3803
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../mail/e-mail-reader.c:4126 ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Nasledujúca"
 
-#: ../mail/e-mail-reader.c:3807
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../mail/e-mail-reader.c:4130 ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Predchádzajúca"
 
-#: ../mail/e-mail-reader.c:3816 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:4139 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: ../mail/e-mail-reader-utils.c:148
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Už ma znovu neupozorňovať"
 
-#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:171
-#: ../smime/gui/certificate-manager.c:330
+#: ../mail/e-mail-reader-utils.c:556 ../modules/cal-config-caldav/e-caldav-chooser.c:1800 
../plugins/face/face.c:170 ../shell/e-shell.c:856 ../shell/e-shell.c:877 
../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: ../mail/e-mail-reader-utils.c:976
+#: ../mail/e-mail-reader-utils.c:1033
+#, fuzzy
+#| msgid "Preview data to be imported"
+msgid "Marking thread to be ignored"
+msgstr "Náhľad správy, ktorú importovať"
+
+#: ../mail/e-mail-reader-utils.c:1037
+msgid "Unmarking thread from being ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1041
+msgid "Marking subthread to be ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1045
+msgid "Unmarking subthread from being ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1280
 msgid "Printing"
 msgstr "Tlačí sa"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
+#: ../mail/e-mail-reader-utils.c:1515
 #, c-format
-msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-"Priečinok „%s“ obsahuje %u duplicitných správ. Ste si istý, že ich chcete "
-"vymazať?"
-msgstr[1] ""
-"Priečinok „%s“ obsahuje %u duplicitnú správu. Ste si istý, že ju chcete "
-"vymazať?"
-msgstr[2] ""
-"Priečinok „%s“ obsahuje %u duplicitné správy. Ste si istý, že ich chcete "
-"vymazať?"
+msgid "Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
+msgid_plural "Folder '%s' contains %u duplicate messages. Are you sure you want to delete them?"
+msgstr[0] "Priečinok „%s“ obsahuje %u duplicitných správ. Ste si istý, že ich chcete vymazať?"
+msgstr[1] "Priečinok „%s“ obsahuje %u duplicitnú správu. Ste si istý, že ju chcete vymazať?"
+msgstr[2] "Priečinok „%s“ obsahuje %u duplicitné správy. Ste si istý, že ich chcete vymazať?"
 
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../mail/e-mail-reader-utils.c:2345
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Uložiť správy"
@@ -13543,521 +14962,269 @@ msgstr[2] "Uložiť správy"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2047
+#: ../mail/e-mail-reader-utils.c:2366
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Správy"
 msgstr[1] "Správa"
 msgstr[2] "Správy"
 
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2739
 msgid "Parsing message"
 msgstr "Analyzuje sa správa"
 
-#: ../mail/e-mail-request.c:197
+#: ../mail/e-mail-request.c:199
 msgid "The message has no text content."
 msgstr "Tieto správy nemajú textový obsah."
 
-#: ../mail/e-mail-tag-editor.c:238
+#: ../mail/e-mail-tag-editor.c:237
 msgid "Flag to Follow Up"
 msgstr "Označiť značkou Vybaviť"
 
+#: ../mail/e-mail-ui-session.c:804
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s overenie totožnosti zlyhalo"
+
+#: ../mail/e-mail-ui-session.c:854
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "Nebol nájdený žiadny zdroj údajov pre UID „%s“"
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1455
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"V ${WeekdayName}, ${ Day}. ${MonthName} ${Year} o ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} napísal(a):"
+#: ../mail/em-composer-utils.c:1507
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "V ${WeekdayName}, ${ Day}. ${MonthName} ${Year} o ${24Hour}:${Minute} ${TimeZone}, ${Sender} 
napísal(a):"
 
 # PŠ: navrhujem prekladať "Forward message" ako "Preposlať správu", všade. Tu to bude potom "Preposlaná 
správa"
-#: ../mail/em-composer-utils.c:1461
+#: ../mail/em-composer-utils.c:1513
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Ďalej poslaná správa --------"
 
-#: ../mail/em-composer-utils.c:1466
+#: ../mail/em-composer-utils.c:1518
 msgid "-----Original Message-----"
 msgstr "-----Pôvodná správa-----"
 
-#: ../mail/em-composer-utils.c:2616
+#: ../mail/em-composer-utils.c:2668
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
-#: ../mail/em-composer-utils.c:3041
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3074
 msgid "Posting destination"
 msgstr "Cieľ posielania"
 
 # label
-#: ../mail/em-composer-utils.c:3042
+#: ../mail/em-composer-utils.c:3079
 msgid "Choose folders to post the message to."
 msgstr "Zvoľte priečinky kam poslať správu."
 
-#: ../mail/em-filter-editor-folder-element.c:154
+#: ../mail/em-filter-editor-folder-element.c:153
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Upraviť skóre"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "Ktorákoľvek hlavička"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "Priradiť farbu"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "Priradiť skóre"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "Skrytá kópia"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "Pípnuť"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "Kópia"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "Úplný"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date received"
-msgstr "Dátum prijatia"
-
-#: ../mail/em-filter-i18n.h:14
-msgid "Date sent"
-msgstr "Dátum odoslania"
-
-#: ../mail/em-filter-i18n.h:16
-msgid "Deleted"
-msgstr "Zmazané"
-
-#: ../mail/em-filter-i18n.h:18
-msgid "does not end with"
-msgstr "nekončí na"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "does not exist"
-msgstr "neexistuje"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "does not have words"
-msgstr "neobsahuje slová"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "does not return"
-msgstr "nevrátiť"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "does not sound like"
-msgstr "nevyzerá ako"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "does not start with"
-msgstr "nezačína na"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Draft"
-msgstr "Koncept"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "ends with"
-msgstr "končí na"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "exists"
-msgstr "existuje"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Expression"
-msgstr "Výraz"
-
-#: ../mail/em-filter-i18n.h:30
-msgid "Follow Up"
-msgstr "Vybaviť"
-
-#: ../mail/em-filter-i18n.h:31
-msgid "Forward to"
-msgstr "Poslať ďalej"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "has words"
-msgstr "obsahuje slová"
-
-#: ../mail/em-filter-i18n.h:33
-msgid "Important"
-msgstr "Dôležitá"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is after"
-msgstr "je po"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is before"
-msgstr "je pred"
-
-#: ../mail/em-filter-i18n.h:37
-msgid "is Flagged"
-msgstr "je označený"
-
-#: ../mail/em-filter-i18n.h:41
-msgid "is not Flagged"
-msgstr "nie je označený"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "is not set"
-msgstr "nie je nastavené"
-
-#: ../mail/em-filter-i18n.h:43
-msgid "is set"
-msgstr "je nastavené"
-
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:106
-msgid "Junk"
-msgstr "Nevyžiadaná pošta"
-
-#: ../mail/em-filter-i18n.h:45
-msgid "Junk Test"
-msgstr "Test nevyžiadanej pošty"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Label"
-msgstr "Menovka"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Mailing list"
-msgstr "Konferencia"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Match All"
-msgstr "Vyhovuje všetko"
-
-#: ../mail/em-filter-i18n.h:49
-msgid "Message Body"
-msgstr "Telo správy"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Message Header"
-msgstr "Hlavička správy"
-
-#: ../mail/em-filter-i18n.h:51
-msgid "Message is Junk"
-msgstr "Správa je nevyžiadaná pošta"
-
-#: ../mail/em-filter-i18n.h:52
-msgid "Message is not Junk"
-msgstr "Správa nie je nevyžiadaná pošta"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Message Location"
-msgstr "Umiestnenie správy"
-
-#: ../mail/em-filter-i18n.h:55
-msgid "Pipe to Program"
-msgstr "Zreťaziť do programu"
-
-#: ../mail/em-filter-i18n.h:56
-msgid "Play Sound"
-msgstr "Zahrať zvuk"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
-msgid "Read"
-msgstr "Prečítaná"
-
-#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "Adresáti"
-
-#: ../mail/em-filter-i18n.h:59
-msgid "Regex Match"
-msgstr "Regul. výraz"
-
-#: ../mail/em-filter-i18n.h:60
-msgid "Replied to"
-msgstr "Odpovedaná"
-
-#: ../mail/em-filter-i18n.h:61
-msgid "returns"
-msgstr "vráti"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "returns greater than"
-msgstr "vráti viac než"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "returns less than"
-msgstr "vráti menej než"
-
-#: ../mail/em-filter-i18n.h:64
-msgid "Run Program"
-msgstr "Spustiť program"
-
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "Skóre"
-
-#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "Odosielateľ"
-
-#: ../mail/em-filter-i18n.h:67
-msgid "Sender or Recipients"
-msgstr "Odosielateľ alebo adresáti"
-
-#: ../mail/em-filter-i18n.h:68
-msgid "Set Label"
-msgstr "Nastaviť menovku"
-
-#: ../mail/em-filter-i18n.h:69
-msgid "Set Status"
-msgstr "Nastaviť stav"
-
-#: ../mail/em-filter-i18n.h:70
-msgid "Size (kB)"
-msgstr "Veľkosť (kB)"
-
-#: ../mail/em-filter-i18n.h:71
-msgid "sounds like"
-msgstr "vyzerá ako"
-
-#: ../mail/em-filter-i18n.h:72
-msgid "Source Account"
-msgstr "Zdrojový účet"
-
-#: ../mail/em-filter-i18n.h:73
-msgid "Specific header"
-msgstr "Konkrétna hlavička"
-
-#: ../mail/em-filter-i18n.h:74
-msgid "starts with"
-msgstr "začína na"
-
-#: ../mail/em-filter-i18n.h:76
-msgid "Stop Processing"
-msgstr "Zastaviť spracovanie"
-
-#: ../mail/em-filter-i18n.h:79
-msgid "Unset Color"
-msgstr "Zrušiť nastavenie farby"
-
-#: ../mail/em-filter-i18n.h:80
-msgid "Unset Status"
-msgstr "Zrušiť nastavenie stavu"
-
 #. and now for the action area
-#: ../mail/em-filter-rule.c:586
+#: ../mail/em-filter-rule.c:587
 msgid "Then"
 msgstr "Potom"
 
-#: ../mail/em-filter-rule.c:651
+#: ../mail/em-filter-rule.c:652
 msgid "Add Ac_tion"
 msgstr "Pridať ak_ciu"
 
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:177
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Neprečítaných správ:"
 msgstr[1] "Neprečítaných správ:"
 msgstr[2] "Neprečítaných správ:"
 
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:188
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Spolu správ:"
 msgstr[1] "Spolu správ:"
 msgstr[2] "Spolu správ:"
 
-#: ../mail/em-folder-properties.c:210
+#: ../mail/em-folder-properties.c:209
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Využitie kvóty (%s):"
 
-#: ../mail/em-folder-properties.c:212
+#: ../mail/em-folder-properties.c:211
 #, c-format
 msgid "Quota usage"
 msgstr "Využitie kvóty"
 
-#: ../mail/em-folder-properties.c:285
+#. Translators: Label of a combo with a list of configured accounts where a user can
+#. choose which account to use as the sender when composing a message in this folder
+#: ../mail/em-folder-properties.c:286
 msgid "_Send Account Override:"
 msgstr ""
 
-#: ../mail/em-folder-properties.c:414
+#: ../mail/em-folder-properties.c:415
 msgid "Folder Properties"
 msgstr "Vlastnosti priečinka"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:76
 msgid "<click here to select a folder>"
 msgstr "<kliknutím vyberiete priečinok>"
 
-#: ../mail/em-folder-selector.c:388
-msgid "C_reate"
-msgstr "Vytvo_riť"
-
-#: ../mail/em-folder-selector.c:394
-msgid "Folder _name:"
-msgstr "_Názov priečinka:"
+# tooltip
+#: ../mail/em-folder-selector.c:398
+#, fuzzy
+#| msgid "Create a new mail folder"
+msgid "Create a new folder"
+msgstr "Vytvorí nový poštový priečinok"
 
-#: ../mail/em-folder-tree.c:628
+#: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "Názvy priečinkov nemôžu obsahovať '/'"
 
-#: ../mail/em-folder-tree.c:765
+#: ../mail/em-folder-tree.c:819
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1588
+#: ../mail/em-folder-tree.c:1668
 msgid "Mail Folder Tree"
 msgstr "Strom poštových priečinkov"
 
-#: ../mail/em-folder-tree.c:2136 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "Presúva sa priečinok %s"
 
-#: ../mail/em-folder-tree.c:2139 ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopíruje sa priečinok %s"
 
-#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2269
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2470
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Presúvajú sa správy do priečinka %s"
 
-#: ../mail/em-folder-tree.c:2150 ../mail/message-list.c:2271
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2472
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopírujú sa správy do priečinka %s"
 
-#: ../mail/em-folder-tree.c:2169
+#: ../mail/em-folder-tree.c:2249
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nedá sa posunúť správu(y) do najvyššej úrovne úložiska"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:431 ../mail/em-folder-tree-model.c:433
+#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
 msgid "UNMATCHED"
 msgstr "NEVYHOVUJÚCE"
 
-#: ../mail/em-folder-tree-model.c:1223 ../mail/em-folder-tree-model.c:1600
+#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
 msgid "Loading..."
 msgstr "Načítava sa…"
 
-#: ../mail/em-folder-utils.c:507
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Presúvanie priečinka do"
 
-#: ../mail/em-folder-utils.c:507
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Kopírovanie priečinka do"
 
-#: ../mail/em-folder-utils.c:605
-msgid "Create Folder"
-msgstr "Vytvorenie priečinka"
-
-#: ../mail/em-folder-utils.c:606
-msgid "Specify where to create the folder:"
-msgstr "Zadajte, kde sa má vytvoriť priečinok:"
-
-#: ../mail/em-subscription-editor.c:856
+#: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "_Prihlásiť k odberu"
 
-#: ../mail/em-subscription-editor.c:865
+#: ../mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
 msgstr "Prihlásiť sa k _zobrazeným"
 
-#: ../mail/em-subscription-editor.c:873
+#: ../mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "Prihlásiť sa ku _všetkým"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1868
-#: ../modules/mail/e-mail-shell-view-actions.c:1632
+#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867 
../modules/mail/e-mail-shell-view-actions.c:1685
 msgid "_Unsubscribe"
 msgstr "O_dhlásiť odber"
 
-#: ../mail/em-subscription-editor.c:979
+#: ../mail/em-subscription-editor.c:978
 msgid "Unsu_bscribe From Hidden"
 msgstr "Odhlásiť sa z _neviditeľných"
 
-#: ../mail/em-subscription-editor.c:987
+#: ../mail/em-subscription-editor.c:986
 msgid "Unsubscribe From _All"
 msgstr "Odhlásiť sa zo _všetkých"
 
-#: ../mail/em-subscription-editor.c:1705
+#: ../mail/em-subscription-editor.c:1704
 msgid "Folder Subscriptions"
 msgstr "Priečinky prihlásené k odberu"
 
-#: ../mail/em-subscription-editor.c:1744
+#: ../mail/em-subscription-editor.c:1743
 msgid "_Account:"
 msgstr "Úč_et:"
 
-#: ../mail/em-subscription-editor.c:1757
+#: ../mail/em-subscription-editor.c:1756
 msgid "Clear Search"
 msgstr "Vyčistiť hľadanie"
 
-#: ../mail/em-subscription-editor.c:1774
+#: ../mail/em-subscription-editor.c:1773
 msgid "Sho_w items that contain:"
 msgstr "_Zobraziť položky obsahujúce:"
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../mail/em-subscription-editor.c:1820
 msgid "Subscribe to the selected folder"
 msgstr "Prihlási sa k odberu vybraného priečinka"
 
-#: ../mail/em-subscription-editor.c:1822
+#: ../mail/em-subscription-editor.c:1821
 msgid "Su_bscribe"
 msgstr "P_rihlásiť k odberu"
 
-#: ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1634
+#: ../mail/em-subscription-editor.c:1866 ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Unsubscribe from the selected folder"
 msgstr "Odhlási z odberu vybraného priečinka"
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../mail/em-subscription-editor.c:1906
 msgid "Collapse all folders"
 msgstr "Zbalí všetky priečinky"
 
-#: ../mail/em-subscription-editor.c:1908
+#: ../mail/em-subscription-editor.c:1907
 msgid "C_ollapse All"
 msgstr "Zbaliť _všetko"
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../mail/em-subscription-editor.c:1917
 msgid "Expand all folders"
 msgstr "Rozbalí všetky priečinky"
 
-#: ../mail/em-subscription-editor.c:1919
+#: ../mail/em-subscription-editor.c:1918
 msgid "E_xpand All"
 msgstr "Roz_baliť všetko"
 
-#: ../mail/em-subscription-editor.c:1929
+#: ../mail/em-subscription-editor.c:1928
 msgid "Refresh the folder list"
 msgstr "Obnoví zoznam priečinkov"
 
-#: ../mail/em-subscription-editor.c:1941
+#: ../mail/em-subscription-editor.c:1929 ../modules/mail/e-mail-shell-view-actions.c:1587 
../modules/mail/e-mail-shell-view-actions.c:1657
+msgid "_Refresh"
+msgstr "_Obnoviť"
+
+#: ../mail/em-subscription-editor.c:1940
 msgid "Stop the current operation"
 msgstr "Zastaví aktuálnu operáciu"
 
+#: ../mail/em-subscription-editor.c:1941 ../modules/addressbook/e-book-shell-view-actions.c:979
+msgid "_Stop"
+msgstr ""
+
 #. Translators: This message is shown only for ten or more
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:77
+#: ../mail/em-utils.c:75
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
@@ -14065,154 +15232,396 @@ msgstr[0] "Ste si istý, že chcete naraz otvoriť %d správ?"
 msgstr[1] "Ste si istý, že chcete naraz otvoriť %d správu?"
 msgstr[2] "Ste si istý, že chcete naraz otvoriť %d správy?"
 
-#: ../mail/em-utils.c:133
-#: ../modules/mailto-handler/evolution-mailto-handler.c:150
-msgid "_Do not show this message again"
-msgstr "_Túto správu už znovu nezobrazovať"
-
-#: ../mail/em-utils.c:243
+#: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "Filtre správ"
 
-#: ../mail/em-utils.c:972
+#: ../mail/em-utils.c:970
 #, c-format
 msgid "Messages from %s"
 msgstr "Správy od %s"
 
-#: ../mail/em-vfolder-editor.c:105
+#: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Vyhľadávacie _priečinky"
 
-#: ../mail/em-vfolder-editor-rule.c:393
+#: ../mail/em-vfolder-editor-rule.c:392
 msgid "Add Folder"
 msgstr "Pridať priečinok"
 
-#: ../mail/em-vfolder-editor-rule.c:519
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr "Zdroje vyhľadávacích priečinokv"
 
-#: ../mail/em-vfolder-editor-rule.c:551
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr "Automaticky aktualizovať pri zmene ktoréhokoľvek _zdrojového priečinka"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "Všetky lokálne priečinky"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "Všetky aktívne vzdialené priečinky"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "Všetky lokálne a aktívne vzdialené priečinky"
 
-#: ../mail/em-vfolder-editor-rule.c:566
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "Špecifické priečinky"
 
-#: ../mail/em-vfolder-editor-rule.c:604
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "vrátane podpriečinkov"
 
-#: ../mail/importers/elm-importer.c:174
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15 ../mail/searchtypes.xml.in.h:1 
../mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "Odosielateľ"
+
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6 ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "začína na"
+
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7 ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "nezačína na"
+
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8 ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "končí na"
+
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9 ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "nekončí na"
+
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12 ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "vyzerá ako"
+
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13 ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "nevyzerá ako"
+
+#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16 ../mail/searchtypes.xml.in.h:10 
../mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
+msgstr "Adresáti"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14 ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "Kópia"
+
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15 ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "Skrytá kópia"
+
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16 ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "Odosielateľ alebo adresáti"
+
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18 ../mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "obsahuje slová"
+
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19 ../mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "neobsahuje slová"
+
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20 ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "Konkrétna hlavička"
+
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21 ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "existuje"
+
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22 ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "neexistuje"
+
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24 ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "Telo správy"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25 ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "Výraz"
+
+#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26 ../mail/vfoldertypes.xml.in.h:26
+#, fuzzy
+#| msgid "Expression"
+msgid "Free Form Expression"
+msgstr "Výraz"
+
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27 ../mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
+msgstr "Dátum odoslania"
+
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28 ../mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "je pred"
+
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29 ../mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "je po"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30 ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "Dátum prijatia"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31 ../mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "Menovka"
+
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3 ../mail/searchtypes.xml.in.h:32 
../mail/vfoldertypes.xml.in.h:32
+msgid "Score"
+msgstr "Skóre"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35 ../mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "Veľkosť (kB)"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37 ../mail/vfoldertypes.xml.in.h:37
+msgid "Replied to"
+msgstr "Odpovedaná"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40 ../mail/vfoldertypes.xml.in.h:40
+msgid "Important"
+msgstr "Dôležitá"
+
+#. Past tense, as in "has been read".
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15 ../mail/searchtypes.xml.in.h:41 
../mail/vfoldertypes.xml.in.h:41
+msgid "Read"
+msgstr "Prečítaná"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:120 ../mail/vfoldertypes.xml.in.h:42
+msgid "Junk"
+msgstr "Nevyžiadaná pošta"
+
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42 ../mail/vfoldertypes.xml.in.h:43
+msgid "Follow Up"
+msgstr "Vybaviť"
+
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43 ../mail/vfoldertypes.xml.in.h:44
+msgid "is Flagged"
+msgstr "je označený"
+
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44 ../mail/vfoldertypes.xml.in.h:45
+msgid "is not Flagged"
+msgstr "nie je označený"
+
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45 ../mail/vfoldertypes.xml.in.h:46
+msgid "Completed On"
+msgstr "Úplný"
+
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46 ../mail/vfoldertypes.xml.in.h:47
+msgid "is set"
+msgstr "je nastavené"
+
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47 ../mail/vfoldertypes.xml.in.h:48
+msgid "is not set"
+msgstr "nie je nastavené"
+
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
+msgid "Mailing list"
+msgstr "Konferencia"
+
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52 ../mail/vfoldertypes.xml.in.h:53
+msgid "Regex Match"
+msgstr "Regul. výraz"
+
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53 ../mail/vfoldertypes.xml.in.h:54
+msgid "Message Header"
+msgstr "Hlavička správy"
+
+#: ../mail/filtertypes.xml.in.h:52
+msgid "Source Account"
+msgstr "Zdrojový účet"
+
+#: ../mail/filtertypes.xml.in.h:53
+msgid "Pipe to Program"
+msgstr "Zreťaziť do programu"
+
+#: ../mail/filtertypes.xml.in.h:54
+msgid "returns"
+msgstr "vráti"
+
+#: ../mail/filtertypes.xml.in.h:55
+msgid "does not return"
+msgstr "nevrátiť"
+
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns greater than"
+msgstr "vráti viac než"
+
+#: ../mail/filtertypes.xml.in.h:57
+msgid "returns less than"
+msgstr "vráti menej než"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "Junk Test"
+msgstr "Test nevyžiadanej pošty"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "Message is Junk"
+msgstr "Správa je nevyžiadaná pošta"
+
+#: ../mail/filtertypes.xml.in.h:60
+msgid "Message is not Junk"
+msgstr "Správa nie je nevyžiadaná pošta"
+
+#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+msgid "Message Location"
+msgstr "Umiestnenie správy"
+
+#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54 ../mail/vfoldertypes.xml.in.h:56
+msgid "Match All"
+msgstr "Vyhovuje všetko"
+
+#: ../mail/filtertypes.xml.in.h:66
+msgid "Stop Processing"
+msgstr "Zastaviť spracovanie"
+
+#: ../mail/filtertypes.xml.in.h:67
+msgid "Set Label"
+msgstr "Nastaviť menovku"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Assign Color"
+msgstr "Priradiť farbu"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Unset Color"
+msgstr "Zrušiť nastavenie farby"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Assign Score"
+msgstr "Priradiť skóre"
+
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Adjust Score"
+msgstr "Upraviť skóre"
+
+#: ../mail/filtertypes.xml.in.h:72
+msgid "Set Status"
+msgstr "Nastaviť stav"
+
+#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+msgid "Deleted"
+msgstr "Zmazané"
+
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Unset Status"
+msgstr "Zrušiť nastavenie stavu"
+
+#: ../mail/filtertypes.xml.in.h:75
+msgid "Beep"
+msgstr "Pípnuť"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Play Sound"
+msgstr "Zahrať zvuk"
+
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Run Program"
+msgstr "Spustiť program"
+
+#: ../mail/filtertypes.xml.in.h:78
+msgid "Forward to"
+msgstr "Poslať ďalej"
+
+#: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Importujú sa Elm údaje"
 
-#: ../mail/importers/elm-importer.c:375
+#: ../mail/importers/elm-importer.c:374
 msgid "Evolution Elm importer"
 msgstr "Importovací nástroj Evolution Elm"
 
-#: ../mail/importers/elm-importer.c:376
+#: ../mail/importers/elm-importer.c:375
 msgid "Import mail from Elm."
 msgstr "Importuje poštu z Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:135
-#: ../plugins/dbx-import/dbx-importer.c:247
+#: ../mail/importers/evolution-mbox-importer.c:134 ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Cieľový priečinok:"
 
-#: ../mail/importers/evolution-mbox-importer.c:141
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:542
+#: ../mail/importers/evolution-mbox-importer.c:140 ../plugins/dbx-import/dbx-importer.c:252 
../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "Vyberte priečinok"
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:254
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../mail/importers/evolution-mbox-importer.c:141 ../plugins/dbx-import/dbx-importer.c:253 
../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "Vyberte priečinok, do ktorého importovať"
 
-#: ../mail/importers/evolution-mbox-importer.c:436
+#: ../mail/importers/evolution-mbox-importer.c:435
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Predmet"
 
-#: ../mail/importers/evolution-mbox-importer.c:441
+#: ../mail/importers/evolution-mbox-importer.c:440
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Od"
 
-#: ../mail/importers/evolution-mbox-importer.c:494
-#: ../shell/e-shell-utils.c:172
+#: ../mail/importers/evolution-mbox-importer.c:493 ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Poštový priečinok Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:495
+#: ../mail/importers/evolution-mbox-importer.c:494
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importovací nástroj poštových priečinkov formátu Berkeley"
 
-#: ../mail/importers/mail-importer.c:56
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "Importuje sa mailbox"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:146
-#: ../plugins/dbx-import/dbx-importer.c:610
-#: ../plugins/pst-import/pst-importer.c:761
+#: ../mail/importers/mail-importer.c:144 ../plugins/dbx-import/dbx-importer.c:609 
../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importuje sa „%s“"
 
-#: ../mail/importers/mail-importer.c:311
+#: ../mail/importers/mail-importer.c:309
 #, c-format
 msgid "Scanning %s"
 msgstr "Prehľadáva sa %s"
 
-#: ../mail/importers/pine-importer.c:248
+#: ../mail/importers/pine-importer.c:247
 msgid "Importing Pine data"
 msgstr "Importujú sa Pine údaje"
 
-#: ../mail/importers/pine-importer.c:476
+#: ../mail/importers/pine-importer.c:475
 msgid "Evolution Pine importer"
 msgstr "Importovací nástroj Evolution Pine"
 
-#: ../mail/importers/pine-importer.c:477
+#: ../mail/importers/pine-importer.c:476
 msgid "Import mail from Pine."
 msgstr "Importuje poštu z Pine."
 
-#: ../mail/mail-autofilter.c:64
+#: ../mail/mail-autofilter.c:63
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta pre %s"
 
-#: ../mail/mail-autofilter.c:220 ../mail/mail-autofilter.c:263
+#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: ../mail/mail-autofilter.c:246
+#: ../mail/mail-autofilter.c:245
 #, c-format
 msgid "Subject is %s"
 msgstr "Predmet je %s"
 
-#: ../mail/mail-autofilter.c:287
+#: ../mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "Poštová konferencia %s"
 
-#: ../mail/mail-autofilter.c:397
+#: ../mail/mail-autofilter.c:396
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
@@ -14221,7 +15630,7 @@ msgstr "Pridať pravidlo filtra"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:506
+#: ../mail/mail-autofilter.c:505
 #, fuzzy, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -14238,75 +15647,81 @@ msgstr[2] ""
 msgid "Set custom junk header"
 msgstr "Nastaviť vlastnú hlavičku pre nevyžiadanú poštu"
 
-#: ../mail/mail-config.ui.h:2
-msgid ""
-"All new emails with header that matches given content will be automatically "
-"filtered as junk"
-msgstr ""
-"Všetky nové správy s hlavičkou, ktorá vyhovuje danému obsahu, budú "
-"automaticky filtrované ako nevyžiadaná pošta"
+#: ../mail/mail-config.ui.h:4
+msgid "All new emails with header that matches given content will be automatically filtered as junk"
+msgstr "Všetky nové správy s hlavičkou, ktorá vyhovuje danému obsahu, budú automaticky filtrované ako 
nevyžiadaná pošta"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "Názov hlavičky"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "Obsah hlavičky"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "Predvolené správanie"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr "Písať správy v _HTML"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:9
 msgid "Automatically insert _emoticon images"
 msgstr "Automaticky vložiť _smejkov"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:10
 msgid "Always request rea_d receipt"
 msgstr "Vž_dy poslať späť správu o prečítaní"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:11
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Kódovať názvy súborov v štýle _Outlook/GMail"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:12
+#, fuzzy
+#| msgid "Saving message to Outbox."
+msgid "Send messages through Outbo_x folder"
+msgstr "Ukladá sa správa do Pošty na odoslanie."
+
+#: ../mail/mail-config.ui.h:13
+msgid "Number of characters for word w_rapping:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:14
 msgid "Ch_aracter encoding:"
 msgstr "Zn_aková sada:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:15
 msgid "Replies and Forwards"
 msgstr "Odpovede a posielania ďalej"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:16
 msgid "_Reply style:"
 msgstr "Š_týl odpovede:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:17
 msgid "_Forward style:"
 msgstr "Štýl _posielania ďalej:"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:18
 msgid "Start _typing at the bottom on replying"
 msgstr "Pri odpovedaní začať písať _dole"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:19
 msgid "_Keep signature above the original message on replying"
 msgstr "_Pri odpovedaní nechať podpis nad pôvodnou správou"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:20
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_norovať „Odpovedať komu:“ pre poštové konferencie."
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:21
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Odpovedať sk_upine smeruje len do konferencie, ak je to možné"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:22
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "Digitálne podpisovať správy ak pôvodné sú podísané (P_GP alebo S/MIME)"
 
@@ -14314,351 +15729,344 @@ msgstr "Digitálne podpisovať správy ak pôvodné sú podísané (P_GP alebo S
 #     Popisuje spôsob odpovedania na e-mail a posielania ďalej. Dáva: Príloh
 #     Bolo by vhodnejšie „ako príloha“
 # PŠ: zjavne to už spravili :-)
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:23
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Ako prílohu"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "V texte (Outlook štýl)"
 
 # Styl odpovede:
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citovať"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Necitovať"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "V texte"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:29
 msgid "Sig_natures"
 msgstr "_Podpisy"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:30
 msgid "Signatures"
 msgstr "Podpisy"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:31
 msgid "_Languages"
 msgstr "_Jazyky"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:32
 msgid "Languages Table"
 msgstr "Tabuľka jazykov"
 
-#: ../mail/mail-config.ui.h:29
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Zoznam jazykov obsahuje iba tie, pre ktoré máte nainštalované slovníky."
+#: ../mail/mail-config.ui.h:33
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "Zoznam jazykov obsahuje iba tie, pre ktoré máte nainštalované slovníky."
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:35
 msgid "Check spelling while I _type"
 msgstr "Kontrolovať pravopis _počas písania"
 
-#: ../mail/mail-config.ui.h:32
-msgid "Color for _misspelled words:"
-msgstr "Farba pre ne_správne slová:"
-
-#: ../mail/mail-config.ui.h:33
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "Vyberte farbu"
-
-#: ../mail/mail-config.ui.h:34
-msgid "Spell Checking"
-msgstr "Kontrola pravopisu"
-
-#: ../mail/mail-config.ui.h:35
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr ""
-"Na pomoc pred nehodami a nepríjemnosťami, pýtať sa na potvrdenie pred "
-"vykonaním nasledujúcich označených akcií:"
+#: ../mail/mail-config.ui.h:37
+msgid "To help avoid email accidents and embarrassments, ask for confirmation before taking the following 
checkmarked actions:"
+msgstr "Na pomoc pred nehodami a nepríjemnosťami, pýtať sa na potvrdenie pred vykonaním nasledujúcich 
označených akcií:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with an _empty subject line"
 msgstr "Posielanie správy bez pr_edmetu"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Posielanie správy s adresátmi iba v skrytej _kópii"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Posielanie _súkromnej odpovede do poštovej konferencie"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Posielanie odpovede veľkému _počtu adresátov"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
 msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr ""
-"Povolenie p_oštovej konferencii presmerovať súkromnú správu do konferencie"
+msgstr "Povolenie p_oštovej konferencii presmerovať súkromnú správu do konferencie"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Posielanie správy s adresátmi bez emailových _adries"
 
-#: ../mail/mail-config.ui.h:48
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:51
+#, fuzzy
+#| msgid "Sending a message with an _empty subject line"
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "Posielanie správy bez pr_edmetu"
+
+#: ../mail/mail-config.ui.h:52
 msgid "Confirmations"
 msgstr "Potvrdenia"
 
-#: ../mail/mail-config.ui.h:49
+#. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
+#: ../mail/mail-config.ui.h:56
 #, fuzzy
-#| msgid "_Add"
-msgid "Add"
+#| msgid "Search Folders"
+msgid "Use for Folders"
+msgstr "Vyhľadávacie priečinky"
+
+#: ../mail/mail-config.ui.h:57
+msgid "A_dd"
 msgstr "_Pridať"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:59
 #, fuzzy
 #| msgid "_Remove"
-msgid "Remove"
+msgid "Re_move"
 msgstr "O_dstrániť"
 
-#: ../mail/mail-config.ui.h:51
-#, fuzzy
-#| msgid "Search Folders"
-msgid " Use for Folders "
-msgstr "Vyhľadávacie priečinky"
-
-#: ../mail/mail-config.ui.h:52
-#, fuzzy
-#| msgid "_Edit"
-msgid "Edit"
-msgstr "_Upraviť"
-
-#: ../mail/mail-config.ui.h:53
+#. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
+#: ../mail/mail-config.ui.h:61
 #, fuzzy
 #| msgid "Sender or Recipients"
-msgid " Use for Recipients "
+msgid "Use for Recipients"
 msgstr "Odosielateľ alebo adresáti"
 
-#: ../mail/mail-config.ui.h:54
+#. Translators: Label of a frame with a list of configured accounts in Send account overrides
+#: ../mail/mail-config.ui.h:63 ../modules/mail/em-composer-prefs.c:836
 #, fuzzy
 #| msgid "_Account:"
-msgid " Account "
+msgid "Account"
 msgstr "Úč_et:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:64
 msgid "Send account overrides"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:65
 msgid ""
-"Assign which account should be used as a send account for respective folders "
-"or recipients, an override for usual send account detection. List of "
-"recipients can contain partial addresses or names. The name and the address "
-"parts are compared separately."
+"Assign which account should be used as a send account for respective folders or recipients, an override for 
usual send account detection. List of recipients can contain partial addresses or names. The name "
+"and the address parts are compared separately."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:57
-msgid "Folder override has precedence over Recipient override"
+#: ../mail/mail-config.ui.h:66
+msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:67
 #, fuzzy
 #| msgid "Source Account"
 msgid "Send Account"
 msgstr "Zdrojový účet"
 
 # MČ: ak som správne pochopil ide o prvé prvočíslo z privátneho klúča
-#: ../mail/mail-config.ui.h:64 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:73 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
 # MČ: ak som správne pochopil ide o druhé prvočíslo z privátneho klúča
-#: ../mail/mail-config.ui.h:65 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:75
 msgid "Start up"
 msgstr "Spustenie"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:76
 msgid "Check for new _messages on start"
 msgstr "Kontrolovať _nové správy pri spustení"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:77
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Kontrolovať n_ové správy vo všetkých aktívnych účtoch"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:78
 msgid "Message Display"
 msgstr "Zobrazenie správy"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:79
 msgid "_Use the same fonts as other applications"
 msgstr "Po_užiť rovnaké písma ako ostatné aplikácie"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:80
 msgid "S_tandard Font:"
 msgstr "_Predvolené písmo:"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:81
 msgid "Select HTML fixed width font"
 msgstr "Vyberte písmo s pevnou šírkou pre HTML"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:82
 msgid "Select HTML variable width font"
 msgstr "Vyberte písmo s premenlivou šírkou pre HTML"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:83
 msgid "Fix_ed Width Font:"
 msgstr "Písmo s p_evnou šírkou:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:84
 msgid "_Mark messages as read after"
 msgstr "Označiť _správy ako prečítané po"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:86
 msgid "Highlight _quotations with"
 msgstr "Spôso_b zvýrazňovania citácie"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:87 ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Pick a color"
+msgstr "Vyberte farbu"
+
+#: ../mail/mail-config.ui.h:88
 msgid "color"
 msgstr "farba"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:89
 msgid "Default character e_ncoding:"
 msgstr "Predvolená _znaková sada:"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:90
 msgid "Apply the same _view settings to all folders"
 msgstr "Použiť ro_vnaké nastavenia zobrazenia pre všetky priečinky"
 
 # PK: co je toto?
 # MČ: Vlákna sa obvykle tvoria podľa hlavičky „In-Reply-To:“, toto zapne, že môže použiť aj podobnosť 
predmetov aby vytvoril opticky vlákno, keĎ tá hlavička chýba (niektrí klienti ju akosi odmietajú zapisovať)
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:91
 msgid "F_all back to threading messages by subject"
 msgstr "V_ytvoriť vlákna správ aj podľa predmetu"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:92
 msgid "Delete Mail"
 msgstr "Odstraňovanie pošty"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:93
 msgid "Empty _trash folders"
 msgstr "Vyprázdniť priečinky _Kôš"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:94
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdenie pri čistení priečinka"
 
+#: ../mail/mail-config.ui.h:95
+msgid "Archive Mail"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:96
+msgid "On This Computer A_rchive folder:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:97
+msgid "Archive folder to use for On This Computer messages"
+msgstr ""
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:99
 msgid "_Show animated images"
 msgstr "_Zobraziť animované obrázky"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:100
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr ""
-"_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
+msgstr "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:101
 msgid "Loading Images"
 msgstr "Načítavanie obrázkov"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:102
 msgid "_Never load images from the Internet"
 msgstr "_Nikdy nenačítať obrázky z internetu"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:103
 msgid "_Load images only in messages from contacts"
 msgstr "Načítať _obrázky iba v správach od kontaktov"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:104
 msgid "_Always load images from the Internet"
 msgstr "_Vždy načítavať obrázky z internetu"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:105
 msgid "HTML Messages"
 msgstr "HTML správy"
 
-#: ../mail/mail-config.ui.h:93 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:106 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Menovky"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:107
 msgid "Sender Photograph"
 msgstr "Fotografia odosielateľa"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:108
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Zobraziť fotografiu odosielateľa v náhľade správy"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:109
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:110
 msgid "Displayed Message Headers"
 msgstr "Zobrazené hlavičky správy"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:111
 msgid "Mail Headers Table"
 msgstr "Tabuľka poštových hlavičiek"
 
-#: ../mail/mail-config.ui.h:98
-#: ../modules/addressbook/autocompletion-config.c:117
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../mail/mail-config.ui.h:112 ../modules/addressbook/autocompletion-config.c:117 
../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Formát dátumu/času"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:114
 msgid "Check incoming _messages for junk"
 msgstr "Kontrolovať prichádzajúce _správy na nevyžiadanú poštu"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:115
 msgid "_Delete junk messages"
 msgstr "_Odstrániť nevyžiadanú poštu"
 
-#: ../mail/mail-config.ui.h:102
-msgid "Check cu_stom headers for junk"
-msgstr "Kontrolovať pomocou špeciá_lnych hlavičkiek pre nevyžiadanú poštu"
+#: ../mail/mail-config.ui.h:116
+#, fuzzy
+#| msgid "Send Options"
+msgid "Just Test Options"
+msgstr "Voľby posielania"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:117
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr ""
-"Neoznačov_ať správy ako nevyžiadanú poštu ak je odosielateľ v mojom adresári "
-"kontaktov"
+msgstr "Neoznačov_ať správy ako nevyžiadanú poštu ak je odosielateľ v mojom adresári kontaktov"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:118
 msgid "_Lookup in local address book only"
 msgstr "V_yhľadávať len v miestnych adresároch kontaktov"
 
-#: ../mail/mail-config.ui.h:105
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Voľba je ignorovaná ak boli nájdené špeciálne hlavičky pre nevyžiadanú poštu."
+#: ../mail/mail-config.ui.h:119
+msgid "Check cu_stom headers for junk"
+msgstr "Kontrolovať pomocou špeciá_lnych hlavičkiek pre nevyžiadanú poštu"
 
-#: ../mail/mail-config.ui.h:107
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
+#: ../mail/mail-config.ui.h:121 ../modules/mail-config/e-mail-config-remote-accounts.c:224 
../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Bez šifrovania"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:122
 msgid "TLS encryption"
 msgstr "Šifrovanie TLS"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:123
 msgid "SSL encryption"
 msgstr "Šifrovanie SSL"
 
@@ -14679,63 +16087,63 @@ msgid "_Due By:"
 msgstr "_Termín:"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Co_mpleted"
 msgstr "Do_končené"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Call"
 msgstr "Volať"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Do Not Forward"
 msgstr "Neposielať ďalej"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Vybaviť"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Pre vašu informáciu"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "Odpoveď nie je nutná"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Odpovedať všetkým"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Revízia"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "Licenčná zmluva"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "_Zaškrtnite toto aby ste prijali licenčné ujednanie"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:22
 msgid "_Accept License"
 msgstr "_Prijať licenciu"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Informácie o zabezpečení"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Digital Signature"
 msgstr "Digitálny podpis"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Encryption"
 msgstr "Šifrovanie"
 
@@ -14744,24 +16152,16 @@ msgid "Invalid authentication"
 msgstr "Neplatné overenie totožnosti"
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Tento spôsob overenia totožnosti nie je podporovaný týmto serverom, možno "
-"nie je podporovaný žiadny spôsob."
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "Tento spôsob overenia totožnosti nie je podporovaný týmto serverom, možno nie je podporovaný žiadny 
spôsob."
 
 #: ../mail/mail.error.xml.h:3
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Vaše prihlásenie k serveru „{0}“ ako „{0}“ zlyhalo."
 
 #: ../mail/mail.error.xml.h:4
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Skontrolujte, či ste správne napísali heslo. Pamätajte, že pri väčšine "
-"hesiel záleží na veľkosti písmen, váš caps lock je možno zapnutý."
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case 
sensitive; your caps lock might be on."
+msgstr "Skontrolujte, či ste správne napísali heslo. Pamätajte, že pri väčšine hesiel záleží na veľkosti 
písmen, váš caps lock je možno zapnutý."
 
 #: ../mail/mail.error.xml.h:5
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14769,12 +16169,10 @@ msgstr "Ste si istý, že chcete odoslať správu v HTML formáte?"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
-"Prosím potvrďte, že nasledujúci adresáti budú a môžu príjímať poštu "
-"formátovanú ako HTML:\n"
+"Prosím potvrďte, že nasledujúci adresáti budú a môžu príjímať poštu formátovanú ako HTML:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:9
@@ -14782,12 +16180,8 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Ste si istý, že chcete odoslať správu bez predmetu?"
 
 #: ../mail/mail.error.xml.h:10
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-"Pridaním zmysluplného predmetu k vašej správe zaistíte, že príjemcovia sa "
-"ľahšie dozvedia, o čom im píšete."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail 
is about."
+msgstr "Pridaním zmysluplného predmetu k vašej správe zaistíte, že príjemcovia sa ľahšie dozvedia, o čom im 
píšete."
 
 #: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to send a message with only BCC recipients?"
@@ -14797,29 +16191,21 @@ msgstr "Ste si istý, že chcete odoslať správu len s adresátmi skrytej kópi
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if 
added, will list all of your recipients in your message. To avoid this, you should add at least one "
+"To: or CC: recipient. "
 msgstr ""
 "Správa, ktorú odosielate je nastavená tak, že ukrýva celý zoznam príjemcov.\n"
 "\n"
-"Mnoho poštových serverov pridáva hlavičku Apparently-To (Zrejme-Pre) do "
-"správ, ktoré obsahujú príjemcov len v skrytej kópii. Táto hlavička, ak je "
-"pridaná, obsahuje všetkých príjemcov vašej správy. Aby ste tomu zabránili, "
-"je vhodné pridať aspoň jedného príjemcu do „Pre“, alebo „Kópia“."
+"Mnoho poštových serverov pridáva hlavičku Apparently-To (Zrejme-Pre) do správ, ktoré obsahujú príjemcov len 
v skrytej kópii. Táto hlavička, ak je pridaná, obsahuje všetkých príjemcov vašej správy. Aby ste "
+"tomu zabránili, je vhodné pridať aspoň jedného príjemcu do „Pre“, alebo „Kópia“."
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if 
added, will list all of your recipients to your message anyway. To avoid this, you should add at "
+"least one To: or CC: recipient."
 msgstr ""
-"Mnoho poštových serverov pridáva hlavičku Apparently-To (Zrejme-Pre) do "
-"správ, ktoré obsahujú príjemcov len v skrytej kópii. Táto hlavička, ak je "
-"pridaná, obsahuje všetkých príjemcov vašej správy. Aby ste tomu zabránili, "
-"je vhodné pridať aspoň jedného príjemcu do „Pre“, alebo „Kópia“."
+"Mnoho poštových serverov pridáva hlavičku Apparently-To (Zrejme-Pre) do správ, ktoré obsahujú príjemcov len 
v skrytej kópii. Táto hlavička, ak je pridaná, obsahuje všetkých príjemcov vašej správy. Aby ste "
+"tomu zabránili, je vhodné pridať aspoň jedného príjemcu do „Pre“, alebo „Kópia“."
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with invalid address?"
@@ -14850,65 +16236,40 @@ msgid "Send private reply?"
 msgstr "Poslať súkromnú odpoveď?"
 
 #: ../mail/mail.error.xml.h:23
-msgid ""
-"You are replying privately to a message which arrived via a mailing list, "
-"but the list is trying to redirect your reply to go back to the list. Are "
-"you sure you want to proceed?"
-msgstr ""
-"Odpovedáte súkromne na správu, ktorá prišla z poštovej konferencie, ale "
-"konferencia sa pokúša presmerovať vašu správu späť do konferencie. Chcete "
-"aby sa tak stalo?"
+msgid "You are replying privately to a message which arrived via a mailing list, but the list is trying to 
redirect your reply to go back to the list. Are you sure you want to proceed?"
+msgstr "Odpovedáte súkromne na správu, ktorá prišla z poštovej konferencie, ale konferencia sa pokúša 
presmerovať vašu správu späť do konferencie. Chcete aby sa tak stalo?"
 
 #: ../mail/mail.error.xml.h:24
 msgid "Reply _Privately"
 msgstr "Odpovedať _súkromne"
 
 #: ../mail/mail.error.xml.h:26
-msgid ""
-"You are replying to a message which arrived via a mailing list, but you are "
-"replying privately to the sender; not to the list. Are you sure you want to "
-"proceed?"
-msgstr ""
-"Odpovedáte na správu, ktorá prišla z poštovej konferencie, ale odpovedáte "
-"súkromne odosielateľovi, nie do konferencie. Chcete aby sa tak stalo?"
+msgid "You are replying to a message which arrived via a mailing list, but you are replying privately to the 
sender; not to the list. Are you sure you want to proceed?"
+msgstr "Odpovedáte na správu, ktorá prišla z poštovej konferencie, ale odpovedáte súkromne odosielateľovi, 
nie do konferencie. Chcete aby sa tak stalo?"
 
 #: ../mail/mail.error.xml.h:28
 msgid "Send reply to all recipients?"
 msgstr "Poslať odpoveď všetkým príjemcom?"
 
 #: ../mail/mail.error.xml.h:29
-msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
-msgstr ""
-"Odpovedáte na správu, ktoré má viacej príjemcov. Chcete poslať odpoveď "
-"všetkým?"
+msgid "You are replying to a message which was sent to many recipients. Are you sure you want to reply to 
ALL of them?"
+msgstr "Odpovedáte na správu, ktoré má viacej príjemcov. Chcete poslať odpoveď všetkým?"
 
 #: ../mail/mail.error.xml.h:30
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
-msgstr ""
-"Táto správa nemôže byť odoslaná pretože ste nezadali žiadnych adresátov"
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "Táto správa nemôže byť odoslaná pretože ste nezadali žiadnych adresátov"
 
 #: ../mail/mail.error.xml.h:31
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
-"Prosím, zadajte platnú emailovú adresu do poľa Pre:. Môžete vyhľadať "
-"emailovú adresu kliknutím na tlačidlo Pre: nasledované zadávacím poľom."
+msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking 
on the To: button next to the entry box."
+msgstr "Prosím, zadajte platnú emailovú adresu do poľa Pre:. Môžete vyhľadať emailovú adresu kliknutím na 
tlačidlo Pre: nasledované zadávacím poľom."
 
 #: ../mail/mail.error.xml.h:32
 msgid "Use default drafts folder?"
 msgstr "Použiť predvolený priečinok konceptov?"
 
 #: ../mail/mail.error.xml.h:33
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Nepodarilo sa otvoriť priečinok na koncepty pre tento účet. Chcete použiť "
-"štandardný priečinok na koncepty?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgstr "Nepodarilo sa otvoriť priečinok na koncepty pre tento účet. Chcete použiť štandardný priečinok na 
koncepty?"
 
 # PK: nastavenia
 #: ../mail/mail.error.xml.h:34
@@ -14916,12 +16277,8 @@ msgid "Use _Default"
 msgstr "Použiť _predvolené"
 
 #: ../mail/mail.error.xml.h:35
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
-msgstr ""
-"Ste si istý, že chcete navždy odstrániť všetky zmazané správy v priečinku "
-"„{0}“?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgstr "Ste si istý, že chcete navždy odstrániť všetky zmazané správy v priečinku „{0}“?"
 
 #: ../mail/mail.error.xml.h:36
 msgid "If you continue, you will not be able to recover these messages."
@@ -14935,15 +16292,10 @@ msgstr "V_yčistiť"
 # PK: ved v GTK je delete = odstranit
 # PŠ: ano. ale sem sa to nehodi (a mozno ani tam)
 #: ../mail/mail.error.xml.h:38
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Ste si istý, že chcete navždy odtrániť všetky zmazané správy vo všetkých "
-"priečinkoch?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "Ste si istý, že chcete navždy odtrániť všetky zmazané správy vo všetkých priečinkoch?"
 
-#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1520
+#: ../mail/mail.error.xml.h:39 ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Empty Trash"
 msgstr "Vyprázdniť _kôš"
 
@@ -14960,11 +16312,8 @@ msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Máte neodoslané správy. Chcete skončiť aj tak?"
 
 #: ../mail/mail.error.xml.h:43
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"Ak skončíte, tieto správy nebudú odoslané pokiaľ znovu nespustíte Evolution."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr "Ak skončíte, tieto správy nebudú odoslané pokiaľ znovu nespustíte Evolution."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
@@ -15018,12 +16367,8 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Nedá sa odstrániť systémový priečinok „{0}“."
 
 #: ../mail/mail.error.xml.h:59
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"Systémové priečinky sú vyžadované pre správnu funkčnosť Evolution a nemôžu "
-"byť premenované, presunuté ani odstránené."
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or 
deleted."
+msgstr "Systémové priečinky sú vyžadované pre správnu funkčnosť Evolution a nemôžu byť premenované, 
presunuté ani odstránené."
 
 #: ../mail/mail.error.xml.h:60
 msgid "Failed to expunge folder &quot;{0}&quot;."
@@ -15042,20 +16387,15 @@ msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Naozaj odstrániť priečinok „{0}“ a všetky jeho podpriečinky?"
 
 #: ../mail/mail.error.xml.h:65
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
-msgstr ""
-"Ak zrušíte priečinok, tak celý jeho obsah a obsah jeho podpriečinkov bude "
-"navždy odstránený."
+msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted 
permanently."
+msgstr "Ak zrušíte priečinok, tak celý jeho obsah a obsah jeho podpriečinkov bude navždy odstránený."
 
 #: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\"?"
 msgstr "Naozaj odstrániť priečinok „{0}“?"
 
 #: ../mail/mail.error.xml.h:68
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
+msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Ak odstránite priečinok, všetok jeho obsah bude navždy odstránený."
 
 #: ../mail/mail.error.xml.h:69
@@ -15064,13 +16404,11 @@ msgstr "Tieto správy nie sú kópie."
 
 #: ../mail/mail.error.xml.h:70
 msgid ""
-"Messages shown in Search Folders are not copies. Deleting them from a Search "
-"Folder will delete the actual messages from the folder or folders in which "
-"they physically reside. Do you really want to delete these messages?"
+"Messages shown in Search Folders are not copies. Deleting them from a Search Folder will delete the actual 
messages from the folder or folders in which they physically reside. Do you really want to delete "
+"these messages?"
 msgstr ""
-"Správy zobrazené vo vyhľadávacích priečinkoch nie sú kópie. Ich odstránenie "
-"z vyhľadávacích priečinkov odstráni aktuálnu správu z priečinka, alebo z "
-"priečinkov, kde sa fyzicky nachádzajú. Naozaj chcete odstrániť tieto správy?"
+"Správy zobrazené vo vyhľadávacích priečinkoch nie sú kópie. Ich odstránenie z vyhľadávacích priečinkov 
odstráni aktuálnu správu z priečinka, alebo z priečinkov, kde sa fyzicky nachádzajú. Naozaj chcete "
+"odstrániť tieto správy?"
 
 #: ../mail/mail.error.xml.h:71
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -15137,8 +16475,7 @@ msgstr ""
 "všetky informácie o zástupcoch budú úplne zrušené."
 
 #: ../mail/mail.error.xml.h:87
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Naozaj chcete zakázať tento účet a zrušiť všetkých jeho zástupcov?"
 
 #: ../mail/mail.error.xml.h:88
@@ -15149,8 +16486,7 @@ msgstr "Ak budete pokračovať, všetky zástupné účty budú úplne zrušené
 msgid "Do _Not Disable"
 msgstr "_Nezakazovať"
 
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:656
+#: ../mail/mail.error.xml.h:90 ../plugins/publish-calendar/publish-calendar.c:655
 msgid "_Disable"
 msgstr "_Zakázať"
 
@@ -15201,12 +16537,10 @@ msgstr "Nebol vybraný žiadny priečinok."
 #: ../mail/mail.error.xml.h:103
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or 
both."
 msgstr ""
 "Musíte určiť aspoň jeden priečinok ako zdroj.\n"
-"Či už vyznačením priečinkov po jednom, a/alebo vyznačením všetkých miestnych "
-"priečinkov, všetkých vzdialených priečinkov, alebo oboch."
+"Či už vyznačením priečinkov po jednom, a/alebo vyznačením všetkých miestnych priečinkov, všetkých 
vzdialených priečinkov, alebo oboch."
 
 #: ../mail/mail.error.xml.h:105
 msgid "Problem migrating old mail folder \"{0}\"."
@@ -15216,17 +16550,11 @@ msgstr "Problém migrácie starého poštového priečinka „{0}“."
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "Neprázdny priečinok „{1}“ už existuje.\n"
 "\n"
-"Môžete si zvoliť ignorovať tento priečinok, prepísať ho, pripojiť jeho "
-"obsah, alebo ukončiť."
-
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "Ignorovať"
+"Môžete si zvoliť ignorovať tento priečinok, prepísať ho, pripojiť jeho obsah, alebo ukončiť."
 
 #: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
@@ -15242,22 +16570,15 @@ msgstr "Formát miestnej pošty programu Evolution sa zmenil."
 
 #: ../mail/mail.error.xml.h:113
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
+"Evolution's local mail format has changed from mbox to Maildir. Your local mail must be migrated to the new 
format before Evolution can proceed. Do you want to migrate now?\n"
 "\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+"An mbox account will be created to preserve the old mbox folders. You can delete the account after ensuring 
the data is safely migrated. Please make sure there is enough disk space if you choose to migrate "
+"now."
 msgstr ""
-"Formát miestnej pošty programu Evolution sa zmenil z mbox na Maildir. Vaša "
-"miestna pošta musí byť premigrovaná do nového formátu skôr ako bude "
-"Evolution spustený. Chcete pustiť migráciu teraz?\n"
+"Formát miestnej pošty programu Evolution sa zmenil z mbox na Maildir. Vaša miestna pošta musí byť 
premigrovaná do nového formátu skôr ako bude Evolution spustený. Chcete pustiť migráciu teraz?\n"
 "\n"
-"Účet pre mbox bude vytvorený pre zachovanie starých priečinkov mbox. Po "
-"migrácii môžete zrušiť tento účet, keď budú všetky údaje bezpečne "
-"zmigrované. Zabezpečte, prosím, dostatok miesta na disku, ak chcete spustiť "
-"migráciu teraz."
+"Účet pre mbox bude vytvorený pre zachovanie starých priečinkov mbox. Po migrácii môžete zrušiť tento účet, 
keď budú všetky údaje bezpečne zmigrované. Zabezpečte, prosím, dostatok miesta na disku, ak chcete "
+"spustiť migráciu teraz."
 
 #: ../mail/mail.error.xml.h:116
 msgid "_Exit Evolution"
@@ -15272,13 +16593,8 @@ msgid "Unable to read license file."
 msgstr "Nepodarilo sa prečítať licenčný súbor."
 
 #: ../mail/mail.error.xml.h:119
-msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
-msgstr ""
-"Nemožno prečítať licenčný súbor „{0}“ z dôvodu problému s inštaláciou. "
-"Nebudete schopný použiť tohoto poskytovateľa pokiaľ neakcepujete jeho "
-"licenciu."
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use 
this provider until you can accept its license."
+msgstr "Nemožno prečítať licenčný súbor „{0}“ z dôvodu problému s inštaláciou. Nebudete schopný použiť 
tohoto poskytovateľa pokiaľ neakcepujete jeho licenciu."
 
 #: ../mail/mail.error.xml.h:120
 msgid "Please wait."
@@ -15289,8 +16605,7 @@ msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Požaduje sa server o zoznam podporovaných spôsobov overenia."
 
 #: ../mail/mail.error.xml.h:122
-msgid ""
-"Failed to query server for a list of supported authentication mechanisms."
+msgid "Failed to query server for a list of supported authentication mechanisms."
 msgstr "Zlyhala požiadavka na server o zoznam podporovaných spôsobov overenia."
 
 #: ../mail/mail.error.xml.h:123
@@ -15298,12 +16613,8 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "Synchronizovať priečinok lokálne na použitie v odpojenom režime?"
 
 #: ../mail/mail.error.xml.h:124
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
-msgstr ""
-"Chcete miestne synchronizovať priečinky, ktoré ste označili na použitie v "
-"odpojenom režime?"
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+msgstr "Chcete miestne synchronizovať priečinky, ktoré ste označili na použitie v odpojenom režime?"
 
 #: ../mail/mail.error.xml.h:125
 msgid "Do _Not Synchronize"
@@ -15326,12 +16637,8 @@ msgid "Also mark messages in subfolders?"
 msgstr "Označiť tiež správy v podpriečinkoch?"
 
 #: ../mail/mail.error.xml.h:130
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"Chcete označiť správy ako prečítané len v aktuálnom priečinku alebo aj v "
-"jeho podpriečinkoch?"
+msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as 
all subfolders?"
+msgstr "Chcete označiť správy ako prečítané len v aktuálnom priečinku alebo aj v jeho podpriečinkoch?"
 
 #: ../mail/mail.error.xml.h:131
 msgid "In Current Folder and _Subfolders"
@@ -15361,14 +16668,6 @@ msgstr "Kopírovať priečinok v strome priečinkov."
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Ste si istý, že chcete skopírovať priečinok „{0}“ do priečinka „{1}“?"
 
-#: ../mail/mail.error.xml.h:138
-msgid "_Yes"
-msgstr "Án_o"
-
-#: ../mail/mail.error.xml.h:139
-msgid "_No"
-msgstr "_Nie"
-
 #: ../mail/mail.error.xml.h:140
 msgid "_Always"
 msgstr "_Vždy"
@@ -15389,12 +16688,8 @@ msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "Ste si istý, že chcete presunúť priečinok „{0}“ do priečinka „{1}“?"
 
 #: ../mail/mail.error.xml.h:144
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr ""
-"Táto správa nemôže byť poslaná pretože účet, ktorý je vybratý na odoslanie, "
-"nie je povolený"
+msgid "This message cannot be sent because the account you chose to send with is not enabled"
+msgstr "Táto správa nemôže byť poslaná pretože účet, ktorý je vybratý na odoslanie, nie je povolený"
 
 #: ../mail/mail.error.xml.h:145
 msgid "Please enable the account or send using another account."
@@ -15434,6 +16729,12 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Priečinok „{0}“ neobsahuje žiadnu duplicitnú správu."
 
 #: ../mail/mail.error.xml.h:155
+#, fuzzy
+#| msgid "Failed to disconnect account &quot;{0}&quot;."
+msgid "Failed to connect account &quot;{0}&quot;."
+msgstr "Zlyhalo odpojenie účtu „{0}“."
+
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Zlyhalo odpojenie účtu „{0}“."
 
@@ -15450,193 +16751,232 @@ msgid "{0}"
 msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
+#, fuzzy
+#| msgid "Send mail also when in offline _mode"
+msgid "Message is not available in offline mode."
+msgstr "Poslať email aj v odpojenom _režime"
+
+#: ../mail/mail.error.xml.h:161
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the account, can be marked for 
offline synchronization. Then, once the account is online again, use File-&gt;Download Messages for "
+"Offline Usage, when this folder is selected, to make sure that all the messages in the folder will be 
available in offline mode."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to open folder."
 msgstr "Zlyhalo otvorenie priečinka."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to find duplicate messages."
 msgstr "Zlyhalo hľadanie duplicitných správ."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to retrieve messages."
 msgstr "Zlyhalo získavanie správ."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to mark messages as read."
 msgstr "Zlyhalo označenie správ ako prečítané."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "Zlyhalo zmazanie príloh zo správ."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr "Zlyhalo prevzatie správ na prezeranie v odpojenom režime."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "Zlyhalo ukladanie správ na disk."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "Skrytý súbor je priložený."
 
-#: ../mail/mail.error.xml.h:168
-msgid ""
-"The attachment named {0} is a hidden file and may contain sensitive data. "
-"Please review it before sending."
-msgstr ""
-"Príloha s názvom {0} je skrytý súbor a môže obsahovať citlivé údaje. "
-"Skontrolujte to, prosím, pred odoslaním."
+#: ../mail/mail.error.xml.h:171
+msgid "The attachment named {0} is a hidden file and may contain sensitive data. Please review it before 
sending."
+msgstr "Príloha s názvom {0} je skrytý súbor a môže obsahovať citlivé údaje. Skontrolujte to, prosím, pred 
odoslaním."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:172
 msgid "Printing failed."
 msgstr "Zlyhalo tlačenie."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:173
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Tlačiareň odpovedala „{0}“."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:174
 msgid "Could not perform this operation on {0}."
 msgstr "Nepodarilo sa vykonať túto operáciu na {0}."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:175
 msgid "You must be working online to complete this operation."
 msgstr "Na dokončenie tejto operácie musíte pracovať v pripojenom režime."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:176
 msgid "Message from &quot;{0}&quot; account:"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail.error.xml.h:177
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgstr "Zlyhalo presunutie udalosti do kalendára „{0}“"
+
+#: ../mail/mail.error.xml.h:178
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:179
+msgid "Failed to mark subthread to be ignored in folder '{0}'"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:180
+msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Ruší sa…"
 
-#: ../mail/mail-send-recv.c:527
+#: ../mail/mail-send-recv.c:631
 msgid "Send & Receive Mail"
 msgstr "Príjem a odoslanie pošty"
 
-#: ../mail/mail-send-recv.c:543
+#: ../mail/mail-send-recv.c:645
 msgid "Cancel _All"
 msgstr "Zrušiť _všetko"
 
-#: ../mail/mail-send-recv.c:637 ../mail/mail-send-recv.c:1029
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1248
 msgid "Updating..."
 msgstr "Aktualizuje sa…"
 
-#: ../mail/mail-send-recv.c:637 ../mail/mail-send-recv.c:719
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
 msgid "Waiting..."
 msgstr "Čaká sa…"
 
-#: ../mail/mail-send-recv.c:1002
+#: ../mail/mail-send-recv.c:1220
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Kontroluje sa nová pošta na „%s“"
 
-#: ../mail/mail-vfolder-ui.c:67
+#: ../mail/mail-send-recv.c:1421
+#, c-format
+msgid "Deleting junk and expunging trash at '%s'"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:1423
+#, fuzzy, c-format
+#| msgid "Reconnecting to '%s'"
+msgid "Deleting junk at '%s'"
+msgstr "Znovu sa pripojája k „%s“"
+
+#: ../mail/mail-send-recv.c:1425
+#, fuzzy, c-format
+#| msgid "Emptying trash in '%s'"
+msgid "Expunging trash at '%s'"
+msgstr "Vyprázdňuje sa kôš v „%s“"
+
+#: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Vyhľadávacie priečinky"
 
-#: ../mail/mail-vfolder-ui.c:147
+#: ../mail/mail-vfolder-ui.c:146
 msgid "Edit Search Folder"
 msgstr "Upraviť vyhľadávací priečinok"
 
-#: ../mail/mail-vfolder-ui.c:268
+#: ../mail/mail-vfolder-ui.c:267
 msgid "New Search Folder"
 msgstr "Nový vyhľadávací priečinok"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "Neprečítané"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "Prečítané"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "Poslané ďalej"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: ../mail/message-list.c:293
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: ../mail/message-list.c:307
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "Nižšia"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "Vyššia"
 
-#: ../mail/message-list.c:312
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: ../mail/message-list.c:456 ../mail/message-list.c:5706
+#: ../mail/message-list.c:459 ../mail/message-list.c:5971
 msgid "Generating message list"
 msgstr "Generuje sa zoznam správ"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1847 ../modules/itip-formatter/itip-view.c:240
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Dnes %H:%M"
 
-#: ../mail/message-list.c:1856
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %H:%M"
 
-#: ../mail/message-list.c:1868
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "%a, %H:%M"
 
-#: ../mail/message-list.c:1876
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H:%M"
 
-#: ../mail/message-list.c:1878
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: ../mail/message-list.c:2756
+#: ../mail/message-list.c:2960
 msgid "Select all visible messages"
 msgstr "Vybrať všetky viditeľné správy"
 
-#: ../mail/message-list.c:3384 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3610 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Správy"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4750
+#: ../mail/message-list.c:4918
 msgid "Follow-up"
 msgstr "Vybaviť"
 
-#: ../mail/message-list.c:5644
+#: ../mail/message-list.c:5908
 #, fuzzy
 msgid ""
-"No message satisfies your search criteria. Change search criteria by "
-"selecting a new Show message filter from the drop down list above or by "
-"running a new search either by clearing it with Search->Clear menu item or "
-"by changing the query above."
-msgstr ""
-"Žiadne správy nevyhovujú vyhľadávacím pomienkam. Zmeňte vyhľadávacie "
-"podmienky vybratím "
+"No message satisfies your search criteria. Change search criteria by selecting a new Show message filter 
from the drop down list above or by running a new search either by clearing it with Search->Clear "
+"menu item or by changing the query above."
+msgstr "Žiadne správy nevyhovujú vyhľadávacím pomienkam. Zmeňte vyhľadávacie podmienky vybratím "
 
-#: ../mail/message-list.c:5652
+#: ../mail/message-list.c:5916
 msgid "There are no messages in this folder."
 msgstr "V tomto priečinku nie sú žiadne správy."
 
@@ -15668,38 +17008,42 @@ msgstr "Správy pre"
 msgid "Subject - Trimmed"
 msgstr "Predmet - skrátený"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "Ktorákoľvek hlavička"
+
+#: ../mail/searchtypes.xml.in.h:55
 msgid "Subject or Addresses contains"
 msgstr "Predmet alebo adresy obsahujú"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2003
+#: ../mail/searchtypes.xml.in.h:56 ../modules/mail/e-mail-shell-view-actions.c:2063
 msgid "Recipients contain"
 msgstr "Adresáti obsahujú"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1996
+#: ../mail/searchtypes.xml.in.h:57 ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Message contains"
 msgstr "Správa obsahuje"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2017
+#: ../mail/searchtypes.xml.in.h:58 ../modules/mail/e-mail-shell-view-actions.c:2077
 msgid "Subject contains"
 msgstr "Predmet obsahuje"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2010
+#: ../mail/searchtypes.xml.in.h:59 ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid "Sender contains"
 msgstr "Odosielateľ obsahuje"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1989
+#: ../mail/searchtypes.xml.in.h:60 ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Body contains"
 msgstr "Telo obsahuje"
 
+#: ../mail/searchtypes.xml.in.h:61 ../modules/mail/e-mail-shell-view-actions.c:2049
+#, fuzzy
+#| msgid "Expression"
+msgid "Free form expression"
+msgstr "Výraz"
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:123
-#: ../modules/mail/em-mailer-prefs.c:1213
+#: ../modules/addressbook/autocompletion-config.c:123 ../modules/mail/em-mailer-prefs.c:1234
 msgid "_Table column:"
 msgstr "Stĺpec _tabuľky:"
 
@@ -15719,341 +17063,303 @@ msgstr "Automatické dopĺňanie"
 msgid "Always _show address of the autocompleted contact"
 msgstr "Vždy _zobraziť adresu automaticky doplneného kontaktu"
 
-#: ../modules/addressbook/eab-composer-util.c:148
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "Viacero vizitiek vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:156
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard kontaktu %s"
 
-#: ../modules/addressbook/eab-composer-util.c:168
-#: ../modules/addressbook/eab-composer-util.c:195
+#: ../modules/addressbook/eab-composer-util.c:167 ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "Informácie o kontakte"
 
-#: ../modules/addressbook/eab-composer-util.c:197
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informácie o kontakte %s"
 
-#: ../modules/addressbook/e-book-shell-backend.c:259
-#: ../modules/addressbook/e-book-shell-view-actions.c:125
+#: ../modules/addressbook/e-book-shell-backend.c:258 ../modules/addressbook/e-book-shell-view-actions.c:124
 msgid "New Address Book"
 msgstr "Nový adresár kontaktov"
 
-#: ../modules/addressbook/e-book-shell-backend.c:268
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:270
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/addressbook/e-book-shell-backend.c:269 ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Create a new contact"
 msgstr "Vytvorí nový kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:275
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Zoznam kontaktov"
 
-#: ../modules/addressbook/e-book-shell-backend.c:277
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
+#: ../modules/addressbook/e-book-shell-backend.c:276 ../modules/addressbook/e-book-shell-view-actions.c:1030
 msgid "Create a new contact list"
 msgstr "Vytvorí nový zoznam kontaktov"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresár kontaktov"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-backend.c:286 ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Create a new address book"
 msgstr "Vytvorí nový adresár kontaktov"
 
-#: ../modules/addressbook/e-book-shell-backend.c:315
+#: ../modules/addressbook/e-book-shell-backend.c:314
 msgid "Certificates"
 msgstr "Certifikáty"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:198
+#: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "Vlastnosti adresára kontaktov"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:476
-#: ../modules/addressbook/e-book-shell-view-actions.c:772
+#: ../modules/addressbook/e-book-shell-view-actions.c:520 
../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Save as vCard"
 msgstr "Uložiť ako vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pírovať všetky kontakty do…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Skopíruje kontakty vybraného adresára kontaktov do iného"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "D_elete Address Book"
 msgstr "O_dstrániť adresár kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
 msgid "Delete the selected address book"
 msgstr "Odstráni vybraný adresár kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:893
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Mo_ve All Contacts To..."
 msgstr "Pre_sunúť všetky kontakty do…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Move the contacts of the selected address book to another"
 msgstr "Presunie kontakty vybraného adresára kontaktov do iného"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "_New Address Book"
 msgstr "_Nový adresár kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:907
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Address _Book Properties"
 msgstr "Vlastnosti _adresára kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Show properties of the selected address book"
 msgstr "Zobrazí vlastnosti vybraného adresára kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:914
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:958 
../modules/calendar/e-cal-shell-view-actions.c:1254 ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Re_fresh"
 msgstr "_Obnoviť"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Refresh the selected address book"
 msgstr "Obnoví vybraný adresár kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Address Book _Map"
 msgstr "_Mapovanie adresára kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
 msgid "Show map with all contacts from selected address book"
 msgstr "Zobrazí mapovanie so všetkými kontaktmi z vybraného adresára kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:928
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
-#: ../modules/calendar/e-task-shell-view-actions.c:767
-#: ../modules/mail/e-mail-shell-view-actions.c:1611
+#: ../modules/addressbook/e-book-shell-view-actions.c:972 
../modules/calendar/e-cal-shell-view-actions.c:1261 ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:710 ../modules/mail/e-mail-shell-view-actions.c:1664
 msgid "_Rename..."
 msgstr "P_remenovať…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Rename the selected address book"
 msgstr "Premenuje vybraný adresár kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Stop loading"
 msgstr "Zastaviť načítavanie"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "_Copy Contact To..."
 msgstr "_Kopírovať kontakt do…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Copy selected contacts to another address book"
 msgstr "Kopíruje vybrané kontakty do iného adresára kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "_Delete Contact"
 msgstr "O_dstrániť kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "_Find in Contact..."
 msgstr "_Nájsť v kontakte…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "Search for text in the displayed contact"
 msgstr "Vyhľadá v texte zobrazeného kontaktu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:963
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "_Forward Contact..."
 msgstr "_Poslať kontakt ďalej…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Send selected contacts to another person"
 msgstr "Pošle vybrané kontakty inej osobe"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:970
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "_Move Contact To..."
 msgstr "P_resunúť kontakt do…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Move selected contacts to another address book"
 msgstr "Presunie vybrané kontakty do iného adresára kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:977
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "_New Contact..."
 msgstr "_Nový kontakt…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:984
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "New Contact _List..."
 msgstr "Nový zoznam _kontaktov…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:991
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "_Open Contact"
 msgstr "_Otvoriť kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "View the current contact"
 msgstr "Zobrazí aktuálny kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:998
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "_Send Message to Contact..."
 msgstr "_Poslať správu kontaktu…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "Send a message to the selected contacts"
 msgstr "Pošle správu vybraným kontaktom"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
-#: ../modules/calendar/e-cal-shell-view-actions.c:1577
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051 
../modules/calendar/e-cal-shell-view-actions.c:1417 ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "A_kcie"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
-#: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1776
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058 
../modules/calendar/e-memo-shell-view-actions.c:622 ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/mail/e-mail-shell-view-actions.c:1829
 msgid "_Preview"
 msgstr "_Náhľad"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:845
-msgid "_Delete"
-msgstr "O_dstrániť"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1027
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
-msgid "_Properties"
-msgstr "V_lastnosti"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Address Book Map"
 msgstr "Mapovanie adresára kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Contact _Preview"
 msgstr "_Náhľad kontaktu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1069
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "Show contact preview window"
 msgstr "Zobrazí okno s náhľadom kontaktu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1075
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "Show _Maps"
 msgstr "Zobraziť _mapovanie"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
 msgid "Show maps in contact preview window"
 msgstr "Zobrazí mapovanie v okne s náhľadom kontaktu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1096
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:914
-#: ../modules/mail/e-mail-shell-view-actions.c:1906
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140 
../modules/calendar/e-memo-shell-view-actions.c:692 ../modules/calendar/e-task-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:1959
 msgid "_Classic View"
 msgstr "_Klasické zobrazenie"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1098
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Show contact preview below the contact list"
 msgstr "Zobrazí náhľad kontaktu pod zoznamom kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:921
-#: ../modules/mail/e-mail-shell-view-actions.c:1913
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147 
../modules/calendar/e-memo-shell-view-actions.c:699 ../modules/calendar/e-task-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:1966
 msgid "_Vertical View"
 msgstr "_Vertikálne zobrazenie"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1105
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show contact preview alongside the contact list"
 msgstr "Zobrazí náhľad kontaktu vedľa zoznamu kontaktov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1120
-#: ../modules/calendar/e-cal-shell-view-actions.c:1754
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1164 
../modules/calendar/e-cal-shell-view-actions.c:1594 ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr "Nevyhovujúce"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1130
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
-#: ../modules/calendar/e-task-shell-view-actions.c:983
-#: ../modules/mail/e-mail-shell-view-actions.c:1982
-#: ../shell/e-shell-content.c:658
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174 
../modules/calendar/e-cal-shell-view-actions.c:1604 ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:926 ../modules/mail/e-mail-shell-view-actions.c:2035 
../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Pokročilé hľadanie"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1163
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Print all shown contacts"
 msgstr "Vytlačí všetky zobrazené kontakty"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1170
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Preview the contacts to be printed"
 msgstr "Zobrazí náhľad kontaktov pred ich tlačou"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1177
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Print selected contacts"
 msgstr "Vytlačí vybrané kontakty"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
 msgid "S_ave Address Book as vCard"
 msgstr "_Uložiť adresár kontaktov ako vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1194
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Uloží kontakty vybraného adresára kontaktov ako vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1200
-#: ../modules/addressbook/e-book-shell-view-actions.c:1210
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244 
../modules/addressbook/e-book-shell-view-actions.c:1254
 msgid "_Save as vCard..."
 msgstr "_Uložiť ako vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1202
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
 msgid "Save selected contacts as a vCard"
 msgstr "Uloží vybrané kontakty ako vCard"
 
 # Preposlať?
-#: ../modules/addressbook/e-book-shell-view.c:312
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "_Predať ďalej kontakty"
 
-#: ../modules/addressbook/e-book-shell-view.c:314
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "_Predať ďalej kontakt"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "_Poslať správu kontaktom"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "_Poslať správu do zoznamu"
 
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "_Poslať správu kontaktu"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:165
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -16063,159 +17369,154 @@ msgstr ""
 "\n"
 "Toto obnoví všetky vaše osobné údaje, nastavenia filtrov, atď."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:180
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Obnoviť zo súboru so zálohou:"
 
 # window title
-#: ../modules/backup-restore/e-mail-config-restore-page.c:191
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Výber súboru so zálohou na obnovenie"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:311
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309 
../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Obnoviť zo zálohy"
 
 # window title
-#: ../modules/backup-restore/evolution-backup-restore.c:217
+#: ../modules/backup-restore/evolution-backup-restore.c:216
 msgid "Select name of the Evolution backup file"
 msgstr "Výber názvu pre súbor so zálohou programu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:250
+#: ../modules/backup-restore/evolution-backup-restore.c:249
 msgid "_Restart Evolution after backup"
 msgstr "_Reštartovať Evolution po zálohovaní"
 
 # window title
-#: ../modules/backup-restore/evolution-backup-restore.c:277
+#: ../modules/backup-restore/evolution-backup-restore.c:276
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Výber názvu pre záložný súbor programu Evolution na obnovenie"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:290
+#: ../modules/backup-restore/evolution-backup-restore.c:289
 msgid "_Restart Evolution after restore"
 msgstr "_Reštartovať Evolution po obnovení"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:308
+#: ../modules/backup-restore/evolution-backup-restore.c:307
 msgid "_Back up Evolution Data..."
 msgstr "_Zálohovať údaje programu Evolution…"
 
 # tooltip
-#: ../modules/backup-restore/evolution-backup-restore.c:310
+#: ../modules/backup-restore/evolution-backup-restore.c:309
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Zálohuje údaje a nastavenia programu Evolution do archívneho súboru"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:315
+#: ../modules/backup-restore/evolution-backup-restore.c:314
 msgid "R_estore Evolution Data..."
 msgstr "_Obnoviť údaje programu Evolution…"
 
 # tooltip
-#: ../modules/backup-restore/evolution-backup-restore.c:317
+#: ../modules/backup-restore/evolution-backup-restore.c:316
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Obnoví údaje a nastavenia programu Evolution z archívneho súboru"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:84
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "Zálohovať adresár programu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:86
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "Obnoviť adresár programu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:88
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "Skontrolovať zálohu programu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:90
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "Reštartovať Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:92
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "S grafickým používateľským rozhraním"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:322
-#: ../modules/backup-restore/evolution-backup-tool.c:516
+#: ../modules/backup-restore/evolution-backup-tool.c:281 
../modules/backup-restore/evolution-backup-tool.c:475
 msgid "Shutting down Evolution"
 msgstr "Vypína sa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:331
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "Zálohujú sa účty a nastavenia programu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:348
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Zálohujú sa údaje programu Evolution (Pošta, Kontakty, Kalendár, Úlohy, "
-"Poznámky)"
+msgstr "Zálohujú sa údaje programu Evolution (Pošta, Kontakty, Kalendár, Úlohy, Poznámky)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "Záloha dokončená"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:371
-#: ../modules/backup-restore/evolution-backup-tool.c:703
+#: ../modules/backup-restore/evolution-backup-tool.c:330 
../modules/backup-restore/evolution-backup-tool.c:665
 msgid "Restarting Evolution"
 msgstr "Reštartuje sa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:522
+#: ../modules/backup-restore/evolution-backup-tool.c:481
 msgid "Back up current Evolution data"
 msgstr "Zálohovať aktuálne údaje programu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:529
+#: ../modules/backup-restore/evolution-backup-tool.c:488
 msgid "Extracting files from back up"
 msgstr "Rozbaľujú sa súbory zo zálohy"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:611
+#: ../modules/backup-restore/evolution-backup-tool.c:570
 msgid "Loading Evolution settings"
 msgstr "Načítavajú sa nastavenia programu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:677
+#: ../modules/backup-restore/evolution-backup-tool.c:636
 msgid "Removing temporary back up files"
 msgstr "Mažú sa dočasné záložné súbory"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:688
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Reloading registry service"
 msgstr "Znovunačítava sa služba registrácie"
 
 # nemá to byť naopak?
-#: ../modules/backup-restore/evolution-backup-tool.c:917
+#: ../modules/backup-restore/evolution-backup-tool.c:853
 msgid "Evolution Back Up"
 msgstr "Záloha Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:918
+#: ../modules/backup-restore/evolution-backup-tool.c:854
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Zálohuje sa do priečinka %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:922
+#: ../modules/backup-restore/evolution-backup-tool.c:858
 msgid "Evolution Restore"
 msgstr "Obnova Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:923
+#: ../modules/backup-restore/evolution-backup-tool.c:859
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Obnovuje sa z priečinka %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:993
+#: ../modules/backup-restore/evolution-backup-tool.c:928
 msgid "Backing up Evolution Data"
 msgstr "Zálohujú sa údaje programu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:994
+#: ../modules/backup-restore/evolution-backup-tool.c:929
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Počkajte, prosím, pokiaľ Evolution zálohuje vaše údaje."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:996
+#: ../modules/backup-restore/evolution-backup-tool.c:931
 msgid "Restoring Evolution Data"
 msgstr "Obnovujú sa údaje programu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:997
+#: ../modules/backup-restore/evolution-backup-tool.c:932
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Počkajte, prosím, pokiaľ Evolution obnovuje vaše údaje."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1019
+#: ../modules/backup-restore/evolution-backup-tool.c:954
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Toto môže chvíľu trvať a záleží to od množstva údajov vo vašom účte."
 
@@ -16232,32 +17533,24 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Ste si istý, že chcete zavrieť Evolution?"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
-msgstr ""
-"Aby ste zálohovali vaše údaje a nastavenia, musíte najprv zavrieť Evolution. "
-"Prosím, ešte predtým si uložte všetky rozpracované údaje."
+msgid "To back up your data and settings, you must first close Evolution. Please make sure that you save any 
unsaved data before proceeding."
+msgstr "Aby ste zálohovali vaše údaje a nastavenia, musíte najprv zavrieť Evolution. Prosím, ešte predtým si 
uložte všetky rozpracované údaje."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Close and Back up Evolution"
 msgstr "Zavrieť a zálohovať Evolution"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "Ste si istý, že chcete obnoviť Evolution z vybraného záložného súboru?"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid ""
-"To restore your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
+"To restore your data and settings, you must first close Evolution. Please make sure that you save any 
unsaved data before proceeding. This will delete all your current Evolution data and settings and "
+"restore them from your backup."
 msgstr ""
-"Aby ste obnovili vaše údaje a nstavenia, musíte najprv zavrieť Evolution. "
-"Prosím, ešte predtým si uložte všetky rozpracované údaje. Táto operácia "
-"zruší všetky aktuálne údaje a nastavenia a obnoví ich z vašej zálohy."
+"Aby ste obnovili vaše údaje a nstavenia, musíte najprv zavrieť Evolution. Prosím, ešte predtým si uložte 
všetky rozpracované údaje. Táto operácia zruší všetky aktuálne údaje a nastavenia a obnoví ich z "
+"vašej zálohy."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "Close and Restore Evolution"
@@ -16273,333 +17566,421 @@ msgstr "Vybraný priečinok nie je zapisovateľný."
 
 # PK: nahlas bug, medzera na konci
 # PK: programu bogofilter?
-#: ../modules/bogofilter/evolution-bogofilter.c:145
+#: ../modules/bogofilter/evolution-bogofilter.c:144
 #, fuzzy, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Zlyhalo spustenie Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
+#: ../modules/bogofilter/evolution-bogofilter.c:162
 #, fuzzy
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Zlyhal tok obsahu poštovej správy do Bogofiltra: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
+#: ../modules/bogofilter/evolution-bogofilter.c:211
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter buď spadol alebo zlyhalo spracovanie poštovej správy"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:308
+#: ../modules/bogofilter/evolution-bogofilter.c:307
 msgid "Bogofilter Options"
 msgstr "Voľby pre Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:317
+#: ../modules/bogofilter/evolution-bogofilter.c:316
 msgid "Convert message text to _Unicode"
 msgstr "Konvertovať text správy na _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:474
+#: ../modules/bogofilter/evolution-bogofilter.c:473 
../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#, fuzzy
+#| msgid "Junk filtering software:"
+msgid "Junk filter using Bogofilter"
+msgstr "Program na filtrovanie nevyžiadanej pošty:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
 msgid "Standard LDAP Port"
 msgstr "Štandardný port LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447 
../modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP cez SSL (zavrhnuté)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft globálny katalóg"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Microsoft globálny katalóg cez SSL"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
 msgid "Connecting to LDAP"
 msgstr "Pripája sa k LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
 msgid "Server Information"
 msgstr "Informácie o serveri"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "Port:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (doporučené)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "Encryption:"
 msgstr "Šifrovanie:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648 
../modules/mail-config/e-mail-config-remote-accounts.c:245 
../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Overenie totožnosti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
 msgid "Anonymous"
 msgstr "Anonymne"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "Použiť emailovú adresu"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "Použiť rozlišujúci názov (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Method:"
 msgstr "Metóda:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Using email address\" requires anonymous access to your "
-"LDAP server."
-msgstr ""
-"Toto je metóda, ktorú Evolution použije pre prihlásenie. Uvedomte si, že "
-"použitie voľby „Použiť emailovú adresu“ vyžaduje anonymný prístup k serveru "
-"LDAP."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Using email 
address\" requires anonymous access to your LDAP server."
+msgstr "Toto je metóda, ktorú Evolution použije pre prihlásenie. Uvedomte si, že použitie voľby „Použiť 
emailovú adresu“ vyžaduje anonymný prístup k serveru LDAP."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
 msgid "Using LDAP"
 msgstr "Používa sa LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:116
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716 ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Hľadá sa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Search Base:"
 msgstr "Základňa hľadania:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
 msgid "Find Possible Search Bases"
 msgstr "Nájsť možné základne vyhľadávania"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
 msgid "One Level"
 msgstr "Jedna úroveň"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
 msgid "Subtree"
 msgstr "Podstrom"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Search Scope:"
 msgstr "Rozah hľadania:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree.  A search scope of \"Subtree\" will include all entries "
-"below your search base.  A search scope of \"One Level\" will only include "
-"the entries one level beneath your search base."
+"The search scope defines how deep you would like the search to extend down the directory tree.  A search 
scope of \"Subtree\" will include all entries below your search base.  A search scope of \"One Level"
+"\" will only include the entries one level beneath your search base."
 msgstr ""
-"Rozsah hľadania určuje, ako hlboko sa pri hľadaní môže v strome zostúpiť. "
-"Rozsah „Podstrom“ znamená vo všetkých položkách podstromu základu hľadania. "
-"Rozsah hľadania „Jedna úroveň“ zahrnie iba položky, ktoré sú jednu úroveň "
-"pod vaším základnom hľadania."
+"Rozsah hľadania určuje, ako hlboko sa pri hľadaní môže v strome zostúpiť. Rozsah „Podstrom“ znamená vo 
všetkých položkách podstromu základu hľadania. Rozsah hľadania „Jedna úroveň“ zahrnie iba položky, "
+"ktoré sú jednu úroveň pod vaším základnom hľadania."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
 msgid "Search Filter:"
 msgstr "Filter hľadania:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Downloading"
 msgstr "Preberá sa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
 msgid "Limit:"
 msgstr "Obmedzenie:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
 msgid "contacts"
 msgstr "contaktov"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "Browse until limit is reached"
 msgstr "Prezerať až do obmedzenia"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135 
../modules/cal-config-caldav/evolution-cal-config-caldav.c:220 
../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Vyhnúť sa IfMatch (potrebné na Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:443
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:422 ../modules/cal-config-caldav/e-caldav-chooser.c:431
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "Chyba HTTP: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:471
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:460
 msgid "Could not parse response"
 msgstr "Nepodarilo sa analyzovať odpoveď"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:480
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
 msgid "Empty response"
 msgstr "Prázdna odpoveď"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:488
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:477
 msgid "Unexpected reply from server"
 msgstr "Neočakávaná odpoveď zo servera"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1120
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1093
 msgid "Could not locate user's calendars"
 msgstr "Nepodarilo sa nájsť používateľove kalendáre"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1344
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1315
 msgid "Path"
 msgstr "Cesta"
 
 # title
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:348 
../modules/cal-config-google/e-google-chooser-dialog.c:198
 msgid "Choose a Calendar"
 msgstr "Výber kalendára"
 
 # title
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:351
 msgid "Choose a Memo List"
 msgstr "Výber zoznamu poznámok"
 
 # title
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:354
 msgid "Choose a Task List"
 msgstr "Výber zoznamu úloh"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:234
 msgid "Find Calendars"
 msgstr "Nájsť kalendáre"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
 msgid "Find Memo Lists"
 msgstr "Nájsť zoznam poznámok"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:240
 msgid "Find Task Lists"
 msgstr "Nájsť zoznam úloh"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:258
 msgid "Email:"
 msgstr "Email:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:263
 msgid "Server handles meeting invitations"
 msgstr "Server obsluhuje pozvánky na stretnutia"
 
 # PK: kde to je?
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
 #, fuzzy
 msgid "Choose which address books to use."
 msgstr "Zvoliť ktorý adresár kontaktov sa použije."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Použiť v kalendári narodenín a výročí"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:127
+#: ../modules/cal-config-google/e-google-chooser-button.c:125
 msgid "Default User Calendar"
 msgstr "Prednastavený kalendár používateľa"
 
-#: ../modules/cal-config-google/e-google-chooser.c:515
+#: ../modules/cal-config-google/e-google-chooser.c:514
 #, c-format
 msgid "Enter Google password for user '%s'."
 msgstr "Zadajte heslo do služby Google pre používateľa „%s“."
 
-#: ../modules/cal-config-google/e-google-chooser.c:532
+#: ../modules/cal-config-google/e-google-chooser.c:531
 msgid "User declined to provide a password"
 msgstr "Používateľ odmietol poskytnúť heslo"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:160
+#: ../modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Použiť existujúci súbor iCalendar (ics)"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:185
+#: ../modules/cal-config-local/evolution-cal-config-local.c:184
 msgid "iCalendar File"
 msgstr "súbor iCalendar"
 
 # button
-#: ../modules/cal-config-local/evolution-cal-config-local.c:197
+#: ../modules/cal-config-local/evolution-cal-config-local.c:196
 msgid "Choose an iCalendar file"
 msgstr "Zvoliť súbor iCalendar"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:200
+#: ../modules/cal-config-local/evolution-cal-config-local.c:199
 msgid "File:"
 msgstr "Súbor:"
 
 # button
-#: ../modules/cal-config-local/evolution-cal-config-local.c:215
+#: ../modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Allow Evolution to update the file"
 msgstr "Povoliť aktualizáciu súboru programu Evolution"
 
+# * https://bugzilla.gnome.org/show_bug.cgi?id=641020
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#, fuzzy
+#| msgid "Default"
+msgctxt "locale-metric"
+msgid "default:mm"
+msgstr "Predvolený"
+
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:251
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
 msgid "Fahrenheit (°F)"
 msgstr ""
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:256
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
 msgid "Centigrade (°C)"
 msgstr ""
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:260
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Kelvin (K)"
 msgstr ""
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:262
-#, fuzzy
-#| msgid "Unit"
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
 msgid "Units:"
-msgstr "Jednotka"
+msgstr "Jednotky:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:320
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../modules/calendar/e-cal-attachment-handler.c:287 ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "I_mportovať"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:406
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+#, fuzzy
+#| msgid "Importing Pine data"
+msgid "Importing an event"
+msgstr "Importujú sa Pine údaje"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+#, fuzzy
+#| msgid "Importing mailbox"
+msgid "Importing a memo"
+msgstr "Importuje sa mailbox"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+#, fuzzy
+#| msgid "Importing Elm data"
+msgid "Importing a task"
+msgstr "Importujú sa Elm údaje"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Výber kalendára"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:433
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+#, fuzzy
+#| msgid "D_elete Memo List"
+msgid "Select a Memo List"
+msgstr "O_dstrániť zoznam poznámok"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "Výber zoznamu úloh"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:443
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "I_mportovať do kalendára"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:450
-msgid "I_mport to Tasks"
-msgstr "I_mportovať do úloh"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+msgid "I_mport to Memo List"
+msgstr "I_mportovať do zoznamu poznámok"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+msgid "I_mport to Task List"
+msgstr "I_mportovať do zoznamu úloh"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:186 ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "Nový kalendár"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190 ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "Nový zoznam poznámok"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194 ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "Nový zoznam úloh"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#, fuzzy, c-format
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying an event into the calendar '%s'"
+msgstr "Kopíruje sa udalosť do kalendára „{0}“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Moving an event into the calendar '%s'"
+msgstr "Presúva sa udalosť do kalendára „{0}“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#, fuzzy, c-format
+#| msgid "Copying a memo into the memo list '{0}'"
+msgid "Copying a memo into the memo list '%s'"
+msgstr "Kopíruje sa poznámka do zoznamu poznámok „{0}“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Moving a memo into the memo list '%s'"
+msgstr "Presúva sa poznámka do zoznamu poznámok „{0}“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#, fuzzy, c-format
+#| msgid "Copying a task into the task list '{0}'"
+msgid "Copying a task into the task list '%s'"
+msgstr "Kopíruje sa úloha do zoznamu úloh „{0}“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Moving a task into the task list '%s'"
+msgstr "Presúva sa úloha do zoznamu úloh „{0}“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+msgid "Calendar Selector"
+msgstr "Nástroj na výber kalendára"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+msgid "Memo List Selector"
+msgstr "Nástroj na výber zoznamu poznámok"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+msgid "Task List Selector"
+msgstr "Nástroj na výber zoznamu uloh"
 
-#: ../modules/calendar/e-calendar-preferences.c:517
+#: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
 msgstr "Vybrané kalendáre pre poplachy"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:924
 msgid "Ti_me and date:"
 msgstr "Č_as a dátum:"
 
-#: ../modules/calendar/e-calendar-preferences.c:926
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "_Date only:"
 msgstr "Len _dátum:"
 
@@ -16660,8 +18041,7 @@ msgstr "_12-hodinový (AM/PM)"
 msgid "_24 hour"
 msgstr "_24-hodinový"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../modules/calendar/e-calendar-preferences.ui.h:18 ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Work Week"
 msgstr "Pracovný týždeň"
 
@@ -16717,13 +18097,11 @@ msgstr "_Ne"
 msgid "Day _ends:"
 msgstr "Deň _končí:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Výstrahy"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Pýtať si potvrdenie pri odstraňovaní položiek"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#, fuzzy
+#| msgid "Send Options"
+msgid "View Options"
+msgstr "Voľby posielania"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -16745,532 +18123,498 @@ msgstr "Zobraziť čísla _týždňov"
 # MČ: Je to vľavo dole v mesačnom prehľade. Je tam zoznam dní a dni, kde je opkakujúca sa udalosť, sú potom 
skloneným písmom
 #: ../modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr ""
-"Zobraziť opakujúce sa _udalosti skloneným písmom vľavom dolnom rohu kalendára"
+msgstr "Zobraziť opakujúce sa _udalosti skloneným písmom vľavom dolnom rohu kalendára"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Sc_roll Month View by a week"
 msgstr "P_osúvať mesačné zobrazenie po týždňoch"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "Výstrahy"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Pýtať si potvrdenie pri odstraňovaní položiek"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Display"
 msgstr "Zobrazenie"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Task List"
 msgstr "Zoznam úloh"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Highlight t_asks due today"
 msgstr "Zvýrazniť úlohy s _dnešným termínom:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Highlight _overdue tasks"
 msgstr "Zvýrazniť úlohy _po termíne:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Skryť úlohy dokončené po"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Display reminders in _notification area only"
 msgstr "Zobraziť pripomenutia len v _oblasti oznámení"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Sh_ow a reminder"
 msgstr "_Zobraziť pripomenutie"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "before every appointment"
 msgstr "pred každou schôdzkou"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show a _reminder"
 msgstr "Zobraziť _pripomenutie"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "pred každým výročím/narodeninami"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Select the calendars for reminder notification"
 msgstr "Vybrať kalendáre pre oznámenie pripomenutia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Default Free/Busy Server"
 msgstr "Predvolený server pre diár"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Template:"
 msgstr "Šablóna:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u a %d budú nahradené používateľom a doménou z emailovej adresy."
 
 # PK: jedna?
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 #, fuzzy
 msgid "Publishing Information"
 msgstr "Zverejňuje sa informácia"
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:191
-msgid "New Calendar"
-msgstr "Nový kalendár"
-
 # nedá sa dať akcelerátor inam?
 # MČ: Ak dám celodenná schôdzka na C, tak sa dá dať S
 #     Inak globálna skratka je Shift-Ctrl-A
-#: ../modules/calendar/e-cal-shell-backend.c:322
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Schôdzka"
 
-#: ../modules/calendar/e-cal-shell-backend.c:324
-#: ../modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../modules/calendar/e-cal-shell-backend.c:116 ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Create a new appointment"
 msgstr "Vytvorí novú schôdzku"
 
-#: ../modules/calendar/e-cal-shell-backend.c:329
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Celodenná schôdzka"
 
-#: ../modules/calendar/e-cal-shell-backend.c:331
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Vytvorí novú celodennú schôdzku"
 
 # nedá sa dať akcelerátor inam?
 # MČ: S a R je už obsadené. Mohlo by byť T, ale neviem, radšej nech zostane podľa Angličtiny
 #     Globálna skratka Shift-Ctrl-E
-#: ../modules/calendar/e-cal-shell-backend.c:336
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Str_etnutie"
 
-#: ../modules/calendar/e-cal-shell-backend.c:338
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "Vytvorí novú požiadavku na stretnutie"
 
 # nedá sa dať akcelerátor inam?
 # MČ: Prvé štyri písmená sú už obsadené.
-#: ../modules/calendar/e-cal-shell-backend.c:346
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndár"
 
-#: ../modules/calendar/e-cal-shell-backend.c:348
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-backend.c:140 ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Create a new calendar"
 msgstr "Vytvorí nový kalendár"
 
-#: ../modules/calendar/e-cal-shell-backend.c:703
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Kalendár a úlohy"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:119
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "Otvára sa kalendár „%s“"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:590
-msgid "Calendar Selector"
-msgstr "Nástroj na výber kalendára"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
 msgstr "Tlačiť"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:291
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
 msgid "Calendar Properties"
 msgstr "Vlastnosti kalendára"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Táto operácia navždy odstráni všetky udalosti staršie ako vybraný čas. Ak "
-"budete pokračovať, nebude už možné tieto udalosti obnoviť."
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
+msgid "This operation will permanently erase all events older than the selected amount of time. If you 
continue, you will not be able to recover these events."
+msgstr "Táto operácia navždy odstráni všetky udalosti staršie ako vybraný čas. Ak budete pokračovať, nebude 
už možné tieto udalosti obnoviť."
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:339
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
 msgid "Purge events older than"
 msgstr "Zbaví sa udalostí starších než"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:585
-msgid "Copying Items"
-msgstr "Kopírujú sa položky"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:878
-msgid "Moving Items"
-msgstr "Presúvajú sa položky"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+#, fuzzy
+#| msgid "Make this Occurrence _Movable"
+msgid "Making an occurrence movable"
+msgstr "Nastaviť tento výskyt ako _presunuteľný"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1211
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "udalosť"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1213
-#: ../modules/calendar/e-cal-shell-view-memopad.c:231
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:527
-#: ../modules/calendar/e-task-shell-view-actions.c:644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057 ../modules/calendar/e-cal-shell-view-memopad.c:208 
../modules/calendar/e-cal-shell-view-taskpad.c:276 ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
 msgid "Save as iCalendar"
 msgstr "Uložiť ako iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191 ../modules/calendar/e-memo-shell-view-actions.c:550 
../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "_Kopírovať…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "O_dstrániť kalendár"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "Odstráni vybraný kalendár"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "Prejde dozadu"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "Prejde dopredu"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "Vyberie dnešok"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "Vybrať dá_tum"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "Prejde na zadaný dátum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "_Nový kalendár"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247 ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr "_Zbaviť sa"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr "Zbaví sa starých schôdzok a stretnutí"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "Obnoví vybraný kalendár"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
 msgstr "Premenuje vybraný kalendár"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 #, fuzzy
 #| msgid "Find _next"
 msgid "Find _Next"
 msgstr "Nájdi ďa_lší"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Find next occurrence of the current search string"
 msgstr "Nájde ďalší výskyt aktuálne hľadaného reťazca"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 #, fuzzy
 #| msgid "Find _previous"
 msgid "Find _Previous"
 msgstr "Nájdi p_redchádzajúci"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Find previous occurrence of the current search string"
 msgstr "Nájde predchádzajúci výskyt aktuálne hľadaného reťazca"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 #, fuzzy
 #| msgid "Stop _running search"
 msgid "Stop _Running Search"
 msgstr "_Zastaviť bežiace hľadanie"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Stop currently running search"
 msgstr "Zastaví aktuálne bežiace hľadanie"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
 msgstr "Zobraziť _len tento kalendár"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "K_opírovať do kalendára…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "Zveriť _stretnutie…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "O_dstrániť schôdzku"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "Odstráni vybrané schôdzky"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "Odstrániť _tento výskyt"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "Odstráni tento výskyt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "Odstrániť _všetky výskyty"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "Odstráni všetky výskyty"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "Nová celodenná _udalosť…"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "Vytvorí novú celodennú udalosť"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
-#: ../modules/calendar/e-cal-shell-view-memopad.c:265
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338 ../modules/calendar/e-cal-shell-view-memopad.c:242 
../modules/calendar/e-cal-shell-view-taskpad.c:316 ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
 msgid "_Forward as iCalendar..."
 msgstr "Poslať ďalej ako i_Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1505
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "Nové _stretnutie…"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "Vytvorí nové stretnutie"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "Pre_sunúť do kalendára…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "Nastaviť tento výskyt ako _presunuteľný"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1533
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "Otvoriť s_chôdzku"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "Zobrazí aktuálnu schôdzku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1554
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie…"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr "SKonvertuje schôdzku na stretnutie"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1561
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_ertovať na schôdzku…"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr "SKonvertuje stretnutie na schôdzku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1568
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "Deň"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1690
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "Zobrazí jeden deň"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "Zoznam"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "Zobrazí ako zoznam"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "Mesiac"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1704
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "Zobrazí jeden mesiac"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "Týždeň"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1711
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "Zobrazí jeden týždeň"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "Zobrazí jeden pracovný týždeň"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "Aktívne schôdzky"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr "Schôdzky v nasledujúcich 7 dňoch"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr "Menej než 5 výskytov"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618 ../modules/calendar/e-memo-shell-view-actions.c:740 
../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1785
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625 ../modules/calendar/e-memo-shell-view-actions.c:747 
../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr "Súhrn obsahuje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635 ../modules/calendar/e-cal-shell-view-actions.c:1649 
../modules/calendar/e-cal-shell-view-memopad.c:273 ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757 ../modules/calendar/e-memo-shell-view-actions.c:771 
../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+#, fuzzy
+#| msgid "_Print..."
+msgid "Print..."
+msgstr "_Tlačiť…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "Vytlačí tento kalendár"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1804
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr "Zobrazí ukážku kalendára pred tlačou"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
-#: ../modules/calendar/e-cal-shell-view-memopad.c:306
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:846
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666 ../modules/calendar/e-cal-shell-view-memopad.c:283 
../modules/calendar/e-cal-shell-view-taskpad.c:371 ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "_Save as iCalendar..."
 msgstr "_Uložiť ako iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Go To"
 msgstr "Prejsť na"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206 ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "poznámka"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249 ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "Nová _poznámka"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251 ../modules/calendar/e-memo-shell-backend.c:65 
../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "Vytvorí novú poznámku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256 ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "_Otvoriť poznámku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258 ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "Zobrazí vybranú poznámku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263 ../modules/calendar/e-cal-shell-view-taskpad.c:351 
../modules/calendar/e-memo-shell-view-actions.c:613 ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Open _Web Page"
 msgstr "Otvoriť _webovú stránku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:831
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275 ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "Vytlačí vybranú poznámku"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "Hľadá sa ďalšia vyhovujúca udalosť"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1563
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "Hľadá sa predchádzajúca vyhovujúca udalosť"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1584
+#: ../modules/calendar/e-cal-shell-view-private.c:832
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -17278,7 +18622,7 @@ msgstr[0] "Nedá sa nájsť vyhovujúca udalosť v nasledujúcich %d rokoch"
 msgstr[1] "Nedá sa nájsť vyhovujúca udalosť v nasledujúcom %d roku"
 msgstr[2] "Nedá sa nájsť vyhovujpca udalosť v nasledujúcich %d rokoch"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1588
+#: ../modules/calendar/e-cal-shell-view-private.c:836
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -17286,7 +18630,7 @@ msgstr[0] "Nedá sa nájsť vyhovujúca udalosť v predchádzajúcich %d rokoch"
 msgstr[1] "Nedá sa nájsť vyhovujúca udalosť v predchádzajúcom %d roku"
 msgstr[2] "Nedá sa nájsť vyhovujpca udalosť v predchádzajúcich %d rokoch"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1613
+#: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
 msgstr "Nedá sa hľadať bez aktívneho kaledára"
 
@@ -17294,177 +18638,150 @@ msgstr "Nedá sa hľadať bez aktívneho kaledára"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274 ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "úloha"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309 ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr "_Priradiť úlohu"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323 ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "_Označiť ako dokončenú"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325 ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "Označí vybrané úlohy ako dokončené"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "_Označiť ako nedokončenú"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332 ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "Označí vybrané úlohy ako nedokončené"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337 ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "Nová ú_loha"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339 ../modules/calendar/e-task-shell-backend.c:64 
../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344 ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "_Otvoriť úlohu"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346 ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "Zobrazí vybranú úlohu"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1030
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363 ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "Vytlačí vybranú úlohu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
-msgid "New Memo List"
-msgstr "Nový zoznam poznámok"
-
-#: ../modules/calendar/e-memo-shell-backend.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "P_oznámka"
 
-#: ../modules/calendar/e-memo-shell-backend.c:224
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Zd_ieľaná poznámka"
 
-#: ../modules/calendar/e-memo-shell-backend.c:226
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "Vytvoriť novú zdieľanú poznámku"
 
-#: ../modules/calendar/e-memo-shell-backend.c:234
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Zozna_m poznámok"
 
-#: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-backend.c:82 ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Create a new memo list"
 msgstr "Vytvorí nový zoznam poznámok"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:117
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "Otvára sa zoznam poznámok „%s“"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:546
-msgid "Memo List Selector"
-msgstr "Nástroj na výber zoznamu poznámok"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view-actions.c:180 ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "Tlač poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
 msgid "Memo List Properties"
 msgstr "Vlastnosti zoznamu poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "O_dstrániť poznámku"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "_Nájsť v poznámke…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "Vyhľadá text v zobrazenej poznámke"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "O_dstrániť zoznam poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "Odstráni vybraný zoznam poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "_Nový zoznam poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "Obnoví vybraný zoznam poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "Premenuje vybraný zoznam poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
 msgstr "Zobraziť _len tento zoznam poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "_Náhľad poznámky"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:731
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr "Zobrazí panel s náhľadom poznámky"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr "Zobrazí náhľad poznámky pod zoznamom poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr "Zobrazí náhľad poznámky vedľa zoznamu poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:817
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "Vytlačí zoznam poznámok"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:824
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "Zobrazí náhľad zoznamu poznámok pred tlačou"
 
-#: ../modules/calendar/e-memo-shell-view.c:239
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "Odstrániť poznámky"
 
-#: ../modules/calendar/e-memo-shell-view.c:241
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "Odstrániť poznámku"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:538
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -17473,180 +18790,153 @@ msgstr[1] "%d poznámka"
 msgstr[2] "%d poznámky"
 
 # PŠ: vyžiadať plural forms
-#: ../modules/calendar/e-memo-shell-view-private.c:542
-#: ../modules/calendar/e-task-shell-view-private.c:748
+#: ../modules/calendar/e-memo-shell-view-private.c:373 ../modules/calendar/e-task-shell-view-private.c:539
 #, c-format
 msgid "%d selected"
 msgstr "vybraných: %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:205
-#: ../modules/calendar/e-task-shell-view-actions.c:219
-msgid "New Task List"
-msgstr "Nový zoznam úloh"
-
-#: ../modules/calendar/e-task-shell-backend.c:214
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: ../modules/calendar/e-task-shell-backend.c:221
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Prira_dená úloha"
 
-#: ../modules/calendar/e-task-shell-backend.c:223
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "Vytvorí novú priradenú úlohu"
 
-#: ../modules/calendar/e-task-shell-backend.c:231
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Zoznam úlo_h"
 
-#: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-backend.c:81 ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "Vytvorí nový zoznam úloh"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:117
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "Otvára sa zoznam úloh „%s“"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:546
-msgid "Task List Selector"
-msgstr "Nástroj na výber zoznamu uloh"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view-actions.c:203 ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "Tlač úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:291
+#: ../modules/calendar/e-task-shell-view-actions.c:259
 msgid "Task List Properties"
 msgstr "Vlastnosti zoznamu úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:586
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able 
to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Táto operácia navždy odstráni všetky úlohy označené ako dokončené. Ak budete "
-"pokračovať, nebude už možné tieto úlohy obnoviť.\n"
+"Táto operácia navždy odstráni všetky úlohy označené ako dokončené. Ak budete pokračovať, nebude už možné 
tieto úlohy obnoviť.\n"
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:593
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "Už sa ma znovu nepýtať"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "O_dstrániť úlohu"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "_Nájsť v úlohe…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:720
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "Vyhľadá text v zobrazenej úlohe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
-msgid "Copy..."
-msgstr "Kopírovať…"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "O_dstrániť zoznam úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "Odstráni vybraný zoznam úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "_Nový zoznam úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "Obnoví vybraný zoznam úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "Premenuje vybraný zoznam úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "Zobraziť _len tento zoznam úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "_Označiť ako nedokončenú"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "Odstráni dokončené úlohy"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "_Náhľad úlohy"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr "Zobrazí panel s náhľadom úlohy"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr "Zobrazí náhľad úlohy pod zoznamom úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:923
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr "Zobrazí náhľad úlohy vedľa zoznamu úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:931
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "Aktívne úlohy"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "Dokončené úlohy"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr "Úlohy v nasledujúcich 7 dňoch"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "Úlohy po termíne"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "Úlohy s prílohami"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1016
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "Vytlačí zoznam úloh"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1023
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr "Zobrazí náhľad zoznamu úloh pred tlačou"
 
-#: ../modules/calendar/e-task-shell-view.c:374
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "Odstrániť úlohy"
 
-#: ../modules/calendar/e-task-shell-view.c:376
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "Odstrániť úlohu"
 
-#: ../modules/calendar/e-task-shell-view-private.c:633
-msgid "Expunging"
-msgstr "Čistí sa"
-
-#: ../modules/calendar/e-task-shell-view-private.c:744
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -17666,13 +18956,13 @@ msgstr "Zobrazí prílohu ako pozvánku"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:231
+#: ../modules/itip-formatter/itip-view.c:228
 msgid "Today %H:%M"
 msgstr "Dnes o %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:235
+#: ../modules/itip-formatter/itip-view.c:232
 msgid "Today %H:%M:%S"
 msgstr "Dnes o %H:%M:%S"
 
@@ -17680,677 +18970,629 @@ msgstr "Dnes o %H:%M:%S"
 #     nie sú reťazce pre %p (am/pm). Ľutujem, že tam nie je (dop/odp)
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:244
+#: ../modules/itip-formatter/itip-view.c:241
 msgid "Today %l:%M:%S %p"
 msgstr "Dnes o %k:%M:%S"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:259
+#: ../modules/itip-formatter/itip-view.c:256
 msgid "Tomorrow %H:%M"
 msgstr "Zajtra o %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:263
+#: ../modules/itip-formatter/itip-view.c:260
 msgid "Tomorrow %H:%M:%S"
 msgstr "Zajtra o %H:%M:%S"
 
 # MČ: detto ako pri "Dnes o"
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:268
+#: ../modules/itip-formatter/itip-view.c:265
 msgid "Tomorrow %l:%M %p"
 msgstr "Zajtra o %k:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:272
+#: ../modules/itip-formatter/itip-view.c:269
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Zajtra o %k:%M:%S"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:291
+#: ../modules/itip-formatter/itip-view.c:288
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:296
+#: ../modules/itip-formatter/itip-view.c:293
 msgid "%A %H:%M"
 msgstr "%A o %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:297
 msgid "%A %H:%M:%S"
 msgstr "%A o %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:305
+#: ../modules/itip-formatter/itip-view.c:302
 msgid "%A %l:%M %p"
 msgstr "%A o %k:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:309
+#: ../modules/itip-formatter/itip-view.c:306
 msgid "%A %l:%M:%S %p"
 msgstr "%A o %k:%M:%S"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:318
+#: ../modules/itip-formatter/itip-view.c:315
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:324
+#: ../modules/itip-formatter/itip-view.c:321
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B o %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:328
+#: ../modules/itip-formatter/itip-view.c:325
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B o %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:333
+#: ../modules/itip-formatter/itip-view.c:330
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B o %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:337
+#: ../modules/itip-formatter/itip-view.c:334
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B o %k:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:343
+#: ../modules/itip-formatter/itip-view.c:340
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:348
+#: ../modules/itip-formatter/itip-view.c:345
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y o %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:349
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y o %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:357
+#: ../modules/itip-formatter/itip-view.c:354
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y o %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:361
+#: ../modules/itip-formatter/itip-view.c:358
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y o %k:%M:%S"
 
-#: ../modules/itip-formatter/itip-view.c:399
-#: ../modules/itip-formatter/itip-view.c:400
-#: ../modules/itip-formatter/itip-view.c:489
-#: ../modules/itip-formatter/itip-view.c:490
-#: ../modules/itip-formatter/itip-view.c:579
+#: ../modules/itip-formatter/itip-view.c:396 ../modules/itip-formatter/itip-view.c:397 
../modules/itip-formatter/itip-view.c:486 ../modules/itip-formatter/itip-view.c:487
+#: ../modules/itip-formatter/itip-view.c:576
 msgid "An unknown person"
 msgstr "Neznáma osoba"
 
-#: ../modules/itip-formatter/itip-view.c:404
-#: ../modules/itip-formatter/itip-view.c:494
-#: ../modules/itip-formatter/itip-view.c:583
+#: ../modules/itip-formatter/itip-view.c:401 ../modules/itip-formatter/itip-view.c:491 
../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Prosím, ozvite sa v mene %s"
 
-#: ../modules/itip-formatter/itip-view.c:406
-#: ../modules/itip-formatter/itip-view.c:496
-#: ../modules/itip-formatter/itip-view.c:585
+#: ../modules/itip-formatter/itip-view.c:403 ../modules/itip-formatter/itip-view.c:493 
../modules/itip-formatter/itip-view.c:582
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Prijaté v mene %s"
 
-#: ../modules/itip-formatter/itip-view.c:411
+#: ../modules/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s prostredníctvom %s zverejnil(a) nasledujúce informácie o stretnutí:"
 
-#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:410
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s zverejnil(a) nasledujúce informácie o stretnutí:"
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s postúpil(a) nasledujúce stretnutie na vás:"
 
-#: ../modules/itip-formatter/itip-view.c:421
+#: ../modules/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s prostredníctvom %s požaduje vašu účasť na nasledujúcom stretnutí:"
 
-#: ../modules/itip-formatter/itip-view.c:423
+#: ../modules/itip-formatter/itip-view.c:420
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s požaduje vašu účasť na nasledujúcom stretnutí:"
 
-#: ../modules/itip-formatter/itip-view.c:429
+#: ../modules/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s si prostredníctvom %s praje byť pridaný na existujúce stretnutie:"
 
-#: ../modules/itip-formatter/itip-view.c:431
+#: ../modules/itip-formatter/itip-view.c:428
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s si praje byť pridaný na existujúce stretnutie:"
 
-#: ../modules/itip-formatter/itip-view.c:435
+#: ../modules/itip-formatter/itip-view.c:432
 #, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
-msgstr ""
-"%s si prostredníctvom %s praje získať najnovšie informácie o nasledujúcom "
-"stretnutí:"
+msgid "%s through %s wishes to receive the latest information for the following meeting:"
+msgstr "%s si prostredníctvom %s praje získať najnovšie informácie o nasledujúcom stretnutí:"
 
-#: ../modules/itip-formatter/itip-view.c:437
+#: ../modules/itip-formatter/itip-view.c:434
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s si praje získať najnovšie informácie o nasledujúcom stretnutí:"
 
-#: ../modules/itip-formatter/itip-view.c:441
+#: ../modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
-msgstr ""
-"%s prostredníctvom %s poslal(a) späť reakciu na nasledujúce priradené "
-"stretnutie:"
+msgstr "%s prostredníctvom %s poslal(a) späť reakciu na nasledujúce priradené stretnutie:"
 
-#: ../modules/itip-formatter/itip-view.c:443
+#: ../modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s poslal(a) späť reakciu na nasledujúce priradené stretnutie:"
 
-#: ../modules/itip-formatter/itip-view.c:447
+#: ../modules/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s prostredníctvom %s zrušil(a) nasledujúce stretnutie:"
 
-#: ../modules/itip-formatter/itip-view.c:449
+#: ../modules/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s zrušil(a) nasledujúce stretnutie:"
 
-#: ../modules/itip-formatter/itip-view.c:453
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s prostredníctvom %s navrhol(a) nasledujúce zmeny stretnutia:"
 
-#: ../modules/itip-formatter/itip-view.c:455
+#: ../modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s navrhol(a) nasledujúce zmeny stretnutia:"
 
-#: ../modules/itip-formatter/itip-view.c:459
+#: ../modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s prostredníctvom %s odmietol(a) nasledujúce zmeny stretnutia:"
 
-#: ../modules/itip-formatter/itip-view.c:461
+#: ../modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s odmietol(a) nasledujúce zmeny stretnutia:"
 
-#: ../modules/itip-formatter/itip-view.c:501
+#: ../modules/itip-formatter/itip-view.c:498
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s prostredníctvom %s zverejnil(a) nasledujúcu úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s zverejnil(a) nasledujúcu úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s požaduje priradenie %s na nasledujúcu úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:511
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s prostredníctvom %s vám priradil(a) úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:513
+#: ../modules/itip-formatter/itip-view.c:510
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s vám priradil(a) úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:519
+#: ../modules/itip-formatter/itip-view.c:516
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s si prostredníctvom %s praje byť pridaný do existujúcej úlohy:"
 
-#: ../modules/itip-formatter/itip-view.c:521
+#: ../modules/itip-formatter/itip-view.c:518
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s si praje byť pridaný do existujúcej úlohy:"
 
-#: ../modules/itip-formatter/itip-view.c:525
+#: ../modules/itip-formatter/itip-view.c:522
 #, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"%s si prostredníctvom %s praje získať najnovšie informácie o nasledujúcej "
-"priradenej úlohe:"
+msgid "%s through %s wishes to receive the latest information for the following assigned task:"
+msgstr "%s si prostredníctvom %s praje získať najnovšie informácie o nasledujúcej priradenej úlohe:"
 
-#: ../modules/itip-formatter/itip-view.c:527
+#: ../modules/itip-formatter/itip-view.c:524
 #, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
-msgstr ""
-"%s si praje získať najnovšie informácie o nasledujúcej priradenej úlohe:"
+msgid "%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s si praje získať najnovšie informácie o nasledujúcej priradenej úlohe:"
 
-#: ../modules/itip-formatter/itip-view.c:531
+#: ../modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
-msgstr ""
-"%s prostredníctvom %s poslal(a) späť reakciu na nasledujúcu priradenú úlohu:"
+msgstr "%s prostredníctvom %s poslal(a) späť reakciu na nasledujúcu priradenú úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:533
+#: ../modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s poslal(a) späť reakciu na nasledujúcu priradenú úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:537
+#: ../modules/itip-formatter/itip-view.c:534
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s prostredníctvom %s zrušil(a) nasledujúcu priradenú úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:539
+#: ../modules/itip-formatter/itip-view.c:536
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s zrušil(a) nasledujúcu priradenú úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:543
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s prostredníctvom %s navrhol(a) nasledujúce zmeny priradenia úlohy:"
 
-#: ../modules/itip-formatter/itip-view.c:545
+#: ../modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s navrhol(a) nasledujúce zmeny priradenia úlohy:"
 
-#: ../modules/itip-formatter/itip-view.c:549
+#: ../modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s prostredníctvom %s odmietol nasledujúcu priradenú úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:551
+#: ../modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s odmietol nasledujúcu priradenú úlohu:"
 
-#: ../modules/itip-formatter/itip-view.c:590
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s prostredníctvom %s zverejnil(a) nasledujúcu poznámku:"
 
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s zverejnil(a) nasledujúcu poznámku:"
 
-#: ../modules/itip-formatter/itip-view.c:597
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s si prostredníctvom %s praje byť pridaný k existujúcej poznámke:"
 
-#: ../modules/itip-formatter/itip-view.c:599
+#: ../modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s si praje byť pridaný k existujúcej poznámke:"
 
-#: ../modules/itip-formatter/itip-view.c:603
+#: ../modules/itip-formatter/itip-view.c:600
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s prostredníctvom %s zrušil(a) nasledujúcu zdieľanú poznámku:"
 
-#: ../modules/itip-formatter/itip-view.c:605
+#: ../modules/itip-formatter/itip-view.c:602
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s zrušil(a) nasledujúcu zdieľanú poznámku:"
 
-#: ../modules/itip-formatter/itip-view.c:678
+#: ../modules/itip-formatter/itip-view.c:675
 msgid "All day:"
 msgstr "Celý deň:"
 
-#: ../modules/itip-formatter/itip-view.c:684
+#: ../modules/itip-formatter/itip-view.c:681
 msgid "Start day:"
 msgstr "Počiatočný deň:"
 
-#: ../modules/itip-formatter/itip-view.c:684
-#: ../modules/itip-formatter/itip-view.c:1498
+#: ../modules/itip-formatter/itip-view.c:681 ../modules/itip-formatter/itip-view.c:1494
 msgid "Start time:"
 msgstr "Čas začiatku:"
 
-#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:690
 msgid "End day:"
 msgstr "Koncový deň:"
 
-#: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1499
+#: ../modules/itip-formatter/itip-view.c:690 ../modules/itip-formatter/itip-view.c:1495
 msgid "End time:"
 msgstr "Čas konca:"
 
-#: ../modules/itip-formatter/itip-view.c:1024
+#: ../modules/itip-formatter/itip-view.c:1020
 msgid "Ope_n Calendar"
 msgstr "Otvoriť _kalendár"
 
-#: ../modules/itip-formatter/itip-view.c:1027
+#: ../modules/itip-formatter/itip-view.c:1023
 msgid "_Decline all"
 msgstr "_Odmietnuť všetko"
 
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../modules/itip-formatter/itip-view.c:1026
 msgid "_Decline"
 msgstr "O_dmietnuť"
 
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../modules/itip-formatter/itip-view.c:1029
 msgid "_Tentative all"
 msgstr "_Predbežne prijať všetko"
 
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../modules/itip-formatter/itip-view.c:1032
 msgid "_Tentative"
 msgstr "P_redbežne prijať"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1035
 msgid "Acce_pt all"
 msgstr "Prijať _všetko"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1038
 msgid "Acce_pt"
 msgstr "Pri_jať"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "Send _Information"
 msgstr "Poslať _informáciu"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1044
 msgid "_Update Attendee Status"
 msgstr "_Aktualizovať stav účastníka"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1047 ../smime/gui/certificate-manager.c:1664
 msgid "_Update"
 msgstr "Ak_tualizovať"
 
-#: ../modules/itip-formatter/itip-view.c:1501
-#: ../modules/itip-formatter/itip-view.c:1549
-#: ../modules/itip-formatter/itip-view.c:1620
+#: ../modules/itip-formatter/itip-view.c:1497 ../modules/itip-formatter/itip-view.c:1545 
../modules/itip-formatter/itip-view.c:1616
 msgid "Comment:"
 msgstr "Komentár:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1537
+#: ../modules/itip-formatter/itip-view.c:1533
 msgid "Send reply to sender"
 msgstr "Poslať potvrdenie odosielateľovi"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1552
+#: ../modules/itip-formatter/itip-view.c:1548
 msgid "Send _updates to attendees"
 msgstr "Poslať _aktualizácie účastníkom"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1555
+#: ../modules/itip-formatter/itip-view.c:1551
 msgid "_Apply to all instances"
 msgstr "_Aplikovať na všetky výskyty"
 
 # The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1556
+#: ../modules/itip-formatter/itip-view.c:1552
 msgid "Show time as _free"
 msgstr "Zobraziť čas ako _voľný"
 
 # The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1557
+#: ../modules/itip-formatter/itip-view.c:1553
 msgid "_Preserve my reminder"
 msgstr "Z_achovať moju pripomienku"
 
 # The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "_Inherit reminder"
 msgstr "_Zdeddiť pripomienku"
 
-#: ../modules/itip-formatter/itip-view.c:1888
+#: ../modules/itip-formatter/itip-view.c:1884
 msgid "_Tasks:"
 msgstr "Ú_lohy:"
 
-#: ../modules/itip-formatter/itip-view.c:1891
+#: ../modules/itip-formatter/itip-view.c:1887
 msgid "_Memos:"
 msgstr "_Poznámky:"
 
-#: ../modules/itip-formatter/itip-view.c:3119
+#: ../modules/itip-formatter/itip-view.c:3115
 msgid "Sa_ve"
 msgstr "_Uložiť"
 
-#: ../modules/itip-formatter/itip-view.c:3579
-#: ../modules/itip-formatter/itip-view.c:5026
+#: ../modules/itip-formatter/itip-view.c:3575 ../modules/itip-formatter/itip-view.c:5023
 msgid "Attendee status updated"
 msgstr "Stav účastníka aktualizovaný"
 
-#: ../modules/itip-formatter/itip-view.c:3758
+#: ../modules/itip-formatter/itip-view.c:3754
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Schôdzka v kalendári „%s“ je v rozpore s týmto stretnutím"
 
-#: ../modules/itip-formatter/itip-view.c:3787
+#: ../modules/itip-formatter/itip-view.c:3783
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Schôdzka bola nájdená v kalendári „%s“"
 
-#: ../modules/itip-formatter/itip-view.c:3900
+#: ../modules/itip-formatter/itip-view.c:3896
 msgid "Unable to find any calendars"
 msgstr "Nepodarilo sa nájsť žiadne kalendáre"
 
-#: ../modules/itip-formatter/itip-view.c:3908
+#: ../modules/itip-formatter/itip-view.c:3904
 msgid "Unable to find this meeting in any calendar"
 msgstr "Toto stretnutie sa nepodarilo nájsť v žiadnom kalendári"
 
-#: ../modules/itip-formatter/itip-view.c:3913
+#: ../modules/itip-formatter/itip-view.c:3909
 msgid "Unable to find this task in any task list"
 msgstr "Túto úlohu sa nepodarilo nájsť v žiadnom zozname úloh"
 
-#: ../modules/itip-formatter/itip-view.c:3918
+#: ../modules/itip-formatter/itip-view.c:3914
 msgid "Unable to find this memo in any memo list"
 msgstr "Túto poznámku sa nepodarilo nájsť v žiadnom zozname poznámok"
 
-#: ../modules/itip-formatter/itip-view.c:4262
+#: ../modules/itip-formatter/itip-view.c:4259
 msgid "Opening the calendar. Please wait..."
 msgstr "Otvára sa kalendár. Čakajte, prosím…"
 
-#: ../modules/itip-formatter/itip-view.c:4267
+#: ../modules/itip-formatter/itip-view.c:4264
 msgid "Searching for an existing version of this appointment"
 msgstr "Hľadá sa existujúca verzia tejto schôdzky"
 
-#: ../modules/itip-formatter/itip-view.c:4662
+#: ../modules/itip-formatter/itip-view.c:4659
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nepodarilo sa poslať položku do kalendára „%s“.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4677
+#: ../modules/itip-formatter/itip-view.c:4674
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslané do kalendára „%s“ ako akceptované"
 
-#: ../modules/itip-formatter/itip-view.c:4682
+#: ../modules/itip-formatter/itip-view.c:4679
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslané do kalendára „%s“ ako predbežné"
 
-#: ../modules/itip-formatter/itip-view.c:4688
+#: ../modules/itip-formatter/itip-view.c:4685
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslané do kalendára „%s“ ako odmietnuté"
 
-#: ../modules/itip-formatter/itip-view.c:4694
+#: ../modules/itip-formatter/itip-view.c:4691
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslané do kalendára „%s“ ako zrušené"
 
-#: ../modules/itip-formatter/itip-view.c:4715
-#: ../modules/itip-formatter/itip-view.c:5172
-#: ../modules/itip-formatter/itip-view.c:5278
+#: ../modules/itip-formatter/itip-view.c:4712 ../modules/itip-formatter/itip-view.c:5169 
../modules/itip-formatter/itip-view.c:5275
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Ukladajú sa zmeny do kalendára. Čakajte, prosím…"
 
-#: ../modules/itip-formatter/itip-view.c:4756
+#: ../modules/itip-formatter/itip-view.c:4753
 msgid "Unable to parse item"
 msgstr "Nepodarilo sa analyzovať položku"
 
 # PK: preco je medzera na konci? nahlas bug
-#: ../modules/itip-formatter/itip-view.c:4949
+#: ../modules/itip-formatter/itip-view.c:4946
 #, fuzzy, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizátor ostránil postúpenie %s "
 
-#: ../modules/itip-formatter/itip-view.c:4966
+#: ../modules/itip-formatter/itip-view.c:4963
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Poslané oznámenie o zrušení postúpenia"
 
-#: ../modules/itip-formatter/itip-view.c:4970
+#: ../modules/itip-formatter/itip-view.c:4967
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nepodarilo sa poslať oznámenie o zrušení postúpenia"
 
-#: ../modules/itip-formatter/itip-view.c:5018
+#: ../modules/itip-formatter/itip-view.c:5015
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nepodarilo sa aktualizovať účastníka. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5061
+#: ../modules/itip-formatter/itip-view.c:5058
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Strenutie nie je platné a nemôže byť aktualizované"
 
-#: ../modules/itip-formatter/itip-view.c:5137
+#: ../modules/itip-formatter/itip-view.c:5134
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný"
+msgstr "Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný"
 
-#: ../modules/itip-formatter/itip-view.c:5209
-#: ../modules/itip-formatter/itip-view.c:5248
+#: ../modules/itip-formatter/itip-view.c:5206 ../modules/itip-formatter/itip-view.c:5245
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Stav účastníka nie je možné aktualizovať, pretože položka už neexistuje"
+msgstr "Stav účastníka nie je možné aktualizovať, pretože položka už neexistuje"
 
-#: ../modules/itip-formatter/itip-view.c:5311
+#: ../modules/itip-formatter/itip-view.c:5308
 msgid "Meeting information sent"
 msgstr "Informácie o stretnutí odoslané"
 
-#: ../modules/itip-formatter/itip-view.c:5316
+#: ../modules/itip-formatter/itip-view.c:5313
 msgid "Task information sent"
 msgstr "Informácie o úlohe odoslané"
 
-#: ../modules/itip-formatter/itip-view.c:5321
+#: ../modules/itip-formatter/itip-view.c:5318
 msgid "Memo information sent"
 msgstr "Informácie o poznámke odoslané"
 
-#: ../modules/itip-formatter/itip-view.c:5332
+#: ../modules/itip-formatter/itip-view.c:5329
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Nepodarilo sa odoslať informácie o stretnutí, stretnutie neexistuje"
 
-#: ../modules/itip-formatter/itip-view.c:5337
+#: ../modules/itip-formatter/itip-view.c:5334
 msgid "Unable to send task information, the task does not exist"
 msgstr "Nepodarilo sa odoslať informácie o úlohe, úloha neexistuje"
 
-#: ../modules/itip-formatter/itip-view.c:5342
+#: ../modules/itip-formatter/itip-view.c:5339
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Nepodarilo sa odoslať informácie o poznámke, poznámka neexistuje"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5407
+#: ../modules/itip-formatter/itip-view.c:5404
 msgid "calendar.ics"
 msgstr "kalendár.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5412
+#: ../modules/itip-formatter/itip-view.c:5409
 msgid "Save Calendar"
 msgstr "Uložiť kalendár"
 
-#: ../modules/itip-formatter/itip-view.c:5461
-#: ../modules/itip-formatter/itip-view.c:5474
+#: ../modules/itip-formatter/itip-view.c:5458 ../modules/itip-formatter/itip-view.c:5471
 msgid "The calendar attached is not valid"
 msgstr "Priložený kalendár nie je platný"
 
-#: ../modules/itip-formatter/itip-view.c:5462
-#: ../modules/itip-formatter/itip-view.c:5475
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-"Správa tvrdí, že obsahuje kalendár, ale kalendár nie je platný iCalendar."
+#: ../modules/itip-formatter/itip-view.c:5459 ../modules/itip-formatter/itip-view.c:5472
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+msgstr "Správa tvrdí, že obsahuje kalendár, ale kalendár nie je platný iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5517
-#: ../modules/itip-formatter/itip-view.c:5547
-#: ../modules/itip-formatter/itip-view.c:5648
+#: ../modules/itip-formatter/itip-view.c:5514 ../modules/itip-formatter/itip-view.c:5544 
../modules/itip-formatter/itip-view.c:5645
 msgid "The item in the calendar is not valid"
 msgstr "Položka v kalendári nie je platná"
 
-#: ../modules/itip-formatter/itip-view.c:5518
-#: ../modules/itip-formatter/itip-view.c:5548
-#: ../modules/itip-formatter/itip-view.c:5649
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"Správa obsahuje kalendár, ale ten neobsahuje žiadne udalosti, úlohy, ani "
-"záznamy pre diár"
+#: ../modules/itip-formatter/itip-view.c:5515 ../modules/itip-formatter/itip-view.c:5545 
../modules/itip-formatter/itip-view.c:5646
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy 
information"
+msgstr "Správa obsahuje kalendár, ale ten neobsahuje žiadne udalosti, úlohy, ani záznamy pre diár"
 
-#: ../modules/itip-formatter/itip-view.c:5563
+#: ../modules/itip-formatter/itip-view.c:5560
 msgid "The calendar attached contains multiple items"
 msgstr "Priložený kalendár obsahuje viac položiek"
 
-#: ../modules/itip-formatter/itip-view.c:5564
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"Na spracovanie všetkých položiek, je potrebné ho uložiť a následne importovať"
+#: ../modules/itip-formatter/itip-view.c:5561
+msgid "To process all of these items, the file should be saved and the calendar imported"
+msgstr "Na spracovanie všetkých položiek, je potrebné ho uložiť a následne importovať"
 
-#: ../modules/itip-formatter/itip-view.c:6066
+#: ../modules/itip-formatter/itip-view.c:6063
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Žiadny"
 
-#: ../modules/itip-formatter/itip-view.c:6082
+#: ../modules/itip-formatter/itip-view.c:6079
 msgid "Tentatively Accepted"
 msgstr "Predbežne akceptované"
 
-#: ../modules/itip-formatter/itip-view.c:6242
+#: ../modules/itip-formatter/itip-view.c:6239
 msgid "This meeting recurs"
 msgstr "Toto stretnutie sa opakuje"
 
-#: ../modules/itip-formatter/itip-view.c:6245
+#: ../modules/itip-formatter/itip-view.c:6242
 msgid "This task recurs"
 msgstr "Táto úloha sa opakuje"
 
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../modules/itip-formatter/itip-view.c:6245
 msgid "This memo recurs"
 msgstr "Táto poznámka sa opakuje"
 
 #: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"Táto odpoveď nie je od aktuálneho účastníka. Chcete ho ako účastníka pridať?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Táto odpoveď nie je od aktuálneho účastníka. Chcete ho ako účastníka pridať?"
 
 #: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 #, fuzzy
@@ -18362,23 +19604,22 @@ msgstr "Toto stretnutie už bolo zverené"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "„{0} má zverené stretnutie. Chcete pridať zverenie „{1}“?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:82
+#: ../modules/itip-formatter/plugin/config-ui.c:81
 msgid "Meeting Invitations"
 msgstr "Pozvánky na stretnutia"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:108
+#: ../modules/itip-formatter/plugin/config-ui.c:107
 msgid "_Delete message after acting"
 msgstr "_Odstrániť správu po stretnutí"
 
 # nebude lepšie rozpor pri hľadaní?
 # MČ: v ktorých kalendároch má hľadať prekrývajúce sa stretnutia
-#: ../modules/itip-formatter/plugin/config-ui.c:122
-#: ../modules/itip-formatter/plugin/config-ui.c:153
+#: ../modules/itip-formatter/plugin/config-ui.c:121 ../modules/itip-formatter/plugin/config-ui.c:152
 msgid "Conflict Search"
 msgstr "Hľadanie konfliktov"
 
 #. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:137
+#: ../modules/itip-formatter/plugin/config-ui.c:136
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Zvoľte kalendáre, v ktorých sa budú hľadať prekrývajúce sa stretnutia"
 
@@ -18390,98 +19631,88 @@ msgstr "Formátovač Itip"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Zobrazí časti MIME „text/calendar“ vo vnútri poštových správ."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:252
+#: ../modules/mail-config/e-mail-config-google-summary.c:250
 msgid "Google Features"
 msgstr "Funkcie Google"
 
 #  PK: kde to je?
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 #, fuzzy
 msgid "Add Google Ca_lendar to this account"
 msgstr "Pridajte ka_lendár Google k tomuto účtu"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:269
+#: ../modules/mail-config/e-mail-config-google-summary.c:267
 #, fuzzy
 msgid "Add Google Con_tacts to this account"
 msgstr "Pridajte _kontakty Google k tomuto účtu"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:275
 msgid "You may need to enable IMAP access"
 msgstr "Možno bude potrebné povoliť IMAP prístup"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:245 
../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Mail _Directory:"
 msgstr "_Adresár s poštou:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
 msgid "Choose a MH mail directory"
 msgstr "Zvoľte adresár s poštou typu MH"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Local Delivery _File:"
 msgstr "_Súbor lokálneho doručenia:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
 msgid "Choose a local delivery file"
 msgstr "Zvoľte súbor pre lokálne doručovanie"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a Maildir mail directory"
 msgstr "Zvoľte adresár s poštou typu Maildir"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:314
 msgid "Spool _File:"
 msgstr "_Zhromažďovací súbor:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Choose a mbox spool file"
 msgstr "Zvoľte zhromažďovací súbor typu mbox"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:337
 msgid "Spool _Directory:"
 msgstr "Zhromažďovací a_dresár:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
 msgid "Choose a mbox spool directory"
 msgstr "Zvoľte adresár pre zhromažďovací súbor typu mbox"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
-#: ../modules/plugin-manager/evolution-plugin-manager.c:159
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:136 
../modules/mail-config/e-mail-config-sendmail-backend.c:54 
../modules/mail-config/e-mail-config-smtp-backend.c:92
+#: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Konfigurácia"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:154 
../modules/mail-config/e-mail-config-smtp-backend.c:110 ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:168 
../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:180 
../modules/mail-config/e-mail-config-smtp-backend.c:242
 msgid "User_name:"
 msgstr "Po_užívateľské meno:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:213 
../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "Encryption _method:"
 msgstr "_Spôsob šifrovania:"
 
 # PK: je tu potrebne to "sa" na konci?
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:228 
../modules/mail-config/e-mail-config-smtp-backend.c:178
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS po pripojení sa"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:232 
../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "SSL on a dedicated port"
 msgstr "SSL na vyhradenom porte"
 
@@ -18515,23 +19746,23 @@ msgstr ""
 msgid "Send mail also when in offline _mode"
 msgstr "Poslať email aj v odpojenom _režime"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _overenie totožnosti"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
 msgid "T_ype:"
 msgstr "T_yp:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "Funckie služby Yahoo!"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Pridajte ka_lendáre a úlohy služby Yahoo! do programu Evolution."
 
-#: ../modules/mail/e-mail-attachment-handler.c:425
+#: ../modules/mail/e-mail-attachment-handler.c:424
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -18539,400 +19770,391 @@ msgstr[0] "%d priložených správ"
 msgstr[1] "%d priložená správa"
 msgstr[2] "%d priložené správy"
 
-#: ../modules/mail/e-mail-shell-backend.c:315
+#: ../modules/mail/e-mail-shell-backend.c:348
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poštová správa"
 
 #  tooltip
-#: ../modules/mail/e-mail-shell-backend.c:317
+#: ../modules/mail/e-mail-shell-backend.c:350
 msgid "Compose a new mail message"
 msgstr "Začne písať novú správu"
 
-#: ../modules/mail/e-mail-shell-backend.c:325
+#: ../modules/mail/e-mail-shell-backend.c:358
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Poštový úče_t"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-backend.c:327
+#: ../modules/mail/e-mail-shell-backend.c:360
 msgid "Create a new mail account"
 msgstr "Vytvorí nový poštový účet"
 
-#: ../modules/mail/e-mail-shell-backend.c:332
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Poštový p_riečinok"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-backend.c:334
+#: ../modules/mail/e-mail-shell-backend.c:367
 msgid "Create a new mail folder"
 msgstr "Vytvorí nový poštový priečinok"
 
-#: ../modules/mail/e-mail-shell-backend.c:645
+#: ../modules/mail/e-mail-shell-backend.c:682
 msgid "Mail Accounts"
 msgstr "Poštové účty"
 
-#: ../modules/mail/e-mail-shell-backend.c:654
+#: ../modules/mail/e-mail-shell-backend.c:691
 msgid "Mail Preferences"
 msgstr "Nastavenia pošty"
 
-#: ../modules/mail/e-mail-shell-backend.c:663
+#: ../modules/mail/e-mail-shell-backend.c:700
 msgid "Composer Preferences"
 msgstr "Nastavenia editora správ"
 
-#: ../modules/mail/e-mail-shell-backend.c:673
+#: ../modules/mail/e-mail-shell-backend.c:710
 msgid "Network Preferences"
 msgstr "Nastavenia siete"
 
 # MČ: pravidlo -> žiadne, pre istotu ešte skontrolovať, nie som si istý kde sa to zobrazí.
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:965
+#: ../modules/mail/e-mail-shell-backend.c:1002
 msgctxt "label"
 msgid "None"
 msgstr "Žiadne"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:671
+#: ../modules/mail/e-mail-shell-view-actions.c:706
 msgid "Marking messages as read..."
 msgstr "Označujú sa správy ako prečítané…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "_Disable Account"
 msgstr "_Zakázať účet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Disable this account"
 msgstr "Zakáže tento účet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Navždy odstráni všetky zmazané správy zo všetkých priečinkov"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Edit properties of this account"
 msgstr "Upraví vlastnosti tohto účtu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1534
-msgid "_Refresh"
-msgstr "_Obnoviť"
-
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Refresh list of folders of this account"
 msgstr "Obnoví zoznam priečinkov tohto účtu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1541
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
 msgid "_Download Messages for Offline Usage"
 msgstr "Prevz_iať správy pre odpojený režim"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
 msgid "Download messages of accounts and folders marked for offline usage"
-msgstr ""
-"Prevezme správy účtov a priečinkov označených na použitie v odpojenom režime"
+msgstr "Prevezme správy účtov a priečinkov označených na použitie v odpojenom režime"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1548
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "Fl_ush Outbox"
 msgstr "_Vyprázdniť priečinok Pošta na odoslanie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "_Copy Folder To..."
 msgstr "_Kopírovať priečinok do…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "Copy the selected folder into another folder"
 msgstr "Kopíruje vybraný priečinok do iného priečinka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Permanently remove this folder"
 msgstr "Navždy odstráni tento priečinok"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "E_xpunge"
 msgstr "_Vyčistiť"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Navždy odstráni všetky zmazané správy z tohto priečinka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
-#: ../modules/mail/e-mail-shell-view-actions.c:1676
+#: ../modules/mail/e-mail-shell-view-actions.c:1629 ../modules/mail/e-mail-shell-view-actions.c:1729
 msgid "Mar_k All Messages as Read"
 msgstr "Označiť všetky _správy ako prečítané"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1578
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../modules/mail/e-mail-shell-view-actions.c:1631 ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Mark all messages in the folder as read"
 msgstr "Označí všetky správy v priečinku ako prečítané"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1636
 msgid "_Move Folder To..."
 msgstr "Pre_sunúť priečinok do…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1585
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Move the selected folder into another folder"
 msgstr "Presunie vybraný priečinok do iného priečinka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1643
 msgid "_New..."
 msgstr "_Nový…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Create a new folder for storing mail"
 msgstr "Vytvorí nový priečinok na ukladanie pošty"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Change the properties of this folder"
 msgstr "Zmení vlastnosti tohto priečinka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1606
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Refresh the folder"
 msgstr "Znovu načíta priečinok"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1613
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Change the name of this folder"
 msgstr "Zmení názov tohoto priečinka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1618
+#: ../modules/mail/e-mail-shell-view-actions.c:1671
 msgid "Select Message _Thread"
 msgstr "Vybrať _vlákno správ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1620
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Vyberie všetky správy v rovnakom vlákne ako je vybraná správa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1625
+#: ../modules/mail/e-mail-shell-view-actions.c:1678
 msgid "Select Message S_ubthread"
 msgstr "Vybrať _podvlákno správ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1627
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Select all replies to the currently selected message"
 msgstr "Vyberie všetky odpovede na aktuálne vybranú správu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Empty _Trash"
 msgstr "Vyprázdniť _Kôš"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1641
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Navždy odstráni všetky zmazané správy zo všetkých účtov"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1646
+#: ../modules/mail/e-mail-shell-view-actions.c:1699
 msgid "_New Label"
 msgstr "_Nová menovka"
 
 # Translators: "None" is used in the message label context menu.
 # It removes all labels from the selected messages.
-#: ../modules/mail/e-mail-shell-view-actions.c:1655
+#: ../modules/mail/e-mail-shell-view-actions.c:1708
 msgid "N_one"
 msgstr "Ži_adna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1669
+#: ../modules/mail/e-mail-shell-view-actions.c:1722
 msgid "_Manage Subscriptions"
 msgstr "_Spravovať prihlásenia"
 
 # MČ: tooltip ku prechádzajúcemu aj ku "Subcriptions..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1671
-#: ../modules/mail/e-mail-shell-view-actions.c:1755
+#: ../modules/mail/e-mail-shell-view-actions.c:1724 ../modules/mail/e-mail-shell-view-actions.c:1808
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prihlási (alebo odhlási) k odberu priečinkov na vzdialených serveroch"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
-#: ../modules/mail/e-mail-shell-view-actions.c:1704
+#: ../modules/mail/e-mail-shell-view-actions.c:1736 ../modules/mail/e-mail-shell-view-actions.c:1757
 msgid "Send / _Receive"
 msgstr "Odoslať / P_rijať"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Send queued items and retrieve new items"
 msgstr "Pošle neodoslanú poštu a získa novú poštu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
 msgid "R_eceive All"
 msgstr "_Prijať všetko"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1692
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "Receive new items from all accounts"
 msgstr "Prijme nové položky zo všetkých účtov"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1750
 msgid "_Send All"
 msgstr "_Poslať všetko"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 msgid "Send queued items in all accounts"
 msgstr "Pošle neodoslanú poštu pre všetky účty"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1727
+#: ../modules/mail/e-mail-shell-view-actions.c:1780
 msgid "Cancel the current mail operation"
 msgstr "Zruší aktuálnu poštovú operáciu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1785
 msgid "Collapse All _Threads"
 msgstr "Zbaliť všetky _vlákna"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1734
+#: ../modules/mail/e-mail-shell-view-actions.c:1787
 msgid "Collapse all message threads"
 msgstr "Zbalí všetky vlákna správ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1792
 msgid "E_xpand All Threads"
 msgstr "Roz_baliť všetky vlákna"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../modules/mail/e-mail-shell-view-actions.c:1794
 msgid "Expand all message threads"
 msgstr "Rozbalí všetky vlákna správ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1799
 msgid "_Message Filters"
 msgstr "Filtre _správ"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1748
+#: ../modules/mail/e-mail-shell-view-actions.c:1801
 msgid "Create or edit rules for filtering new mail"
 msgstr "Vytvorí alebo upraví pravidlá na filtrovanie novej pošty"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../modules/mail/e-mail-shell-view-actions.c:1806
 msgid "_Subscriptions..."
 msgstr "_Prihlásenia k odberu…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1762
+#: ../modules/mail/e-mail-shell-view-actions.c:1815
 msgid "F_older"
 msgstr "P_riečinok"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1769
+#: ../modules/mail/e-mail-shell-view-actions.c:1822
 msgid "_Label"
 msgstr "_Menovka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1786
+#: ../modules/mail/e-mail-shell-view-actions.c:1839
 msgid "C_reate Search Folder From Search..."
 msgstr "Vytvo_riť vyhľadávací priečinok z hľadania…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:1846
 msgid "Search F_olders"
 msgstr "Vyhľadávacie pr_iečinky"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../modules/mail/e-mail-shell-view-actions.c:1848
 msgid "Create or edit search folder definitions"
 msgstr "Vytvorí alebo upraví definície vyhľadávacích priečinkov"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1834
+#: ../modules/mail/e-mail-shell-view-actions.c:1887
 msgid "_New Folder..."
 msgstr "Nový _priečinok…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1862
+#: ../modules/mail/e-mail-shell-view-actions.c:1915
 msgid "Show Message _Preview"
 msgstr "Zobraziť _náhľad správy"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1864
+#: ../modules/mail/e-mail-shell-view-actions.c:1917
 msgid "Show message preview pane"
 msgstr "Zobrazí panel s náhľadom správy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1870
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Show _Deleted Messages"
 msgstr "Zobraziť o_dstránené správy"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1872
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Show deleted messages with a line through them"
 msgstr "Zobrazí odstránené správy ako preškrtnuté"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1878
+#: ../modules/mail/e-mail-shell-view-actions.c:1931
 msgid "_Group By Threads"
 msgstr "Zoskupiť podľa _vlákien"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1880
+#: ../modules/mail/e-mail-shell-view-actions.c:1933
 msgid "Threaded message list"
 msgstr "Zoznam správ po vláknach"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1886
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "_Unmatched Folder Enabled"
 msgstr "Povolený priečinok _Nevyhovujúce"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1888
+#: ../modules/mail/e-mail-shell-view-actions.c:1941
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Prepína, či má byť povolený vyhľadávací priečinok Nevyhovujúce"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1908
+#: ../modules/mail/e-mail-shell-view-actions.c:1961
 msgid "Show message preview below the message list"
 msgstr "Zobrazí náhľad správy pod zoznamom správ"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1915
+#: ../modules/mail/e-mail-shell-view-actions.c:1968
 msgid "Show message preview alongside the message list"
 msgstr "Zobrazí náhľad správy vedľa zoznamu správ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1923
+#: ../modules/mail/e-mail-shell-view-actions.c:1976
 msgid "All Messages"
 msgstr "Všetky správy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1930
+#: ../modules/mail/e-mail-shell-view-actions.c:1983
 msgid "Important Messages"
 msgstr "Dôležité správy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1937
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Last 5 Days' Messages"
 msgstr "Správy za posledných 5 dní"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1944
+#: ../modules/mail/e-mail-shell-view-actions.c:1997
 msgid "Messages Not Junk"
 msgstr "Správy nie sú nevyžiadané"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1951
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "Messages with Attachments"
 msgstr "Správy s prílohami"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1958
+#: ../modules/mail/e-mail-shell-view-actions.c:2011
 msgid "No Label"
 msgstr "Bez menovky"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1965
+#: ../modules/mail/e-mail-shell-view-actions.c:2018
 msgid "Read Messages"
 msgstr "Prečítané správy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1972
+#: ../modules/mail/e-mail-shell-view-actions.c:2025
 msgid "Unread Messages"
 msgstr "Neprečítané správy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2024
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Subject or Addresses contain"
 msgstr "Predmet alebo adresy obsahujú"
 
 # je to za hľadať v:
-#: ../modules/mail/e-mail-shell-view-actions.c:2034
+#: ../modules/mail/e-mail-shell-view-actions.c:2094
 msgid "All Accounts"
 msgstr "Všetkých účtoch"
 
 # je to za hľadať v:
-#: ../modules/mail/e-mail-shell-view-actions.c:2041
+#: ../modules/mail/e-mail-shell-view-actions.c:2101
 msgid "Current Account"
 msgstr "Aktuálnom účte"
 
 # je to za hľadať v:
-#: ../modules/mail/e-mail-shell-view-actions.c:2048
+#: ../modules/mail/e-mail-shell-view-actions.c:2108
 msgid "Current Folder"
 msgstr "Aktuálnom priečinku"
 
 # MČ: názov vyhľadávacieho priečinka
-#: ../modules/mail/e-mail-shell-view.c:637
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
 msgstr "Hľadanie vo všetkých účtoch"
 
 # MČ: názov vyhľadávacieho priečinka
-#: ../modules/mail/e-mail-shell-view.c:745
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
 msgstr "Hľadanie v účte"
 
-#: ../modules/mail/e-mail-shell-view-private.c:985
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -18940,8 +20162,7 @@ msgstr[0] "%d vybraných, "
 msgstr[1] "%d vybraná, "
 msgstr[2] "%d vybrané, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:994
-#: ../modules/mail/e-mail-shell-view-private.c:1011
+#: ../modules/mail/e-mail-shell-view-private.c:995 ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -18949,8 +20170,7 @@ msgstr[0] "%d odstránených"
 msgstr[1] "%d odstránená"
 msgstr[2] "%d odstránené"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1020
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1021 ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -18958,7 +20178,7 @@ msgstr[0] "%d nevyžiadaných"
 msgstr[1] "%d nevyžiadaná"
 msgstr[2] "%d nevyžiadané"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -18966,7 +20186,7 @@ msgstr[0] "%d konceptov"
 msgstr[1] "%d koncept"
 msgstr[2] "%d koncepty"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -18974,7 +20194,7 @@ msgstr[0] "%d neposlaných"
 msgstr[1] "%d neposlaná"
 msgstr[2] "%d neposlané"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1045
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -18982,7 +20202,7 @@ msgstr[0] "%d poslaných"
 msgstr[1] "%d poslaná"
 msgstr[2] "%d poslané"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1057
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18990,7 +20210,7 @@ msgstr[0] "%d neprečítaných, "
 msgstr[1] "%d neprečítaná, "
 msgstr[2] "%d neprečítané, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -18998,59 +20218,77 @@ msgstr[0] "celkom %d"
 msgstr[1] "celkom %d"
 msgstr[2] "celkom %d"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1081
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 msgid "Trash"
 msgstr "Kôš"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1518
+#: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
 msgstr "Odoslať / Prijať"
 
-#: ../modules/mail/em-composer-prefs.c:444
+#: ../modules/mail/em-composer-prefs.c:394
 #, fuzzy
 #| msgid "Select Folder"
 msgid "Select Folder to Add"
 msgstr "Vybrať priečinok"
 
-#: ../modules/mail/em-composer-prefs.c:871
-#, fuzzy
-#| msgid "_Account:"
-msgid "Account"
-msgstr "Úč_et:"
-
-#: ../modules/mail/em-composer-prefs.c:889
+#: ../modules/mail/em-composer-prefs.c:854
 #, fuzzy
 #| msgid "F_older"
 msgid "Folder"
 msgstr "P_riečinok"
 
-#: ../modules/mail/em-composer-prefs.c:925
+#: ../modules/mail/em-composer-prefs.c:890
 #, fuzzy
 #| msgid "Recipients"
 msgid "Recipient"
 msgstr "Adresáti"
 
-#: ../modules/mail/em-composer-prefs.c:1196
+#: ../modules/mail/em-composer-prefs.c:1157
+#, fuzzy
+#| msgid "_Save to Outbox"
+msgid "Keep in Outbox"
+msgstr "_Uložiť do Pošty na odoslanie"
+
+#: ../modules/mail/em-composer-prefs.c:1158
+#, fuzzy
+#| msgid "Send private reply?"
+msgid "Send immediately"
+msgstr "Poslať súkromnú odpoveď?"
+
+#: ../modules/mail/em-composer-prefs.c:1159
+#, fuzzy
+#| msgid "15 minutes"
+msgid "Send after 5 minutes"
+msgstr "15 minút"
+
+#: ../modules/mail/em-composer-prefs.c:1232
 msgid "Language(s)"
 msgstr "Jazyk(y)"
 
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "On exit, every time"
 msgstr "Vždy pri ukončení"
 
-#: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per day"
+#: ../modules/mail/em-mailer-prefs.c:80
+#, fuzzy
+#| msgid "On exit, once per day"
+msgid "Once per day"
 msgstr "Pri ukončení, raz za deň"
 
-#: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per week"
+#: ../modules/mail/em-mailer-prefs.c:81
+#, fuzzy
+#| msgid "On exit, once per week"
+msgid "Once per week"
 msgstr "Pri ukončení, raz za týždeň"
 
-#: ../modules/mail/em-mailer-prefs.c:84
-msgid "On exit, once per month"
+#: ../modules/mail/em-mailer-prefs.c:82
+#, fuzzy
+#| msgid "On exit, once per month"
+msgid "Once per month"
 msgstr "Pri ukončení, raz za mesiac"
 
-#: ../modules/mail/em-mailer-prefs.c:85
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "Immediately, on folder leave"
 msgstr "Okamžite pri opúšťaní priečinka"
 
@@ -19063,40 +20301,39 @@ msgid "Contains Value"
 msgstr "Obsahuje hodnotu"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1236
 msgid "_Date header:"
 msgstr "_Dátum hlavičky:"
 
-#: ../modules/mail/em-mailer-prefs.c:1216
+#: ../modules/mail/em-mailer-prefs.c:1237
 msgid "Show _original header value"
 msgstr "Zobraziť pôv_odnú hodnotu hlavičky"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
-msgstr ""
-"Chcete urobiť z programu Evolution vášho predvoleného emailového klienta?"
+msgstr "Chcete urobiť z programu Evolution vášho predvoleného emailového klienta?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:308
+#: ../modules/mdn/evolution-mdn.c:304
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Vaša správa pre %s o „%s“ zo dňa %s bola prečítaná."
 
 # PK: pre?
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:375
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Upozornenie o doručení na „%s“"
 
-#: ../modules/mdn/evolution-mdn.c:540
+#: ../modules/mdn/evolution-mdn.c:531
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Poslať informáciu o prečítaní kontaktu „%s“"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:545
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr "_Informovať odosielateľa"
 
@@ -19114,116 +20351,90 @@ msgstr "Evolution je práve v odpojenom režime."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Click 'Work Online' to return to online mode."
-msgstr ""
-"Aby ste sa vrátili do pripojeného režimu kliknite na „Pracovať v pripojenom "
-"režime“."
+msgstr "Aby ste sa vrátili do pripojeného režimu kliknite na „Pracovať v pripojenom režime“."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
-msgstr ""
-"Evolution je momentálne v odpojenom režime, pretože nie je dostupná sieť."
+msgstr "Evolution je momentálne v odpojenom režime, pretože nie je dostupná sieť."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-msgid ""
-"Evolution will return to online mode once a network connection is "
-"established."
-msgstr ""
-"Evolution sa vráti do pripojeného režimu hneď po nadviazaní sieťového "
-"pripojenia."
+msgid "Evolution will return to online mode once a network connection is established."
+msgstr "Evolution sa vráti do pripojeného režimu hneď po nadviazaní sieťového pripojenia."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../modules/plugin-manager/evolution-plugin-manager.c:253
 msgid "Plugin Manager"
 msgstr "Správca zásuvných modulov"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+#: ../modules/plugin-manager/evolution-plugin-manager.c:268
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Poznámka: Niektoré zmeny sa prejavia až po reštarte"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:298
+#: ../modules/plugin-manager/evolution-plugin-manager.c:297
 msgid "Overview"
 msgstr "Prehľad"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:367
-#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+#: ../modules/plugin-manager/evolution-plugin-manager.c:366 
../modules/plugin-manager/evolution-plugin-manager.c:449
 msgid "Plugin"
 msgstr "Zásuvný modul"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "_Plugins"
 msgstr "_Zásuvné moduly"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "Enable and disable plugins"
 msgstr "Povoliť alebo zakázať zásuvné moduly"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version"
 msgstr "Zobraziť obyčajný text"
 
 # tooltip
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
 msgid "Display plain text version of multipart/alternative message"
-msgstr ""
-"Zobrazí obyčaný text zo správy multipart/alternative (alternatívne zápisy "
-"správy)"
+msgstr "Zobrazí obyčaný text zo správy multipart/alternative (alternatívne zápisy správy)"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 msgid "Display HTML version"
 msgstr "Zobraziť HTML časť"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
 msgid "Display HTML version of multipart/alternative message"
-msgstr ""
-"Zobrazí HTML časť zo správy multipart/alternative (alternatívne zápisy "
-"správy)"
+msgstr "Zobrazí HTML časť zo správy multipart/alternative (alternatívne zápisy správy)"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78 ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "Zobraziť HTML časť, ak je prítomná"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:45
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79 ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Ponechá program Evolution rozhodnúť, ktorú časť je najlepšie zobraziť"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82 ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Zobraziť obyčajný text, ak je prítomný"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:49
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
-msgstr ""
-"Zobrazí časť s obyčajným textom, ak je prítomná, inak ponechá rozhodnutie "
-"programu Evolution, aby vybral najvhodnejšiu časť."
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83 ../modules/prefer-plain/plugin/config-ui.c:48
+msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
+msgstr "Zobrazí časť s obyčajným textom, ak je prítomná, inak ponechá rozhodnutie programu Evolution, aby 
vybral najvhodnejšiu časť."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87 ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Vždy zobraziť len obyčajný text"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:54
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
-msgstr ""
-"Vždy zobrazí časť s obyčajným textom a je požiadaný z ostatných častí "
-"vytvorí prílohy."
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88 ../modules/prefer-plain/plugin/config-ui.c:53
+msgid "Always show plain text part and make attachments from other parts, if requested."
+msgstr "Vždy zobrazí časť s obyčajným textom a je požiadaný z ostatných častí vytvorí prílohy."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:105
+#: ../modules/prefer-plain/plugin/config-ui.c:104
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Zobraziť _utajené HTML časti ako prílohy"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:127
+#: ../modules/prefer-plain/plugin/config-ui.c:126
 msgid "HTML _Mode"
 msgstr "_Režim HTML"
 
@@ -19238,335 +20449,331 @@ msgstr "Režim obyčajného textu"
 
 #: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr ""
-"Zobrazí poštové správy ako obyčajný text, dokonca aj keď obsahujú HTML obsah."
+msgstr "Zobrazí poštové správy ako obyčajný text, dokonca aj keď obsahujú HTML obsah."
 
 # PK: preco medzera na konci? nahlas bug
-#: ../modules/spamassassin/evolution-spamassassin.c:151
+#: ../modules/spamassassin/evolution-spamassassin.c:150
 #, fuzzy, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Zlyhalo vytvorenie procesu programu SpamAssassin (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:174
+#: ../modules/spamassassin/evolution-spamassassin.c:173
 #, fuzzy
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Zlyhalo zasielanie obsahu poštovej správy do programu SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:193
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, fuzzy, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Zlyhalo zapísanie „%s“ do SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:221
+#: ../modules/spamassassin/evolution-spamassassin.c:220
 #, fuzzy
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Zlyhalo prečítanie výstupu z SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:276
+#: ../modules/spamassassin/evolution-spamassassin.c:275
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin spadol alebo zlyhal pri spracovaní poštovej správy"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:356
+#: ../modules/spamassassin/evolution-spamassassin.c:355
 msgid "SpamAssassin Options"
 msgstr "Voľby pre SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:371
+#: ../modules/spamassassin/evolution-spamassassin.c:370
 msgid "I_nclude remote tests"
 msgstr "_Zahrnúť vzdialené testy"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:385
+#: ../modules/spamassassin/evolution-spamassassin.c:384
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Toto spôsobí, že bude SpamAssassin spoľahlivejší, ale pomalší."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:559
+#: ../modules/spamassassin/evolution-spamassassin.c:558 
../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#, fuzzy
+#| msgid "Junk filtering software:"
+msgid "Junk filter using SpamAssassin"
+msgstr "Program na filtrovanie nevyžiadanej pošty:"
+
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:262
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260 
../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Importujú sa súbory"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "Import zrušený."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "Import dokončený."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:156
+#: ../modules/startup-wizard/e-startup-assistant.c:155
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
-"The next few screens will allow Evolution to connect to your email accounts, "
-"and to import files from other applications."
+"The next few screens will allow Evolution to connect to your email accounts, and to import files from other 
applications."
 msgstr ""
 "Víta vás Evolution.\n"
 "\n"
-"Niekoľko nasledujúcich obrazoviek umožní programu Evolution pripojiť sa k "
-"vašim poštovým účtom a importovať súbory z iných aplikácií."
+"Niekoľko nasledujúcich obrazoviek umožní programu Evolution pripojiť sa k vašim poštovým účtom a importovať 
súbory z iných aplikácií."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:229
+#: ../modules/startup-wizard/evolution-startup-wizard.c:228
 msgid "Loading accounts..."
 msgstr "Načítavajú sa účty…"
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
 msgid "_Format as..."
 msgstr "_Formátovať ako…"
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
 msgid "_Other languages"
 msgstr "_Ostatné jazyky"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:337
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:437
 msgid "Text Highlight"
 msgstr "Zvýrazňovanie textu"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:338
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Syntax highlighting of mail parts"
 msgstr "Zvýrazňovanie syntaxe častí poštových správ"
 
-#: ../modules/text-highlight/languages.c:32
+#: ../modules/text-highlight/languages.c:31
 msgid "_Plain text"
 msgstr "_Obyčajný text"
 
-#: ../modules/text-highlight/languages.c:38
+#: ../modules/text-highlight/languages.c:37
 msgid "_Assembler"
 msgstr "J_azyk symbolických inštrukcií"
 
-#: ../modules/text-highlight/languages.c:43
+#: ../modules/text-highlight/languages.c:42
 msgid "_Bash"
 msgstr "_Bash"
 
-#: ../modules/text-highlight/languages.c:54
+#: ../modules/text-highlight/languages.c:53
 msgid "_C/C++"
 msgstr "_C/C++"
 
-#: ../modules/text-highlight/languages.c:63
+#: ../modules/text-highlight/languages.c:62
 msgid "_C#"
 msgstr "_C#"
 
 # PK: tu by som dal len CSS
-#: ../modules/text-highlight/languages.c:68
+#: ../modules/text-highlight/languages.c:67
 msgid "_Cascade Style Sheet"
 msgstr "_Cascade Style Sheet (CSS)"
 
-#: ../modules/text-highlight/languages.c:73
-msgid "_HTML"
-msgstr "_HTML"
-
-#: ../modules/text-highlight/languages.c:81
+#: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
 
-#: ../modules/text-highlight/languages.c:87
+#: ../modules/text-highlight/languages.c:86
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: ../modules/text-highlight/languages.c:93
+#: ../modules/text-highlight/languages.c:92
 msgid "_Patch/diff"
 msgstr "_Patch/diff"
 
-#: ../modules/text-highlight/languages.c:99
+#: ../modules/text-highlight/languages.c:98
 msgid "_Perl"
 msgstr "_Perl"
 
-#: ../modules/text-highlight/languages.c:110
+#: ../modules/text-highlight/languages.c:109
 msgid "_PHP"
 msgstr "_PHP"
 
-#: ../modules/text-highlight/languages.c:123
+#: ../modules/text-highlight/languages.c:122
 msgid "_Python"
 msgstr "_Python"
 
-#: ../modules/text-highlight/languages.c:128
+#: ../modules/text-highlight/languages.c:127
 msgid "_Ruby"
 msgstr "_Ruby"
 
-#: ../modules/text-highlight/languages.c:135
+#: ../modules/text-highlight/languages.c:134
 msgid "_Tcl/Tk"
 msgstr "_Tcl/Tk"
 
-#: ../modules/text-highlight/languages.c:141
+#: ../modules/text-highlight/languages.c:140
 msgid "_TeX/LaTeX"
 msgstr "_TeX/LaTeX"
 
-#: ../modules/text-highlight/languages.c:147
+#: ../modules/text-highlight/languages.c:146
 msgid "_Vala"
 msgstr "_Vala"
 
-#: ../modules/text-highlight/languages.c:152
+#: ../modules/text-highlight/languages.c:151
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
-#: ../modules/text-highlight/languages.c:159
+#: ../modules/text-highlight/languages.c:158
 msgid "_XML"
 msgstr "_XML"
 
-#: ../modules/text-highlight/languages.c:177
+#: ../modules/text-highlight/languages.c:176
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
-#: ../modules/text-highlight/languages.c:182
+#: ../modules/text-highlight/languages.c:181
 msgid "_ADA95"
 msgstr "_ADA95"
 
-#: ../modules/text-highlight/languages.c:189
+#: ../modules/text-highlight/languages.c:188
 msgid "_ALGOL 68"
 msgstr "_ALGOL 68"
 
-#: ../modules/text-highlight/languages.c:194
+#: ../modules/text-highlight/languages.c:193
 msgid "(_G)AWK"
 msgstr "(_G)AWK"
 
-#: ../modules/text-highlight/languages.c:199
+#: ../modules/text-highlight/languages.c:198
 msgid "_COBOL"
 msgstr "_COBOL"
 
-#: ../modules/text-highlight/languages.c:204
+#: ../modules/text-highlight/languages.c:203
 msgid "_DOS Batch"
 msgstr "Dávkový súbor pre _DOS"
 
-#: ../modules/text-highlight/languages.c:209
+#: ../modules/text-highlight/languages.c:208
 msgid "_D"
 msgstr "_D"
 
-#: ../modules/text-highlight/languages.c:214
+#: ../modules/text-highlight/languages.c:213
 msgid "_Erlang"
 msgstr "_Erlang"
 
-#: ../modules/text-highlight/languages.c:219
+#: ../modules/text-highlight/languages.c:218
 msgid "_FORTRAN 77"
 msgstr "_FORTRAN 77"
 
-#: ../modules/text-highlight/languages.c:225
+#: ../modules/text-highlight/languages.c:224
 msgid "_FORTRAN 90"
 msgstr "_FORTRAN 90"
 
-#: ../modules/text-highlight/languages.c:230
+#: ../modules/text-highlight/languages.c:229
 msgid "_F#"
 msgstr "_F#"
 
-#: ../modules/text-highlight/languages.c:235
+#: ../modules/text-highlight/languages.c:234
 msgid "_Go"
 msgstr "_Go"
 
-#: ../modules/text-highlight/languages.c:240
+#: ../modules/text-highlight/languages.c:239
 msgid "_Haskell"
 msgstr "_Haskell"
 
-#: ../modules/text-highlight/languages.c:245
+#: ../modules/text-highlight/languages.c:244
 msgid "_JSP"
 msgstr "_JSP"
 
-#: ../modules/text-highlight/languages.c:250
+#: ../modules/text-highlight/languages.c:249
 msgid "_Lisp"
 msgstr "_Lisp"
 
-#: ../modules/text-highlight/languages.c:258
+#: ../modules/text-highlight/languages.c:257
 msgid "_Lotus"
 msgstr "_Lotus"
 
-#: ../modules/text-highlight/languages.c:263
+#: ../modules/text-highlight/languages.c:262
 msgid "_Lua"
 msgstr "_Lua"
 
-#: ../modules/text-highlight/languages.c:268
+#: ../modules/text-highlight/languages.c:267
 msgid "_Maple"
 msgstr "_Maple"
 
-#: ../modules/text-highlight/languages.c:273
+#: ../modules/text-highlight/languages.c:272
 msgid "_Matlab"
 msgstr "_Matlab"
 
-#: ../modules/text-highlight/languages.c:278
+#: ../modules/text-highlight/languages.c:277
 msgid "_Maya"
 msgstr "_Maya"
 
-#: ../modules/text-highlight/languages.c:283
+#: ../modules/text-highlight/languages.c:282
 msgid "_Oberon"
 msgstr "_Oberon"
 
-#: ../modules/text-highlight/languages.c:288
+#: ../modules/text-highlight/languages.c:287
 msgid "_Objective C"
 msgstr "_Objective C"
 
-#: ../modules/text-highlight/languages.c:294
+#: ../modules/text-highlight/languages.c:293
 msgid "_OCaml"
 msgstr "_OCaml"
 
-#: ../modules/text-highlight/languages.c:299
+#: ../modules/text-highlight/languages.c:298
 msgid "_Octave"
 msgstr "_Octave"
 
-#: ../modules/text-highlight/languages.c:304
+#: ../modules/text-highlight/languages.c:303
 msgid "_Object Script"
 msgstr "_Object Script"
 
-#: ../modules/text-highlight/languages.c:309
+#: ../modules/text-highlight/languages.c:308
 msgid "_Pascal"
 msgstr "_Pascal"
 
-#: ../modules/text-highlight/languages.c:314
+#: ../modules/text-highlight/languages.c:313
 msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
-#: ../modules/text-highlight/languages.c:319
+#: ../modules/text-highlight/languages.c:318
 msgid "_Prolog"
 msgstr "_Prolog"
 
-#: ../modules/text-highlight/languages.c:324
+#: ../modules/text-highlight/languages.c:323
 msgid "_PostScript"
 msgstr "_PostScript"
 
-#: ../modules/text-highlight/languages.c:329
+#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:334
+#: ../modules/text-highlight/languages.c:333
 msgid "_RPM Spec"
 msgstr "Súbor so špecifikáciou pre _RPM"
 
-#: ../modules/text-highlight/languages.c:339
+#: ../modules/text-highlight/languages.c:338
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:344
+#: ../modules/text-highlight/languages.c:343
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:350
+#: ../modules/text-highlight/languages.c:349
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:355
+#: ../modules/text-highlight/languages.c:354
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
-#: ../modules/vcard-inline/e-mail-part-vcard.c:152
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131 ../modules/vcard-inline/e-mail-part-vcard.c:151
 msgid "Show F_ull vCard"
 msgstr "Zobraziť ú_plnú vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
-#: ../modules/vcard-inline/e-mail-part-vcard.c:170
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134 ../modules/vcard-inline/e-mail-part-vcard.c:169
 msgid "Show Com_pact vCard"
 msgstr "Zobraziť _kompaktnú vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
 msgid "Save _To Addressbook"
 msgstr "_Uložiť do adresára kontaktov"
 
 # zobrazí sa keď má zoznam kontaktov presne dve položky, okrem vlastného kontaktu ešte jednu
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 msgid "There is one other contact."
 msgstr "Je tu ešte jeden kontakt."
 
 # zobrazí sa keď má zoznam kontaktov viac ako dve položky, teda môj a ešte aspoň dva ďalšie.
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -19574,26 +20781,25 @@ msgstr[0] "Je tu %d iných kontaktov."
 msgstr[1] "Je tu jeden iný kontakt."
 msgstr[2] "Sú tu %d iné kontakty."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
 msgid "Addressbook Contact"
 msgstr "Kontakt z adresára"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
 msgid "Display the part as an addressbook contact"
 msgstr "Zobrazí časť ako kontakt z adresára"
 
 # PK: neni to skor nastroj na analyzu? co to robi?
-#: ../modules/web-inspector/evolution-web-inspector.c:96
+#: ../modules/web-inspector/evolution-web-inspector.c:95
 #, fuzzy
 msgid "Evolution Web Inspector"
 msgstr "Dozorca Web programu Evolution"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:123
 msgid "_Do not show this message again."
 msgstr "_Túto správu už nezobrazovať."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:477
+#: ../plugins/attachment-reminder/attachment-reminder.c:584 ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Kĺučové slová"
 
@@ -19602,12 +20808,8 @@ msgid "Message has no attachments"
 msgstr "Správa nemá prílohy"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
-msgstr ""
-"Evolution objavil niektoré kľúčové slová, ktoré indikujú, že správa by mala "
-"obsahovať prílohu, ale nenašiel žiadnu."
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but 
cannot find one."
+msgstr "Evolution objavil niektoré kľúčové slová, ktoré indikujú, že správa by mala obsahovať prílohu, ale 
nenašiel žiadnu."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
@@ -19627,38 +20829,35 @@ msgstr "Upozorňovač na prílohy"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Upozorní vás na chýbajúcu prílohu v poštovej správe"
 
-#: ../plugins/bbdb/bbdb.c:637 ../plugins/bbdb/bbdb.c:646
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835 
../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatické kontakty"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:661
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "Vytvárať položky _adresára kontaktov pri posielaní pošty"
 
-#: ../plugins/bbdb/bbdb.c:668
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "Vyberte adresár kontaktov pre automatické kontakty"
 
 # instant messaging tusím prekladáme inak pozri v ostatných moduloch
-#: ../plugins/bbdb/bbdb.c:685
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "Kontakty priamej komunikácie"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:700
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr ""
-"_Synchronizovať informácie o kontaktoch a obrázky zo zoznamu priateľov "
-"programu Pidgin"
+msgstr "_Synchronizovať informácie o kontaktoch a obrázky zo zoznamu priateľov programu Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:707
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Vyberte adresár kontaktov pre zoznam priateľov programu Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:720
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronizovať so zoznamom _priateľov teraz"
 
@@ -19677,17 +20876,13 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
+"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills 
in IM contact information from your buddy lists."
 msgstr ""
 "Odbremení od otravnej práce s udržiavaním adresára kontaktov.\n"
 "\n"
-"Automaticky vypĺňa váš adresár kontaktov menami a emailovými adresami ak "
-"pošlete odpoveď na správu. Taktiež vypĺňa informácie priamej komunikácie o "
-"kontaktoch zo zoznamov programov priamej komunikácie."
+"Automaticky vypĺňa váš adresár kontaktov menami a emailovými adresami ak pošlete odpoveď na správu. Taktiež 
vypĺňa informácie priamej komunikácie o kontaktoch zo zoznamov programov priamej komunikácie."
 
-#: ../plugins/dbx-import/dbx-importer.c:279
+#: ../plugins/dbx-import/dbx-importer.c:278
 msgid "Importing Outlook Express data"
 msgstr "Importujú sa údaje programu Outlook Express"
 
@@ -19704,38 +20899,38 @@ msgstr "Osobné priečinky Outlook Express 5/6 (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Importuje správy programu Outlook Experss zo súboru DBX"
 
-#: ../plugins/email-custom-header/email-custom-header.c:292
+#: ../plugins/email-custom-header/email-custom-header.c:293
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Bezpečnosť:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:296
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Osobné"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=635414
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Nezaradené"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Chránené"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Dôverné"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Tajné"
 
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../plugins/email-custom-header/email-custom-header.c:302
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Prísne tajné"
@@ -19743,17 +20938,17 @@ msgstr "Prísne tajné"
 # Translators: "None" as an email custom header option in a dialog invoked
 #     by Insert->Custom Header from Composer, indicating the header will not be
 #     added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:361
+#: ../plugins/email-custom-header/email-custom-header.c:362
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Žiadna"
 
-#: ../plugins/email-custom-header/email-custom-header.c:537
+#: ../plugins/email-custom-header/email-custom-header.c:539
 msgid "_Custom Header"
 msgstr "_Vlastná hlavička"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:807
+#: ../plugins/email-custom-header/email-custom-header.c:809
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19761,12 +20956,11 @@ msgstr ""
 "Formát pre určenie kľúča a hodnoty vlastnej hlavičky je:\n"
 "Názov kľúča a hodnoty oddelené pomocou „;“."
 
-#: ../plugins/email-custom-header/email-custom-header.c:860
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Kľúč"
 
-#: ../plugins/email-custom-header/email-custom-header.c:877
-#: ../plugins/templates/templates.c:486
+#: ../plugins/email-custom-header/email-custom-header.c:879 ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "Hodnoty"
 
@@ -19783,11 +20977,11 @@ msgstr "Pridajte vlastné hlavičky do odchádzajúcich poštových správ."
 msgid "Email Custom Header"
 msgstr "Vlastná hlavička emailu"
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:113
 msgid "Command to be executed to launch the editor: "
 msgstr "Príkaz na spustenie editora: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:114
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
@@ -19795,12 +20989,11 @@ msgstr ""
 "Pre XEmacs použite „xemacs“\n"
 "Pre Vim použite „gvim -f“"
 
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:124
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Automaticky spustiť pri upravovaní novej pošty"
 
-#: ../plugins/external-editor/external-editor.c:418
-#: ../plugins/external-editor/external-editor.c:420
+#: ../plugins/external-editor/external-editor.c:467 ../plugins/external-editor/external-editor.c:469
 msgid "Compose in External Editor"
 msgstr "Písať v externom editore"
 
@@ -19817,56 +21010,44 @@ msgid "Editor not launchable"
 msgstr "Editor nie je spustiteľný"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"Externý editor nastavený v predvoľbách zásuvného modulu sa nepodarilo "
-"spustiť. Pokúste sa nastaviť iný editor."
+msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different 
editor."
+msgstr "Externý editor nastavený v predvoľbách zásuvného modulu sa nepodarilo spustiť. Pokúste sa nastaviť 
iný editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid "Cannot create Temporary File"
 msgstr "Nedá sa vytvoriť dočasný súbor"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
-msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
-msgstr ""
-"Evolution nemôže vytvoriť dočasný súbor na uloženie vašej poštovej správy. "
-"Skúste to neskôr."
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgstr "Evolution nemôže vytvoriť dočasný súbor na uloženie vašej poštovej správy. Skúste to neskôr."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr "Externý editor stále beží"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
-msgstr ""
-"Externý editor stále beží. Okno písania správy nemôže byť zatvorené pokiaľ "
-"je editor aktívny."
+msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor 
is active."
+msgstr "Externý editor stále beží. Okno písania správy nemôže byť zatvorené pokiaľ je editor aktívny."
 
 # dialog title
-#: ../plugins/face/face.c:289
+#: ../plugins/face/face.c:288
 msgid "Select a Face Picture"
 msgstr "Výber obrázka tváre"
 
-#: ../plugins/face/face.c:299
+#: ../plugins/face/face.c:298
 msgid "Image files"
 msgstr "Súbory obrázkov"
 
 # PK: automaticky vkladat...
-#: ../plugins/face/face.c:358
+#: ../plugins/face/face.c:357
 msgid "_Insert Face picture by default"
 msgstr "Automaticky _vkladať obrázok tváre"
 
-#: ../plugins/face/face.c:371
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr "Načítať nový obrázok _tváre"
 
-#: ../plugins/face/face.c:432
+#: ../plugins/face/face.c:431
 msgid "Include _Face"
 msgstr "Zahrnúť _tvár"
 
@@ -19899,68 +21080,60 @@ msgstr "Nie je obrázok"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "Súbor, ktorý ste vybrali, nevyzerá ako platný .png obrázok. Chyba: {0}"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "Vložený obrázok"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "Zobraziť priložené obrázky priamo v poštovej správe."
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:365
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "Získať _archív konferencie"
 
 # tooltip
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "Get an archive of the list this message belongs to"
 msgstr "Získa archív konferencie, do ktorej patrí táto správa"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:372
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
 msgid "Get List _Usage Information"
 msgstr "Získať informácie o po_užívaní konferencie"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Získa informácie o používaní konferencie, do ktorej patrí táto správa"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:379
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
 msgid "Contact List _Owner"
 msgstr "Kontaktovať _vlastníka konferencie"
 
 # tooltip
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Skontaktuje vlastníka konferencie, do ktorej patrí táto správa"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:386
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
 msgid "_Post Message to List"
 msgstr "_Poslať správu do konferencie"
 
 # tooltip
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Pošle správu do konferencie, do ktorej patrí táto správa"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:393
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
 msgid "_Subscribe to List"
 msgstr "Prihlá_siť sa do konferencie"
 
 # tooltip
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Prihlási do konferencie, do ktorej patrí táto správa"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:400
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
 msgid "_Unsubscribe from List"
 msgstr "_Odhlásiť z konferencie"
 
 # tooltip
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Odhlási z konferencie, do ktorej patrí táto správa"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:409
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "Mailing _List"
 msgstr "Poštová _konferencia"
 
@@ -19971,18 +21144,14 @@ msgstr "Akcie poštovej konferencie"
 # description of plugin
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr ""
-"Sprístupňuje bežné akcie poštovej konferencie (prihlásenie, odhlásenie, "
-"atď.)."
+msgstr "Sprístupňuje bežné akcie poštovej konferencie (prihlásenie, odhlásenie, atď.)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "Akcia nie je k dispozícii"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
-msgid ""
-"This message does not contain the header information required for this "
-"action."
+msgid "This message does not contain the header information required for this action."
 msgstr "Táto správa neobsahuje informačnú hlavičku potrebnú pre túto akciu."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
@@ -19990,13 +21159,8 @@ msgid "Posting not allowed"
 msgstr "Odosielanie nie je povolené"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"Odosielanie do tejto poštovej konferencie nie je povolené. Je možné, že je "
-"to poštová konferencia len na čítanie. Ak chcete viac podrobností spojte sa "
-"s vlastníkom konferencie."
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the 
list owner for details."
+msgstr "Odosielanie do tejto poštovej konferencie nie je povolené. Je možné, že je to poštová konferencia 
len na čítanie. Ak chcete viac podrobností spojte sa s vlastníkom konferencie."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
@@ -20004,17 +21168,13 @@ msgstr "Poslať emailovú správu do poštovej konferencie?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see 
and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
-"Emailová správa bude odoslaná na URL „{0}“. Môžete, buď správu automaticky "
-"odoslať, alebo sa najprv na ňu pozrieť a upraviť ju.\n"
+"Emailová správa bude odoslaná na URL „{0}“. Môžete, buď správu automaticky odoslať, alebo sa najprv na ňu 
pozrieť a upraviť ju.\n"
 "\n"
-"Mali by ste obdržať odpoveď zakrátko po odoslaní správy do poštovej "
-"konferencie."
+"Mali by ste obdržať odpoveď zakrátko po odoslaní správy do poštovej konferencie."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "_Send message"
@@ -20044,18 +21204,15 @@ msgstr "Žiadne poštové akcie"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain any action that could be 
processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Akcia nemôže byť vykonaná. Hlavička pre túto akciu neobsahuje žiadnu akciu, "
-"ktorá sa dá spracovať.\n"
+"Akcia nemôže byť vykonaná. Hlavička pre túto akciu neobsahuje žiadnu akciu, ktorá sa dá spracovať.\n"
 "\n"
 "Hlavička: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:383
-#: ../plugins/mail-notification/mail-notification.c:419
+#: ../plugins/mail-notification/mail-notification.c:382 ../plugins/mail-notification/mail-notification.c:418
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -20065,54 +21222,54 @@ msgstr[2] "Dostali ste %d nové správy."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:394
+#: ../plugins/mail-notification/mail-notification.c:393
 #, c-format
 msgid "From: %s"
 msgstr "Od: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:408
+#: ../plugins/mail-notification/mail-notification.c:407
 #, c-format
 msgid "Subject: %s"
 msgstr "Predmet: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../plugins/mail-notification/mail-notification.c:424
 msgid "New email in Evolution"
 msgstr "Nová pošta v programe Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:460
+#: ../plugins/mail-notification/mail-notification.c:459
 #, c-format
 msgid "Show %s"
 msgstr "Zobraziť %s"
 
-#: ../plugins/mail-notification/mail-notification.c:662
+#: ../plugins/mail-notification/mail-notification.c:661
 msgid "_Play sound when a new message arrives"
 msgstr "Pre_hrať zvuk pri príchode novej správy"
 
-#: ../plugins/mail-notification/mail-notification.c:694
+#: ../plugins/mail-notification/mail-notification.c:693
 msgid "_Beep"
 msgstr "_Pípnuť"
 
-#: ../plugins/mail-notification/mail-notification.c:707
+#: ../plugins/mail-notification/mail-notification.c:706
 msgid "Use sound _theme"
 msgstr "Použiť zvukovú _tému"
 
-#: ../plugins/mail-notification/mail-notification.c:726
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Play _file:"
 msgstr "Prehrať _súbor:"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Select sound file"
 msgstr "Vybrať zvukový súbor"
 
-#: ../plugins/mail-notification/mail-notification.c:791
+#: ../plugins/mail-notification/mail-notification.c:790
 msgid "Notify new messages for _Inbox only"
 msgstr "Upozorniť na nové správy len pre priečinok _Doručená pošta"
 
-#: ../plugins/mail-notification/mail-notification.c:801
+#: ../plugins/mail-notification/mail-notification.c:800
 msgid "Show _notification when a new message arrives"
 msgstr "Zobraziť _oznámenie po prijatí novej správy"
 
@@ -20125,165 +21282,113 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Upozorní vás pri príchode novej spávy."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:230
+#: ../plugins/mail-to-task/mail-to-task.c:229
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Vytvorené z poštovej správy od kontaktu %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:613
 #, c-format
-msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
-"old event?"
-msgstr ""
-"Vybratý kalendár už obsahuje udalosť „%s“. Chcete upraviť starú udalosť?"
+msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
+msgstr "Vybratý kalendár už obsahuje udalosť „%s“. Chcete upraviť starú udalosť?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:617
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
-msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
-"old task?"
-msgstr ""
-"Vybratý zoznam úloh už obsahuje úlohu „%s“. Chcete upraviť starú úlohu?"
+msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
+msgstr "Vybratý zoznam úloh už obsahuje úlohu „%s“. Chcete upraviť starú úlohu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:620
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
-msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
-"old memo?"
-msgstr ""
-"Vybratý zoznam poznámok už obsahuje poznámku „%s“. Chcete upraviť starú "
-"poznámku?"
+msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
+msgstr "Vybratý zoznam poznámok už obsahuje poznámku „%s“. Chcete upraviť starú poznámku?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:640
+#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
-msgid ""
-"You have selected %d mails to be converted to events. Do you really want to "
-"add them all?"
-msgid_plural ""
-"You have selected %d mails to be converted to events. Do you really want to "
-"add them all?"
-msgstr[0] ""
-"Máte vybratých %d poštových správ, z ktorých chcete spraviť udalosti. Naozaj "
-"ich chcete pridať?"
-msgstr[1] ""
-"Máte vybratú %d poštovú správu, z ktorej chcete spraviť udalosť. Naozaj ju "
-"chcete pridať?"
-msgstr[2] ""
-"Máte vybraté %d poštové správy, z ktorých chcete spraviť udalosti. Naozaj "
-"ich chcete pridať?"
+msgid "You have selected %d mails to be converted to events. Do you really want to add them all?"
+msgid_plural "You have selected %d mails to be converted to events. Do you really want to add them all?"
+msgstr[0] "Máte vybratých %d poštových správ, z ktorých chcete spraviť udalosti. Naozaj ich chcete pridať?"
+msgstr[1] "Máte vybratú %d poštovú správu, z ktorej chcete spraviť udalosť. Naozaj ju chcete pridať?"
+msgstr[2] "Máte vybraté %d poštové správy, z ktorých chcete spraviť udalosti. Naozaj ich chcete pridať?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:647
+#: ../plugins/mail-to-task/mail-to-task.c:646
 #, c-format
-msgid ""
-"You have selected %d mails to be converted to tasks. Do you really want to "
-"add them all?"
-msgid_plural ""
-"You have selected %d mails to be converted to tasks. Do you really want to "
-"add them all?"
-msgstr[0] ""
-"Máte vybratých %d poštových správ, z ktorých chcete spraviť úlohy. Naozaj "
-"ich chcete pridať?"
-msgstr[1] ""
-"Máte vybratú %d poštovú správu, z ktorej chcete spraviť úlohu. Naozaj ju "
-"chcete pridať?"
-msgstr[2] ""
-"Máte vybraté %d poštové správy, z ktorých chcete spraviť úlohy. Naozaj ich "
-"chcete pridať?"
+msgid "You have selected %d mails to be converted to tasks. Do you really want to add them all?"
+msgid_plural "You have selected %d mails to be converted to tasks. Do you really want to add them all?"
+msgstr[0] "Máte vybratých %d poštových správ, z ktorých chcete spraviť úlohy. Naozaj ich chcete pridať?"
+msgstr[1] "Máte vybratú %d poštovú správu, z ktorej chcete spraviť úlohu. Naozaj ju chcete pridať?"
+msgstr[2] "Máte vybraté %d poštové správy, z ktorých chcete spraviť úlohy. Naozaj ich chcete pridať?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:654
+#: ../plugins/mail-to-task/mail-to-task.c:653
 #, c-format
-msgid ""
-"You have selected %d mails to be converted to memos. Do you really want to "
-"add them all?"
-msgid_plural ""
-"You have selected %d mails to be converted to memos. Do you really want to "
-"add them all?"
-msgstr[0] ""
-"Máte vybratých %d poštových správ, z ktorých chcete spraviť poznámky. Naozaj "
-"ich chcete pridať?"
-msgstr[1] ""
-"Máte vybratú %d poštovú správu, z ktorej chcete spraviť poznámku. Naozaj ju "
-"chcete pridať?"
-msgstr[2] ""
-"Máte vybraté %d poštové správy, z ktorých chcete spraviť poznámky. Naozaj "
-"ich chcete pridať?"
+msgid "You have selected %d mails to be converted to memos. Do you really want to add them all?"
+msgid_plural "You have selected %d mails to be converted to memos. Do you really want to add them all?"
+msgstr[0] "Máte vybratých %d poštových správ, z ktorých chcete spraviť poznámky. Naozaj ich chcete pridať?"
+msgstr[1] "Máte vybratú %d poštovú správu, z ktorej chcete spraviť poznámku. Naozaj ju chcete pridať?"
+msgstr[2] "Máte vybraté %d poštové správy, z ktorých chcete spraviť poznámky. Naozaj ich chcete pridať?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:675
+#: ../plugins/mail-to-task/mail-to-task.c:674
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Chcete pokračovať v konverzii zvyšných správ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:751
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid "[No Summary]"
 msgstr "[Žiadny súhrn]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:764
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "Neplatný objekt vrátený zo servera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:819
+#: ../plugins/mail-to-task/mail-to-task.c:818
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Vyskytla sa chyba pri spracovaní: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:853
+#: ../plugins/mail-to-task/mail-to-task.c:854
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Nedá sa otvoriť kalendár. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
-msgid ""
-"Selected calendar is read only, thus cannot create event there. Select other "
-"calendar, please."
-msgstr ""
-"Vybratý kalendár je len na čítanie, a preto v ňom nemožno vytvoriť udalosť. "
-"Vyberte si, prosím, iný kalendár."
+#: ../plugins/mail-to-task/mail-to-task.c:858
+msgid "Selected calendar is read only, thus cannot create event there. Select other calendar, please."
+msgstr "Vybratý kalendár je len na čítanie, a preto v ňom nemožno vytvoriť udalosť. Vyberte si, prosím, iný 
kalendár."
 
-#: ../plugins/mail-to-task/mail-to-task.c:860
-msgid ""
-"Selected task list is read only, thus cannot create task there. Select other "
-"task list, please."
-msgstr ""
-"Vybratý zoznam úloh je len na čítanie, a preto v ňom nemožno vytvoriť úlohu. "
-"Vyberte si, prosím, iný zoznam úloh."
+#: ../plugins/mail-to-task/mail-to-task.c:861
+msgid "Selected task list is read only, thus cannot create task there. Select other task list, please."
+msgstr "Vybratý zoznam úloh je len na čítanie, a preto v ňom nemožno vytvoriť úlohu. Vyberte si, prosím, iný 
zoznam úloh."
 
-#: ../plugins/mail-to-task/mail-to-task.c:863
-msgid ""
-"Selected memo list is read only, thus cannot create memo there. Select other "
-"memo list, please."
-msgstr ""
-"Vybratý zoznam poznámok je len na čítanie, a preto v ňom nemožno vytvoriť "
-"poznámku. Vyberte si, prosím, iný zoznam poznámok."
+#: ../plugins/mail-to-task/mail-to-task.c:864
+msgid "Selected memo list is read only, thus cannot create memo there. Select other memo list, please."
+msgstr "Vybratý zoznam poznámok je len na čítanie, a preto v ňom nemožno vytvoriť poznámku. Vyberte si, 
prosím, iný zoznam poznámok."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1262
+#: ../plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create an _Appointment"
 msgstr "Vytvoriť schôd_zku"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1264
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a new event from the selected message"
 msgstr "Vytvorí novú udalosť z vybranej správy"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1269
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create a Mem_o"
 msgstr "Vytvoriť _poznámku"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a new memo from the selected message"
 msgstr "Vytvorí novú poznámku z vybranej správy"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1276
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a _Task"
 msgstr "Vytvoriť ú_lohu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new task from the selected message"
 msgstr "Vytvorí novú úlohu z vybranej správy"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
+#: ../plugins/mail-to-task/mail-to-task.c:1290
 msgid "Create a _Meeting"
 msgstr "Vytvoriť _stretnutie"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1288
+#: ../plugins/mail-to-task/mail-to-task.c:1292
 msgid "Create a new meeting from the selected message"
 msgstr "Vytvorí nové stretnutie z vybranej správy"
 
@@ -20303,37 +21408,35 @@ msgstr "Osobné priečinky Outlook (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Importovať Outlook správy z PST súboru"
 
-#: ../plugins/pst-import/pst-importer.c:527
+#: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: ../plugins/pst-import/pst-importer.c:556
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Destination folder:"
 msgstr "Cieľový priečinok:"
 
-#: ../plugins/pst-import/pst-importer.c:566
+#: ../plugins/pst-import/pst-importer.c:565
 msgid "_Address Book"
 msgstr "_Adresár kontaktov"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "A_ppointments"
 msgstr "_Schôdzky"
 
-#: ../plugins/pst-import/pst-importer.c:576 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "Ú_lohy"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:580
 msgid "_Journal entries"
 msgstr "_Položky žurnálu"
 
-#: ../plugins/pst-import/pst-importer.c:698
+#: ../plugins/pst-import/pst-importer.c:697
 msgid "Importing Outlook data"
 msgstr "Importujú sa údaje z programu Outlook"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:141
-#: ../plugins/publish-calendar/publish-calendar.c:148
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1 
../plugins/publish-calendar/publish-calendar.c:140 ../plugins/publish-calendar/publish-calendar.c:147
 msgid "Calendar Publishing"
 msgstr "Zverejňovanie kalendárov"
 
@@ -20345,44 +21448,42 @@ msgstr "Umiestnenia"
 msgid "Publish calendars to the web."
 msgstr "Zverejní kalendáre na webe."
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
-#: ../plugins/publish-calendar/publish-calendar.c:485
+#: ../plugins/publish-calendar/publish-calendar.c:217 ../plugins/publish-calendar/publish-calendar.c:484
 #, c-format
 msgid "Could not open %s:"
 msgstr "Nepodarilo sa otvoriť %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:237
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Vyskytla sa chyba počas zverejňovania na %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:243
+#: ../plugins/publish-calendar/publish-calendar.c:242
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Zverejňovanie na %s úspešne skončilo"
 
-#: ../plugins/publish-calendar/publish-calendar.c:291
+#: ../plugins/publish-calendar/publish-calendar.c:290
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Pripojenie %s zlyhalo:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:656
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/publish-calendar/publish-calendar.c:655 ../plugins/publish-calendar/publish-calendar.ui.h:35
 msgid "E_nable"
 msgstr "_Povoliť"
 
-#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/publish-calendar/publish-calendar.c:805
 msgid "Are you sure you want to remove this location?"
 msgstr "Ste si istý, že chcete odstrániť toto umiestenie?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1145
+#: ../plugins/publish-calendar/publish-calendar.c:1144
 msgid "Could not create publish thread."
 msgstr "Nepodarilo sa vytvoriť vlákno na zverejnenie."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1155
+#: ../plugins/publish-calendar/publish-calendar.c:1154
 msgid "_Publish Calendar Information"
 msgstr "_Zverejniť informácie o kalendári"
 
@@ -20462,7 +21563,7 @@ msgstr "P_ort:"
 msgid "_Username:"
 msgstr "Po_užívateľské meno:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29 ../smime/gui/certificate-manager.c:772
 msgid "_Password:"
 msgstr "_Heslo:"
 
@@ -20474,17 +21575,16 @@ msgstr "Z_apamätať heslo"
 msgid "Publishing Location"
 msgstr "Zverejňuje sa umiestnenie"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:100
-#: ../plugins/publish-calendar/publish-format-ical.c:103
+#: ../plugins/publish-calendar/publish-format-fb.c:101 ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Neplatný UID zdroja „%s“"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:545
+#: ../plugins/publish-calendar/url-editor-dialog.c:544
 msgid "New Location"
 msgstr "Nové umiestnenie"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:547
+#: ../plugins/publish-calendar/url-editor-dialog.c:546
 msgid "Edit Location"
 msgstr "Upraviť umiestnenie"
 
@@ -20493,83 +21593,83 @@ msgstr "Upraviť umiestnenie"
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:161
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "Zoznam popisov"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Categories List"
 msgstr "Zoznam kategórií"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Comment List"
 msgstr "Zoznam komentárov"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Contact List"
 msgstr "Zoznam kontaktov"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Start"
 msgstr "Štart"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "End"
 msgstr "Koniec"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Due"
 msgstr "Termín"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "percent Done"
 msgstr "percet dokončených"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Attendees List"
 msgstr "Zoznam účastníkov"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Modified"
 msgstr "Zmenené"
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:563
 msgid "A_dvanced options for the CSV format"
 msgstr "_Pokročilé voľby pre CSV formát"
 
-#: ../plugins/save-calendar/csv-format.c:572
+#: ../plugins/save-calendar/csv-format.c:571
 msgid "Prepend a _header"
 msgstr "Predradiť h_lavičku"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "_Value delimiter:"
 msgstr "Oddeľovač _hodnôt:"
 
-#: ../plugins/save-calendar/csv-format.c:592
+#: ../plugins/save-calendar/csv-format.c:591
 msgid "_Record delimiter:"
 msgstr "Oddeľovač _záznamov:"
 
-#: ../plugins/save-calendar/csv-format.c:603
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "_Encapsulate values with:"
 msgstr "Hodnoty _ohraničené pomocou:"
 
-#: ../plugins/save-calendar/csv-format.c:629
+#: ../plugins/save-calendar/csv-format.c:628
 msgid "Comma separated values (.csv)"
 msgstr "Formát čiarkou oddelených hodnôt (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:184 ../shell/e-shell-utils.c:178
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -20596,70 +21696,74 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:121
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Formát:"
 
-#: ../plugins/save-calendar/save-calendar.c:187
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Vybrať cieľový súbor"
 
-#: ../plugins/save-calendar/save-calendar.c:348
+#: ../plugins/save-calendar/save-calendar.c:188
+#, fuzzy
+#| msgid "_Save"
+msgid "_Save As"
+msgstr "_Uložiť"
+
+#: ../plugins/save-calendar/save-calendar.c:347
 msgid "Save the selected calendar to disk"
 msgstr "Uloží vybraný kalendár na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:379
+#: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
 msgstr "Uloží vybraný zoznam poznámok na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:410
+#: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
 msgstr "Uloží vybraný zoznam úloh na disk"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid ""
-"Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an email you are replying to."
-msgstr ""
-"Zásuvný modul šablón založených na konceptoch. Môžete použiť premenné ako "
-"$ORIG[subject], $ORIG[from], $ORIG[to] alebo $ORIG[body], ktoré budú "
-"nahradené hodnotami z emailu, na ktorý odpovedáte."
+msgid "Drafts based template plugin. You can use variables like $ORIG[subject], $ORIG[from], $ORIG[to] or 
$ORIG[body], which will be replaced by values from an email you are replying to."
+msgstr "Zásuvný modul šablón založených na konceptoch. Môžete použiť premenné ako $ORIG[subject], 
$ORIG[from], $ORIG[to] alebo $ORIG[body], ktoré budú nahradené hodnotami z emailu, na ktorý odpovedáte."
 
-#: ../plugins/templates/templates.c:1145
+#: ../plugins/templates/templates.c:1199
 msgid "No Title"
 msgstr "Bez názvu"
 
-#: ../plugins/templates/templates.c:1254
+#: ../plugins/templates/templates.c:1308
 msgid "Save as _Template"
 msgstr "Uložiť ako ša_blónu"
 
-#: ../plugins/templates/templates.c:1256
+#: ../plugins/templates/templates.c:1310
 msgid "Save as Template"
 msgstr "Uloží ako šablónu"
 
-#: ../shell/e-shell.c:279
+#: ../shell/e-shell.c:326
 msgid "Preparing to go offline..."
 msgstr "Pripravuje sa prechod na odpojený režim…"
 
-#: ../shell/e-shell.c:332
+#: ../shell/e-shell.c:379
 msgid "Preparing to go online..."
 msgstr "Pripravuje sa prechod na pripojený režim…"
 
 #  reason for inhibiting
-#: ../shell/e-shell.c:413
+#: ../shell/e-shell.c:486
 msgid "Preparing to quit"
 msgstr "Príprava na ukončenie"
 
-#: ../shell/e-shell.c:419
+#: ../shell/e-shell.c:492
 msgid "Preparing to quit..."
 msgstr "Pripravuje sa na ukončenie…"
 
-#: ../shell/e-shell-content.c:721 ../shell/e-shell-content.c:722
+#: ../shell/e-shell.c:904
+msgid "Credentials are required to connect to the destination host."
+msgstr ""
+
+#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Hľadania"
 
-#: ../shell/e-shell-content.c:765
+#: ../shell/e-shell-content.c:764
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
@@ -20667,27 +21771,27 @@ msgstr "Uložiť hľadanie"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:930
 msgid "Sho_w:"
 msgstr "Zo_braziť:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:963
+#: ../shell/e-shell-searchbar.c:955
 msgid "Sear_ch:"
 msgstr "_Hľadať:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1031
+#: ../shell/e-shell-searchbar.c:1023
 msgid "i_n"
 msgstr "_v"
 
-#: ../shell/e-shell-utils.c:175
+#: ../shell/e-shell-utils.c:174
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:199
+#: ../shell/e-shell-utils.c:198
 msgid "All Files (*)"
 msgstr "Všetky súbory (*)"
 
@@ -20698,314 +21802,322 @@ msgstr "Uchováva sa stav používateľského rozhrania"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:74
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
 "Marcel Telka <marcel telka sk>\n"
 "Pavol Klačanský <pavol klacansky com>\n"
 "Marián Čavojský <cavo+gnomel10n cavo sk>"
 
-#: ../shell/e-shell-window-actions.c:85
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "Webové stránky programu Evolution"
 
-#: ../shell/e-shell-window-actions.c:341
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr "Editor kategórií"
 
-#: ../shell/e-shell-window-actions.c:672
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr "Program Priateľ v núdzi nie je nainštalovaný."
 
-#: ../shell/e-shell-window-actions.c:673
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr "Program Priateľ v núdzi nemohol byť spustený."
 
+#: ../shell/e-shell-window-actions.c:894
+msgid "_About"
+msgstr ""
+
 # tooltip
-#: ../shell/e-shell-window-actions.c:853
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "Zobrazí informácie o programe Evolution"
 
-#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "Za_vrieť okno"
 
-#: ../shell/e-shell-window-actions.c:879
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "Ob_sah"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:881
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr "Otvorí používateľskú príručku pre Evolution"
 
-#: ../shell/e-shell-window-actions.c:907
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "I_mportovať…"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:909
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr "Importuje údaje z iných programov"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "Nové _okno"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr "Vytvorí nové okno zobrazujúce tento pohľad"
 
-#: ../shell/e-shell-window-actions.c:928
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "Dostupné kate_górie"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr "Organizuje dostupné kategórie"
 
-#: ../shell/e-shell-window-actions.c:942
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
 msgstr "K_rátky prehľad klávesových skratiek"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr "Zobrazí klávesové skratky pre Evolution"
 
+#: ../shell/e-shell-window-actions.c:992
+#, fuzzy
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "Ukončiť"
+
 # tooltip
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: ../shell/e-shell-window-actions.c:956
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "_Pokročilé hľadanie…"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "Zostrojí pokročilé hľadanie"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:965
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr "Vymaže aktuálne parametre hľadania"
 
-#: ../shell/e-shell-window-actions.c:970
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "_Upraviť uložené hľadania…"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "Spravuje vaše uložené hľadania"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "Kliknutím zmeníte typ vyhľadávania"
 
-#: ../shell/e-shell-window-actions.c:984
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "_Nájsť teraz"
 
 #  tooltip
-#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr "Vykoná aktuálne parametre hľadania"
 
-#: ../shell/e-shell-window-actions.c:991
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "Uložiť _hľadanie…"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr "Uloží aktuálne parametre hľadania"
 
-#: ../shell/e-shell-window-actions.c:1005
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
 msgstr "_Odoslať správu o chybe…"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Odošle správu o chybe pomocou programu Priateľ v núdzi"
 
-#: ../shell/e-shell-window-actions.c:1012
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "_Pracovať v odpojenom režime"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "Prepne Evolution do odpojeného režimu"
 
-#: ../shell/e-shell-window-actions.c:1019
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "_Pracovať v pripojenom režime"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1021
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "Prepne Evolution do pripojeného režimu"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr "R_ozloženie"
 
-#: ../shell/e-shell-window-actions.c:1056
-msgid "_New"
-msgstr "_Nový"
-
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1106
 msgid "_Search"
 msgstr "_Nájsť"
 
-#: ../shell/e-shell-window-actions.c:1070
+#: ../shell/e-shell-window-actions.c:1113
 msgid "_Switcher Appearance"
 msgstr "_Vzhľad prepínania"
 
-#: ../shell/e-shell-window-actions.c:1084
+#: ../shell/e-shell-window-actions.c:1127
 msgid "_Window"
 msgstr "_Okno"
 
-#: ../shell/e-shell-window-actions.c:1113
+#: ../shell/e-shell-window-actions.c:1156
 msgid "Show Side _Bar"
 msgstr "Zobraziť bočnú _lištu"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1115
+#: ../shell/e-shell-window-actions.c:1158
 msgid "Show the side bar"
 msgstr "Zobrazí bočnú lištu"
 
-#: ../shell/e-shell-window-actions.c:1121
+#: ../shell/e-shell-window-actions.c:1164
 msgid "Show _Buttons"
 msgstr "Zobraziť _tlačidlá"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1123
+#: ../shell/e-shell-window-actions.c:1166
 msgid "Show the switcher buttons"
 msgstr "Zobrazí tlačidlá prepínača"
 
-#: ../shell/e-shell-window-actions.c:1129
+#: ../shell/e-shell-window-actions.c:1172
 msgid "Show _Status Bar"
 msgstr "Zobraziť _stavovú lištu"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1131
+#: ../shell/e-shell-window-actions.c:1174
 msgid "Show the status bar"
 msgstr "Zobrazí stavovú lištu"
 
-#: ../shell/e-shell-window-actions.c:1137
+#: ../shell/e-shell-window-actions.c:1180
 msgid "Show _Tool Bar"
 msgstr "Zobraziť lištu _nástrojov"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1139
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Show the tool bar"
 msgstr "Zobrazí lištu nástrojov"
 
-#: ../shell/e-shell-window-actions.c:1161
+#: ../shell/e-shell-window-actions.c:1204
 msgid "_Icons Only"
 msgstr "Len _ikony"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1206
 msgid "Display window buttons with icons only"
 msgstr "Zobrazí tlačidlá okna len s ikonami"
 
-#: ../shell/e-shell-window-actions.c:1168
+#: ../shell/e-shell-window-actions.c:1211
 msgid "_Text Only"
 msgstr "Len _text"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1213
 msgid "Display window buttons with text only"
 msgstr "Zobrazí tlačidlá okna len s textom"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Icons _and Text"
 msgstr "Ikony _a text"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1177
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Display window buttons with icons and text"
 msgstr "Zobrazí tlačidlá okna s ikonami a textom"
 
-#: ../shell/e-shell-window-actions.c:1182
+#: ../shell/e-shell-window-actions.c:1225
 msgid "Tool_bar Style"
 msgstr "Štýl _lišty nástrojov"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1184
+#: ../shell/e-shell-window-actions.c:1227
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Zobrazí tlačidlá okna s použitím nastavení lišty nástrojov pracovnej plochy"
+msgstr "Zobrazí tlačidlá okna s použitím nastavení lišty nástrojov pracovnej plochy"
 
-#: ../shell/e-shell-window-actions.c:1192
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Delete Current View"
 msgstr "Zrušiť aktuálny pohľad"
 
-#: ../shell/e-shell-window-actions.c:1199
+#: ../shell/e-shell-window-actions.c:1242
 msgid "Save Custom View..."
 msgstr "Uložiť prispôsobený pohľad…"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1201
+#: ../shell/e-shell-window-actions.c:1244
 msgid "Save current custom view"
 msgstr "Uloží aktuálny prispôsobený pohľad"
 
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1251
 msgid "C_urrent View"
 msgstr "Akt_uálny pohľad"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1261
 msgid "Custom View"
 msgstr "Prispôsobený pohľad"
 
 #  tooltip
-#: ../shell/e-shell-window-actions.c:1220
+#: ../shell/e-shell-window-actions.c:1263
 msgid "Current view is a customized view"
 msgstr "Aktuálny pohľad je prispôsobený"
 
+#: ../shell/e-shell-window-actions.c:1271
+msgid "Page Set_up..."
+msgstr ""
+
 # tooltip
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1273
 msgid "Change the page settings for your current printer"
 msgstr "Zmení nastavenia strany pre vašu aktuálnu tlačiareň"
 
 # %s je názov časti aplkácie. Čiže: Pošta, Kontakty, Kalendár, Úlohy a Poznámky
 # tooltip
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1634
 #, c-format
 msgid "Switch to %s"
 msgstr "Prepne na aplikáciu %s"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1757
 #, c-format
 msgid "Select view: %s"
 msgstr "Vyberie pohľad: %s"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1774
 #, c-format
 msgid "Delete view: %s"
 msgstr "Zruší pohľad: %s"
 
-#: ../shell/e-shell-window-actions.c:1825
+#: ../shell/e-shell-window-actions.c:1868
 msgid "Execute these search parameters"
 msgstr "Vykoná tieto vyhľadávacie parametre"
 
-#: ../shell/e-shell-window.c:504
+#: ../shell/e-shell-window.c:503
 msgid "New"
 msgstr "Nová"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:580
+#: ../shell/e-shell-window-private.c:579
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -21061,13 +22173,8 @@ msgstr "Túto správu už nezobrazovať"
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
 #: ../shell/main.c:302
-msgid ""
-"Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
-msgstr ""
-"Spustiť Evolution zobrazením určeného komponentu. Dostupné voľby sú "
-"„mail“ (pošta), „calendar“ (kalendár), „contacts“ (kontakty), "
-"„tasks“ (úlohy) a „memos“ (poznámky)"
+msgid "Start Evolution showing the specified component. Available options are 'mail', 'calendar', 
'contacts', 'tasks', and 'memos'"
+msgstr "Spustiť Evolution zobrazením určeného komponentu. Dostupné voľby sú „mail“ (pošta), „calendar“ 
(kalendár), „contacts“ (kontakty), „tasks“ (úlohy) a „memos“ (poznámky)"
 
 #: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
@@ -21103,19 +22210,15 @@ msgstr "Požiadať spustený Evolution proces o ukončenie"
 
 #: ../shell/main.c:403
 #, c-format
-msgid ""
-"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
-"System error: %s"
-msgstr ""
-"Nedá sa spustiť Evolution. Iná inštancia Evolution možno neodpovedá. Chyba "
-"systému: %s"
+msgid "Cannot start Evolution.  Another Evolution instance may be unresponsive. System error: %s"
+msgstr "Nedá sa spustiť Evolution. Iná inštancia Evolution možno neodpovedá. Chyba systému: %s"
 
 # PIM - personal information manager
-#: ../shell/main.c:497 ../shell/main.c:502
+#: ../shell/main.c:454 ../shell/main.c:459
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Poštový klient a osobný správca údajov Evolution"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:517
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21124,7 +22227,7 @@ msgstr ""
 "%s: --online a --offline nie je možné použiť naraz.\n"
 "  Spustite „%s“ --help na zobrazenie dalších informácií.\n"
 
-#: ../shell/main.c:575
+#: ../shell/main.c:523
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21141,13 +22244,11 @@ msgstr "Aktualizácia z predchádzajúcej verzie zlyhala:"
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{0}\n"
 "\n"
-"Ak sa rozhodnete pokračovať, nebudete mať prístup ku niektorým vašim starým "
-"údajom.\n"
+"Ak sa rozhodnete pokračovať, nebudete mať prístup ku niektorým vašim starým údajom.\n"
 
 #: ../shell/shell.error.xml.h:7
 msgid "Continue Anyway"
@@ -21162,17 +22263,73 @@ msgid "Cannot upgrade directly from version {0}"
 msgstr "Nedá sa aktualizovať priamo z verzie {0}"
 
 #: ../shell/shell.error.xml.h:10
-msgid ""
-"Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
+msgid "Evolution no longer supports upgrading directly from version {0}. However as a workaround you might 
try first upgrading to Evolution 2, and then upgrading to Evolution 3."
+msgstr "Evolution už viac nepodporuje priamu aktualizáciu z verzie {0}. Obísť to možno tak, že sa pokúsite 
aktualizovať na Evolution verzie 2 a až následne na Evolution verzie 3."
+
+#: ../shell/shell.error.xml.h:11
+#, fuzzy
+#| msgid "Unknown background operation"
+msgid "Close Evolution with pending background operations?"
+msgstr "Neznáma operácia na pozadí"
+
+#: ../shell/shell.error.xml.h:12
+msgid "Evolution is taking a long time to shut down, possibly due to network connectivity issues. Would you 
like to cancel all pending operations and close immediately, or keep waiting?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:14
+#, fuzzy
+#| msgid "Waiting..."
+msgid "Keep _Waiting"
+msgstr "Čaká sa…"
+
+#: ../shell/shell.error.xml.h:15
+#, fuzzy
+#| msgid "Unable to open address book"
+msgid "Failed to get values from '{0}'"
+msgstr "Nepodarilo sa otvoriť adresár kontaktov"
+
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "Zlyhalo presunutie udalosti do kalendára „{0}“"
+
+#: ../shell/shell.error.xml.h:17
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to connect to '{0}'"
+msgstr "Zlyhalo kopírovanie udalosti do kalendára „{0}“"
+
+#: ../shell/shell.error.xml.h:18
+#, fuzzy
+#| msgid "_Recover"
+msgid "_Reconnect"
+msgstr "_Obnoviť"
+
+#: ../shell/shell.error.xml.h:19
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr "Zlyhalo kopírovanie udalosti do kalendára „{0}“"
+
+#: ../shell/shell.error.xml.h:20
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:21
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:22
+msgid "Reason: {1}"
 msgstr ""
-"Evolution už viac nepodporuje priamu aktualizáciu z verzie {0}. Obísť to "
-"možno tak, že sa pokúsite aktualizovať na Evolution verzie 2 a až následne "
-"na Evolution verzie 3."
 
 # PK: precertifikovane
-#: ../smime/gui/ca-trust-dialog.c:109
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21183,166 +22340,310 @@ msgstr ""
 "\n"
 "Upraviť nastavenia dôvery:"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103 
../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Názov certifikátu"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Vydaný pre organizáciu:"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Vydaný pre organizáčnú jednotku (OU)"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107 
../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Sériové číslo"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108 
../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Účely"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109 
../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Vydavateľ"
 
 # PK: rod?
 # MČ: certifikát vydaný organizáciou.
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110 
../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Vydaný organizáciou"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111 
../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Vydaný organizačnou jednotkou"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112 
../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Vydaný"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113 
../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Platnosť vyprší"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114 
../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "Odtlačok SHA1"
 
-#: ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
-#: ../smime/gui/certificate-manager.c:130
+#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115 
../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "Odtlačok MD5"
 
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:104 ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "Emailová adresa"
 
-#: ../smime/gui/certificate-manager.c:622
-msgid "Select a certificate to import..."
-msgstr "Vyberte certifikát na importovanie…"
+#: ../smime/gui/certificate-manager.c:650
+msgid "Select a file to backup your key and certificate..."
+msgstr ""
+
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:662
+#, c-format
+msgid "%s-backup.p12"
+msgstr ""
 
-#: ../smime/gui/certificate-manager.c:636
+#: ../smime/gui/certificate-manager.c:676 ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../smime/gui/certificate-manager.c:672
+#: ../smime/gui/certificate-manager.c:728
+#, fuzzy
+#| msgid "Certificate"
+msgid "Backup Certificate"
+msgstr "Certifikát"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:742
+#, fuzzy
+#| msgid "F_ilename:"
+msgid "_File name:"
+msgstr "Náz_ov súboru:"
+
+#. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
+#: ../smime/gui/certificate-manager.c:747
+#, fuzzy
+#| msgid "Select a file"
+msgid "Please select a file..."
+msgstr "Vybrať súbor"
+
+#: ../smime/gui/certificate-manager.c:761
+msgid "_Include certificate chain in the backup"
+msgstr ""
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:767
+msgid ""
+"The certificate backup password you set here protects the backup file that you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:786
+#, fuzzy
+#| msgid "_Password:"
+msgid "_Repeat Password:"
+msgstr "_Heslo:"
+
+#: ../smime/gui/certificate-manager.c:805
+msgid "Passwords do not match"
+msgstr ""
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:813
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:858
+#, fuzzy
+#| msgid "No email address provided"
+msgid "No file name provided"
+msgstr "Neposkytnutá žiadna emailová adresa"
+
+#: ../smime/gui/certificate-manager.c:862
+#, fuzzy
+#| msgid "Failed to import certificate"
+msgid "Failed to backup key and certificate"
+msgstr "Zlyhal import certifikátu"
+
+#: ../smime/gui/certificate-manager.c:951
+msgid "Select a certificate to import..."
+msgstr "Vyberte certifikát na importovanie…"
+
+#: ../smime/gui/certificate-manager.c:1001
 msgid "Failed to import certificate"
 msgstr "Zlyhal import certifikátu"
 
-#: ../smime/gui/certificate-manager.c:1054
+#: ../smime/gui/certificate-manager.c:1117
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1119
+#, fuzzy
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Nikdy"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Marginal"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Ultimate"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Temporary"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1333
+#, fuzzy
+#| msgid "Certificate Authority Trust"
+msgid "Change certificate trust"
+msgstr "Dôveryhodnosť certifikačnej autority"
+
+#: ../smime/gui/certificate-manager.c:1345
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Temporary (this session only)"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1371
+#, fuzzy
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "_Never"
+msgstr "Nikdy"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Marginal"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1373
+#, fuzzy
+#| msgid "_Full name"
+msgctxt "CamelTrust"
+msgid "_Fully"
+msgstr "_Celé meno"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Ultimate"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1378
+#, fuzzy
+#| msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and 
procedures (if available)."
+msgid "Before trusting this site, you should examine its certificate and its policy and procedures (if 
available)."
+msgstr "Predtým, ako začnete dôverovať tejto CA z akýchkoľvek dôvodov, mali by ste si preštudovať jej 
certifikát a aj jej pravidlá a postupy (ak sú dostupné)."
+
+#: ../smime/gui/certificate-manager.c:1393
+#, fuzzy
+#| msgid "_View Certificate"
+msgid "_Display certificate"
+msgstr "_Zobraziť certifikát"
+
+#: ../smime/gui/certificate-manager.c:1598
+#, fuzzy
+#| msgid "You have certificates on file that identify these people:"
+msgid "You have certificates on file that identify these mail servers:"
+msgstr "V evidencii máte certifikáty, ktoré identifikujú týchto ľudí:"
+
+#: ../smime/gui/certificate-manager.c:1629
+#, fuzzy
+#| msgid "_List name:"
+msgid "Host name"
+msgstr "Názov _zoznamu:"
+
+#: ../smime/gui/certificate-manager.c:1631
+msgid "Issuer"
+msgstr "Vydavateľ"
+
+# algoritmy - overené priamo v aplikácii
+#: ../smime/gui/certificate-manager.c:1632
+#, fuzzy
+#| msgid "Fingerprints"
+msgid "Fingerprint"
+msgstr "Odtlačky"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Trust"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1654
+#, fuzzy
+#| msgid "_Edit CA Trust"
+msgid "_Edit Trust"
+msgstr "_Upraviť dôveru CA"
+
+#: ../smime/gui/certificate-manager.c:1973
 msgid "All PKCS12 files"
 msgstr "Všetky súbory PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1071
+#: ../smime/gui/certificate-manager.c:1990
 msgid "All email certificate files"
 msgstr "Všetky súbory emailových certifikátov"
 
-#: ../smime/gui/certificate-manager.c:1088
+#: ../smime/gui/certificate-manager.c:2007
 msgid "All CA certificate files"
 msgstr "Všetky súbory CA certifikátov"
 
-#: ../smime/gui/cert-trust-dialog.c:153
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Pretože dôverujete certifikačnej autorite, ktorá vydala tento certifikát, "
-"tak dôverujete aj pravosti tohoto certifikátu, pokiaľ tu nie je uvedené inak"
+#: ../smime/gui/cert-trust-dialog.c:152
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the 
authenticity of this certificate unless otherwise indicated here"
+msgstr "Pretože dôverujete certifikačnej autorite, ktorá vydala tento certifikát, tak dôverujete aj pravosti 
tohoto certifikátu, pokiaľ tu nie je uvedené inak"
 
-#: ../smime/gui/cert-trust-dialog.c:158
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Pretože nedôverujete certifikačnej autorite, ktorá vydala tento certifikát, "
-"tak nedôverujete ani pravosti tohoto certifikátu, pokiaľ tu nie je uvedené "
-"inak"
+#: ../smime/gui/cert-trust-dialog.c:157
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not 
trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Pretože nedôverujete certifikačnej autorite, ktorá vydala tento certifikát, tak nedôverujete ani 
pravosti tohoto certifikátu, pokiaľ tu nie je uvedené inak"
 
-#: ../smime/gui/component.c:56
+#: ../smime/gui/component.c:55
 #, c-format
 msgid "Enter the password for '%s', token '%s'"
 msgstr "Zadajte heslo pre „%s“, token „%s“"
 
-#: ../smime/gui/component.c:58
+#: ../smime/gui/component.c:57
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Zadajte heslo pre „%s“"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:86
+#: ../smime/gui/component.c:85
 msgid "Enter new password for certificate database"
 msgstr "Zadajte vaše heslo pre databázu certifikátov"
 
-#: ../smime/gui/component.c:89
+#: ../smime/gui/component.c:88
 msgid "Enter new password"
 msgstr "Zadajte nové heslo"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"Vydané pre:\n"
-"  Predmet: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:123
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"Vydavateľ:\n"
-"  Predmet: %s\n"
-
 # titulok okna, zjavne podľa kódu
-#: ../smime/gui/e-cert-selector.c:176
+#: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
 msgstr "Výber certifikátu"
 
@@ -21363,75 +22664,65 @@ msgstr "_Zálohovať"
 msgid "Backup _All"
 msgstr "Zálohovať _všetko"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Your Certificates"
 msgstr "Vaše certifikáty"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "You have certificates on file that identify these people:"
 msgstr "V evidencii máte certifikáty, ktoré identifikujú týchto ľudí:"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Contact Certificates"
 msgstr "Certifikáty kontaktu"
 
-#: ../smime/gui/smime-ui.ui.h:13
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"V evidencii máte certifikáty, ktoré identifikujú tieto certifikačné autority:"
+#: ../smime/gui/smime-ui.ui.h:15
+msgid "You have certificates on file that identify these certificate authorities:"
+msgstr "V evidencii máte certifikáty, ktoré identifikujú tieto certifikačné autority:"
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Authorities"
 msgstr "Autority"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Certificate Authority Trust"
 msgstr "Dôveryhodnosť certifikačnej autority"
 
 # PK: neviem ci je jasne ze su to webstranky
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:18
 #, fuzzy
 msgid "Trust this CA to identify _websites."
 msgstr "Dôverovať tejto CA pri identifikácii _webových sídiel."
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _email users."
 msgstr "Dôverovať tejto CA pri identifikácii p_oštových používateľov."
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _software developers."
 msgstr "Dôverovať tejto CA pri identifikácii _vývojárov softvéru."
 
-#: ../smime/gui/smime-ui.ui.h:19
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Predtým, ako začnete dôverovať tejto CA z akýchkoľvek dôvodov, mali by ste "
-"si preštudovať jej certifikát a aj jej pravidlá a postupy (ak sú dostupné)."
-
 #: ../smime/gui/smime-ui.ui.h:21
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and 
procedures (if available)."
+msgstr "Predtým, ako začnete dôverovať tejto CA z akýchkoľvek dôvodov, mali by ste si preštudovať jej 
certifikát a aj jej pravidlá a postupy (ak sú dostupné)."
+
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Certificate"
 msgstr "Certifikát"
 
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "Certificate details"
-msgstr "Podrobnosti certifikátu"
-
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Email Certificate Trust Settings"
 msgstr "Nastavenia dôvery poštového certifikátu"
 
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
 msgstr "Dôverovať pravosti tohoto certifikátu"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Nedôverovať pravosti tohoto certifikátu"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
 msgstr "_Upraviť dôveru CA"
 
@@ -21448,19 +22739,48 @@ msgstr "Podpisovanie"
 msgid "Encrypt"
 msgstr "Šifrovanie"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "Certifikát už existuje"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "Heslo súboru PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "Zadajte heslo pre súbor PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:329
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to create export context, err_code: %i"
+msgstr "Nedá sa zarezervovať zdroj, chyba: %s"
+
+#: ../smime/lib/e-pkcs12.c:336
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:346
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "Nedá sa zarezervovať zdroj, chyba: %s"
+
+#: ../smime/lib/e-pkcs12.c:364
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "Nedá sa zarezervovať zdroj, chyba: %s"
+
+#: ../smime/lib/e-pkcs12.c:382
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "Nedá sa zarezervovať zdroj, chyba: %s"
+
+#: ../smime/lib/e-pkcs12.c:409
 msgid "Imported Certificate"
 msgstr "Importovaný certifikát"
 
@@ -21539,6 +22859,125 @@ msgstr "S _termínom"
 msgid "With _Status"
 msgstr "So _stavom"
 
+#~ msgid "Web addresses"
+#~ msgstr "Webové adresy"
+
+#~ msgid "Original Contact:"
+#~ msgstr "Pôvodný kontakt:"
+
+#~ msgid "Could not open destination"
+#~ msgstr "Nepodarilo sa otvoriť cieľ"
+
+#~ msgid "Cannot create object"
+#~ msgstr "Nedá sa vytvoriť objekt"
+
+#~ msgid "Could not open source"
+#~ msgstr "Nepodarilo sa otvoriť zdroj"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr "Udalosť sa nepodarilo odstrániť kvôli chybe systému dbus: %s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr "Úlohu sa nepodarilo odstrániť kvôli chybe systému dbus: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr "Poznámku sa nepodarilo odstrániť kvôli chybe systému dbus: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr "Položku sa nepodarilo odstrániť kvôli chybe systému dbus: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "Udalosť sa nepodarilo odstrániť kvôli nedostatočným právam"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "Úlohu sa nepodarilo odstrániť kvôli nedostatočným právam"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "Poznámku sa nepodarilo odstrániť kvôli nedostatočným právam"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "Položku sa nepodarilo odstrániť kvôli nedostatočným právam"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "Udalosť sa nepodarilo odstrániť kvôli chybe: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "Úlohu sa nepodarilo odstrániť kvôli chybe: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "Poznámku sa nepodarilo odstrániť kvôli chybe: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "Položku sa nepodarilo odstrániť kvôli chybe: %s"
+
+#~ msgid "Customize"
+#~ msgstr "Prispôsobiť"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "Vlastné pripomenutie:"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "Odstráňujú sa vybrané objekty"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Správa bez názvu"
+
+#~ msgid "Spell checking color"
+#~ msgstr "Farba kontroly pravopisu"
+
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr "Farba podčiarknutia pre nesprávne slová pri zapnutej kontrole pravopisu."
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "Neplatná návratová hodnota (%d) overenia totožnosti"
+
+#~ msgid "Pinging %s"
+#~ msgstr "Prezváňa sa %s"
+
+#, fuzzy
+#~| msgid "_Add"
+#~ msgid "Add"
+#~ msgstr "_Pridať"
+
+#, fuzzy
+#~| msgid "_Edit"
+#~ msgid "Edit"
+#~ msgstr "_Upraviť"
+
+#, fuzzy
+#~| msgid "_Account:"
+#~ msgid " Account "
+#~ msgstr "Úč_et:"
+
+#~ msgid "Option is ignored if a match for custom junk headers is found."
+#~ msgstr "Voľba je ignorovaná ak boli nájdené špeciálne hlavičky pre nevyžiadanú poštu."
+
+#~ msgid "Copy..."
+#~ msgstr "Kopírovať…"
+
+#~ msgid "Expunging"
+#~ msgstr "Čistí sa"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "Zobraziť priložené obrázky priamo v poštovej správe."
+
+#~ msgid ""
+#~ "Issued to:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Vydané pre:\n"
+#~ "  Predmet: %s\n"
+
+#~ msgid ""
+#~ "Issued by:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Vydavateľ:\n"
+#~ "  Predmet: %s\n"
+
+#~ msgid "Certificate details"
+#~ msgstr "Podrobnosti certifikátu"
+
 #~ msgid "_Restore Default"
 #~ msgstr "_Vrátiť pôvodné"
 
@@ -21611,10 +23050,6 @@ msgstr "So _stavom"
 #~ msgid "Expires On"
 #~ msgstr "Platnosť vyprší"
 
-# algoritmy - overené priamo v aplikácii
-#~ msgid "Fingerprints"
-#~ msgstr "Odtlačky"
-
 #~ msgid "Certificate Hierarchy"
 #~ msgstr "Hierarchia certifikátu"
 
@@ -21736,9 +23171,6 @@ msgstr "So _stavom"
 #~ msgid "Certificate Signature Algorithm"
 #~ msgstr "Algoritmus podpisu certifikátu"
 
-#~ msgid "Issuer"
-#~ msgstr "Vydavateľ"
-
 #~ msgid "Issuer Unique ID"
 #~ msgstr "Jedinečný identifikátor vydavateľa"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]