diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 0848deaf28..86149fdccf 100644
Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 8736ae4640..f6e14578dc 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -5,230 +5,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-17 11:59+0200\n"
-"PO-Revision-Date: 2009-09-17 12:25+0100\n"
-"Last-Translator: Marian Andre <django@andre.sk>\n"
-"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"POT-Creation-Date: 2010-05-06 12:15+0100\n"
+"PO-Revision-Date: 2010-05-08 16:32+0200\n"
+"Last-Translator: Martin Kosír <martin@martinkosir.net>\n"
+"Language-Team: Slovak <>\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 ? 0 : n>1 && n<5 ? 1 : 2;\n"
 
 #: conf/global_settings.py:44
 msgid "Arabic"
 msgstr "arabský"
 
 #: conf/global_settings.py:45
-msgid "Bengali"
-msgstr "bengálsky"
-
-#: conf/global_settings.py:46
 msgid "Bulgarian"
 msgstr "bulharský"
 
+#: conf/global_settings.py:46
+msgid "Bengali"
+msgstr "bengálsky"
+
 #: conf/global_settings.py:47
+msgid "Bosnian"
+msgstr "bosniansky"
+
+#: conf/global_settings.py:48
 msgid "Catalan"
 msgstr "katalánsky"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Czech"
 msgstr "český"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Welsh"
 msgstr "waleský"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Danish"
 msgstr "dánsky"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "German"
 msgstr "nemecký"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Greek"
 msgstr "grécky"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "English"
 msgstr "anglický"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
+msgid "British English"
+msgstr "britský"
+
+#: conf/global_settings.py:56
 msgid "Spanish"
 msgstr "španielsky"
 
-#: conf/global_settings.py:55
-msgid "Estonian"
-msgstr "estónsky"
-
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
 msgid "Argentinean Spanish"
 msgstr "argentínska španielčina"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
+msgid "Estonian"
+msgstr "estónsky"
+
+#: conf/global_settings.py:59
 msgid "Basque"
 msgstr "baskický"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:60
 msgid "Persian"
 msgstr "perzský"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:61
 msgid "Finnish"
 msgstr "fínsky"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:62
 msgid "French"
 msgstr "francúzsky"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:63
+msgid "Frisian"
+msgstr "frízsky"
+
+#: conf/global_settings.py:64
 msgid "Irish"
 msgstr "írsky"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Galician"
 msgstr "galícijský"
 
-#: conf/global_settings.py:63
-msgid "Hungarian"
-msgstr "maďarský"
-
-#: conf/global_settings.py:64
+#: conf/global_settings.py:66
 msgid "Hebrew"
 msgstr "hebrejský"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:67
 msgid "Hindi"
 msgstr "hindský"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:68
 msgid "Croatian"
 msgstr "chorvátsky"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:69
+msgid "Hungarian"
+msgstr "maďarský"
+
+#: conf/global_settings.py:70
 msgid "Icelandic"
 msgstr "islandský"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:71
 msgid "Italian"
 msgstr "taliansky"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:72
 msgid "Japanese"
 msgstr "japonský"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:73
 msgid "Georgian"
 msgstr "gruzínsky"
 
-#: conf/global_settings.py:71
-msgid "Korean"
-msgstr "kórejský"
-
-#: conf/global_settings.py:72
+#: conf/global_settings.py:74
 msgid "Khmer"
 msgstr "kmérsky"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:75
 msgid "Kannada"
 msgstr "kanadský"
 
-#: conf/global_settings.py:74
-msgid "Latvian"
-msgstr "lotyšský"
+#: conf/global_settings.py:76
+msgid "Korean"
+msgstr "kórejský"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:77
 msgid "Lithuanian"
 msgstr "litovský"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:78
+msgid "Latvian"
+msgstr "lotyšský"
+
+#: conf/global_settings.py:79
 msgid "Macedonian"
 msgstr "macedónsky"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:80
+msgid "Mongolian"
+msgstr "mongolský"
+
+#: conf/global_settings.py:81
 msgid "Dutch"
 msgstr "holandský"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
 msgid "Norwegian"
 msgstr "nórsky"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
+msgid "Norwegian Bokmal"
+msgstr "nórsky (Bokmal)"
+
+#: conf/global_settings.py:84
+msgid "Norwegian Nynorsk"
+msgstr "nórsky (Nynorsk)"
+
+#: conf/global_settings.py:85
 msgid "Polish"
 msgstr "poľský"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:86
 msgid "Portuguese"
 msgstr "portugalský"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:87
 msgid "Brazilian Portuguese"
 msgstr "portugalský (Brazília)"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:88
 msgid "Romanian"
 msgstr "rumunský"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:89
 msgid "Russian"
 msgstr "ruský"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:90
 msgid "Slovak"
 msgstr "slovenský"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:91
 msgid "Slovenian"
 msgstr "slovinský"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:92
+msgid "Albanian"
+msgstr "albánsky"
+
+#: conf/global_settings.py:93
 msgid "Serbian"
 msgstr "srbský"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:94
+msgid "Serbian Latin"
+msgstr "srbský (Latin)"
+
+#: conf/global_settings.py:95
 msgid "Swedish"
 msgstr "švédsky"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:96
 msgid "Tamil"
 msgstr "tamilský"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:97
 msgid "Telugu"
 msgstr "telúgsky"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:98
 msgid "Thai"
 msgstr "thajský"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:99
 msgid "Turkish"
 msgstr "turecký"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:100
 msgid "Ukrainian"
 msgstr "ukrajinský"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:101
+msgid "Vietnamese"
+msgstr "vietnamský"
+
+#: conf/global_settings.py:102
 msgid "Simplified Chinese"
 msgstr "čínsky (zjednodušene)"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:103
 msgid "Traditional Chinese"
 msgstr "čínsky (tradične)"
 
-#: contrib/admin/actions.py:60
+#: contrib/admin/actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Úspešne zmazaných %(count)d %(items)s."
 
-#: contrib/admin/actions.py:67
-#: contrib/admin/options.py:1027
+#: contrib/admin/actions.py:55 contrib/admin/options.py:1125
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: contrib/admin/actions.py:85
+#: contrib/admin/actions.py:73
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Zmazať označené %(verbose_name_plural)s"
@@ -242,10 +277,8 @@ msgstr ""
 "<h3>Od %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:75
-#: contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147
-#: contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
 msgid "All"
 msgstr "Všetko"
 
@@ -269,28 +302,25 @@ msgstr "Tento mesiac"
 msgid "This year"
 msgstr "Tento rok"
 
-#: contrib/admin/filterspecs.py:147
-#: forms/widgets.py:435
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
 msgid "Yes"
 msgstr "Áno"
 
-#: contrib/admin/filterspecs.py:147
-#: forms/widgets.py:435
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
 msgid "No"
 msgstr "Nie"
 
-#: contrib/admin/filterspecs.py:154
-#: forms/widgets.py:435
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:469
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: contrib/admin/helpers.py:14
+#: contrib/admin/helpers.py:20
 msgid "Action:"
 msgstr "Akcia:"
 
 #: contrib/admin/models.py:19
 msgid "action time"
-msgstr "čas udalosti"
+msgstr "čas akcie"
 
 #: contrib/admin/models.py:22
 msgid "object id"
@@ -298,11 +328,11 @@ msgstr "identifikátor objektu"
 
 #: contrib/admin/models.py:23
 msgid "object repr"
-msgstr "objekt repr"
+msgstr "reprezentácia objektu"
 
 #: contrib/admin/models.py:24
 msgid "action flag"
-msgstr "príznak udalosti"
+msgstr "príznak akcie"
 
 #: contrib/admin/models.py:25
 msgid "change message"
@@ -316,184 +346,198 @@ msgstr "položka záznamu"
 msgid "log entries"
 msgstr "položky záznamu"
 
-#: contrib/admin/options.py:133
-#: contrib/admin/options.py:147
+#: contrib/admin/options.py:138 contrib/admin/options.py:153
 msgid "None"
 msgstr "Žiadne"
 
-#: contrib/admin/options.py:519
+#: contrib/admin/options.py:559
 #, python-format
 msgid "Changed %s."
 msgstr "Zmenené %s."
 
-#: contrib/admin/options.py:519
-#: contrib/admin/options.py:529
-#: contrib/comments/templates/comments/preview.html:16
-#: forms/models.py:388
-#: forms/models.py:600
+#: contrib/admin/options.py:559 contrib/admin/options.py:569
+#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:844
+#: forms/models.py:568
 msgid "and"
 msgstr "a"
 
-#: contrib/admin/options.py:524
+#: contrib/admin/options.py:564
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Pridaný %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:528
+#: contrib/admin/options.py:568
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Zmenený %(list)s pre %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:533
+#: contrib/admin/options.py:573
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Zmazaný %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:537
+#: contrib/admin/options.py:577
 msgid "No fields changed."
 msgstr "Polia nezmenené."
 
-#: contrib/admin/options.py:599
-#: contrib/auth/admin.py:67
+#: contrib/admin/options.py:643
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný."
 
-#: contrib/admin/options.py:603
-#: contrib/admin/options.py:636
-#: contrib/auth/admin.py:75
+#: contrib/admin/options.py:647 contrib/admin/options.py:680
 msgid "You may edit it again below."
-msgstr "Nižšie to môžete znova upraviť."
+msgstr "Nižšie môžete znova robiť úpravy."
 
-#: contrib/admin/options.py:613
-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:657 contrib/admin/options.py:690
 #, python-format
 msgid "You may add another %s below."
 msgstr "Nižšie môžete pridať ďalšie %s."
 
-#: contrib/admin/options.py:634
+#: contrib/admin/options.py:678
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne zmenený."
 
-#: contrib/admin/options.py:642
+#: contrib/admin/options.py:686
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný. Ďalšie zmeny môžete urobiť nižšie."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"Objekt %(name)s \"%(obj)s\" bol úspešne pridaný. Ďalšie zmeny môžete urobiť "
+"nižšie."
 
-#: contrib/admin/options.py:773
+#: contrib/admin/options.py:740 contrib/admin/options.py:997
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+"Položky musia byť vybrané, ak chcete na nich vykonať akcie. Neboli vybrané "
+"žiadne položky."
+
+#: contrib/admin/options.py:759
+msgid "No action selected."
+msgstr "Nebola vybraná žiadna akcia."
+
+#: contrib/admin/options.py:840
 #, python-format
 msgid "Add %s"
 msgstr "Pridať %s"
 
-#: contrib/admin/options.py:804
-#: contrib/admin/options.py:1005
+#: contrib/admin/options.py:866 contrib/admin/options.py:1105
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Objekt %(name)s s primárnym kľúčom %(key)r neexistuje."
 
-#: contrib/admin/options.py:861
+#: contrib/admin/options.py:931
 #, python-format
 msgid "Change %s"
 msgstr "Zmeniť %s"
 
-#: contrib/admin/options.py:905
+#: contrib/admin/options.py:977
 msgid "Database error"
 msgstr "Chyba databázy"
 
-#: contrib/admin/options.py:941
+#: contrib/admin/options.py:1039
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
-msgstr[0] "%(count)s %(name)s bolo úspešne zmenených."
-msgstr[1] "%(count)s %(name)s bol úspešne zmenený."
-msgstr[2] "%(count)s %(name)s boli úspešne zmenené."
+msgstr[0] "%(count)s %(name)s bola úspešne zmenená."
+msgstr[1] "%(count)s %(name)s boli úspešne zmenené."
+msgstr[2] "%(count)s %(name)s bolo úspešne zmenených."
 
-#: contrib/admin/options.py:1020
+#: contrib/admin/options.py:1066
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] "%(total_count)s vybraná"
+msgstr[1] "Všetky %(total_count)s vybrané"
+msgstr[2] "Všetkých %(total_count)s vybraných"
+
+#: contrib/admin/options.py:1071
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "0 z %(cnt)s vybraných"
+
+#: contrib/admin/options.py:1118
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne vymazaný."
 
-#: contrib/admin/options.py:1057
+#: contrib/admin/options.py:1155
 #, python-format
 msgid "Change history: %s"
 msgstr "Zmeniť históriu: %s"
 
-#: contrib/admin/sites.py:21
-#: contrib/admin/views/decorators.py:14
-#: contrib/auth/forms.py:80
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
-msgstr "Prosím, zadajte správne používateľské meno a heslo. Rešpektujte malé a veľké písmená."
+#: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:14
+#: contrib/auth/forms.py:81
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Prosím, zadajte správne používateľské meno a heslo. Rešpektujte malé a veľké "
+"písmená."
 
-#: contrib/admin/sites.py:285
-#: contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:307 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Vaše prihlásenie vypršalo. Prosím, prihláste sa znovu."
 
-#: contrib/admin/sites.py:292
-#: contrib/admin/views/decorators.py:47
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Zdá sa, že váš prehliadač nemá povolené cookies. Prosím, povoľte cookies, znova načítajte túto stránku a skúste to znova."
+#: contrib/admin/sites.py:314 contrib/admin/views/decorators.py:47
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Zdá sa, že váš prehliadač nemá povolené cookies. Prosím, povoľte cookies, "
+"znova načítajte túto stránku a pokúste sa znova prihlásiť."
 
-#: contrib/admin/sites.py:308
-#: contrib/admin/sites.py:314
+#: contrib/admin/sites.py:330 contrib/admin/sites.py:336
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Používateľské mená nemožu obsahovať znak '@'."
 
-#: contrib/admin/sites.py:311
-#: contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:333 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Vaša e-mail adresa nie je vašim používateľským menom. Skúste namiesto toho použiť '%s'."
+msgstr ""
+"Vaša e-mailová adresa nie je vašim používateľským menom. Skúste namiesto "
+"toho použiť '%s'."
 
-#: contrib/admin/sites.py:367
+#: contrib/admin/sites.py:389
 msgid "Site administration"
 msgstr "Správa stránky"
 
-#: contrib/admin/sites.py:381
-#: contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:403 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "Prihlásenie"
 
-#: contrib/admin/sites.py:426
+#: contrib/admin/sites.py:448
 #, python-format
 msgid "%s administration"
 msgstr "%s správa"
 
-#: contrib/admin/util.py:168
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Jeden alebo viac %(fieldname)s v %(name)s: %(obj)s"
-
-#: contrib/admin/util.py:173
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Jeden alebo viac %(fieldname)s v %(name)s:"
-
-#: contrib/admin/widgets.py:72
+#: contrib/admin/widgets.py:75
 msgid "Date:"
 msgstr "Dátum:"
 
-#: contrib/admin/widgets.py:72
+#: contrib/admin/widgets.py:75
 msgid "Time:"
 msgstr "Čas:"
 
-#: contrib/admin/widgets.py:96
+#: contrib/admin/widgets.py:99
 msgid "Currently:"
 msgstr "Aktuálne:"
 
-#: contrib/admin/widgets.py:96
+#: contrib/admin/widgets.py:99
 msgid "Change:"
 msgstr "Zmeniť:"
 
-#: contrib/admin/widgets.py:125
+#: contrib/admin/widgets.py:129
 msgid "Lookup"
 msgstr "Vyhľadanie"
 
-#: contrib/admin/widgets.py:237
+#: contrib/admin/widgets.py:244
 msgid "Add Another"
 msgstr "Pridať ďalší"
 
@@ -508,17 +552,17 @@ msgstr "Ľutujeme, ale požadovanú stránku nie je možné nájsť."
 
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:54
-#: contrib/admin/templates/admin/change_form.html:17
-#: contrib/admin/templates/admin/change_list.html:25
+#: contrib/admin/templates/admin/base.html:55
+#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_list.html:42
 #: contrib/admin/templates/admin/delete_confirmation.html:6
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:6
 #: contrib/admin/templates/admin/invalid_setup.html:4
 #: contrib/admin/templates/admin/object_history.html:6
-#: contrib/admin/templates/admin/auth/user/change_password.html:10
+#: contrib/admin/templates/admin/auth/user/change_password.html:11
 #: contrib/admin/templates/registration/logged_out.html:4
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:5
 #: contrib/admin/templates/registration/password_reset_complete.html:4
 #: contrib/admin/templates/registration/password_reset_confirm.html:4
 #: contrib/admin/templates/registration/password_reset_done.html:4
@@ -540,16 +584,33 @@ msgid "Server Error <em>(500)</em>"
 msgstr "Chyba servera <em>(500)</em>"
 
 #: contrib/admin/templates/admin/500.html:10
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "Vyskytla sa chyba. Bola oznámená správcovi stránky e-mailom a mala by byť čoskoro opravená.Ďakujeme za pochopenie."
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Vyskytla sa chyba. Bola oznámená správcovi stránky e-mailom a mala by byť "
+"čoskoro opravená. Ďakujeme za pochopenie."
 
 #: contrib/admin/templates/admin/actions.html:4
 msgid "Run the selected action"
-msgstr "Spustiť označenú akciu"
+msgstr "Vykonať vybranú akciu"
 
 #: contrib/admin/templates/admin/actions.html:4
 msgid "Go"
-msgstr "Ísť"
+msgstr "Vykonať"
+
+#: contrib/admin/templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr "Kliknite sem pre výber objektov na všetkých stránkach"
+
+#: contrib/admin/templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr "Vybrať všetkých %(total_count)s %(module_name)s"
+
+#: contrib/admin/templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr "Zrušiť výber"
 
 #: contrib/admin/templates/admin/app_index.html:10
 #: contrib/admin/templates/admin/index.html:19
@@ -557,28 +618,28 @@ msgstr "Ísť"
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:27
+#: contrib/admin/templates/admin/base.html:28
 msgid "Welcome,"
 msgstr "Vitajte,"
 
-#: contrib/admin/templates/admin/base.html:32
+#: contrib/admin/templates/admin/base.html:33
 #: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_form.html:4
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentácia"
 
-#: contrib/admin/templates/admin/base.html:40
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:47
+#: contrib/admin/templates/admin/base.html:41
+#: contrib/admin/templates/admin/auth/user/change_password.html:15
+#: contrib/admin/templates/admin/auth/user/change_password.html:48
 #: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: contrib/admin/templates/admin/base.html:47
+#: contrib/admin/templates/admin/base.html:48
 #: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Odhlásiť"
 
@@ -590,55 +651,65 @@ msgstr "Správa Django stránky"
 msgid "Django administration"
 msgstr "Správa Django"
 
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/change_form.html:21
 #: contrib/admin/templates/admin/index.html:29
 msgid "Add"
 msgstr "Pridať"
 
-#: contrib/admin/templates/admin/change_form.html:27
+#: contrib/admin/templates/admin/change_form.html:28
 #: contrib/admin/templates/admin/object_history.html:10
 msgid "History"
 msgstr "História"
 
-#: contrib/admin/templates/admin/change_form.html:28
-#: contrib/admin/templates/admin/edit_inline/stacked.html:13
+#: contrib/admin/templates/admin/change_form.html:29
+#: contrib/admin/templates/admin/edit_inline/stacked.html:9
 #: contrib/admin/templates/admin/edit_inline/tabular.html:28
 msgid "View on site"
 msgstr "Pozrieť na stránke"
 
-#: contrib/admin/templates/admin/change_form.html:38
-#: contrib/admin/templates/admin/change_list.html:54
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:39
+#: contrib/admin/templates/admin/change_list.html:71
+#: contrib/admin/templates/admin/auth/user/change_password.html:24
+#: contrib/admin/templates/registration/password_change_form.html:15
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
-msgstr[0] "Prosím, opravte chyby uvedené nižšie."
-msgstr[1] "Prosím, opravte chybu uvedenú nižšie."
+msgstr[0] "Prosím, opravte chybu uvedenú nižšie."
+msgstr[1] "Prosím, opravte chyby uvedené nižšie."
 msgstr[2] "Prosím, opravte chyby uvedené nižšie."
 
-#: contrib/admin/templates/admin/change_list.html:46
+#: contrib/admin/templates/admin/change_list.html:63
 #, python-format
 msgid "Add %(name)s"
 msgstr "Pridať %(name)s"
 
-#: contrib/admin/templates/admin/change_list.html:65
+#: contrib/admin/templates/admin/change_list.html:82
 msgid "Filter"
 msgstr "Filtrovať"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4
-#: forms/formsets.py:275
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:302
 msgid "Delete"
 msgstr "Odstrániť"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:16
 #, python-format
-msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Odstránenie objektu %(object_name)s '%(escaped_object)s' by malo za následok aj odstránenie súvisiacich objektov, avšak váš účet nemá oprávnenie na odstránenie nasledujúcich typov objektov:"
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+"Odstránenie objektu %(object_name)s '%(escaped_object)s' by malo za následok "
+"aj odstránenie súvisiacich objektov. Váš účet však nemá oprávnenie na "
+"odstránenie nasledujúcich typov objektov:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:23
 #, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
-msgstr "Ste si istý, že chcete odstrániť objekt %(object_name)s \"%(escaped_object)s\"? Všetky nasledujúce súvisiace objekty budú odstránené:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+"Ste si istý, že chcete odstrániť objekt %(object_name)s \"%(escaped_object)s"
+"\"? Všetky nasledujúce súvisiace objekty budú odstránené:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:28
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:33
@@ -651,13 +722,23 @@ msgstr "Zmazať viacero objektov"
 
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:15
 #, python-format
-msgid "Deleting the %(object_name)s would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Odstránenie objektu %(object_name)s by malo za následok aj odstránenie súvisiacich objektov, avšak váš účet nemá oprávnenie na odstránenie nasledujúcich typov objektov:"
+msgid ""
+"Deleting the %(object_name)s would result in deleting related objects, but "
+"your account doesn't have permission to delete the following types of "
+"objects:"
+msgstr ""
+"Odstránenie objektu %(object_name)s by malo za následok aj odstránenie "
+"súvisiacich objektov, Váš účet však nemá oprávnenie na odstránenie "
+"nasledujúcich typov objektov:"
 
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:22
 #, python-format
-msgid "Are you sure you want to delete the selected %(object_name)s objects? All of the following objects and their related items will be deleted:"
-msgstr "Ste si istý, že chcete odstrániť objekty %(object_name)s? Budú odstránené nasledujúce objekty a položky s nimi súvisiace:"
+msgid ""
+"Are you sure you want to delete the selected %(object_name)s objects? All of "
+"the following objects and their related items will be deleted:"
+msgstr ""
+"Ste si istý, že chcete odstrániť objekty %(object_name)s? Budú odstránené "
+"nasledujúce objekty a položky s nimi súvisiace:"
 
 #: contrib/admin/templates/admin/filter.html:2
 #, python-format
@@ -679,11 +760,11 @@ msgstr "Nemáte právo na vykonávanie zmien."
 
 #: contrib/admin/templates/admin/index.html:53
 msgid "Recent Actions"
-msgstr "Posledné udalosti"
+msgstr "Posledné akcie"
 
 #: contrib/admin/templates/admin/index.html:54
 msgid "My Actions"
-msgstr "Moje udalosti"
+msgstr "Moje akcie"
 
 #: contrib/admin/templates/admin/index.html:58
 msgid "None available"
@@ -694,8 +775,14 @@ msgid "Unknown content"
 msgstr "Neznámy obsah"
 
 #: contrib/admin/templates/admin/invalid_setup.html:7
-msgid "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user."
-msgstr "Niečo nie je v poriadku s vašou inštaláciou databázy. Uistite sa, že boli vytvorené potrebné databázové tabuľky a taktiež skontrolujte, či príslušný používateľ môže databázu čítať."
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+"Niečo nie je v poriadku s vašou inštaláciou databázy. Uistite sa, že boli "
+"vytvorené potrebné databázové tabuľky a taktiež skontrolujte, či príslušný "
+"používateľ môže databázu čítať."
 
 #: contrib/admin/templates/admin/login.html:19
 msgid "Username:"
@@ -714,18 +801,16 @@ msgid "User"
 msgstr "Používateľ"
 
 #: contrib/admin/templates/admin/object_history.html:24
-#: contrib/comments/templates/comments/moderation_queue.html:33
 msgid "Action"
-msgstr "Udalosť"
-
-#: contrib/admin/templates/admin/object_history.html:30
-#: utils/translation/trans_real.py:400
-msgid "DATETIME_FORMAT"
-msgstr "j. F Y o G:i"
+msgstr "Akcia"
 
 #: contrib/admin/templates/admin/object_history.html:38
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Tento objekt nemá históriu zmien. Pravdepodobne nebol pridaný prostredníctvom tejto správcovskej stránky."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Tento objekt nemá históriu zmien. Pravdepodobne nebol pridaný "
+"prostredníctvom tejto správcovskej stránky."
 
 #: contrib/admin/templates/admin/pagination.html:10
 msgid "Show all"
@@ -744,9 +829,9 @@ msgstr "Vyhľadávanie"
 #, python-format
 msgid "1 result"
 msgid_plural "%(counter)s results"
-msgstr[0] "%(counter)s výsledkov"
-msgstr[1] "1 výsledok"
-msgstr[2] "%(counter)s výsledky"
+msgstr[0] "%(counter)s výsledok"
+msgstr[1] "%(counter)s výsledky"
+msgstr[2] "%(counter)s výsledkov"
 
 #: contrib/admin/templates/admin/search_form.html:10
 #, python-format
@@ -759,50 +844,56 @@ msgstr "Uložiť ako nový"
 
 #: contrib/admin/templates/admin/submit_line.html:6
 msgid "Save and add another"
-msgstr "Uložiť a pridať ďaľší"
+msgstr "Uložiť a pridať ďalší"
 
 #: contrib/admin/templates/admin/submit_line.html:7
 msgid "Save and continue editing"
 msgstr "Uložiť a pokračovať v úpravách"
 
-#: contrib/admin/templates/admin/auth/user/add_form.html:6
-msgid "First, enter a username and password. Then, you'll be able to edit more user options."
-msgstr "Najskôr zadajte používateľské meno a heslo. Potom budete môcť upraviť viac používateľských nastavení."
+#: contrib/admin/templates/admin/auth/user/add_form.html:5
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+"Najskôr zadajte používateľské meno a heslo. Potom budete môcť upraviť viac "
+"používateľských nastavení."
 
-#: contrib/admin/templates/admin/auth/user/add_form.html:13
-#: contrib/auth/forms.py:14
-#: contrib/auth/forms.py:47
-#: contrib/auth/forms.py:59
-msgid "Username"
-msgstr "Používateľské meno"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:20
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
-#: contrib/auth/forms.py:17
-#: contrib/auth/forms.py:60
-#: contrib/auth/forms.py:185
-msgid "Password"
-msgstr "Heslo"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:26
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
-#: contrib/auth/forms.py:186
-msgid "Password (again)"
-msgstr "Heslo (znova)"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:27
-#: contrib/admin/templates/admin/auth/user/change_password.html:41
-msgid "Enter the same password as above, for verification."
-msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie."
-
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:28
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Zadajte nové heslo pre používateľa <strong>%(username)s</strong>."
 
+#: contrib/admin/templates/admin/auth/user/change_password.html:35
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:61 contrib/auth/forms.py:186
+msgid "Password"
+msgstr "Heslo"
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:41
+#: contrib/admin/templates/registration/password_change_form.html:37
+#: contrib/auth/forms.py:187
+msgid "Password (again)"
+msgstr "Heslo (znova)"
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:42
+#: contrib/auth/forms.py:19
+msgid "Enter the same password as above, for verification."
+msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie."
+
+#: contrib/admin/templates/admin/edit_inline/stacked.html:64
+#: contrib/admin/templates/admin/edit_inline/tabular.html:110
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr "Pridať ďalší %(verbose_name)s"
+
+#: contrib/admin/templates/admin/edit_inline/stacked.html:67
+#: contrib/admin/templates/admin/edit_inline/tabular.html:113
+#: contrib/comments/templates/comments/delete.html:12
+msgid "Remove"
+msgstr "Odstrániť"
+
 #: contrib/admin/templates/admin/edit_inline/tabular.html:15
 msgid "Delete?"
-msgstr "Odstrániť?"
+msgstr "Zmazať?"
 
 #: contrib/admin/templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
@@ -813,9 +904,9 @@ msgid "Log in again"
 msgstr "Znova sa prihlásiť"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
+#: contrib/admin/templates/registration/password_change_form.html:5
+#: contrib/admin/templates/registration/password_change_form.html:7
+#: contrib/admin/templates/registration/password_change_form.html:19
 msgid "Password change"
 msgstr "Zmena hesla"
 
@@ -828,28 +919,28 @@ msgstr "Zmena hesla úspešná"
 msgid "Your password was changed."
 msgstr "Vaše heslo bolo zmenené."
 
-#: contrib/admin/templates/registration/password_change_form.html:12
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Z bezpečnostných dôvodov zadajte staré heslo a potom nové heslo dvakrát, aby sme mohli overiť, že ste ho zadali správne."
-
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Staré heslo:"
-
-#: contrib/admin/templates/registration/password_change_form.html:19
-#: contrib/admin/templates/registration/password_reset_confirm.html:18
-msgid "New password:"
-msgstr "Nové heslo:"
-
 #: contrib/admin/templates/registration/password_change_form.html:21
-#: contrib/admin/templates/registration/password_reset_confirm.html:20
-msgid "Confirm password:"
-msgstr "Potvrdenie hesla:"
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Z bezpečnostných dôvodov zadajte staré heslo a potom nové heslo dvakrát, aby "
+"sme mohli overiť, že ste ho zadali správne."
 
-#: contrib/admin/templates/registration/password_change_form.html:23
+#: contrib/admin/templates/registration/password_change_form.html:27
+#: contrib/auth/forms.py:170
+msgid "Old password"
+msgstr "Staré heslo"
+
+#: contrib/admin/templates/registration/password_change_form.html:32
+#: contrib/auth/forms.py:144
+msgid "New password"
+msgstr "Nové heslo"
+
+#: contrib/admin/templates/registration/password_change_form.html:43
 #: contrib/admin/templates/registration/password_reset_confirm.html:21
 msgid "Change my password"
-msgstr "Zmena môjho hesla"
+msgstr "Zmeniť moje heslo"
 
 #: contrib/admin/templates/registration/password_reset_complete.html:4
 #: contrib/admin/templates/registration/password_reset_confirm.html:6
@@ -878,16 +969,31 @@ msgid "Enter new password"
 msgstr "Zadajte nové heslo"
 
 #: contrib/admin/templates/registration/password_reset_confirm.html:14
-msgid "Please enter your new password twice so we can verify you typed it in correctly."
-msgstr "Zadajte nové heslo dvakrát, aby sme mohli overiť, že ste ho zadali správne."
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+"Zadajte nové heslo dvakrát, aby sme mohli overiť, že ste ho zadali správne."
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:18
+msgid "New password:"
+msgstr "Nové heslo:"
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:20
+msgid "Confirm password:"
+msgstr "Potvrdenie hesla:"
 
 #: contrib/admin/templates/registration/password_reset_confirm.html:26
 msgid "Password reset unsuccessful"
 msgstr "Obnova hesla sa nepodarila"
 
 #: contrib/admin/templates/registration/password_reset_confirm.html:28
-msgid "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset."
-msgstr "Odkaz na obnovenie hesla je neplatný, pretože pravdepodobne už bol raz použitý. Požiadajte znovu o obnovu hesla, prosím."
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+"Odkaz na obnovenie hesla je neplatný, pretože už bol pravdepodobne raz "
+"použitý. Prosím, požiadajte znovu o obnovu hesla."
 
 #: contrib/admin/templates/registration/password_reset_done.html:6
 #: contrib/admin/templates/registration/password_reset_done.html:10
@@ -895,12 +1001,16 @@ msgid "Password reset successful"
 msgstr "Obnovenie hesla úspešné"
 
 #: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Poslali sme vám e-mailom návod na nastavenie vášho hesla na mailovú adresu, ktorú ste zadali.Mali by ste ho zakrátko dostať."
+msgid ""
+"We've e-mailed you instructions for setting your password to the e-mail "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+"Na uvedenú e-mailovú adresu sme vám poslali návod na obnovenie hesla. Mali "
+"by ste ho zakrátko dostať."
 
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Dostávate túto elektronickú poštu, pretože ste si vyžiadali obnovenie hesla."
+msgstr "Obdržali ste tento e-mail, pretože ste si vyžiadali obnovenie hesla."
 
 #: contrib/admin/templates/registration/password_reset_email.html:3
 #, python-format
@@ -925,54 +1035,54 @@ msgid "The %(site_name)s team"
 msgstr "Tím %(site_name)s"
 
 #: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one."
-msgstr "Zabudli ste svoje heslo? Zadajte svoju e-mail adresu a my Vám pošleme inštrukcie pre nastavenie nového."
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"instructions for setting a new one."
+msgstr ""
+"Zabudli ste heslo? Zadajte svoju e-mail adresu a my Vám pošleme inštrukcie "
+"pre nastavenie nového."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
-msgstr "E-mail adresa:"
+msgstr "E-mailová adresa:"
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "Reset my password"
 msgstr "Obnova môjho hesla"
 
-#: contrib/admin/templatetags/admin_list.py:299
+#: contrib/admin/templatetags/admin_list.py:239
 msgid "All dates"
 msgstr "Všetky dátumy"
 
-#: contrib/admin/views/main.py:70
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr "Vybrať %s"
 
-#: contrib/admin/views/main.py:70
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr "Vybrať \"%s\" na úpravu"
 
-#: contrib/admin/views/template.py:37
-#: contrib/sites/models.py:38
+#: contrib/admin/views/template.py:38 contrib/sites/models.py:38
 msgid "site"
 msgstr "stránka"
 
-#: contrib/admin/views/template.py:39
+#: contrib/admin/views/template.py:40
 msgid "template"
 msgstr "šablóna"
 
-#: contrib/admindocs/views.py:61
-#: contrib/admindocs/views.py:63
+#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
 #: contrib/admindocs/views.py:65
 msgid "tag:"
 msgstr "značka:"
 
-#: contrib/admindocs/views.py:94
-#: contrib/admindocs/views.py:96
+#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
 #: contrib/admindocs/views.py:98
 msgid "filter:"
 msgstr "filter:"
 
-#: contrib/admindocs/views.py:158
-#: contrib/admindocs/views.py:160
+#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
 #: contrib/admindocs/views.py:162
 msgid "view:"
 msgstr "pohľad:"
@@ -992,29 +1102,23 @@ msgstr "Model %(model_name)r sa nenachádza v aplikácii %(app_label)r"
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "súvisiaci objekt `%(app_label)s.%(data_type)s`"
 
-#: contrib/admindocs/views.py:209
-#: contrib/admindocs/views.py:228
-#: contrib/admindocs/views.py:233
-#: contrib/admindocs/views.py:247
-#: contrib/admindocs/views.py:261
-#: contrib/admindocs/views.py:266
+#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
 msgid "model:"
 msgstr "model:"
 
-#: contrib/admindocs/views.py:224
-#: contrib/admindocs/views.py:256
+#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "súvisiace objekty `%(app_label)s.%(object_name)s`"
 
-#: contrib/admindocs/views.py:228
-#: contrib/admindocs/views.py:261
+#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
 #, python-format
 msgid "all %s"
 msgstr "všetky %s"
 
-#: contrib/admindocs/views.py:233
-#: contrib/admindocs/views.py:266
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
 #, python-format
 msgid "number of %s"
 msgstr "počet %s"
@@ -1024,97 +1128,7 @@ msgstr "počet %s"
 msgid "Fields on %s objects"
 msgstr "Polia objektov %s"
 
-#: contrib/admindocs/views.py:334
-#: contrib/admindocs/views.py:345
-#: contrib/admindocs/views.py:347
-#: contrib/admindocs/views.py:353
-#: contrib/admindocs/views.py:354
-#: contrib/admindocs/views.py:356
-msgid "Integer"
-msgstr "Celé číslo"
-
-#: contrib/admindocs/views.py:335
-msgid "Boolean (Either True or False)"
-msgstr "Logická hodnota (buď True alebo False)"
-
-#: contrib/admindocs/views.py:336
-#: contrib/admindocs/views.py:355
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr "Reťazec (až do %(max_length)s)"
-
-#: contrib/admindocs/views.py:337
-msgid "Comma-separated integers"
-msgstr "Celé čísla oddelené čiarkou"
-
-#: contrib/admindocs/views.py:338
-msgid "Date (without time)"
-msgstr "Dátum (bez času)"
-
-#: contrib/admindocs/views.py:339
-msgid "Date (with time)"
-msgstr "Dátum (a čas)"
-
-#: contrib/admindocs/views.py:340
-msgid "Decimal number"
-msgstr "Desatinné číslo"
-
-#: contrib/admindocs/views.py:341
-msgid "E-mail address"
-msgstr "E-mail adresa"
-
-#: contrib/admindocs/views.py:342
-#: contrib/admindocs/views.py:343
-#: contrib/admindocs/views.py:346
-msgid "File path"
-msgstr "Cesta k súboru"
-
-#: contrib/admindocs/views.py:344
-msgid "Floating point number"
-msgstr "Číslo s plávajúcou desatinnou čiarkou"
-
-#: contrib/admindocs/views.py:348
-#: contrib/comments/models.py:60
-msgid "IP address"
-msgstr "IP adresa"
-
-#: contrib/admindocs/views.py:350
-msgid "Boolean (Either True, False or None)"
-msgstr "Logická hodnota (buď True, False alebo None)"
-
-#: contrib/admindocs/views.py:351
-msgid "Relation to parent model"
-msgstr "Vzťah k nadradenému modelu"
-
-#: contrib/admindocs/views.py:352
-msgid "Phone number"
-msgstr "Telefónne číslo"
-
-#: contrib/admindocs/views.py:357
-msgid "Text"
-msgstr "Text"
-
-#: contrib/admindocs/views.py:358
-msgid "Time"
-msgstr "Čas"
-
-#: contrib/admindocs/views.py:359
-#: contrib/comments/forms.py:95
-#: contrib/comments/templates/comments/moderation_queue.html:37
-#: contrib/flatpages/admin.py:8
-#: contrib/flatpages/models.py:7
-msgid "URL"
-msgstr "URL"
-
-#: contrib/admindocs/views.py:360
-msgid "U.S. state (two uppercase letters)"
-msgstr "Štát USA (dve veľké písmená)"
-
 #: contrib/admindocs/views.py:361
-msgid "XML text"
-msgstr "XML text"
-
-#: contrib/admindocs/views.py:387
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s nevyzerá ako urlpattern objekt"
@@ -1125,7 +1139,7 @@ msgstr "Záložky"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:4
 msgid "Documentation bookmarklets"
-msgstr "Dokumentačné záložky"
+msgstr "Záložky dokumentácie"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:8
 msgid ""
@@ -1139,24 +1153,36 @@ msgid ""
 msgstr ""
 "\n"
 "<p class=\"help\">Ak chete nainštalovať záložky, pretiahnite odkaz do\n"
-"nástrojovej lišty so záložkami, alebo kliknite pravým tlačidlom myši na odkaz a pridajte ho do záložiek.\n"
-"Následne môžete záložky použiť na stránkach. Poznamenávame, že použitie niektorých záložiek vyžaduje, aby bol váš počítač \"interný\" (ak si nie ste istý, že váš počítač je \"interný\", oslovte svojho systémového správcu).</p>\n"
+"nástrojovej lišty so záložkami, alebo kliknite pravým tlačidlom myši na "
+"odkaz a pridajte ho do záložiek.\n"
+"Následne môžete záložky použiť na stránkach. Poznamenávame, že použitie "
+"niektorých záložiek vyžaduje, aby bol váš počítač \"interný\" (ak si nie ste "
+"istý, že váš počítač je \"interný\", oslovte svojho systémového správcu).</"
+"p>\n"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:18
 msgid "Documentation for this page"
 msgstr "Dokumentácia k tejto stránke"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:19
-msgid "Jumps you from any page to the documentation for the view that generates that page."
-msgstr "Nasmeruje vás z ľubovoľnej stránky do dokumentácie, kde je popísané, ako sa táto stránka generuje."
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Nasmeruje vás z ľubovoľnej stránky do dokumentácie, kde je popísané, ako sa "
+"táto stránka generuje."
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:21
 msgid "Show object ID"
 msgstr "Zobraziť identifikátor objektu"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:22
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Zobrazí content-type a jedinečný identifikátor pre stránky, ktoré reprezentujú samostatný objekt."
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Zobrazí content-type a jedinečný identifikátor pre stránky, ktoré "
+"reprezentujú samostatný objekt."
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:24
 msgid "Edit this object (current window)"
@@ -1164,7 +1190,8 @@ msgstr "Upraviť tento objekt (aktuálne okno)"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:25
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Skočí na stránku správy pre stránky, ktoré reprezentujú samostatný objekt."
+msgstr ""
+"Skočí na stránku správy pre stránky, ktoré reprezentujú samostatný objekt."
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:27
 msgid "Edit this object (new window)"
@@ -1174,219 +1201,272 @@ msgstr "Upraviť tento objekt (nové okno)"
 msgid "As above, but opens the admin page in a new window."
 msgstr "Ako predtým, ale otvorí stránku správy v novom okne."
 
-#: contrib/auth/admin.py:21
+#: contrib/auth/admin.py:29
 msgid "Personal info"
 msgstr "Osobné údaje"
 
-#: contrib/auth/admin.py:22
+#: contrib/auth/admin.py:30
 msgid "Permissions"
 msgstr "Práva"
 
-#: contrib/auth/admin.py:23
+#: contrib/auth/admin.py:31
 msgid "Important dates"
 msgstr "Dôležité dátumy"
 
-#: contrib/auth/admin.py:24
+#: contrib/auth/admin.py:32
 msgid "Groups"
 msgstr "Skupiny"
 
-#: contrib/auth/admin.py:80
-msgid "Add user"
-msgstr "Pridať používateľa"
-
-#: contrib/auth/admin.py:106
+#: contrib/auth/admin.py:114
 msgid "Password changed successfully."
 msgstr "Heslo úspešne zmenené."
 
-#: contrib/auth/admin.py:112
+#: contrib/auth/admin.py:124
 #, python-format
 msgid "Change password: %s"
 msgstr "Zmeniť heslo: %s"
 
-#: contrib/auth/forms.py:15
-#: contrib/auth/forms.py:48
-#: contrib/auth/models.py:128
-msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
-msgstr "Povinné. 30 znakov alebo menej. Len alfanumerické znaky (písmená, čísla a podčiarkovníky)."
+#: contrib/auth/forms.py:14 contrib/auth/forms.py:48 contrib/auth/forms.py:60
+msgid "Username"
+msgstr "Používateľské meno"
 
-#: contrib/auth/forms.py:16
-#: contrib/auth/forms.py:49
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Táto hodnota môže obsahovať len písmená, číslice a podčiarkovníky."
+#: contrib/auth/forms.py:15 contrib/auth/forms.py:49
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Povinné. 30 znakov alebo menej. Iba písmená, čísla a @/./+/-/_."
+
+#: contrib/auth/forms.py:16 contrib/auth/forms.py:50
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Táto hodnota môže obsahovať len písmená, číslice a znaky @/./+/-/_."
 
 #: contrib/auth/forms.py:18
 msgid "Password confirmation"
 msgstr "Potvrdenie hesla"
 
-#: contrib/auth/forms.py:30
+#: contrib/auth/forms.py:31
 msgid "A user with that username already exists."
 msgstr "Používateľ s takým používateľským menom už existuje."
 
-#: contrib/auth/forms.py:36
-#: contrib/auth/forms.py:155
-#: contrib/auth/forms.py:197
+#: contrib/auth/forms.py:37 contrib/auth/forms.py:156
+#: contrib/auth/forms.py:198
 msgid "The two password fields didn't match."
-msgstr "Pole hesla a jeho potvrdenie sa nezhodujú."
+msgstr "Heslo a jeho potvrdenie sa nezhodujú."
 
-#: contrib/auth/forms.py:82
+#: contrib/auth/forms.py:83
 msgid "This account is inactive."
 msgstr "Tento účet je neaktívny."
 
-#: contrib/auth/forms.py:87
-msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
-msgstr "Váš prehliadač nemá povolené cookies. Cookies sú potrebné pre prihlásenie."
+#: contrib/auth/forms.py:88
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Váš prehliadač nemá povolené cookies. Cookies sú potrebné pre prihlásenie."
 
-#: contrib/auth/forms.py:100
+#: contrib/auth/forms.py:101
 msgid "E-mail"
 msgstr "E-mail"
 
-#: contrib/auth/forms.py:109
-msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
-msgstr "Táto e-mail adresa nemá priradený žiadny používateľský účet. Ste si istý, že ste sa zaregistrovali?"
+#: contrib/auth/forms.py:110
+msgid ""
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+"Táto e-mail adresa nemá priradený žiadny používateľský účet. Ste si istý, že "
+"ste sa zaregistrovali?"
 
-#: contrib/auth/forms.py:135
+#: contrib/auth/forms.py:136
 #, python-format
 msgid "Password reset on %s"
 msgstr "Obnovenie hesla na %s"
 
-#: contrib/auth/forms.py:143
-msgid "New password"
-msgstr "Nové heslo"
-
-#: contrib/auth/forms.py:144
+#: contrib/auth/forms.py:145
 msgid "New password confirmation"
 msgstr "Potvrdenie nového hesla"
 
-#: contrib/auth/forms.py:169
-msgid "Old password"
-msgstr "Staré heslo"
-
-#: contrib/auth/forms.py:177
+#: contrib/auth/forms.py:178
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Nezadali ste správne svoje staré heslo. Napíšte ho znovu, prosím."
 
-#: contrib/auth/models.py:63
-#: contrib/auth/models.py:86
+#: contrib/auth/models.py:66 contrib/auth/models.py:94
 msgid "name"
 msgstr "meno"
 
-#: contrib/auth/models.py:65
-msgid "codename"
-msgstr "kódový názov"
-
 #: contrib/auth/models.py:68
+msgid "codename"
+msgstr "kódové meno"
+
+#: contrib/auth/models.py:72
 msgid "permission"
 msgstr "oprávnenie"
 
-#: contrib/auth/models.py:69
-#: contrib/auth/models.py:87
+#: contrib/auth/models.py:73 contrib/auth/models.py:95
 msgid "permissions"
 msgstr "oprávnenia"
 
-#: contrib/auth/models.py:90
+#: contrib/auth/models.py:98
 msgid "group"
 msgstr "skupina"
 
-#: contrib/auth/models.py:91
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:99 contrib/auth/models.py:206
 msgid "groups"
 msgstr "skupiny"
 
-#: contrib/auth/models.py:128
+#: contrib/auth/models.py:196
 msgid "username"
 msgstr "používateľské meno"
 
-#: contrib/auth/models.py:129
+#: contrib/auth/models.py:196
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Povinné. 30 znakov alebo menej. Len písmená, číslice a znaky @/./+/-/_."
+
+#: contrib/auth/models.py:197
 msgid "first name"
 msgstr "krstné meno"
 
-#: contrib/auth/models.py:130
+#: contrib/auth/models.py:198
 msgid "last name"
 msgstr "priezvisko"
 
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:199
 msgid "e-mail address"
-msgstr "e-mail adresa"
+msgstr "e-mailová adresa"
 
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:200
 msgid "password"
 msgstr "heslo"
 
-#: contrib/auth/models.py:132
-msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
-msgstr "Použite '[algo]$[salt]$[hexdigest]' alebo <a href=\"password/\">formulár na zmenu hesla</a>."
+#: contrib/auth/models.py:200
+msgid ""
+"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
+"password form</a>."
+msgstr ""
+"Použite '[algo]$[salt]$[hexdigest]' alebo <a href=\"password/\">formulár na "
+"zmenu hesla</a>."
 
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:201
 msgid "staff status"
 msgstr "postavenie zamestnanca"
 
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:201
 msgid "Designates whether the user can log into this admin site."
 msgstr "Určuje, či sa používateľ môže prihlásiť do správy stránok."
 
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:202
 msgid "active"
 msgstr "aktívny"
 
-#: contrib/auth/models.py:134
-msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
-msgstr "Určuje, či je účet aktívny. Odškrtnite, ak chcete vypnúť používateľský účet."
+#: contrib/auth/models.py:202
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Určuje, či je účet aktívny. Odškrtnite, ak chcete vypnúť používateľský účet."
 
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:203
 msgid "superuser status"
-msgstr "stav superpoužívateľa"
+msgstr "status superpoužívateľa"
 
-#: contrib/auth/models.py:135
-msgid "Designates that this user has all permissions without explicitly assigning them."
-msgstr "Určuje, či používateľ získava automaticky všetky práva aj bez priameho priradenia."
+#: contrib/auth/models.py:203
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Určuje, či používateľ získava automaticky všetky práva aj bez priameho "
+"priradenia."
 
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:204
 msgid "last login"
 msgstr "naposledy prihlásený"
 
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:205
 msgid "date joined"
 msgstr "dátum registrácie"
 
-#: contrib/auth/models.py:139
-msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "Okrem ručne zadaných práv bude mať používateľ aj všetky práva prislúchajúce skupinám, v ktorých sa nachádza."
+#: contrib/auth/models.py:207
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Okrem ručne zadaných práv bude mať používateľ aj všetky práva prislúchajúce "
+"skupinám, v ktorých sa nachádza."
 
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:208
 msgid "user permissions"
-msgstr "používateľské práva"
+msgstr "používateľské oprávnenia"
 
-#: contrib/auth/models.py:144
-#: contrib/comments/models.py:50
+#: contrib/auth/models.py:212 contrib/comments/models.py:50
 #: contrib/comments/models.py:168
 msgid "user"
 msgstr "používateľ"
 
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:213
 msgid "users"
 msgstr "používatelia"
 
-#: contrib/auth/models.py:301
+#: contrib/auth/models.py:394
 msgid "message"
 msgstr "správa"
 
-#: contrib/auth/views.py:56
+#: contrib/auth/views.py:79
 msgid "Logged out"
 msgstr "Odhlásený"
 
 #: contrib/auth/management/commands/createsuperuser.py:23
-#: forms/fields.py:428
+#: core/validators.py:120 forms/fields.py:428
 msgid "Enter a valid e-mail address."
-msgstr "Zadajte platnú e-mail adresu."
+msgstr "Zadajte platnú e-mailovú adresu."
 
-#: contrib/comments/admin.py:11
+#: contrib/comments/admin.py:12
 msgid "Content"
 msgstr "Obsah"
 
-#: contrib/comments/admin.py:14
+#: contrib/comments/admin.py:15
 msgid "Metadata"
 msgstr "Metaúdaje"
 
+#: contrib/comments/admin.py:40
+msgid "flagged"
+msgid_plural "flagged"
+msgstr[0] "označený"
+msgstr[1] "označené"
+msgstr[2] "označených"
+
+#: contrib/comments/admin.py:41
+msgid "Flag selected comments"
+msgstr "Označiť vybraný komentár"
+
+#: contrib/comments/admin.py:45
+msgid "approved"
+msgid_plural "approved"
+msgstr[0] "schválený"
+msgstr[1] "schválené"
+msgstr[2] "schválených"
+
+#: contrib/comments/admin.py:46
+msgid "Approve selected comments"
+msgstr "Schváliť vybraný komentár"
+
+#: contrib/comments/admin.py:50
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] "odstránený"
+msgstr[1] "odstránené"
+msgstr[2] "odstránených"
+
+#: contrib/comments/admin.py:51
+msgid "Remove selected comments"
+msgstr "Odstrániť vybrané komentáre"
+
+#: contrib/comments/admin.py:63
+#, python-format
+msgid "1 comment was successfully %(action)s."
+msgid_plural "%(count)s comments were successfully %(action)s."
+msgstr[0] "1 komentár bol úspešne %(action)s."
+msgstr[1] "%(count)s komentáre boli úspešne %(action)s."
+msgstr[2] "%(count)s komentárov bolo úspešne %(action)s."
+
 #: contrib/comments/feeds.py:13
 #, python-format
 msgid "%(site_name)s comments"
@@ -1398,7 +1478,6 @@ msgid "Latest comments on %(site_name)s"
 msgstr "Najnovšie komentáre na %(site_name)s"
 
 #: contrib/comments/forms.py:93
-#: contrib/comments/templates/comments/moderation_queue.html:34
 msgid "Name"
 msgstr "Meno"
 
@@ -1406,25 +1485,30 @@ msgstr "Meno"
 msgid "Email address"
 msgstr "E-mail adresa"
 
+#: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
+#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1101
+msgid "URL"
+msgstr "URL"
+
 #: contrib/comments/forms.py:96
-#: contrib/comments/templates/comments/moderation_queue.html:35
 msgid "Comment"
 msgstr "Komentár"
 
-#: contrib/comments/forms.py:173
+#: contrib/comments/forms.py:175
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "Vyjadrujte sa slušne! Slová %s tu nie je dovolené používať."
-msgstr[1] "Vyjadrujte sa slušne! Slovo %s tu nie je dovolené používať."
+msgstr[0] "Vyjadrujte sa slušne! Slovo %s tu nie je dovolené používať."
+msgstr[1] "Vyjadrujte sa slušne! Slová %s tu nie je dovolené používať."
 msgstr[2] "Vyjadrujte sa slušne! Slová %s tu nie je dovolené používať."
 
-#: contrib/comments/forms.py:180
-msgid "If you enter anything in this field your comment will be treated as spam"
-msgstr "Ak ste do tohoto poľa čokoľvek zadali, váš komentár bude považovaný za spam"
+#: contrib/comments/forms.py:182
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+"Ak ste do tohoto poľa čokoľvek zadali, váš komentár bude považovaný za spam"
 
-#: contrib/comments/models.py:22
-#: contrib/contenttypes/models.py:74
+#: contrib/comments/models.py:22 contrib/contenttypes/models.py:81
 msgid "content type"
 msgstr "typ obsahu"
 
@@ -1444,8 +1528,7 @@ msgstr "e-mail adresa používateľa"
 msgid "user's URL"
 msgstr "URL používateľa"
 
-#: contrib/comments/models.py:56
-#: contrib/comments/models.py:76
+#: contrib/comments/models.py:56 contrib/comments/models.py:76
 #: contrib/comments/models.py:169
 msgid "comment"
 msgstr "komentár"
@@ -1454,33 +1537,51 @@ msgstr "komentár"
 msgid "date/time submitted"
 msgstr "dátum a čas odoslania"
 
+#: contrib/comments/models.py:60 db/models/fields/__init__.py:896
+msgid "IP address"
+msgstr "IP adresa"
+
 #: contrib/comments/models.py:61
 msgid "is public"
 msgstr "je verejný"
 
 #: contrib/comments/models.py:62
-msgid "Uncheck this box to make the comment effectively disappear from the site."
-msgstr "Ak chcete, aby komentár zmizol zo stránky, zrušte zaškrtnutie tohoto políčka."
+msgid ""
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr ""
+"Ak chcete, aby komentár zmizol zo stránky, zrušte zaškrtnutie tohoto políčka."
 
 #: contrib/comments/models.py:64
 msgid "is removed"
 msgstr "je odstránený"
 
 #: contrib/comments/models.py:65
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-msgstr "Zaškrtnite toto pole, ak je komentár nevhodný. Namiesto neho sa zobrazí správa \"Tento komenár bol odstránený\"."
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Zaškrtnite toto pole, ak je komentár nevhodný. Namiesto neho sa zobrazí "
+"správa \"Tento komenár bol odstránený\"."
 
 #: contrib/comments/models.py:77
 msgid "comments"
 msgstr "komentáre"
 
 #: contrib/comments/models.py:119
-msgid "This comment was posted by an authenticated user and thus the name is read-only."
-msgstr "Tento komentár je od autentifikovaného používateľa a preto je jeho meno len na čítanie."
+msgid ""
+"This comment was posted by an authenticated user and thus the name is read-"
+"only."
+msgstr ""
+"Tento komentár je od autentifikovaného používateľa a preto je jeho meno len "
+"na čítanie."
 
 #: contrib/comments/models.py:128
-msgid "This comment was posted by an authenticated user and thus the email is read-only."
-msgstr "Tento komentár je od autentifikovaného používateľa a preto je jeho e-mail len na čítanie."
+msgid ""
+"This comment was posted by an authenticated user and thus the email is read-"
+"only."
+msgstr ""
+"Tento komentár je od autentifikovaného používateľa a preto je jeho e-mail "
+"len na čítanie."
 
 #: contrib/comments/models.py:153
 #, python-format
@@ -1522,7 +1623,6 @@ msgid "Really make this comment public?"
 msgstr "Skutočne chcete zverejniť tento komentár?"
 
 #: contrib/comments/templates/comments/approve.html:12
-#: contrib/comments/templates/comments/moderation_queue.html:49
 msgid "Approve"
 msgstr "Povoliť"
 
@@ -1533,8 +1633,10 @@ msgstr "Ďakujeme za povolenie"
 #: contrib/comments/templates/comments/approved.html:7
 #: contrib/comments/templates/comments/deleted.html:7
 #: contrib/comments/templates/comments/flagged.html:7
-msgid "Thanks for taking the time to improve the quality of discussion on our site"
-msgstr "Ďakujeme za čas, ktorý ste venovali zvýšniu kvality diskusie na našej stránke"
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr ""
+"Ďakujeme za čas, ktorý ste venovali zvýšniu kvality diskusie na našej stránke"
 
 #: contrib/comments/templates/comments/delete.html:4
 msgid "Remove a comment"
@@ -1544,11 +1646,6 @@ msgstr "Zmazať komentár"
 msgid "Really remove this comment?"
 msgstr "Naozaj chcete zmazať tento komentár?"
 
-#: contrib/comments/templates/comments/delete.html:12
-#: contrib/comments/templates/comments/moderation_queue.html:53
-msgid "Remove"
-msgstr "Odstrániť"
-
 #: contrib/comments/templates/comments/deleted.html:4
 msgid "Thanks for removing"
 msgstr "Ďakujeme za odstránenie"
@@ -1579,39 +1676,6 @@ msgstr "Poslať"
 msgid "Preview"
 msgstr "Náhľad"
 
-#: contrib/comments/templates/comments/moderation_queue.html:4
-#: contrib/comments/templates/comments/moderation_queue.html:19
-msgid "Comment moderation queue"
-msgstr "Rad komentárov čakajúcich na schválenie"
-
-#: contrib/comments/templates/comments/moderation_queue.html:26
-msgid "No comments to moderate"
-msgstr "Žiadne komentáre na schválenie"
-
-#: contrib/comments/templates/comments/moderation_queue.html:36
-msgid "Email"
-msgstr "Email"
-
-#: contrib/comments/templates/comments/moderation_queue.html:38
-msgid "Authenticated?"
-msgstr "Autentifikovaný?"
-
-#: contrib/comments/templates/comments/moderation_queue.html:39
-msgid "IP Address"
-msgstr "IP adresa"
-
-#: contrib/comments/templates/comments/moderation_queue.html:40
-msgid "Date posted"
-msgstr "Dátum odoslania"
-
-#: contrib/comments/templates/comments/moderation_queue.html:63
-msgid "yes"
-msgstr "áno"
-
-#: contrib/comments/templates/comments/moderation_queue.html:63
-msgid "no"
-msgstr "nie"
-
 #: contrib/comments/templates/comments/posted.html:4
 msgid "Thanks for commenting"
 msgstr "Vďaka za komentár"
@@ -1628,8 +1692,8 @@ msgstr "Náhľad komentára"
 #: contrib/comments/templates/comments/preview.html:11
 msgid "Please correct the error below"
 msgid_plural "Please correct the errors below"
-msgstr[0] "Opravte, prosím, chyby uvedené nižšie"
-msgstr[1] "Opravte, prosím, chybu uvedenú nižšie"
+msgstr[0] "Opravte, prosím, chybu uvedenú nižšie"
+msgstr[1] "Opravte, prosím, chyby uvedené nižšie"
 msgstr[2] "Opravte, prosím, chyby uvedené nižšie"
 
 #: contrib/comments/templates/comments/preview.html:16
@@ -1640,21 +1704,27 @@ msgstr "Poslať váš komentár"
 msgid "or make changes"
 msgstr "alebo urobiť zmeny"
 
-#: contrib/contenttypes/models.py:70
+#: contrib/contenttypes/models.py:77
 msgid "python model class name"
 msgstr "pythonovské meno triedy modelu"
 
-#: contrib/contenttypes/models.py:75
+#: contrib/contenttypes/models.py:82
 msgid "content types"
 msgstr "typy obsahu"
 
 #: contrib/flatpages/admin.py:9
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Príklad: '/about/contact/'. Uistite sa, že máte lomky na začiatku a na konci."
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Príklad: '/about/contact/'. Uistite sa, že máte lomky na začiatku a na konci."
 
 #: contrib/flatpages/admin.py:11
-msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
-msgstr "Táto hodnota môže obsahovať len písmená, číslice, podčiarkovniky, pomlčky a lomky."
+msgid ""
+"This value must contain only letters, numbers, underscores, dashes or "
+"slashes."
+msgstr ""
+"Táto hodnota môže obsahovať len písmená, číslice, podčiarkovniky, pomlčky a "
+"lomky."
 
 #: contrib/flatpages/admin.py:22
 msgid "Advanced options"
@@ -1677,8 +1747,12 @@ msgid "template name"
 msgstr "názov šablóny"
 
 #: contrib/flatpages/models.py:12
-msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."
-msgstr "Príklad: 'flatpages/contact_page.html'. Ak nič nenapíšete, systém použije 'flatpages/default.html'."
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+"Príklad: 'flatpages/contact_page.html'. Ak nič nenapíšete, systém použije "
+"'flatpages/default.html'."
 
 #: contrib/flatpages/models.py:13
 msgid "registration required"
@@ -1686,7 +1760,9 @@ msgstr "nutná registrácia"
 
 #: contrib/flatpages/models.py:13
 msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Ak je toto zaškrtnuté, stránku budú môcť prezerať len prihlásení používatelia."
+msgstr ""
+"Ak je toto zaškrtnuté, stránku budú môcť prezerať len prihlásení "
+"používatelia."
 
 #: contrib/flatpages/models.py:18
 msgid "flat page"
@@ -1696,9 +1772,45 @@ msgstr "statická stránka"
 msgid "flat pages"
 msgstr "statické stránky"
 
-#: contrib/formtools/wizard.py:130
-msgid "We apologize, but your form has expired. Please continue filling out the form from this page."
-msgstr "Ospravedlňujeme sa, ale platnosť formulára vypršala. Prosím, pokračujte vo vypĺňaní z tejto stránky."
+#: contrib/formtools/wizard.py:140
+msgid ""
+"We apologize, but your form has expired. Please continue filling out the "
+"form from this page."
+msgstr ""
+"Ospravedlňujeme sa, ale platnosť formulára vypršala. Prosím, pokračujte vo "
+"vypĺňaní z tejto stránky."
+
+#: contrib/gis/db/models/fields.py:50
+msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
+msgstr "Základné GIS pole -- mapuje na typ OpenGIS Specification Geometry"
+
+#: contrib/gis/db/models/fields.py:270
+msgid "Point"
+msgstr "Bod"
+
+#: contrib/gis/db/models/fields.py:274
+msgid "Line string"
+msgstr "Čiara"
+
+#: contrib/gis/db/models/fields.py:278
+msgid "Polygon"
+msgstr "Polygón"
+
+#: contrib/gis/db/models/fields.py:282
+msgid "Multi-point"
+msgstr "Viacero bodov"
+
+#: contrib/gis/db/models/fields.py:286
+msgid "Multi-line string"
+msgstr "Viacero čiar"
+
+#: contrib/gis/db/models/fields.py:290
+msgid "Multi polygon"
+msgstr "Viacero polygónov"
+
+#: contrib/gis/db/models/fields.py:294
+msgid "Geometry collection"
+msgstr "Goemetrická kolekcia"
 
 #: contrib/gis/forms/fields.py:17
 msgid "No geometry value provided."
@@ -1713,7 +1825,9 @@ msgid "Invalid geometry type."
 msgstr "Chybný geometrický typ."
 
 #: contrib/gis/forms/fields.py:20
-msgid "An error occurred when transforming the geometry to the SRID of the geometry form field."
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
 msgstr "Nastala chyba pri prevode geometrie do SRID z formulárového poľa."
 
 #: contrib/humanize/templatetags/humanize.py:19
@@ -1736,25 +1850,25 @@ msgstr "rd"
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
-msgstr[0] "%(value).1f miliónov"
-msgstr[1] "%(value).1f milión"
-msgstr[2] "%(value).1f milióny"
+msgstr[0] "%(value).1f milión"
+msgstr[1] "%(value).1f milióny"
+msgstr[2] "%(value).1f miliónov"
 
 #: contrib/humanize/templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
-msgstr[0] "%(value).1f miliárd"
-msgstr[1] "%(value).1f miliarda"
-msgstr[2] "%(value).1f miliardy"
+msgstr[0] "%(value).1f miliárda"
+msgstr[1] "%(value).1f miliardy"
+msgstr[2] "%(value).1f miliárd"
 
 #: contrib/humanize/templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
-msgstr[0] "%(value).1f biliónov"
-msgstr[1] "%(value).1f bilión"
-msgstr[2] "%(value).1f bilióny"
+msgstr[0] "%(value).1f bilión"
+msgstr[1] "%(value).1f bilióny"
+msgstr[2] "%(value).1f biliónov"
 
 #: contrib/humanize/templatetags/humanize.py:73
 msgid "one"
@@ -1804,27 +1918,25 @@ msgstr "zajtra"
 msgid "yesterday"
 msgstr "včera"
 
-#: contrib/localflavor/ar/forms.py:27
+#: contrib/localflavor/ar/forms.py:28
 msgid "Enter a postal code in the format NNNN or ANNNNAAA."
 msgstr "Zadajte poštové smerovacie číslo v tvare NNNN alebo ANNNNAAA."
 
-#: contrib/localflavor/ar/forms.py:49
-#: contrib/localflavor/br/forms.py:96
-#: contrib/localflavor/br/forms.py:135
-#: contrib/localflavor/pe/forms.py:23
-#: contrib/localflavor/pe/forms.py:51
+#: contrib/localflavor/ar/forms.py:50 contrib/localflavor/br/forms.py:92
+#: contrib/localflavor/br/forms.py:131 contrib/localflavor/pe/forms.py:24
+#: contrib/localflavor/pe/forms.py:52
 msgid "This field requires only numbers."
 msgstr "Toto pole môže obsahovať len čísla."
 
-#: contrib/localflavor/ar/forms.py:50
+#: contrib/localflavor/ar/forms.py:51
 msgid "This field requires 7 or 8 digits."
 msgstr "Toto pole vyžaduje 7 alebo 8 číslic."
 
-#: contrib/localflavor/ar/forms.py:79
+#: contrib/localflavor/ar/forms.py:80
 msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
 msgstr "Vložte platné CUIT vo formáte XX-XXXXXXXX-X alebo XXXXXXXXXXXX."
 
-#: contrib/localflavor/ar/forms.py:80
+#: contrib/localflavor/ar/forms.py:81
 msgid "Invalid CUIT."
 msgstr "Neplatné CUIT."
 
@@ -1864,55 +1976,59 @@ msgstr "Vorarlbersko"
 msgid "Vienna"
 msgstr "Viedeň"
 
-#: contrib/localflavor/at/forms.py:20
-#: contrib/localflavor/ch/forms.py:16
-#: contrib/localflavor/no/forms.py:12
+#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:17
+#: contrib/localflavor/no/forms.py:13
 msgid "Enter a zip code in the format XXXX."
 msgstr "Zadajte poštové smerovacie číslo v tvare XXXX."
 
 #: contrib/localflavor/at/forms.py:48
 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Zadajte platné rakúske číslo sociálneho poistenia vo formáte XXXX XXXXXX."
+msgstr ""
+"Zadajte platné rakúske číslo sociálneho poistenia vo formáte XXXX XXXXXX."
 
-#: contrib/localflavor/au/forms.py:16
+#: contrib/localflavor/au/forms.py:17
 msgid "Enter a 4 digit post code."
 msgstr "Zadajte štvorciferné poštové smerovacie číslo."
 
-#: contrib/localflavor/br/forms.py:21
+#: contrib/localflavor/br/forms.py:17
 msgid "Enter a zip code in the format XXXXX-XXX."
 msgstr "Zadajte poštové smerovacie číslo v tvare XXXXX-XXX."
 
-#: contrib/localflavor/br/forms.py:30
+#: contrib/localflavor/br/forms.py:26
 msgid "Phone numbers must be in XX-XXXX-XXXX format."
 msgstr "Telefónne čísla musia byť vo formáte XX-XXXX-XXXX."
 
-#: contrib/localflavor/br/forms.py:58
-msgid "Select a valid brazilian state. That state is not one of the available states."
-msgstr "Vyberte platný brazílsky štát. Tento štát nepatrí medzi existujúce štáty."
+#: contrib/localflavor/br/forms.py:54
+msgid ""
+"Select a valid brazilian state. That state is not one of the available "
+"states."
+msgstr ""
+"Vyberte platný brazílsky štát. Tento štát nepatrí medzi existujúce štáty."
 
-#: contrib/localflavor/br/forms.py:94
+#: contrib/localflavor/br/forms.py:90
 msgid "Invalid CPF number."
 msgstr "Chybné CPF číslo."
 
-#: contrib/localflavor/br/forms.py:95
+#: contrib/localflavor/br/forms.py:91
 msgid "This field requires at most 11 digits or 14 characters."
 msgstr "Toto pole môže mať najviac 11 čísel alebo 14 písmen."
 
-#: contrib/localflavor/br/forms.py:134
+#: contrib/localflavor/br/forms.py:130
 msgid "Invalid CNPJ number."
 msgstr "Chybné CNPJ číslo."
 
-#: contrib/localflavor/br/forms.py:136
+#: contrib/localflavor/br/forms.py:132
 msgid "This field requires at least 14 digits"
 msgstr "Toto pole vyžaduje minimálne 14 číslic"
 
-#: contrib/localflavor/ca/forms.py:17
+#: contrib/localflavor/ca/forms.py:25
 msgid "Enter a postal code in the format XXX XXX."
 msgstr "Zadajte poštové smerovacie číslo v tvare XXX XXX."
 
-#: contrib/localflavor/ca/forms.py:88
+#: contrib/localflavor/ca/forms.py:96
 msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Zadajte platné číslo kanadského sociálneho poistenia vo formáte XXX-XXX-XX."
+msgstr ""
+"Zadajte platné číslo kanadského sociálneho poistenia vo formáte XXX-XXX-XX."
 
 #: contrib/localflavor/ch/ch_states.py:5
 msgid "Aargau"
@@ -2018,19 +2134,23 @@ msgstr "Zug"
 msgid "Zurich"
 msgstr "Zurich"
 
-#: contrib/localflavor/ch/forms.py:64
-msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
-msgstr "Vložte platné švajčiarske číslo občianskeho preukazu alebo pasu vo formáte X1234567<0 alebo 1234567890."
+#: contrib/localflavor/ch/forms.py:65
+msgid ""
+"Enter a valid Swiss identity or passport card number in X1234567<0 or "
+"1234567890 format."
+msgstr ""
+"Vložte platné švajčiarske číslo občianskeho preukazu alebo pasu vo formáte "
+"X1234567<0 alebo 1234567890."
 
-#: contrib/localflavor/cl/forms.py:29
+#: contrib/localflavor/cl/forms.py:30
 msgid "Enter a valid Chilean RUT."
 msgstr "Vložte platné čilské RUT."
 
-#: contrib/localflavor/cl/forms.py:30
+#: contrib/localflavor/cl/forms.py:31
 msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
 msgstr "Vložte platné čilské RUT. Formát je XX.XXX.XXX-X."
 
-#: contrib/localflavor/cl/forms.py:31
+#: contrib/localflavor/cl/forms.py:32
 msgid "The Chilean RUT is not valid."
 msgstr "Čilské RUT nie je platné."
 
@@ -2090,24 +2210,23 @@ msgstr "Žlínsky kraj"
 msgid "Moravian-Silesian Region"
 msgstr "Moravskosliezsky kraj"
 
-#: contrib/localflavor/cz/forms.py:27
-#: contrib/localflavor/sk/forms.py:30
+#: contrib/localflavor/cz/forms.py:28 contrib/localflavor/sk/forms.py:30
 msgid "Enter a postal code in the format XXXXX or XXX XX."
 msgstr "Zadajte poštové smerovacie číslo v tvare XXXXX alebo XXX XX."
 
-#: contrib/localflavor/cz/forms.py:47
+#: contrib/localflavor/cz/forms.py:48
 msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
 msgstr "Zadajte rodné číslo vo formáte XXXXXX/XXXX alebo XXXXXXXXXX."
 
-#: contrib/localflavor/cz/forms.py:48
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Neplatný voliteľný parameter Pohlavie, platné hodnoty sú 'f' a 'm'"
-
 #: contrib/localflavor/cz/forms.py:49
+msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
+msgstr "Neplatný voliteľný parameter pohlavie, platné hodnoty sú 'f' a 'm'"
+
+#: contrib/localflavor/cz/forms.py:50
 msgid "Enter a valid birth number."
 msgstr "Zadajte platné rodné číslo."
 
-#: contrib/localflavor/cz/forms.py:106
+#: contrib/localflavor/cz/forms.py:107
 msgid "Enter a valid IC number."
 msgstr "Zadajte platné IC číslo."
 
@@ -2175,15 +2294,18 @@ msgstr "Schleswigsko-Holsteinsko"
 msgid "Thuringia"
 msgstr "Thuringia"
 
-#: contrib/localflavor/de/forms.py:14
-#: contrib/localflavor/fi/forms.py:12
-#: contrib/localflavor/fr/forms.py:15
+#: contrib/localflavor/de/forms.py:15 contrib/localflavor/fi/forms.py:13
+#: contrib/localflavor/fr/forms.py:16
 msgid "Enter a zip code in the format XXXXX."
 msgstr "Vložte poštové smerovacie číslo v tvare XXXXX."
 
-#: contrib/localflavor/de/forms.py:41
-msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format."
-msgstr "Vložte platné nemecké číslo občianskeho preukazu vo formáte XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
+#: contrib/localflavor/de/forms.py:42
+msgid ""
+"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
+"format."
+msgstr ""
+"Vložte platné nemecké číslo občianskeho preukazu vo formáte XXXXXXXXXXX-"
+"XXXXXXX-XXXXXXX-X."
 
 #: contrib/localflavor/es/es_provinces.py:5
 msgid "Arava"
@@ -2452,71 +2574,506 @@ msgstr "Navarra"
 msgid "Valencian Community"
 msgstr "Valencijské spoločenstvo"
 
-#: contrib/localflavor/es/forms.py:19
+#: contrib/localflavor/es/forms.py:20
 msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Zadajte platné poštové smerovacie číslo v rozmedzí a v tvare 01XXX - 52XXX."
+msgstr ""
+"Zadajte platné poštové smerovacie číslo v rozmedzí a v tvare 01XXX - 52XXX."
 
-#: contrib/localflavor/es/forms.py:39
-msgid "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX."
-msgstr "Zadajte platné telefónne číslo v tvare 6XXXXXXXX, 8XXXXXXXX alebo 9XXXXXXXX."
+#: contrib/localflavor/es/forms.py:40
+msgid ""
+"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
+"9XXXXXXXX."
+msgstr ""
+"Zadajte platné telefónne číslo v tvare 6XXXXXXXX, 8XXXXXXXX alebo 9XXXXXXXX."
 
-#: contrib/localflavor/es/forms.py:66
+#: contrib/localflavor/es/forms.py:67
 msgid "Please enter a valid NIF, NIE, or CIF."
 msgstr "Zadajte platné NIF, NIE alebo CIF, prosím."
 
-#: contrib/localflavor/es/forms.py:67
+#: contrib/localflavor/es/forms.py:68
 msgid "Please enter a valid NIF or NIE."
 msgstr "Zadajte platné NIF alebo NIE, prosím."
 
-#: contrib/localflavor/es/forms.py:68
+#: contrib/localflavor/es/forms.py:69
 msgid "Invalid checksum for NIF."
 msgstr "Neplatný kontrolný súčet pre NIF."
 
-#: contrib/localflavor/es/forms.py:69
+#: contrib/localflavor/es/forms.py:70
 msgid "Invalid checksum for NIE."
 msgstr "Neplatný kontrolný súčet pre NIE."
 
-#: contrib/localflavor/es/forms.py:70
+#: contrib/localflavor/es/forms.py:71
 msgid "Invalid checksum for CIF."
 msgstr "Neplatný kontrolný súčet pre CIF."
 
-#: contrib/localflavor/es/forms.py:142
-msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Zadajte, prosím, platné číslo bankového účtu v tvare XXXX-XXXX-XX-XXXXXXXXXX."
-
 #: contrib/localflavor/es/forms.py:143
+msgid ""
+"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
+msgstr ""
+"Zadajte, prosím, platné číslo bankového účtu v tvare XXXX-XXXX-XX-XXXXXXXXXX."
+
+#: contrib/localflavor/es/forms.py:144
 msgid "Invalid checksum for bank account number."
 msgstr "Neplatný kontrolný súčet čísla bankového účtu."
 
-#: contrib/localflavor/fi/forms.py:28
+#: contrib/localflavor/fi/forms.py:29
 msgid "Enter a valid Finnish social security number."
 msgstr "Vložte platné fínske číslo sociálneho poistenia."
 
-#: contrib/localflavor/fr/forms.py:30
+#: contrib/localflavor/fr/forms.py:31
 msgid "Phone numbers must be in 0X XX XX XX XX format."
 msgstr "Telefónne čísla musia mať formát 0X XX XX XX XX."
 
-#: contrib/localflavor/in_/forms.py:14
+#: contrib/localflavor/id/forms.py:28
+msgid "Enter a valid post code"
+msgstr "Zadajte platné poštové smerovacie číslo"
+
+#: contrib/localflavor/id/forms.py:68 contrib/localflavor/nl/forms.py:53
+msgid "Enter a valid phone number"
+msgstr "Zadajte platné telofónne číslo"
+
+#: contrib/localflavor/id/forms.py:107
+msgid "Enter a valid vehicle license plate number"
+msgstr "Zadajte platnú štátnu poznávaciu značku auta"
+
+#: contrib/localflavor/id/forms.py:170
+msgid "Enter a valid NIK/KTP number"
+msgstr "Zadajte platné NIK/KTP číslo"
+
+#: contrib/localflavor/id/id_choices.py:9
+#: contrib/localflavor/id/id_choices.py:73
+msgid "Bali"
+msgstr "Bali"
+
+#: contrib/localflavor/id/id_choices.py:10
+#: contrib/localflavor/id/id_choices.py:45
+msgid "Banten"
+msgstr "Banten"
+
+#: contrib/localflavor/id/id_choices.py:11
+#: contrib/localflavor/id/id_choices.py:54
+msgid "Bengkulu"
+msgstr "Bengkulu"
+
+#: contrib/localflavor/id/id_choices.py:12
+#: contrib/localflavor/id/id_choices.py:47
+msgid "Yogyakarta"
+msgstr "Yogyakarta"
+
+#: contrib/localflavor/id/id_choices.py:13
+#: contrib/localflavor/id/id_choices.py:51
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: contrib/localflavor/id/id_choices.py:14
+#: contrib/localflavor/id/id_choices.py:75
+msgid "Gorontalo"
+msgstr "Gorontalo"
+
+#: contrib/localflavor/id/id_choices.py:15
+#: contrib/localflavor/id/id_choices.py:57
+msgid "Jambi"
+msgstr "Jambi"
+
+#: contrib/localflavor/id/id_choices.py:16
+msgid "Jawa Barat"
+msgstr "Jawa Barat"
+
+#: contrib/localflavor/id/id_choices.py:17
+msgid "Jawa Tengah"
+msgstr "Jawa Tengah"
+
+#: contrib/localflavor/id/id_choices.py:18
+msgid "Jawa Timur"
+msgstr "Jawa Timur"
+
+#: contrib/localflavor/id/id_choices.py:19
+#: contrib/localflavor/id/id_choices.py:88
+msgid "Kalimantan Barat"
+msgstr "Kalimantan Barat"
+
+#: contrib/localflavor/id/id_choices.py:20
+#: contrib/localflavor/id/id_choices.py:66
+msgid "Kalimantan Selatan"
+msgstr "Kalimantan Selatan"
+
+#: contrib/localflavor/id/id_choices.py:21
+#: contrib/localflavor/id/id_choices.py:89
+msgid "Kalimantan Tengah"
+msgstr "Kalimantan Tengah"
+
+#: contrib/localflavor/id/id_choices.py:22
+#: contrib/localflavor/id/id_choices.py:90
+msgid "Kalimantan Timur"
+msgstr "Kalimantan Timur"
+
+#: contrib/localflavor/id/id_choices.py:23
+msgid "Kepulauan Bangka-Belitung"
+msgstr "Kepulauan Bangka-Belitung"
+
+#: contrib/localflavor/id/id_choices.py:24
+#: contrib/localflavor/id/id_choices.py:62
+msgid "Kepulauan Riau"
+msgstr "Kepulauan Riau"
+
+#: contrib/localflavor/id/id_choices.py:25
+#: contrib/localflavor/id/id_choices.py:55
+msgid "Lampung"
+msgstr "Lampung"
+
+#: contrib/localflavor/id/id_choices.py:26
+#: contrib/localflavor/id/id_choices.py:70
+msgid "Maluku"
+msgstr "Maluku"
+
+#: contrib/localflavor/id/id_choices.py:27
+#: contrib/localflavor/id/id_choices.py:71
+msgid "Maluku Utara"
+msgstr "Maluku Utara"
+
+#: contrib/localflavor/id/id_choices.py:28
+#: contrib/localflavor/id/id_choices.py:59
+msgid "Nanggroe Aceh Darussalam"
+msgstr "Nanggroe Aceh Darussalam"
+
+#: contrib/localflavor/id/id_choices.py:29
+msgid "Nusa Tenggara Barat"
+msgstr "Nusa Tenggara Barat"
+
+#: contrib/localflavor/id/id_choices.py:30
+msgid "Nusa Tenggara Timur"
+msgstr "Nusa Tenggara Timur"
+
+#: contrib/localflavor/id/id_choices.py:31
+msgid "Papua"
+msgstr "Papua"
+
+#: contrib/localflavor/id/id_choices.py:32
+msgid "Papua Barat"
+msgstr "Papua Barat"
+
+#: contrib/localflavor/id/id_choices.py:33
+#: contrib/localflavor/id/id_choices.py:60
+msgid "Riau"
+msgstr "Riau"
+
+#: contrib/localflavor/id/id_choices.py:34
+#: contrib/localflavor/id/id_choices.py:68
+msgid "Sulawesi Barat"
+msgstr "Sulawesi Barat"
+
+#: contrib/localflavor/id/id_choices.py:35
+#: contrib/localflavor/id/id_choices.py:69
+msgid "Sulawesi Selatan"
+msgstr "Sulawesi Selatan"
+
+#: contrib/localflavor/id/id_choices.py:36
+#: contrib/localflavor/id/id_choices.py:76
+msgid "Sulawesi Tengah"
+msgstr "Sulawesi Tengah"
+
+#: contrib/localflavor/id/id_choices.py:37
+#: contrib/localflavor/id/id_choices.py:79
+msgid "Sulawesi Tenggara"
+msgstr "Sulawesi Tenggara"
+
+#: contrib/localflavor/id/id_choices.py:38
+msgid "Sulawesi Utara"
+msgstr "Sulawesi Utara"
+
+#: contrib/localflavor/id/id_choices.py:39
+#: contrib/localflavor/id/id_choices.py:52
+msgid "Sumatera Barat"
+msgstr "Sumatera Barat"
+
+#: contrib/localflavor/id/id_choices.py:40
+#: contrib/localflavor/id/id_choices.py:56
+msgid "Sumatera Selatan"
+msgstr "Sumatera Selatan"
+
+#: contrib/localflavor/id/id_choices.py:41
+#: contrib/localflavor/id/id_choices.py:58
+msgid "Sumatera Utara"
+msgstr "Sumatera Utara"
+
+#: contrib/localflavor/id/id_choices.py:46
+msgid "Magelang"
+msgstr "Magelang"
+
+#: contrib/localflavor/id/id_choices.py:48
+msgid "Surakarta - Solo"
+msgstr "Surakarta - Solo"
+
+#: contrib/localflavor/id/id_choices.py:49
+msgid "Madiun"
+msgstr "Madiun"
+
+#: contrib/localflavor/id/id_choices.py:50
+msgid "Kediri"
+msgstr "Kediri"
+
+#: contrib/localflavor/id/id_choices.py:53
+msgid "Tapanuli"
+msgstr "Tapanuli"
+
+#: contrib/localflavor/id/id_choices.py:61
+msgid "Kepulauan Bangka Belitung"
+msgstr "Kepulauan Bangka Belitung"
+
+#: contrib/localflavor/id/id_choices.py:63
+msgid "Corps Consulate"
+msgstr "Corps Consulate"
+
+#: contrib/localflavor/id/id_choices.py:64
+msgid "Corps Diplomatic"
+msgstr "Corps Diplomatic"
+
+#: contrib/localflavor/id/id_choices.py:65
+msgid "Bandung"
+msgstr "Bandung"
+
+#: contrib/localflavor/id/id_choices.py:67
+msgid "Sulawesi Utara Daratan"
+msgstr "Sulawesi Utara Daratan"
+
+#: contrib/localflavor/id/id_choices.py:72
+msgid "NTT - Timor"
+msgstr "NTT - Timor"
+
+#: contrib/localflavor/id/id_choices.py:74
+msgid "Sulawesi Utara Kepulauan"
+msgstr "Sulawesi Utara Kepulauan"
+
+#: contrib/localflavor/id/id_choices.py:77
+msgid "NTB - Lombok"
+msgstr "NTB - Lombok"
+
+#: contrib/localflavor/id/id_choices.py:78
+msgid "Papua dan Papua Barat"
+msgstr "Papua dan Papua Barat"
+
+#: contrib/localflavor/id/id_choices.py:80
+msgid "Cirebon"
+msgstr "Cirebon"
+
+#: contrib/localflavor/id/id_choices.py:81
+msgid "NTB - Sumbawa"
+msgstr "NTB - Sumbawa"
+
+#: contrib/localflavor/id/id_choices.py:82
+msgid "NTT - Flores"
+msgstr "NTT - Flores"
+
+#: contrib/localflavor/id/id_choices.py:83
+msgid "NTT - Sumba"
+msgstr "NTT - Sumba"
+
+#: contrib/localflavor/id/id_choices.py:84
+msgid "Bogor"
+msgstr "Bogor"
+
+#: contrib/localflavor/id/id_choices.py:85
+msgid "Pekalongan"
+msgstr "Pekalongan"
+
+#: contrib/localflavor/id/id_choices.py:86
+msgid "Semarang"
+msgstr "Semarang"
+
+#: contrib/localflavor/id/id_choices.py:87
+msgid "Pati"
+msgstr "Pati"
+
+#: contrib/localflavor/id/id_choices.py:91
+msgid "Surabaya"
+msgstr "Surabaya"
+
+#: contrib/localflavor/id/id_choices.py:92
+msgid "Madura"
+msgstr "Madura"
+
+#: contrib/localflavor/id/id_choices.py:93
+msgid "Malang"
+msgstr "Malang"
+
+#: contrib/localflavor/id/id_choices.py:94
+msgid "Jember"
+msgstr "Jember"
+
+#: contrib/localflavor/id/id_choices.py:95
+msgid "Banyumas"
+msgstr "Banyumas"
+
+#: contrib/localflavor/id/id_choices.py:96
+msgid "Federal Government"
+msgstr "Federálna vláda"
+
+#: contrib/localflavor/id/id_choices.py:97
+msgid "Bojonegoro"
+msgstr "Bojonegoro"
+
+#: contrib/localflavor/id/id_choices.py:98
+msgid "Purwakarta"
+msgstr "Purwakarta"
+
+#: contrib/localflavor/id/id_choices.py:99
+msgid "Sidoarjo"
+msgstr "Sidoarjo"
+
+#: contrib/localflavor/id/id_choices.py:100
+msgid "Garut"
+msgstr "Garut"
+
+#: contrib/localflavor/ie/ie_counties.py:8
+msgid "Antrim"
+msgstr "Antrim"
+
+#: contrib/localflavor/ie/ie_counties.py:9
+msgid "Armagh"
+msgstr "Armagh"
+
+#: contrib/localflavor/ie/ie_counties.py:10
+msgid "Carlow"
+msgstr "Carlow"
+
+#: contrib/localflavor/ie/ie_counties.py:11
+msgid "Cavan"
+msgstr "Cavan"
+
+#: contrib/localflavor/ie/ie_counties.py:12
+msgid "Clare"
+msgstr "Clare"
+
+#: contrib/localflavor/ie/ie_counties.py:13
+msgid "Cork"
+msgstr "Cork"
+
+#: contrib/localflavor/ie/ie_counties.py:14
+msgid "Derry"
+msgstr "Derry"
+
+#: contrib/localflavor/ie/ie_counties.py:15
+msgid "Donegal"
+msgstr "Donegal"
+
+#: contrib/localflavor/ie/ie_counties.py:16
+msgid "Down"
+msgstr "Down"
+
+#: contrib/localflavor/ie/ie_counties.py:17
+msgid "Dublin"
+msgstr "Dublin"
+
+#: contrib/localflavor/ie/ie_counties.py:18
+msgid "Fermanagh"
+msgstr "Fermanagh"
+
+#: contrib/localflavor/ie/ie_counties.py:19
+msgid "Galway"
+msgstr "Galway"
+
+#: contrib/localflavor/ie/ie_counties.py:20
+msgid "Kerry"
+msgstr "Kerry"
+
+#: contrib/localflavor/ie/ie_counties.py:21
+msgid "Kildare"
+msgstr "Kildare"
+
+#: contrib/localflavor/ie/ie_counties.py:22
+msgid "Kilkenny"
+msgstr "Kilkenny"
+
+#: contrib/localflavor/ie/ie_counties.py:23
+msgid "Laois"
+msgstr "Laois"
+
+#: contrib/localflavor/ie/ie_counties.py:24
+msgid "Leitrim"
+msgstr "Leitrim"
+
+#: contrib/localflavor/ie/ie_counties.py:25
+msgid "Limerick"
+msgstr "Limerick"
+
+#: contrib/localflavor/ie/ie_counties.py:26
+msgid "Longford"
+msgstr "Longford"
+
+#: contrib/localflavor/ie/ie_counties.py:27
+msgid "Louth"
+msgstr "Louth"
+
+#: contrib/localflavor/ie/ie_counties.py:28
+msgid "Mayo"
+msgstr "Mayo"
+
+#: contrib/localflavor/ie/ie_counties.py:29
+msgid "Meath"
+msgstr "Meath"
+
+#: contrib/localflavor/ie/ie_counties.py:30
+msgid "Monaghan"
+msgstr "Monaghan"
+
+#: contrib/localflavor/ie/ie_counties.py:31
+msgid "Offaly"
+msgstr "Offaly"
+
+#: contrib/localflavor/ie/ie_counties.py:32
+msgid "Roscommon"
+msgstr "Roscommon"
+
+#: contrib/localflavor/ie/ie_counties.py:33
+msgid "Sligo"
+msgstr "Sligo"
+
+#: contrib/localflavor/ie/ie_counties.py:34
+msgid "Tipperary"
+msgstr "Tipperary"
+
+#: contrib/localflavor/ie/ie_counties.py:35
+msgid "Tyrone"
+msgstr "Tyrone"
+
+#: contrib/localflavor/ie/ie_counties.py:36
+msgid "Waterford"
+msgstr "Waterford"
+
+#: contrib/localflavor/ie/ie_counties.py:37
+msgid "Westmeath"
+msgstr "Westmeath"
+
+#: contrib/localflavor/ie/ie_counties.py:38
+msgid "Wexford"
+msgstr "Wexford"
+
+#: contrib/localflavor/ie/ie_counties.py:39
+msgid "Wicklow"
+msgstr "Wicklow"
+
+#: contrib/localflavor/in_/forms.py:15
 msgid "Enter a zip code in the format XXXXXXX."
 msgstr "Vložte poštové smerovacie číslo v tvare XXXXXXX."
 
-#: contrib/localflavor/is_/forms.py:17
-msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
+#: contrib/localflavor/is_/forms.py:18
+msgid ""
+"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
 msgstr "Zadajte platné islandské identifikačné číslo. Formát je XXXXXX-XXXX."
 
-#: contrib/localflavor/is_/forms.py:18
+#: contrib/localflavor/is_/forms.py:19
 msgid "The Icelandic identification number is not valid."
 msgstr "Islandské identifikačné číslo je neplatné."
 
-#: contrib/localflavor/it/forms.py:14
+#: contrib/localflavor/it/forms.py:15
 msgid "Enter a valid zip code."
 msgstr "Zadajte platné poštové smerovacie číslo."
 
-#: contrib/localflavor/it/forms.py:43
+#: contrib/localflavor/it/forms.py:44
 msgid "Enter a valid Social Security number."
 msgstr "Vložte platné číslo sociálneho poistenia."
 
-#: contrib/localflavor/it/forms.py:68
+#: contrib/localflavor/it/forms.py:69
 msgid "Enter a valid VAT number."
 msgstr "Zadajte platné VAT číslo."
 
@@ -2712,6 +3269,10 @@ msgstr "Kagošima"
 msgid "Okinawa"
 msgstr "Okinawa"
 
+#: contrib/localflavor/kw/forms.py:25
+msgid "Enter a valid Kuwaiti Civil ID number"
+msgstr "Zadajte platné kuvaitské civilné identifikačné číslo"
+
 #: contrib/localflavor/mx/mx_states.py:12
 msgid "Aguascalientes"
 msgstr "Aguascalientes"
@@ -2746,7 +3307,7 @@ msgstr "Colima"
 
 #: contrib/localflavor/mx/mx_states.py:20
 msgid "Distrito Federal"
-msgstr "Federálny dištrikt"
+msgstr "Distrito Federal"
 
 #: contrib/localflavor/mx/mx_states.py:21
 msgid "Durango"
@@ -2840,15 +3401,11 @@ msgstr "Yucatán"
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: contrib/localflavor/nl/forms.py:21
+#: contrib/localflavor/nl/forms.py:22
 msgid "Enter a valid postal code"
 msgstr "Zadajte platné poštové smerovacie číslo"
 
-#: contrib/localflavor/nl/forms.py:52
-msgid "Enter a valid phone number"
-msgstr "Zadajte platné telofónne číslo"
-
-#: contrib/localflavor/nl/forms.py:78
+#: contrib/localflavor/nl/forms.py:79
 msgid "Enter a valid SoFi number"
 msgstr "Zadajte platné SoFi číslo"
 
@@ -2900,15 +3457,15 @@ msgstr "Zéland"
 msgid "Zuid-Holland"
 msgstr "Južný Holland"
 
-#: contrib/localflavor/no/forms.py:33
+#: contrib/localflavor/no/forms.py:34
 msgid "Enter a valid Norwegian social security number."
 msgstr "Vložte platné nórske číslo sociálneho poistenia."
 
-#: contrib/localflavor/pe/forms.py:24
+#: contrib/localflavor/pe/forms.py:25
 msgid "This field requires 8 digits."
 msgstr "Toto pole vyžaduje 8 číslic."
 
-#: contrib/localflavor/pe/forms.py:52
+#: contrib/localflavor/pe/forms.py:53
 msgid "This field requires 11 digits."
 msgstr "Toto pole vyžaduje 11 číslic."
 
@@ -2921,8 +3478,11 @@ msgid "Wrong checksum for the National Identification Number."
 msgstr "Nesprávny kontrolný súčet pre národné identifikačné číslo."
 
 #: contrib/localflavor/pl/forms.py:71
-msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
-msgstr "Zadajte platné daňové číselné pole (NIP) v tvare XXX-XXX-XX-XX alebo XX-XX-XXX-XXX."
+msgid ""
+"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
+msgstr ""
+"Zadajte platné daňové číselné pole (NIP) v tvare XXX-XXX-XX-XX alebo XX-XX-"
+"XXX-XXX."
 
 #: contrib/localflavor/pl/forms.py:72
 msgid "Wrong checksum for the Tax Number (NIP)."
@@ -2930,11 +3490,13 @@ msgstr "Nesprávny kontrolný súčet pre daňové číslo (NIP)."
 
 #: contrib/localflavor/pl/forms.py:109
 msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Číslo národného obchodného registra (REGON) sa skladá z 9 alebo zo 14 číslic."
+msgstr ""
+"Číslo národného obchodného registra (REGON) sa skladá z 9 alebo zo 14 číslic."
 
 #: contrib/localflavor/pl/forms.py:110
 msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Nesprávny kontrolný súčet pre číslo národného obchodného registra (REGON)."
+msgstr ""
+"Nesprávny kontrolný súčet pre číslo národného obchodného registra (REGON)."
 
 #: contrib/localflavor/pl/forms.py:148
 msgid "Enter a postal code in the format XX-XXX."
@@ -3004,6 +3566,14 @@ msgstr "Veľkopoľské vojvodstvo"
 msgid "West Pomerania"
 msgstr "Západopomoranské vojvodstvo"
 
+#: contrib/localflavor/pt/forms.py:17
+msgid "Enter a zip code in the format XXXX-XXX."
+msgstr "Zadajte poštové smerovacie číslo v tvare  XXXX-XXX."
+
+#: contrib/localflavor/pt/forms.py:37
+msgid "Phone numbers must have 9 digits, or start by + or 00."
+msgstr "Telefónne čísla musia obsahovať 9 číslic a začína znakom + alebo 00."
+
 #: contrib/localflavor/ro/forms.py:19
 msgid "Enter a valid CIF."
 msgstr "Zadajte platné CIF."
@@ -3024,6 +3594,106 @@ msgstr "Telefónne čísla musia mať formát XXXX-XXXXXX."
 msgid "Enter a valid postal code in the format XXXXXX"
 msgstr "Zadajte platné poštové smerovacie číslo v tvare XXXXXX"
 
+#: contrib/localflavor/se/forms.py:50
+msgid "Enter a valid Swedish organisation number."
+msgstr "Zadajte platné švédske číslo organizácie."
+
+#: contrib/localflavor/se/forms.py:107
+msgid "Enter a valid Swedish personal identity number."
+msgstr "Zadajte platné švédske osobné identifikačné číslo."
+
+#: contrib/localflavor/se/forms.py:108
+msgid "Co-ordination numbers are not allowed."
+msgstr "Koordinačné čísla nie sú povolené."
+
+#: contrib/localflavor/se/forms.py:150
+msgid "Enter a Swedish postal code in the format XXXXX."
+msgstr "Zadajte švédske poštové smerovacie číslo v tvare XXXXX."
+
+#: contrib/localflavor/se/se_counties.py:15
+msgid "Stockholm"
+msgstr "Stockholm"
+
+#: contrib/localflavor/se/se_counties.py:16
+msgid "Västerbotten"
+msgstr "Västerbotten"
+
+#: contrib/localflavor/se/se_counties.py:17
+msgid "Norrbotten"
+msgstr "Norrbotten"
+
+#: contrib/localflavor/se/se_counties.py:18
+msgid "Uppsala"
+msgstr "Uppsala"
+
+#: contrib/localflavor/se/se_counties.py:19
+msgid "Södermanland"
+msgstr "Södermanland"
+
+#: contrib/localflavor/se/se_counties.py:20
+msgid "Östergötland"
+msgstr "Östergötland"
+
+#: contrib/localflavor/se/se_counties.py:21
+msgid "Jönköping"
+msgstr "Jönköping"
+
+#: contrib/localflavor/se/se_counties.py:22
+msgid "Kronoberg"
+msgstr "Kronoberg"
+
+#: contrib/localflavor/se/se_counties.py:23
+msgid "Kalmar"
+msgstr "Kalmar"
+
+#: contrib/localflavor/se/se_counties.py:24
+msgid "Gotland"
+msgstr "Gotland"
+
+#: contrib/localflavor/se/se_counties.py:25
+msgid "Blekinge"
+msgstr "Blekinge"
+
+#: contrib/localflavor/se/se_counties.py:26
+msgid "Skåne"
+msgstr "Skåne"
+
+#: contrib/localflavor/se/se_counties.py:27
+msgid "Halland"
+msgstr "Halland"
+
+#: contrib/localflavor/se/se_counties.py:28
+msgid "Västra Götaland"
+msgstr "Västra Götaland"
+
+#: contrib/localflavor/se/se_counties.py:29
+msgid "Värmland"
+msgstr "Värmland"
+
+#: contrib/localflavor/se/se_counties.py:30
+msgid "Örebro"
+msgstr "Örebro"
+
+#: contrib/localflavor/se/se_counties.py:31
+msgid "Västmanland"
+msgstr "Västmanland"
+
+#: contrib/localflavor/se/se_counties.py:32
+msgid "Dalarna"
+msgstr "Dalarna"
+
+#: contrib/localflavor/se/se_counties.py:33
+msgid "Gävleborg"
+msgstr "Gävleborg"
+
+#: contrib/localflavor/se/se_counties.py:34
+msgid "Västernorrland"
+msgstr "Västernorrland"
+
+#: contrib/localflavor/se/se_counties.py:35
+msgid "Jämtland"
+msgstr "Jämtland"
+
 #: contrib/localflavor/sk/sk_districts.py:8
 msgid "Banska Bystrica"
 msgstr "Banská Bystrica"
@@ -3656,19 +4326,43 @@ msgstr "Škótsko"
 msgid "Wales"
 msgstr "Wales"
 
-#: contrib/localflavor/us/forms.py:16
+#: contrib/localflavor/us/forms.py:17
 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
 msgstr "Zadajte poštové smerovacie číslo vo formáte XXXXX alebo XXXXX-XXXX."
 
-#: contrib/localflavor/us/forms.py:54
+#: contrib/localflavor/us/forms.py:26
+msgid "Phone numbers must be in XXX-XXX-XXXX format."
+msgstr "Telefónne čísla musia byť vo formáte XXX-XXX-XXXX."
+
+#: contrib/localflavor/us/forms.py:55
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
 msgstr "Vložte platné číslo U.S. sociálneho poistenia vo formáte XXX-XX-XXXX."
 
-#: contrib/localflavor/za/forms.py:20
+#: contrib/localflavor/us/forms.py:88
+msgid "Enter a U.S. state or territory."
+msgstr "Zadajte štát USA alebo teritórium."
+
+#: contrib/localflavor/us/models.py:8
+msgid "U.S. state (two uppercase letters)"
+msgstr "Štát USA (dve veľké písmená)"
+
+#: contrib/localflavor/us/models.py:17
+msgid "Phone number"
+msgstr "Telefónne číslo"
+
+#: contrib/localflavor/uy/forms.py:28
+msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
+msgstr "Vložte platné CI vo formáte X.XXX.XXX-X,XXXXXXX-X alebo XXXXXXXX."
+
+#: contrib/localflavor/uy/forms.py:30
+msgid "Enter a valid CI number."
+msgstr "Zadajte platné IC číslo."
+
+#: contrib/localflavor/za/forms.py:21
 msgid "Enter a valid South African ID number"
 msgstr "Zadajte platné juhoafrické ID číslo."
 
-#: contrib/localflavor/za/forms.py:54
+#: contrib/localflavor/za/forms.py:55
 msgid "Enter a valid South African postal code"
 msgstr "Zadajte platné juhoafrické poštové smerovacie číslo"
 
@@ -3708,21 +4402,33 @@ msgstr "North West"
 msgid "Western Cape"
 msgstr "Western Cape"
 
+#: contrib/messages/tests/base.py:101
+msgid "lazy message"
+msgstr "lenivá správa"
+
 #: contrib/redirects/models.py:7
 msgid "redirect from"
 msgstr "presmerovať z"
 
 #: contrib/redirects/models.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Tu by sa mala použiť absolútna cesta bez názvu domény. Napríklad: '/events/search/'."
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Tu by sa mala použiť absolútna cesta bez názvu domény. Napríklad: '/events/"
+"search/'."
 
 #: contrib/redirects/models.py:9
 msgid "redirect to"
 msgstr "presmerovať na"
 
 #: contrib/redirects/models.py:10
-msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
-msgstr "Toto môže byť buď absolútna cesta (ako vyššie) alebo úplné URL začínajúce na 'http://'."
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Toto môže byť buď absolútna cesta (ako vyššie) alebo úplné URL začínajúce na "
+"'http://'."
 
 #: contrib/redirects/models.py:13
 msgid "redirect"
@@ -3764,261 +4470,376 @@ msgstr "zobrazené meno"
 msgid "sites"
 msgstr "weby"
 
-#: db/models/fields/__init__.py:356
-#: db/models/fields/__init__.py:710
-msgid "This value must be an integer."
-msgstr "Táto hodnota musí byť celé číslo."
-
-#: db/models/fields/__init__.py:388
-msgid "This value must be either True or False."
-msgstr "Táto hodnota musí byť True alebo False."
-
-#: db/models/fields/__init__.py:427
-msgid "This field cannot be null."
-msgstr "Toto pole nemôže byť prázdne."
-
-#: db/models/fields/__init__.py:443
-msgid "Enter only digits separated by commas."
-msgstr "Zadajte len číslice oddelené čiarkami."
-
-#: db/models/fields/__init__.py:474
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Zadajte platný dátum vo formáte RRRR-MM-DD."
-
-#: db/models/fields/__init__.py:483
-#, python-format
-msgid "Invalid date: %s"
-msgstr "Neplatný dátum: %s"
-
-#: db/models/fields/__init__.py:547
-#: db/models/fields/__init__.py:565
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Zadajte platný dátum a čas vo formáte RRRR-MM-DD HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:601
-msgid "This value must be a decimal number."
-msgstr "Táto hodnota musí byť desiatkové číslo."
-
-#: db/models/fields/__init__.py:686
-msgid "This value must be a float."
-msgstr "Táto hodnota musí byť číslo s plávajúcou desatinnou čiarkou."
-
-#: db/models/fields/__init__.py:746
-msgid "This value must be either None, True or False."
-msgstr "Táto hodnota musí byť buď None, True alebo False."
-
-#: db/models/fields/__init__.py:849
-#: db/models/fields/__init__.py:863
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Zadajte platný čas vo formáte HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/related.py:816
-msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Ak chcete vybrať viac ako jednu položku, podržte \"Control\", alebo \"Command\" na počítači Mac."
-
-#: db/models/fields/related.py:894
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
-msgstr[0] "Prosím, zadajte platný identifikátor %(self)s. Hodnoty %(value)r sú neplatné."
-msgstr[1] "Prosím, zadajte platný identifikátor %(self)s. Hodnota %(value)r je neplatná."
-msgstr[2] "Prosím, zadajte platný identifikátor %(self)s. Hodnoty %(value)r sú neplatné."
-
-#: forms/fields.py:53
-msgid "This field is required."
-msgstr "Toto pole je povinné."
-
-#: forms/fields.py:54
+#: core/validators.py:20 forms/fields.py:66
 msgid "Enter a valid value."
 msgstr "Zadajte platnú hodnotu."
 
-#: forms/fields.py:137
-#, python-format
-msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr "Uistite sa, že táto hodnota má najviac %(max)d znakov (má %(length)d)."
-
-#: forms/fields.py:138
-#, python-format
-msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr "Uistite sa, že zadaná hodnota má najmenej %(min)d znakov (má %(length)d)."
-
-#: forms/fields.py:165
-msgid "Enter a whole number."
-msgstr "Zadajte celé číslo."
-
-#: forms/fields.py:166
-#: forms/fields.py:195
-#: forms/fields.py:224
-#, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr "Uistite sa, že táto hodnota je menšia alebo rovná %s."
-
-#: forms/fields.py:167
-#: forms/fields.py:196
-#: forms/fields.py:225
-#, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr "Uistite sa, že hodnota je väčšia alebo rovná %s."
-
-#: forms/fields.py:194
-#: forms/fields.py:223
-msgid "Enter a number."
-msgstr "Zadajte číslo."
-
-#: forms/fields.py:226
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr "Uistite sa, že nie je zadaných celkovo viac ako %s číslic."
-
-#: forms/fields.py:227
-#, python-format
-msgid "Ensure that there are no more than %s decimal places."
-msgstr "Uistite sa, že nie je zadaných viac ako %s desatinných miest."
-
-#: forms/fields.py:228
-#, python-format
-msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Uistite sa, že nie je zadaných viac ako %s číslic pred desatinnou čiarkou."
-
-#: forms/fields.py:287
-#: forms/fields.py:862
-msgid "Enter a valid date."
-msgstr "Zadajte platný dátum."
-
-#: forms/fields.py:321
-#: forms/fields.py:863
-msgid "Enter a valid time."
-msgstr "Zadajte platný čas."
-
-#: forms/fields.py:360
-msgid "Enter a valid date/time."
-msgstr "Zadajte platný dátum a čas."
-
-#: forms/fields.py:446
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Súbor nebol odoslaný. Skontrolujte typ kódovania vo formulári."
-
-#: forms/fields.py:447
-msgid "No file was submitted."
-msgstr "Žiaden súbor nebol odoslaný."
-
-#: forms/fields.py:448
-msgid "The submitted file is empty."
-msgstr "Odoslaný súbor je prázdny."
-
-#: forms/fields.py:449
-#, python-format
-msgid "Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "Uistite sa, že názov súboru má najviac %(max)d znakov (má %(length)d)."
-
-#: forms/fields.py:482
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Nahrajte platný obrázok. Súbor, ktorý ste odoslali nebol obrázok alebo bol poškodený."
-
-#: forms/fields.py:543
+#: core/validators.py:87 forms/fields.py:529
 msgid "Enter a valid URL."
 msgstr "Zadajte platnú URL adresu."
 
-#: forms/fields.py:544
+#: core/validators.py:89 forms/fields.py:530
 msgid "This URL appears to be a broken link."
 msgstr "Toto URL je chybný odkaz."
 
-#: forms/fields.py:624
-#: forms/fields.py:702
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Vyberte platnú voľbu. %(value)s nepatrí medzi dostupné možnosti."
+#: core/validators.py:123 forms/fields.py:873
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Zadajte platný 'slug' pozostávajúci z písmen, čísel, podčiarkovníkov alebo "
+"pomlčiek."
 
-#: forms/fields.py:703
-#: forms/fields.py:764
-#: forms/models.py:1003
-msgid "Enter a list of values."
-msgstr "Vložte zoznam hodnôt."
-
-#: forms/fields.py:891
+#: core/validators.py:126 forms/fields.py:866
 msgid "Enter a valid IPv4 address."
 msgstr "Zadajte platnú IPv4 adresu."
 
-#: forms/fields.py:901
-msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr "Zadajte platný 'slug' pozostávajúci z písmen, čísel, podčiarkovníkov alebo pomlčiek."
+#: core/validators.py:129 db/models/fields/__init__.py:572
+msgid "Enter only digits separated by commas."
+msgstr "Zadajte len číslice oddelené čiarkami."
 
-#: forms/formsets.py:271
-#: forms/formsets.py:273
-msgid "Order"
-msgstr "Poradie"
+#: core/validators.py:135
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr "Uistite sa, že táto hodnota je %(limit_value)s (je to %(show_value)s)."
 
-#: forms/models.py:367
+#: core/validators.py:153 forms/fields.py:205 forms/fields.py:257
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr "Uistite sa, že táto hodnota je menšia alebo rovná %(limit_value)s."
+
+#: core/validators.py:158 forms/fields.py:206 forms/fields.py:258
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr "Uistite sa, že hodnota je väčšia alebo rovná %(limit_value)s."
+
+#: core/validators.py:164
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has %"
+"(show_value)d)."
+msgstr ""
+"Uistite sa, že zadaná hodnota má najmenej %(limit_value)d znakov (má %"
+"(show_value)d)."
+
+#: core/validators.py:170
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d characters (it has %"
+"(show_value)d)."
+msgstr ""
+"Uistite sa, že táto hodnota má najviac %(limit_value)d  znakov (má %"
+"(show_value)d)."
+
+#: db/models/base.py:822
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s musí byť unikátne pre %(date_field)s %(lookup)s."
 
-#: forms/models.py:381
-#: forms/models.py:389
+#: db/models/base.py:837 db/models/base.py:845
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s s týmto %(field_label)s už existuje."
 
-#: forms/models.py:594
+#: db/models/fields/__init__.py:63
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr "Hodnota %r nie je platná možnosť."
+
+#: db/models/fields/__init__.py:64
+msgid "This field cannot be null."
+msgstr "Toto pole nemôže byť prázdne."
+
+#: db/models/fields/__init__.py:65
+msgid "This field cannot be blank."
+msgstr "Toto pole nemôže byť prázdne."
+
+#: db/models/fields/__init__.py:70
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Pole typu: %(field_type)s"
+
+#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:852
+#: db/models/fields/__init__.py:961 db/models/fields/__init__.py:972
+#: db/models/fields/__init__.py:999
+msgid "Integer"
+msgstr "Celé číslo"
+
+#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:850
+msgid "This value must be an integer."
+msgstr "Táto hodnota musí byť celé číslo."
+
+#: db/models/fields/__init__.py:490
+msgid "This value must be either True or False."
+msgstr "Táto hodnota musí byť True alebo False."
+
+#: db/models/fields/__init__.py:492
+msgid "Boolean (Either True or False)"
+msgstr "Logická hodnota (buď True alebo False)"
+
+#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:982
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Reťazec (až do %(max_length)s)"
+
+#: db/models/fields/__init__.py:567
+msgid "Comma-separated integers"
+msgstr "Celé čísla oddelené čiarkou"
+
+#: db/models/fields/__init__.py:581
+msgid "Date (without time)"
+msgstr "Dátum (bez času)"
+
+#: db/models/fields/__init__.py:585
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Zadajte platný dátum vo formáte RRRR-MM-DD."
+
+#: db/models/fields/__init__.py:586
+#, python-format
+msgid "Invalid date: %s"
+msgstr "Neplatný dátum: %s"
+
+#: db/models/fields/__init__.py:667
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+msgstr "Zadajte platný dátum a čas vo formáte RRRR-MM-DD HH:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:669
+msgid "Date (with time)"
+msgstr "Dátum (a čas)"
+
+#: db/models/fields/__init__.py:735
+msgid "This value must be a decimal number."
+msgstr "Táto hodnota musí byť desatinné číslo."
+
+#: db/models/fields/__init__.py:737
+msgid "Decimal number"
+msgstr "Desatinné číslo"
+
+#: db/models/fields/__init__.py:792
+msgid "E-mail address"
+msgstr "E-mail adresa"
+
+#: db/models/fields/__init__.py:799 db/models/fields/files.py:220
+#: db/models/fields/files.py:331
+msgid "File path"
+msgstr "Cesta k súboru"
+
+#: db/models/fields/__init__.py:822
+msgid "This value must be a float."
+msgstr "Táto hodnota musí byť číslo s plávajúcou desatinnou čiarkou."
+
+#: db/models/fields/__init__.py:824
+msgid "Floating point number"
+msgstr "Číslo s plávajúcou desatinnou čiarkou"
+
+#: db/models/fields/__init__.py:883
+msgid "Big (8 byte) integer"
+msgstr "Veľké celé číslo (8 bajtov)"
+
+#: db/models/fields/__init__.py:912
+msgid "This value must be either None, True or False."
+msgstr "Táto hodnota musí byť buď None, True alebo False."
+
+#: db/models/fields/__init__.py:914
+msgid "Boolean (Either True, False or None)"
+msgstr "Logická hodnota (buď True, False alebo None)"
+
+#: db/models/fields/__init__.py:1005
+msgid "Text"
+msgstr "Text"
+
+#: db/models/fields/__init__.py:1021
+msgid "Time"
+msgstr "Čas"
+
+#: db/models/fields/__init__.py:1025
+msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+msgstr "Zadajte platný čas vo formáte HH:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1109
+msgid "XML text"
+msgstr "XML text"
+
+#: db/models/fields/related.py:799
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr "Model %(model)s s primárnym kľúčom %(pk)r neexistuje."
+
+#: db/models/fields/related.py:801
+msgid "Foreign Key (type determined by related field)"
+msgstr "Cudzí kľúč (typ určuje pole v relácii)"
+
+#: db/models/fields/related.py:918
+msgid "One-to-one relationship"
+msgstr "Typ relácie: jedna k jednej"
+
+#: db/models/fields/related.py:980
+msgid "Many-to-many relationship"
+msgstr "Typ relácie: M ku N"
+
+#: db/models/fields/related.py:1000
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Ak chcete vybrať viac ako jednu položku, podržte \"Control\", alebo \"Command"
+"\" na počítači Mac."
+
+#: db/models/fields/related.py:1061
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] ""
+"Prosím, zadajte platný identifikátor %(self)s. Hodnota %(value)r je neplatná."
+msgstr[1] ""
+"Prosím, zadajte platný identifikátor %(self)s. Hodnoty %(value)r sú neplatné."
+msgstr[2] ""
+"Prosím, zadajte platný identifikátor %(self)s. Hodnoty %(value)r sú neplatné."
+
+#: forms/fields.py:65
+msgid "This field is required."
+msgstr "Toto pole je povinné."
+
+#: forms/fields.py:204
+msgid "Enter a whole number."
+msgstr "Zadajte celé číslo."
+
+#: forms/fields.py:235 forms/fields.py:256
+msgid "Enter a number."
+msgstr "Zadajte číslo."
+
+#: forms/fields.py:259
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Uistite sa, že nie je zadaných celkovo viac ako %s číslic."
+
+#: forms/fields.py:260
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Uistite sa, že nie je zadaných viac ako %s desatinných miest."
+
+#: forms/fields.py:261
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr ""
+"Uistite sa, že nie je zadaných viac ako %s číslic pred desatinnou čiarkou."
+
+#: forms/fields.py:323 forms/fields.py:838
+msgid "Enter a valid date."
+msgstr "Zadajte platný dátum."
+
+#: forms/fields.py:351 forms/fields.py:839
+msgid "Enter a valid time."
+msgstr "Zadajte platný čas."
+
+#: forms/fields.py:377
+msgid "Enter a valid date/time."
+msgstr "Zadajte platný dátum a čas."
+
+#: forms/fields.py:435
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Súbor nebol odoslaný. Skontrolujte typ kódovania vo formulári."
+
+#: forms/fields.py:436
+msgid "No file was submitted."
+msgstr "Žiaden súbor nebol odoslaný."
+
+#: forms/fields.py:437
+msgid "The submitted file is empty."
+msgstr "Odoslaný súbor je prázdny."
+
+#: forms/fields.py:438
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr "Uistite sa, že názov súboru má najviac %(max)d znakov (má %(length)d)."
+
+#: forms/fields.py:473
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Nahrajte platný obrázok. Súbor, ktorý ste odoslali nebol obrázok alebo bol "
+"poškodený."
+
+#: forms/fields.py:596 forms/fields.py:671
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr "Vyberte platnú voľbu. %(value)s nepatrí medzi dostupné možnosti."
+
+#: forms/fields.py:672 forms/fields.py:734 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr "Vložte zoznam hodnôt."
+
+#: forms/formsets.py:298 forms/formsets.py:300
+msgid "Order"
+msgstr "Poradie"
+
+#: forms/models.py:562
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Prosím, opravte duplicitné dáta pre %(field)s."
 
-#: forms/models.py:598
+#: forms/models.py:566
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Dáta pre %(field)s musia byť unikátne, prosím, opravte duplikáty."
 
-#: forms/models.py:604
+#: forms/models.py:572
 #, python-format
-msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s."
-msgstr "Dáta pre %(field_name)s musia byť unikátne pre %(lookup)s v %(date_field)s, prosím, opravte duplikáty."
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Dáta pre %(field_name)s musia byť unikátne pre %(lookup)s v %(date_field)s, "
+"prosím, opravte duplikáty."
 
-#: forms/models.py:612
+#: forms/models.py:580
 msgid "Please correct the duplicate values below."
 msgstr "Prosím, opravte nižšie uvedené duplicitné hodnoty. "
 
-#: forms/models.py:867
+#: forms/models.py:855
 msgid "The inline foreign key did not match the parent instance primary key."
-msgstr "Vnorený cudzí kľúč sa nezhoduje s nadradenou inštanciou primárnho kľúča."
+msgstr ""
+"Vnorený cudzí kľúč sa nezhoduje s nadradenou inštanciou primárnho kľúča."
 
-#: forms/models.py:930
+#: forms/models.py:921
 msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Vyberte platnú možnosť. Vybraná položka nepatrí medzi dostupné možnosti."
+msgstr ""
+"Vyberte platnú možnosť. Vybraná položka nepatrí medzi dostupné možnosti."
 
-#: forms/models.py:1004
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Vyberte platnú možnost. %s nepatrí medzi dostupné možnosti."
 
-#: forms/models.py:1006
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" nie je platná hodnota pre primárny kľúč."
 
-#: template/defaultfilters.py:767
+#: template/defaultfilters.py:776
 msgid "yes,no,maybe"
 msgstr "áno,nie,možno"
 
-#: template/defaultfilters.py:798
+#: template/defaultfilters.py:807
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d bajtov"
-msgstr[1] "%(size)d bajt"
-msgstr[2] "%(size)d bajty"
+msgstr[0] "%(size)d bajt"
+msgstr[1] "%(size)d bajty"
+msgstr[2] "%(size)d bajtov"
 
-#: template/defaultfilters.py:800
+#: template/defaultfilters.py:809
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:802
+#: template/defaultfilters.py:811
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:803
+#: template/defaultfilters.py:812
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
@@ -4111,28 +4932,23 @@ msgstr "január"
 msgid "February"
 msgstr "február"
 
-#: utils/dates.py:18
-#: utils/dates.py:31
+#: utils/dates.py:18 utils/dates.py:31
 msgid "March"
 msgstr "marec"
 
-#: utils/dates.py:18
-#: utils/dates.py:31
+#: utils/dates.py:18 utils/dates.py:31
 msgid "April"
 msgstr "apríl"
 
-#: utils/dates.py:18
-#: utils/dates.py:31
+#: utils/dates.py:18 utils/dates.py:31
 msgid "May"
 msgstr "máj"
 
-#: utils/dates.py:18
-#: utils/dates.py:31
+#: utils/dates.py:18 utils/dates.py:31
 msgid "June"
 msgstr "jún"
 
-#: utils/dates.py:19
-#: utils/dates.py:31
+#: utils/dates.py:19 utils/dates.py:31
 msgid "July"
 msgstr "júl"
 
@@ -4232,51 +5048,51 @@ msgstr "nov."
 msgid "Dec."
 msgstr "dec."
 
-#: utils/text.py:128
+#: utils/text.py:130
 msgid "or"
 msgstr "alebo"
 
 #: utils/timesince.py:21
 msgid "year"
 msgid_plural "years"
-msgstr[0] "rokov"
-msgstr[1] "rok"
-msgstr[2] "roky"
+msgstr[0] "rok"
+msgstr[1] "roky"
+msgstr[2] "rokov"
 
 #: utils/timesince.py:22
 msgid "month"
 msgid_plural "months"
-msgstr[0] "mesiacov"
-msgstr[1] "mesiac"
-msgstr[2] "mesiace"
+msgstr[0] "mesiac"
+msgstr[1] "mesiace"
+msgstr[2] "mesiacov"
 
 #: utils/timesince.py:23
 msgid "week"
 msgid_plural "weeks"
-msgstr[0] "týždňov"
-msgstr[1] "týždeň"
-msgstr[2] "týždne"
+msgstr[0] "týždeň"
+msgstr[1] "týždne"
+msgstr[2] "týždnov"
 
 #: utils/timesince.py:24
 msgid "day"
 msgid_plural "days"
-msgstr[0] "dní"
-msgstr[1] "deň"
-msgstr[2] "dni"
+msgstr[0] "deň"
+msgstr[1] "dni"
+msgstr[2] "dní"
 
 #: utils/timesince.py:25
 msgid "hour"
 msgid_plural "hours"
-msgstr[0] "hodín"
-msgstr[1] "hodina"
-msgstr[2] "hodiny"
+msgstr[0] "hodina"
+msgstr[1] "hodiny"
+msgstr[2] "hodín"
 
 #: utils/timesince.py:26
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "minút"
-msgstr[1] "minúta"
-msgstr[2] "minúty"
+msgstr[0] "minúta"
+msgstr[1] "minúty"
+msgstr[2] "minút"
 
 #: utils/timesince.py:45
 msgid "minutes"
@@ -4292,34 +5108,76 @@ msgstr "%(number)d %(type)s"
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/translation/trans_real.py:399
+#: utils/translation/trans_real.py:518
 msgid "DATE_FORMAT"
 msgstr "j. F Y"
 
-#: utils/translation/trans_real.py:401
+#: utils/translation/trans_real.py:519
+msgid "DATETIME_FORMAT"
+msgstr "j. F Y G:i"
+
+#: utils/translation/trans_real.py:520
 msgid "TIME_FORMAT"
 msgstr "G:i"
 
-#: utils/translation/trans_real.py:417
+#: utils/translation/trans_real.py:541
 msgid "YEAR_MONTH_FORMAT"
 msgstr "F Y"
 
-#: utils/translation/trans_real.py:418
+#: utils/translation/trans_real.py:542
 msgid "MONTH_DAY_FORMAT"
 msgstr "j. F"
 
-#: views/generic/create_update.py:114
+#: views/generic/create_update.py:115
 #, python-format
 msgid "The %(verbose_name)s was created successfully."
 msgstr "Objekt %(verbose_name)s bol úspešne vytvorený."
 
-#: views/generic/create_update.py:156
+#: views/generic/create_update.py:158
 #, python-format
 msgid "The %(verbose_name)s was updated successfully."
 msgstr "Objekt %(verbose_name)s bol úspešne zmenený."
 
-#: views/generic/create_update.py:198
+#: views/generic/create_update.py:201
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr "Objekt %(verbose_name)s bol zmazaný."
 
+#~ msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#~ msgstr "Jeden alebo viac %(fieldname)s v %(name)s: %(obj)s"
+
+#~ msgid "One or more %(fieldname)s in %(name)s:"
+#~ msgstr "Jeden alebo viac %(fieldname)s v %(name)s:"
+
+#~ msgid "Old password:"
+#~ msgstr "Staré heslo:"
+
+#~ msgid "Relation to parent model"
+#~ msgstr "Vzťah k nadradenému modelu"
+
+#~ msgid "Add user"
+#~ msgstr "Pridať používateľa"
+
+#~ msgid "Comment moderation queue"
+#~ msgstr "Rad komentárov čakajúcich na schválenie"
+
+#~ msgid "No comments to moderate"
+#~ msgstr "Žiadne komentáre na schválenie"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Authenticated?"
+#~ msgstr "Autentifikovaný?"
+
+#~ msgid "IP Address"
+#~ msgstr "IP adresa"
+
+#~ msgid "Date posted"
+#~ msgstr "Dátum odoslania"
+
+#~ msgid "yes"
+#~ msgstr "áno"
+
+#~ msgid "no"
+#~ msgstr "nie"
diff --git a/django/conf/locale/sk/LC_MESSAGES/djangojs.mo b/django/conf/locale/sk/LC_MESSAGES/djangojs.mo
index a9246a3f7c..bbca8a0552 100644
Binary files a/django/conf/locale/sk/LC_MESSAGES/djangojs.mo and b/django/conf/locale/sk/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/djangojs.po b/django/conf/locale/sk/LC_MESSAGES/djangojs.po
index 0a82c2e811..42c20ff645 100644
--- a/django/conf/locale/sk/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/sk/LC_MESSAGES/djangojs.po
@@ -5,45 +5,82 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-17 12:00+0200\n"
-"PO-Revision-Date: 2009-03-15 17:23+0100\n"
-"Last-Translator: Marian Andre <django@andre.sk>\n"
-"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"POT-Creation-Date: 2010-05-06 12:15+0100\n"
+"PO-Revision-Date: 2010-05-07 09:48+0200\n"
+"Last-Translator: Martin Kosír <martin@martinkosir.net>\n"
+"Language-Team: Slovak <>\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 ? 0 : n>1 && n<5 ? 1 : 2;\n"
 
-#: contrib/admin/media/js/SelectFilter2.js:33
+#: contrib/admin/media/js/SelectFilter2.js:37
 #, perl-format
 msgid "Available %s"
 msgstr "Dostupné %s"
 
-#: contrib/admin/media/js/SelectFilter2.js:41
+#: contrib/admin/media/js/SelectFilter2.js:45
 msgid "Choose all"
 msgstr "Vybrať všetko"
 
-#: contrib/admin/media/js/SelectFilter2.js:46
+#: contrib/admin/media/js/SelectFilter2.js:50
 msgid "Add"
 msgstr "Pridať"
 
-#: contrib/admin/media/js/SelectFilter2.js:48
+#: contrib/admin/media/js/SelectFilter2.js:52
 msgid "Remove"
-msgstr "Vymazať"
+msgstr "Odstrániť"
 
-#: contrib/admin/media/js/SelectFilter2.js:53
+#: contrib/admin/media/js/SelectFilter2.js:57
 #, perl-format
 msgid "Chosen %s"
 msgstr "Vybrané %s"
 
-#: contrib/admin/media/js/SelectFilter2.js:54
+#: contrib/admin/media/js/SelectFilter2.js:58
 msgid "Select your choice(s) and click "
-msgstr "Zvoľte si a kliknite "
+msgstr "Zvoľte možnosť a kliknite "
 
-#: contrib/admin/media/js/SelectFilter2.js:59
+#: contrib/admin/media/js/SelectFilter2.js:63
 msgid "Clear all"
 msgstr "Všetko zrušiť"
 
+#: contrib/admin/media/js/actions.js:18
+#: contrib/admin/media/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] "%(sel)s z %(cnt)s vybrané"
+msgstr[1] "%(sel)s z %(cnt)s vybrané"
+msgstr[2] "%(sel)s z %(cnt)s vybraných"
+
+#: contrib/admin/media/js/actions.js:109
+#: contrib/admin/media/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+"Vrámci jednotlivých editovateľných polí máte neuložené zmeny. Ak vykonáte "
+"akciu, vaše zmeny budú stratené."
+
+#: contrib/admin/media/js/actions.js:121
+#: contrib/admin/media/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+"Vybrali ste akciu, ale neuložili ste jednotlivé polia. Prosím, uložte zmeny "
+"kliknutím na OK. Akciu budete musieť vykonať znova."
+
+#: contrib/admin/media/js/actions.js:123
+#: contrib/admin/media/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+"Vybrali ste akciu, ale neurobili ste žiadne zmeny v jednotlivých poliach. "
+"Pravdepodobne ste chceli použiť tlačidlo vykonať namiesto uložiť."
+
 #: contrib/admin/media/js/calendar.js:24
 #: contrib/admin/media/js/dateparse.js:32
 msgid ""
@@ -57,62 +94,63 @@ msgstr ""
 msgid "S M T W T F S"
 msgstr "N P U S Š P S"
 
+#: contrib/admin/media/js/collapse.js:9 contrib/admin/media/js/collapse.js:21
+#: contrib/admin/media/js/collapse.min.js:1
+msgid "Show"
+msgstr "Zobraziť"
+
+#: contrib/admin/media/js/collapse.js:16
+#: contrib/admin/media/js/collapse.min.js:1
+msgid "Hide"
+msgstr "Skryť"
+
 #: contrib/admin/media/js/dateparse.js:33
 msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
 msgstr "nedeľa pondelok utorok streda štvrtok piatok sobota"
 
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
-msgid "Show"
-msgstr "Zobraziť"
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
-msgid "Hide"
-msgstr "Skryť"
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:49
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
 msgid "Now"
 msgstr "Teraz"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:53
 msgid "Clock"
 msgstr "Hodiny"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
 msgid "Choose a time"
 msgstr "Vybrať čas"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:85
 msgid "Midnight"
 msgstr "Polnoc"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:86
 msgid "6 a.m."
 msgstr "6:00"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
 msgid "Noon"
 msgstr "Poludnie"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:91
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:188
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:133
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:182
 msgid "Today"
 msgstr "Dnes"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:137
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:180
 msgid "Yesterday"
 msgstr "Včera"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:184
 msgid "Tomorrow"
 msgstr "Zajtra"
diff --git a/django/conf/locale/sk/formats.py b/django/conf/locale/sk/formats.py
index 1bc3549dcf..bf90c1a641 100644
--- a/django/conf/locale/sk/formats.py
+++ b/django/conf/locale/sk/formats.py
@@ -4,15 +4,29 @@
 
 DATE_FORMAT = 'j. F Y'
 TIME_FORMAT = 'G:i:s'
-# DATETIME_FORMAT = 
+DATETIME_FORMAT = 'j. F Y G:i:s'
 YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j. F'
-SHORT_DATE_FORMAT = 'j.n.Y'
-# SHORT_DATETIME_FORMAT = 
-# FIRST_DAY_OF_WEEK = 
-# DATE_INPUT_FORMATS = 
-# TIME_INPUT_FORMATS = 
-# DATETIME_INPUT_FORMATS = 
+SHORT_DATE_FORMAT = 'd.m.Y'
+SHORT_DATETIME_FORMAT = 'd.m.Y G:i:s'
+FIRST_DAY_OF_WEEK = 1 # Monday
+DATE_INPUT_FORMATS = (
+    '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
+    '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25'
+    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
+)
+TIME_INPUT_FORMATS = (
+    '%H:%M:%S', # '14:30:59'
+    '%H:%M',    # '14:30'
+)
+DATETIME_INPUT_FORMATS = (
+    '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
+    '%d.%m.%Y',             # '25.10.2006'
+    '%Y-%m-%d %H:%M:%S',    # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M',       # '2006-10-25 14:30'
+    '%Y-%m-%d',             # '2006-10-25'
+)
 DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = ' '
-# NUMBER_GROUPING = 
+THOUSAND_SEPARATOR = ' '
+NUMBER_GROUPING = 3