[evolution-data-server] Updated Slovak translation

From: Pavol Åimo <palosimo src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Slovak translation
Date: Mon, 8 Oct 2012 14:40:51 +0000 (UTC)
commit 0f51f0793cb93d46164eecd496685037f400b189
Author: MariÃn ÄavojskÃ <cavo+gnomel10n cavo sk>
Date:   Mon Oct 8 16:40:39 2012 +0200

    Updated Slovak translation

 po/sk.po | 3398 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1734 insertions(+), 1664 deletions(-)
---
diff --git a/po/sk.po b/po/sk.po
index bd4b19d..6f325da 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,247 +1,288 @@
 # Slovak translation for evolution-data-server.
-# Copyright (C) 2001, 2002, 2003, 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2010, 2011, 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution-data-server package.
 # Stanislav Visnovsky <visnovsky nenya ms mff cuni cz>, 2001, 2002, 2003.
 # Stanislav Visnovsky <visnovsky kde org>, 2003, 2004.
 # Ivan Noris <vix vazka sk>, 2004.
 # Pavol KlaÄanskÃ <pavol klacansky com>, 2010, 2011.
+# MariÃn ÄavojskÃ <cavo+gnomel10n cavo sk>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-09-17 09:19+0000\n"
-"PO-Revision-Date: 2011-09-19 09:39+0200\n"
-"Last-Translator: Pavol KlaÄanskÃ <pavol klacansky com>\n"
+"POT-Creation-Date: 2012-02-29 19:24+0000\n"
+"PO-Revision-Date: 2012-10-08 16:35+0200\n"
+"Last-Translator: MariÃn ÄavojskÃ <cavo+gnomel10n cavo sk>\n"
 "Language-Team: Slovak <gnome-sk-list gnome org>\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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n<=4 && n>=2) ? 2 : 0;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:828
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:478
+#: ../addressbook/backends/file/e-book-backend-file.c:129
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
+#: ../addressbook/libebook/e-book-client.c:106
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:577
+#: ../calendar/backends/http/e-cal-backend-http.c:424
+#: ../calendar/libecal/e-cal.c:4596 ../calendar/libecal/e-cal-client.c:150
+#: ../camel/providers/imap/camel-imap-command.c:515
+#: ../camel/providers/imap/camel-imap-store.c:464
+#: ../camel/providers/imapx/camel-imapx-command.c:538
+#: ../libedataserver/e-client.c:164
+msgid "Unknown error"
+msgstr "NeznÃma chyba"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:154
+#, c-format
+msgid "Failed to remove file '%s': %s"
+msgstr "Zlyhalo odstrÃnenie sÃboru â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:177
+#, c-format
+msgid "Failed to make directory %s: %s"
+msgstr "Zlyhalo vytvorenie adresÃra %s: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:472
+#, c-format
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr "Zlyhalo vytvorenie pevnÃho prepojenia pre prostriedok â%sâ: %s"
+
+# PÅ: keÄ uÅ duplikovaÅ, tak poriadne ;-)  (U ako unique alebo unified?)
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/file/e-book-backend-file.c:1129
+msgid "No UID in the contact"
+msgstr "Åiadny UID identifikÃtor v kontakte"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1563
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516
 msgid "Loading..."
 msgstr "NaÄÃtava sa..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:831
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4807
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:480
+#: ../addressbook/backends/file/e-book-backend-file.c:1566
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518
 msgid "Searching..."
 msgstr "HÄadÃ sa...."
 
+#: ../addressbook/backends/file/e-book-backend-file.c:2108
+#, c-format
+msgid "Failed to build summary for an address book %s"
+msgstr "Zlyhalo vytvorenie sumÃru pre adresÃr kontaktov %s"
+
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:832
+#: ../addressbook/backends/google/e-book-backend-google.c:874
 msgid "Querying for updated contactsâ"
-msgstr ""
+msgstr "VyhÄadÃvajÃ sa aktualizovanÃ kontaktyâ"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=633557
-#: ../addressbook/backends/google/e-book-backend-google.c:883
-#: ../addressbook/libebook/e-book.c:3549 ../calendar/libecal/e-cal.c:1381
-#: ../libedataserver/e-client.c:1951
+#: ../addressbook/backends/google/e-book-backend-google.c:923
+#: ../addressbook/libebook/e-book.c:3531 ../calendar/libecal/e-cal.c:1380
+#: ../libedataserver/e-client.c:1918
 msgid "Personal"
 msgstr "OsobnÃ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:885
+#: ../addressbook/backends/google/e-book-backend-google.c:925
 msgid "Friends"
 msgstr "Priatelia"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:887
+#: ../addressbook/backends/google/e-book-backend-google.c:927
 msgid "Family"
 msgstr "Rodina"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:889
+#: ../addressbook/backends/google/e-book-backend-google.c:929
 msgid "Coworkers"
 msgstr "SpolupracovnÃci"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:973
+#: ../addressbook/backends/google/e-book-backend-google.c:1019
 msgid "Querying for updated groupsâ"
-msgstr ""
+msgstr "VyhÄadÃvajÃ sa aktualizovanÃ skupinyâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1424
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1639
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:295
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+msgid "The backend does not support bulk additions"
+msgstr "ObsluÅnÃ softvÃr nepodporuje hromadnÃ pridÃvanie"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1392
+#: ../addressbook/backends/google/e-book-backend-google.c:1451
 msgid "Creating new contactâ"
 msgstr "VytvÃra sa novÃ kontaktâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1502
+#: ../addressbook/backends/google/e-book-backend-google.c:1540
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+msgid "The backend does not support bulk removals"
+msgstr "ObsluÅnÃ softvÃr nepodporuje hromadnÃ odstraÅovanie"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1568
 msgid "Deleting contactâ"
 msgstr "OdstraÅuje sa kontaktâ"
 
+#: ../addressbook/backends/google/e-book-backend-google.c:1818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2296
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:375
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
+msgid "The backend does not support bulk modifications"
+msgstr "ObsluÅnÃ softvÃr nepodporuje hromadnÃ Ãpravy"
+
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1783
+#: ../addressbook/backends/google/e-book-backend-google.c:1851
 msgid "Modifying contactâ"
 msgstr "Upravuje sa kontaktâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1990
+#: ../addressbook/backends/google/e-book-backend-google.c:2058
 msgid "Loadingâ"
 msgstr "NaÄÃtava saâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2148
+#: ../addressbook/backends/google/e-book-backend-google.c:2187
 msgid "Authenticating with the serverâ"
 msgstr "Overuje sa totoÅnosÅ so serveromâ"
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:177
 msgid "Not connected"
 msgstr "NepripojenÃ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:784
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
 msgid "Using Distinguished Name (DN)"
 msgstr "Pomocou rozliÅovacieho nÃzvu (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:787
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
 msgid "Using Email Address"
 msgstr "Pomocou emailovej adresy"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1058
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
 msgid "Reconnecting to LDAP server..."
 msgstr "Znovu sa pripÃja na server LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1187
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
 msgid "Invalid DN syntax"
 msgstr "NeplatnÃ syntax DN"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1712
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
 msgid "Adding contact to LDAP server..."
 msgstr "PridÃva sa kontakt na server LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1869
 msgid "Removing contact from LDAP server..."
 msgstr "OdstraÅuje sa kontakt zo serveru LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2278
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2318
 msgid "Modifying contact from LDAP server..."
 msgstr "Upravuje sa kontakt na serveri LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4658
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4720
 msgid "Receiving LDAP search results..."
-msgstr "PrijÃmajÃ sa vÃsledky hÄadania LDAP..."
+msgstr "PrijÃmajÃ sa vÃsledky hÄadania v LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4828
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
 msgid "Error performing search"
 msgstr "Chyba poÄas hÄadania"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4949
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "SÅahujÃ sa kontakty (%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:906
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:452
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:559
-#: ../calendar/backends/http/e-cal-backend-http.c:433
-#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
-#: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:411
-#: ../camel/providers/imapx/camel-imapx-server.c:2280
-#: ../camel/providers/smtp/camel-smtp-transport.c:442
-#: ../libedataserver/e-client.c:159
-msgid "Unknown error"
-msgstr "NeznÃma chyba"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:343
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgstr "Vytvorenie zdroja â%sâ zlyhalo so stavom HTTP: %d (%s)"
+msgstr "Vytvorenie prostriedku â%sâ zlyhalo so stavom HTTP: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3216
+#: ../addressbook/libebook/e-book.c:3198
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr ""
+msgstr "%s: nebol nÃjdenÃ Åiadny zdroj pre UID â%sâ uloÅenÃ v GConf."
 
-#: ../addressbook/libebook/e-book.c:3532 ../calendar/libecal/e-cal.c:1361
-#: ../libedataserver/e-client.c:1946
+#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
+#: ../libedataserver/e-client.c:1913
 msgid "On This Computer"
 msgstr "Na tomto poÄÃtaÄi"
 
-#: ../addressbook/libebook/e-book.c:3658
-#: ../addressbook/libebook/e-book-client.c:678
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../addressbook/libebook/e-book.c:3640
+#: ../addressbook/libebook/e-book-client.c:702
+#: ../addressbook/libedata-book/e-data-book.c:322
 msgid "Address book does not exist"
 msgstr "AdresÃr kontaktov neexistuje"
 
-#: ../addressbook/libebook/e-book-client.c:92
-#, fuzzy
-#| msgctxt "BookClientError"
-#| msgid "No such book"
+#: ../addressbook/libebook/e-book-client.c:95
 msgid "No such book"
 msgstr "AdresÃr kontaktov neexistuje"
 
-#: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:315
 msgid "Contact not found"
 msgstr "Kontakt sa nenaÅiel"
 
-#: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:316
 msgid "Contact ID already exists"
 msgstr "IdentifikÃtor kontaktu uÅ existuje"
 
-#: ../addressbook/libebook/e-book-client.c:98
+#: ../addressbook/libebook/e-book-client.c:101
 msgid "No such source"
 msgstr "Zdroj neexistuje"
 
-#: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:332
 msgid "No space"
 msgstr "Åiadne miesto"
 
-#: ../addressbook/libebook/e-book-client.c:491
-#, fuzzy
+#: ../addressbook/libebook/e-book-client.c:515
 msgid "Failed to run book factory"
-msgstr "Zlyhalo kÃdovanie Ãdajov"
+msgstr "Zlyhalo spustenie vytvÃracieho rozhrania adresÃra kontaktov"
 
-#: ../addressbook/libebook/e-book-client.c:501
-#: ../addressbook/libedata-book/e-data-book-factory.c:379
-#: ../addressbook/libedata-book/e-data-book-factory.c:437
-#: ../calendar/libecal/e-cal-client.c:610
-#: ../calendar/libedata-cal/e-data-cal-factory.c:399
+#: ../addressbook/libebook/e-book-client.c:525
+#: ../addressbook/libedata-book/e-data-book-factory.c:196
+#: ../addressbook/libedata-book/e-data-book-factory.c:228
+#: ../calendar/libecal/e-cal-client.c:613
+#: ../calendar/libedata-cal/e-data-cal-factory.c:213
+#: ../calendar/libedata-cal/e-data-cal-factory.c:242
 #, c-format
 msgid "Invalid source"
 msgstr "NeplatnÃ zdroj"
 
-#: ../addressbook/libebook/e-book-client.c:603
-#: ../calendar/libecal/e-cal-client.c:725
+#: ../addressbook/libebook/e-book-client.c:627
+#: ../calendar/libecal/e-cal-client.c:728
 #, c-format
 msgid "Incorrect uri '%s'"
 msgstr "NesprÃvny uri â%sâ"
 
-#: ../addressbook/libebook/e-book-client.c:641
-#, fuzzy
+#: ../addressbook/libebook/e-book-client.c:665
 msgid "Failed to find system book"
-msgstr "Nepodarilo sa pripojiÅ k serveru LDAP"
+msgstr "Zlyhalo nÃjdenie systÃmovÃho adresÃra kontaktov"
 
-#: ../addressbook/libebook/e-book-client.c:750
-#: ../calendar/libecal/e-cal-client.c:878
-#, fuzzy, c-format
+#: ../addressbook/libebook/e-book-client.c:774
+#: ../calendar/libecal/e-cal-client.c:881
+#, c-format
 msgid "There was no source for UID '%s' stored in a source list."
-msgstr ""
-"e_book_set_default_source: there was no source for uid â%sâ stored in gconf."
+msgstr "V zozname zdrojov nebol uloÅenÃ Åiadny zdroj pre UID â%sâ."
 
-#: ../addressbook/libebook/e-book-client.c:2280
-#: ../calendar/libecal/e-cal-client.c:4475
-#, fuzzy
+#: ../addressbook/libebook/e-book-client.c:2566
+#: ../calendar/libecal/e-cal-client.c:4536
 msgid "Cannot get connection to view"
-msgstr "NedÃ sa zÃskaÅ zoznam kontaktov: %s"
+msgstr "NedÃ sa zÃskaÅ pripojenie k pohÄadu"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Unique ID"
 msgstr "JedineÄnÃ identifikÃtor"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
 #. *         so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:119
+#: ../addressbook/libebook/e-contact.c:124
 msgid "File Under"
-msgstr ""
+msgstr "ZaradiÅ ako"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Book URI"
 msgstr "URI adresÃra kontaktov"
 
@@ -249,898 +290,898 @@ msgstr "URI adresÃra kontaktov"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Full Name"
 msgstr "CelÃ meno"
 
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Given Name"
 msgstr "Meno"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Family Name"
 msgstr "Priezvisko"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Nickname"
 msgstr "PrezÃvka"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Email 1"
 msgstr "Email 1"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Email 2"
 msgstr "Email 2"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 3"
 msgstr "Email 3"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 4"
 msgstr "Email 4"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Mailer"
 msgstr "PoÅtovÃ klient"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Home Address Label"
 msgstr "OznaÄenie adresy domov"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Work Address Label"
 msgstr "OznaÄenie adresy do prÃce"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Other Address Label"
 msgstr "OznaÄenie inej adresy"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Assistant Phone"
 msgstr "Asistentov telefÃn"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Business Phone"
 msgstr "TelefÃn do prÃce"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Business Phone 2"
 msgstr "TelefÃn do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Fax"
 msgstr "Fax do prÃce"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Callback Phone"
 msgstr "TelefÃn pre spÃtnÃ volanie"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Car Phone"
 msgstr "TelefÃn v aute"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Company Phone"
 msgstr "TelefÃn do firmy"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Home Phone"
 msgstr "TelefÃn domov"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Home Phone 2"
 msgstr "TelefÃn domov 2"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Fax"
 msgstr "Fax domov"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:161
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Mobile Phone"
 msgstr "Mobil"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Other Phone"
 msgstr "InÃ telefÃn"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Other Fax"
 msgstr "InÃ fax"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Pager"
 msgstr "Pager"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Primary Phone"
 msgstr "PrimÃrny telefÃn"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Radio"
 msgstr "RÃdio"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:170
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Organization"
 msgstr "OrganizÃcia"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Organizational Unit"
 msgstr "OrganizÃÄnÃ jednotka"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Office"
 msgstr "Pracovisko"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Title"
 msgstr "Funkcia"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Role"
 msgstr "Rola"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Manager"
 msgstr "VedÃci"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Assistant"
 msgstr "Asistent"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Homepage URL"
 msgstr "URL domovskej strÃnky"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:183
 msgid "Weblog URL"
 msgstr "URL blogu"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:181
-#: ../libedataserverui/e-categories-dialog.c:85
+#: ../addressbook/libebook/e-contact.c:186
+#: ../libedataserverui/e-categories-dialog.c:88
 msgid "Categories"
 msgstr "KategÃrie"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:189
 msgid "Calendar URI"
 msgstr "URI kalendÃra"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Free/Busy URL"
 msgstr "URL diÃra"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:191
 msgid "ICS Calendar"
 msgstr "ICS kalendÃr"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Video Conferencing URL"
 msgstr "URL videokonferencie"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:195
 msgid "Spouse's Name"
 msgstr "ManÅel(ka)"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:196
 msgid "Note"
 msgstr "PoznÃmka"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Home Screen Name 1"
 msgstr "AIM prezÃvka domov 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:200
 msgid "AIM Home Screen Name 2"
 msgstr "AIM prezÃvka domov 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 3"
 msgstr "AIM prezÃvka domov 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Work Screen Name 1"
 msgstr "AIM prezÃvka do prÃce 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Work Screen Name 2"
 msgstr "AIM prezÃvka do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 3"
 msgstr "AIM prezÃvka do prÃce 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise prezÃvka domov 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:206
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise prezÃvka domov 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise prezÃvka domov 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise prezÃvka do prÃce 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise prezÃvka do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise prezÃvka do prÃce 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Home ID 1"
 msgstr "Jabber identifikÃtor domov 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Jabber Home ID 2"
 msgstr "Jabber identifikÃtor domov 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 3"
 msgstr "Jabber identifikÃtor domov 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Work ID 1"
 msgstr "Jabber identifikÃtor do prÃce 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Work ID 2"
 msgstr "Jabber identifikÃtor do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 3"
 msgstr "Jabber identifikÃtor do prÃce 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! prezÃvka domov 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! prezÃvka domov 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! prezÃvka domov 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! prezÃvka do prÃce 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! prezÃvka do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! prezÃvka do prÃce 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Home Screen Name 1"
 msgstr "MSN prezÃvka domov 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:224
 msgid "MSN Home Screen Name 2"
 msgstr "MSN prezÃvka domov 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 3"
 msgstr "MSN prezÃvka domov 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Work Screen Name 1"
 msgstr "MSN prezÃvka do prÃce 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Work Screen Name 2"
 msgstr "MSN prezÃvka do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 3"
 msgstr "MSN prezÃvka do prÃce 3"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Home ID 1"
 msgstr "ICQ identifikÃtor domov 1"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:230
 msgid "ICQ Home ID 2"
 msgstr "ICQ identifikÃtor domov 2"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 3"
 msgstr "ICQ identifikÃtor domov 3"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Work ID 1"
 msgstr "ICQ identifikÃtor do prÃce 1"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Work ID 2"
 msgstr "ICQ identifikÃtor do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 3"
 msgstr "ICQ identifikÃtor do prÃce 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Last Revision"
 msgstr "PoslednÃ revÃzia"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Name or Org"
 msgstr "Meno alebo organizÃcia"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:241
 msgid "Address List"
 msgstr "Zoznam adries"
 
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Home Address"
 msgstr "Adresa domov"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Work Address"
 msgstr "Adresa do prÃce"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:244
 msgid "Other Address"
 msgstr "InÃ adresa"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Category List"
 msgstr "Zoznam kategÃriÃ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Photo"
 msgstr "Fotografia"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:251
 msgid "Logo"
 msgstr "Logo"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:253
 msgid "Name"
 msgstr "Meno"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Email List"
 msgstr "Zoznam emailov"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:257
 msgid "AIM Screen Name List"
 msgstr "Zoznam AIM prezÃvok"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:258
 msgid "GroupWise ID List"
 msgstr "Zoznam GroupWise identifikÃtorov"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Jabber ID List"
 msgstr "Zoznam Jabber identifikÃtorov"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Yahoo! Screen Name List"
 msgstr "Zoznam Yahoo! prezÃvok"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:261
 msgid "MSN Screen Name List"
 msgstr "Zoznam MSN prezÃvok"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:262
 msgid "ICQ ID List"
 msgstr "Zoznam ICQ identifikÃtorov"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Wants HTML Mail"
 msgstr "Chce HTML mail"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:266
 msgid "List"
 msgstr "Zoznam"
 
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:267
 msgid "List Show Addresses"
-msgstr "ZobraziÅ adresy"
+msgstr "ZobraziÅ adresy zoznamu"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Birth Date"
 msgstr "DÃtum narodenia"
 
-#: ../addressbook/libebook/e-contact.c:265
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
+#: ../addressbook/libebook/e-contact.c:270
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
 msgid "Anniversary"
 msgstr "VÃroÄie"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:273
 msgid "X.509 Certificate"
 msgstr "CertifikÃt X.509"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu identifikÃtor domov 1"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu identifikÃtor domov 2"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:277
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu identifikÃtor domov 3"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu identifikÃtor do prÃce 1"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu identifikÃtor do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu identifikÃtor do prÃce 3"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Gadu-Gadu ID List"
 msgstr "Zoznam Gadu-Gadu identifikÃtorov"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Geographic Information"
 msgstr "GeografickÃ informÃcie"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Telephone"
 msgstr "TelefÃn"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Home Name 1"
 msgstr "Skype prezÃvka domov 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Home Name 2"
 msgstr "Skype prezÃvka domov 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Skype Home Name 3"
 msgstr "Skype prezÃvka domov 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Skype Work Name 1"
 msgstr "Skype prezÃvka do prÃce 1"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Skype Work Name 2"
 msgstr "Skype prezÃvka do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Skype Work Name 3"
 msgstr "Skype prezÃvka do prÃce 3"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Skype Name List"
 msgstr "Zoznam Skype prezÃvok"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:296
 msgid "SIP address"
 msgstr "SIP adresa"
 
-#: ../addressbook/libebook/e-contact.c:293
-#, fuzzy
-#| msgid "Skype Home Name 1"
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Google Talk Home Name 1"
-msgstr "Skype prezÃvka domov 1"
+msgstr "Google Talk prezÃvka domov 1"
 
-#: ../addressbook/libebook/e-contact.c:294
-#, fuzzy
-#| msgid "Skype Home Name 2"
+#: ../addressbook/libebook/e-contact.c:299
 msgid "Google Talk Home Name 2"
-msgstr "Skype prezÃvka domov 2"
+msgstr "Google Talk prezÃvka domov 2"
 
-#: ../addressbook/libebook/e-contact.c:295
-#, fuzzy
-#| msgid "Skype Home Name 3"
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Google Talk Home Name 3"
-msgstr "Skype prezÃvka domov 3"
+msgstr "Google Talk prezÃvka domov 3"
 
-#: ../addressbook/libebook/e-contact.c:296
-#, fuzzy
-#| msgid "Skype Work Name 1"
+#: ../addressbook/libebook/e-contact.c:301
 msgid "Google Talk Work Name 1"
-msgstr "Skype prezÃvka do prÃce 1"
+msgstr "Google Talk prezÃvka do prÃce 1"
 
-#: ../addressbook/libebook/e-contact.c:297
-#, fuzzy
-#| msgid "Skype Work Name 2"
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Google Talk Work Name 2"
-msgstr "Skype prezÃvka do prÃce 2"
+msgstr "Google Talk prezÃvka do prÃce 2"
 
-#: ../addressbook/libebook/e-contact.c:298
-#, fuzzy
-#| msgid "Skype Work Name 3"
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Google Talk Work Name 3"
-msgstr "Skype prezÃvka do prÃce 3"
+msgstr "Google Talk prezÃvka do prÃce 3"
 
-#: ../addressbook/libebook/e-contact.c:299
-#, fuzzy
-#| msgid "Skype Name List"
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Google Talk Name List"
-msgstr "Zoznam Skype prezÃvok"
+msgstr "Zoznam Google Talk prezÃvok"
 
-#: ../addressbook/libebook/e-contact.c:1580
-#: ../addressbook/libebook/e-destination.c:884
+#: ../addressbook/libebook/e-contact.c:1597
+#: ../addressbook/libebook/e-destination.c:878
 msgid "Unnamed List"
 msgstr "Zoznam bez nÃzvu"
 
 #: ../addressbook/libedata-book/e-book-backend.c:19
 msgid "Cannot process, book backend is opening"
-msgstr ""
+msgstr "NedÃ sa spracovaÅ, obsluÅnÃ program adresÃra kontaktov sa otvÃra"
 
-#: ../addressbook/libedata-book/e-book-backend.c:96
-#, fuzzy, c-format
+#: ../addressbook/libedata-book/e-book-backend.c:91
+#, c-format
 msgid "Unknown book property '%s'"
-msgstr "NeznÃma chyba: %s"
+msgstr "NeznÃma vlastnosÅ adresÃra kontaktov â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:113
-#, fuzzy, c-format
+#: ../addressbook/libedata-book/e-book-backend.c:108
+#, c-format
 msgid "Cannot change value of book property '%s'"
-msgstr "NedÃ sa vytvoriÅ prieÄinok '%s': %s"
+msgstr "NedÃ sa zmeniÅ hodnota vlastnosti adresÃra kontaktov â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:470
-#: ../camel/camel-db.c:481
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
+#: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "Nedostatok pamÃte"
 
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "Kontakt â%sâ sa nenaÅiel"
+
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:199
-#: ../addressbook/libedata-book/e-data-book.c:212
-#: ../addressbook/libedata-book/e-data-book.c:744
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../addressbook/libedata-book/e-data-book.c:219
+#: ../addressbook/libedata-book/e-data-book.c:733
 msgid "Invalid query: "
-msgstr "NeplatnÃ poÅiadavka: %s"
+msgstr "NeplatnÃ poÅiadavka: "
 
-#: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Success"
 msgstr "Ãspech"
 
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:420
-#: ../libedataserver/e-client.c:118
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libecal/e-cal.c:4564 ../calendar/libedata-cal/e-data-cal.c:428
+#: ../libedataserver/e-client.c:123
 msgid "Backend is busy"
 msgstr "ObsluÅnÃ program je zaneprÃzdnenÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:128
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:133
 msgid "Repository offline"
 msgstr "ÃloÅisko je odpojenÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:422
-#: ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libecal/e-cal.c:4578 ../calendar/libedata-cal/e-data-cal.c:430
+#: ../libedataserver/e-client.c:137
 msgid "Permission denied"
 msgstr "PrÃstup zamietnutÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:310
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Authentication Failed"
 msgstr "Overenie totoÅnosti zlyhalo"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436
 msgid "Authentication Required"
 msgstr "VyÅaduje sa overenie totoÅnosti"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Unsupported field"
 msgstr "NepodporovanÃ pole"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:140
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:145
 msgid "Unsupported authentication method"
 msgstr "NepodporovanÃ metÃda overenia totoÅnosti"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:147
 msgid "TLS not available"
 msgstr "TLS nie je dostupnÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "Book removed"
 msgstr "AdresÃr kontaktov odstrÃnenÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:443
 msgid "Not available in offline mode"
 msgstr "NedostupnÃ v odpojenom reÅime"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:144
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:149
 msgid "Search size limit exceeded"
-msgstr "PrekroÄenÃ dÄÅka cesty"
+msgstr "PrekroÄenÃ limit veÄkosti vyhÄadÃvania"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437 ../libedataserver/e-client.c:146
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:151
 msgid "Search time limit exceeded"
-msgstr "PrekroÄenÃ dÄÅka cesty"
+msgstr "PrekroÄenÃ ÄasovÃ limit vyhÄadÃvania"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:438 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:153
 msgid "Invalid query"
 msgstr "NeplatnÃ poÅiadavka"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:155
 msgid "Query refused"
-msgstr ""
+msgstr "PoÅiadavka odmietnutÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:136
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:141
 msgid "Could not cancel"
 msgstr "Nepodarilo sa zruÅiÅ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libedata-cal/e-data-cal.c:450
 msgid "Invalid server version"
 msgstr "NeplatnÃ verzia servera"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:443
-#: ../libedataserver/e-client.c:116
+#: ../addressbook/libedata-book/e-data-book.c:333
+#: ../calendar/libecal/e-cal.c:4562 ../calendar/libedata-cal/e-data-cal.c:451
+#: ../libedataserver/e-client.c:121
 msgid "Invalid argument"
 msgstr "NeplatnÃ argument"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:445
-#: ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal.c:4601 ../calendar/libedata-cal/e-data-cal.c:453
+#: ../libedataserver/e-client.c:143
 msgid "Not supported"
 msgstr "NepodporovanÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:156
-#, fuzzy
-#| msgid "Backend is busy"
+#: ../addressbook/libedata-book/e-data-book.c:336
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:161
 msgid "Backend is not opened yet"
-msgstr "ObsluÅnÃ program je zaneprÃzdnenÃ"
+msgstr "ObsluÅnÃ program nie je eÅte otvorenÃ"
 
-#: ../addressbook/libedata-book/e-data-book.c:337
-#: ../calendar/libecal/e-cal-client.c:618
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-data-book.c:344
+#: ../calendar/libecal/e-cal-client.c:621
+#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:159
 msgid "Other error"
 msgstr "InÃ chyba"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:562
-#: ../addressbook/libedata-book/e-data-book.c:954
+#: ../addressbook/libedata-book/e-data-book.c:551
+#: ../addressbook/libedata-book/e-data-book.c:943
 msgid "Cannot get contact: "
 msgstr "NedÃ sa zÃskaÅ kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:587
-#: ../addressbook/libedata-book/e-data-book.c:612
+#: ../addressbook/libedata-book/e-data-book.c:576
+#: ../addressbook/libedata-book/e-data-book.c:601
 msgid "Empty query: "
-msgstr ""
+msgstr "PrÃzdna poÅiadavka: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:637
-#: ../addressbook/libedata-book/e-data-book.c:1036
+#: ../addressbook/libedata-book/e-data-book.c:626
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot add contact: "
 msgstr "NedÃ sa pridaÅ kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:662
-#: ../addressbook/libedata-book/e-data-book.c:1058
-msgid "Cannot modify contact: "
-msgstr "NedÃ sa upraviÅ kontakt: "
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:1075
+msgid "Cannot modify contacts: "
+msgstr "NedajÃ sa upraviÅ kontakty: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:770
-#: ../calendar/libedata-cal/e-data-cal.c:893
+#: ../addressbook/libedata-book/e-data-book.c:759
+#: ../calendar/libedata-cal/e-data-cal.c:866
 msgid "Cannot authenticate user: "
 msgstr "NedÃ sa overiÅ totoÅnosÅ pouÅÃvateÄa: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:841
+#: ../addressbook/libedata-book/e-data-book.c:830
 msgid "Cannot open book: "
 msgstr "NedÃ sa otvoriÅ adresÃr kontaktov: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:857
+#: ../addressbook/libedata-book/e-data-book.c:846
 msgid "Cannot remove book: "
 msgstr "NedÃ sa odstrÃniÅ adresÃr kontaktov: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:884
+#: ../addressbook/libedata-book/e-data-book.c:873
 msgid "Cannot refresh address book: "
 msgstr "NedÃ sa obnoviÅ adresÃr kontaktov: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:910
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:899
 msgid "Cannot get backend property: "
-msgstr "NedÃ sa vytvoriÅ objekt kalendÃra: %s"
+msgstr "NedÃ sa zÃskaÅ vlastnosÅ obsluÅnÃho programu: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:935
-#: ../calendar/libedata-cal/e-data-cal.c:1096
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:924
+#: ../calendar/libedata-cal/e-data-cal.c:1069
 msgid "Cannot set backend property: "
-msgstr "NedÃ sa poslaÅ objekt kalendÃra: %s"
+msgstr "NedÃ sa nastaviÅ vlastnosÅ obsluÅnÃho programu: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:972
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list: "
 msgstr "NedÃ sa zÃskaÅ zoznam kontaktov: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1006
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:995
 msgid "Cannot get contact list uids: "
-msgstr "NedÃ sa zÃskaÅ zoznam kontaktov: %s"
+msgstr "NedÃ sa zÃskaÅ zoznam uid kontaktov: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1079
+#: ../addressbook/libedata-book/e-data-book.c:1100
 msgid "Cannot remove contacts: "
 msgstr "NedajÃ sa odstrÃniÅ kontakty: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:363
-#: ../addressbook/libedata-book/e-data-book-factory.c:396
-#: ../calendar/libedata-cal/e-data-cal-factory.c:414
+#: ../addressbook/libedata-book/e-data-book-factory.c:184
+#: ../addressbook/libedata-book/e-data-book-factory.c:212
+#: ../calendar/libedata-cal/e-data-cal-factory.c:229
 #, c-format
 msgid "Empty URI"
 msgstr "PrÃzdny URI"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:528
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
 #, c-format
 msgid "Server is unreachable (%s)"
-msgstr ""
+msgstr "Server je nedostupnÃ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "VrÃtenÃ neoÄakÃvanÃ stavovÃ kÃd HTTP %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2183
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2540
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
 "Error message: %s"
 msgstr ""
+"Server je nedostupnÃ, kalendÃr je otvorenÃ v reÅime iba-na-ÄÃtanie.\n"
+"ChybovÃ sprÃva: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4476
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
 msgid "Calendar doesn't support Free/Busy"
 msgstr "KalendÃr nepodporuje diÃr"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:758
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:219
+#: ../libedataserverui/e-client-utils.c:875
+#, c-format
+msgid ""
+"Enter password for address book %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"Zadajte heslo pre adresÃr kontaktov %s (pouÅÃvateÄ %s)\n"
+"DÃvod: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:221
+#: ../libedataserverui/e-client-utils.c:877
+#, c-format
+msgid "Enter password for address book %s (user %s)"
+msgstr "Zadajte heslo pre adresÃr kontaktov %s (pouÅÃvateÄ %s)"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065
 msgid "Birthday"
 msgstr "DÃtum narodenia"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
 #, c-format
 msgid "Birthday: %s"
 msgstr "DÃtum narodenia: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
 #, c-format
 msgid "Anniversary: %s"
 msgstr "VÃroÄie: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#, fuzzy
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
-msgstr "Nepodarilo sa uloÅiÅ dÃta kalendÃra. NeplatnÃ URI."
+msgstr "NedajÃ sa uloÅiÅ Ãdaje kalendÃra: NeplatnÃ URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:248
-#: ../calendar/backends/file/e-cal-backend-file.c:254
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 msgid "Cannot save calendar data"
 msgstr "NedajÃ sa uloÅiÅ Ãdaje kalendÃra"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:416
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "Presmerovanie na neplatnÃ URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:446
 msgid "Bad file format."
 msgstr "NesprÃvny formÃt sÃboru."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:461
+#: ../calendar/backends/http/e-cal-backend-http.c:454
 msgid "Not a calendar."
 msgstr "Nie je kalendÃr."
 
 #: ../calendar/backends/http/e-cal-backend-http.c:780
 #: ../calendar/backends/http/e-cal-backend-http.c:781
-#: ../calendar/backends/weather/e-cal-backend-weather.c:527
+#: ../calendar/backends/weather/e-cal-backend-weather.c:524
 msgid "Could not create cache file"
 msgstr "Nepodarilo sa vytvoriÅ sÃbor vyrovnÃvacej pamÃte"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
 msgid "Could not retrieve weather data"
 msgstr "Nepodarilo sa zÃskaÅ Ãdaje o poÄasÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Fog"
 msgstr "PoÄasie: Hmla"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Cloudy Night"
 msgstr "PoÄasie: OblaÄnÃ noc"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Cloudy"
 msgstr "PoÄasie: OblaÄno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Overcast"
 msgstr "PoÄasie: ZamraÄenÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Showers"
 msgstr "PoÄasie: PrehÃnky"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Snow"
 msgstr "PoÄasie: SneÅenie"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Clear Night"
 msgstr "PoÄasie: JasnÃ noc"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Sunny"
 msgstr "PoÄasie: SlneÄno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:296
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Thunderstorms"
 msgstr "PoÄasie: BÃrky"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:444
+#: ../calendar/backends/weather/e-cal-backend-weather.c:435
 msgid "Forecast"
 msgstr "PredpoveÄ"
 
-#: ../calendar/libecal/e-cal.c:892 ../libedataserverui/e-book-auth-util.c:204
+#: ../calendar/libecal/e-cal.c:891 ../libedataserverui/e-book-auth-util.c:204
 #: ../libedataserverui/e-book-auth-util.c:428
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -1150,106 +1191,104 @@ msgstr "Zadajte heslo pre %s (pouÅÃvateÄ %s)"
 #. * This password prompt will be prompted rarely. Since the key that is passed to
 #. * the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:906
+#: ../calendar/libecal/e-cal.c:905
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
-msgstr "Zadajte heslo pre %s, ktorÃ povolÃ proxy pre pouÅÃvateÄa %s"
+msgstr "Zadajte heslo pre %s, ktorÃ povolÃ proxovanie pre pouÅÃvateÄa %s"
 
-#: ../calendar/libecal/e-cal.c:4565
+#: ../calendar/libecal/e-cal.c:4566
 msgid "Repository is offline"
 msgstr "ÃloÅisko je odpojenÃ"
 
-#: ../calendar/libecal/e-cal.c:4567 ../calendar/libecal/e-cal-client.c:134
+#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
 msgid "No such calendar"
 msgstr "KalendÃr neexistuje"
 
-#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:136
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../calendar/libecal/e-cal.c:4570 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Object not found"
 msgstr "Objekt sa nepodarilo nÃjsÅ"
 
-#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:138
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libecal/e-cal.c:4572 ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid object"
 msgstr "NeplatnÃ objekt"
 
-#: ../calendar/libecal/e-cal.c:4573
+#: ../calendar/libecal/e-cal.c:4574
 msgid "URI not loaded"
 msgstr "URI nebol naÄÃtanÃ"
 
-#: ../calendar/libecal/e-cal.c:4575
+#: ../calendar/libecal/e-cal.c:4576
 msgid "URI already loaded"
 msgstr "URI uÅ bol naÄÃtanÃ"
 
-#: ../calendar/libecal/e-cal.c:4579
+#: ../calendar/libecal/e-cal.c:4580
 msgid "Unknown User"
 msgstr "NeznÃmy pouÅÃvateÄ"
 
-#: ../calendar/libecal/e-cal.c:4581 ../calendar/libecal/e-cal-client.c:142
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libecal/e-cal.c:4582 ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Object ID already exists"
 msgstr "IdentifikÃtor objektu uÅ existuje"
 
-#: ../calendar/libecal/e-cal.c:4583
+#: ../calendar/libecal/e-cal.c:4584
 msgid "Protocol not supported"
 msgstr "Protokol nepodporovanÃ"
 
-#: ../calendar/libecal/e-cal.c:4585
+#: ../calendar/libecal/e-cal.c:4586
 msgid "Operation has been canceled"
 msgstr "OperÃcia bola zruÅenÃ"
 
-#: ../calendar/libecal/e-cal.c:4587
+#: ../calendar/libecal/e-cal.c:4588
 msgid "Could not cancel operation"
 msgstr "Nepodarilo sa zruÅiÅ operÃciu"
 
-#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:124
+#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
 msgid "Authentication failed"
 msgstr "Zlyhalo overenie totoÅnosti"
 
-#: ../calendar/libecal/e-cal.c:4591
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
-#: ../libedataserver/e-client.c:126
+#: ../calendar/libecal/e-cal.c:4592
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../libedataserver/e-client.c:131
 msgid "Authentication required"
 msgstr "VyÅaduje sa overenie totoÅnosti"
 
-#: ../calendar/libecal/e-cal.c:4593
+#: ../calendar/libecal/e-cal.c:4594
 msgid "A D-Bus exception has occurred"
 msgstr "Vyskytla sa D-Bus vÃnimka"
 
-#: ../calendar/libecal/e-cal.c:4597
+#: ../calendar/libecal/e-cal.c:4598
 msgid "No error"
 msgstr "Åiadna chyba"
 
-#: ../calendar/libecal/e-cal-client.c:140
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:442
 msgid "Unknown user"
 msgstr "NeznÃmy pouÅÃvateÄ"
 
-#: ../calendar/libecal/e-cal-client.c:144
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../calendar/libecal/e-cal-client.c:147
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Invalid range"
 msgstr "NeplatnÃ rozsah"
 
-#: ../calendar/libecal/e-cal-client.c:600
-#, fuzzy
+#: ../calendar/libecal/e-cal-client.c:603
 msgid "Failed to run calendar factory"
-msgstr "Zlyhalo kÃdovanie Ãdajov"
+msgstr "Zlyhalo spustenie vytvÃracieho rozhrania kalendÃra"
 
-#: ../calendar/libecal/e-cal-client.c:765
-#, fuzzy
+#: ../calendar/libecal/e-cal-client.c:768
 msgid "Failed to find system calendar"
-msgstr "Zlyhalo kÃdovanie Ãdajov"
+msgstr "Zlyhalo vyhÄadanie systÃmovÃho kalendÃra"
 
-#: ../calendar/libecal/e-cal-client.c:804
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal-client.c:807
+#: ../calendar/libedata-cal/e-data-cal.c:441
 msgid "Calendar does not exist"
 msgstr "KalendÃr neexistuje"
 
-#: ../calendar/libecal/e-cal-client.c:919
+#: ../calendar/libecal/e-cal-client.c:922
 msgid "Invalid source type"
 msgstr "NeplatnÃ typ zdroja"
 
-#: ../calendar/libecal/e-cal-component.c:1326
+#: ../calendar/libecal/e-cal-component.c:1337
 msgid "Untitled appointment"
 msgstr "SchÃdzka bez nÃzvu"
 
@@ -1396,110 +1435,125 @@ msgstr "NÃzka"
 #: ../calendar/libecal/e-cal-util.c:716
 msgctxt "Priority"
 msgid "Undefined"
-msgstr "NedefinovanÃ"
+msgstr "NeurÄenÃ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:34
-#, fuzzy
+#: ../calendar/libedata-cal/e-cal-backend.c:38
 msgid "Cannot process, calendar backend is opening"
-msgstr "NedÃ sa spracovaÅ, obsluÅnÃ program kalendÃr"
+msgstr "NedÃ sa spracovaÅ, obsluÅnÃ program kalendÃra sa otvÃra"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:212
-#, fuzzy, c-format
+#: ../calendar/libedata-cal/e-cal-backend.c:146
+#, c-format
 msgid "Unknown calendar property '%s'"
-msgstr "NeznÃma chyba: %s"
+msgstr "NeznÃma vlastnosÅ kalendÃra â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:229
-#, fuzzy, c-format
+#: ../calendar/libedata-cal/e-cal-backend.c:163
+#, c-format
 msgid "Cannot change value of calendar property '%s'"
-msgstr "NedÃ sa vytvoriÅ objekt kalendÃra: %s"
+msgstr "NedÃ sa zmeniÅ hodnota vlastnosti kalendÃra â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:72
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:736
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:851
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1082
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1112
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:79
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:841
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:956
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1187
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1217
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ neoÄakÃva parametre"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:224
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:269
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:308
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1153
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:231
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:276
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:315
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1258
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ oÄakÃva jeden parameter"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:114
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:314
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:128
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:321
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:886
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ oÄakÃva ako prvÃ parameter reÅazec"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:129
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:136
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "â%sâ oÄakÃva ako prvÃ parameter reÅazec dÃtumu/Äasu podÄa ISO 8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:171
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:388
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:441
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:178
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:537
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:880
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ oÄakÃva dva parametre"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:177
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:230
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:275
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:394
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:447
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1159
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:184
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:237
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:282
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:403
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:486
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:543
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1028
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1264
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ oÄakÃva ako prvÃ parameter time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â%sâ oÄakÃva ako druhÃ parameter celÃ ÄÃslo"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:402
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:456
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:931
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397
+#, c-format
+msgid "\"%s\" expects two or three arguments"
+msgstr "â%sâ oÄakÃva dva alebo tri parametre"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:411
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:492
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:552
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1036
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ oÄakÃva ako druhÃ parameter time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:789
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:420
+#, c-format
+msgid "\"%s\" expects the third argument to be a string"
+msgstr "â%sâ oÄakÃva ako tretÃ parameter reÅazec"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480
+#, c-format
+msgid "\"%s\" expects none or two arguments"
+msgstr "â%sâ oÄakÃva Åiadny alebo dva parametre"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â%sâ oÄakÃva ako druhÃ parameter reÅazec"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:924
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 msgstr ""
-"â%sâ oÄakÃva ako prvÃ parameter jednu z hodnÃt âanyâ, âsummaryâ, alebo "
+"â%sâ oÄakÃva ako prvÃ parameter buÄ hodnotu âanyâ, alebo âsummaryâ, alebo "
 "âdescriptionâ, alebo âlocationâ, alebo âattendeeâ, alebo âorganizerâ, alebo "
 "âclassificationâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ oÄakÃva aspoÅ jeden parameter"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:995
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1100
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1508,168 +1562,149 @@ msgstr ""
 "â%sâ oÄakÃva vÅetky parametre ako reÅazce alebo prÃve jeden parameter - "
 "logickÃ hodnotu nepravda (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Unsupported method"
 msgstr "NepodporovanÃ metÃda"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:989
+#: ../calendar/libedata-cal/e-data-cal.c:962
 msgid "Cannot open calendar: "
 msgstr "NedÃ sa otvoriÅ kalendÃr: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:987
 msgid "Cannot remove calendar: "
 msgstr "NedÃ sa odstrÃniÅ kalendÃr: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 msgid "Cannot refresh calendar: "
 msgstr "NedÃ sa obnoviÅ kalendÃr: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1070
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1043
 msgid "Cannot retrieve backend property: "
-msgstr "NedÃ sa zÃskaÅ adresa kalendÃra: %s"
+msgstr "NedÃ sa zÃskaÅ vlastnosÅ obsluÅnÃho programu: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1125
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1098
 msgid "Cannot retrieve calendar object path: "
-msgstr "Nie je moÅnÃ otvoriÅ cestu poÅtovej schrÃnky: %s: %s"
+msgstr "NedÃ sa zÃskaÅ cesta k objektu kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1155
+#: ../calendar/libedata-cal/e-data-cal.c:1128
 msgid "Cannot retrieve calendar object list: "
 msgstr "NedÃ sa zÃskaÅ zoznam objektov kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1184
+#: ../calendar/libedata-cal/e-data-cal.c:1157
 msgid "Cannot retrieve calendar free/busy list: "
-msgstr "NedÃ sa zÃskaÅ zoznam kalendÃra voÄnÃ/zaneprÃzdnenÃ: "
+msgstr "NedÃ sa zÃskaÅ diÃr kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1215
+#: ../calendar/libedata-cal/e-data-cal.c:1188
 msgid "Cannot create calendar object: "
 msgstr "NedÃ sa vytvoriÅ objekt kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1247
+#: ../calendar/libedata-cal/e-data-cal.c:1220
 msgid "Cannot modify calendar object: "
 msgstr "NedÃ sa upraviÅ objekt kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot remove calendar object: "
 msgstr "NedÃ sa odstrÃniÅ objekt kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1308
+#: ../calendar/libedata-cal/e-data-cal.c:1281
 msgid "Cannot receive calendar objects: "
-msgstr "NedÃ sa zÃskaÅ objekt kalendÃra: "
+msgstr "NedajÃ sa zÃskaÅ objekty kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1339
+#: ../calendar/libedata-cal/e-data-cal.c:1312
 msgid "Cannot send calendar objects: "
-msgstr "NedÃ sa odoslaÅ objekt kalendÃra: "
+msgstr "NedajÃ sa odoslaÅ objekty kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1371
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1344
 msgid "Could not retrieve attachment uris: "
-msgstr "NedÃ sa zÃskaÅ zoznam prÃloh: %s"
+msgstr "Nepodarilo sa zÃskaÅ URI prÃloh: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1399
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1372
 msgid "Could not discard reminder: "
-msgstr "Nepodarilo sa uloÅiÅ dÃta kalendÃra. NeplatnÃ URI."
+msgstr "Nepodarilo sa zruÅiÅ upozorÅovanie: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1428
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1401
 msgid "Could not get calendar view path: "
-msgstr "Nepodarilo sa zÃskaÅ ÄasovÃ zÃnu kalendÃra: %s"
+msgstr "Nepodarilo sa zÃskaÅ cestu pohÄadu kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1458
+#: ../calendar/libedata-cal/e-data-cal.c:1431
 msgid "Could not retrieve calendar time zone: "
 msgstr "Nepodarilo sa zÃskaÅ ÄasovÃ zÃnu kalendÃra: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1484
+#: ../calendar/libedata-cal/e-data-cal.c:1457
 msgid "Could not add calendar time zone: "
-msgstr "NedÃ sa pridaÅ ÄasovÃ zÃna kalendÃra: "
+msgstr "Nepodarilo sa pridaÅ ÄasovÃ zÃnu kalendÃra: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:387
-#, fuzzy, c-format
-msgid "Invalid call"
-msgstr "NeplatnÃ rozsah"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:428
+# MÄ: podÄa kÃdu mi to stÃle vychÃdza: NeplatnÃ kalendÃr. Asi je tam preklep a jedno âlâ navyÅe
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
 #, c-format
-msgid "Invalid URI"
-msgstr "NeplatnÃ URI"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:446
-#, c-format
-msgid "No backend factory for '%s' of '%s'"
-msgstr ""
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:489
-#, fuzzy, c-format
-msgid "Could not instantiate backend"
-msgstr "Nepodarilo sa vytvoriÅ sÃbor vyrovnÃvacej pamÃti"
+msgid "Invalid call"
+msgstr "NeplatnÃ kalendÃr"
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:206
 #, c-format
 msgid "Signing is not supported by this cipher"
-msgstr "DigitÃlny podpis nie je podporovanÃ touto Åifrou"
+msgstr "DigitÃlne podpisovanie nie je podporovanÃ touto Åifrou"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:219
 #, c-format
 msgid "Verifying is not supported by this cipher"
-msgstr "Overenie podpisu nie je podporovanÃ touto Åifrou"
+msgstr "Overovanie podpisu nie je podporovanÃ touto Åifrou"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:235
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Åifrovanie nie je podporovanÃ touto Åifrou"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:249
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "DeÅifrovanie nie je podporovanÃ touto Åifrou"
 
-#: ../camel/camel-cipher-context.c:256
+#: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Touto Åifrou nemÃÅete importovaÅ kÄÃÄe"
 
-#: ../camel/camel-cipher-context.c:270
+#: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Touto Åifrou nemÃÅete exportovaÅ kÄÃÄe"
 
-#: ../camel/camel-cipher-context.c:812
+#: ../camel/camel-cipher-context.c:805
 msgid "Signing message"
 msgstr "Podpisuje sa sprÃva"
 
-#: ../camel/camel-cipher-context.c:1053
+#: ../camel/camel-cipher-context.c:1046
 msgid "Encrypting message"
 msgstr "Åifruje sa sprÃva"
 
-#: ../camel/camel-cipher-context.c:1180
+#: ../camel/camel-cipher-context.c:1173
 msgid "Decrypting message"
 msgstr "DeÅifruje sa sprÃva"
 
-#: ../camel/camel-data-cache.c:178
+#: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
 msgstr "Nepodarilo sa vytvoriÅ cestu pre vyrovnÃvaciu pamÃÅ"
 
-#: ../camel/camel-data-cache.c:504
+#: ../camel/camel-data-cache.c:507
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nepodarilo sa odstrÃniÅ poloÅku vyrovnÃvacej pamÃte: %s: %s"
@@ -1701,35 +1736,42 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Obnovuje sa synchronizÃcia so serverom"
 
-#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "SÅahujÃ sa novÃ sprÃvy pre odpojenÃ reÅim"
 
-#: ../camel/camel-disco-folder.c:410
+#: ../camel/camel-disco-folder.c:416
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripravuje sa prieÄinok â%sâ pre odpojenÃ reÅim"
 
-#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
-msgid "Copy folder content locally for offline operation"
-msgstr "VytvoriÅ lokÃlnu kÃpiu prieÄinka pre operÃcie v odpojenom reÅime"
+#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+msgid "Copy folder content locally for _offline operation"
+msgstr "VytvoriÅ lokÃlnu kÃpiu prieÄinka pre operÃcie v _odpojenom reÅime"
 
 #: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1157
-#: ../camel/providers/imap/camel-imap-store.c:1935
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap/camel-imap-store.c:3192
-#: ../camel/providers/imapx/camel-imapx-folder.c:324
-#: ../camel/providers/imapx/camel-imapx-folder.c:357
-#: ../camel/providers/imapx/camel-imapx-folder.c:411
-#: ../camel/providers/imapx/camel-imapx-folder.c:457
-#: ../camel/providers/imapx/camel-imapx-folder.c:491
-#: ../camel/providers/imapx/camel-imapx-folder.c:531
-#: ../camel/providers/imapx/camel-imapx-folder.c:567
-#: ../camel/providers/imapx/camel-imapx-store.c:242
-#: ../camel/providers/imapx/camel-imapx-store.c:1306
-#: ../camel/providers/imapx/camel-imapx-store.c:1394
-#: ../camel/providers/imapx/camel-imapx-store.c:1440
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imap/camel-imap-store.c:2028
+#: ../camel/providers/imap/camel-imap-store.c:2523
+#: ../camel/providers/imap/camel-imap-store.c:3282
+#: ../camel/providers/imapx/camel-imapx-folder.c:407
+#: ../camel/providers/imapx/camel-imapx-folder.c:440
+#: ../camel/providers/imapx/camel-imapx-folder.c:474
+#: ../camel/providers/imapx/camel-imapx-folder.c:530
+#: ../camel/providers/imapx/camel-imapx-folder.c:587
+#: ../camel/providers/imapx/camel-imapx-folder.c:621
+#: ../camel/providers/imapx/camel-imapx-folder.c:661
+#: ../camel/providers/imapx/camel-imapx-folder.c:697
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1367
+#: ../camel/providers/imapx/camel-imapx-store.c:1455
+#: ../camel/providers/imapx/camel-imapx-store.c:1501
+#: ../camel/providers/pop3/camel-pop3-folder.c:525
+#: ../camel/providers/pop3/camel-pop3-folder.c:655
+#: ../camel/providers/pop3/camel-pop3-folder.c:838
+#: ../camel/providers/pop3/camel-pop3-folder.c:1036
+#: ../camel/providers/pop3/camel-pop3-store.c:393
+#: ../camel/providers/pop3/camel-pop3-store.c:805
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Na dokonÄenie tejto operÃcie musÃte pracovaÅ v pripojenom reÅime"
@@ -1739,64 +1781,64 @@ msgstr "Na dokonÄenie tejto operÃcie musÃte pracovaÅ v pripojenom reÅime"
 msgid "Canceled"
 msgstr "ZruÅenÃ"
 
-#: ../camel/camel-filter-driver.c:878 ../camel/camel-filter-search.c:697
+#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Zlyhalo vytvorenie dcÃrskeho procesu â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:926
+#: ../camel/camel-filter-driver.c:943
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "PrijatÃ neplatnÃ stream sprÃvy od %s: %s"
 
-#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1140
+#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
 msgstr "SynchronizujÃ sa prieÄinky"
 
-#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Chyba pri spracovÃvanÃ filtra: %s: %s"
+msgstr "Chyba pri analyzovanÃ filtra: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1692
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykonÃvanÃ filtra: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1347
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Nepodarilo sa otvoriÅ zoraÄovacÃ prieÄinok"
 
-#: ../camel/camel-filter-driver.c:1355
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Nepodarilo sa spracovaÅ zoraÄovacÃ prieÄinok"
 
-#: ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "ZÃskava sa sprÃva %d (%d%%)"
+msgstr "ZÃskava sa sprÃva %d (%d %%)"
 
-#: ../camel/camel-filter-driver.c:1380 ../camel/camel-filter-driver.c:1402
+#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
 #, c-format
 msgid "Failed on message %d"
 msgstr "Zlyhanie pri sprÃve %d"
 
-#: ../camel/camel-filter-driver.c:1417 ../camel/camel-filter-driver.c:1518
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
 msgid "Syncing folder"
 msgstr "Synchronizuje sa prieÄinok"
 
-#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
+#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
 msgid "Complete"
 msgstr "Hotovo"
 
-#: ../camel/camel-filter-driver.c:1482
+#: ../camel/camel-filter-driver.c:1485
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ZÃskava sa sprÃva %d z %d"
 
-#: ../camel/camel-filter-driver.c:1500
+#: ../camel/camel-filter-driver.c:1503
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na sprÃve %d z %d"
@@ -1805,34 +1847,39 @@ msgstr "Zlyhanie na sprÃve %d z %d"
 msgid "Failed to retrieve message"
 msgstr "Nepodarilo sa prijaÅ sprÃvu"
 
-#: ../camel/camel-filter-search.c:447
+#: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
-msgstr "NeplatnÃ parametre pre (systÃmovÃ prÃznaky)"
+msgstr "NeplatnÃ parametre pre (system-flag)"
 
-#: ../camel/camel-filter-search.c:465
+#: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
-msgstr "NeplatnÃ parametre pre (pouÅÃvateÄskÃ znaÄky)"
+msgstr "NeplatnÃ parametre pre (user-tag)"
 
-#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
+#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr "Chyba pri vykonÃvanÃ hÄadania filtrov: %s: %s"
+msgstr "Chyba pri vykonÃvanÃ vyhÄadÃvacieho filtra: %s: %s"
 
-#: ../camel/camel-folder.c:243
-#, fuzzy, c-format
+# PK: co tak nevyziadana posta (junk inde)
+#: ../camel/camel-folder.c:262
+#, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "ZÃskavam %d sprÃv"
-msgstr[1] "ZÃskavam %d sprÃv"
+msgstr[0] "UÄenie pomocou novÃch nevyÅiadanÃch sprÃv v â%sâ"
+msgstr[1] "UÄenie pomocou novej nevyÅiadanej sprÃvy v â%sâ"
+msgstr[2] "UÄenie pomocou novÃch nevyÅiadanÃch sprÃv v â%sâ"
 
-#: ../camel/camel-folder.c:283
-#, fuzzy, c-format
+# PK: neviem ci ludia vedia co je ham sprava
+# MÄ: nie som si istÃ tÃm prekladom, ale myslÃm, Åe by to malo byÅ zrozumiteÄnÃ
+#: ../camel/camel-folder.c:302
+#, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "ZÃskavam %d sprÃv"
-msgstr[1] "ZÃskavam %d sprÃv"
+msgstr[0] "UÄenie pomocou novÃch oÄakÃvanÃch sprÃv v â%sâ"
+msgstr[1] "UÄenie pomocou novej oÄakÃvanej sprÃvy v â%sâ"
+msgstr[2] "UÄenie pomocou novÃch oÄakÃvanÃch sprÃv v â%sâ"
 
-#: ../camel/camel-folder.c:331
+#: ../camel/camel-folder.c:350
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -1840,42 +1887,42 @@ msgstr[0] "FiltrujÃ sa novÃ sprÃvy v â%sâ"
 msgstr[1] "Filtruje sa novÃ sprÃva v â%sâ"
 msgstr[2] "FiltrujÃ sa novÃ sprÃvy v â%sâ"
 
-#: ../camel/camel-folder.c:902
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:918
+#: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "PresÃvajÃ sa sprÃvy"
 
-#: ../camel/camel-folder.c:905
+#: ../camel/camel-folder.c:921
 msgid "Copying messages"
 msgstr "KopÃrujÃ sa sprÃvy"
 
-#: ../camel/camel-folder.c:1160
+#: ../camel/camel-folder.c:1233
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "InformÃcie o kvÃte nie sÃ podporovanÃ pre prieÄinok â%sâ"
 
-#: ../camel/camel-folder.c:3271
+#: ../camel/camel-folder.c:3549
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "ZÃskava sa sprÃva â%sâ v %s"
 
-#: ../camel/camel-folder.c:3404
+#: ../camel/camel-folder.c:3698
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "ZÃskavajÃ sa informÃcie o kvÃte pre â%sâ"
 
-#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:459
-#: ../camel/camel-folder-search.c:630
+#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
+#: ../camel/camel-folder-search.c:664
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"NedÃ sa spracovaÅ vyhÄadÃvacÃ vÃraz: %s:\n"
+"NedÃ sa analyzovaÅ vyhÄadÃvacÃ vÃraz: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:471
-#: ../camel/camel-folder-search.c:642
+#: ../camel/camel-folder-search.c:377 ../camel/camel-folder-search.c:491
+#: ../camel/camel-folder-search.c:676
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1885,50 +1932,49 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:856 ../camel/camel-folder-search.c:899
+#: ../camel/camel-folder-search.c:890 ../camel/camel-folder-search.c:933
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) vyÅaduje jeden vÃsledok ako logickÃ hodnotu"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:960
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nie je povolenÃ vnÃtri %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:967 ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:1001 ../camel/camel-folder-search.c:1009
 #, c-format
 msgid "(%s) requires a match type string"
-msgstr ""
+msgstr "(%s) vyÅaduje reÅazcovÃ typ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1003
+#: ../camel/camel-folder-search.c:1037
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) oÄakÃva ako vÃsledok pole"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1013
-#, fuzzy, c-format
+#: ../camel/camel-folder-search.c:1047
+#, c-format
 msgid "(%s) requires the folder set"
-msgstr "(odpovedÃ vÅetkÃmu) vyÅaduje jeden pravdivostnÃ vÃsledok"
+msgstr "(%s) vyÅaduje mnoÅinu prieÄinkov"
 
-#: ../camel/camel-gpg-context.c:657 ../camel/camel-gpg-context.c:662
-#: ../camel/camel-gpg-context.c:1288
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepodarilo sa spustiÅ gpg: %s"
 
-# je tu sprÃvny rod
-# PK: mal by byt
-# PÅ: ide o chybu, tak si myslÃm, Åe skÃr NeznÃma...
-#: ../camel/camel-gpg-context.c:662
-#: ../camel/providers/smtp/camel-smtp-transport.c:762
+# je tu sprÃvny rod?
+# PÅ: ide o chybu a chybovÃ kÃd - ziÅiel by sa kontext (neznÃma, neznÃme)
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Unknown"
 msgstr "NeznÃma"
 
-#: ../camel/camel-gpg-context.c:727
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1939,17 +1985,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:744
+#: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "Zlyhalo spracovanie gpg pomÃcky userid."
+msgstr "Zlyhala anaÃza gpg pomÃcky userid."
 
-#: ../camel/camel-gpg-context.c:769 ../camel/camel-gpg-context.c:784
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "Zlyhalo spracovanie poÅiadavky na heslo gpg."
+msgstr "Zlyhala analÃza poÅiadavky na heslo gpg."
 
-#: ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1958,7 +2004,7 @@ msgstr ""
 "Na odomknutie kÄÃÄa pre vaÅu SmartCard\n"
 "potrebujete PIN: â%sâ"
 
-#: ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1967,87 +2013,91 @@ msgstr ""
 "Na odomknutie kÄÃÄa pre pouÅÃvateÄa\n"
 "potrebujete heslo: â%sâ"
 
-#: ../camel/camel-gpg-context.c:815
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "NeoÄakÃvanÃ poÅiadavka od GnuPG pre â%sâ"
 
+#: ../camel/camel-gpg-context.c:850
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+"PamÃtajte, Åe zaÅifrovanÃ obsah neobsahuje informÃciu o prijÃmateÄovi, preto "
+"budete poÅiadanÃ o heslo pre kaÅdÃ uloÅenÃ sÃkromnÃ klÃÄ."
+
 # * https://bugzilla.gnome.org/show_bug.cgi?id=655414
-# PÅ: ja by som dal ZruÅenÃ, to by sa mohlo lepÅie hodiÅ vo viacerÃch kontextoch...
-#: ../camel/camel-gpg-context.c:844 ../camel/camel-net-utils.c:523
-#: ../camel/camel-tcp-stream-raw.c:260
-#: ../camel/providers/imapx/camel-imapx-server.c:5014
-#: ../camel/providers/imapx/camel-imapx-server.c:5031
-#: ../camel/providers/imapx/camel-imapx-store.c:161
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-#: ../libedataserver/e-client.c:134 ../libedataserverui/e-book-auth-util.c:227
+#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:382
+#: ../libedataserver/e-client.c:139 ../libedataserverui/e-book-auth-util.c:227
 #, c-format
 msgid "Cancelled"
 msgstr "ZruÅenÃ"
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Odomknutie tajnÃho kÄÃÄa zlyhalo: trikrÃt zadanÃ zlÃ heslo."
 
-#: ../camel/camel-gpg-context.c:874
+#: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "NeoÄakÃvanÃ odpoveÄ od GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1005
+#: ../camel/camel-gpg-context.c:1044
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Zlyhalo zaÅifrovanie: nezadanÃ Åiadni platnÃ adresÃti."
 
-#: ../camel/camel-gpg-context.c:1552 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
 msgid "Could not generate signing data: "
 msgstr "Nepodarilo sa vygenerovaÅ podpisovacie Ãdaje: "
 
-#: ../camel/camel-gpg-context.c:1601 ../camel/camel-gpg-context.c:1805
-#: ../camel/camel-gpg-context.c:1915 ../camel/camel-gpg-context.c:2062
-#: ../camel/camel-gpg-context.c:2162 ../camel/camel-gpg-context.c:2210
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
 msgid "Failed to execute gpg."
 msgstr "Nepodarilo sa spustiÅ gpg."
 
-#: ../camel/camel-gpg-context.c:1680 ../camel/camel-gpg-context.c:1688
-#: ../camel/camel-gpg-context.c:1696 ../camel/camel-gpg-context.c:1716
-#: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
-#: ../camel/camel-smime-context.c:976
+#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-smime-context.c:980
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "NedÃ sa overiÅ podpis sprÃvy: NesprÃvny formÃt sprÃvy"
 
-#: ../camel/camel-gpg-context.c:1758
+#: ../camel/camel-gpg-context.c:1797
 msgid "Cannot verify message signature: "
 msgstr "NedÃ sa overiÅ podpis sprÃvy: "
 
-#: ../camel/camel-gpg-context.c:1881
+#: ../camel/camel-gpg-context.c:1920
 msgid "Could not generate encrypting data: "
 msgstr "Nepodarilo sa vygenerovaÅ Åifrovacie Ãdaje: "
 
-#: ../camel/camel-gpg-context.c:1934
+#: ../camel/camel-gpg-context.c:1973
 msgid "This is a digitally encrypted message part"
 msgstr "Toto je digitÃlne ÅifrovanÃ ÄasÅ sprÃvy"
 
-#: ../camel/camel-gpg-context.c:1992 ../camel/camel-gpg-context.c:2001
-#: ../camel/camel-gpg-context.c:2024
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "NedÃ sa deÅifrovaÅ sprÃva: NesprÃvny formÃt sprÃvy"
 
-#: ../camel/camel-gpg-context.c:2012
+#: ../camel/camel-gpg-context.c:2051
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Nepodarilo sa deÅifrovaÅ ÄasÅ MIME: chyba protokolu"
 
-#: ../camel/camel-gpg-context.c:2103 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
 msgid "Encrypted content"
 msgstr "ÅifrovanÃ obsah"
 
-#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
 msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr ""
+msgstr "S CamelHttpStream je podporovanÃ prenastavenie len na zaÄiatok"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2160,22 +2210,6 @@ msgstr "Åiadny dostupnÃ podpis"
 msgid "parse error"
 msgstr "chyba spracovania"
 
-#: ../camel/camel-network-service.c:99
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "Nepodarilo sa pripojiÅ k %s: %s"
-
-# je tu sprÃvny rod?
-# PK: mne to tak dobre zneje
-#: ../camel/camel-network-service.c:100
-msgid "SSL unavailable"
-msgstr "SSL je nedostupnÃ"
-
-#: ../camel/camel-network-service.c:123
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "Nepodarilo sa pripojiÅ k %s: "
-
 #: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
@@ -2183,7 +2217,7 @@ msgstr "ZisÅuje sa adresa: %s"
 
 #: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
-msgstr "Zlyhalo hÄadanie hostiteÄa zlyhalo"
+msgstr "HÄadanie hostiteÄa zlyhalo"
 
 #: ../camel/camel-net-utils.c:732
 #, c-format
@@ -2196,22 +2230,27 @@ msgstr "ZisÅuje sa adresa"
 
 #: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
-msgstr ""
+msgstr "HÄadanie nÃzvu zlyhalo"
 
 #: ../camel/camel-net-utils.c:880
-#, fuzzy, c-format
+#, c-format
 msgid "Name lookup failed: %s"
-msgstr "NNTP prÃkaz zlyhal: %s"
+msgstr "HÄadanie nÃzvu zlyhalo: %s"
 
-#: ../camel/camel-offline-folder.c:202
+#: ../camel/camel-network-service.c:112
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Nepodarilo sa pripojiÅ k %s: "
+
+#: ../camel/camel-offline-folder.c:206
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "SynchronizujÃ sa sprÃvy v prieÄinku â%sâ so sprÃvami na disku"
 
-#: ../camel/camel-offline-journal.c:147 ../camel/camel-offline-journal.c:177
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr ""
+msgstr "NedÃ sa zapÃsaÅ ÅurnÃl odpojenÃho reÅimu pre prieÄinok â%sâ: %s"
 
 #: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
@@ -2222,24 +2261,24 @@ msgstr "PoskytovateÄ virtuÃlneho prieÄinka poÅty"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Na ÄÃtanie poÅty ako poÅiadavky na inÃ mnoÅinu prieÄinkov"
 
-#: ../camel/camel-provider.c:192
+#: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Nepodarilo sa naÄÃtaÅ %s: NaÄÃtavanie modulov nie je na tomto systÃme "
 "podporovanÃ."
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nepodarilo sa naÄÃtaÅ %s: %s"
 
-#: ../camel/camel-provider.c:210
+#: ../camel/camel-provider.c:211
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nepodarilo sa naÄÃtaÅ %s: V module nie je inicializaÄnÃ kÃd."
 
-#: ../camel/camel-provider.c:394 ../camel/camel-session.c:351
+#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Pre protokol â%sâ nie je k dispozÃcii Åiadny poskytovateÄ"
@@ -2250,7 +2289,7 @@ msgstr "AnonymnÃ"
 
 #: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
-msgstr "TÃto voÄba vÃs pripojÃ na server pomocou anonymnÃho prihlÃsenia."
+msgstr "TÃto voÄba vÃs pripojÃ k serveru pomocou anonymnÃho prihlÃsenia."
 
 #: ../camel/camel-sasl-anonymous.c:70
 #, c-format
@@ -2284,11 +2323,11 @@ msgstr ""
 "NeplatnÃ informÃcia trasovania:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:48
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2296,11 +2335,11 @@ msgstr ""
 "TÃto voÄba vÃs pripojÃ k serveru pomocou hesla ÅifrovanÃho metÃdou CRAM-MD5, "
 "ak ho podporuje server."
 
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:61
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2308,46 +2347,46 @@ msgstr ""
 "TÃto voÄba vÃs pripojÃ k serveru pomocou hesla ÅifrovanÃho metÃdou DIGEST-"
 "MD5, ak ho podporuje server."
 
-#: ../camel/camel-sasl-digest-md5.c:830
+#: ../camel/camel-sasl-digest-md5.c:850
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "VÃzva pre server prÃliÅ dlhÃ (>2048 bajtov)"
 
-#: ../camel/camel-sasl-digest-md5.c:841
+#: ../camel/camel-sasl-digest-md5.c:861
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "VÃzva pre server neplatnÃ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:849
+#: ../camel/camel-sasl-digest-md5.c:869
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "VÃzva pre server obsahovala neplatnÃ prvok âKvalita ochranyâ"
 
-#: ../camel/camel-sasl-digest-md5.c:883
+#: ../camel/camel-sasl-digest-md5.c:902
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "OdpoveÄ servera neobsahovala Ãdaje o overenÃ totoÅnosti"
 
-#: ../camel/camel-sasl-digest-md5.c:904
+#: ../camel/camel-sasl-digest-md5.c:923
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "OdpoveÄ servera obsahovala neÃplnÃ Ãdaje o overenÃ totoÅnosti"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:936
 #, c-format
 msgid "Server response does not match"
 msgstr "OdpoveÄ servera sa nezhoduje"
 
-#: ../camel/camel-sasl-gssapi.c:86
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:88
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "TÃto voÄba vÃs pripojÃ k serveru pomocou overenia totoÅnosti Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2355,26 +2394,27 @@ msgstr ""
 "ZadanÃ mechanizmus nie je podporovanÃ poskytnutÃm poverenÃm, alebo ho "
 "implementÃcia nepodporuje."
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ZadanÃ parameter target_name bol neplatnÃ."
 
-#: ../camel/camel-sasl-gssapi.c:137
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
-"ZadanÃ parameter target_name obsahoval neplatnÃ alebo nepodporovanÃ typ nÃzvu."
+"ZadanÃ parameter target_name obsahoval neplatnÃ alebo nepodporovanÃ typ "
+"nÃzvu."
 
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
-"input_token obsahuje inÃ pripojenia kanÃlu neÅ to, ktorÃ je uvedenÃ v "
+"input_token obsahuje inÃ pripojenia kanÃlu neÅ tie, ktorÃ sÃ uvedenÃ v "
 "parametri input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2382,7 +2422,7 @@ msgstr ""
 "ReÅazec input_token obsahuje neplatnÃ podpis alebo podpis, ktorÃ nie je "
 "moÅnÃ overiÅ."
 
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:155
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2390,52 +2430,52 @@ msgstr ""
 "ZadanÃ poverenia neboli platnÃ pre vytvorenie kontextu alebo nezodpovedali "
 "Åiadnemu bezpeÄnostnÃmu zÃznamu."
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ZadanÃ manipulÃtor kontextu nezodpovedal platnÃmu kontextu."
 
-#: ../camel/camel-sasl-gssapi.c:158
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "VykonanÃ kontroly konzistencie pre input_token zlyhali."
 
-#: ../camel/camel-sasl-gssapi.c:161
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "Zlyhali kontroly konzistencie poverenia."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "PlatnosÅ odkazovanÃho poverenia vyprÅala."
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:321
-#: ../camel/camel-sasl-gssapi.c:365 ../camel/camel-sasl-gssapi.c:382
-#: ../camel/providers/smtp/camel-smtp-transport.c:1232
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
+#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:562
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "NeplatnÃ odpoveÄ na overenie totoÅnosti od servera."
 
-#: ../camel/camel-sasl-gssapi.c:394
+#: ../camel/camel-sasl-gssapi.c:410
 #, c-format
 msgid "Unsupported security layer."
 msgstr "NepodporovanÃ vrstva zabezpeÄenia."
 
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "PrihlÃsenie"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
 msgstr "TÃto voÄba vÃs pripojÃ k serveru pomocou jednoduchÃho hesla."
 
-#: ../camel/camel-sasl-login.c:92
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "NeznÃmy stav overenia totoÅnosti."
 
-#: ../camel/camel-sasl-ntlm.c:42
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:44
+#: ../camel/camel-sasl-ntlm.c:49
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2443,457 +2483,453 @@ msgstr ""
 "TÃto voÄba vÃs pripojÃ k serveru Windows pomocou overenia totoÅnosti NTLM / "
 "Secure Password."
 
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP pred SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "TÃto voÄba bude prihlasovaÅ POP spojenie pred pokusom o SMTP spojenie"
 
-#: ../camel/camel-sasl-popb4smtp.c:80
-#, fuzzy
+#: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
-msgstr "ZdrojovÃ URI pre POP"
+msgstr "ZdrojovÃ UID pre POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:92
-#, fuzzy, c-format
+#: ../camel/camel-sasl-popb4smtp.c:96
+#, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
-msgstr "PrihlÃsenie POP pred SMTP pomocou neznÃmeho transportu"
+msgstr "Overenie totoÅnosti POP pred SMTP pomocou neznÃmeho transportu"
 
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
-#, fuzzy, c-format
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
+#, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
-msgstr "PrihlÃsenie POP pred SMTP nie pomocou zdroja POP"
+msgstr "Overenie totoÅnosti POP pred SMTP pomocou sluÅby %s"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Preklad regulÃrneho vÃrazu zlyhal: %s: %s"
 
-#: ../camel/camel-service.c:524
-#, c-format
-msgid "URL '%s' needs a user component"
-msgstr "URL â%sâ vyÅaduje prvok pouÅÃvateÄa"
-
-#: ../camel/camel-service.c:535
+#: ../camel/camel-session.c:393
 #, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL â%sâ vyÅaduje prvok hostiteÄa"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "NeplatnÃ GType registrovanÃ pre protokol â%sâ"
 
-#: ../camel/camel-service.c:546
+#: ../camel/camel-session.c:472
+#: ../camel/providers/imap/camel-imap-store.c:1143
+#: ../camel/providers/imapx/camel-imapx-server.c:2936
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:566
+#: ../camel/providers/smtp/camel-smtp-transport.c:455
 #, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL â%sâ vyÅaduje prvok cesty"
+msgid "No support for %s authentication"
+msgstr "Overenie totoÅnosti %s nie je podporovanÃ"
 
-#: ../camel/camel-session.c:361
+#: ../camel/camel-session.c:487
 #, c-format
-msgid "Invalid GType registered for protocol '%s'"
-msgstr "NeplatnÃ GType registrovanÃ pre protokol â%sâ"
+msgid "%s authentication failed"
+msgstr "Zlyhalo overenie totoÅnosti %s"
 
-#: ../camel/camel-session.c:941
+#: ../camel/camel-session.c:1194
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ProsÃm, zadajte %s heslo pre %s na hostiteÄovi %s."
 
-#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "NedÃ sa nÃjsÅ certifikÃt pre â%sâ"
 
-#: ../camel/camel-smime-context.c:375
-#, fuzzy
+# MÄ: Cryptographic Message Syntax - http://en.wikipedia.org/wiki/Cryptographic_Message_Syntax
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
-msgstr "Nie je moÅnÃ otvoriÅ sprÃvu"
+msgstr "NedÃ sa vytvoriÅ sprÃva CMS"
 
-#: ../camel/camel-smime-context.c:380
-#, fuzzy
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
-msgstr "Nie je moÅnÃ priloÅiÅ sÃbor %s: %s"
+msgstr "NedajÃ sa vytvoriÅ podpÃsanÃ Ãdaje CMS"
 
-#: ../camel/camel-smime-context.c:386
-#, fuzzy
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
-msgstr "Nie je moÅnÃ priloÅiÅ sÃbor %s: %s"
+msgstr "NedajÃ sa priloÅiÅ podpÃsanÃ Ãdaje CMS"
 
-#: ../camel/camel-smime-context.c:393
-#, fuzzy
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
-msgstr "Nie je moÅnÃ priloÅiÅ sÃbor %s: %s"
+msgstr "NedajÃ sa priloÅiÅ Ãdaje CMS"
 
-#: ../camel/camel-smime-context.c:399
-#, fuzzy
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
-msgstr "Nie je moÅnÃ otvoriÅ sprÃvu"
+msgstr "NedÃ sa vytvoriÅ informÃcia CMS podpisovateÄa"
 
-#: ../camel/camel-smime-context.c:405
-#, fuzzy
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
-msgstr "Nepodarilo sa nÃjsÅ certifikÃt pre \"%s\"."
+msgstr "NedÃ sa nÃjsÅ reÅaz certifikÃtov"
 
-#: ../camel/camel-smime-context.c:411
-#, fuzzy
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
-msgstr "Nie je moÅnÃ priloÅiÅ sÃbor %s: %s"
+msgstr "NedÃ sa pridaÅ Äas CMS podpisovania"
 
-#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "ÅifrovacÃ certifikÃt pre â%sâ neexistuje"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr ""
+msgstr "NedÃ sa pridaÅ atribÃt SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:462
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr ""
+msgstr "NedÃ sa pridaÅ atribÃt MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:467
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "NedÃ sa pridaÅ ÅifrovacÃ certifikÃt"
 
-#: ../camel/camel-smime-context.c:473
-#, fuzzy
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
-msgstr "InformÃcie o kalendÃri"
+msgstr "NedÃ sa pridaÅ informÃcia o CMS podpisovateÄovi"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:506
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "NeoverenÃ"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "DobrÃ podpis"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "NesprÃvny podpis"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
-msgstr ""
+msgstr "Obsah sfalÅovanÃ alebo pozmenenÃ poÄas prenosu"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "PodpisovacÃ certifikÃt nebol nÃjdenÃ"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "PodpisovacÃ certifikÃt nie je dÃveryhodnÃ"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
-msgstr ""
+msgstr "NeznÃmy algoritmus podpisu"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
-msgstr ""
+msgstr "NepodporovanÃ algoritmus podpisu"
 
-#: ../camel/camel-smime-context.c:522
-#, fuzzy
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
-msgstr "UloÅiÅ podpis"
+msgstr "PoÅkodenÃ podpis"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "Chyba pri spracovanÃ"
 
-#: ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "Åiadne podpÃsanÃ Ãdaje v podpise"
 
-#: ../camel/camel-smime-context.c:574
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
-msgstr ""
+msgstr "V zabalenÃch Ãdajoch chÃbajÃ sÃhrny"
 
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
-#, fuzzy
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
-msgstr "Nie je moÅnÃ zÃskaÅ prieÄinok: %s: %s"
+msgstr "NedajÃ sa vypoÄÃtaÅ sÃhrny"
 
-#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
-#, fuzzy
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
-msgstr "Nie je moÅnÃ zÃskaÅ sprÃvu %s: %s"
+msgstr "NedajÃ sa nastaviÅ sÃhrny sprÃvy"
 
-#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "Importovanie certifikÃtu zlyhalo"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr ""
+msgstr "SprÃva obsahuje len certifikÃt, certifikÃty sa nedajÃ overiÅ"
 
-#: ../camel/camel-smime-context.c:637
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr ""
+msgstr "SprÃva obsahuje len certifikÃt, certifikÃty boli importovanÃ a overenÃ"
 
-#: ../camel/camel-smime-context.c:641
-#, fuzzy
+# MÄ: Tu som to naprvÃ krÃt asi troÅku nepochopil. Funkcia zisÅuje, Äi podpÃsanÃ Ãdaje (obsahujÃ aj podpis(-y)) majÃ priradenÃ digesty (sÃhrny)
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
-msgstr "UpraviÅ podpis"
+msgstr "NedajÃ sa nÃjsÅ sÃhrny podpisu"
 
-#: ../camel/camel-smime-context.c:657
+#: ../camel/camel-smime-context.c:661
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "PodpÃsal: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
-#, fuzzy
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
-msgstr "Nepodarilo sa vytvoriÅ kontext dekÃdovania S/MIME."
+msgstr "NedÃ sa vytvoriÅ kontext kÃderu"
 
-#: ../camel/camel-smime-context.c:844
-#, fuzzy
+#: ../camel/camel-smime-context.c:848
 msgid "Failed to add data to CMS encoder"
-msgstr "Nepodarilo sa pridaÅ do lokÃlneho prieÄinku \"OdoslenÃ\": %s"
+msgstr "Zlyhalo pridanie Ãdajov do CMS kÃderu"
 
-#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
-msgstr "Zlyhalo kÃdovanie Ãdajov"
+msgstr "KÃdovanie Ãdajov zlyhalo"
 
-#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
-#, fuzzy
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
-msgstr "IMAP prÃkaz zlyhal: %s"
+msgstr "DekÃder zlyhal"
 
-#: ../camel/camel-smime-context.c:1061
-#, fuzzy
+# PK: hromadneho?
+# MÄ: PrÃveÅe v kÃde som nenaÅiel Åadnu informÃciu, ktorÃ by hovorila nieÄo o hromadnosti, SkÃr moÅno âglobÃlnyâ, ale naozaj to nedokÃÅem ani podÄa kÃdu odhadnÃÅ.
+# MÄ: teraz mi tak napadlo, Äi âcommon bulkâ nebude znamenaÅ âobvyklÃ globÃlnyâ => âspoloÄnÃâ Äo by mi uÅ zmysel dÃvalo
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
-msgstr "Nepodarilo sa nÃjsÅ obvyklÃ bulk algoritmus."
+msgstr "NedÃ sa nÃjsÅ obvyklÃ globÃlny ÅifrovacÃ algoritmus"
 
-#: ../camel/camel-smime-context.c:1069
+#: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr ""
+msgstr "NedÃ sa alokovaÅ pozÃcia pre ÅifrovacÃ globÃlny klÃÄ"
 
-#: ../camel/camel-smime-context.c:1080
-#, fuzzy
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
-msgstr "Nie je moÅnÃ otvoriÅ sprÃvu"
+msgstr "NedÃ sa vytvoriÅ sprÃva CMS"
 
-#: ../camel/camel-smime-context.c:1086
-#, fuzzy
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
-msgstr "Nie je moÅnÃ otvoriÅ sprÃvu"
+msgstr "NedÃ sa vytvoriÅ zabalenÃ Ãdaj CMS"
 
-#: ../camel/camel-smime-context.c:1092
-#, fuzzy
+#: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
-msgstr "Nie je moÅnÃ priloÅiÅ sÃbor %s: %s"
+msgstr "NedÃ sa priloÅiÅ zabalenÃ Ãdaj CMS"
 
-#: ../camel/camel-smime-context.c:1098
-#, fuzzy
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
-msgstr "Nie je moÅnÃ priloÅiÅ sÃbor %s: %s"
+msgstr "NedÃ sa priloÅiÅ ÃdajovÃ objekt CMS"
 
-#: ../camel/camel-smime-context.c:1107
-#, fuzzy
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
-msgstr "Nie je moÅnÃ otvoriÅ sprÃvu"
+msgstr "NedÃ sa vytvoriÅ informÃcia prijÃmateÄa CMS"
 
-#: ../camel/camel-smime-context.c:1112
-#, fuzzy
+#: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
-msgstr "Nie je moÅnÃ otvoriÅ sprÃvu"
+msgstr "NedÃ sa pridaÅ informÃcia prijÃmateÄa CMS"
 
-#: ../camel/camel-smime-context.c:1137
-#, fuzzy
+#: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
-msgstr "Nepodarilo sa pripojiÅ k serveru LDAP"
+msgstr "Zlyhalo pridÃvanie Ãdajov do kÃdera"
 
-#: ../camel/camel-smime-context.c:1246
+#: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "DeÅifrovanie S/MIME: Nebol nÃjdenÃ Åiadny ÅifrovanÃ obsah"
 
-#: ../camel/camel-store.c:1815
+#: ../camel/camel-store.c:1799
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "NedÃ sa vytvoriÅ prieÄinok â%sâ: prieÄinok existuje"
 
-#: ../camel/camel-store.c:1858
+#: ../camel/camel-store.c:1842
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "OtvÃra sa prieÄinok â%sâ"
 
-#: ../camel/camel-store.c:2043
+#: ../camel/camel-store.c:2027
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "PrezerajÃ sa prieÄinky v â%sâ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2055 ../camel/camel-store.c:2065
+#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "KÃÅ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2058 ../camel/camel-store.c:2069
+#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "NevyÅiadanÃ poÅta"
 
-#: ../camel/camel-store.c:2520
+#: ../camel/camel-store.c:2501
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "NedÃ sa vytvoriÅ prieÄinok: %s: prieÄinok existuje"
 
-#: ../camel/camel-store.c:2534
+#: ../camel/camel-store.c:2515
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "VytvÃra sa prieÄinok â%sâ"
 
-#: ../camel/camel-store.c:2652 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "NedÃ sa odstrÃniÅ prieÄinok: %s: NeplatnÃ operÃcia"
 
-#: ../camel/camel-store.c:2795 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:710
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:764
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "NedÃ sa premenovaÅ prieÄinok: %s: NeplatnÃ operÃcia"
 
-#: ../camel/camel-stream-filter.c:327
+#: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
-msgstr ""
+msgstr "CamelStreamFilter podporuje prenastavenie len na zaÄiatok"
 
 #: ../camel/camel-stream-process.c:267
 #, c-format
 msgid "Connection cancelled"
-msgstr "Spojenie zruÅenÃ"
+msgstr "Pripojenie zruÅenÃ"
 
 #: ../camel/camel-stream-process.c:272
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nepodarilo sa pripojiÅ pomocou prÃkazu â%sâ: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:756 ../camel/camel-tcp-stream-raw.c:767
+#: ../camel/camel-tcp-stream-raw.c:303
+#, c-format
+msgid "NSPR error code %d"
+msgstr "ChybovÃ kÃd NSPR %d"
+
+#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "Proxy hostiteÄ nepodporuje SOCKS4"
 
-#: ../camel/camel-tcp-stream-raw.c:778
+#: ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "Proxy hostiteÄ zamietol naÅu poÅiadavku: kÃd %d"
 
-#: ../camel/camel-tcp-stream-raw.c:874 ../camel/camel-tcp-stream-raw.c:880
+#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "Proxy hostiteÄ nepodporuje SOCKS5"
 
-#: ../camel/camel-tcp-stream-raw.c:886
-#, fuzzy, c-format
+#: ../camel/camel-tcp-stream-raw.c:770
+#, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "Overenie typu %s nie je podporovanÃ."
+msgstr "Nepodarilo sa nÃjsÅ vhodnÃ typ overenia totoÅnosti: kÃd 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:898
+#: ../camel/camel-tcp-stream-raw.c:782
 msgid "General SOCKS server failure"
 msgstr "VÅeobecnÃ zlyhanie servera SOCKS"
 
-#: ../camel/camel-tcp-stream-raw.c:899
+#: ../camel/camel-tcp-stream-raw.c:783
 msgid "SOCKS server's rules do not allow connection"
 msgstr "PravidlÃ servera SOCKS nepovoÄujÃ pripojenie"
 
-#: ../camel/camel-tcp-stream-raw.c:900
+#: ../camel/camel-tcp-stream-raw.c:784
 msgid "Network is unreachable from SOCKS server"
 msgstr "SieÅ nie je dosiahnuteÄnÃ zo servera SOCKS"
 
-#: ../camel/camel-tcp-stream-raw.c:901
+#: ../camel/camel-tcp-stream-raw.c:785
 msgid "Host is unreachable from SOCKS server"
 msgstr "HostiteÄ nie je dosiahnuteÄnÃ zo servera SOCKS"
 
-#: ../camel/camel-tcp-stream-raw.c:902
+#: ../camel/camel-tcp-stream-raw.c:786
 msgid "Connection refused"
 msgstr "Pripojenie odmietnutÃ"
 
-#: ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:787
 msgid "Time-to-live expired"
-msgstr ""
+msgstr "VyprÅal Äas Åivotnosti (time-to-live)"
 
-#: ../camel/camel-tcp-stream-raw.c:904
+#: ../camel/camel-tcp-stream-raw.c:788
 msgid "Command not supported by SOCKS server"
 msgstr "PrÃkaz nie je podporovanÃ serverom SOCKS"
 
-#: ../camel/camel-tcp-stream-raw.c:905
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "Address type not supported by SOCKS server"
 msgstr "Typ adresy nie je podporovanÃ serverom SOCKS"
 
-#: ../camel/camel-tcp-stream-raw.c:906
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "Unknown error from SOCKS server"
 msgstr "NeznÃma chyba zo servera SOCKS"
 
-#: ../camel/camel-tcp-stream-raw.c:939
+#: ../camel/camel-tcp-stream-raw.c:823
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "ZÃskanÃ neznÃmy typ adresy zo servera SOCKS"
 
-#: ../camel/camel-tcp-stream-raw.c:957
+#: ../camel/camel-tcp-stream-raw.c:841
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "NeÃplnÃ odpoveÄ zo servera SOCKS"
 
-#: ../camel/camel-tcp-stream-raw.c:977
+#: ../camel/camel-tcp-stream-raw.c:861
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "NÃzov hostiteÄa je prÃliÅ dlhÃ (maximum je 255 znakov)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1009 ../camel/camel-tcp-stream-raw.c:1019
+#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "NeplatnÃ odpoveÄ od proxy servera"
 
-#: ../camel/camel-tcp-stream-ssl.c:462
+#: ../camel/camel-tcp-stream-ssl.c:474
 #, c-format
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
-"Vydal:             %s\n"
-"Predmet:           %s\n"
-"OdtlaÄok:          %s\n"
-"Podpis:            %s"
+"   Vydal:        %s\n"
+"   Predmet:      %s\n"
+"   OdtlaÄok:     %s\n"
+"   Podpis:       %s"
 
 # podpis, viÄ vyÅÅie
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "GOOD"
 msgstr "DOBRÃ"
 
 # podpis, viÄ vyÅÅie
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "BAD"
 msgstr "NESPRÃVNY"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:472
+#: ../camel/camel-tcp-stream-ssl.c:484
 #, c-format
 msgid ""
-"SSL Certificate check for %s:\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
 msgstr ""
-"Kontrola certifikÃtu SSL pre %s.\n"
-"\n"
-"%s\n"
+"SSL certifikÃt pre â%sâ nie je dÃveryhodnÃ. Chcete ho akceptovaÅ?\n"
 "\n"
-"Chcete ho prijaÅ?"
+"PodrobnÃ informÃcie o certifikÃte:\n"
+"%s"
+
+#: ../camel/camel-tcp-stream-ssl.c:488
+msgid "_Reject"
+msgstr "_OdmietnuÅ"
 
-#: ../camel/camel-tcp-stream-ssl.c:516
+#: ../camel/camel-tcp-stream-ssl.c:489
+msgid "Accept _Temporarily"
+msgstr "AkceptovaÅ _doÄasne"
+
+#: ../camel/camel-tcp-stream-ssl.c:490
+msgid "_Accept Permanently"
+msgstr "_AkceptovaÅ nastÃlo"
+
+#: ../camel/camel-tcp-stream-ssl.c:548
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2902,7 +2938,7 @@ msgstr ""
 "ProblÃm certifikÃtu: %s\n"
 "Vydal: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:568
+#: ../camel/camel-tcp-stream-ssl.c:600
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2911,7 +2947,7 @@ msgstr ""
 "NeplatnÃ domÃna certifikÃtu: %s\n"
 "Vydal: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:586
+#: ../camel/camel-tcp-stream-ssl.c:618
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2920,7 +2956,7 @@ msgstr ""
 "PlatnosÅ certifikÃtu vyprÅala: %s\n"
 "Vydal: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:603
+#: ../camel/camel-tcp-stream-ssl.c:635
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2929,23 +2965,28 @@ msgstr ""
 "VyprÅala platnosÅ zoznamu zruÅenÃch certifikÃtov: %s\n"
 "Vydal: %s"
 
-#: ../camel/camel-url.c:333
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Nepodarilo sa analyzovaÅ URL â%sâ"
 
-#: ../camel/camel-vee-folder.c:1310 ../camel/camel-vee-folder.c:1470
+#: ../camel/camel-vee-folder.c:651
+#, c-format
+msgid "Updating %s folder"
+msgstr "Aktualizuje sa prieÄinok %s"
+
+#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nepodarilo sa skopÃrovaÅ alebo presunÃÅ sprÃvu do virtuÃlneho prieÄinka"
 
-#: ../camel/camel-vee-folder.c:1343
+#: ../camel/camel-vee-folder.c:1358
 #, c-format
 msgid "No such message %s in %s"
 msgstr "SprÃva %s neexistuje v %s"
 
-#: ../camel/camel-vee-folder.c:1411
+#: ../camel/camel-vee-folder.c:1426
 #, c-format
 msgid "Error storing '%s': "
 msgstr "Chyba pri ukladanÃ â%sâ: "
@@ -2974,24 +3015,33 @@ msgstr "Nie je moÅnÃ kopÃrovaÅ sprÃvu do prieÄinka KÃÅ"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Nie je moÅnÃ kopÃrovaÅ sprÃvu do prieÄinka NevyÅiadanÃ poÅta"
 
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:293
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, c-format
 msgid "No output stream"
 msgstr "Åiadny vÃstupnÃ stream"
 
-#: ../camel/providers/imap/camel-imap-command.c:206
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, c-format
 msgid "No input stream"
 msgstr "Åiadny vstupnÃ stream"
 
-#: ../camel/providers/imap/camel-imap-command.c:365
+#: ../camel/providers/imap/camel-imap-command.c:383
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server sa neoÄakÃvane odpojil: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:395
+#: ../camel/providers/imap/camel-imap-command.c:416
+#, c-format
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"Upozornenie zo servera IMAP %s %s v prieÄinku %s:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:420
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3000,112 +3050,118 @@ msgstr ""
 "Upozornenie zo servera IMAP %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:471
+#: ../camel/providers/imap/camel-imap-command.c:502
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NeoÄakÃvanÃ odpoveÄ zo servera IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:483
+#: ../camel/providers/imap/camel-imap-command.c:514
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP prÃkaz zlyhal: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:563
+#: ../camel/providers/imap/camel-imap-command.c:594
 #, c-format
 msgid "Server response ended too soon."
 msgstr "OdpoveÄ servera skonÄila prÃliÅ skoro."
 
-#: ../camel/providers/imap/camel-imap-command.c:775
+#: ../camel/providers/imap/camel-imap-command.c:806
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "OdpoveÄ servera IMAP neobsahovala informÃciu %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:813
+#: ../camel/providers/imap/camel-imap-command.c:844
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NeoÄakÃvanÃ odpoveÄ OK zo servera IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:296
-msgid "Always check for new mail in this folder"
-msgstr "VÅdy kontrolovaÅ novÃ poÅtu v tomto prieÄinku"
+#: ../camel/providers/imap/camel-imap-folder.c:348
+msgid "Always check for _new mail in this folder"
+msgstr "VÅdy kontrolovaÅ _novÃ poÅtu v tomto prieÄinku"
+
+#: ../camel/providers/imap/camel-imap-folder.c:359
+#: ../camel/providers/imapx/camel-imapx-folder.c:747
+#: ../camel/providers/nntp/camel-nntp-folder.c:760
+msgid "Apply message _filters to this folder"
+msgstr "AplikovaÅ _filtre na sprÃvy v tomto prieÄinku"
 
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:440
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nepodarilo sa vytvoriÅ prieÄinok %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:395
+#: ../camel/providers/imap/camel-imap-folder.c:461
 #, c-format
 msgid "Could not load summary for %s"
-msgstr "Nie je moÅnÃ naÄÃtaÅ sÃhrn pre %s"
+msgstr "Nepodarilo sa naÄÃtaÅ sÃhrn pre %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1054
-#: ../camel/providers/imapx/camel-imapx-server.c:4065
+#: ../camel/providers/imap/camel-imap-folder.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:3938
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "PrehÄadÃvajÃ sa zmenenÃ sprÃvy v %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3483
+#: ../camel/providers/imap/camel-imap-folder.c:3478
 msgid "Unable to retrieve message: "
 msgstr "Nepodarilo sa zÃskaÅ sprÃvu: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3520
-#: ../camel/providers/imapx/camel-imapx-server.c:5344
+#: ../camel/providers/imap/camel-imap-folder.c:3515
+#: ../camel/providers/imapx/camel-imapx-server.c:5497
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "NedÃ sa zÃskaÅ sprÃva s identifikÃtorom sprÃvy %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3521
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#: ../camel/providers/imap/camel-imap-folder.c:3516
+#: ../camel/providers/imapx/camel-imapx-server.c:5498
 msgid "No such message available."
 msgstr "SprÃva nie je dostupnÃ."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3596
-#: ../camel/providers/imap/camel-imap-folder.c:4503
-#: ../camel/providers/nntp/camel-nntp-folder.c:438
+#: ../camel/providers/imap/camel-imap-folder.c:3591
+#: ../camel/providers/imap/camel-imap-folder.c:4469
+#: ../camel/providers/nntp/camel-nntp-folder.c:515
 #, c-format
 msgid "This message is not currently available"
 msgstr "TÃto sprÃva momentÃlne nie je k dispozÃcii"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4087
-#: ../camel/providers/imap/camel-imap-folder.c:4170
-#: ../camel/providers/imapx/camel-imapx-server.c:4023
-#: ../camel/providers/imapx/camel-imapx-server.c:4173
+#: ../camel/providers/imap/camel-imap-folder.c:4050
+#: ../camel/providers/imap/camel-imap-folder.c:4133
+#: ../camel/providers/imapx/camel-imapx-server.c:3890
+#: ../camel/providers/imapx/camel-imapx-server.c:4070
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "ZÃskavajÃ sa sÃhrnnÃ informÃcie pre novÃ sprÃvy v %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4304
+#: ../camel/providers/imap/camel-imap-folder.c:4267
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "NeÃplnÃ odpoveÄ servera: neposkytnutÃ Åiadne informÃcie pre sprÃvu %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4314
+#: ../camel/providers/imap/camel-imap-folder.c:4277
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "NeÃplnÃ odpoveÄ servera: neposkytnutÃ Åiadne UID pre sprÃvu %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4543
+#: ../camel/providers/imap/camel-imap-folder.c:4509
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Nepodarilo sa nÃjsÅ telo sprÃvy v odpovedi FETCH."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:197
-#: ../camel/providers/imap/camel-imap-message-cache.c:257
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
 msgid "Could not open cache directory: "
 msgstr "Nepodarilo sa otvoriÅ adresÃr doÄasnej pamÃte: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:335
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Zlyhalo uloÅenie sprÃvy %s do doÄasnej pamÃte: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:401
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
 #, c-format
 msgid "Failed to cache message %s: "
 msgstr "Zlyhalo uloÅenie sprÃvy %s do doÄasnej pamÃte: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:543
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "Zlyhalo uloÅenie %s do doÄasnej pamÃte: "
@@ -3116,12 +3172,12 @@ msgid "Checking for New Mail"
 msgstr "Kontroluje sa novÃ poÅta"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "C_heck for new messages in all folders"
 msgstr "_KontrolovaÅ novÃ poÅtu vo vÅetkÃch prieÄinkoch"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "K_ontrolovaÅ novÃ poÅtu v prieÄinkoch prihlÃsenÃch na odber"
 
@@ -3141,7 +3197,7 @@ msgstr "_PrÃkaz:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
 #: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "PrieÄinky"
 
@@ -3152,9 +3208,8 @@ msgstr "_ZobraziÅ iba prieÄinky prihlÃsenÃ na odber"
 
 #: ../camel/providers/imap/camel-imap-provider.c:60
 #: ../camel/providers/imapx/camel-imapx-provider.c:67
-#, fuzzy
 msgid "O_verride server-supplied folder namespace"
-msgstr "PredefinovaÅ nÃzvy prieÄinkov zo serveru"
+msgstr "P_redefinovaÅ nÃzvy prieÄinkov zo serveru"
 
 #: ../camel/providers/imap/camel-imap-provider.c:62
 msgid "Names_pace:"
@@ -3165,211 +3220,195 @@ msgstr "_MennÃ priestor:"
 #: ../camel/providers/local/camel-local-provider.c:42
 #: ../camel/providers/local/camel-local-provider.c:84
 #: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "VoÄby"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "_AplikovaÅ filtre na novÃ sprÃvy v DoruÄenej poÅte na tomto serveri"
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+msgid "Apply _filters to new messages in all folders"
+msgstr "AplikovaÅ _filtre na novÃ sprÃvy vo vÅetkÃch prieÄinkoch"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "KontrolovaÅ _nevyÅiadanÃ obsah v novÃch sprÃvach"
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "_AplikovaÅ filtre na novÃ sprÃvy v DoruÄenej poÅte na tomto serveri"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "KontrolovaÅ nevyÅiadanÃ sprÃvy len v prieÄinku _DoruÄenÃ poÅta"
+msgid "Check new messages for _Junk contents"
+msgstr "KontrolovaÅ _nevyÅiadanÃ obsah v novÃch sprÃvach"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "KontrolovaÅ nevyÅiadanÃ sprÃvy len v prieÄinku _DoruÄenÃ poÅta"
+
+#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Automaticky synchroni_zovaÅ vzdialenÃ poÅtu s lokÃlnou"
+msgstr "Automaticky _synchronizovaÅ vzdialenÃ poÅtu s lokÃlnou"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:80
 msgid "IMAP default port"
 msgstr "PredvolenÃ IMAP port"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP over SSL"
 msgstr "IMAP cez SSL"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:87
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imap/camel-imap-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:98
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Na ÄÃtanie a ukladanie poÅty na serveroch IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:118
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid "Password"
 msgstr "Heslo"
 
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:115
+#: ../camel/providers/imap/camel-imap-provider.c:109
+#: ../camel/providers/imapx/camel-imapx-provider.c:120
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "TÃto voÄba vÃs pripojÃ k serveru IMAP pomocou hesla prenÃÅanÃho ako ÄistÃ "
 "text."
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:224
-#: ../camel/providers/imap/camel-imap-store.c:2601
-#: ../camel/providers/imapx/camel-imapx-store.c:340
-#: ../camel/providers/imapx/camel-imapx-store.c:796
-#: ../camel/providers/local/camel-maildir-folder.c:464
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:711
-#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/imap/camel-imap-store.c:272
+#: ../camel/providers/imap/camel-imap-store.c:2694
+#: ../camel/providers/imapx/camel-imapx-store.c:373
+#: ../camel/providers/imapx/camel-imapx-store.c:844
+#: ../camel/providers/local/camel-maildir-folder.c:471
+#: ../camel/providers/local/camel-maildir-store.c:301
+#: ../camel/providers/local/camel-maildir-store.c:675
+#: ../camel/providers/local/camel-maildir-store.c:681
+#: ../camel/providers/local/camel-maildir-store.c:765
+#: ../camel/providers/local/camel-spool-store.c:387
 msgid "Inbox"
 msgstr "DoruÄenÃ poÅta"
 
-#: ../camel/providers/imap/camel-imap-store.c:356
-#: ../camel/providers/imap/camel-imap-store.c:383
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:3042
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#: ../camel/providers/imapx/camel-imapx-server.c:2818
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Zlyhalo pripojenie k serveru IMAP %s v zabezpeÄenom reÅime: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:357
-#: ../camel/providers/imapx/camel-imapx-server.c:3043
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:2819
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 msgid "STARTTLS not supported"
 msgstr "STARTTLS nie je podporovanÃ"
 
-#: ../camel/providers/imap/camel-imap-store.c:376
-#: ../camel/providers/imapx/camel-imapx-server.c:3081
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imapx/camel-imapx-server.c:2858
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Zlyhalo pripojenie k serveru IMAP %s v zabezpeÄenom reÅime: "
 
-#: ../camel/providers/imap/camel-imap-store.c:384
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-msgid "SSL is not available in this build"
-msgstr "SSL nie je dostupnÃ v tomto zostavenÃ"
-
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:3176
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "PoÅadovanÃ spÃsob overenia %2$s nie je podporovanÃ serverom IMAP %1$s"
-
-#: ../camel/providers/imap/camel-imap-store.c:720
-#: ../camel/providers/imapx/camel-imapx-server.c:3189
-#: ../camel/providers/smtp/camel-smtp-transport.c:350
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "Overenie typu %s nie je podporovanÃ"
-
-#: ../camel/providers/imap/camel-imap-store.c:731
-#: ../camel/providers/smtp/camel-smtp-transport.c:363
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "Chyba pri vytvÃranÃ overovacieho objektu SASL."
-
-#: ../camel/providers/imap/camel-imap-store.c:779
-#: ../camel/providers/imapx/camel-imapx-server.c:3234
-#, c-format
-msgid "You did not enter a password."
-msgstr "Nezadali ste heslo."
-
-#: ../camel/providers/imap/camel-imap-store.c:820
-#: ../camel/providers/imapx/camel-imapx-server.c:3279
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imapx/camel-imapx-server.c:2925
 #, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Nepodarilo sa overiÅ totoÅnosÅ na serveri IMAP.\n"
-"%s\n"
-"\n"
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP server %s nepodporuje overenie totoÅnosti %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:878
-#: ../camel/providers/imapx/camel-imapx-store.c:144
+#: ../camel/providers/imap/camel-imap-store.c:809
+#: ../camel/providers/imapx/camel-imapx-store.c:155
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:881
-#: ../camel/providers/imapx/camel-imapx-store.c:147
+#: ../camel/providers/imap/camel-imap-store.c:812
+#: ../camel/providers/imapx/camel-imapx-store.c:158
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "SluÅba IMAP pre %s na %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1972
-#: ../camel/providers/imap/camel-imap-store.c:2176
-#: ../camel/providers/imapx/camel-imapx-store.c:315
+#: ../camel/providers/imap/camel-imap-store.c:1111
+#: ../camel/providers/imapx/camel-imapx-server.c:2955
+#: ../camel/providers/nntp/camel-nntp-store.c:505
+msgid "Cannot authenticate without a username"
+msgstr "NedÃ sa overiÅ totoÅnosÅ bez pouÅÃvateÄskÃho mena"
+
+#: ../camel/providers/imap/camel-imap-store.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:2964
+#: ../camel/providers/nntp/camel-nntp-store.c:514
+#: ../camel/providers/pop3/camel-pop3-store.c:491
+#: ../camel/providers/pop3/camel-pop3-store.c:511
+msgid "Authentication password not available"
+msgstr "Heslo overenia totoÅnosti nie je dostupnÃ"
+
+#: ../camel/providers/imap/camel-imap-store.c:2065
+#: ../camel/providers/imap/camel-imap-store.c:2269
+#: ../camel/providers/imapx/camel-imapx-store.c:348
 #, c-format
 msgid "No such folder %s"
 msgstr "PrieÄinok %s neexistuje"
 
-#: ../camel/providers/imap/camel-imap-store.c:1986
-#: ../camel/providers/imap/camel-imap-store.c:2445
-#: ../camel/providers/imapx/camel-imapx-store.c:1327
+#: ../camel/providers/imap/camel-imap-store.c:2079
+#: ../camel/providers/imap/camel-imap-store.c:2538
+#: ../camel/providers/imapx/camel-imapx-store.c:1388
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "NÃzov prieÄinka â%sâ nie je platnÃ, pretoÅe obsahuje znak â%câ"
 
-#: ../camel/providers/imap/camel-imap-store.c:2050
-#: ../camel/providers/imap/camel-imap-store.c:2509
-#: ../camel/providers/imapx/camel-imapx-store.c:1348
+#: ../camel/providers/imap/camel-imap-store.c:2143
+#: ../camel/providers/imap/camel-imap-store.c:2602
+#: ../camel/providers/imapx/camel-imapx-store.c:1409
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "RodiÄovskÃ prieÄinok nesmie obsahovaÅ podprieÄinky"
 
-#: ../camel/providers/imap/camel-imap-store.c:2103
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:424
-#: ../camel/providers/local/camel-mh-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:2196
+#: ../camel/providers/local/camel-maildir-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:421
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "NedÃ sa vytvoriÅ prieÄinok â%sâ: prieÄinok existuje."
 
-#: ../camel/providers/imap/camel-imap-store.c:2458
-#: ../camel/providers/imapx/camel-imapx-store.c:1338
+#: ../camel/providers/imap/camel-imap-store.c:2551
+#: ../camel/providers/imapx/camel-imapx-store.c:1399
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "NeznÃmy rodiÄovskÃ prieÄinok: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3235
+#: ../camel/providers/imap/camel-imap-store.c:3326
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Server sa neoÄakÃvane odpojil"
 
-#: ../camel/providers/imap/camel-imap-store.c:3238
+#: ../camel/providers/imap/camel-imap-store.c:3329
 msgid "Server unexpectedly disconnected: "
 msgstr "Server sa neoÄakÃvane odpojil: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:91
+#: ../camel/providers/imapx/camel-imapx-folder.c:101
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Nepodarilo sa vytvoriÅ sÃhrn o prieÄinku pre %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:99
+#: ../camel/providers/imapx/camel-imapx-folder.c:109
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Nepodarilo sa vytvoriÅ vyrovnÃvaciu pamÃÅ pre %s: "
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "Use _Quick Resync if the server supports it"
-msgstr ""
+msgstr "PouÅiÅ _rÃchlu synchronizÃciu, ak ju server podporuje"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use I_dle if the server supports it"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
+msgstr "_PoÄÃvaÅ na upozornenia servera o zmenÃch"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
@@ -3377,42 +3416,128 @@ msgstr "PrÃkaz:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Numbe_r of cached connections to use"
-msgstr ""
+msgstr "PoÄet odloÅenÃch _spojenÃ k pouÅitiu"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "MennÃ priestor:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "Default IMAP port"
 msgstr "PredvolenÃ IMAP port"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:94
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1504
-#, fuzzy
+#: ../camel/providers/imapx/camel-imapx-server.c:817
+msgid "Server disconnected"
+msgstr "Server sa odpojil"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1203
 msgid "Error writing to cache stream: "
-msgstr "Chyba pri zÃpise do doÄasnej schrÃnky: %s"
+msgstr "Chyba pri zÃpise do vyrovnÃvacieho streamu: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2214
+#: ../camel/providers/imapx/camel-imapx-server.c:1930
 #, c-format
 msgid "Not authenticated"
 msgstr "NeoverenÃ totoÅnosÅ"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3452
-#, fuzzy
+# MÄ: IDLE - stav na IMAP prieÄinku, keÄ sa oÄakÃvajÃ sprÃvy od servera
+#: ../camel/providers/imapx/camel-imapx-server.c:1995
+msgid "Error performing IDLE"
+msgstr "Chyba poÄas IDLE"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3150
+msgid "Error fetching message"
+msgstr "Chyba pri zÃskavanÃ sprÃvy"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3218
 msgid "Closing tmp stream failed: "
-msgstr "OperÃcia zlyhala: %s"
+msgstr "ZatvÃranie doÄasnÃho streamu zlyhalo: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3317
+msgid "Error copying messages"
+msgstr "Chyba pri kopÃrovanÃ sprÃv"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3447
+msgid "Error appending message"
+msgstr "Chyba pri pridÃvanÃ sprÃvy"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3627
+msgid "Error fetching message headers"
+msgstr "Chyba pri zÃskavanÃ hlaviÄiek sprÃvy"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3768
+msgid "Error retrieving message"
+msgstr "Chyba pri vyberanÃ sprÃvy"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3971
+msgid "Error fetching new messages"
+msgstr "Chyba pri zÃskavanÃ novÃch sprÃv"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4161
+msgid "Error while fetching messages"
+msgstr "Chyba poÄas zÃskavania sprÃv"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4169
+#: ../camel/providers/imapx/camel-imapx-server.c:4199
+#, c-format
+msgid "Fetching summary information for %d message in %s"
+msgid_plural "Fetching summary information for %d messages in %s"
+msgstr[0] "ZÃskavajÃ sa sÃhrnnÃ informÃcie pre %d novÃch sprÃv v %s"
+msgstr[1] "ZÃskavajÃ sa sÃhrnnÃ informÃcie pre %d novÃ sprÃvu v %s"
+msgstr[2] "ZÃskavajÃ sa sÃhrnnÃ informÃcie pre %d novÃ sprÃvy v %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4321
+#: ../camel/providers/imapx/camel-imapx-server.c:4355
+msgid "Error refreshing folder"
+msgstr "Chyba poÄas obnovovania prieÄinka"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4444
+msgid "Error expunging message"
+msgstr "Chyba pri ÅkrtanÃ sprÃv"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4528
+msgid "Error fetching folders"
+msgstr "Chyba pri zÃskavanÃ prieÄinka"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4602
+msgid "Error subscribing to folder"
+msgstr "Chyba pri prihlasovanÃ sa k odberu prieÄinka"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4655
+msgid "Error creating folder"
+msgstr "Chyba pri vytvÃranÃ prieÄinka"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5490
-#: ../camel/providers/imapx/camel-imapx-server.c:5505
+#: ../camel/providers/imapx/camel-imapx-server.c:4700
+msgid "Error deleting folder"
+msgstr "Chyba pri ruÅenÃ prieÄinka"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4750
+msgid "Error renaming folder"
+msgstr "Chyba pri premenovÃvanÃ prieÄinka"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4801
+msgid "Error performing NOOP"
+msgstr "Chyba poÄas NOOP"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4896
+msgid "Error syncing changes"
+msgstr "Chyba pri synchronizÃcii zmien"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5652
+#: ../camel/providers/imapx/camel-imapx-server.c:5667
 msgid "Cannot create spool file: "
 msgstr "NedÃ sa vytvoriÅ zoraÄovacÃ sÃbor: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1115
-#: ../camel/providers/nntp/camel-nntp-store.c:1713
+#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "ZÃskava sa zoznam prieÄinkov pre %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1176
+#: ../camel/providers/nntp/camel-nntp-store.c:1790
 #, c-format
 msgid "No such folder: %s"
 msgstr "PrieÄinok neexistuje: %s"
@@ -3420,34 +3545,34 @@ msgstr "PrieÄinok neexistuje: %s"
 #: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
 msgid "Source stream returned no data"
-msgstr ""
+msgstr "ZdrojovÃ stream nevrÃtil Åiadne Ãdaje"
 
 #: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
 msgid "Source stream unavailable"
 msgstr "ZdrojovÃ stream nie je dostupnÃ"
 
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:191
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:188
-#: ../camel/providers/local/camel-local-folder.c:197
+#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "poÅtovÃ schrÃnka: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:219
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:473
-msgid "Index message body data"
-msgstr "IndexovaÅ Ãdaje v tele sprÃvy"
+#: ../camel/providers/local/camel-local-folder.c:483
+msgid "_Index message body data"
+msgstr "_IndexovaÅ Ãdaje v tele sprÃvy"
 
-#: ../camel/providers/local/camel-local-folder.c:704
+#: ../camel/providers/local/camel-local-folder.c:712
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3470,20 +3595,19 @@ msgstr "Na ukladanie lokÃlnej poÅty v poÅtovÃch prieÄinkoch typu MH."
 
 #: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
-msgstr "LokÃlne doruÄenie"
+msgstr "LokÃlne doruÄovanie"
 
 #: ../camel/providers/local/camel-local-provider.c:71
-#, fuzzy
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
-"Pre zÃskanie (presun) lokÃlnej poÅty zo Åtandardnej fronty vo formÃte mbox "
-"do prieÄinkov spravovanÃch Evolution."
+"Na zÃskanie (presun) lokÃlnej poÅty zo Åtandardnej fronty vo formÃte mbox "
+"do prieÄinkov spravovanÃch programom Evolution."
 
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:107
-msgid "_Apply filters to new messages in INBOX"
+msgid "_Apply filters to new messages in Inbox"
 msgstr "_AplikovaÅ filtre na novÃ sprÃvy v DoruÄenej poÅte"
 
 #: ../camel/providers/local/camel-local-provider.c:93
@@ -3492,7 +3616,7 @@ msgstr "PoÅtovÃ prieÄinky vo formÃte maildir"
 
 #: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
-msgstr "Pre ukladanie lokÃlnej poÅty v prieÄinkov vo formÃte maildir."
+msgstr "Na ukladanie lokÃlnej poÅty v prieÄinkov vo formÃte maildir."
 
 #: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
@@ -3513,229 +3637,228 @@ msgstr ""
 "prieÄinkov v ÅtÃle Elm, Pine alebo Mutt."
 
 #: ../camel/providers/local/camel-local-provider.c:127
-#, fuzzy
 msgid "Standard Unix mbox spool directory"
-msgstr "ÅtandardnÃ UnixovÃ sÃbor mbox alebo prieÄinok"
+msgstr "AdresÃr ÅtandardnÃho unixovÃho sÃboru mbox"
 
-#: ../camel/providers/local/camel-local-store.c:92
+#: ../camel/providers/local/camel-local-store.c:98
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nepodarilo sa premenovaÅ prieÄinok %s na %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "LokÃlny poÅtovÃ sÃbor %s"
 
-#: ../camel/providers/local/camel-local-store.c:235
-#: ../camel/providers/local/camel-local-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:542
-#: ../camel/providers/local/camel-spool-store.c:574
+#: ../camel/providers/local/camel-local-store.c:218
+#: ../camel/providers/local/camel-local-store.c:375
+#: ../camel/providers/local/camel-maildir-store.c:101
+#: ../camel/providers/local/camel-mbox-store.c:555
+#: ../camel/providers/local/camel-spool-store.c:86
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "KoreÅ ukladania %s nie je absolÃtna cesta"
 
-#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:227
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "KoreÅ ukladania %s nie je normÃlny prieÄinok"
 
-#: ../camel/providers/local/camel-local-store.c:255
-#: ../camel/providers/local/camel-local-store.c:265
-#: ../camel/providers/local/camel-local-store.c:390
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../camel/providers/local/camel-local-store.c:239
+#: ../camel/providers/local/camel-local-store.c:249
+#: ../camel/providers/local/camel-local-store.c:388
+#: ../camel/providers/local/camel-maildir-store.c:134
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "NedÃ sa zÃskaÅ prieÄinok: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:286
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "LokÃlne ukladanie nemÃ prieÄinok pre novÃ poÅtu"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:716
+#: ../camel/providers/local/camel-local-store.c:445
+#: ../camel/providers/local/camel-mbox-store.c:722
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Nepodarilo sa odstrÃniÅ indexovÃ sÃbor prieÄinka â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:463
-#: ../camel/providers/local/camel-mbox-store.c:746
+#: ../camel/providers/local/camel-local-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:752
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Nepodarilo sa odstrÃniÅ meta sÃbor prieÄinka â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:549
+#: ../camel/providers/local/camel-local-store.c:581
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nepodarilo sa premenovaÅ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:569
+#: ../camel/providers/local/camel-local-summary.c:527
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nepodarilo sa pridaÅ sprÃvu do sÃhrnu: neznÃmy dÃvod"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-maildir-folder.c:336
 #: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
 msgid "No such message"
 msgstr "SprÃva neexistuje"
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:226
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "NedÃ sa pridaÅ sprÃva do maildir prieÄinka: %s:"
 
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:172
+#: ../camel/providers/local/camel-mh-folder.c:182
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "NedÃ sa zÃskaÅ sprÃva %s z prieÄinka %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:351
+#: ../camel/providers/local/camel-maildir-folder.c:354
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Do cieÄovÃho prieÄinka sa nedÃ presunÃÅ sprÃva: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:100
+#: ../camel/providers/local/camel-maildir-store.c:109
 #, c-format
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgid "Cannot create folder: %s: Folder name cannot contain a dot"
 msgstr "NedÃ sa vytvoriÅ prieÄinok: %s: NÃzov prieÄinka nemÃÅe obsahovaÅ bodku"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:728
+#: ../camel/providers/local/camel-maildir-store.c:119
+#: ../camel/providers/local/camel-maildir-store.c:782
 #, c-format
 msgid "Folder %s already exists"
 msgstr "PrieÄinok %s uÅ existuje"
 
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:392
-#: ../camel/providers/local/camel-mbox-store.c:406
+#: ../camel/providers/local/camel-maildir-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:403
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "NedÃ sa vytvoriÅ prieÄinok â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:358
-#: ../camel/providers/local/camel-mh-store.c:505
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:516
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "NedÃ sa zÃskaÅ prieÄinok â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:368
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "NedÃ sa zÃskaÅ prieÄinok â%sâ: prieÄinok neexistuje."
 
-#: ../camel/providers/local/camel-maildir-store.c:239
+#: ../camel/providers/local/camel-maildir-store.c:263
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "NedÃ sa sa zÃskaÅ prieÄinok â%sâ: nie je adresÃr maildir."
 
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:652
+#: ../camel/providers/local/camel-maildir-store.c:329
+#: ../camel/providers/local/camel-maildir-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:670
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Nepodarilo sa odstrÃniÅ prieÄinok â%sâ: %s"
 
-# PK: asi ide o chybovu spravu alebo filter
-#: ../camel/providers/local/camel-maildir-store.c:295
+#: ../camel/providers/local/camel-maildir-store.c:331
 msgid "not a maildir directory"
 msgstr "nie je prieÄinok maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:510
-#: ../camel/providers/local/camel-maildir-store.c:885
-#: ../camel/providers/local/camel-spool-store.c:161
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:569
+#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:228
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Nepodarilo sa prehÄadaÅ prieÄinok â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:719
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-store.c:773
+#, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr "NedÃ sa vytvoriÅ prieÄinok: %s: prieÄinok existuje"
+msgstr ""
+"NedÃ sa premenovaÅ prieÄinok: %s: NÃzov prieÄinka nemÃÅe obsahovaÅ bodku"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:571
+#: ../camel/providers/local/camel-maildir-summary.c:416
+#: ../camel/providers/local/camel-maildir-summary.c:549
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "NedÃ sa otvoriÅ cesta poÅtovej schrÃnky: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:562
+#: ../camel/providers/local/camel-maildir-summary.c:540
 msgid "Checking folder consistency"
 msgstr "Kontroluje sa konzistencia prieÄinka"
 
-#: ../camel/providers/local/camel-maildir-summary.c:655
+#: ../camel/providers/local/camel-maildir-summary.c:633
 msgid "Checking for new messages"
 msgstr "Kontroluje sa na novÃ sprÃvy"
 
-#: ../camel/providers/local/camel-maildir-summary.c:748
-#: ../camel/providers/local/camel-mbox-summary.c:485
-#: ../camel/providers/local/camel-mbox-summary.c:717
-#: ../camel/providers/local/camel-mbox-summary.c:863
-#: ../camel/providers/local/camel-spool-summary.c:131
+#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:418
+#: ../camel/providers/local/camel-mbox-summary.c:649
+#: ../camel/providers/local/camel-mbox-summary.c:793
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "UkladÃ sa prieÄinok"
 
-#: ../camel/providers/local/camel-mbox-folder.c:183
+#: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "NedÃ sa otvoriÅ poÅtovÃ schrÃnka: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:249
+#: ../camel/providers/local/camel-mbox-folder.c:253
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "NedÃ sa pridaÅ sprÃva do sÃboru mbox: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "PrieÄinok vyzerÃ ako neopraviteÄne poÅkodenÃ."
 
-#: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:71
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "NedÃ sa zÃskaÅ zÃmok na prieÄinok %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:380
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:563
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "NedÃ sa vytvoriÅ prieÄinok s tÃmto nÃzvom."
 
-#: ../camel/providers/local/camel-mbox-store.c:417
+#: ../camel/providers/local/camel-mbox-store.c:414
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "NedÃ sa zÃskaÅ prieÄinok â%sâ: nie je to normÃlny sÃbor."
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "NedÃ sa vytvoriÅ prieÄinok â%sâ: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:582
+#: ../camel/providers/local/camel-mbox-store.c:591
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "NedÃ sa vytvoriÅ prieÄinok: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:584
+#: ../camel/providers/local/camel-mbox-store.c:593
 msgid "Folder already exists"
 msgstr "PrieÄinok uÅ existuje"
 
-#: ../camel/providers/local/camel-mbox-store.c:627
-#: ../camel/providers/local/camel-mbox-store.c:640
-#: ../camel/providers/local/camel-mbox-store.c:669
+#: ../camel/providers/local/camel-mbox-store.c:633
+#: ../camel/providers/local/camel-mbox-store.c:646
+#: ../camel/providers/local/camel-mbox-store.c:675
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3744,90 +3867,90 @@ msgstr ""
 "Nepodarilo sa odstrÃniÅ prieÄinok â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:656
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "â%sâ nie je normÃlny sÃbor."
 
-#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:665
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "PrieÄinok â%sâ nie je prÃzdny. NeodstrÃnenÃ."
 
-#: ../camel/providers/local/camel-mbox-store.c:686
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../camel/providers/local/camel-mbox-store.c:707
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Nepodarilo sa odstrÃniÅ sÃbor sÃhrnu o prieÄinku â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:783
+#: ../camel/providers/local/camel-mbox-store.c:789
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "NÃzov novÃho prieÄinka nie je povolenÃ."
 
-#: ../camel/providers/local/camel-mbox-store.c:799
+#: ../camel/providers/local/camel-mbox-store.c:805
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Nepodarilo sa premenovaÅ â%sâ: â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:882
+#: ../camel/providers/local/camel-mbox-store.c:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nepodarilo sa premenovaÅ â%sâ na %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:495
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nepodarilo sa otvoriÅ prieÄinok %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:556
+#: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr ""
 "KritickÃ chyba syntaktickej analÃzy sprÃvy blÃzko pozÃcie %s v prieÄinku %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:645
+#: ../camel/providers/local/camel-mbox-summary.c:574
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "NedÃ sa skontrolovaÅ prieÄinok: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:730
-#: ../camel/providers/local/camel-mbox-summary.c:872
-#: ../camel/providers/local/camel-spool-summary.c:138
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:802
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nepodarilo sa otvoriÅ sÃbor %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:744
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "NedÃ sa otvoriÅ doÄasnÃ poÅtovÃ schrÃnka: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
-#: ../camel/providers/local/camel-mbox-summary.c:988
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:918
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nepodarilo sa zatvoriÅ zdrojovÃ prieÄinok: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:772
+#: ../camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Nepodarilo sa zatvoriÅ doÄasnÃ prieÄinok: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:789
+#: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nepodarilo sa premenovaÅ prieÄinok: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1153
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nepodarilo sa uloÅiÅ prieÄinok: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:925
-#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../camel/providers/local/camel-mbox-summary.c:855
+#: ../camel/providers/local/camel-mbox-summary.c:1115
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3836,40 +3959,40 @@ msgstr ""
 "MBOX sÃbor je poÅkodenÃ, prosÃm, opravte ho. (OÄakÃvanÃ riadok Od, ale nebol "
 "zÃskanÃ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:934
-#: ../camel/providers/local/camel-mbox-summary.c:1193
+#: ../camel/providers/local/camel-mbox-summary.c:864
+#: ../camel/providers/local/camel-mbox-summary.c:1124
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "SÃhrn a prieÄinok si neodpovedajÃ ani po synchronizÃcii"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1099
-#: ../camel/providers/local/camel-spool-summary.c:343
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:345
 #, c-format
 msgid "Unknown error: %s"
 msgstr "NeznÃma chyba: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1263
-#: ../camel/providers/local/camel-mbox-summary.c:1293
+#: ../camel/providers/local/camel-mbox-summary.c:1182
+#: ../camel/providers/local/camel-mbox-summary.c:1212
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Zapisovanie do doÄasnej poÅtovej schrÃnky zlyhalo: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1282
+#: ../camel/providers/local/camel-mbox-summary.c:1201
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Zapisovanie do doÄasnej poÅtovej schrÃnky zlyhalo: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:115
+#: ../camel/providers/local/camel-mh-folder.c:119
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "NedÃ sa pridaÅ sprÃva do prieÄinka mh: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-mh-store.c:535
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Nepodarilo sa vytvoriÅ prieÄinok â%sâ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:542
+#: ../camel/providers/local/camel-mh-store.c:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "NedÃ sa zÃskaÅ prieÄinok â%sâ: nie je to adresÃr."
@@ -3879,22 +4002,36 @@ msgstr "NedÃ sa zÃskaÅ prieÄinok â%sâ: nie je to adresÃr."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "NedÃ sa otvoriÅ cesta adresÃra MH: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:350
+#: ../camel/providers/local/camel-spool-store.c:94
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "ZoraÄovacÃ prieÄinok â%sâ sa nedÃ otvoriÅ: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:108
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "ZoraÄovacÃ prieÄinok â%sâ nie je normÃlny sÃbor alebo adresÃr"
+
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid "Spool mail file %s"
 msgstr "LokÃlny zoraÄovacÃ sÃbor poÅty %s"
 
-#: ../camel/providers/local/camel-spool-store.c:353
+#: ../camel/providers/local/camel-spool-store.c:420
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Strom zoraÄovacÃch prieÄinov %s"
 
-#: ../camel/providers/local/camel-spool-store.c:394
+#: ../camel/providers/local/camel-spool-store.c:423
+msgid "Invalid spool"
+msgstr "NeplatnÃ zoraÄovacÃ prieÄinok"
+
+#: ../camel/providers/local/camel-spool-store.c:480
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "PrieÄinok â%s/%sâ neexistuje."
 
-#: ../camel/providers/local/camel-spool-store.c:408
+#: ../camel/providers/local/camel-spool-store.c:493
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3903,12 +4040,12 @@ msgstr ""
 "Nepodarilo sa otvoriÅ prieÄinok â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:414
+#: ../camel/providers/local/camel-spool-store.c:499
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "PrieÄinok â%sâ neexistuje."
 
-#: ../camel/providers/local/camel-spool-store.c:421
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3917,51 +4054,41 @@ msgstr ""
 "Nepodarilo sa vytvoriÅ prieÄinok â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:433
+#: ../camel/providers/local/camel-spool-store.c:520
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "â%sâ nie je sÃbor poÅtovej schrÃnky."
 
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../camel/providers/local/camel-spool-store.c:584
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ÃloÅisko nepodporuje INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:495
+#: ../camel/providers/local/camel-spool-store.c:603
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ZoraÄovacie prieÄinky sa nedajÃ odstrÃniÅ"
 
-#: ../camel/providers/local/camel-spool-store.c:510
+#: ../camel/providers/local/camel-spool-store.c:618
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ZoraÄovacie prieÄinky sa nedajÃ premenovaÅ"
 
-#: ../camel/providers/local/camel-spool-store.c:583
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "ZoraÄovacÃ prieÄinok â%sâ sa nedÃ otvoriÅ: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:599
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "ZoraÄovacÃ prieÄinok â%sâ nie je normÃlny sÃbor alebo adresÃr"
-
-#: ../camel/providers/local/camel-spool-summary.c:169
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:193
+#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:192
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Nepodarilo sa synchronizovaÅ doÄasnÃ prieÄinok %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:211
+#: ../camel/providers/local/camel-spool-summary.c:210
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Nepodarilo synchronizovaÅ zoraÄovacÃ prieÄinok %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:243
-#: ../camel/providers/local/camel-spool-summary.c:262
-#: ../camel/providers/local/camel-spool-summary.c:275
+#: ../camel/providers/local/camel-spool-summary.c:242
+#: ../camel/providers/local/camel-spool-summary.c:261
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -3970,78 +4097,81 @@ msgstr ""
 "Nepodarilo sa synchronizovaÅ zoraÄovacÃ prieÄinok %s: %s\n"
 "PrieÄinok je asi poÅkodenÃ, kÃpia uloÅenÃ do â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:213
-#: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/nntp/camel-nntp-folder.c:424
+#: ../camel/providers/nntp/camel-nntp-folder.c:290
+#: ../camel/providers/nntp/camel-nntp-folder.c:379
+#: ../camel/providers/nntp/camel-nntp-folder.c:501
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "VnÃtornÃ chyba: UID je v neplatnom formÃte: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:263
-#: ../camel/providers/nntp/camel-nntp-folder.c:267
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#: ../camel/providers/nntp/camel-nntp-folder.c:340
+#: ../camel/providers/nntp/camel-nntp-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:611
+#: ../camel/providers/pop3/camel-pop3-folder.c:995
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "NedÃ sa zÃskaÅ sprÃva %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:274
-#: ../camel/providers/nntp/camel-nntp-folder.c:449
-#: ../camel/providers/pop3/camel-pop3-folder.c:368
-#: ../camel/providers/pop3/camel-pop3-folder.c:420
-#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#: ../camel/providers/nntp/camel-nntp-folder.c:351
+#: ../camel/providers/nntp/camel-nntp-folder.c:526
+#: ../camel/providers/pop3/camel-pop3-folder.c:549
+#: ../camel/providers/pop3/camel-pop3-folder.c:601
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "NedÃ sa zÃskaÅ sprÃva %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
-#: ../camel/providers/nntp/camel-nntp-folder.c:514
-#: ../camel/providers/nntp/camel-nntp-folder.c:561
+#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#: ../camel/providers/nntp/camel-nntp-folder.c:591
+#: ../camel/providers/nntp/camel-nntp-folder.c:638
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Odosielanie zlyhalo: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:556
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 msgid "Posting failed: "
 msgstr "Odosielanie zlyhalo: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#: ../camel/providers/nntp/camel-nntp-folder.c:662
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "NemÃÅete odoslaÅ NNTP sprÃvy, keÄ pracujete v odpojenom reÅime!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:605
+#: ../camel/providers/nntp/camel-nntp-folder.c:682
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NemÃÅete kopÃrovaÅ sprÃvy z NNTP prieÄinka!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
+"_ZobraziÅ prieÄinky v skrÃtenom zÃpise (napr. c.o.linux skÃr ako comp.os."
+"linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
-msgstr ""
+msgstr "V _dialÃgu prihlasovania k odberu zobraziÅ relatÃvne nÃzvy prieÄinkov"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:52
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "Default NNTP port"
 msgstr "PredvolenÃ NNTP port"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "NNTP over SSL"
 msgstr "NNTP cez SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:59
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
 msgstr "DiskusnÃ skupiny USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
-#, fuzzy
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "Toto je prÃstup k ÄÃtaniu a posielaniu do DiskusnÃch skupÃn USENET."
+msgstr ""
+"Toto je poskytovateÄ prÃstupu k ÄÃtaniu a posielaniu sprÃv do diskusnÃch "
+"skupÃn USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../camel/providers/nntp/camel-nntp-provider.c:86
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4049,137 +4179,136 @@ msgstr ""
 "TÃto moÅnosÅ nastavÃ overenie totoÅnosti na server NNTP pomocou poslania "
 "hesla ako ÄistÃho textu."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:97
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
-msgid "Authentication requested but no username provided"
-msgstr ""
-"Overenie totoÅnosti je vyÅadovanÃ, ale nebolo poskytnutÃ Åiadne pouÅÃvateÄskÃ "
-"meno"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:109
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "NedÃ sa overiÅ totoÅnosÅ na serveri: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:357
-#, fuzzy, c-format
 msgid "Could not read greeting from %s: "
-msgstr "Nie je moÅnÃ preÄÃtaÅ privÃtanie z %s: %s"
+msgstr "Nie je moÅnÃ preÄÃtaÅ privÃtanie z %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Server NNTP %s vrÃtil chybovÃ kÃd %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:528
+#: ../camel/providers/nntp/camel-nntp-store.c:469
 #, c-format
 msgid "USENET News via %s"
 msgstr "DiskusnÃ skupiny USENET pomocou %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1060
-#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
 msgstr ""
-"Chyba pri ukladanÃ sprÃv do `%s':\n"
+"Chyba pri zÃskavanÃ diskusnÃch skupÃn:\n"
+"\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1153
+#: ../camel/providers/nntp/camel-nntp-store.c:1165
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
+"NemÃÅete vytvoriÅ prieÄinok v ÃloÅisku diskusnÃch skupÃn: poÅadovanÃ "
+"prihlÃsenie k odberu"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1169
-#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#, c-format
 msgid "You cannot rename a folder in a News store."
-msgstr "Nie je moÅnÃ premenovaÅ prieÄinok %s na %s: %s"
+msgstr "NemÃÅete premenovaÅ prieÄinok v ÃloÅisku diskusnÃch skupÃn."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
-#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Nie je moÅnÃ presunÃÅ prieÄinok do jednoho zo svojÃch podprieÄinkov."
+msgstr ""
+"NemÃÅete odstrÃniÅ prieÄinok v ÃloÅisku diskusnÃch skupÃn: poÅadovanÃ "
+"odhlÃsenie z odberu."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1338
+#: ../camel/providers/nntp/camel-nntp-store.c:1402
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
+"NemÃÅete sa prihlÃsiÅ k odberu tejto diskusnej skupiny:\n"
+"\n"
+"Neexistuje takÃ diskusnÃ skupina. VybranÃ poloÅka je pravdepodobne prieÄinok "
+"rodiÄa."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1389
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
+"NemÃÅete sa odhlÃsiÅ z odberu tejto diskusnej skupiny:\n"
+"\n"
+"diskusnÃ skupina neexistuje!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1582
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 msgid "NNTP Command failed: "
 msgstr "PrÃkaz NNTP zlyhal: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1656
+#: ../camel/providers/nntp/camel-nntp-store.c:1732
 #, c-format
 msgid "Not connected."
 msgstr "NepripojenÃ."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:240
-#: ../camel/providers/nntp/camel-nntp-summary.c:358
+#: ../camel/providers/nntp/camel-nntp-summary.c:195
+#: ../camel/providers/nntp/camel-nntp-summary.c:322
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: PrehÄadÃvajÃ sa novÃ sprÃvy"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:256
-#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
+#, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "NeoÄakÃvanÃ odpoveÄ od IMAP serveru: %s"
+msgstr "NeoÄakÃvanÃ odpoveÄ servera z prÃkazu xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:374
-#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#, c-format
 msgid "Unexpected server response from head: %s"
-msgstr "NeoÄakÃvanÃ odpoveÄ od GnuPG: %s"
+msgstr "NeoÄakÃvanÃ odpoveÄ servera z prÃkazu head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:419
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
 msgstr "OperÃcia zlyhala: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:285
-#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:517
 #, c-format
 msgid "No message with UID %s"
 msgstr "Åiadna sprÃva s UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:352
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ZÃskava sa POP sprÃva %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:432
+#: ../camel/providers/pop3/camel-pop3-folder.c:612
 msgid "Unknown reason"
 msgstr "NeznÃmy dÃvod"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:472
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
 msgid "Retrieving POP summary"
 msgstr "ZÃskava sa POP sÃhrn"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:487
+#: ../camel/providers/pop3/camel-pop3-folder.c:711
 msgid "Cannot get POP summary: "
 msgstr "NedÃ sa zÃskaÅ POP sÃhrn: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:557
+#: ../camel/providers/pop3/camel-pop3-folder.c:823
 msgid "Expunging old messages"
 msgstr "Äistia sa starÃ sprÃvy"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:569
+#: ../camel/providers/pop3/camel-pop3-folder.c:843
 msgid "Expunging deleted messages"
 msgstr "Äistia sa odstrÃnenÃ sprÃvy"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-#| msgid "Message storage"
 msgid "Message Storage"
 msgstr "ÃloÅisko sprÃv"
 
@@ -4195,7 +4324,7 @@ msgstr "O_dstrÃniÅ po %s dÅoch"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Delete _expunged from local Inbox"
-msgstr ""
+msgstr "OdstrÃniÅ _vyÅkrtnutÃ z miestnej doruÄenej poÅty"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
@@ -4217,7 +4346,7 @@ msgstr "POP"
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Na pripojenie a stiahnutie poÅty zo serverov POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4225,7 +4354,7 @@ msgstr ""
 "TÃto voÄba vÃs pripojÃ k serveru POP pomocou hesla prenesenÃho ako ÄistÃ "
 "text. To je Äasto jedinÃ moÅnosÅ, ktorÃ POP servery podporujÃ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:94
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4240,70 +4369,61 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:130
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Nepodarilo sa prihlÃsiÅ na POP server %s: %s"
+msgstr "Nepodarilo sa preÄÃtaÅ sprÃvne privÃtanie z POP servera %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:150
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:153
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Nepodarilo sa pripojiÅ k POP serveru %s v zabezpeÄenom reÅime:%s"
+msgstr "Zlyhalo pripojenie k POP serveru %s v zabezpeÄenom reÅime:%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:151
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 msgid "STLS not supported by server"
 msgstr "STLS nie je podporovanÃ serverom"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:172
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Zlyhalo pripojenie k POP serveru %s v zabezpeÄenom reÅime%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:185
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Zlyhalo pripojenie k POP serveru %s v zabezpeÄenom reÅime: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:190
-msgid "TLS is not available in this build"
-msgstr "TLS nie je dostupnÃ v tomto zostavenÃ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:414
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"Nepodarilo sa pripojiÅ k POP serveru %s. PoÅadovanÃ spÃsob overenia "
-"totoÅnosti nie je podporovanÃ."
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:269
-#, c-format
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "SASL '%s' prihlÃsenie zlyhalo pre POP server %s%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:286
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "NedÃ sa prihlÃsiÅ na POP server %s: chyba protokolu SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:310
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Zlyhalo overenie totoÅnosti na POP serveri %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:380
+#: ../camel/providers/pop3/camel-pop3-store.c:359
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 server %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:362
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "POP3 server pre %s na %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:525
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
+"NemoÅno sa pripojiÅ k POP serveru %s:\tPrijatÃ neplatnÃ identifikÃtor APOP. "
+"Podozrenie z Ãtoku falÅovanÃm osoby. ProsÃm, kontaktujte svojho sprÃvcu."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:427
+#: ../camel/providers/pop3/camel-pop3-store.c:577
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4312,8 +4432,9 @@ msgstr ""
 "Nepodarilo sa pripojiÅ k POP serveru %s.\n"
 "Chyba pri posielanÃ hesla: "
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:437
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:592
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4322,40 +4443,20 @@ msgstr ""
 "Nepodarilo sa pripojiÅ k POP serveru %s.\n"
 "Chyba pri posielanÃ pouÅÃvateÄskÃho mena%s"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password%s"
-msgstr ""
-"Nepodarilo sa pripojiÅ k POP serveru %s.\n"
-"Chyba pri posielanÃ hesla%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
-msgid "POP3 server %s"
-msgstr "POP3 server %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#, c-format
-msgid "POP3 server for %s on %s"
-msgstr "POP3 server pre %s na %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:650
 #, c-format
 msgid "Could not connect to POP server %s"
-msgstr "Nepodarilo sa spojiÅ s POP serverom %s"
+msgstr "Nepodarilo sa prpojiÅ k POP serveru %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:653
+#: ../camel/providers/pop3/camel-pop3-store.c:678
 #, c-format
 msgid "No such folder '%s'."
 msgstr "PrieÄinok â%sâ neexistuje."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:695
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
-msgstr ""
+msgstr "POP3 ÃloÅiskÃ nemajÃ hierarchiu prieÄinkov"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
@@ -4390,21 +4491,21 @@ msgstr "Nepodarilo sa vytvoriÅ zreÅazenie do sendmailu: %s: poÅta neodoslanÃ
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nepodarilo sa vetviÅ sendmail: %s: poÅta neodoslanÃ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
 msgid "Could not send message: "
 msgstr "Nepodarilo sa odoslaÅ sprÃvu: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail skonÄil so signÃlom %s: poÅta neodoslanÃ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nepodarilo sa spustiÅ %s: poÅta neodoslanÃ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail skonÄil so stavom %d: poÅta neodoslanÃ."
@@ -4417,245 +4518,237 @@ msgstr "PredvolenÃ SMTP port"
 msgid "SMTP over SSL"
 msgstr "SMTP cez SSL"
 
+# PK: malo  by to byt ok podla RFC
 #: ../camel/providers/smtp/camel-smtp-provider.c:44
 msgid "Message submission port"
-msgstr ""
+msgstr "Port podania sprÃvy"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:52
-#, fuzzy
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Pre doruÄenie poÅty spojenÃm sa so vzdialenÃm serverom pomocou SMTP.\n"
+msgstr "Na doruÄenie poÅty spojenÃm sa so vzdialenÃm serverom pomocou SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
-#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Welcome response error: "
-msgstr "Chyba odpovede na privÃtanie"
+msgstr "Chyba odpovede na privÃtanie: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Nepodarilo sa pripojiÅ k serveru SMTP %s v zabezpeÄenom reÅime: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS prÃkaz zlyhal:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Zlyhalo pripojenie k serveru SMTP %s v zabezpeÄenom reÅime: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:283
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "DoruÄenie poÅty SMTP pomocou %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "PoÅadovanÃ spÃsob overenia %s nie je podporovanÃ SMTP serverom %s."
+msgid "SMTP server %s does not support %s authentication"
+msgstr "SMTP server %s nepodporuje spÃsob overenia totoÅnosti %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:440
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Nepodarilo sa overiÅ totoÅnosÅ na serveri SMTP.\n"
-"%s\n"
-"\n"
+msgid "No SASL mechanism was specified"
+msgstr "Nebol urÄenÃ Åiadny SASL mechanizmus"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:459
+msgid "SMTP Authentication"
+msgstr "Overenie totoÅnosti SMTP"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:478
+#: ../camel/providers/smtp/camel-smtp-transport.c:489
+#: ../camel/providers/smtp/camel-smtp-transport.c:502
+msgid "AUTH command failed: "
+msgstr "PrÃkaz AUTH zlyhal: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:557
+#: ../camel/providers/smtp/camel-smtp-transport.c:643
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "SprÃva sa nedÃ odoslaÅ: sluÅba nie je pripojenÃ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:564
+#: ../camel/providers/smtp/camel-smtp-transport.c:650
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "SprÃva sa nedÃ odoslaÅ: adresa odosielateÄa nie je platnÃ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 msgid "Sending message"
 msgstr "Odosiela sa sprÃva"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:593
+#: ../camel/providers/smtp/camel-smtp-transport.c:679
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "SprÃva sa nedÃ odoslaÅ: adresÃti nie sÃ definovanÃ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "SprÃva sa nedÃ odoslaÅ: adresÃti nie sÃ platnÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:709
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
 msgid "Syntax error, command unrecognized"
 msgstr "SyntaktickÃ chyba, prÃkaz neznÃmy"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:711
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Syntax error in parameters or arguments"
 msgstr "SyntaktickÃ chyba v parametroch alebo argumentoch"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
 msgid "Command not implemented"
 msgstr "PrÃkaz neimplementovanÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:715
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
 msgid "Command parameter not implemented"
 msgstr "Parameter prÃkazu neimplementovanÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
 msgid "System status, or system help reply"
 msgstr "Stav systÃmu alebo odpoveÄ pomocnÃka"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Help message"
 msgstr "SprÃva pomocnÃka"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Service ready"
 msgstr "SluÅba pripravenÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Service closing transmission channel"
 msgstr "SluÅba zatvÃra prenosovÃ kanÃl"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Service not available, closing transmission channel"
-msgstr "SluÅba nie je k dispozÃcii, zatvÃram prenosovÃ kanÃl"
+msgstr "SluÅba nie je k dispozÃcii, zatvÃra sa prenosovÃ kanÃl"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Requested mail action okay, completed"
 msgstr "PoÅadovanÃ poÅtovÃ akcia v poriadku, dokonÄenÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "User not local; will forward to <forward-path>"
 msgstr "PouÅÃvateÄ nie je lokÃlny, bude predanÃ podÄa <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "PoÅadovanÃ poÅtovÃ akcia nevykonanÃ: poÅtovÃ schrÃnka nie je k dispozÃcii"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "PoÅadovanÃ akcia nevykonanÃ: poÅtovÃ schrÃnka nie je k dispozÃcii"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Requested action aborted: error in processing"
 msgstr "PoÅadovanÃ akcia zruÅenÃ: chyba pri spracovanÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "User not local; please try <forward-path>"
 msgstr "PouÅÃvateÄ nie je lokÃlny; skÃste <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Requested action not taken: insufficient system storage"
 msgstr "PoÅadovanÃ akcia nevykonanÃ: nedostatok miesta v systÃme"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "PoÅadovanÃ poÅtovÃ akcia preruÅenÃ: presiahnutÃ vyhradenÃ miesto pre ÃloÅisko"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "PoÅadovanÃ akcia nevykonanÃ: nepovolenÃ nÃzov poÅtovej schrÃnky"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "SpustiÅ vstup poÅty: konÄÃ <CRLF>.<CRLF>"
+msgstr "ZaÄiatok vstupu poÅty; koniec pomocou <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "Transaction failed"
 msgstr "Transakcia zlyhala"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "A password transition is needed"
 msgstr "VyÅadovanÃ je prenos hesla"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizmus overenia je prÃliÅ slabÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Encryption required for requested authentication mechanism"
-msgstr "PoÅadovanÃ Åifrovanie pre poÅadovanÃ spÃsob overenia"
+msgstr "Pre poÅadovanÃ spÃsob overenia totoÅnosti je vyÅadovanÃ Åifrovanie"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Temporary authentication failure"
-msgstr "DoÄasnÃ zlyhanie overenia."
+msgstr "DoÄasnÃ zlyhanie overenia totoÅnosti"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1008
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1035
-#: ../camel/providers/smtp/camel-smtp-transport.c:1052
-#: ../camel/providers/smtp/camel-smtp-transport.c:1060
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1147
 msgid "HELO command failed: "
 msgstr "PrÃkaz HELO zlyhal: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1129
-msgid "SMTP Authentication"
-msgstr "PrihlÃsenie SMTP"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1148
-#: ../camel/providers/smtp/camel-smtp-transport.c:1159
-#: ../camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "AUTH command failed: "
-msgstr "PrÃkaz AUTH zlyhal: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1280
-#: ../camel/providers/smtp/camel-smtp-transport.c:1294
-#: ../camel/providers/smtp/camel-smtp-transport.c:1303
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
+#: ../camel/providers/smtp/camel-smtp-transport.c:1236
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
 msgid "MAIL FROM command failed: "
 msgstr "PrÃkaz MAIL FROM zlyhal: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 msgid "RCPT TO command failed: "
 msgstr "PrÃkaz RCPT TO zlyhal: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1346
-#: ../camel/providers/smtp/camel-smtp-transport.c:1355
+#: ../camel/providers/smtp/camel-smtp-transport.c:1288
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> zlyhal: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1397
-#: ../camel/providers/smtp/camel-smtp-transport.c:1407
-#: ../camel/providers/smtp/camel-smtp-transport.c:1417
-#: ../camel/providers/smtp/camel-smtp-transport.c:1476
-#: ../camel/providers/smtp/camel-smtp-transport.c:1495
-#: ../camel/providers/smtp/camel-smtp-transport.c:1508
-#: ../camel/providers/smtp/camel-smtp-transport.c:1516
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1349
+#: ../camel/providers/smtp/camel-smtp-transport.c:1359
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
 msgid "DATA command failed: "
 msgstr "PrÃkaz DATA zlyhal: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1541
-#: ../camel/providers/smtp/camel-smtp-transport.c:1555
-#: ../camel/providers/smtp/camel-smtp-transport.c:1563
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1505
 msgid "RSET command failed: "
 msgstr "PrÃkaz RSET zlyhal: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1588
-#: ../camel/providers/smtp/camel-smtp-transport.c:1602
-#: ../camel/providers/smtp/camel-smtp-transport.c:1609
+#: ../camel/providers/smtp/camel-smtp-transport.c:1530
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
 msgid "QUIT command failed: "
 msgstr "PrÃkaz QUIT zlyhal: "
 
@@ -4692,12 +4785,12 @@ msgstr "DarÄeky"
 #: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
-msgstr ""
+msgstr "Ciele/Ãlohy"
 
 #: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday"
-msgstr "Sviatok"
+msgstr "Dovolenka"
 
 #: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
@@ -4736,10 +4829,9 @@ msgid "Personal"
 msgstr "OsobnÃ"
 
 #: ../libedataserver/e-categories.c:63
-#, fuzzy
 msgctxt "CategoryName"
 msgid "Phone Calls"
-msgstr "MobilnÃ telefÃny"
+msgstr "Pre volania telefÃnom"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
 #: ../libedataserver/e-categories.c:65
@@ -4760,7 +4852,7 @@ msgstr "DodÃvatelia"
 #: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Time & Expenses"
-msgstr ""
+msgstr "Äas a vÃdavky"
 
 #: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
@@ -4772,37 +4864,30 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÄakajÃce"
 
-#: ../libedataserver/e-client.c:120
-#| msgctxt "ClientError"
-#| msgid "Source not loaded"
+#: ../libedataserver/e-client.c:125
 msgid "Source not loaded"
 msgstr "Zdroj nebol naÄÃtanÃ"
 
-#: ../libedataserver/e-client.c:122
-#| msgctxt "ClientError"
-#| msgid "Source already loaded"
+#: ../libedataserver/e-client.c:127
 msgid "Source already loaded"
 msgstr "Zdroj uÅ bol naÄÃtanÃ"
 
-#: ../libedataserver/e-client.c:130
-#| msgctxt "ClientError"
-#| msgid "Offline unavailable"
+#: ../libedataserver/e-client.c:135
 msgid "Offline unavailable"
 msgstr "OdpojenÃ reÅim je nedostupnÃ"
 
-#: ../libedataserver/e-client.c:152
-#| msgctxt "ClientError"
-#| msgid "D-Bus error"
+#: ../libedataserver/e-client.c:157
 msgid "D-Bus error"
 msgstr "Chyba D-Bus"
 
+# MÄ: %p sa nerozvinie, alebo presnejÅie sa rozvinie do Åiadneho znaku. NedÃ sa rozlÃÅiÅ dopoludnie a odpoludnie preto 24H
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
 #: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
+msgstr "%a %e.%m.%Y, %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format.
@@ -4812,13 +4897,14 @@ msgstr ""
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %e.%m.%Y, %H:%M:%S"
 
+# MÄ: %p sa nerozvinie, alebo presnejÅie sa rozvinie do Åiadneho znaku. NedÃ sa rozlÃÅiÅ dopoludnie a odpoludnie preto 24H
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
 #: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
 msgid "%a %m/%d/%Y %I:%M %p"
-msgstr ""
+msgstr "%a %d.%m.%Y, %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without seconds.
@@ -4828,11 +4914,12 @@ msgstr ""
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y, %H:%M"
 
+# MÄ: %p sa nerozvinie, alebo presnejÅie sa rozvinie do Åiadneho znaku. NedÃ sa rozlÃÅiÅ dopoludnie a odpoludnie preto 24H
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
 #: ../libedataserver/e-time-utils.c:1666
 msgid "%a %m/%d/%Y %I %p"
-msgstr ""
+msgstr "%a %d.%m.%Y, %H"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
@@ -4847,21 +4934,23 @@ msgstr "%a %d.%m.%Y, %H"
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
+# MÄ: %p sa nerozvinie, alebo presnejÅie sa rozvinie do Åiadneho znaku. NedÃ sa rozlÃÅiÅ dopoludnie a odpoludnie preto 24H
 #. strptime format of a date and a time, in 12-hour format.
 #: ../libedataserver/e-time-utils.c:1681
 msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr ""
+msgstr "%d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 24-hour format.
 #: ../libedataserver/e-time-utils.c:1685
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H:%M:%S"
 
+# MÄ: %p sa nerozvinie, alebo presnejÅie sa rozvinie do Åiadneho znaku. NedÃ sa rozlÃÅiÅ dopoludnie a odpoludnie preto 24H
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
 #: ../libedataserver/e-time-utils.c:1690
 msgid "%m/%d/%Y %I:%M %p"
-msgstr ""
+msgstr "%d.%m.%Y %H:%M"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
@@ -4869,11 +4958,12 @@ msgstr ""
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H:%M"
 
+# MÄ: %p sa nerozvinie, alebo presnejÅie sa rozvinie do Åiadneho znaku. NedÃ sa rozlÃÅiÅ dopoludnie a odpoludnie preto 24H
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
 #: ../libedataserver/e-time-utils.c:1700
 msgid "%m/%d/%Y %I %p"
-msgstr ""
+msgstr "%d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
@@ -4887,11 +4977,12 @@ msgstr "%d.%m.%Y %H"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
+# MÄ: %p sa nerozvinie, alebo presnejÅie sa rozvinie do Åiadneho znaku. NedÃ sa rozlÃÅiÅ dopoludnie a odpoludnie preto 24H
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
 #: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
 msgid "%I:%M:%S %p"
-msgstr ""
+msgstr "%H:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
@@ -4899,13 +4990,14 @@ msgstr ""
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
+# MÄ: %p sa nerozvinie, alebo presnejÅie sa rozvinie do Åiadneho znaku. NedÃ sa rozlÃÅiÅ dopoludnie a odpoludnie preto 24H
 #. strptime format for time of day, without seconds,
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
 #: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
 msgid "%I:%M %p"
-msgstr ""
+msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
@@ -4919,63 +5011,173 @@ msgstr "%H:%M"
 msgid "%H%M"
 msgstr "%H%M"
 
+# MÄ: %p sa nerozvinie, alebo presnejÅie sa rozvinie do Åiadneho znaku. NedÃ sa rozlÃÅiÅ dopoludnie a odpoludnie preto 24H
 #. strptime format for hour and AM/PM, 12-hour format.
 #: ../libedataserver/e-time-utils.c:1888
 msgid "%I %p"
+msgstr "%H"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "Proxy type to use"
+msgstr "Typ proxy, ktorÃ pouÅiÅ"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+"means manual proxy."
+msgstr ""
+"KtorÃ typ proxy pouÅiÅ. â0â znamenÃ systÃmovÃ, â1â znamenÃ bez proxy, â2â "
+"znamenÃ ruÄnÃ nastavenie proxy"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "Whether to use http-proxy"
+msgstr "Äi pouÅiÅ http-proxy"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Whether to use proxy for HTTP requests."
+msgstr "Äi pouÅiÅ proxy pre HTTP poÅiadavky."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "Whether proxy server requires authentication"
+msgstr "Äi proxy server vyÅaduje overenie totoÅnosti"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "Whether authentication is required to access proxy server."
+msgstr "Äi je vyÅadovanÃ overenie totoÅnosti pri prÃstupe na proxy server."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "Host name for HTTP requests"
+msgstr "NÃzov hostiteÄa pre HTTP poÅiadavky"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "Host name to use for HTTP requests."
+msgstr "NÃzov hostiteÄa pouÅitÃ pre poÅiadavky cez HTTP."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "Port number for HTTP requests"
+msgstr "ÄÃslo portu pre HTTP poÅiadavky"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Port number to use for HTTP requests."
+msgstr "ÄÃslo portu pouÅitÃ pre poÅiadavky cez HTTP."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "Proxy authentication user name"
+msgstr "PouÅÃvateÄskÃ meno overenia totoÅnosti na proxy"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "User name to use to authenticate against proxy server."
 msgstr ""
+"PouÅÃvateÄskÃ meno na overenie totoÅnosti na proxy serveri."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "Proxy authentication password"
+msgstr "Heslo overenia totoÅnosti na proxy"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "Password to use to authenticate against proxy server."
+msgstr "Heslo na overenie totoÅnosti na proxy serveri."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
+msgid "List of hosts to connect to without proxy"
+msgstr "Zoznam hostiteÄov k spojeniu bez proxy"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
+msgid "List of hosts for which do not use proxy."
+msgstr "Zoznam hostiteÄov, ktorÃ sa dajÃ pouÅÃvaÅ bez proxy."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
+msgid "Host name for HTTPS requests"
+msgstr "NÃzov hostiteÄa pre HTTPS poÅiadavky"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
+msgid "Host name to use for HTTPS requests."
+msgstr "NÃzov hostiteÄa pouÅitÃ pre poÅiadavky cez HTTPS."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
+msgid "Port number for HTTPS requests"
+msgstr "ÄÃslo portu pre HTTPS poÅiadavky"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
+msgid "Port number to use for HTTPS requests."
+msgstr "ÄÃslo portu pouÅitÃ pre poÅiadavky cez HTTPS."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
+msgid "Host name for SOCKS requests"
+msgstr "NÃzov hostiteÄa pre SOCKS poÅiadavky"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
+msgid "Host name to use for SOCKS requests."
+msgstr "NÃzov hostiteÄa pouÅitÃ pre poÅiadavky cez SOCKS."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
+msgid "Port number for SOCKS requests"
+msgstr "ÄÃslo portu pre SOCKS poÅiadavky"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
+msgid "Port number to use for SOCKS requests."
+msgstr "ÄÃslo portu pouÅitÃ pre poÅiadavky cez SOCKS."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
+msgid "Automatic proxy configuration URL"
+msgstr "URL automatickej konfigurÃcie proxy"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
+msgid "Where to read automatic proxy configuration from."
+msgstr "Kde sa mÃ ÄÃtaÅ automatickÃ konfigurÃcia proxy."
 
 #: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:662
+#: ../libedataserverui/e-book-auth-util.c:656
 msgid "Accessing LDAP Server anonymously"
-msgstr ""
+msgstr "PrÃstup na server LDAP anonymne"
 
 #: ../libedataserverui/e-book-auth-util.c:197
 #: ../libedataserverui/e-book-auth-util.c:423
 msgid "Failed to authenticate.\n"
 msgstr "Overenie totoÅnosti zlyhalo.\n"
 
-#: ../libedataserverui/e-categories-editor.c:221
+#: ../libedataserverui/e-categories-editor.c:228
 msgid "Currently _used categories:"
 msgstr "PrÃve po_uÅitÃ kategÃrie:"
 
-#: ../libedataserverui/e-categories-editor.c:230
+#: ../libedataserverui/e-categories-editor.c:237
 msgid "_Available Categories:"
 msgstr "_DostupnÃ kategÃrie:"
 
-#: ../libedataserverui/e-categories-selector.c:320
+#: ../libedataserverui/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../libedataserverui/e-categories-selector.c:325
+#: ../libedataserverui/e-categories-selector.c:327
 msgid "Category"
 msgstr "KategÃria"
 
-#: ../libedataserverui/e-category-completion.c:294
+#: ../libedataserverui/e-category-completion.c:299
 #, c-format
 msgid "Create category \"%s\""
 msgstr "VytvoriÅ kategÃriu â%sâ"
 
-#: ../libedataserverui/e-category-editor.c:132
+#: ../libedataserverui/e-category-editor.c:135
 msgid "Category Icon"
 msgstr "Ikona kategÃrie"
 
-#: ../libedataserverui/e-category-editor.c:136
+#: ../libedataserverui/e-category-editor.c:139
 msgid "_No Image"
 msgstr "Åiad_ny obrÃzok"
 
-#: ../libedataserverui/e-category-editor.c:173
+#: ../libedataserverui/e-category-editor.c:176
 msgid "Category _Name"
 msgstr "_NÃzov kategÃrie"
 
-#: ../libedataserverui/e-category-editor.c:181
+#: ../libedataserverui/e-category-editor.c:184
 msgid "Category _Icon"
 msgstr "_Ikona kategÃrie"
 
-#: ../libedataserverui/e-category-editor.c:221
+#: ../libedataserverui/e-category-editor.c:224
 msgid "Category Properties"
 msgstr "Vlastnosti kategÃrie"
 
-#: ../libedataserverui/e-category-editor.c:282
+#: ../libedataserverui/e-category-editor.c:285
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
@@ -4983,76 +5185,46 @@ msgid ""
 msgstr "V nastaveniach uÅ existuje kategÃria â%sâ. ProsÃm, pouÅite inÃ nÃzov"
 
 #: ../libedataserverui/e-client-utils.c:856
-#, fuzzy, c-format
-#| msgid ""
-#| "Enter password for %s (user %s)\n"
-#| "Reason: %s"
+#, c-format
 msgid ""
 "Enter password for calendar %s (user %s)\n"
 "Reason: %s"
 msgstr ""
-"Zadajte heslo pre %s (pouÅÃvateÄ %s)\n"
+"Zadajte heslo pre kalendÃr %s (pouÅÃvateÄ %s)\n"
 "DÃvod: %s"
 
 #: ../libedataserverui/e-client-utils.c:858
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
+#, c-format
 msgid "Enter password for calendar %s (user %s)"
-msgstr "Zadajte heslo pre %s (pouÅÃvateÄ %s)"
+msgstr "Zadajte heslo pre kalendÃr %s (pouÅÃvateÄ %s)"
 
 #: ../libedataserverui/e-client-utils.c:862
-#, fuzzy, c-format
-#| msgid ""
-#| "Enter password for %s (user %s)\n"
-#| "Reason: %s"
+#, c-format
 msgid ""
 "Enter password for task list %s (user %s)\n"
 "Reason: %s"
 msgstr ""
-"Zadajte heslo pre %s (pouÅÃvateÄ %s)\n"
+"Zadajte heslo pre zoznam Ãloh %s (pouÅÃvateÄ %s)\n"
 "DÃvod: %s"
 
 #: ../libedataserverui/e-client-utils.c:864
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
+#, c-format
 msgid "Enter password for task list %s (user %s)"
-msgstr "Zadajte heslo pre %s (pouÅÃvateÄ %s)"
+msgstr "Zadajte heslo pre zoznam Ãloh %s (pouÅÃvateÄ %s)"
 
 #: ../libedataserverui/e-client-utils.c:868
-#, fuzzy, c-format
-#| msgid ""
-#| "Enter password for %s (user %s)\n"
-#| "Reason: %s"
+#, c-format
 msgid ""
 "Enter password for memo list %s (user %s)\n"
 "Reason: %s"
 msgstr ""
-"Zadajte heslo pre %s (pouÅÃvateÄ %s)\n"
+"Zadajte heslo pre zoznam poznÃmok %s (pouÅÃvateÄ %s)\n"
 "DÃvod: %s"
 
 #: ../libedataserverui/e-client-utils.c:870
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
+#, c-format
 msgid "Enter password for memo list %s (user %s)"
-msgstr "Zadajte heslo pre %s (pouÅÃvateÄ %s)"
-
-#: ../libedataserverui/e-client-utils.c:875
-#, fuzzy, c-format
-#| msgid ""
-#| "Enter password for %s (user %s)\n"
-#| "Reason: %s"
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"Zadajte heslo pre %s (pouÅÃvateÄ %s)\n"
-"DÃvod: %s"
-
-#: ../libedataserverui/e-client-utils.c:877
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for address book %s (user %s)"
-msgstr "Zadajte heslo pre %s (pouÅÃvateÄ %s)"
+msgstr "Zadajte heslo pre zoznam poznÃmok %s (pouÅÃvateÄ %s)"
 
 #: ../libedataserverui/e-client-utils.c:981
 msgid "Enter Passphrase"
@@ -5062,92 +5234,92 @@ msgstr "Zadajte heslo"
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: ../libedataserverui/e-name-selector-dialog.c:184
+#: ../libedataserverui/e-name-selector-dialog.c:187
 msgid "Show Contacts"
 msgstr "ZobraziÅ kontakty"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:209
 msgid "Address B_ook:"
 msgstr "AdresÃr k_ontaktov:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:214
+#: ../libedataserverui/e-name-selector-dialog.c:217
 msgid "Cate_gory:"
 msgstr "Kate_gÃria:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:232
+#: ../libedataserverui/e-name-selector-dialog.c:235
 msgid "_Search:"
 msgstr "_HÄadaÅ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1035
+#: ../libedataserverui/e-name-selector-dialog.c:253
+#: ../libedataserverui/e-name-selector-dialog.c:1038
 msgid "Any Category"
 msgstr "AkÃkoÄvek kategÃria"
 
-#: ../libedataserverui/e-name-selector-dialog.c:252
+#: ../libedataserverui/e-name-selector-dialog.c:255
 msgid "Co_ntacts"
 msgstr "Ko_ntakty"
 
-#: ../libedataserverui/e-name-selector-dialog.c:307
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Search"
 msgstr "HÄadaÅ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Address Book"
 msgstr "AdresÃr kontaktov"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:316
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: ../libedataserverui/e-name-selector-dialog.c:430
+#: ../libedataserverui/e-name-selector-dialog.c:433
 msgid "Select Contacts from Address Book"
 msgstr "Vyberte kontakty z adresÃra kontaktov"
 
-#: ../libedataserverui/e-name-selector-dialog.c:778
+#: ../libedataserverui/e-name-selector-dialog.c:781
 msgid "_Add"
 msgstr "_PridaÅ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:782
+#: ../libedataserverui/e-name-selector-dialog.c:785
 msgid "_Remove"
 msgstr "O_dstrÃniÅ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:954
+#: ../libedataserverui/e-name-selector-dialog.c:957
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "Chyba pri naÄÃtavanÃ adresÃra kontaktov: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2816
+#: ../libedataserverui/e-name-selector-entry.c:2823
 #, c-format
 msgid "E_xpand %s Inline"
-msgstr ""
+msgstr "_RozbaliÅ %s do riadku"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2831
+#: ../libedataserverui/e-name-selector-entry.c:2838
 #, c-format
 msgid "Cop_y %s"
 msgstr "_KopÃrovaÅ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2841
+#: ../libedataserverui/e-name-selector-entry.c:2848
 #, c-format
 msgid "C_ut %s"
 msgstr "Vystri_hnÃÅ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2858
+#: ../libedataserverui/e-name-selector-entry.c:2865
 #, c-format
 msgid "_Edit %s"
 msgstr "_UpraviÅ %s"
 
-#: ../libedataserverui/e-name-selector-list.c:520
+#: ../libedataserverui/e-name-selector-list.c:524
 #, c-format
 msgid "_Delete %s"
 msgstr "O_dstrÃniÅ %s"
 
 #: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
-msgstr ""
+msgstr "ZvÃzok kÄÃÄov je nepouÅiteÄnÃ: chÃba pouÅÃvateÄ alebo nÃzov hostiteÄa"
 
 #: ../libedataserverui/e-passwords.c:701
 #: ../libedataserverui/e-passwords-win32.c:614
@@ -5175,122 +5347,20 @@ msgid "_Remember this password for the remainder of this session"
 msgstr "_ZapamÃtaÅ si toto heslo do konca tejto relÃcie"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:99
+#: ../libedataserverui/e-source-selector-dialog.c:91
 msgid "Select destination"
-msgstr "VybraÅ cieÄ"
+msgstr "VÃber cieÄa"
 
-#: ../libedataserverui/e-source-selector-dialog.c:174
+#: ../libedataserverui/e-source-selector-dialog.c:166
 msgid "_Destination"
 msgstr "_CieÄ"
 
-#~ msgctxt "BookClientError"
-#~ msgid "Contact not found"
-#~ msgstr "Kontakt sa nenaÅiel"
-
-#~ msgctxt "BookClientError"
-#~ msgid "Contact ID already exists"
-#~ msgstr "IdentifikÃtor kontaktu uÅ existuje"
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+msgid "Keep running after the last client is closed"
+msgstr "PonechaÅ spustenÃ i po zatvorenÃ poslednÃho klienta"
 
-#~ msgctxt "BookClientError"
-#~ msgid "No space"
-#~ msgstr "Åiadne miesto"
-
-#~ msgctxt "BookClientError"
-#~ msgid "Unknown error"
-#~ msgstr "NeznÃma chyba"
-
-#~ msgctxt "CalClientError"
-#~ msgid "No such calendar"
-#~ msgstr "KalendÃr neexistuje"
-
-#~ msgctxt "CalClientError"
-#~ msgid "Object not found"
-#~ msgstr "Objekt sa nenaÅiel"
-
-#~ msgctxt "CalClientError"
-#~ msgid "Invalid object"
-#~ msgstr "NeplatnÃ objekt"
-
-#~ msgctxt "CalClientError"
-#~ msgid "Unknown user"
-#~ msgstr "NeznÃmy pouÅÃvateÄ"
-
-#~ msgctxt "CalClientError"
-#~ msgid "Object ID already exists"
-#~ msgstr "IdentifikÃtor objektu uÅ existuje"
-
-#~ msgctxt "CalClientError"
-#~ msgid "Invalid range"
-#~ msgstr "NeplatnÃ rozsah"
-
-#~ msgctxt "CalClientError"
-#~ msgid "Unknown error"
-#~ msgstr "NeznÃma chyba"
-
-#~ msgctxt "ClientError"
-#~ msgid "Invalid argument"
-#~ msgstr "NeplatnÃ argument"
-
-#~ msgctxt "ClientError"
-#~ msgid "Backend is busy"
-#~ msgstr "ObsluÅnÃ program je zaneprÃzdnenÃ"
-
-#~ msgctxt "ClientError"
-#~ msgid "Authentication failed"
-#~ msgstr "Overenie totoÅnosti zlyhalo"
-
-#~ msgctxt "ClientError"
-#~ msgid "Authentication required"
-#~ msgstr "Overenie totoÅnosti je vyÅadovanÃ"
-
-#~ msgctxt "ClientError"
-#~ msgid "Repository offline"
-#~ msgstr "ÃloÅisko je odpojenÃ"
-
-#~ msgctxt "ClientError"
-#~ msgid "Permission denied"
-#~ msgstr "PrÃstup zamietnutÃ"
-
-# je tu sprÃvny rod?
-# PK: mal by byt
-#~ msgctxt "ClientError"
-#~ msgid "Cancelled"
-#~ msgstr "ZruÅenÃ"
-
-#~ msgctxt "ClientError"
-#~ msgid "Could not cancel"
-#~ msgstr "Nepodarilo sa zruÅiÅ"
-
-#~ msgctxt "ClientError"
-#~ msgid "Not supported"
-#~ msgstr "NepodporovanÃ"
-
-#~ msgctxt "ClientError"
-#~ msgid "Unsupported authentication method"
-#~ msgstr "NepodporovanÃ metÃda overenia totoÅnosti"
-
-#~ msgctxt "ClientError"
-#~ msgid "TLS not available"
-#~ msgstr "TLS nie je dostupnÃ"
-
-#, fuzzy
-#~ msgctxt "ClientError"
-#~ msgid "Search size limit exceeded"
-#~ msgstr "PrekroÄenÃ dÄÅka cesty"
-
-#, fuzzy
-#~ msgctxt "ClientError"
-#~ msgid "Search time limit exceeded"
-#~ msgstr "PrekroÄenÃ dÄÅka cesty"
-
-#~ msgctxt "ClientError"
-#~ msgid "Invalid query"
-#~ msgstr "NeplatnÃ poÅiadavka"
-
-#~ msgctxt "ClientError"
-#~ msgid "Other error"
-#~ msgstr "InÃ chyba"
-
-#~ msgctxt "ClientError"
-#~ msgid "Unknown error"
-#~ msgstr "NeznÃma chyba"
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+msgid "Wait running until at least one client is connected"
+msgstr "PonechaÅ spustenÃ pokÃm aspoÅ jeden klient je pripojenÃ"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]