To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site. Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").
\n"
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
msgstr ""
-"
ะะด %s:
\n"
-"
\n"
+"ะะฒะพั ะพะฑัะตะบั ะฝะตะผะฐ ะธััะพัะธัะฐ ะฝะฐ ะธะทะผะตะฝะธ. ะะฐัะฒะตัะพัะฐัะฝะพ ะฝะต ะฑะธะป ะดะพะดะฐะดะตะฝ ัะพ ะฐะดะผะธะฝ "
+"ัะฐััะพั."
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169
-msgid "All"
-msgstr "ะกะธัะต"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "ะัะตัะบะฐ ัะพ ัะตัะฒะตัะพั"
-#: contrib/admin/filterspecs.py:109
-msgid "Any date"
-msgstr "ะะธะปะพ ะบะพั ะดะฐััะผ"
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "ะัะตัะบะฐ ัะพ ัะตัะฒะตัะพั (500)"
-#: contrib/admin/filterspecs.py:110
-msgid "Today"
-msgstr "ะะตะฝะตัะบะฐ"
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error (500)"
+msgstr "ะัะตัะบะฐ ัะพ ัะตัะฒะตัะพั (500)"
-#: contrib/admin/filterspecs.py:113
-msgid "Past 7 days"
-msgstr "ะะพัะปะตะดะฝะธัะต 7 ะดะตะฝะฐ"
+#: 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 ""
+"ะะผะฐัะต ะณัะตัะบะฐ. ะััะฐัะฐ ะฑะตัะต ะฟัะธัะฐะฒะตะฝะฐ ะฝะฐ ะฐะดะผะธะฝะธัััะฐัะพัะธัะต ะธ ัะต ะฑะธะดะต ะฟะพะฟัะฐะฒะตะฝะฐ "
+"ะฒะพ ะฑัะทะพ ะฒัะตะผะต. ะะธ ะฑะปะฐะณะพะดะฐัะธะผะต ะทะฐ ะฒะฐัะตัะพ ััะฟะตะฝะธะต."
-#: contrib/admin/filterspecs.py:115
-msgid "This month"
-msgstr "ะะฒะพั ะผะตัะตั"
+#: contrib/admin/templates/admin/invalid_setup.html:8
+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 ""
+"ะะตััะพ ะฝะต ะต ะฒะพ ัะตะด ัะพ ะธะฝััะฐะปะฐัะธัะฐัะฐ ะฝะฐ ะฑะฐะทะฐัะฐ ะฝะฐ ะฟะพะดะฐัะพัะธ. ะะพัะฒัะดะตัะต ะดะตะบะฐ "
+"ัะพะพะดะฒะตัะฝะธ ัะฐะฑะตะปะธ ะฒะพ ะฑะฐะทะฐัะฐ ัะต ะฝะฐะฟัะฐะฒะตะฝะธ ะธ ะฟะพัะฒัะดะตัะต ะดะตะบะฐ ะฑะฐะทะฐัะฐ ะผะพะถะต ะดะฐ ะฑะธะดะต "
+"ะฟัะพัะธัะฐะฝะฐ ะพะด ัะพะพะดะฒะตัะฝะธะพั ะบะพัะธัะฝะธะบ."
-#: contrib/admin/filterspecs.py:117
-msgid "This year"
-msgstr "ะะฒะฐะฐ ะณะพะดะธะฝะฐ"
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "ะะดะธ"
-#: contrib/admin/models.py:16
-msgid "action time"
-msgstr "ะฒัะตะผะต ะฝะฐ ะฐะบัะธัะฐ"
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] "1 ัะตะทัะปัะฐั"
+msgstr[1] "%(counter)s ัะตะทัะปัะฐัะธ"
-#: contrib/admin/models.py:19
-msgid "object id"
-msgstr "ะธะดะตะฝัะธัะธะบะฐัะธะพะฝะตะฝ ะฑัะพั ะฝะฐ ะพะฑัะตะบั"
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "ะฒะบัะฟะฝะพ %(full_result_count)s"
-#: contrib/admin/models.py:20
-msgid "object repr"
-msgstr "object repr"
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "ะคะธะปัะตั"
-#: contrib/admin/models.py:21
-msgid "action flag"
-msgstr "ะทะฝะฐะบัะต ะทะฐ ะฐะบัะธัะฐ"
+#: contrib/admin/templates/admin/login.html:17
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+msgid "Username:"
+msgstr "ะะพัะธัะฝะธะบ:"
-#: contrib/admin/models.py:22
-msgid "change message"
-msgstr "ะธะทะผะตะฝะธ ัะฐ ะฟะพัะฐะบะฐัะฐ"
+#: contrib/admin/templates/admin/login.html:20
+#: contrib/comments/templates/comments/form.html:8
+msgid "Password:"
+msgstr "ะะพะทะธะฝะบะฐ:"
-#: contrib/admin/models.py:25
-msgid "log entry"
-msgstr "ััะฐะฒะบะฐ ะฒะพ ะทะฐะฟะธัะฝะธะบะพั"
+#: contrib/admin/templates/admin/base.html:25
+msgid "Welcome,"
+msgstr "ะะพะฑัะตะดะพัะดะพะฒัะต,"
-#: contrib/admin/models.py:26
-msgid "log entries"
-msgstr "ััะฐะฒะบะธ ะฒะพ ะทะฐะฟะธัะฝะธะบะพั"
+#: 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 ""
+"ะัะฒะพ, ะฒะฝะตัะตัะต ะบะพัะธัะฝะธัะบะพ ะธะผะต ะธ ะปะพะทะธะฝะบะฐ. ะะพัะพะฐ ัะต ะผะพะถะตัะต ะดะฐ ััะตะดัะฒะฐัะต ะฟะพะฒะตัะต "
+"ะบะพัะธัะฝะธัะบะธ ะพะฟัะธะธ."
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
+msgid "Username"
+msgstr "ะะพัะธัะฝะธะบ"
-#: contrib/admin/templatetags/admin_list.py:238
-msgid "All dates"
-msgstr "ะกะธัะต ะดะฐััะผะธ"
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/change_password.html:34
+msgid "Password"
+msgstr "ะะพะทะธะฝะบะฐ"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/admin/base.html:30
-#: contrib/admin/templates/admin/auth/user/change_password.html:12
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-msgid "Home"
-msgstr "ะะพะผะฐ"
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+msgid "Password (again)"
+msgstr "ะะพะทะธะฝะบะฐ (ะฟะพะฒัะพัะฝะพ)"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
-msgid "Documentation"
-msgstr "ะะพะบัะผะตะฝัะฐัะธัะฐ"
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+#: contrib/admin/templates/admin/auth/user/change_password.html:40
+msgid "Enter the same password as above, for verification."
+msgstr "ะะฐัะฐะดะธ ะฒะตัะธัะธะบะฐัะธัะฐ ะฒะฝะตัะตัะต ัะฐ ะธััะฐัะฐ ะปะพะทะธะฝะบะฐ ะบะฐะบะพ ะธ ะณะพัะต."
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#, python-format
+msgid "Enter a new password for the user %(username)s."
+msgstr "ะะฝะตัะตัะต ะฝะพะฒะฐ ะปะพะทะธะฝะบะฐ ะทะฐ ะบะพัะธัะฝะธะบะพั %(username)s."
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
msgstr "ะะฑะตะปะตะถัะฒะฐัะธ"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin/auth/user/change_password.html:15
-#: contrib/admin/templates/admin/auth/user/change_password.html:46
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
-msgid "Change password"
-msgstr "ะัะพะผะตะฝะธ ะปะพะทะธะฝะบะฐ"
-
#: contrib/admin/templates/admin_doc/bookmarklets.html:5
msgid "Documentation bookmarklets"
msgstr "ะะฑะตะปะตะถัะฒะฐัะธ ะฝะฐ ะดะพะบัะผะตะฝัะฐัะธัะฐ"
@@ -1275,750 +1451,999 @@ msgstr ""
msgid "Documentation for this page"
msgstr "ะะพะบัะผะตะฝัะฐัะธัะฐ ะทะฐ ะพะฒะฐะฐ ัััะฐะฝะธัะฐ"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
-msgstr ""
-"ะะต ะฝะพัะธ ะพะด ะฑะธะปะพ ะบะพัะฐ ัััะฐะฝะธัะฐ ะพะด ะดะพะบัะผะตะฝัะฐัะธัะฐัะฐ ะดะพ ะฟะพะณะปะตะดะพั ะบะพั ัะฐ ะณะตะฝะตัะธัะฐ "
-"ัะฐะฐ ัััะฐะฝะธัะฐ."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"ะะต ะฝะพัะธ ะพะด ะฑะธะปะพ ะบะพัะฐ ัััะฐะฝะธัะฐ ะพะด ะดะพะบัะผะตะฝัะฐัะธัะฐัะฐ ะดะพ ะฟะพะณะปะตะดะพั ะบะพั ัะฐ ะณะตะฝะตัะธัะฐ "
+"ัะฐะฐ ัััะฐะฝะธัะฐ."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "ะัะธะบะฐะถะธ ะธะดะตะฝัะธัะธะบะฐัะธะพะฝะตะฝ ะฑัะพั ะฝะฐ ะพะฑัะตะบัะพั"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"ะะพ ะฟัะธะบะฐะถัะฒะฐ ัะธะฟะพั ะฝะฐ ัะพะดัะถะธะฝะฐัะฐ ะธ ัะฝะธะบะฐัะฝะธะพั ะธะดะตะฝัะธัะธะบะฐัะธะพะฝะตะฝ ะฑัะพั ะทะฐ "
+"ัััะฐะฝะธัะธ ะบะพะธ ะฟัะตัััะฐะฒัะฒะฐะฐั ะตะดะธะฝะตัะตะฝ ะพะฑัะตะบั."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "ะฃัะตะดะธ ะณะพ ะพะฒะพั ะพะฑัะตะบั (ะฒะพ ะพะฒะพั ะฟัะพะทะพัะตั)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "ะกะบะพะบะฝัะฒะฐ ะดะพ ะฐะดะผะธะฝ ัััะฐะฝะธัะฐัะฐ ะทะฐ ัััะฐะฝะธัะธ ะบะพะธ ะฟัะตัััะฐะฒัะฒะฐะฐั ะตะดะธะฝะตัะตะฝ ะพะฑัะตะบั."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "ะฃัะตะดะธ ะณะพ ะพะฒะพั ะพะฑัะตะบั (ะฒะพ ะฝะพะฒ ะฟัะพะทะพัะตั)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "ะะฐะบะพ ะฟะพะณะพัะต, ะฝะพ ัะฐ ะพัะฒะฐัะฐ ะฐะดะผะธะฝ ัััะฐะฝะธัะฐัะฐ ะฒะพ ะฝะพะฒ ะฟัะพะทะพัะตั."
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "ะะฐััะผ:"
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "ะัะตะผะต:"
+
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "ะะพะผะตะฝัะฐะปะฝะพ:"
+
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "ะะทะผะตะฝะฐ:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "ะ ะตัะตัะธัะฐัะต ะฝะฐ ะปะพะทะธะฝะบะฐ"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"ะกัะต ัะฐ ะทะฐะฑะพัะฐะฒะธะปะต ะฒะฐัะฐัะฐ ะปะพะทะธะฝะบะฐ? ะะฝะตัะตัะต ัะฐ ะฒะฐัะฐัะฐ ะต-ะฟะพััะฐ ะฟะพะดะพะปั, ัะต ัะฐ "
+"ัะตัะตัะธัะฐะผะต ะฒะฐัะฐัะฐ ะปะพะทะธะฝะบะฐ ะธ ะฝะพะฒะฐัะฐ ัะต ะฒะธ ัะฐ ะฟัะฐัะธะผะต ะฟะพ ะต-ะฟะพััะฐ."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "ะ-ะฟะพััะฐ:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "ะ ะตัะตัะธัะฐั ัะฐ ะผะพัะฐัะฐ ะปะพะทะธะฝะบะฐ"
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "ะะฐ ะดะพะฑะธะฒะฐัะฐ ะพะฒะฐะฐ ะฟะพัะฐะบะฐ ะฑะธะดะตััะธ ะฟะพะฑะฐัะฐะฒัะต ะดะฐ ัะต ัะตัะตัะธัะฐ ะฒะฐัะฐัะฐ ะปะพะทะธะฝะบะฐ"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "ะทะฐ ะบะพัะธัะฝะธัะบะฐัะฐ ัะผะตัะบะฐ ะฝะฐ %(site_name)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr "ะะฐัะฐัะฐ ะฝะพะฒะฐ ะปะพะทะธะฝะบะฐ ะต: %(new_password)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr "ะงัััะฒัะฒะฐััะต ัะต ัะปะพะฑะพะดะฝะพ ะดะฐ ัะฐ ะฟัะพะผะตะฝะธัะต ะพะฒะฐะฐ ะปะพะทะธะฝะบะฐ ะฟัะตะบั ะพะฒะฐะฐ ัััะฐะฝะธัะฐ:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "ะะฐัะตัะพ ะบะพัะธัะฝะธัะบะพ ะธะผะต, ะฒะพ ัะปััะฐั ะดะฐ ััะต ะณะพ ะทะฐะฑะพัะฐะฒะธะปะต:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "ะะธ ะฑะปะฐะณะพะดะฐัะธะผะต ััะพ ะณะพ ะบะพัะธััะธัะต ะพะฒะพั ัะฐัั!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "ะขะธะผะพั ะฝะฐ %(site_name)s"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "ะะธ ะฑะปะฐะณะพะดะฐัะธะผะต ััะพ ะดะตะฝะตัะบะฐ ะฟะพะผะธะฝะฐะฒัะต ะบะฒะฐะปะธัะตัะฝะพ ะฒัะตะผะต ัะพ ะธะฝัะตัะฝะตั ัััะฐะฝะธัะฐะฒะฐ."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "ะะพะณะธัะฐััะต ัะต ะฟะพะฒัะพัะฝะพ"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "ะฃัะฟะตัะฝะพ ะต ัะตัะตัะธัะฐัะตัะพ ะฝะฐ ะปะพะทะธะฝะบะฐัะฐ"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"ะะธ ะฟัะฐัะธะฒะผะต ะฝะพะฒะฐ ะปะพะทะธะฝะบะฐ ะฝะฐ ะฐะดัะตัะฐัะฐ ะบะพัะฐ ัะฐ ะฒะฝะตัะพะฒัะต.ะขัะตะฑะฐ ะดะฐ ัะฐ ะฟัะธะผะธัะต ะทะฐ "
+"ะบัะฐัะบะพ ะฒัะตะผะต."
+
+#: 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_done.html:4
+msgid "Password change"
+msgstr "ะะทะผะตะฝะฐ ะฝะฐ ะปะพะทะธะฝะบะฐ"
+
+#: 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 ""
+"ะะฐัะฐะดะธ ัะธะณััะฝะพัั ะฒะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ัะฐ ะฒะฐัะฐัะฐ ััะฐัะฐ ะปะพะทะธะฝะบะฐ ะธ ะฟะพัะพะฐ ะฒะฝะตัะตัะต ัะฐ "
+"ะฝะพะฒะฐัะฐ ะดะฒะฐะฟะฐัะธ ะทะฐ ะดะฐ ะผะพะถะต ะดะฐ ัะต ะฟะพัะฒัะดะธ ะดะตะบะฐ ะฟัะฐะฒะธะปะฝะพ ััะต ัะฐ ะธัะบััะฐะปะต."
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "ะกัะฐัะฐ ะปะพะทะธะฝะบะฐ:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "ะะพะฒะฐ ะปะพะทะธะฝะบะฐ:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "ะะพัะฒัะดะธ ะปะพะทะธะฝะบะฐ:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "ะัะพะผะตะฝะธ ัะฐ ะผะพัะฐัะฐ ะปะพะทะธะฝะบะฐ"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "ะฃัะฟะตัะฝะฐ ะฟัะพะผะตะฝะฐ ะฝะฐ ะปะพะทะธะฝะบะฐัะฐ"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "ะะฐัะฐัะฐ ะปะพะทะธะฝะบะฐ ะฑะตัะต ัะผะตะฝะตัะฐ."
+
+#: contrib/sites/models.py:10
+msgid "domain name"
+msgstr "ะดะพะผะตัะฝ"
+
+#: contrib/sites/models.py:11
+msgid "display name"
+msgstr "ะธะผะต ะบะพะต ัะต ะฟัะธะบะฐะถัะฒะฐ"
+
+#: contrib/sites/models.py:15
+msgid "site"
+msgstr "ัะฐัั"
+
+#: contrib/sites/models.py:16
+msgid "sites"
+msgstr "ัะฐััะพะฒะธ"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "th"
+msgstr "th"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "st"
+msgstr "st"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "nd"
+msgstr "nd"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "rd"
+msgstr "rd"
+
+#: contrib/humanize/templatetags/humanize.py:47
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f ะผะธะปะธะพะฝ"
+msgstr[1] "%(value).1f ะผะธะปะธะพะฝ"
+
+#: contrib/humanize/templatetags/humanize.py:50
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f ะผะธะปะธัะฐัะดะฐ"
+msgstr[1] "%(value).1f ะผะธะปะธัะฐัะดะฐ"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-msgstr "ะัะธะบะฐะถะธ ะธะดะตะฝัะธัะธะบะฐัะธะพะฝะตะฝ ะฑัะพั ะฝะฐ ะพะฑัะตะบัะพั"
+#: contrib/humanize/templatetags/humanize.py:53
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f ััะธะปะธะพะฝ"
+msgstr[1] "%(value).1f ััะธะปะธะพะฝ"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
-msgstr ""
-"ะะพ ะฟัะธะบะฐะถัะฒะฐ ัะธะฟะพั ะฝะฐ ัะพะดัะถะธะฝะฐัะฐ ะธ ัะฝะธะบะฐัะฝะธะพั ะธะดะตะฝัะธัะธะบะฐัะธะพะฝะตะฝ ะฑัะพั ะทะฐ "
-"ัััะฐะฝะธัะธ ะบะพะธ ะฟัะตัััะฐะฒัะฒะฐะฐั ะตะดะธะฝะตัะตะฝ ะพะฑัะตะบั."
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "one"
+msgstr "ะตะดะตะฝ"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "ะฃัะตะดะธ ะณะพ ะพะฒะพั ะพะฑัะตะบั (ะฒะพ ะพะฒะพั ะฟัะพะทะพัะตั)"
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "two"
+msgstr "ะดะฒะฐ"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "ะกะบะพะบะฝัะฒะฐ ะดะพ ะฐะดะผะธะฝ ัััะฐะฝะธัะฐัะฐ ะทะฐ ัััะฐะฝะธัะธ ะบะพะธ ะฟัะตัััะฐะฒัะฒะฐะฐั ะตะดะธะฝะตัะตะฝ ะพะฑัะตะบั."
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "three"
+msgstr "ััะธ"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "ะฃัะตะดะธ ะณะพ ะพะฒะพั ะพะฑัะตะบั (ะฒะพ ะฝะพะฒ ะฟัะพะทะพัะตั)"
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "four"
+msgstr "ัะตัะธัะธ"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-msgstr "ะะฐะบะพ ะฟะพะณะพัะต, ะฝะพ ัะฐ ะพัะฒะฐัะฐ ะฐะดะผะธะฝ ัััะฐะฝะธัะฐัะฐ ะฒะพ ะฝะพะฒ ะฟัะพะทะพัะตั."
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "five"
+msgstr "ะฟะตั"
-#: contrib/admin/templates/admin/submit_line.html:3
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-msgid "Delete"
-msgstr "ะะทะฑัะธัะธ"
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "six"
+msgstr "ัะตัั"
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "ะกะฝะธะผะธ ะบะฐะบะพ ะฝะพะฒะฐ"
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "seven"
+msgstr "ัะตะดัะผ"
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "ะกะฝะธะผะธ ะธ ะดะพะดะฐะดะธ ัััะต"
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "eight"
+msgstr "ะพััะผ"
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "ะกะฝะธะผะธ ะธ ะฟัะพะดะพะปะถะธ ัะพ ััะตะดัะฒะฐัะต"
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "nine"
+msgstr "ะดะตะฒะตั"
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "ะกะฝะธะผะธ"
+#: contrib/flatpages/models.py:8
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"ะะฐ ะฟั. โ/za/kontakt/โ. ะัะธะณััะฐััะต ัะต ะดะฐ ะธะผะฐัะต ะบะพัะฐ ัััะฐ ะธ ะฝะฐ ะบัะฐัะพั ะธ ะฝะฐ "
+"ะฟะพัะตัะพะบะพั."
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "ะัะตัะบะฐ ัะพ ัะตัะฒะตัะพั"
+#: contrib/flatpages/models.py:9
+msgid "title"
+msgstr "ะฝะฐัะปะพะฒ"
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "ะัะตัะบะฐ ัะพ ัะตัะฒะตัะพั (500)"
+#: contrib/flatpages/models.py:10
+msgid "content"
+msgstr "ัะพะดัะถะธะฝะฐ"
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error (500)"
-msgstr "ะัะตัะบะฐ ัะพ ัะตัะฒะตัะพั (500)"
+#: contrib/flatpages/models.py:11
+msgid "enable comments"
+msgstr "ะพะฒะพะทะผะพะถะธ ะบะพะผะตะฝัะฐัะธ"
-#: contrib/admin/templates/admin/500.html:10
+#: contrib/flatpages/models.py:12
+msgid "template name"
+msgstr "ะธะผะต ะฝะฐ ัะฐะฑะปะพะฝะพั"
+
+#: contrib/flatpages/models.py:13
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."
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
msgstr ""
-"ะะผะฐัะต ะณัะตัะบะฐ. ะััะฐัะฐ ะฑะตัะต ะฟัะธัะฐะฒะตะฝะฐ ะฝะฐ ะฐะดะผะธะฝะธัััะฐัะพัะธัะต ะธ ัะต ะฑะธะดะต ะฟะพะฟัะฐะฒะตะฝะฐ "
-"ะฒะพ ะฑัะทะพ ะฒัะตะผะต. ะะธ ะฑะปะฐะณะพะดะฐัะธะผะต ะทะฐ ะฒะฐัะตัะพ ััะฟะตะฝะธะต."
+"ะะฐ ะฟั. โflatpages/kontakt.html'. ะะบะพ ะฝะต ะณะพ ะฒะฝะตัะตัะต ะพะฒะฐ, ัะธััะตะผะพั ัะต ะบะพัะธััะธ "
+"โflatpages/default.htmlโ."
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(filter_title)s "
-msgstr " ะะด %(filter_title)s "
+#: contrib/flatpages/models.py:14
+msgid "registration required"
+msgstr "ะฟะพััะตะฑะฝะฐ ะต ัะตะณะธัััะฐัะธัะฐ"
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "ะคะธะปัะตั"
+#: contrib/flatpages/models.py:14
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"ะะบะพ ะพะฒะฐ ะต ััะธะบะปะธัะฐะฝะพ, ัะฐะผะพ ะฝะฐัะฐะฒะตะฝะธัะต ะบะพัะธัะฝะธัะธ ัะต ะผะพะถะฐั ะดะฐ ัะฐ ะณะปะตะดะฐะฐั ะพะฒะฐะฐ "
+"ัััะฐะฝะธัะฐ."
-#: contrib/admin/templates/admin/invalid_setup.html:8
+#: contrib/flatpages/models.py:18
+msgid "flat page"
+msgstr "ััะฐัะธัะฝะฐ ัััะฐะฝะธัะฐ"
+
+#: contrib/flatpages/models.py:19
+msgid "flat pages"
+msgstr "ััะฐัะธัะฝะธ ัััะฐะฝะธัะธ"
+
+#: contrib/redirects/models.py:7
+msgid "redirect from"
+msgstr "ะฟัะตะฝะฐัะพัะตะฝะพ ะพะด"
+
+#: contrib/redirects/models.py:8
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."
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
msgstr ""
-"ะะตััะพ ะฝะต ะต ะฒะพ ัะตะด ัะพ ะธะฝััะฐะปะฐัะธัะฐัะฐ ะฝะฐ ะฑะฐะทะฐัะฐ ะฝะฐ ะฟะพะดะฐัะพัะธ. ะะพัะฒัะดะตัะต ะดะตะบะฐ "
-"ัะพะพะดะฒะตัะฝะธ ัะฐะฑะตะปะธ ะฒะพ ะฑะฐะทะฐัะฐ ัะต ะฝะฐะฟัะฐะฒะตะฝะธ ะธ ะฟะพัะฒัะดะตัะต ะดะตะบะฐ ะฑะฐะทะฐัะฐ ะผะพะถะต ะดะฐ ะฑะธะดะต "
-"ะฟัะพัะธัะฐะฝะฐ ะพะด ัะพะพะดะฒะตัะฝะธะพั ะบะพัะธัะฝะธะบ."
+"ะะฒะฐ ััะตะฑะฐ ะดะฐ ะฑะธะดะต ะฐะฟัะพะปััะฝะฐ ะฟะฐัะตะบะฐ ะฑะตะท ะธะผะตัะพ ะฝะฐ ะดะพะผะตัะฝะพั. ะะฐ ะฟั. โ/nastani/"
+"prebaraj/โ."
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "ะะดะธ"
+#: contrib/redirects/models.py:9
+msgid "redirect to"
+msgstr "ะฟัะตะฝะฐัะพัะธ ะบะพะฝ"
-#: contrib/admin/templates/admin/search_form.html:10
-#, python-format
-msgid "1 result"
-msgid_plural "%(counter)s results"
-msgstr[0] "1 ัะตะทัะปัะฐั"
-msgstr[1] "%(counter)s ัะตะทัะปัะฐัะธ"
+#: contrib/redirects/models.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"ะะฒะฐ ะผะพะถะต ะดะฐ ะฑะธะดะต ะธะปะธ ะฐะฟัะพะปััะฝะฐ ะฟะฐัะตะบะฐ (ะบะฐะบะพ ะฟะพะณะพัะต) ะธะปะธ ัะตะปะฐ ะฐะดัะตัะฐ "
+"ะฟะพััะฒะฐััะธ ัะพ โhttp://โ."
-#: contrib/admin/templates/admin/search_form.html:10
-#, python-format
-msgid "%(full_result_count)s total"
-msgstr "ะฒะบัะฟะฝะพ %(full_result_count)s"
+#: contrib/redirects/models.py:13
+msgid "redirect"
+msgstr "ะฟัะตะฝะฐัะพััะฒะฐัะต"
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:21
-msgid "History"
-msgstr "ะััะพัะธัะฐ"
+#: contrib/redirects/models.py:14
+msgid "redirects"
+msgstr "ะฟัะตะฝะฐัะพััะฒะฐัะฐ"
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "ะะฐััะผ/ัะฐั"
+#: contrib/comments/models.py:67 contrib/comments/models.py:166
+msgid "object ID"
+msgstr "object ID"
-#: contrib/admin/templates/admin/object_history.html:19
-msgid "User"
-msgstr "ะะพัะธัะฝะธะบ"
+#: contrib/comments/models.py:68
+msgid "headline"
+msgstr "ะฝะฐัะปะพะฒ"
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "ะะบัะธัะฐ"
+#: contrib/comments/models.py:69 contrib/comments/models.py:90
+#: contrib/comments/models.py:167
+msgid "comment"
+msgstr "ะบะพะผะตะฝัะฐั"
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "N j. Y, H:i"
+#: contrib/comments/models.py:70
+msgid "rating #1"
+msgstr "ะฟะพะฟัะปะฐัะฝะพัั #1"
-#: contrib/admin/templates/admin/object_history.html:36
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
-msgstr ""
-"ะะฒะพั ะพะฑัะตะบั ะฝะตะผะฐ ะธััะพัะธัะฐ ะฝะฐ ะธะทะผะตะฝะธ. ะะฐัะฒะตัะพัะฐัะฝะพ ะฝะต ะฑะธะป ะดะพะดะฐะดะตะฝ ัะพ ะฐะดะผะธะฝ "
-"ัะฐััะพั."
+#: contrib/comments/models.py:71
+msgid "rating #2"
+msgstr "ะฟะพะฟัะปะฐัะฝะพัั #2"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, 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 "ะัะธัะตัะต ะฝะฐ %(object_name)s '%(escaped_object)s' ัะต ัะตะทัะปัะธัะฐ ัะพ ะฑัะธัะตัะต ะฝะฐ ะฟะพะฒัะทะฐะฝะธัะต ะพะฑัะตะบัะธ, ะฝะพ ัะพ ะฒะฐัะฐัะฐ ัะผะตัะบะฐ ะฝะตะผะฐัะต ะดะพะฒะพะปะฝะพ ะฟัะธะฒะธะปะตะณะธะธ ะดะฐ ะณะธ ะฑัะธัะตัะต ัะปะตะดะฝะธัะต ัะธะฟะพะฒะธ ะฝะฐ ะพะฑัะตะบัะธ:"
+#: contrib/comments/models.py:72
+msgid "rating #3"
+msgstr "ะฟะพะฟัะปะฐัะฝะพัั #3"
-#: contrib/admin/templates/admin/delete_confirmation.html:21
-#, python-format
+#: contrib/comments/models.py:73
+msgid "rating #4"
+msgstr "ะฟะพะฟัะปะฐัะฝะพัั #4"
+
+#: contrib/comments/models.py:74
+msgid "rating #5"
+msgstr "ะฟะพะฟัะปะฐัะฝะพัั #5"
+
+#: contrib/comments/models.py:75
+msgid "rating #6"
+msgstr "ะฟะพะฟัะปะฐัะฝะพัั #6"
+
+#: contrib/comments/models.py:76
+msgid "rating #7"
+msgstr "ะฟะพะฟัะปะฐัะฝะพัั #7"
+
+#: contrib/comments/models.py:77
+msgid "rating #8"
+msgstr "ะฟะพะฟัะปะฐัะฝะพัั #8"
+
+#: contrib/comments/models.py:82
+msgid "is valid rating"
+msgstr "ะต ะฒะฐะปะธะดะฝะฐ ะฟะพะฟัะปะฐัะฝะพัั"
+
+#: contrib/comments/models.py:83 contrib/comments/models.py:169
+msgid "date/time submitted"
+msgstr "ะดะฐััะผ/ะฒัะตะผะต ะฟัะธัะฐะฒะตะฝ"
+
+#: contrib/comments/models.py:84 contrib/comments/models.py:170
+msgid "is public"
+msgstr "ะต ัะฐะฒะตะฝ"
+
+#: contrib/comments/models.py:86
+msgid "is removed"
+msgstr "ะต ะพััััะฐะฝะตั"
+
+#: contrib/comments/models.py:86
msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
-"All of the following related items will be deleted:"
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
msgstr ""
-"ะกะธะณััะฝะต ััะต ะดะตะบะฐ ัะฐะบะฐัะต ะดะฐ ะณะธ ะฑัะธัะตัะต %(object_name)s โ%(escaped_object)sโ? "
-"ะกะธัะต ะพะฒะธะต ััะฐะฒะบะธ ัะต ะฑะธะดะฐั ะธะทะฑัะธัะฐะฝะธ:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:26
-msgid "Yes, I'm sure"
-msgstr "ะะฐ, ัะธะณััะตะฝ ััะผ"
+"ะจัะธะบะปะธัะฐััะต ะณะพ ะพะฒะฐ ะฟะพะปะต ะฐะบะพ ะบะพะผะตะฝัะฐัะพั ะฝะต ะต ะฟัะธะณะพะดะตะฝ. ะะฐะผะตััะพ ะฝะตะณะพ ะฟะพัะฐะบะฐัะฐ "
+"โะะฒะพั ะบะพะผะตะฝัะฐั ะฑะตัะต ะพััััะฐะฝะตัโ ัะต ะฑะธะดะต ะฟัะธะบะฐะถะฐะฝะฐ."
-#: contrib/admin/templates/admin/pagination.html:10
-msgid "Show all"
-msgstr "ะัะธะบะฐะถะธ ะณะธ ัะธัะต"
+#: contrib/comments/models.py:91
+msgid "comments"
+msgstr "ะบะพะผะตะฝัะฐัะธ"
-#: contrib/admin/templates/admin/change_list.html:12
+#: contrib/comments/models.py:131 contrib/comments/models.py:207
+msgid "Content object"
+msgstr "Content ะพะฑัะตะบั"
+
+#: contrib/comments/models.py:159
#, python-format
-msgid "Add %(name)s"
-msgstr "ะะพะดะฐะดะธ %(name)s"
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"ะะฐะฟะธัะฐะฝ ะพะด %(user)s ะฝะฐ %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
-#: contrib/admin/templates/admin/change_form.html:15
-#: contrib/admin/templates/admin/index.html:28
-msgid "Add"
-msgstr "ะะพะดะฐะดะธ"
+#: contrib/comments/models.py:168
+msgid "person's name"
+msgstr "ะธะผะต ะฝะฐ ะปะธัะฝะพััะฐ"
-#: contrib/admin/templates/admin/change_form.html:22
-msgid "View on site"
-msgstr "ะะพะณะปะตะดะฝะธ ะฝะฐ ัะฐััะพั"
+#: contrib/comments/models.py:171
+msgid "ip address"
+msgstr "ะธะฟ ะฐะดัะตัะฐ"
-#: contrib/admin/templates/admin/change_form.html:32
-#: contrib/admin/templates/admin/auth/user/change_password.html:24
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "ะะต ะผะพะปะฐะผ ะฟะพะฟัะฐะฒะตัะต ัะฐ ะณัะตัะบะฐัะฐ ะฟะพะดะพะปั."
-msgstr[1] "ะะต ะผะพะปะฐะผ ะฟะพะฟัะฐะฒะตัะต ะณะธ ะณัะตัะบะธัะต ะฟะพะดะพะปั."
+#: contrib/comments/models.py:173
+msgid "approved by staff"
+msgstr "ะพะดะพะฑัะตะฝะพ ะพะด ะฐะดะผะธะฝะธัััะฐัะพัะธัะต"
-#: contrib/admin/templates/admin/change_form.html:50
-msgid "Ordering"
-msgstr "ะะพะดัะตะดัะฒะฐัะต"
+#: contrib/comments/models.py:176
+msgid "free comment"
+msgstr "ัะปะพะฑะพะดะตะฝ ะบะพะผะตะฝัะฐั"
-#: contrib/admin/templates/admin/change_form.html:53
-msgid "Order:"
-msgstr "ะะพะดัะตะดะธ:"
+#: contrib/comments/models.py:177
+msgid "free comments"
+msgstr "ัะปะพะฑะพะดะฝะธ ะบะพะผะตะฝัะฐัะธ"
-#: contrib/admin/templates/admin/base.html:25
-msgid "Welcome,"
-msgstr "ะะพะฑัะตะดะพัะดะพะฒัะต,"
+#: contrib/comments/models.py:233
+msgid "score"
+msgstr "ะฟะพะตะฝะธ"
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "ะกััะฐะฝะธัะฐัะฐ ะฝะต ะต ะฝะฐัะดะตะฝะฐ"
+#: contrib/comments/models.py:234
+msgid "score date"
+msgstr "ะดะฐััะผ ะฟะพะตะฝะธ"
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "ะกะต ะธะทะฒะธะฝัะฒะฐะผะต, ะฝะพ ะฝะตะผะพะถะต ะดะฐ ัะฐ ะฝะฐัะดะตะผะต ัััะฐะฝะธัะฐัะฐ ะบะพัะฐ ัะฐ ะฑะฐัะฐะฒัะต."
+#: contrib/comments/models.py:237
+msgid "karma score"
+msgstr "ะบะฐัะผะฐ ะฟะพะตะฝ"
-#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:24
-msgid "Log in"
-msgstr "ะะฐัะฐะฒะฐ"
+#: contrib/comments/models.py:238
+msgid "karma scores"
+msgstr "ะบะฐัะผะฐ ะฟะพะตะฝะธ"
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/comments/models.py:242
#, python-format
-msgid "Models available in the %(name)s application."
-msgstr "ะะพััะฐะฟะฝะธ ะผะพะดะตะปะธ ะฒะพ ะฐะฟะปะธะบะฐัะธัะฐัะฐ %(name)s."
+msgid "%(score)d rating by %(user)s"
+msgstr "%(score)d ะณะปะฐัะฐัะต ะทะฐ ะฟะพะฟัะปะฐัะฝะพัั ะพะด %(user)s"
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/comments/models.py:258
#, python-format
-msgid "%(name)s"
-msgstr "%(name)s"
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"ะะฒะพั ะบะพะผะตะฝัะฐั ะฑะตัะต ะพะทะฝะฐัะตะฝ ะพะด %(user)s:\n"
+"\n"
+"%(text)s"
-#: contrib/admin/templates/admin/index.html:34
-msgid "Change"
-msgstr "ะะทะผะตะฝะธ"
+#: contrib/comments/models.py:265
+msgid "flag date"
+msgstr "ะดะฐััะผ ะฝะฐ ะพะทะฝะฐััะฒะฐัะต"
-#: contrib/admin/templates/admin/index.html:44
-msgid "You don't have permission to edit anything."
-msgstr "ะะตะผะฐัะต ะดะพะทะฒะพะปะฐ ะฝะธััะพ ะดะฐ ััะตะดัะฒะฐ."
+#: contrib/comments/models.py:268
+msgid "user flag"
+msgstr "ะบะพัะธัะฝะธัะบะฐ ะพะทะฝะฐะบะฐ"
-#: contrib/admin/templates/admin/index.html:52
-msgid "Recent Actions"
-msgstr "ะะพัะปะตะดะฝะธ ะฐะบัะธะธ"
+#: contrib/comments/models.py:269
+msgid "user flags"
+msgstr "ะบะพัะธัะฝะธัะบะธ ะพะทะฝะฐะบะธ"
-#: contrib/admin/templates/admin/index.html:53
-msgid "My Actions"
-msgstr "ะะพะธ ะฐะบัะธะธ"
+#: contrib/comments/models.py:273
+#, python-format
+msgid "Flag by %r"
+msgstr "ะะทะฝะฐัะตะฝะพ ะพะด %r"
-#: contrib/admin/templates/admin/index.html:57
-msgid "None available"
-msgstr "ะะธััะพ ะฝะต ะต ะดะพััะฐะฟะฝะพ"
+#: contrib/comments/models.py:278
+msgid "deletion date"
+msgstr "ะดะฐััะผ ะฝะฐ ะฑัะธัะตัะต"
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "ะะฐะฝะณะพ ะฐะดะผะธะฝะธัััะฐัะธัะฐ ะฝะฐ ัะฐัั"
+#: contrib/comments/models.py:280
+msgid "moderator deletion"
+msgstr "ะฑัะธัะตัะต ะพะด ะผะพะดะตัะฐัะพั"
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "ะะฐะฝะณะพ ะฐะดะผะธะฝะธัััะฐัะธัะฐ"
+#: contrib/comments/models.py:281
+msgid "moderator deletions"
+msgstr "ะฑัะธัะตัะฐ ะพะด ะผะพะดะตัะฐัะพั"
-#: 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 ""
-"ะัะฒะพ, ะฒะฝะตัะตัะต ะบะพัะธัะฝะธัะบะพ ะธะผะต ะธ ะปะพะทะธะฝะบะฐ. ะะพัะพะฐ ัะต ะผะพะถะตัะต ะดะฐ ััะตะดัะฒะฐัะต ะฟะพะฒะตัะต "
-"ะบะพัะธัะฝะธัะบะธ ะพะฟัะธะธ."
+#: contrib/comments/models.py:285
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr "ะัะธัะตัะต ะพะด ะผะพะดะตัะฐัะพั ะพะด %r"
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
-msgid "Username"
-msgstr "ะะพัะธัะฝะธะบ"
+#: contrib/comments/views/karma.py:19
+msgid "Anonymous users cannot vote"
+msgstr "ะะฝะพะฝะธะผะฝะธัะต ะบะพัะธัะฝะธัะธ ะฝะตะผะพะถะต ะดะฐ ะณะปะฐัะฐะฐั"
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
-msgid "Password"
-msgstr "ะะพะทะธะฝะบะฐ"
+#: contrib/comments/views/karma.py:23
+msgid "Invalid comment ID"
+msgstr "ะะตะฒะฐะปะธะดะฝะพ ะะ ะฝะฐ ะบะพะผะตะฝัะฐัะพั"
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
-msgid "Password (again)"
-msgstr "ะะพะทะธะฝะบะฐ (ะฟะพะฒัะพัะฝะพ)"
+#: contrib/comments/views/karma.py:25
+msgid "No voting for yourself"
+msgstr "ะะตะผะฐ ะณะปะฐัะฐัะต ะทะฐ ัะฐะผะธะพั ัะตะฑะต"
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
-msgid "Enter the same password as above, for verification."
-msgstr "ะะฐัะฐะดะธ ะฒะตัะธัะธะบะฐัะธัะฐ ะฒะฝะตัะตัะต ัะฐ ะธััะฐัะฐ ะปะพะทะธะฝะบะฐ ะบะฐะบะพ ะธ ะณะพัะต."
+#: contrib/comments/views/comments.py:27
+msgid "This rating is required because you've entered at least one other rating."
+msgstr ""
+"ะะฒะฐ ะณะปะฐัะฐัะต ะทะฐ ะฟะพะฟัะปะฐัะฝะพัั ะต ะฟะพััะตะฑะฝะพ ะฑะธะดะตััะธ ะฒะฝะตัะพะฒัะต ะฝะฐัะผะฐะปะบั ัััะต ะตะดะฝะพ "
+"ะดััะณะพ."
-#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#: contrib/comments/views/comments.py:111
#, python-format
-msgid "Enter a new password for the user %(username)s."
-msgstr "ะะฝะตัะตัะต ะฝะพะฒะฐ ะปะพะทะธะฝะบะฐ ะทะฐ ะบะพัะธัะฝะธะบะพั %(username)s."
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr[0] ""
+"ะะฒะพั ะบะพะผะตะฝัะฐั ะฑะตัะต ะฟัะฐัะตะฝ ะพะด ะบะพัะธัะฝะธะบ ะบะพั ะฟัะฐัะธะป ะฟะพะผะฐะปะบั ะพะด %(count)s "
+"ะบะพะผะตะฝัะฐั:\n"
+"\n"
+"%(text)s"
+msgstr[1] ""
+"ะะฒะพั ะบะพะผะตะฝัะฐั ะฑะตัะต ะฟัะฐัะตะฝ ะพะด ะบะพัะธัะฝะธะบ ะบะพั ะฟัะฐัะธะป ะฟะพะผะฐะปะบั ะพะด %(count)s "
+"ะบะพะผะตะฝัะฐัะธ:\n"
+"\n"
+"%(text)s"
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "ะะพะผะตะฝัะฐะปะฝะพ:"
+#: contrib/comments/views/comments.py:116
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"ะะฒะพั ะบะพะผะตะฝัะฐั ะฑะตัะต ะฟัะฐัะตะฝ ะพะด ะฝะตะดะพะฒะตัะปะธะฒ ะบะพัะธัะฝะธะบ:\n"
+"\n"
+"%(text)s"
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "ะะทะผะตะฝะฐ:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:280
+msgid "Only POSTs are allowed"
+msgstr "ะะพะทะฒะพะปะตะฝะพ ะต ัะฐะผะพ POST"
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "ะะฐััะผ:"
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:284
+msgid "One or more of the required fields wasn't submitted"
+msgstr "ะะดะฝะพ ะธะปะธ ะฟะพะฒะตัะต ะพะด ะฟะพััะตะฑะฝะธัะต ะฟะพะปะธัะฐ ะฝะต ะฑะตัะต ะฟะพะฟะพะปะฝะตัะพ"
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "ะัะตะผะต:"
+#: contrib/comments/views/comments.py:196
+#: contrib/comments/views/comments.py:286
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "ะะตะบะพั ัะฐ ะฟัะพะผะตะฝะธะป ัะพัะผะฐัะฐ ะทะฐ ะบะพะผะตะฝัะฐัะธ (ัะธะณััะฝะพัะตะฝ ะฟัะตะบััะพะบ)"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "ะะธ ะฑะปะฐะณะพะดะฐัะธะผะต ััะพ ะดะตะฝะตัะบะฐ ะฟะพะผะธะฝะฐะฒัะต ะบะฒะฐะปะธัะตัะฝะพ ะฒัะตะผะต ัะพ ะธะฝัะตัะฝะตั ัััะฐะฝะธัะฐะฒะฐ."
+#: contrib/comments/views/comments.py:206
+#: contrib/comments/views/comments.py:292
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"ะคะพัะผะฐัะฐ ะทะฐ ะบะพะผะตะฝัะฐั ะธะผะฐัะต ะฝะตะฟัะฐะฒะธะปะตะฝ โtargetโ ะฟะฐัะฐะผะตัะฐั - ะธะดะตะฝัะธัะธะบะฐัะธะพะฝะธะพั "
+"ะฑัะพั ะฝะฐ ะพะฑัะตะบัะพั ะฑะตัะต ะฝะตะฟัะฐะฒะธะปะตะฝ"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "ะะพะณะธัะฐััะต ัะต ะฟะพะฒัะพัะฝะพ"
+#: contrib/comments/views/comments.py:257
+#: contrib/comments/views/comments.py:321
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "ะคะพัะผะฐัะฐ ะทะฐ ะบะพะผะตะฝัะฐั ะฝะต ะพะฒะพะทะผะพะถะธ ะฝะธัั โะฟัะตะณะปะตะดโ ะฝะธัั โะฟัะฐัะฐัะตโ"
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "ะะฐ ะดะพะฑะธะฒะฐัะฐ ะพะฒะฐะฐ ะฟะพัะฐะบะฐ ะฑะธะดะตััะธ ะฟะพะฑะฐัะฐะฒัะต ะดะฐ ัะต ัะตัะตัะธัะฐ ะฒะฐัะฐัะฐ ะปะพะทะธะฝะบะฐ"
+#: contrib/comments/templates/comments/form.html:8
+msgid "Forgotten your password?"
+msgstr "ะะฐ ะทะฐะฑะพัะฐะฒะธัะต ะฒะฐัะฐัะฐ ะปะพะทะธะฝะบะฐ?"
-#: contrib/admin/templates/registration/password_reset_email.html:3
-#, python-format
-msgid "for your user account at %(site_name)s"
-msgstr "ะทะฐ ะบะพัะธัะฝะธัะบะฐัะฐ ัะผะตัะบะฐ ะฝะฐ %(site_name)s"
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr "ะะพะฟัะปะฐัะฝะพัั"
-#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "ะะฐัะฐัะฐ ะฝะพะฒะฐ ะปะพะทะธะฝะบะฐ ะต: %(new_password)s"
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "ะะพััะตะฑะฝะพ"
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr "ะงัััะฒัะฒะฐััะต ัะต ัะปะพะฑะพะดะฝะพ ะดะฐ ัะฐ ะฟัะพะผะตะฝะธัะต ะพะฒะฐะฐ ะปะพะทะธะฝะบะฐ ะฟัะตะบั ะพะฒะฐะฐ ัััะฐะฝะธัะฐ:"
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr "ะะพ ะถะตะปะฑะฐ"
-#: contrib/admin/templates/registration/password_reset_email.html:11
-msgid "Your username, in case you've forgotten:"
-msgstr "ะะฐัะตัะพ ะบะพัะธัะฝะธัะบะพ ะธะผะต, ะฒะพ ัะปััะฐั ะดะฐ ััะต ะณะพ ะทะฐะฑะพัะฐะฒะธะปะต:"
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr "ะะฑัะฐะฒะธ ัะพัะพะณัะฐัะธัะฐ"
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-msgstr "ะะธ ะฑะปะฐะณะพะดะฐัะธะผะต ััะพ ะณะพ ะบะพัะธััะธัะต ะพะฒะพั ัะฐัั!"
+#: contrib/comments/templates/comments/form.html:28
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "ะะพะผะตะฝัะฐั:"
-#: contrib/admin/templates/registration/password_reset_email.html:15
-#, python-format
-msgid "The %(site_name)s team"
-msgstr "ะขะธะผะพั ะฝะฐ %(site_name)s"
+#: contrib/comments/templates/comments/form.html:35
+#: contrib/comments/templates/comments/freeform.html:10
+msgid "Preview comment"
+msgstr "ะัะตะณะปะตะดะฐั"
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/registration/password_reset_form.html:10
-msgid "Password reset"
-msgstr "ะ ะตัะตัะธัะฐัะต ะฝะฐ ะปะพะทะธะฝะบะฐ"
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "ะะฐัะตัะพ ะธะผะต:"
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "ะฃัะฟะตัะฝะพ ะต ัะตัะตัะธัะฐัะตัะพ ะฝะฐ ะปะพะทะธะฝะบะฐัะฐ"
+#: contrib/localflavor/br/forms.py:18
+msgid "Enter a zip code in the format XXXXX-XXX."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะฟะพััะตะฝัะบะธ ะฑัะพั ะฒะพ ัะพัะผะฐัะพั XXXXX-XXX."
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"ะะธ ะฟัะฐัะธะฒะผะต ะฝะพะฒะฐ ะปะพะทะธะฝะบะฐ ะฝะฐ ะฐะดัะตัะฐัะฐ ะบะพัะฐ ัะฐ ะฒะฝะตัะพะฒัะต.ะขัะตะฑะฐ ะดะฐ ัะฐ ะฟัะธะผะธัะต ะทะฐ "
-"ะบัะฐัะบะพ ะฒัะตะผะต."
+#: contrib/localflavor/br/forms.py:30
+msgid "Phone numbers must be in XX-XXXX-XXXX format."
+msgstr "ะขะตะปะตัะพะฝัะบะธัะต ะฑัะพะตะฒะธ ะผะพัะฐ ะดะฐ ะฑะธะดะฐั ะฒะพ XX-XXXX-XXXX ัะพัะผะฐัะพั."
-#: 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_done.html:4
-msgid "Password change"
-msgstr "ะะทะผะตะฝะฐ ะฝะฐ ะปะพะทะธะฝะบะฐ"
+#: contrib/localflavor/de/forms.py:16 contrib/localflavor/fi/forms.py:14
+#: contrib/localflavor/fr/forms.py:17 contrib/localflavor/it/forms.py:14
+msgid "Enter a zip code in the format XXXXX."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะฟะพััะตะฝัะบะธ ะฑัะพั ะฒะพ ัะพัะผะฐั XXXXXX."
-#: contrib/admin/templates/registration/password_change_form.html:12
+#: contrib/localflavor/de/forms.py:60
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 ""
-"ะะฐัะฐะดะธ ัะธะณััะฝะพัั ะฒะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ัะฐ ะฒะฐัะฐัะฐ ััะฐัะฐ ะปะพะทะธะฝะบะฐ ะธ ะฟะพัะพะฐ ะฒะฝะตัะตัะต ัะฐ "
-"ะฝะพะฒะฐัะฐ ะดะฒะฐะฟะฐัะธ ะทะฐ ะดะฐ ะผะพะถะต ะดะฐ ัะต ะฟะพัะฒัะดะธ ะดะตะบะฐ ะฟัะฐะฒะธะปะฝะพ ััะต ัะฐ ะธัะบััะฐะปะต."
+"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
+"format."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะฑัะพั ะฝะฐ ะปะธัะฝะฐ ะบะฐััะฐ ะฒะพ ะะตัะผะฐะฝะธัะฐ ะฒะพ XXXXXXXXXXX-XXXXXXX-XXXXXXX-X ัะพัะผะฐัะพั."
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "ะกัะฐัะฐ ะปะพะทะธะฝะบะฐ:"
+#: contrib/localflavor/de/de_states.py:5
+msgid "Baden-Wuerttemberg"
+msgstr "ะะฐะดะตะฝ-ะัะตััะตะผะฑะตัะณ"
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
-msgstr "ะะพะฒะฐ ะปะพะทะธะฝะบะฐ:"
+#: contrib/localflavor/de/de_states.py:6
+msgid "Bavaria"
+msgstr "ะะฐะฒะฐัะธัะฐ"
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
-msgstr "ะะพัะฒัะดะธ ะปะพะทะธะฝะบะฐ:"
+#: contrib/localflavor/de/de_states.py:7
+msgid "Berlin"
+msgstr "ะะตัะปะธะฝ"
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
-msgstr "ะัะพะผะตะฝะธ ัะฐ ะผะพัะฐัะฐ ะปะพะทะธะฝะบะฐ"
+#: contrib/localflavor/de/de_states.py:8
+msgid "Brandenburg"
+msgstr "ะัะฐะฝะดะตะฝะฑััะณ"
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
-msgstr "ะฃัะฟะตัะฝะฐ ะฟัะพะผะตะฝะฐ ะฝะฐ ะปะพะทะธะฝะบะฐัะฐ"
+#: contrib/localflavor/de/de_states.py:9
+msgid "Bremen"
+msgstr "ะัะตะผะตะฝ"
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-msgstr "ะะฐัะฐัะฐ ะปะพะทะธะฝะบะฐ ะฑะตัะต ัะผะตะฝะตัะฐ."
+#: contrib/localflavor/de/de_states.py:10
+msgid "Hamburg"
+msgstr "ะฅะฐะผะฑััะณ"
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr "ะกัะต ัะฐ ะทะฐะฑะพัะฐะฒะธะปะต ะฒะฐัะฐัะฐ ะปะพะทะธะฝะบะฐ? ะะฝะตัะตัะต ัะฐ ะฒะฐัะฐัะฐ ะต-ะฟะพััะฐ ะฟะพะดะพะปั, ัะต ัะฐ ัะตัะตัะธัะฐะผะต ะฒะฐัะฐัะฐ ะปะพะทะธะฝะบะฐ ะธ ะฝะพะฒะฐัะฐ ัะต ะฒะธ ัะฐ ะฟัะฐัะธะผะต ะฟะพ ะต-ะฟะพััะฐ."
+#: contrib/localflavor/de/de_states.py:11
+msgid "Hessen"
+msgstr "ะฅะตัะตะฝ"
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "ะ-ะฟะพััะฐ:"
+#: contrib/localflavor/de/de_states.py:12
+msgid "Mecklenburg-Western Pomerania"
+msgstr "ะะตะบะปะตะฝะฑััะณ - ะะฐะฟะฐะดะฝะฐ ะะพะผะตัะฐะฝะธัะฐ"
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "ะ ะตัะตัะธัะฐั ัะฐ ะผะพัะฐัะฐ ะปะพะทะธะฝะบะฐ"
+#: contrib/localflavor/de/de_states.py:13
+msgid "Lower Saxony"
+msgstr "ะะพะปะฝะฐ ะกะฐะบัะพะฝะธัะฐ"
-#: contrib/admin/views/main.py:223
-msgid "Site administration"
-msgstr "ะะดะผะธะฝะธัััะฐัะธัะฐ ะฝะฐ ัะฐัั"
+#: contrib/localflavor/de/de_states.py:14
+msgid "North Rhine-Westphalia"
+msgstr "ะกะตะฒะตัะฝะฐ ะ ะฐัะฝะฐ-ะะตัััะฐะปะธัะฐ"
-#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:19
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" ะฑะตัะต ััะฟะตัะฝะพ ะดะพะดะฐะดะตะฝ."
+#: contrib/localflavor/de/de_states.py:15
+msgid "Rhineland-Palatinate"
+msgstr "ะ ะฐัะฝะฐะปะตะฝะด-ะะฐะปะฐัะธะฝะฐัะต"
-#: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347
-#: contrib/admin/views/auth.py:24
-msgid "You may edit it again below."
-msgstr "ะะพะดะพะปั ะผะพะถะตัะต ะฟะพะฒัะพัะฝะพ ะดะฐ ะณะพ ััะตะดะธัะต."
+#: contrib/localflavor/de/de_states.py:16
+msgid "Saarland"
+msgstr "ะกะฐัะปะตะฝะด"
-#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356
-#, python-format
-msgid "You may add another %s below."
-msgstr "ะะพะดะพะปั ะผะพะถะตัะต ะดะฐ ะดะพะดะฐัะต ัััะต ะตะดะตะฝ %s."
+#: contrib/localflavor/de/de_states.py:17
+msgid "Saxony"
+msgstr "ะกะฐะบัะพะฝะธัะฐ"
-#: contrib/admin/views/main.py:289
-#, python-format
-msgid "Add %s"
-msgstr "ะะพะดะฐะดะธ %s"
+#: contrib/localflavor/de/de_states.py:18
+msgid "Saxony-Anhalt"
+msgstr "ะกะฐะบัะพะฝะธัะฐ-ะะฝั ะฐะปั"
-#: contrib/admin/views/main.py:335
-#, python-format
-msgid "Added %s."
-msgstr "ะะพะดะฐะดะตะฝะพ %s."
+#: contrib/localflavor/de/de_states.py:19
+msgid "Schleswig-Holstein"
+msgstr "ะจะปะตัะฒะธะณ-ะฅะพะปััะฐัะฝ"
-#: contrib/admin/views/main.py:337
-#, python-format
-msgid "Changed %s."
-msgstr "ะะทะผะตะฝะตัะฐ %s."
+#: contrib/localflavor/de/de_states.py:20
+msgid "Thuringia"
+msgstr "ะขััะธะฝะณะธะฐ"
-#: contrib/admin/views/main.py:339
-#, python-format
-msgid "Deleted %s."
-msgstr "ะะทะฑัะธัะฐะฝะฐ %s."
+#: contrib/localflavor/fi/forms.py:40 contrib/localflavor/fi/forms.py:46
+msgid "Enter a valid Finnish social security number."
+msgstr "ะะฝะตััะต ะฟัะฐะฒะธะปะตะฝ ัะธะฝัะบะธ ะผะฐัะธัะตะฝ ะฑัะพั."
-#: contrib/admin/views/main.py:342
-msgid "No fields changed."
-msgstr "ะะต ะฑะตัะต ะธะทะผะตะฝะตัะพ ะฝะธะตะดะฝะพ ะฟะพะปะต."
+#: contrib/localflavor/jp/forms.py:21
+msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
+msgstr "ะะฝะตัะตัะต ะฟะพััะตะฝัะบะธ ะฑัะพั ะฒะพ ัะพัะผะฐัะพั XXXXXXX ะธะปะธ XXX-XXXX."
-#: contrib/admin/views/main.py:345
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ะฑะตัะต ััะฟะตัะฝะพ ะธะทะผะตะฝะตัะฐ."
+#: contrib/localflavor/jp/jp_prefectures.py:4
+msgid "Hokkaido"
+msgstr "ะฅะพะบะฐะธะดะพ"
-#: contrib/admin/views/main.py:353
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-"%(name)s \"%(obj)s\" ะฑะตัะต ััะฟะตัะฝะพ ะดะพะดะฐะดะตะฝะฐ.ะะพะดะพะปั ะผะพะถะตัะต ะฟะพะฒัะพัะฝะพ ะดะฐ ัะฐ "
-"ััะตะดะธัะต."
+#: contrib/localflavor/jp/jp_prefectures.py:5
+msgid "Aomori"
+msgstr "ะะพะผะพัะธ"
-#: contrib/admin/views/main.py:391
-#, python-format
-msgid "Change %s"
-msgstr "ะะทะผะตะฝะธ %s"
+#: contrib/localflavor/jp/jp_prefectures.py:6
+msgid "Iwate"
+msgstr "ะะฒะฐัะต"
-#: contrib/admin/views/main.py:473
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "ะะดะตะฝ ะธะปะธ ะฟะพะฒะตัะต %(fieldname)s ะฒะพ %(name)s: %(obj)s"
+#: contrib/localflavor/jp/jp_prefectures.py:7
+msgid "Miyagi"
+msgstr "ะะธัะฐะณะธ"
-#: contrib/admin/views/main.py:478
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "ะะดะตะฝ ะธะปะธ ะฟะพะฒะตัะต %(fieldname)s ะฒะพ %(name)s:"
+#: contrib/localflavor/jp/jp_prefectures.py:8
+msgid "Akita"
+msgstr "ะะบะธัะฐ"
-#: contrib/admin/views/main.py:511
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" ะฑะตัะต ะธะทะฑัะธัะฐะฝะฐ ััะฟะตัะฝะพ."
+#: contrib/localflavor/jp/jp_prefectures.py:9
+msgid "Yamagata"
+msgstr "ะะฐะผะฐะณะฐัะฐ"
-#: contrib/admin/views/main.py:514
-msgid "Are you sure?"
-msgstr "ะกะธะณััะฝะธ ััะต?"
+#: contrib/localflavor/jp/jp_prefectures.py:10
+msgid "Fukushima"
+msgstr "ะคัะบััะธะผะฐ"
-#: contrib/admin/views/main.py:536
-#, python-format
-msgid "Change history: %s"
-msgstr "ะััะพัะธัะฐ ะฝะฐ ะธะทะผะตะฝะธ: %s"
+#: contrib/localflavor/jp/jp_prefectures.py:11
+msgid "Ibaraki"
+msgstr "ะะฑะฐัะฐะบะธ"
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "Select %s"
-msgstr "ะะทะฑะตัะตั %s"
+#: contrib/localflavor/jp/jp_prefectures.py:12
+msgid "Tochigi"
+msgstr "ะขะพัะธะณะธ"
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "Select %s to change"
-msgstr "ะะทะฑะตัะตัะต %s ะทะฐ ะธะทะผะตะฝะฐ"
+#: contrib/localflavor/jp/jp_prefectures.py:13
+msgid "Gunma"
+msgstr "ะัะฝะผะฐ"
-#: contrib/admin/views/main.py:758
-msgid "Database error"
-msgstr "ะัะตัะบะฐ ะฒะพ ะฑะฐะทะฐัะฐ ัะพ ะฟะพะดะฐัะพัะธ"
+#: contrib/localflavor/jp/jp_prefectures.py:14
+msgid "Saitama"
+msgstr "ะกะฐะธัะฐะผะฐ"
-#: contrib/admin/views/decorators.py:62
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"ะะต ะผะพะปะฐะผ ะฝะฐัะฐะฒะตัะต ัะต ะฟะพะฒัะพัะฝะพ ะฑะธะดะตััะธ ะฒะฐัะฐัะฐ ัะตัะธัะฐ ะต ะธััะตัะตะฝะฐ. ะะต ัะต "
-"ะณัะธะถะตัะต. ะะฐัะธัะต ะฒะฝะตัะพะฒะธ ะฑะตะฐ ะทะฐััะฒะฐะฝะธ."
+#: contrib/localflavor/jp/jp_prefectures.py:15
+msgid "Chiba"
+msgstr "ะงะธะฑะฐ"
-#: contrib/admin/views/decorators.py:69
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"ะะทะณะปะตะดะฐ ะดะตะบะฐ ะฒะฐัะธะพั ะฟัะตะปะธัััะฒะฐั ะฝะต ะต ะบะพะฝัะธะณััะธัะฐะฝ ะดะฐ ะฟัะธัะฐัะฐ ะบะพะปะฐัะธัะฐ. ะะต "
-"ะผะพะปะฐะผ ะพะฒะพะทะผะพะถะตัะต ะณะธ ะบะพะปะฐัะธัะฐัะฐ, ะฟัะตะฒัะธัะฐััะต ัะฐ ัััะฐัะฐ ะธ ะฟัะพะฑะฐััะต ะฟะพะฒัะพัะฝะพ."
+#: contrib/localflavor/jp/jp_prefectures.py:16
+msgid "Tokyo"
+msgstr "ะขะพะบะธะพ"
-#: contrib/admin/views/decorators.py:83
-msgid "Usernames cannot contain the '@' character."
-msgstr "ะะพัะธัะฝะธัะบะธัะต ะธะผะธัะฐ ะฝะตะผะพะถะต ะดะฐ ะณะพ ัะพะดัะถะฐั โ@โ ะทะฝะฐะบะพั."
+#: contrib/localflavor/jp/jp_prefectures.py:17
+msgid "Kanagawa"
+msgstr "ะะฐะฝะฐะณะฐะฒะฐ"
-#: contrib/admin/views/decorators.py:85
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "ะะฐัะฐัะฐ ะต-ะฟะพััะฐ ะฝะต ะต ะฒะฐัะตัะพ ะบะพัะธัะฝะธัะบะพ ะธะผะต. ะัะพะฑะฐััะต ัะพ โ%sโ."
+#: contrib/localflavor/jp/jp_prefectures.py:18
+msgid "Yamanashi"
+msgstr "ะะฐะผะฐะฝะฐัะธ"
-#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48
-#: contrib/admin/views/doc.py:50
-msgid "tag:"
-msgstr "ัะฐะณ:"
+#: contrib/localflavor/jp/jp_prefectures.py:19
+msgid "Nagano"
+msgstr "ะะฐะณะฐะฝะพ"
-#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79
-#: contrib/admin/views/doc.py:81
-msgid "filter:"
-msgstr "ัะธะปัะตั:"
+#: contrib/localflavor/jp/jp_prefectures.py:20
+msgid "Niigata"
+msgstr "ะะธะณะธัะฐ"
-#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137
-#: contrib/admin/views/doc.py:139
-msgid "view:"
-msgstr "ะฟะพะณะปะตะด:"
+#: contrib/localflavor/jp/jp_prefectures.py:21
+msgid "Toyama"
+msgstr "ะขะพัะฐะผะฐ"
-#: contrib/admin/views/doc.py:164
-#, python-format
-msgid "App %r not found"
-msgstr "ะะต ะต ะฝะฐัะดะตะฝะฐ ะฐะฟะปะธะบะฐัะธัะฐัะฐ %r"
+#: contrib/localflavor/jp/jp_prefectures.py:22
+msgid "Ishikawa"
+msgstr "ะัะธะบะฐะฒะฐ"
-#: contrib/admin/views/doc.py:171
-#, python-format
-msgid "Model %r not found in app %r"
-msgstr "ะะพะดะตะปะพั %r ะฝะต ะต ะฝะฐัะดะตะฝ ะฒะพ ะฐะฟะปะธะบะฐัะธัะฐัะฐ %r"
+#: contrib/localflavor/jp/jp_prefectures.py:23
+msgid "Fukui"
+msgstr "ะคัะบัะธ"
-#: contrib/admin/views/doc.py:183
-#, python-format
-msgid "the related `%s.%s` object"
-msgstr "ะฟะพะฒัะฐะทะฝะธัะต`%s.%s` ะพะฑัะตะบั"
+#: contrib/localflavor/jp/jp_prefectures.py:24
+msgid "Gifu"
+msgstr "ะะธัั"
-#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205
-#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224
-msgid "model:"
-msgstr "ะผะพะดะตะป:"
+#: contrib/localflavor/jp/jp_prefectures.py:25
+msgid "Shizuoka"
+msgstr "ะจะธะทะพัะบะฐ"
-#: contrib/admin/views/doc.py:214
-#, python-format
-msgid "related `%s.%s` objects"
-msgstr "ะฟะพะฒัะทะฐะฝะธ `%s.%s` ะพะฑัะตะบัะธ"
+#: contrib/localflavor/jp/jp_prefectures.py:26
+msgid "Aichi"
+msgstr "ะะธัะธ"
-#: contrib/admin/views/doc.py:219
-#, python-format
-msgid "all %s"
-msgstr "ัะธัะต %s"
+#: contrib/localflavor/jp/jp_prefectures.py:27
+msgid "Mie"
+msgstr "ะะธะต"
-#: contrib/admin/views/doc.py:224
-#, python-format
-msgid "number of %s"
-msgstr "ะฑัะพั ะฝะฐ %s"
+#: contrib/localflavor/jp/jp_prefectures.py:28
+msgid "Shiga"
+msgstr "ะจะธะณะฐ"
-#: contrib/admin/views/doc.py:229
-#, python-format
-msgid "Fields on %s objects"
-msgstr "ะะพะปะธัะฐ ะฝะฐ %s ะพะฑัะตะบัะธ"
+#: contrib/localflavor/jp/jp_prefectures.py:29
+msgid "Kyoto"
+msgstr "ะัะพัะพ"
-#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
-#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312
-msgid "Integer"
-msgstr "ะฆะตะป ะฑัะพั"
+#: contrib/localflavor/jp/jp_prefectures.py:30
+msgid "Osaka"
+msgstr "ะัะฐะบะฐ"
-#: contrib/admin/views/doc.py:292
-msgid "Boolean (Either True or False)"
-msgstr "ะะพะณะธัะบะฐ (ะธะปะธ ัะพัะฝะพ ะธะปะธ ะฝะตัะพัะฝะพ)"
+#: contrib/localflavor/jp/jp_prefectures.py:31
+msgid "Hyogo"
+msgstr "ะฅะธะพะณะพ"
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "ะะฑะพั (ะดะพ %(maxlength)s)"
+#: contrib/localflavor/jp/jp_prefectures.py:32
+msgid "Nara"
+msgstr "ะะฐัะฐ"
-#: contrib/admin/views/doc.py:294
-msgid "Comma-separated integers"
-msgstr "ะฆะตะปะพะฑัะพัะฝะธ ะฒัะตะดะฝะพััะธ ะพะดะดะตะปะตะฝะธ ัะพ ะทะฐะฟะธัะบะฐ"
+#: contrib/localflavor/jp/jp_prefectures.py:33
+msgid "Wakayama"
+msgstr "ะะฐะบะฐัะฐะผะฐ"
+
+#: contrib/localflavor/jp/jp_prefectures.py:34
+msgid "Tottori"
+msgstr "ะขะพัะพัะธ"
-#: contrib/admin/views/doc.py:295
-msgid "Date (without time)"
-msgstr "ะะฐััะผ (ะฑะตะท ัะฐั)"
+#: contrib/localflavor/jp/jp_prefectures.py:35
+msgid "Shimane"
+msgstr "ะจะธะผะฐะฝะต"
-#: contrib/admin/views/doc.py:296
-msgid "Date (with time)"
-msgstr "ะะฐััะผ (ัะพ ัะฐั)"
+#: contrib/localflavor/jp/jp_prefectures.py:36
+msgid "Okayama"
+msgstr "ะะบะฐัะฐะผะฐ"
-#: contrib/admin/views/doc.py:297
-msgid "E-mail address"
-msgstr "ะะดัะตัะฐ ะฝะฐ ะต-ะฟะพััะฐ"
+#: contrib/localflavor/jp/jp_prefectures.py:37
+msgid "Hiroshima"
+msgstr "ะฅะธัะพัะธะผะฐ"
-#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299
-#: contrib/admin/views/doc.py:302
-msgid "File path"
-msgstr "ะะฐัะตะบะฐ ะฝะฐ ะดะฐัะพัะตะบะฐ"
+#: contrib/localflavor/jp/jp_prefectures.py:38
+msgid "Yamaguchi"
+msgstr "ะะฐะผะฐะณััะธ"
-#: contrib/admin/views/doc.py:300
-msgid "Decimal number"
-msgstr "ะะตัะธะผะฐะปะตะฝ ะฑัะพั"
+#: contrib/localflavor/jp/jp_prefectures.py:39
+msgid "Tokushima"
+msgstr "ะขะพะบััะธะผะฐ"
-#: contrib/admin/views/doc.py:306
-msgid "Boolean (Either True, False or None)"
-msgstr "ะะพะณะธัะบะฐ (ัะพัะฝะพ,ะฝะตัะพัะฝะพ ะธะปะธ ะฟัะฐะทะฝะพ)"
+#: contrib/localflavor/jp/jp_prefectures.py:40
+msgid "Kagawa"
+msgstr "ะะฐะณะฐะฒะฐ"
-#: contrib/admin/views/doc.py:307
-msgid "Relation to parent model"
-msgstr "ะ ะตะปะฐัะธัะฐ ัะพ ัะพะดะธัะตะปัะบะธะพั ะผะพะดะตะป"
+#: contrib/localflavor/jp/jp_prefectures.py:41
+msgid "Ehime"
+msgstr "ะะธะผะต"
-#: contrib/admin/views/doc.py:308
-msgid "Phone number"
-msgstr "ะขะตะปะตัะพะฝัะบะธ ะฑัะพั"
+#: contrib/localflavor/jp/jp_prefectures.py:42
+msgid "Kochi"
+msgstr "ะะพัะธ"
-#: contrib/admin/views/doc.py:313
-msgid "Text"
-msgstr "ะขะตะบัั"
+#: contrib/localflavor/jp/jp_prefectures.py:43
+msgid "Fukuoka"
+msgstr "ะคัะบัะพะบะฐ"
-#: contrib/admin/views/doc.py:314
-msgid "Time"
-msgstr "ะงะฐั"
+#: contrib/localflavor/jp/jp_prefectures.py:44
+msgid "Saga"
+msgstr "ะกะฐะณะฐ"
-#: contrib/admin/views/doc.py:316
-msgid "U.S. state (two uppercase letters)"
-msgstr "ะัะถะฐะฒะฐ ะฒะพ ะกะะ (ะดะฒะต ะณะพะปะตะผะธ ะฑัะบะฒะธ)"
+#: contrib/localflavor/jp/jp_prefectures.py:45
+msgid "Nagasaki"
+msgstr "ะะฐะณะฐัะฐะบะธ"
-#: contrib/admin/views/doc.py:317
-msgid "XML text"
-msgstr "XML ัะตะบัั"
+#: contrib/localflavor/jp/jp_prefectures.py:46
+msgid "Kumamoto"
+msgstr "ะัะผะฐะผะพัะพ"
-#: contrib/admin/views/doc.py:343
-#, python-format
-msgid "%s does not appear to be a urlpattern object"
-msgstr "%s ะฝะต ะธะทะณะปะตะดะฐ ะดะตะบะฐ ะต url ะพะฑัะตะบั"
+#: contrib/localflavor/jp/jp_prefectures.py:47
+msgid "Oita"
+msgstr "ะะธัะฐ"
-#: contrib/admin/views/auth.py:30
-msgid "Add user"
-msgstr "ะะพะดะฐะดะธ ะบะพัะธัะฝะธะบ"
+#: contrib/localflavor/jp/jp_prefectures.py:48
+msgid "Miyazaki"
+msgstr "ะะธัะฐะทะฐะบะธ"
-#: contrib/admin/views/auth.py:57
-msgid "Password changed successfully."
-msgstr "ะฃัะฟะตัะฝะฐ ะฟัะพะผะตะฝะฐ ะฝะฐ ะปะพะทะธะฝะบะฐัะฐ."
+#: contrib/localflavor/jp/jp_prefectures.py:49
+msgid "Kagoshima"
+msgstr "ะะฐะณะพัะธะผะฐ"
-#: contrib/admin/views/auth.py:64
-#, python-format
-msgid "Change password: %s"
-msgstr "ะัะพะผะตะฝะธ ะปะพะทะธะฝะบะฐ: %s"
+#: contrib/localflavor/jp/jp_prefectures.py:50
+msgid "Okinawa"
+msgstr "ะะบะธะฝะฐะฒะฐ"
-#: newforms/fields.py:101 newforms/fields.py:254
-#, python-format
-msgid "Ensure this value has at most %d characters."
-msgstr "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะพะฒะฐะฐ ะฒัะตะดะฝะพัั ะธะผะฐ ะฝะฐัะผะฝะพะณั %d ะทะฝะฐัะธ."
+#: contrib/localflavor/no/forms.py:15
+msgid "Enter a zip code in the format XXXX."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะฟะพััะตะฝัะบะธ ะฑัะพั ะฒะพ ัะพัะผะฐัะพั XXXX."
-#: newforms/fields.py:103 newforms/fields.py:256
-#, python-format
-msgid "Ensure this value has at least %d characters."
-msgstr "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะพะฒะฐะฐ ะฒัะตะดะฝะพัั ะธะผะฐ ะฝะฐัะผะฐะปะบั %d ะทะฝะฐัะธ."
+#: contrib/localflavor/no/forms.py:36
+msgid "Enter a valid Norwegian social security number."
+msgstr "ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะฝะพัะฒะตัะบะธ ะผะฐัะธัะตะฝ ะฑัะพั."
-#: newforms/fields.py:126 core/validators.py:120
-msgid "Enter a whole number."
-msgstr "ะะฝะตัะธ ัะตะป ะฑัะพั."
+#: contrib/localflavor/uk/forms.py:18
+msgid "Enter a postcode. A space is required between the two postcode parts."
+msgstr "ะะฝะตัะตัะต ะฟะพััะตะฝัะบะธ ะฑัะพั. ะะฐะดะพะปะถะธัะตะปะฝะพ ะต ะฟัะฐะทะฝะพ ะผะตััะพ ะฟะพะผะตัั ะดะฒะฐัะฐ ะดะตะปะฐ ะฝะฐ ะฟะพััะตะฝัะบะธะพั ะฑัะพั."
-#: newforms/fields.py:128
-#, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะพะฒะฐะฐ ะฒัะตะดะฝะพัั ะต ะฟะพะผะฐะปะฐ ะธะปะธ ะตะดะฝะฐะบะฒะฐ ะฝะฐ %s."
+#: contrib/localflavor/usa/forms.py:18
+msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
+msgstr "ะะฝะตัะตัะต ะฟะพััะตะฝัะบะธ ะฑัะพั ะฒะพ ัะพัะผะฐัะพั XXXXX ะธะปะธ XXXXX-XXXX."
-#: newforms/fields.py:130
-#, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะพะฒะฐะฐ ะฒัะตะดะฝะพัั ะต ะฟะพะณะพะปะตะผะฐ ะธะปะธ ะตะดะฝะฐะบะฒะฐ ัะพ %s."
+#: contrib/localflavor/usa/forms.py:51
+msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
+msgstr "ะะฝะตััะต ะฟัะฐะฒะธะปะตะฝ ะผะฐัะธัะตะฝ ะฑัะพั ะทะฐ ะกะะ ะฒะพ XXX-XX-XXXX ัะพัะผะฐัะพั."
-#: newforms/fields.py:163
-msgid "Enter a valid date."
-msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะฐััะผ."
+#: contrib/sessions/models.py:68
+msgid "session key"
+msgstr "ะบะปัั ะฝะฐ ัะตัะธัะฐัะฐ"
-#: newforms/fields.py:190
-msgid "Enter a valid time."
-msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะพ ะฒัะตะผะต."
+#: contrib/sessions/models.py:69
+msgid "session data"
+msgstr "ะฟะพะดะฐัะพัะธ ะพะด ัะตัะธัะฐัะฐ"
-#: newforms/fields.py:226
-msgid "Enter a valid date/time."
-msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะฐััะผ ัะพ ะฒัะตะผะต."
+#: contrib/sessions/models.py:70
+msgid "expire date"
+msgstr "ะดะฐััะผ ะฝะฐ ะธััะตะบัะฒะฐัะต"
-#: newforms/fields.py:240
-msgid "Enter a valid value."
-msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะฐ ะฒัะตะดะฝะพัั."
+#: contrib/sessions/models.py:74
+msgid "session"
+msgstr "ัะตัะธัะฐ"
-#: newforms/fields.py:269 core/validators.py:161
-msgid "Enter a valid e-mail address."
-msgstr "ะะฝะตัeัะต ะฟัะฐะฒะธะปะฝะฐ ะฐะดัะตัะฐ ะทะฐ ะต-ะฟะพััะฐ."
+#: contrib/sessions/models.py:75
+msgid "sessions"
+msgstr "ัะตัะธะธ"
-#: newforms/fields.py:287 newforms/fields.py:309
-msgid "Enter a valid URL."
-msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะฐ ะฐะดัะตัะฐ."
+#: contrib/contenttypes/models.py:36
+msgid "python model class name"
+msgstr "ะธะผะฐ ะฝะฐ ะบะปะฐัะฐัะฐ ะฝะฐ ะฟะธัะพะฝ ะผะพะดะตะปะธัะต"
-#: newforms/fields.py:311
-msgid "This URL appears to be a broken link."
-msgstr "ะะฒะฐะฐ ะฐะดัะตัะฐ ะธะทะณะปะตะดะฐ ะดะตะบะฐ ะฝะต ะต ะดะพััะฐะฟะฝะฐ."
+#: contrib/contenttypes/models.py:39
+msgid "content type"
+msgstr "content type"
-#: newforms/fields.py:359
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "ะะทะฑะตัะตัะต ะฟัะฐะฒะธะปะฝะพ. ะขะพะฐ ะฝะต ะต ะตะดะฝะพ ะพะด ะผะพะถะฝะธัะต ะธะทะฑะพัะธ."
+#: contrib/contenttypes/models.py:40
+msgid "content types"
+msgstr "content types"
-#: newforms/fields.py:377 newforms/fields.py:453
-msgid "Enter a list of values."
-msgstr "ะะฝะตัะตัะต ะปะธััะฐ ะฝะฐ ะฒัะตะดะฝะพััะธ."
+#: oldforms/__init__.py:392
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะฒะฐัะธะพั ัะตะบัั ะธะผะฐ ะฟะพะผะฐะปะบั ะพะด %s ะทะฝะฐะบ."
+msgstr[1] "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะฒะฐัะธะพั ัะตะบัั ะธะผะฐ ะฟะพะผะฐะปะบั ะพะด %s ะทะฝะฐัะธ."
+
+#: oldforms/__init__.py:397
+msgid "Line breaks are not allowed here."
+msgstr "ะขัะบะฐ ะฝะต ัะต ะดะพะทะฒะพะปะตะฝะธ ะฟัะตะบะธะฝะธ ะฝะฐ ะปะธะฝะธัะฐ."
-#: newforms/fields.py:386
+#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610
#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะพ. %s ะฝะต ะต ะตะดะตะฝ ะพะด ะดะพััะฐะฟะฝะธัะต ะฒัะตะดะฝะพััะธ."
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "ะะทะฑะตัะตัะต ะฟัะฐะฒะธะปะฝะพ, %(data)s' ะฝะต ะต ะฒะพ %(choices)s."
-#: template/defaultfilters.py:436
-msgid "yes,no,maybe"
-msgstr "ะดะฐ, ะฝะต, ะผะพะถะตะฑะธ"
+#: oldforms/__init__.py:674
+msgid "The submitted file is empty."
+msgstr "ะัะฐัะตะฝะฐัะฐ ะดะฐัะพัะตะบะฐ ะต ะฟัะฐะทะฝะฐ."
+
+#: oldforms/__init__.py:730
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "ะะฝะตัะตัะต ัะตะป ะฑัะพั ะฟะพะผะตัั -32,768 ะธ 32,767."
+
+#: oldforms/__init__.py:740
+msgid "Enter a positive number."
+msgstr "ะะฝะตัะตัะต ะฟะพะทะธัะธะฒะตะฝ ะฑัะพั."
+
+#: oldforms/__init__.py:750
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "ะะฝะตัะตัะต ัะตะป ะฑัะพั ะฟะพะผะตัั 0 ะธ 32,767."
#: views/generic/create_update.py:43
#, python-format
@@ -2035,286 +2460,296 @@ msgstr "%(verbose_name)s ะฑะตัะต ััะฟะตัะฝะพ ะฐะถััะธัะฐะฝ."
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s ะฑะตัะต ะธะทะฑัะธัะฐะฝ."
-#: core/validators.py:64
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "ะะฒะฐะฐ ะฒัะตะดะฝะพัั ัะผะตะต ะดะฐ ะธะผะฐ ัะฐะผะพ ะฑัะบะฒะธ, ะฑัะพัะบะธ ะธะปะธ ะดะพะปะฝะธ ัััะธ."
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "ะฟะพะฝะตะดะตะปะฝะธะบ"
-#: core/validators.py:68
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
-"slashes."
-msgstr "ะะฒะฐะฐ ะฒัะตะดะฝะพัั ัะผะตะต ะดะฐ ะธะผะฐ ัะฐะผะพ ะฑัะบะฒะธ, ะฑัะพัะบะธ, ะดะพะปะฝะธ ัััะธ, ัััะธ ะธะปะธ ะบะพัะธ ัััะธ."
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "ะฒัะพัะฝะธะบ"
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers, underscores or hyphens."
-msgstr "ะะฒะฐะฐ ะฒัะตะดะฝะพัั ัะผะตะต ะดะฐ ัะพะดัะถะธ ัะฐะผะพ ะฑัะบะฒะธ, ะฑัะพัะบะธ, ะดะพะปะฝะธ ัััะธ ะธะปะธ ัััะธ."
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "ััะตะดะฐ"
-#: core/validators.py:76
-msgid "Uppercase letters are not allowed here."
-msgstr "ะะพะปะตะผะธ ะฑัะบะฒะธ ะฝะต ัะต ะดะพะทะฒะพะปะตะฝะธ."
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "ัะตัะฒััะพะบ"
-#: core/validators.py:80
-msgid "Lowercase letters are not allowed here."
-msgstr "ะะฐะปะธ ะฑัะบะฒะธ ะฝะต ัะต ะดะพะทะฒะพะปะตะฝะธ."
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "ะฟะตัะพะบ"
-#: core/validators.py:87
-msgid "Enter only digits separated by commas."
-msgstr "ะะฝะตัะตัะต ัะฐะผะพ ัะธััะธ ะพะดะดะตะปะตะฝะธ ัะพ ะทะฐะฟะธัะบะธ."
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "ัะฐะฑะพัะฐ"
-#: core/validators.py:99
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "ะะฝะตัะตัะต ะฒะฐะปะธะดะฝะธ ะฐะดัะตัะธ ะทะฐ ะต-ะฟะพััะฐ ะพะดะดะตะปะตะฝะธ ัะพ ะทะฐะฟะธัะบะธ."
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "ะฝะตะดะตะปะฐ"
-#: core/validators.py:103
-msgid "Please enter a valid IP address."
-msgstr "ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฒะฐะปะธะดะฝะฐ ะะ ะฐะดัะตัะฐ."
+#: utils/dates.py:14
+msgid "January"
+msgstr "ัะฐะฝัะฐัะธ"
-#: core/validators.py:107
-msgid "Empty values are not allowed here."
-msgstr "ะัะฐะทะฝะธ ะฒัะตะดะฝะพััะธ ะฝะต ัะต ะดะพะทะฒะพะปะตะฝะธ."
+#: utils/dates.py:14
+msgid "February"
+msgstr "ัะตะฒััะฐัะธ"
-#: core/validators.py:111
-msgid "Non-numeric characters aren't allowed here."
-msgstr "ะะตะฝัะผะตัะธัะบะธ ะทะฝะฐัะธ ะฝะต ัะต ะดะพะทะฒะพะปะตะฝะธ ััะบะฐ."
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
+msgstr "ะผะฐัั"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
+msgstr "ะฐะฟัะธะป"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
+msgstr "ะผะฐั"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
+msgstr "ััะฝะธ"
+
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
+msgstr "ััะปะธ"
+
+#: utils/dates.py:15
+msgid "August"
+msgstr "ะฐะฒะณััั"
+
+#: utils/dates.py:15
+msgid "September"
+msgstr "ัะตะฟัะตะผะฒัะธ"
+
+#: utils/dates.py:15
+msgid "October"
+msgstr "ะพะบัะพะผะฒัะธ"
+
+#: utils/dates.py:15
+msgid "November"
+msgstr "ะฝะพะตะผะฒัะธ"
+
+#: utils/dates.py:16
+msgid "December"
+msgstr "ะดะตะบะตะผะฒัะธ"
+
+#: utils/dates.py:19
+msgid "jan"
+msgstr "ัะฐะฝ"
+
+#: utils/dates.py:19
+msgid "feb"
+msgstr "ัะตะฒ"
+
+#: utils/dates.py:19
+msgid "mar"
+msgstr "ะผะฐั"
+
+#: utils/dates.py:19
+msgid "apr"
+msgstr "ะฐะฟั"
+
+#: utils/dates.py:19
+msgid "may"
+msgstr "ะผะฐั"
+
+#: utils/dates.py:19
+msgid "jun"
+msgstr "ััะฝ"
+
+#: utils/dates.py:20
+msgid "jul"
+msgstr "ััะป"
+
+#: utils/dates.py:20
+msgid "aug"
+msgstr "ะฐะฒะณ"
-#: core/validators.py:115
-msgid "This value can't be comprised solely of digits."
-msgstr "ะะฒะฐะฐ ะฒัะตะดะฝะพัั ะฝะต ัะผะตะต ะดะฐ ะฑะธะดะต ัะฐะผะพ ะพะด ัะธััะธ."
+#: utils/dates.py:20
+msgid "sep"
+msgstr "ัะตะฟ"
-#: core/validators.py:124
-msgid "Only alphabetical characters are allowed here."
-msgstr "ะะพะทะฒะพะปะตะฝะธ ัะต ัะฐะผะพ ะฑัะบะฒะธ."
+#: utils/dates.py:20
+msgid "oct"
+msgstr "ะพะบั"
-#: core/validators.py:139
-msgid "Year must be 1900 or later."
-msgstr "ะะพะดะธะฝะฐัะฐ ะผะพัะฐ ะดะฐ ะฑะธะดะต 1900 ะธะปะธ ะฟะพะบะฐัะฝะพ."
+#: utils/dates.py:20
+msgid "nov"
+msgstr "ะฝะพะต"
-#: core/validators.py:143
-#, python-format
-msgid "Invalid date: %s."
-msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ะดะฐััะผ: %s."
+#: utils/dates.py:20
+msgid "dec"
+msgstr "ะดะตะบ"
-#: core/validators.py:152
-msgid "Enter a valid time in HH:MM format."
-msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะพ ะฒัะตะผะต ะฒะพ ัะพัะผะฐัะพั HH:MM."
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "ัะฐะฝ."
-#: core/validators.py:177
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"ะะฐัะตัะต ะฒะฐะปะธะดะฝะฐ ัะพัะพะณัะฐัะธัะฐ. ะะฐัะพัะตะบะฐัะฐ ะบะพัะฐ ัะฐ ะบะฐัะธะฒัะต ะธะปะธ ะฝะต ะฑะตัะต "
-"ัะพัะพะณัะฐัะธัะฐ ะธะปะธ ะฑะตัะต ัะฐัะธะฟะฐะฝะฐ ะดะฐัะพัะตะบะฐัะฐ."
+#: utils/dates.py:27
+msgid "Feb."
+msgstr "ัะตะฒ."
-#: core/validators.py:184
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "ะะดัะตัะฐัะฐ %s ะฝะต ะฟะพะบะฐะถัะฒะฐ ะบะพะฝ ะฒะฐะปะธะดะฝะฐ ัะพัะพะณัะฐัะธัะฐ."
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "ะฐะฒะณ."
-#: core/validators.py:188
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr ""
-"ะขะตะปะตัะพะฝัะบะธัะต ะฑัะพะตะฒะธ ะผะพัะฐ ะดะฐ ะฑะธะดะฐั ะฒะพ XXX-XXX-XXXX ัะพัะผะฐัะพั. โ%sโ ะฝะต ะต "
-"ะฒะฐะปะธะดะตะฝ."
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "ัะตะฟ."
-#: core/validators.py:196
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "ะะดัะตัะฐัะฐ โ%sโ ะฝะต ะฟะพะบะฐะถัะฒะฐ ะบะพะฝ QuickTime ะฒะธะดะตะพ."
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "ะพะบั."
-#: core/validators.py:200
-msgid "A valid URL is required."
-msgstr "ะะฐะดะพะปะถะธัะตะปะฝะฐ ะต ะฟัะฐะฒะธะปะฝะฐ ะฐะดัะตัะฐ."
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "ะฝะพะต."
-#: core/validators.py:214
-#, python-format
-msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
-msgstr ""
-"ะะฐะดะพะปะถะธัะตะปะตะฝ ะต ะฟัะฐะฒะธะปะตะฝ HTML. ะัะตัะบะธัะต ัะต:\n"
-"%s"
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "ะดะตะบ."
-#: core/validators.py:221
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "ะะตะฟัะฐะฒะธะปะฝะพ ัะพัะผะธัะฐะฝ XML: %s"
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] "ะณะพะดะธะฝะฐ"
+msgstr[1] "ะณะพะดะธะฝะธ"
-#: core/validators.py:238
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ะฐะดัะตัะฐ: %s"
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] "ะผะตัะตั"
+msgstr[1] "ะผะตัะตัะธ"
-#: core/validators.py:243 core/validators.py:245
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "ะะดัะตัะฐัะฐ %s ะต ัะบััะตะฝะฐ ะฒััะบะฐ."
+#: utils/timesince.py:14
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "ัะตะดะผะธัะฐ"
+msgstr[1] "ัะตะดะผะธัะธ"
-#: core/validators.py:251
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะฐ ัะบัะฐัะตะฝะธัะฐ ะทะฐ ะดัะถะฐะฒะฐ ะฒะพ ะกะะ."
+#: utils/timesince.py:15
+msgid "day"
+msgid_plural "days"
+msgstr[0] "ะดะตะฝ"
+msgstr[1] "ะดะตะฝะฐ"
-#: core/validators.py:265
-#, 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] "ะะฝะธะผะฐะฒะฐััะต ะฝะฐ ัะฐะทะธะบะพั. ะขัะบะฐ ะฝะต ะต ะดะพะทะฒะพะปะตะฝ ะทะฑะพัะพั %s."
-msgstr[1] "ะะฝะธะผะฐะฒะฐััะต ะฝะฐ ัะฐะทะธะบะพั. ะขัะบะฐ ะฝะต ัะต ะดะพะทะฒะพะปะตะฝะธ ะทะฑะพัะพะฒะธัะต %s."
+#: utils/timesince.py:16
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "ัะฐั"
+msgstr[1] "ัะฐัะฐ"
-#: core/validators.py:272
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "ะะฒะฐ ะฟะพะปะต ะผะพัะฐ ะดะฐ ัะพะพะดะตัััะฒัะฒะฐ ัะพ ะฟะพะปะตัะพ โ%sโ."
+#: utils/timesince.py:17
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "ะผะธะฝััะฐ"
+msgstr[1] "ะผะธะฝััะธ"
-#: core/validators.py:291
-msgid "Please enter something for at least one field."
-msgstr "ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฝะตััะพ ะฒะพ ะฑะฐัะตะผ ะตะดะฝะพ ะฟะพะปะต."
+#: utils/dateformat.py:40
+msgid "p.m."
+msgstr "ะฟะพะฟะปะฐะดะฝะต"
-#: core/validators.py:300 core/validators.py:311
-msgid "Please enter both fields or leave them both empty."
-msgstr "ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฒะพ ะดะฒะตัะต ะฟะพะปะธัะฐ ะธะปะธ ะพััะฐะฒะตัะต ะณะธ ะดะฒะตัะต ะฟัะฐะทะฝะธ."
+#: utils/dateformat.py:41
+msgid "a.m."
+msgstr "ะฝะฐัััะพ"
-#: core/validators.py:318
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "ะะฒะฐ ะฟะพะปะต ะผะพัะฐ ะดะฐ ะฑะธะดะต ะทะฐะดะฐะดะตะฝะพ ะฐะบะพ %(field)s ะต %(value)s"
+#: utils/dateformat.py:46
+msgid "PM"
+msgstr "ะฟะพะฟะปะฐะดะฝะต"
-#: core/validators.py:330
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr "ะะฒะฐ ะฟะพะปะต ะผะพัะฐ ะดะฐ ะฑะธะดะต ะทะฐะดะฐะดะตะฝะพ ะฐะบะพ %(field)s ะฝะต ะต %(value)s"
+#: utils/dateformat.py:47
+msgid "AM"
+msgstr "ะฝะฐัััะพ"
-#: core/validators.py:349
-msgid "Duplicate values are not allowed."
-msgstr "ะัะฟะปะธะบะฐั ะฒัะตะดะฝะพััะธ ะฝะต ัะต ะดะพะทะฒะพะปะตะฝะธ."
+#: utils/dateformat.py:95
+msgid "midnight"
+msgstr "ะฟะพะปะฝะพั"
-#: core/validators.py:364
-#, python-format
-msgid "This value must be between %s and %s."
-msgstr "ะะฒะฐะฐ ะฒัะตะดะฝะพััะฐ ะผะพัะฐ ะดะฐ ะฑะธะดะต ะฟะพะผะตัั %s ะธ %s."
+#: utils/dateformat.py:97
+msgid "noon"
+msgstr "ะฟะปะฐะดะฝะต"
-#: core/validators.py:366
-#, python-format
-msgid "This value must be at least %s."
-msgstr "ะะฒะฐะฐ ะฒัะตะดะฝะพััะฐ ะผะพัะฐ ะดะฐ ะฑะธะดะต ะฝะฐัะผะฐะปะบั %s."
+#: utils/translation/trans_real.py:358
+msgid "DATE_FORMAT"
+msgstr "j M Y"
-#: core/validators.py:368
-#, python-format
-msgid "This value must be no more than %s."
-msgstr "ะะฒะฐะฐ ะฒัะตะดะฝะพัั ะฝะต ัะผะตะต ะดะฐ ะฑะธะดะต ะฟะพะณะพะปะตะผะฐ ะพะด %s."
+#: utils/translation/trans_real.py:359
+msgid "DATETIME_FORMAT"
+msgstr "j M Y, P"
-#: core/validators.py:404
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "ะะฒะฐะฐ ะฒัะตะดะฝะพััะฐ ะผะพัะฐ ะดะฐ ะฑะธะดะต ััะตะฟะตะฝ ะพะด %s."
+#: utils/translation/trans_real.py:360
+msgid "TIME_FORMAT"
+msgstr "P"
-#: core/validators.py:415
-msgid "Please enter a valid decimal number."
-msgstr "ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะตัะธะผะฐะปะตะฝ ะฑัะพั."
+#: utils/translation/trans_real.py:376
+msgid "YEAR_MONTH_FORMAT"
+msgstr "F Y"
-#: core/validators.py:419
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural "Please enter a valid decimal number with at most %s total digits."
-msgstr[0] "ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะตัะธะผะฐะปะตะฝ ะฑัะพั ัะพ ะฝะฐัะผะฝะพะณั %s ัะธััa."
-msgstr[1] "ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะตัะธะผะฐะปะตะฝ ะฑัะพั ัะพ ะฝะฐัะผะฝะพะณั %s ะฒะบัะฟะฝะพ ัะธััะธ."
+#: utils/translation/trans_real.py:377
+msgid "MONTH_DAY_FORMAT"
+msgstr "F j"
-#: core/validators.py:422
-#, python-format
-msgid "Please enter a valid decimal number with a whole part of at most %s digit."
-msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
-msgstr[0] ""
-"ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะตัะธะผะฐะปะตะฝ ะฑัะพั ะบะพั ะฒะพ ัะตะปะธะพั ะฑัะพั ะธะผะฐ ะฝะฐัะผะฝะพะณั %s "
-"ัะธััะฐ."
-msgstr[1] ""
-"ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะตัะธะผะฐะปะตะฝ ะฑัะพั ะบะพั ะฒะพ ัะตะปะธะพั ะฑัะพั ะธะผะฐ ะฝะฐัะผะฝะพะณั %s "
-"ัะธััะธ."
+#: template/defaultfilters.py:491
+msgid "yes,no,maybe"
+msgstr "ะดะฐ, ะฝะต, ะผะพะถะตะฑะธ"
-#: core/validators.py:425
+#: newforms/fields.py:103 newforms/fields.py:256
#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural "Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] "ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะตัะธะผะฐะปะตะฝ ะฑัะพั ะบะพั ะธะผะฐ ะฝะฐัะผะฝะพะณั %s ะดะตัะธะผะฐะปะฝะฐ ัะธััะฐ."
-msgstr[1] "ะะต ะผะพะปะฐะผ ะฒะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะตัะธะผะฐะปะตะฝ ะฑัะพั ะบะพั ะธะผะฐ ะฝะฐัะผะฝะพะณั %s ะดะตัะธะผะฐะปะฝะธ ัะธััะธ."
+msgid "Ensure this value has at most %d characters."
+msgstr "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะพะฒะฐะฐ ะฒัะตะดะฝะพัั ะธะผะฐ ะฝะฐัะผะฝะพะณั %d ะทะฝะฐัะธ."
-#: core/validators.py:435
+#: newforms/fields.py:105 newforms/fields.py:258
#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "ะะพัะฒัะดะตัะต ะดะตะบะฐ ะบะฐัะตะฝะฐัะฐ ะดะฐัะพัะตะบะฐ ะธะผะฐ ะฝะฐัะผะฐะปะบั %s ะฑะฐััะธ."
+msgid "Ensure this value has at least %d characters."
+msgstr "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะพะฒะฐะฐ ะฒัะตะดะฝะพัั ะธะผะฐ ะฝะฐัะผะฐะปะบั %d ะทะฝะฐัะธ."
-#: core/validators.py:436
+#: newforms/fields.py:130
#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "ะะพัะฒัะดะตัะต ะดะตะบะฐ ะบะฐัะตะฝะฐัะฐ ะดะฐัะพัะตะบะฐ ะธะผะฐ ะฝะฐัะผะฝะพะณั %s ะฑะฐััะธ."
+msgid "Ensure this value is less than or equal to %s."
+msgstr "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะพะฒะฐะฐ ะฒัะตะดะฝะพัั ะต ะฟะพะผะฐะปะฐ ะธะปะธ ะตะดะฝะฐะบะฒะฐ ะฝะฐ %s."
-#: core/validators.py:453
-msgid "The format for this field is wrong."
-msgstr "ะคะพัะผะฐัะพั ะทะฐ ะพะฒะฐ ะฟะพะปะต ะต ะณัะตัะตะฝ."
+#: newforms/fields.py:132
+#, python-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "ะัะธะณััะฐััะต ัะต ะดะตะบะฐ ะพะฒะฐะฐ ะฒัะตะดะฝะพัั ะต ะฟะพะณะพะปะตะผะฐ ะธะปะธ ะตะดะฝะฐะบะฒะฐ ัะพ %s."
-#: core/validators.py:468
-msgid "This field is invalid."
-msgstr "ะะฒะฐ ะฟะพะปะต ะฝะต ะต ะฟัะฐะฒะธะปะฝะพ."
+#: newforms/fields.py:165
+msgid "Enter a valid date."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะฐััะผ."
-#: core/validators.py:504
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "ะะตะผะพะถะตะฒ ะดะฐ ะธะทะฒะฐะดะฐะผ ะฝะธััะพ ะพะด %s."
+#: newforms/fields.py:192
+msgid "Enter a valid time."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะพ ะฒัะตะผะต."
-#: core/validators.py:507
-#, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "ะะดัะตัะฐัะฐ %(url)s ะฒัะฐัะธ ะฝะตะฟัะฐะฒะธะปะฝะพ ะทะฐะณะปะฐะฒัะต Content-Type โ%(contenttype)sโ."
+#: newforms/fields.py:228
+msgid "Enter a valid date/time."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะตะฝ ะดะฐััะผ ัะพ ะฒัะตะผะต."
-#: core/validators.py:540
-#, python-format
-msgid ""
-"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
-"\"%(start)s\".)"
-msgstr ""
-"ะะต ะผะพะปะฐะผ ะทะฐัะฒะพัะตัะต ะณะพ ะพัะฒะพัะตะฝะธะพั %(tag)s ัะฐะณ ะพะด ะปะธะฝะธัะฐัะฐ %(line)s. (ะปะธะฝะธัะฐัะฐ "
-"ะฟะพัะฝัะฒะฐ ัะพ โ%(start)sโ.)"
+#: newforms/fields.py:242
+msgid "Enter a valid value."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะฐ ะฒัะตะดะฝะพัั."
-#: core/validators.py:544
-#, python-format
-msgid ""
-"Some text starting on line %(line)s is not allowed in that context. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"ะะตะบะพั ัะตะบัั ะบะพั ะฟะพัะฝัะฒะฐ ะฝะฐ ะปะธะฝะธัะฐัะฐ %(line)s ะฝะต ะต ะดะพะทะฒะพะปะตะฝ ะฒะพ ัะพั ะบะพะฝัะตะบัั. "
-"(ะะธะฝะธัะฐัะฐ ะทะฐะฟะพัะฝัะฒะฐ ัะพ โ%(start)sโ.)"
+#: newforms/fields.py:289 newforms/fields.py:311
+msgid "Enter a valid URL."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะฐ ะฐะดัะตัะฐ."
-#: core/validators.py:549
-#, python-format
-msgid ""
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"โ%(attr)sโ ะฝะฐ ะปะธะฝะธัะฐ %(line)s ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ะฐััะธะฑัั. (ะปะธะฝะธัะฐัะฐ ะทะฐะฟะพัะฝัะฒะฐ ัะพ โ%"
-"(start)sโ.)"
+#: newforms/fields.py:313
+msgid "This URL appears to be a broken link."
+msgstr "ะะฒะฐะฐ ะฐะดัะตัะฐ ะธะทะณะปะตะดะฐ ะดะตะบะฐ ะฝะต ะต ะดะพััะฐะฟะฝะฐ."
-#: core/validators.py:554
-#, python-format
-msgid ""
-"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"โ<%(tag)s>โ ะฝะฐ ะปะธะฝะธัะฐ %(line)s ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ัะฐะณ. (ะปะธะฝะธัะฐัะฐ ะทะฐะฟะพัะฝัะฒะฐ ัะพ โ%"
-"(start)sโ.)"
+#: newforms/fields.py:362 newforms/models.py:165
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "ะะทะฑะตัะตัะต ะฟัะฐะฒะธะปะฝะพ. ะขะพะฐ ะฝะต ะต ะตะดะฝะพ ะพะด ะผะพะถะฝะธัะต ะธะทะฑะพัะธ."
-#: core/validators.py:558
-#, python-format
-msgid ""
-"A tag on line %(line)s is missing one or more required attributes. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"ะะฐ ัะฐะณ ะพะด ะปะธะฝะธัะฐัะฐ %(line)s ะผั ะฝะตะดะพััะฐััะฒะฐ ะตะดะตะฝ ะธะปะธ ะฟะพะฒะตัะต ะพะด ะฟะพััะตะฑะฝะธัะต "
-"ะฐััะธะฑััะธ (ะปะธะฝะธัะฐัะฐ ะทะฐะฟะพัะฝัะฒะฐ ัะพ โ%(start)sโ)."
+#: newforms/fields.py:380 newforms/fields.py:456 newforms/models.py:182
+msgid "Enter a list of values."
+msgstr "ะะฝะตัะตัะต ะปะธััะฐ ะฝะฐ ะฒัะตะดะฝะพััะธ."
-#: core/validators.py:563
+#: newforms/fields.py:389 newforms/models.py:188
#, python-format
-msgid ""
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-"starts with \"%(start)s\".)"
-msgstr "ะััะธะฑััะพั โ%(attr)sโ ะฝะฐ ะปะธะฝะธัะฐัะฐ %(line)s ะธะผะฐ ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฒัะตะดะฝะพัั (ะปะธะฝะธัะฐัะฐ ะทะฐะฟะพัะฝัะฒะฐ ัะพ โ%(start)sโ)."
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "ะะฝะตัะตัะต ะฟัะฐะฒะธะปะฝะพ. %s ะฝะต ะต ะตะดะตะฝ ะพะด ะดะพััะฐะฟะฝะธัะต ะฒัะตะดะฝะพััะธ."
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index ee2152b5e1..1dc12ae50e 100644
Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index 427879a8f3..85b7d49d09 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@@ -1732,7 +1732,7 @@ msgstr "Ikke godkjent URL: %s"
#: core/validators.py:206 core/validators.py:208
#, python-format
msgid "The URL %s is a broken link."
-msgstr "Internettadresse fรธrer til en side som ikke virker."
+msgstr "Internettadresse %s fรธrer til en side som ikke virker."
#: core/validators.py:214
msgid "Enter a valid U.S. state abbreviation."
@@ -1881,7 +1881,7 @@ msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
"starts with \"%(start)s\".)"
msgstr ""
-"\"%(attr)s\" tillegg pรฅ linje $(line)s har en ikke godkjent verdi. (Linjen "
+"\"%(attr)s\" tillegg pรฅ linje %(line)s har en ikke godkjent verdi. (Linjen "
"starter med \"%(start)s\".)"
#: db/models/manipulators.py:302
@@ -1892,7 +1892,7 @@ msgstr "%(object)s med %(type)s finnes allerede for angitt %(field)s."
#: db/models/fields/__init__.py:40
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "$(optname)s med %(fieldname)s finnes allerede."
+msgstr "%(optname)s med %(fieldname)s finnes allerede."
#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index c6ac1c9612..2789e1518f 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 4e1dba2a49..f1a3cd77a2 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -1,200 +1,746 @@
-# Translation of django.po to.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Vladimir Labath , 2005.
-#
-#, fuzzy
+#
+#
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-27 07:31-0400\n"
-"PO-Revision-Date: 2005-11-10 23:22-0500\n"
-"Last-Translator: Vladimir Labath \n"
-"Language-Team: Slovak \n"
+"POT-Creation-Date: 2007-03-31 14:02+0200\n"
+"PO-Revision-Date: 2007-04-03 21:49+0200\n"
+"Last-Translator: <>\n"
+"Language-Team: Slovak\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#: oldforms/__init__.py:357 db/models/fields/__init__.py:117
+#: db/models/fields/__init__.py:274 db/models/fields/__init__.py:610
+#: db/models/fields/__init__.py:621 newforms/models.py:178
+#: newforms/fields.py:78 newforms/fields.py:374 newforms/fields.py:450
+#: newforms/fields.py:461
+msgid "This field is required."
+msgstr "Toto pole je povinnรฉ."
+
+#: oldforms/__init__.py:392
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgstr "Uisite sa, ลพe text je kratลกรญ ako %s znakov."
+
+#: oldforms/__init__.py:397
+msgid "Line breaks are not allowed here."
+msgstr "Zalomenia riadkov nie sรบ povolenรฉ."
+
+#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Vyberte platnรบ moลพnosลฅ; '%(data)s' nie je v %(choices)s."
+
+#: oldforms/__init__.py:577 newforms/widgets.py:170
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
+msgstr "Neznรกmy"
+
+#: oldforms/__init__.py:577 newforms/widgets.py:170
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
+msgstr "รno"
+
+#: oldforms/__init__.py:577 newforms/widgets.py:170
+#: contrib/admin/filterspecs.py:143
+msgid "No"
+msgstr "Nie"
+
+#: oldforms/__init__.py:672 core/validators.py:174 core/validators.py:445
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Sรบbor nebol odoslanรฝ. Skontrolujte atribรบt 'enctype' encoding vo formulรกri."
+
+#: oldforms/__init__.py:674
+msgid "The submitted file is empty."
+msgstr "Odoslanรฝ sรบbor je prรกzdnรฝ."
+
+#: oldforms/__init__.py:730
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Zadajte celรฉ ฤรญslo s hodnotou medzi -32768 a 32767."
+
+#: oldforms/__init__.py:740
+msgid "Enter a positive number."
+msgstr "Zadajte celรฉ kladnรฉ ฤรญslo."
+
+#: oldforms/__init__.py:750
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Zadajte celรฉ ฤรญslo s hodnotou medzi 0 a 32767."
+
+#: db/models/manipulators.py:307
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr "%(object)s s %(type)s uลพ existuje pre prvok %(field)s."
+
+#: db/models/manipulators.py:308 contrib/admin/views/main.py:335
+#: contrib/admin/views/main.py:337 contrib/admin/views/main.py:339
+msgid "and"
+msgstr "a"
+
+#: db/models/fields/__init__.py:42
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "%(optname)s s %(fieldname)s uลพ existuje."
+
+#: db/models/fields/__init__.py:367
+msgid "This value must be an integer."
+msgstr "Tรกto hodnota musรญ byลฅ celรฉ ฤรญslo."
+
+#: db/models/fields/__init__.py:402
+msgid "This value must be either True or False."
+msgstr "Tรกto hodnota musรญ byลฅ True alebo False."
+
+#: db/models/fields/__init__.py:423
+msgid "This field cannot be null."
+msgstr "Toto pole nemรดลพe obsahovaลฅ null."
+
+#: db/models/fields/__init__.py:457 core/validators.py:148
+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:526 core/validators.py:157
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Zadajte platnรฝ dรกtum a ฤas vo formรกte RRRR-MM-DD HH:MM."
+
+#: db/models/fields/__init__.py:630
+msgid "Enter a valid filename."
+msgstr "Zadajte platnรฝ nรกzov sรบboru."
+
+#: db/models/fields/__init__.py:751
+msgid "This value must be either None, True or False."
+msgstr "Tรกto hodnota musรญ byลฅ None, True alebo False."
+
+#: db/models/fields/related.py:53
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Prosรญm, zadajte platnรฉ %s."
+
+#: db/models/fields/related.py:642
+msgid "Separate multiple IDs with commas."
+msgstr "Oddeฤพte viacnรกsobnรฉ ID ฤiarkami."
+
+#: db/models/fields/related.py:644
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Ak chcete vybraลฅ viacero moลพnostรญ, podrลพte \"Control\" alebo \"Command\" na Mac-u."
+
+#: db/models/fields/related.py:691
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr "Prosรญm, vloลพte platnรฉ %(self)s ID-ฤka. Hodnota %(value)r je neplatnรก."
+"Prosรญm, vloลพte platnรฉ %(self)s ID-ฤka. Hodnoty %(value)r sรบ neplatnรฉ."
+
+#: conf/global_settings.py:39
+msgid "Arabic"
+msgstr "Arabsky"
+
+#: conf/global_settings.py:40
+msgid "Bengali"
+msgstr "Bengรกlsky"
+
+#: conf/global_settings.py:41
+msgid "Catalan"
+msgstr "Katalรกnsky"
+
+#: conf/global_settings.py:42
+msgid "Czech"
+msgstr "ฤesky"
+
+#: conf/global_settings.py:43
+msgid "Welsh"
+msgstr "Welลกsky"
+
+#: conf/global_settings.py:44
+msgid "Danish"
+msgstr "Dรกnsky"
+
+#: conf/global_settings.py:45
+msgid "German"
+msgstr "Nemecky"
+
+#: conf/global_settings.py:46
+msgid "Greek"
+msgstr "Grรฉcky"
+
+#: conf/global_settings.py:47
+msgid "English"
+msgstr "Anglicky"
+
+#: conf/global_settings.py:48
+msgid "Spanish"
+msgstr "ล panielsky"
+
+#: conf/global_settings.py:49
+msgid "Argentinean Spanish"
+msgstr "Argentรญnska ลกpanielฤina"
+
+#: conf/global_settings.py:50
+msgid "Finnish"
+msgstr "Fรญnsky"
+
+#: conf/global_settings.py:51
+msgid "French"
+msgstr "Francรบzsky"
+
+#: conf/global_settings.py:52
+msgid "Galician"
+msgstr "Galicijsky"
+
+#: conf/global_settings.py:53
+msgid "Hungarian"
+msgstr "Maฤarsky"
+
+#: conf/global_settings.py:54
+msgid "Hebrew"
+msgstr "Hebrejsky"
+
+#: conf/global_settings.py:55
+msgid "Icelandic"
+msgstr "Islandsky"
+
+#: conf/global_settings.py:56
+msgid "Italian"
+msgstr "Taliansky"
+
+#: conf/global_settings.py:57
+msgid "Japanese"
+msgstr "Japonsky"
+
+#: conf/global_settings.py:58
+msgid "Kannada"
+msgstr "Kannada"
+
+#: conf/global_settings.py:59
+msgid "Latvian"
+msgstr "Lotyลกsky"
+
+#: conf/global_settings.py:60
+msgid "Macedonian"
+msgstr "Mecedรณnsky"
+
+#: conf/global_settings.py:61
+msgid "Dutch"
+msgstr "Holandsky"
+
+#: conf/global_settings.py:62
+msgid "Norwegian"
+msgstr "Nรณrsky"
+
+#: conf/global_settings.py:63
+msgid "Polish"
+msgstr "Poฤพsky"
+
+#: conf/global_settings.py:64
+msgid "Portugese"
+msgstr "Portugalsky"
+
+#: conf/global_settings.py:65
+msgid "Brazilian"
+msgstr "Brazรญlsky"
+
+#: conf/global_settings.py:66
+msgid "Romanian"
+msgstr "Rumunsky"
+
+#: conf/global_settings.py:67
+msgid "Russian"
+msgstr "Rusky"
+
+#: conf/global_settings.py:68
+msgid "Slovak"
+msgstr "Slovensky"
+
+#: conf/global_settings.py:69
+msgid "Slovenian"
+msgstr "Slovinsky"
+
+#: conf/global_settings.py:70
+msgid "Serbian"
+msgstr "Srbsky"
+
+#: conf/global_settings.py:71
+msgid "Swedish"
+msgstr "ล vรฉdsky"
+
+#: conf/global_settings.py:72
+msgid "Tamil"
+msgstr "Tamilsky"
+
+#: conf/global_settings.py:73
+msgid "Telugu"
+msgstr "Telugu"
+
+#: conf/global_settings.py:74
+msgid "Turkish"
+msgstr "Turecky"
+
+#: conf/global_settings.py:75
+msgid "Ukrainian"
+msgstr "Ukrajinsky"
+
+#: conf/global_settings.py:76
+msgid "Simplified Chinese"
+msgstr "ฤรญnsky (zjednoduลกene)"
+
+#: conf/global_settings.py:77
+msgid "Traditional Chinese"
+msgstr "ฤรญnsky (tradiฤne)"
+
+#: core/validators.py:64
+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."
+
+#: core/validators.py:68
+msgid ""
+"This value must contain only letters, numbers, underscores, dashes or "
+"slashes."
+msgstr "Tรกto hodnota mรดลพe obsahovaลฅ len pรญsmena, ฤรญslice, podฤiarkovniky, pomlฤky a lomรญtka."
+
+#: core/validators.py:72
+msgid "This value must contain only letters, numbers, underscores or hyphens."
+msgstr "Tรกto hodnota mรดลพe obsahovaลฅ len pรญsmenรก, ฤรญslice, poฤiarkovnรญky a pomlฤky."
+
+#: core/validators.py:76
+msgid "Uppercase letters are not allowed here."
+msgstr "Veฤพkรฉ pรญsmenรก nie sรบ povolenรฉ."
+
+#: core/validators.py:80
+msgid "Lowercase letters are not allowed here."
+msgstr "Malรฉ pรญsmena nie sรบ povolenรฉ."
+
+#: core/validators.py:87
+msgid "Enter only digits separated by commas."
+msgstr "Zadรกvajte len ฤรญslice oddelenรฉ ฤiarkami."
+
+#: core/validators.py:99
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Zadajte platnรฉ e-mailovรฉ adresy oddelenรฉ ฤiarkami."
+
+#: core/validators.py:103
+msgid "Please enter a valid IP address."
+msgstr "Prosรญm, zadajte platnรบ IP adresu."
+
+#: core/validators.py:107
+msgid "Empty values are not allowed here."
+msgstr "Prรกzdne hodnoty tu nie sรบ povolenรฉ."
+
+#: core/validators.py:111
+msgid "Non-numeric characters aren't allowed here."
+msgstr "Inรฉ ako numerickรฉ znaky tu nie sรบ povolenรฉ."
+
+#: core/validators.py:115
+msgid "This value can't be comprised solely of digits."
+msgstr "Tรกto hodnota nemรดลพe byลฅ ฤisto numerickรก."
+
+#: core/validators.py:120 newforms/fields.py:126
+msgid "Enter a whole number."
+msgstr "Zadajte celรฉ ฤรญslo."
+
+#: core/validators.py:124
+msgid "Only alphabetical characters are allowed here."
+msgstr "Tu sรบ povolenรฉ len alfanumerickรฉ znaky."
+
+#: core/validators.py:139
+msgid "Year must be 1900 or later."
+msgstr "Rok musรญ byลฅ 1900 alebo neskรดr."
+
+#: core/validators.py:143
+#, python-format
+msgid "Invalid date: %s"
+msgstr "Neplatnรฝ dรกtum: %s"
+
+#: core/validators.py:153
+msgid "Enter a valid time in HH:MM format."
+msgstr "Zadajte platnรฝ ฤas vo formรกte HH:MM."
+
+#: core/validators.py:162 newforms/fields.py:269
+msgid "Enter a valid e-mail address."
+msgstr "Zadajte platnรบ e-mailovรบ adresu."
+
+#: core/validators.py:178
+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รกzkovรฝ formรกt alebo bol poลกkodenรฝ."
+
+#: core/validators.py:185
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "URL %s neodkazuje na platnรฝ obrรกzok."
+
+#: core/validators.py:189
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr "Telefรณnne ฤรญslo musรญ maลฅ formรกt XXX-XXX-XXXX. ฤรญslo \"%s\" je neplatnรฉ."
+
+#: core/validators.py:197
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "URL %s neodkazuje na platnรฉ QuickTime video."
+
+#: core/validators.py:201
+msgid "A valid URL is required."
+msgstr "Je poลพadovanรก platnรก adresa URL."
+
+#: core/validators.py:215
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr "HTML kรณd musรญ zodpovedaลฅ ลกpecifikรกcii. Zistenรฉ chyby sรบ:\n"
+"%s"
+
+#: core/validators.py:222
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "Chybnรฉ XML nezodpovedajรบce definรญcii: %s"
+
+#: core/validators.py:239
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "Neplatnรก adresa URL: %s"
+
+#: core/validators.py:244 core/validators.py:246
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "Odkaz na URL %s je neplatnรฝ."
+
+#: core/validators.py:252
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Zadajte platnรบ skratku ลกtรกtu USA."
+
+#: core/validators.py:266
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgstr "Vyjadrujte sa sluลกne! Slovo %s tu nie je dovolenรฉ pouลพivaลฅ."
+
+#: core/validators.py:273
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "Toto pole sa musรญ zhodovaลฅ s poฤพom '%s'. "
+
+#: core/validators.py:292
+msgid "Please enter something for at least one field."
+msgstr "Prosรญm, vyplลte aspoล jedno pole."
+
+#: core/validators.py:301 core/validators.py:312
+msgid "Please enter both fields or leave them both empty."
+msgstr "Prosรญm, vyplลte buฤ obidve polia, alebo ich nechajte prรกzdne."
+
+#: core/validators.py:320
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "Toto pole musรญ byลฅ vyplnenรฉ ak, %(field)s je %(value)s"
+
+#: core/validators.py:333
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "Toto pole musรญ byลฅ vyplnenรฉ, ak %(field)s nie je %(value)s"
+
+#: core/validators.py:352
+msgid "Duplicate values are not allowed."
+msgstr "Duplicitnรฉ hodnoty nie sรบ povolenรฉ."
+
+#: core/validators.py:367
+#, python-format
+msgid "This value must be between %(lower)s and %(upper)s."
+msgstr "Tรกto hodnota musรญ byลฅ medzi %(lower)s a %(upper)s."
+
+#: core/validators.py:369
+#, python-format
+msgid "This value must be at least %s."
+msgstr "Tรกto hodnota musรญ byลฅ prinajmenลกom %s."
+
+#: core/validators.py:371
+#, python-format
+msgid "This value must be no more than %s."
+msgstr "Tรกto hodnota musรญ byลฅ vรคฤลกia ako %s."
+
+#: core/validators.py:407
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Tรกto hodnota musรญ byลฅ mocninou %s."
+
+#: core/validators.py:418
+msgid "Please enter a valid decimal number."
+msgstr "Prosรญm, vloลพte platnรฉ desatinnรฉ ฤรญslo. "
+
+#: core/validators.py:422
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+"Please enter a valid decimal number with at most %s total digits."
+msgstr "Prosรญm vloลพ platnรฉ desatinnรฉ ฤรญslo s najviac %s ฤรญslicou."
+"Prosรญm vloลพ platnรฉ desatinnรฉ ฤรญslo s najviac %s ฤรญslicami."
+
+#: core/validators.py:425
+#, python-format
+msgid ""
+"Please enter a valid decimal number with a whole part of at most %s digit."
+"Please enter a valid decimal number with a whole part of at most %s digits."
+msgstr "Prosรญm, zadajte platnรฉ desatinnรฉ ฤรญslo s najviac %s ฤรญslicou pred desatinnou ฤiarkou."
+"Prosรญm, zadajte platnรฉ desatinnรฉ ฤรญslo s najviac %s ฤรญslicami pred desatinnou ฤiarkou."
+
+#: core/validators.py:428
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr "Prosรญm, zadajte platnรฉ desatinnรฉ ฤรญslo s najviac %s desatinnรฝm miestom."
+"Prosรญm, zadajte platnรฉ desatinnรฉ ฤรญslo s najviac %s desatinnรฝmi miestami."
+
+#: core/validators.py:438
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Uistite sa, ลพe posielanรฝ sรบbor nemรก menej ako %s bajtov."
+
+#: core/validators.py:439
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "Uistite sa, ลพe posielanรฝ sรบbor nemรก viac ako %s bajtov."
+
+#: core/validators.py:456
+msgid "The format for this field is wrong."
+msgstr "Formรกt pre toto pole je chybnรฝ."
-#: contrib/contenttypes/models.py:25
-msgid "python model class name"
-msgstr "pythonovรฉ meno triedy modelu"
+#: core/validators.py:471
+msgid "This field is invalid."
+msgstr "Toto pole nie je platnรฉ."
-#: contrib/contenttypes/models.py:28
-msgid "content type"
-msgstr "typ obsahu"
+#: core/validators.py:507
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "Z %s niฤ nepriลกlo."
-#: contrib/contenttypes/models.py:29
-msgid "content types"
-msgstr "typy obsahu"
+#: core/validators.py:510
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "Adresa URL %(url)s vrรกtila v hlaviฤke neplatnรฝ Content-Type '%(contenttype)s'."
-#: contrib/auth/models.py:13 contrib/auth/models.py:26
-msgid "name"
-msgstr "meno"
+#: core/validators.py:543
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr "Prosรญm, uzatvorte tag %(tag)s na riadku %(line)s. (Riadok zaฤรญna "
+"s \"%(start)s\".)"
-#: contrib/auth/models.py:15
-msgid "codename"
-msgstr "codename"
+#: core/validators.py:547
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr "Text zaฤรญnajรบci na riadku %(line)s nie je povolenรฝ v tomto kontexte. (Riadok zaฤรญna s \"%(start)s\".)"
-#: contrib/auth/models.py:17
-msgid "permission"
-msgstr "povolenie"
+#: core/validators.py:552
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr "\"%(attr)s\" na riadku %(line)s je neplatnรฝ atribรบt. (Riadok zaฤรญna s \"%"
+"(start)s\".)"
-#: contrib/auth/models.py:18 contrib/auth/models.py:27
-msgid "permissions"
-msgstr "povolenia"
+#: core/validators.py:557
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr "\"<%(tag)s>\" na riadku %(line)s je neplatnรฝ tag. (Riadok zaฤรญna s \"%"
+"(start)s\".)"
-#: contrib/auth/models.py:29
-msgid "group"
-msgstr "skupina"
+#: core/validators.py:561
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr "V tagu na riadku %(line)s chรฝba jeden alebo viac atribรบtov. (Riadok "
+"zaฤรญna s \"%(start)s\".)"
-#: contrib/auth/models.py:30 contrib/auth/models.py:65
-msgid "groups"
-msgstr "skupiny"
+#: core/validators.py:566
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr "Atribรบt \"%(attr)s\" na riadku %(line)s mรก neplatnรบ hodnotu. (Riadok zaฤรญna "
+"s \"%(start)s\".)"
-#: contrib/auth/models.py:55
-msgid "username"
-msgstr "uลพรญvateฤพskรฉ meno"
+#: views/generic/create_update.py:43
+#, python-format
+msgid "The %(verbose_name)s was created successfully."
+msgstr "Objekt %(verbose_name)s bol รบspeลกne vytvorenรฝ."
-#: contrib/auth/models.py:56
-msgid "first name"
-msgstr "krstnรฉ meno"
+#: views/generic/create_update.py:117
+#, python-format
+msgid "The %(verbose_name)s was updated successfully."
+msgstr "Objekt %(verbose_name)s bol รบspeลกne zmenenรฝ."
-#: contrib/auth/models.py:57
-msgid "last name"
-msgstr "priezvisko"
+#: views/generic/create_update.py:184
+#, python-format
+msgid "The %(verbose_name)s was deleted."
+msgstr "Objekt %(verbose_name)s bol zmazanรฝ."
-#: contrib/auth/models.py:58
-msgid "e-mail address"
-msgstr "e-mailovรก adresa"
+#: newforms/models.py:165 newforms/fields.py:360
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Vyberte platnรบ moลพnosลฅ. Vybranรก poloลพka nepatrรญ medzi platnรฉ moลพnosti."
-#: contrib/auth/models.py:59
-msgid "password"
-msgstr "heslo"
+#: newforms/models.py:182 newforms/fields.py:378 newforms/fields.py:454
+msgid "Enter a list of values."
+msgstr "Vloลพte zoznam hodnรดt."
-#: contrib/auth/models.py:59
-msgid "Use '[algo]$[salt]$[hexdigest]'"
-msgstr "Pouลพi '[algo]$[salt]$[hexdigest]'"
+#: newforms/models.py:188 newforms/fields.py:387
+#, 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."
-#: contrib/auth/models.py:60
-msgid "staff status"
-msgstr "ลกtatรบt zamestnanca"
+#: newforms/fields.py:101 newforms/fields.py:254
+#, python-format
+msgid "Ensure this value has at most %d characters."
+msgstr "Uistite sa, ลพe hodnota mรก najviac %d znakov."
-#: contrib/auth/models.py:60
-msgid "Designates whether the user can log into this admin site."
-msgstr "Oznaฤenie, ak uลพรญvateฤพ mรก oprรกvnenie vstรบpiลฅ ako administrรกtor."
+#: newforms/fields.py:103 newforms/fields.py:256
+#, python-format
+msgid "Ensure this value has at least %d characters."
+msgstr "Uistite sa, ลพe zadanรก hodnota mรก menej ako %d znakov."
-#: contrib/auth/models.py:61
-msgid "active"
-msgstr "aktรญvny"
+#: newforms/fields.py:128
+#, 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."
-#: contrib/auth/models.py:62
-msgid "superuser status"
-msgstr "ลกtatรบt superuลพรญvateฤพa"
+#: newforms/fields.py:130
+#, python-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "Uistite sa, ลพe hodnota je vรคฤลกia alebo rovnรก %s."
-#: contrib/auth/models.py:63
-msgid "last login"
-msgstr "poslednรฉ prihlรกsenie"
+#: newforms/fields.py:163
+msgid "Enter a valid date."
+msgstr "Zadajte platnรฝ dรกtum."
-#: contrib/auth/models.py:64
-msgid "date joined"
-msgstr "dรกtum registrรกcie"
+#: newforms/fields.py:190
+msgid "Enter a valid time."
+msgstr "Zadajte platnรฝ ฤas."
-#: contrib/auth/models.py:66
-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 vloลพenรฝch povolenรญ, tento uลพivateฤพ dostane vลกetky povolenia "
-"skupin, v ktorรฝch sa nachรกdza."
+#: newforms/fields.py:226
+msgid "Enter a valid date/time."
+msgstr "Zadajte platnรฝ dรกtum a ฤas."
-#: contrib/auth/models.py:67
-msgid "user permissions"
-msgstr "pridelenรฉ povolenia"
+#: newforms/fields.py:240
+msgid "Enter a valid value."
+msgstr "Zadajte platnรบ hodnotu."
-#: contrib/auth/models.py:70
-msgid "user"
-msgstr "uลพivateฤพ"
+#: newforms/fields.py:287 newforms/fields.py:309
+msgid "Enter a valid URL."
+msgstr "Zadajte platnรบ adresu URL."
-#: contrib/auth/models.py:71
-msgid "users"
-msgstr "uลพรญvatelia"
+#: newforms/fields.py:311
+msgid "This URL appears to be a broken link."
+msgstr "Odkaz na URL neexistuje."
-#: contrib/auth/models.py:76
-msgid "Personal info"
-msgstr "Osobnรฉ รบdaje"
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "th"
+msgstr "th"
-#: contrib/auth/models.py:77
-msgid "Permissions"
-msgstr "Povolenia"
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "st"
+msgstr "st"
-#: contrib/auth/models.py:78
-msgid "Important dates"
-msgstr "Dรดleลพitรฉ รบdaje"
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "nd"
+msgstr "nd"
-#: contrib/auth/models.py:79
-msgid "Groups"
-msgstr "Skupiny"
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "rd"
+msgstr "rd"
-#: contrib/auth/models.py:219
-msgid "message"
-msgstr "zprรกva"
+#: contrib/humanize/templatetags/humanize.py:47
+#, python-format
+msgid "%(value).1f million"
+msgstr "%(value).1f miliรณn"
-#: contrib/auth/forms.py:30
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"Vyzerรก, ลพe tvoj web prehliadaฤ nedovoฤพuje prรญstup ku cookies. Cookies sรบ "
-"nevรฝhnutnรฉ aby si sa mohol prihlรกsiลฅ."
+#: contrib/humanize/templatetags/humanize.py:50
+#, python-format
+msgid "%(value).1f billion"
+msgstr "%(value).1f miliarda"
-#: contrib/auth/forms.py:36 contrib/auth/forms.py:41
-#: contrib/admin/views/decorators.py:9
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Prosรญm, vloลพ spรกvne meno uลพvateฤพa ako aj heslo. Pripomรญnam, ลพe obe polia "
-"rozliลกujรบ malรฉ a veฤพkรฉ pรญsmena"
+#: contrib/humanize/templatetags/humanize.py:53
+#, python-format
+msgid "%(value).1f trillion"
+msgstr "%(value).1f biliรณn"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "one"
+msgstr "jeden"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "two"
+msgstr "dva"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "three"
+msgstr "tri"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "four"
+msgstr "ลกtyri"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "five"
+msgstr "pรคลฅ"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "six"
+msgstr "ลกesลฅ"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "seven"
+msgstr "sedem"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "eight"
+msgstr "osem"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "nine"
+msgstr "devรคลฅ"
#: contrib/redirects/models.py:7
msgid "redirect from"
-msgstr "presmerovanรฝ z"
+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 domรฉny. Napr.: '/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 "presmerovanรฝ na "
+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 ""
-"Tu mรดลพe byลฅ buฤ absolรบtna cesta (ako hore) alebo plnรฉ URL zaฤรญnajรบce s "
-"'http://'."
+msgstr "Tu mรดลพe byลฅ buฤ absolรบtna cesta (ako je uvedenรฉ vyลกลกie) alebo รบplnรก adresa URL zaฤรญnajรบca s 'http://'."
-#: contrib/redirects/models.py:12
+#: contrib/redirects/models.py:13
msgid "redirect"
msgstr "presmerovanie"
-#: contrib/redirects/models.py:13
+#: contrib/redirects/models.py:14
msgid "redirects"
msgstr "presmerovania"
#: contrib/comments/models.py:67 contrib/comments/models.py:166
msgid "object ID"
-msgstr "objekt ID"
+msgstr "ID objektu"
#: contrib/comments/models.py:68
msgid "headline"
-msgstr "titulok"
+msgstr "nadpis"
#: contrib/comments/models.py:69 contrib/comments/models.py:90
#: contrib/comments/models.py:167
@@ -239,13 +785,13 @@ msgstr "je platnรฉ hodnotenie"
#: contrib/comments/models.py:83 contrib/comments/models.py:169
msgid "date/time submitted"
-msgstr "dรกtum/ฤas poslania"
+msgstr "dรกtum a ฤas odoslania"
#: contrib/comments/models.py:84 contrib/comments/models.py:170
msgid "is public"
-msgstr "je zverรฉjnenรฝ"
+msgstr "je verejnรฝ"
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:292
+#: contrib/comments/models.py:85 contrib/admin/views/doc.py:304
msgid "IP address"
msgstr "IP adresa"
@@ -257,9 +803,7 @@ msgstr "je vymazanรฝ"
msgid ""
"Check this box if the comment is inappropriate. A \"This comment has been "
"removed\" message will be displayed instead."
-msgstr ""
-"Ak je tento komentรกr nevhodnรฝ, tu ho poznaฤ. \"Tento komentรกr bol vymazanรฝ"
-"\" tรกto sprรกva sa objavรญ namiesto neho."
+msgstr "Zaลกkrtnite toto pole, ak je komentรกr nevhodnรฝ. Sprรกva \"Tento komenรกr bol zmazanรฝ\" sa bude zobrazovaลฅ namiesto neho."
#: contrib/comments/models.py:91
msgid "comments"
@@ -278,7 +822,7 @@ msgid ""
"\n"
"http://%(domain)s%(url)s"
msgstr ""
-"Od %(user)s dลa %(date)s\n"
+"Pridanรฝ uลพรญvateฤพom %(user)s dลa %(date)s\n"
"\n"
"%(comment)s\n"
"\n"
@@ -286,7 +830,7 @@ msgstr ""
#: contrib/comments/models.py:168
msgid "person's name"
-msgstr "osobnรฉ meno"
+msgstr "meno osoby"
#: contrib/comments/models.py:171
msgid "ip address"
@@ -306,24 +850,24 @@ msgstr "voฤพnรฉ komentรกre"
#: contrib/comments/models.py:233
msgid "score"
-msgstr "stav"
+msgstr "stav skรณre"
#: contrib/comments/models.py:234
msgid "score date"
-msgstr "รบdaje stavu"
+msgstr "dรกtum stavu skรณre"
#: contrib/comments/models.py:237
msgid "karma score"
-msgstr "karma รบdaj"
+msgstr "karma"
#: contrib/comments/models.py:238
msgid "karma scores"
-msgstr "karma รบdaje"
+msgstr "karma"
#: contrib/comments/models.py:242
#, python-format
msgid "%(score)d rating by %(user)s"
-msgstr "%(score)d hodnotiteฤพ %(user)s"
+msgstr "%(score)d od hodnotiteฤพa %(user)s"
#: contrib/comments/models.py:258
#, python-format
@@ -331,22 +875,21 @@ msgid ""
"This comment was flagged by %(user)s:\n"
"\n"
"%(text)s"
-msgstr ""
-"Tento komentรกr bol oznaฤenรฝ uลพรญvateฤพom %(user)s:\n"
+msgstr "Tento komentรกr bol oznaฤenรฝ uลพรญvateฤพom %(user)s:\n"
"\n"
"%(text)s"
#: contrib/comments/models.py:265
msgid "flag date"
-msgstr "dรกtumovรฉ nรกvestie"
+msgstr "dรกtumovรฉ prรญznak"
#: contrib/comments/models.py:268
msgid "user flag"
-msgstr "nรกvestie uลพivateฤพa"
+msgstr "uลพivateฤพskรฝ prรญznak"
#: contrib/comments/models.py:269
msgid "user flags"
-msgstr "nรกvestia uลพรญvateฤพa"
+msgstr "uลพรญvateฤพskรฉ prรญznaky"
#: contrib/comments/models.py:273
#, python-format
@@ -355,20 +898,20 @@ msgstr " %r nรกvestie"
#: contrib/comments/models.py:278
msgid "deletion date"
-msgstr "odstrรกnenรฉ dรกtumy"
+msgstr "dรกtum zmazania"
#: contrib/comments/models.py:280
msgid "moderator deletion"
-msgstr "moderรกtor odstrรกnenia"
+msgstr "zmazania moderรกtorom"
#: contrib/comments/models.py:281
msgid "moderator deletions"
-msgstr "moderรกtor odstrรกnenรญ"
+msgstr "Zmazanรฉ moderรกtorom"
#: contrib/comments/models.py:285
#, python-format
msgid "Moderator deletion by %r"
-msgstr "Moderรกtor odstrรกnenia %r"
+msgstr "Zmazananรฉ moderรกtorom %r"
#: contrib/comments/views/karma.py:19
msgid "Anonymous users cannot vote"
@@ -380,89 +923,71 @@ msgstr "Chybnรฉ ID komentรกra"
#: contrib/comments/views/karma.py:25
msgid "No voting for yourself"
-msgstr "Nemรดลพeลก hlasovaลฅ za seba"
+msgstr "Nemรดลพete hlasovaลฅ za samรฉho seba"
-#: contrib/comments/views/comments.py:28
+#: contrib/comments/views/comments.py:27
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr "Toto hlasovanie je nevyhnutnรฉ, lebo sรบvisรญ s predchรกdzjรบcou voฤพbou."
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:111
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
"comment:\n"
"\n"
"%(text)s"
-msgid_plural ""
"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr[0] ""
-"Tento komentรกr je od uลพรญvateฤพa, ktorรฝ doteraz poslal minimรกlne %(count)s "
+msgstr ""
+"Tento komentรกr je od uลพรญvateฤพa, ktorรฝ doteraz poslal menej ako %(count)s "
"komentรกr:\n"
"\n"
"%(text)s"
-msgstr[1] ""
-"Tento komentรกr je od uลพรญvateฤพa, ktorรฝ doteraz poslal najmenej %(count)s "
+"Tento komentรกr je od uลพรญvateฤพa, ktorรฝ doteraz poslal menej ako %(count)s "
"komentรกrov:\n"
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:117
+#: contrib/comments/views/comments.py:116
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
"\n"
"%(text)s"
-msgstr ""
-"Tento komentรกr je od veฤพmi nรกznakovรฉho uลพรญvateฤพa:\n"
+msgstr "Tento komentรกr je od uลพรญvateฤพa, ktorรฝ sa rรกd vyjadruje v nรกznakoch:\n"
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:189
+#: contrib/comments/views/comments.py:188
#: contrib/comments/views/comments.py:280
msgid "Only POSTs are allowed"
msgstr "Dovolenรฉ sรบ len POST"
-#: contrib/comments/views/comments.py:193
+#: contrib/comments/views/comments.py:192
#: contrib/comments/views/comments.py:284
msgid "One or more of the required fields wasn't submitted"
msgstr "Jedno alebo viac povinnรฝch polรญ nebolo vloลพenรฝch"
-#: contrib/comments/views/comments.py:197
+#: contrib/comments/views/comments.py:196
#: contrib/comments/views/comments.py:286
msgid "Somebody tampered with the comment form (security violation)"
-msgstr "Niekto skรบลกal manipulovaลฅ s formulรกrom komentรกra (poruลกenรก bezpeฤnosลฅ)"
+msgstr "Niekto sa pokรบลกal manipulovaลฅ s formulรกrom komentรกra (poruลกenie bezpeฤnosti)"
-#: contrib/comments/views/comments.py:207
+#: contrib/comments/views/comments.py:206
#: contrib/comments/views/comments.py:292
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-"Formulรกr komentรกra ma chybnรฝ 'cieฤพovรฝ' parameter -- the objekt ID bol "
-"poลกkodenรฝ"
+"Formulรกr komentรกra ma chybnรฝ 'target' parameter -- ID objektu je neplatnรฉ"
#: contrib/comments/views/comments.py:257
#: contrib/comments/views/comments.py:321
msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr "Formulรกr komentรกra neposkytuje odpoveฤ buฤ 'prezri' alebo 'poลกli'"
-
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
-msgstr "Tvoje meno:"
-
-#: contrib/comments/templates/comments/freeform.html:5
-#: contrib/comments/templates/comments/form.html:27
-msgid "Comment:"
-msgstr "Komentรกr:"
-
-#: contrib/comments/templates/comments/freeform.html:9
-#: contrib/comments/templates/comments/form.html:32
-msgid "Preview comment"
-msgstr "Pozri komentรกr"
+msgstr "Formulรกr komentรกra neobsahuje ani jednu z moลพnostรญ 'nรกhฤพad' alebo 'odoslaลฅ'."
#: contrib/comments/templates/comments/form.html:6
#: contrib/comments/templates/comments/form.html:8
@@ -471,35 +996,36 @@ msgid "Username:"
msgstr "Meno:"
#: contrib/comments/templates/comments/form.html:6
-#: contrib/admin/templates/admin/login.html:20
-msgid "Password:"
-msgstr "Heslo:"
-
-#: contrib/comments/templates/comments/form.html:6
-msgid "Forgotten your password?"
-msgstr "Zabudol si svoje heslo?"
-
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:23
#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
#: contrib/admin/templates/admin_doc/missing_docutils.html:4
#: contrib/admin/templates/admin_doc/view_index.html:5
#: contrib/admin/templates/admin_doc/model_detail.html:3
#: contrib/admin/templates/admin_doc/index.html:4
#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
msgid "Log out"
msgstr "Odhlรกsenie"
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:20
+msgid "Password:"
+msgstr "Heslo:"
+
+#: contrib/comments/templates/comments/form.html:8
+msgid "Forgotten your password?"
+msgstr "Zabudli ste heslo?"
+
#: contrib/comments/templates/comments/form.html:12
msgid "Ratings"
msgstr "Hodnotenia"
@@ -512,87 +1038,29 @@ msgstr "Poลพadovanรฉ"
#: contrib/comments/templates/comments/form.html:12
#: contrib/comments/templates/comments/form.html:23
msgid "Optional"
-msgstr "Voliteฤพnรฉ"
+msgstr "Nepovinnรฉ"
#: contrib/comments/templates/comments/form.html:23
msgid "Post a photo"
msgstr "Poลกli foto"
-#: contrib/flatpages/models.py:7 contrib/admin/views/doc.py:303
-msgid "URL"
-msgstr "URL"
-
-#: contrib/flatpages/models.py:8
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Prรญklad: '/about/contact/'. Uisti sa, ลพe mรกลก vloลพenรฉ ako รบvodnรฉ tak aj "
-"zรกvereฤnรฉ lomรญtka."
-
-#: contrib/flatpages/models.py:9
-msgid "title"
-msgstr "nรกzov"
-
-#: contrib/flatpages/models.py:10
-msgid "content"
-msgstr "obsah"
-
-#: contrib/flatpages/models.py:11
-msgid "enable comments"
-msgstr "povolenรฉ komentรกre"
-
-#: contrib/flatpages/models.py:12
-msgid "template name"
-msgstr "meno predlohy"
-
-#: contrib/flatpages/models.py:13
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Prรญklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systรฉm pouลพije "
-"'flatpages/default'."
-
-#: contrib/flatpages/models.py:14
-msgid "registration required"
-msgstr "musรญte byลฅ zaregistrovanรฝ"
-
-#: contrib/flatpages/models.py:14
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Ak je toto oznaฤenรฉ, potom len prihlรกsenรฝ uลพรญvateฤพ mรดลพe vidieลฅ tรบto strรกnku."
-
-#: contrib/flatpages/models.py:18
-msgid "flat page"
-msgstr "plochรก strรกnka"
-
-#: contrib/flatpages/models.py:19
-msgid "flat pages"
-msgstr "plochรฉ strรกnky"
-
-#: contrib/sessions/models.py:35
-msgid "session key"
-msgstr "kฤพรบฤ sedenia"
-
-#: contrib/sessions/models.py:36
-msgid "session data"
-msgstr "รบdaje sedenia"
-
-#: contrib/sessions/models.py:37
-msgid "expire date"
-msgstr "dรกtum konca platnosti"
+#: contrib/comments/templates/comments/form.html:28
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Komentรกr:"
-#: contrib/sessions/models.py:41
-msgid "session"
-msgstr "sedenie"
+#: contrib/comments/templates/comments/form.html:35
+#: contrib/comments/templates/comments/freeform.html:10
+msgid "Preview comment"
+msgstr "Nรกhฤพad komentรกra"
-#: contrib/sessions/models.py:42
-msgid "sessions"
-msgstr "sedenia"
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "Tvoje meno:"
#: contrib/sites/models.py:10
msgid "domain name"
-msgstr "meno domรฉny"
+msgstr "nรกzov domรฉny"
#: contrib/sites/models.py:11
msgid "display name"
@@ -616,7 +1084,7 @@ msgstr ""
"
\n"
#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143
+#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169
msgid "All"
msgstr "Vลกetko"
@@ -640,25 +1108,13 @@ msgstr "Tento mesiac"
msgid "This year"
msgstr "Tento rok"
-#: contrib/admin/filterspecs.py:143
-msgid "Yes"
-msgstr "รno"
-
-#: contrib/admin/filterspecs.py:143
-msgid "No"
-msgstr "Nie"
-
-#: contrib/admin/filterspecs.py:150
-msgid "Unknown"
-msgstr "Neznรกmy"
-
#: contrib/admin/models.py:16
msgid "action time"
msgstr "ฤas udalosti"
#: contrib/admin/models.py:19
msgid "object id"
-msgstr "objekt id"
+msgstr "id objektu"
#: contrib/admin/models.py:20
msgid "object repr"
@@ -666,107 +1122,86 @@ msgstr "objekt repr"
#: contrib/admin/models.py:21
msgid "action flag"
-msgstr "nรกvestie udalosti"
-
-#: contrib/admin/models.py:22
-msgid "change message"
-msgstr "zmeล zprรกvu"
-
-#: contrib/admin/models.py:25
-msgid "log entry"
-msgstr "zรกznam priebehu"
-
-#: contrib/admin/models.py:26
-msgid "log entries"
-msgstr "zรกznamy priebehu"
+msgstr "prรญznak udalosti"
-#: contrib/admin/templatetags/admin_list.py:228
-msgid "All dates"
-msgstr "Vลกetky dรกtumy"
-
-#: contrib/admin/views/decorators.py:23
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Prihlรกsenie"
-
-#: contrib/admin/views/decorators.py:61
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"Prosรญm prihlas sa znovu, lebo ฤas tvojho sedenia vyprลกal. Nemaj obavy: tvoje "
-"รบdaje su uchovanรฉ."
-
-#: contrib/admin/views/decorators.py:68
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Vyzerรก, ลพe tvoj prehliadaฤ nemรก povolenรฉ cookies. Prosรญm, povoฤพ cookies, "
-"znovu naฤรญtaj tรบto strรกnku a skรบs ฤinnosลฅ znovu."
+#: contrib/admin/models.py:22
+msgid "change message"
+msgstr "zmeniลฅ zprรกvu"
-#: contrib/admin/views/decorators.py:82
-msgid "Usernames cannot contain the '@' character."
-msgstr "Meno uลพรญvateฤพa nemoลพe obsahovaลฅ znak '@' ."
+#: contrib/admin/models.py:25
+msgid "log entry"
+msgstr "zรกznam priebehu"
-#: contrib/admin/views/decorators.py:84
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Tvoja e-mailova adresa nie je tvoje uลพรญvateฤพskรฉ meno. Skรบs '%s'."
+#: contrib/admin/models.py:26
+msgid "log entries"
+msgstr "zรกznamy priebehu"
-#: contrib/admin/views/main.py:226
-msgid "Site administration"
-msgstr "Administrรกcia webu"
+#: contrib/admin/templatetags/admin_list.py:247
+msgid "All dates"
+msgstr "Vลกetky dรกtumy"
-#: contrib/admin/views/main.py:260
+#: contrib/admin/views/auth.py:19 contrib/admin/views/main.py:257
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Objekt %(name)s \"%(obj)s\" bol รบspeลกne pridanรฝ."
-#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
+#: contrib/admin/views/auth.py:24 contrib/admin/views/main.py:261
+#: contrib/admin/views/main.py:347
msgid "You may edit it again below."
-msgstr "Mรดลพeลก urobiลฅ zmeny zase niลพลกie."
+msgstr "Mรดลพete pokraฤovaลฅ v zmenรกch."
+
+#: contrib/admin/views/auth.py:30
+msgid "Add user"
+msgstr "Pridaลฅ uลพรญvateฤพa"
+
+#: contrib/admin/views/auth.py:57
+msgid "Password changed successfully."
+msgstr "Heslo bolo รบspeลกne zmenenรฉ."
-#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
+#: contrib/admin/views/auth.py:64
+#, python-format
+msgid "Change password: %s"
+msgstr "Zmeniลฅ heslo: %s"
+
+#: contrib/admin/views/main.py:223
+msgid "Site administration"
+msgstr "Administrรกcia"
+
+#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356
#, python-format
msgid "You may add another %s below."
-msgstr "Mรดลพeลก pridaลฅ ฤalลกรญ %s niลพลกie."
+msgstr "Mรดลพete pokraฤovaลฅ v pridรกvanรญ ฤaฤพลกรญch %s."
-#: contrib/admin/views/main.py:290
+#: contrib/admin/views/main.py:289
#, python-format
msgid "Add %s"
msgstr "Pridaj %s"
-#: contrib/admin/views/main.py:336
+#: contrib/admin/views/main.py:335
#, python-format
msgid "Added %s."
msgstr "Bol pridanรฝ %s."
-#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
-#: contrib/admin/views/main.py:340
-msgid "and"
-msgstr "a"
-
-#: contrib/admin/views/main.py:338
+#: contrib/admin/views/main.py:337
#, python-format
msgid "Changed %s."
msgstr "Bol zmenenรฝ %s"
-#: contrib/admin/views/main.py:340
+#: contrib/admin/views/main.py:339
#, python-format
msgid "Deleted %s."
msgstr "Bol vymazanรฝ %s."
-#: contrib/admin/views/main.py:343
+#: contrib/admin/views/main.py:342
msgid "No fields changed."
msgstr "Polia neboli zmenenรฉ."
-#: contrib/admin/views/main.py:346
+#: contrib/admin/views/main.py:345
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "Objekt %(name)s \"%(obj)s\" boli รบspeลกne zmenenรฝ."
-#: contrib/admin/views/main.py:354
+#: contrib/admin/views/main.py:353
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -774,120 +1209,221 @@ msgstr ""
"Objekt %(name)s \"%(obj)s\" bol รบspeลกne zmenenรฝ. ฤalลกie zmeny mรดลพeลก urobiลฅ "
"zase niลพลกie."
-#: contrib/admin/views/main.py:392
+#: contrib/admin/views/main.py:391
#, python-format
msgid "Change %s"
-msgstr "Zmeล %s"
+msgstr "Zmeniลฅ %s"
-#: contrib/admin/views/main.py:470
+#: contrib/admin/views/main.py:476
#, 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/views/main.py:475
+#: contrib/admin/views/main.py:481
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Jeden alebo viac %(fieldname)s v %(name)s:"
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:514
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Objekt %(name)s \"%(obj)s\" bol รบspeลกne vymazanรฝ."
-#: contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:517
msgid "Are you sure?"
-msgstr "Si si istรฝ?"
+msgstr "Ste si istรฝ?"
-#: contrib/admin/views/main.py:533
+#: contrib/admin/views/main.py:539
#, python-format
msgid "Change history: %s"
-msgstr "Zmeล histรณriu: %s"
+msgstr "Zmeniลฅ histรณriu: %s"
-#: contrib/admin/views/main.py:565
+#: contrib/admin/views/main.py:573
#, python-format
msgid "Select %s"
msgstr "Vรฝber %s"
-#: contrib/admin/views/main.py:565
+#: contrib/admin/views/main.py:573
#, python-format
msgid "Select %s to change"
msgstr "Ktorรฝ %s sa mรก zmeniลฅ?"
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:289
-#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:297
-#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:300
+#: contrib/admin/views/main.py:768
+msgid "Database error"
+msgstr "Chyba databรกzy"
+
+#: contrib/admin/views/decorators.py:10 contrib/auth/forms.py:60
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Prosรญm, zadajte uลพรญvateฤพskรฉ meno a heslo. Pozor na malรฉ a veฤพkรฉ pรญsmenรก."
+
+#: contrib/admin/views/decorators.py:24
+#: contrib/admin/templates/admin/login.html:25
+msgid "Log in"
+msgstr "Prihlรกsenie"
+
+#: contrib/admin/views/decorators.py:62
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr "Vaลกa session vyprลกala. Prosรญm, prรญhlaste sa znovu. Nemusรญte sa obรกvaลฅ, vaลกe รบdaje boli uchovanรฉ."
+
+#: contrib/admin/views/decorators.py:69
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr "Vyzerรก to tak, ลพe vรกลก prehliadaฤ nemรก povolenรฉ cookies. Prosรญm, povoฤพte si cookies a skรบste znova naฤรญtaลฅ strรกnku."
+
+#: contrib/admin/views/decorators.py:83
+msgid "Usernames cannot contain the '@' character."
+msgstr "Uลพรญvateฤพskรฉ meno nemoลพe obsahovaลฅ znak '@'."
+
+#: contrib/admin/views/decorators.py:85
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Vaลกa e-mailovรก adresa nie je uลพรญvateฤพskรฝm menom. Skรบste pouลพiลฅ meno '%s'."
+
+#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48
+#: contrib/admin/views/doc.py:50
+msgid "tag:"
+msgstr ""
+
+#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79
+#: contrib/admin/views/doc.py:81
+msgid "filter:"
+msgstr ""
+
+#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137
+#: contrib/admin/views/doc.py:139
+msgid "view:"
+msgstr ""
+
+#: contrib/admin/views/doc.py:164
+#, python-format
+msgid "App %r not found"
+msgstr "Aplikรกciu %r sa nepodarilo nรกjsลฅ."
+
+#: contrib/admin/views/doc.py:171
+#, python-format
+msgid "Model %(name)r not found in app %(label)r"
+msgstr "Model %(name)r sa nenachรกdza v aplikรกcii %(label)r"
+
+#: contrib/admin/views/doc.py:183
+#, python-format
+msgid "the related `%(label)s.%(type)s` object"
+msgstr "Prepojenie na objekt `%(label)s.%(type)s`"
+
+#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205
+#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224
+msgid "model:"
+msgstr ""
+
+#: contrib/admin/views/doc.py:214
+#, python-format
+msgid "related `%(label)s.%(name)s` objects"
+msgstr "sรบvisiace objekty `%(label)s.%(name)s`"
+
+#: contrib/admin/views/doc.py:219
+#, python-format
+msgid "all %s"
+msgstr "vลกetky %s"
+
+#: contrib/admin/views/doc.py:224
+#, python-format
+msgid "number of %s"
+msgstr "poฤet %s"
+
+#: contrib/admin/views/doc.py:229
+#, python-format
+msgid "Fields on %s objects"
+msgstr "Polia objektu %s"
+
+#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
+#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
+#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312
msgid "Integer"
-msgstr "Celoฤรญselnรก hodnota"
+msgstr "Celรฉ ฤรญslo"
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:292
msgid "Boolean (Either True or False)"
-msgstr "Logickรก hodnota (buฤ True alebo False)"
+msgstr "Logickรก hodnota (True alebo False)"
-#: contrib/admin/views/doc.py:281 contrib/admin/views/doc.py:299
+#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311
#, python-format
msgid "String (up to %(maxlength)s)"
-msgstr "Dฤบลพka reลฅazca (maximรกlne do %(maxlength)s)"
+msgstr "Dฤบลพka reลฅazca (maximรกlne do %(maxlength)s znakov)"
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:294
msgid "Comma-separated integers"
-msgstr "ฤiarka oddeฤพuje celรฉ ฤรญsla"
+msgstr "Celรฉ ฤรญsla oddelenรฉ ฤiarkou"
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:295
msgid "Date (without time)"
msgstr "Dรกtum (bez ฤasu)"
-#: contrib/admin/views/doc.py:284
+#: contrib/admin/views/doc.py:296
msgid "Date (with time)"
-msgstr "Dรกtum ( a ฤas)"
+msgstr "Dรกtum (a ฤas)"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:297
msgid "E-mail address"
msgstr "E-mailovรก adresa"
-#: contrib/admin/views/doc.py:286 contrib/admin/views/doc.py:287
-#: contrib/admin/views/doc.py:290
+#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299
+#: contrib/admin/views/doc.py:302
msgid "File path"
msgstr "Cesta k sรบboru"
-#: contrib/admin/views/doc.py:288
+#: contrib/admin/views/doc.py:300
msgid "Decimal number"
-msgstr "Desiatkovรฉ ฤรญslo"
+msgstr "Desatinnรฉ ฤรญslo"
-#: contrib/admin/views/doc.py:294
+#: contrib/admin/views/doc.py:306
msgid "Boolean (Either True, False or None)"
-msgstr "Logickรก hodnota (buฤ True, False alebo None)"
+msgstr "Logickรก hodnota (True, False alebo None)"
-#: contrib/admin/views/doc.py:295
+#: contrib/admin/views/doc.py:307
msgid "Relation to parent model"
-msgstr "Mรก vzลฅah na rodiฤovskรฝ model"
+msgstr "Mรก vzลฅah k nadradenรฉmu modelu"
-#: contrib/admin/views/doc.py:296
+#: contrib/admin/views/doc.py:308
msgid "Phone number"
msgstr "ฤรญslo telefรณnu"
-#: contrib/admin/views/doc.py:301
+#: contrib/admin/views/doc.py:313
msgid "Text"
msgstr "Text"
-#: contrib/admin/views/doc.py:302
+#: contrib/admin/views/doc.py:314
msgid "Time"
msgstr "ฤas"
-#: contrib/admin/views/doc.py:304
+#: contrib/admin/views/doc.py:315 contrib/flatpages/models.py:7
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:316
msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. ลกtรกt (dve veฤพkรฉ pรญsmena)"
+msgstr "ล tรกt USA (dve veฤพkรฉ pรญsmena)"
-#: contrib/admin/views/doc.py:305
+#: contrib/admin/views/doc.py:317
msgid "XML text"
msgstr "XML text"
+#: contrib/admin/views/doc.py:343
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s nie je urlpattern objekt"
+
#: contrib/admin/templates/widget/file.html:2
msgid "Currently:"
-msgstr "Aktuรกlny:"
+msgstr "Aktuรกlne:"
#: contrib/admin/templates/widget/file.html:3
msgid "Change:"
-msgstr "Zmeล:"
+msgstr "Zmeniลฅ:"
#: contrib/admin/templates/widget/date_time.html:3
msgid "Date:"
@@ -897,43 +1433,49 @@ msgstr "Dรกtum:"
msgid "Time:"
msgstr "ฤas:"
-#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:23
#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Dokumentรกcia"
-#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:23
#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/admin/auth/user/change_password.html:15
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
#: contrib/admin/templates/admin_doc/missing_docutils.html:4
#: contrib/admin/templates/admin_doc/view_index.html:5
#: contrib/admin/templates/admin_doc/model_detail.html:3
#: contrib/admin/templates/admin_doc/index.html:4
#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
msgid "Change password"
-msgstr "Zmeล heslo"
+msgstr "Zmeniลฅ heslo"
-#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/change_list.html:6
+#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/invalid_setup.html:4
#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/auth/user/change_password.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -943,14 +1485,24 @@ msgstr "Zmeล heslo"
msgid "Home"
msgstr "Zaฤiatok"
+#: contrib/admin/templates/admin/change_list.html:12
+#, python-format
+msgid "Add %(name)s"
+msgstr "Pridaลฅ %(name)s"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr "Podฤพa %(filter_title)s "
+
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/change_form.html:21
msgid "History"
msgstr "Histรณria"
#: contrib/admin/templates/admin/object_history.html:18
msgid "Date/time"
-msgstr "Dรกtum/ฤas"
+msgstr "Dรกtum a ฤas"
#: contrib/admin/templates/admin/object_history.html:19
msgid "User"
@@ -962,25 +1514,40 @@ msgstr "Udalosลฅ"
#: contrib/admin/templates/admin/object_history.html:26
msgid "DATE_WITH_TIME_FULL"
-msgstr "PLNY_DATUM_AJ_CAS"
+msgstr "DATE_WITH_TIME_FULL"
#: contrib/admin/templates/admin/object_history.html:36
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
msgstr ""
-"Tento object nemรก histรณriu zmien. Moลพno nebol pridanรฝ prostrednรญctvom tohoto "
-"web admina"
+"Tento object nemรก histรณriu vykonanรฝch zmien. Moลพno nebol pridanรฝ prostrednรญctvom tohoto administraฤnรฉho rozhrania."
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Choฤ"
-#: contrib/admin/templates/admin/change_list.html:11
+#: contrib/admin/templates/admin/search_form.html:10
#, python-format
-msgid "Add %(name)s"
-msgstr "Pridaj %(name)s"
+msgid "1 result"
+msgstr "1 vรฝsledok"
-#: contrib/admin/templates/admin/filter.html:2
+#: contrib/admin/templates/admin/search_form.html:10
#, python-format
-msgid " By %(title)s "
-msgstr " Od %(title)s "
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s spolu"
+
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Zobraziลฅ vลกetky"
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django administrรกcia"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administrรกcia Django"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -998,39 +1565,37 @@ msgstr "Chyba servera (500)"
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 ""
-"Vznikla chyba. Prostrednรญctvom e-mailu bol o nej informovanรฝ sprรกvca a tรกto "
-"by mala byลฅ o chviฤพu odstrรกnenรก. ฤakujeme za tvoju trpezlivosลฅ."
-
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "Choฤ"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django web admin"
+msgstr "Vznikla neoฤakรกvanรก chyba. Prostrednรญctvom e-mailu bol o nej informovanรฝ sprรกvca a dรก sa predpokladaลฅ, ลพe bude v krรกtkej dobe odstrรกnenรก. ฤakujeme za pochopenie."
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administrรกcia Django"
+#: contrib/admin/templates/admin/invalid_setup.html:8
+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 "S inลกtalรกciou alebo nastavenรญm vaลกej databรกzy nie je nieฤo v poriadku. Uistite sa, ลพe ste vytvorili potrebnรฉ databรกzovรฉ tabuฤพky. Taktieลพ skontrolujte, ฤi mรก systรฉmovรฝ uลพรญvateฤพ, pod ktorรฝm beลพรญ aplikรกcia, prรกvo na prรญstup k databรกze a ฤรญtanie sรบborov databรกzy."
#: contrib/admin/templates/admin/index.html:17
#, python-format
msgid "Models available in the %(name)s application."
-msgstr "Model je prรญstupnรฝ v %(name)s aplikรกciรญ."
+msgstr "Modely dostupnรฉ v aplikรกcii %(name)s."
+
+#: contrib/admin/templates/admin/index.html:18
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
#: contrib/admin/templates/admin/index.html:28
#: contrib/admin/templates/admin/change_form.html:15
msgid "Add"
-msgstr "Pridaj"
+msgstr "Pridaลฅ"
#: contrib/admin/templates/admin/index.html:34
msgid "Change"
-msgstr "Zmeล"
+msgstr "Zmeniลฅ"
#: contrib/admin/templates/admin/index.html:44
msgid "You don't have permission to edit anything."
-msgstr "Nemรกลก povolenie na zmeny ."
+msgstr "Nemรกte prรกvo na vykonรกvanie zmien."
#: contrib/admin/templates/admin/index.html:52
msgid "Recent Actions"
@@ -1042,7 +1607,7 @@ msgstr "Moje udalosti"
#: contrib/admin/templates/admin/index.html:57
msgid "None available"
-msgstr "Nepovolenรฉ"
+msgstr "Nedostupnรฉ"
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
@@ -1053,32 +1618,27 @@ msgstr "Strรกnka nebola nรกjdenรก"
msgid "We're sorry, but the requested page could not be found."
msgstr "ฤฝutujeme, ale poลพadovanรก strรกnka nebola nรกjdenรก."
-#: contrib/admin/templates/admin/login.html:22
-msgid "Have you forgotten your password?"
-msgstr "Zabudol si svoje heslo?"
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Filter"
-#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/change_form.html:22
msgid "View on site"
-msgstr "Pozri na webe"
+msgstr "Pozrieลฅ na strรกnke"
-#: contrib/admin/templates/admin/change_form.html:30
+#: contrib/admin/templates/admin/change_form.html:32
+#: contrib/admin/templates/admin/auth/user/change_password.html:24
msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Oprav chybu, ฤo je niลพลกie, prosรญm."
-msgstr[1] "Oprav chyby, ฤo sรบ niลพลกie, prosรญm."
+msgstr "Prosรญm, opravte chyby uvedenรฉ niลพลกie."
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:50
msgid "Ordering"
-msgstr "Urฤenie"
+msgstr "Radenie"
-#: contrib/admin/templates/admin/change_form.html:51
+#: contrib/admin/templates/admin/change_form.html:53
msgid "Order:"
msgstr "Poradie:"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Vรญtajte,"
-
#: contrib/admin/templates/admin/delete_confirmation.html:9
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Delete"
@@ -1087,49 +1647,79 @@ msgstr "Vymazaลฅ"
#: contrib/admin/templates/admin/delete_confirmation.html:14
#, python-format
msgid ""
-"Deleting the %(object_name)s '%(object)s' would result in deleting related "
-"objects, but your account doesn't have permission to delete the following "
-"types of objects:"
-msgstr ""
-"Vymazanรญm objektu %(object_name)s '%(object)s' mรดลพeลก spรดsobiลฅ vymazanie "
-"sรบvisiacich objektov, ale tvoj รบฤet nemรก povolenie na mazanie nasledujรบcich "
-"typov objektov:"
+"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 "Zmazanie objektu %(object_name)s '%(escaped_object)s' by spรดsobilo zmazanie sรบvisiacich objektov, avลกak vaลกe uลพรญvateฤพskรฉ prรกva vรกm neumoลพลujรบ zmazaลฅ nasledujรบce typy objektov:"
#: contrib/admin/templates/admin/delete_confirmation.html:21
#, python-format
msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Si si istรฝ, ลพe chceลก vymazaลฅ %(object_name)s \"%(object)s\"? Vลกetky "
-"nasledujรบce objekty budรบ tieลพ vymazanรฉ :"
+"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 zmazaลฅ objekt %(object_name)s \"%(escaped_object)s\"? "
+"Zmazanรฉ budรบ aj vลกetky tieto sรบvisiace objekty:"
#: contrib/admin/templates/admin/delete_confirmation.html:26
msgid "Yes, I'm sure"
-msgstr "Ano, som si istรฝ"
+msgstr "รno, som si istรฝ"
+
+#: contrib/admin/templates/admin/base.html:25
+msgid "Welcome,"
+msgstr "Vitajte,"
#: contrib/admin/templates/admin/submit_line.html:4
msgid "Save as new"
-msgstr "Zapรญsaลฅ ako novรฝ"
+msgstr "Uloลพiลฅ ako novรฝ"
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save and add another"
-msgstr "Zapรญsaลฅ a pridaลฅ ฤaลกรญ"
+msgstr "Uloลพiลฅ a pridaลฅ ฤaฤพลกรญ"
#: contrib/admin/templates/admin/submit_line.html:6
msgid "Save and continue editing"
-msgstr "Zapรญsaลฅ a pokraฤovaลฅ v zmenรกch"
+msgstr "Uloลพiลฅ a pokraฤovaลฅ v zmenรกch"
#: contrib/admin/templates/admin/submit_line.html:7
msgid "Save"
-msgstr "Zรกpis"
+msgstr "Uloลพiลฅ"
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#, python-format
+msgid "Enter a new password for the user %(username)s."
+msgstr "Zadajte novรฉ heslo pre uลพรญvateฤพa %(username)s."
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:34
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
+msgid "Password"
+msgstr "Heslo"
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+msgid "Password (again)"
+msgstr "Heslo (potvrdiลฅ)"
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:40
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+msgid "Enter the same password as above, for verification."
+msgstr "Znova zadajte heslo kvรดli overeniu."
+
+#: 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 uลพรญvateฤพskรฉ meno a heslo. Neskรดr budete mรดcลฅ upraviลฅ ostatnรฉ uลพรญvateฤพskรฉ nastavnia."
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
+msgid "Username"
+msgstr "Uลพรญvateฤพskรฉ meno"
#: 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
msgid "Password change"
-msgstr "Zmeล heslo"
+msgstr "Zmena heslo"
#: contrib/admin/templates/registration/password_change_done.html:6
#: contrib/admin/templates/registration/password_change_done.html:10
@@ -1138,22 +1728,20 @@ msgstr "Heslo bolo รบspeลกne zmenenรฉ"
#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
-msgstr "Tvoje heslo bolo zmenenรฉ."
+msgstr "Vaลกe heslo bolo zmenenรฉ."
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/password_reset_form.html:6
#: contrib/admin/templates/registration/password_reset_form.html:10
#: contrib/admin/templates/registration/password_reset_done.html:4
msgid "Password reset"
-msgstr "Generรกcia novรฉho hesla"
+msgstr "Obnovenie hesla"
#: contrib/admin/templates/registration/password_reset_form.html:12
msgid ""
"Forgotten your password? Enter your e-mail address below, and we'll reset "
"your password and e-mail the new one to you."
-msgstr ""
-"Zabudol si svoje heslo? Vloลพ niลพลกie tvoju e-mail adresu, a novรฉ heslo ti "
-"bude na ลu zaslanรฉ ."
+msgstr "Zabudli ste svoje heslo? Zadajte svoju e-mailovรบ adresu, na ktorรบ vรกm bude zaslanรฉ novรฉ heslo."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -1165,32 +1753,28 @@ msgstr "Obnova mรดjho hesla"
#: contrib/admin/templates/registration/logged_out.html:8
msgid "Thanks for spending some quality time with the Web site today."
-msgstr "ฤakujeme ti, za strรกveny ฤas na naลกej strรกnke."
+msgstr "ฤakujeme vรกm, za ฤas strรกvenรฝ na naลกich strรกnkach."
#: contrib/admin/templates/registration/logged_out.html:10
msgid "Log in again"
-msgstr "Prihlรกs sa znovu"
+msgstr "Prihlรกsiลฅ sa znovu"
#: contrib/admin/templates/registration/password_reset_done.html:6
#: contrib/admin/templates/registration/password_reset_done.html:10
msgid "Password reset successful"
-msgstr "Heslo bolo รบspeลกne vygenerovanรฉ"
+msgstr "Heslo bolo รบspeลกne obnovenรฉ"
#: contrib/admin/templates/registration/password_reset_done.html:12
msgid ""
"We've e-mailed a new password to the e-mail address you submitted. You "
"should be receiving it shortly."
-msgstr ""
-"Poslali sme ti, novรฉ heslo na tebou uvedenรบ emailovรบ adresu. Mal by si ho "
-"dostaลฅ ฤo najskรดr."
+msgstr "Bolo vรกm zaslanรฉ novรฉ heslo na uvedenรบ adresu. Mali by ste ho obdrลพaลฅ v najbliลพลกej dobe."
#: 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 ""
-"Kvรดli bezpeฤnosti vloลพ prosรญm tvoje starรฉ heslo, a potom dvakrรกt tvoje novรฉ "
-"heslo, tรฝm mรดลพeme skontrolovaลฅ jeho sprรกvnosลฅ."
+msgstr "Z bezpeฤnostnรฝch dรดvodov zadajte najskรดr starรฉ heslo a potom dva krรกt novรฉ heslo, tak aby sa mohlo overiลฅ, ฤi nevznikol preklep."
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
@@ -1210,34 +1794,34 @@ msgstr "Zmeล svoje heslo"
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Dostal si tรบto sprรกvu preto, lebo si poลพadoval vygenerovaลฅ tvoje heslo"
+msgstr "Dostali ste tรบto sprรกvu, lebo ste si vyลพiadali obnovu hesla."
#: contrib/admin/templates/registration/password_reset_email.html:3
#, python-format
msgid "for your user account at %(site_name)s"
-msgstr "pre tvoj uลพรญvateฤพskรฝ รบฤet na %(site_name)s"
+msgstr "pre vรกลก uลพรญvateฤพskรฝ รบฤet na %(site_name)s"
#: contrib/admin/templates/registration/password_reset_email.html:5
#, python-format
msgid "Your new password is: %(new_password)s"
-msgstr "Tvoje novรฉ heslo je: %(new_password)s"
+msgstr "Vaลกe novรฉ heslo je: %(new_password)s"
#: contrib/admin/templates/registration/password_reset_email.html:7
msgid "Feel free to change this password by going to this page:"
-msgstr "Mรดลพeลก zmeniลฅ toto heslo na nasledujรบcej strรกnke:"
+msgstr "Heslo si kฤพudne mรดลพete zmeniลฅ na tejto strรกnke:"
#: contrib/admin/templates/registration/password_reset_email.html:11
msgid "Your username, in case you've forgotten:"
-msgstr "Tvoje uลพรญvateฤพskรฉ meno, ak si ho zabudol:"
+msgstr "Vaลกe uลพรญvateฤพskรฉ meno, pre prรญpad, ลพe ste zabudli:"
#: contrib/admin/templates/registration/password_reset_email.html:13
msgid "Thanks for using our site!"
-msgstr "ฤakujeme, ลพe pouลพรญvaลก naลกe strรกnky!"
+msgstr "ฤakujeme vรกm, ลพe vyuลพรญvate sluลพby naลกej strรกnky!"
#: contrib/admin/templates/registration/password_reset_email.html:15
#, python-format
msgid "The %(site_name)s team"
-msgstr "Skupina %(site_name)s"
+msgstr "Tรญm %(site_name)s"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
@@ -1256,747 +1840,730 @@ msgid ""
"bookmarklets require you to be viewing the site from a computer designated\n"
"as \"internal\" (talk to your system administrator if you aren't sure if\n"
"your computer is \"internal\").
\n"
-msgstr ""
-"\n"
-"
Na inลกtalรกciu zรกloลพiek, potiahni linku do tvojho "
-"bookmarks\n"
-"toolbar, alebo klikni pravou myลกou na linku a pridaj ju do tvojho "
-"bookmarks.\n"
-"Teraz si mรดลพeลก vybraลฅ zรกloลพku pre ฤพubovoฤพnรบ strรกnku na webe. Poznรกmka:\n"
-"niektorรฉ zรกloลพky vyลพadujรบ aby si prezeral web z poฤรญtaฤa oznaฤenรฉho \n"
-"ako \"internal\" (opรฝtaj sa vรกลกho systรฉmovรฉho administrรกtora ak si si nie "
-"istรฝ/รก, \n"
-"ลพe tvoj poฤรญtaฤ je oznaฤenรฝ ako \"internal\").
\n"
+msgstr "\n"
+"
Ak chete nainลกtalovaลฅ zรกloลพky, pretiahnite linku do vรกลกho panela so zรกloลพkami\n"
+"alebo kliknite pravรฝm tlaฤidlom myลกi na linku a pridajte ju do svojich zรกloลพiek.\n"
+"Nรกsledne mรดลพete zรกloลพky pouลพiลฅ na strรกnkach. Vลกimnite si, ลพe pouลพitie niektorรฝch zรกloลพiek vyลพaduje, aby bol vรกลก poฤรญtaฤ pridanรฝ do zoznamu INTERNAL_IPS. Ak nie ste si istรฝ, ลพe ste v tomto zozname, oslovte vรกลกho administrรกtora.
\n"
#: contrib/admin/templates/admin_doc/bookmarklets.html:19
msgid "Documentation for this page"
-msgstr "Dokumnentรกcia tejto strรกnky"
+msgstr "Dokumentรกcia k tejto strรกnke"
#: contrib/admin/templates/admin_doc/bookmarklets.html:20
msgid ""
"Jumps you from any page to the documentation for the view that generates "
"that page."
msgstr ""
-"Skoฤ z ฤพubovoฤพnej strรกnky do dokumentรกcie, kde je popรญsanรก generรกcia tejto "
-"strรกnky."
+"Skoฤte z ฤพubovoฤพnej strรกnky do dokumentรกcie, kde je popรญsanรฉ, ako sa tรกto strรกnka generuje."
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
msgid "Show object ID"
-msgstr "Ukรกลพ objekt ID"
+msgstr "Zobraziลฅ ID objektu."
#: contrib/admin/templates/admin_doc/bookmarklets.html:23
msgid ""
"Shows the content-type and unique ID for pages that represent a single "
"object."
-msgstr ""
-"Ukรกลพ typ obsahu a jednoznaฤnรฉ ID pre strรกnky, ktorรฉ zatupujรบ jednoduchรฉ "
-"objekty."
+msgstr "Zobrazuje content-type a ID strรกnok, ktorรฉ reprezentujรบ jedinรฝ objekt."
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Edit this object (current window)"
-msgstr "Edituj tento object (aktuรกlne okno)"
+msgstr "Editรกcia tohoto objektu (v aktuรกlnom okne)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:26
msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Skoฤ na strรกnku admina, ktorรก zastupuje jednoduchรฝ objekt"
+msgstr "Skoฤiลฅ na strรกnku admina, ktorรก reprezentuje tento jeden objekt."
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "Edit this object (new window)"
-msgstr "Edituj tento objekt (novรฉ okno)"
+msgstr "Editรกcia tohoto objektu (v novom okne)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:29
msgid "As above, but opens the admin page in a new window."
-msgstr "Ako vyลกลกie, ale stranka admina sa otvorรญ v novom okne."
+msgstr "To istรฉ ako predtรฝm, akurรกt otvorรญ administraฤnรบ strรกnku v novom okne."
-#: utils/translation.py:363
-msgid "DATE_FORMAT"
-msgstr ""
+#: contrib/contenttypes/models.py:36
+msgid "python model class name"
+msgstr "pythonovรฉ meno triedy modelu"
-#: utils/translation.py:364
-msgid "DATETIME_FORMAT"
-msgstr ""
+#: contrib/contenttypes/models.py:39
+msgid "content type"
+msgstr "typ obsahu"
-#: utils/translation.py:365
-msgid "TIME_FORMAT"
-msgstr ""
+#: contrib/contenttypes/models.py:40
+msgid "content types"
+msgstr "typy obsahu"
-#: utils/dates.py:6
-msgid "Monday"
-msgstr "Pondelok"
+#: contrib/auth/views.py:39
+msgid "Logged out"
+msgstr "Odhlรกsenรฝ"
-#: utils/dates.py:6
-msgid "Tuesday"
-msgstr "Utorok"
+#: contrib/auth/models.py:38 contrib/auth/models.py:57
+msgid "name"
+msgstr "meno"
-#: utils/dates.py:6
-msgid "Wednesday"
-msgstr "Streda"
+#: contrib/auth/models.py:40
+msgid "codename"
+msgstr "codename"
-#: utils/dates.py:6
-msgid "Thursday"
-msgstr "ล tvrtok"
+#: contrib/auth/models.py:42
+msgid "permission"
+msgstr "povolenie"
-#: utils/dates.py:6
-msgid "Friday"
-msgstr "Piatok"
+#: contrib/auth/models.py:43 contrib/auth/models.py:58
+msgid "permissions"
+msgstr "prรกva"
-#: utils/dates.py:7
-msgid "Saturday"
-msgstr "Sobota"
+#: contrib/auth/models.py:60
+msgid "group"
+msgstr "skupina"
-#: utils/dates.py:7
-msgid "Sunday"
-msgstr "Nedeฤพa"
+#: contrib/auth/models.py:61 contrib/auth/models.py:100
+msgid "groups"
+msgstr "skupiny"
-#: utils/dates.py:14
-msgid "January"
-msgstr "Januรกr"
+#: contrib/auth/models.py:90
+msgid "username"
+msgstr "uลพรญvateฤพskรฉ meno"
-#: utils/dates.py:14
-msgid "February"
-msgstr "Februรกr"
+#: contrib/auth/models.py:90
+msgid ""
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
+"digits and underscores)."
+msgstr "Povinnรก poloลพka s dฤบลพkou 30 znakov alebo menej. Povolenรฉ sรบ len alfanumerickรฉ znaky (pรญsmenรก, ฤรญsla a podtrลพnรญk)."
+
+#: contrib/auth/models.py:91
+msgid "first name"
+msgstr "krstnรฉ meno"
+
+#: contrib/auth/models.py:92
+msgid "last name"
+msgstr "priezvisko"
+
+#: contrib/auth/models.py:93
+msgid "e-mail address"
+msgstr "e-mailovรก adresa"
+
+#: contrib/auth/models.py:94
+msgid "password"
+msgstr "heslo"
+
+#: contrib/auth/models.py:94
+msgid ""
+"Use '[algo]$[salt]$[hexdigest]' or use the change "
+"password form."
+msgstr "Pouลพite '[algo]$[salt]$[hexdigest]' alebo formulรกr na zmenu hesla."
+
+#: contrib/auth/models.py:95
+msgid "staff status"
+msgstr "zamestnanec"
+
+#: contrib/auth/models.py:95
+msgid "Designates whether the user can log into this admin site."
+msgstr "Urฤuje, ฤi mรก uลพรญvateฤพ oprรกvnenie prihlรกsiลฅ sa do administraฤnej ฤasti."
+
+#: contrib/auth/models.py:96
+msgid "active"
+msgstr "aktรญvny"
+
+#: contrib/auth/models.py:96
+msgid ""
+"Designates whether this user can log into the Django admin. Unselect this "
+"instead of deleting accounts."
+msgstr "Urฤuje, ฤi je รบฤet aktรญvny. Odลกkrtnite, ak chcete deaktivovaลฅ uลพรญvateฤพskรฝ รบฤet."
+
+#: contrib/auth/models.py:97
+msgid "superuser status"
+msgstr "superuลพรญvateฤพ"
+
+#: contrib/auth/models.py:97
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "Urฤuje, ฤi uลพรญvateฤพ zรญskava automaticky vลกetky prรกva aj bez priameho priradenia."
+
+#: contrib/auth/models.py:98
+msgid "last login"
+msgstr "naposledy prihlรกsenรฝ"
+
+#: contrib/auth/models.py:99
+msgid "date joined"
+msgstr "dรกtum registrรกcie"
+
+#: contrib/auth/models.py:101
+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ลฅ uลพรญvateฤพ aj vลกetky prรกva prislรบchajรบce skupinรกm, v ktorรฝch sa nachรกdza."
+
+#: contrib/auth/models.py:102
+msgid "user permissions"
+msgstr "uลพรญvateฤพskรฉ prรกva"
+
+#: contrib/auth/models.py:105
+msgid "user"
+msgstr "uลพivateฤพ"
+
+#: contrib/auth/models.py:106
+msgid "users"
+msgstr "uลพรญvatelia"
+
+#: contrib/auth/models.py:111
+msgid "Personal info"
+msgstr "Osobnรฉ รบdaje"
+
+#: contrib/auth/models.py:112
+msgid "Permissions"
+msgstr "Prรกva"
+
+#: contrib/auth/models.py:113
+msgid "Important dates"
+msgstr "Dรดleลพitรฉ dรกtumy"
+
+#: contrib/auth/models.py:114
+msgid "Groups"
+msgstr "Skupiny"
-#: utils/dates.py:14 utils/dates.py:27
-msgid "March"
-msgstr "Marec"
+#: contrib/auth/models.py:258
+msgid "message"
+msgstr "sprรกva"
-#: utils/dates.py:14 utils/dates.py:27
-msgid "April"
-msgstr "Aprรญl"
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+msgid "The two password fields didn't match."
+msgstr "Pole hesla a jeho potvrdenie sa nezhodujรบ."
-#: utils/dates.py:14 utils/dates.py:27
-msgid "May"
-msgstr "Mรกj"
+#: contrib/auth/forms.py:25
+msgid "A user with that username already exists."
+msgstr "Uลพรญvateฤพ s tรฝmto uลพรญvateฤพskรฝm menom uลพ existuje."
-#: utils/dates.py:14 utils/dates.py:27
-msgid "June"
-msgstr "Jรบn"
+#: contrib/auth/forms.py:53
+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 รบspeลกnรฉ prihlรกsenie."
-#: utils/dates.py:15 utils/dates.py:27
-msgid "July"
-msgstr "Jรบl"
+#: contrib/auth/forms.py:62
+msgid "This account is inactive."
+msgstr "รฤet je deaktivovanรฝ."
-#: utils/dates.py:15
-msgid "August"
-msgstr "August"
+#: contrib/auth/forms.py:85
+msgid ""
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr "K danej e-mailovej adrese neexistuje uลพรญvateฤพskรฝ รบฤet. Ste si istรฝ, ลพe ste sa zaregistrovali?"
-#: utils/dates.py:15
-msgid "September"
-msgstr "September"
+#: contrib/auth/forms.py:117
+msgid "The two 'new password' fields didn't match."
+msgstr "Pole novรฉho hesla a jeho potvrdenie sa nezhodujรบ."
-#: utils/dates.py:15
-msgid "October"
-msgstr "Oktรณber"
+#: contrib/auth/forms.py:124
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Vaลกe starรฉ heslo nebolo zadanรฉ sprรกvne. Prosรญm, zadajte heslo znova."
-#: utils/dates.py:15
-msgid "November"
-msgstr "November"
+#: contrib/localflavor/uk/forms.py:18
+msgid "Enter a postcode. A space is required between the two postcode parts."
+msgstr "Zadajte britskรฝ poลกtovรฝ kรณd (PSฤ). Medzera medzi dvomi ฤasลฅami kรณdu je povinnรก."
-#: utils/dates.py:16
-msgid "December"
-msgstr "December"
+#: contrib/localflavor/fr/forms.py:17 contrib/localflavor/it/forms.py:15
+#: contrib/localflavor/fi/forms.py:14
+msgid "Enter a zip code in the format XXXXX."
+msgstr "Vloลพte poลกtovรฉ smerovacie ฤรญslo v tvare XXXXX."
-#: utils/dates.py:19
-msgid "jan"
-msgstr ""
+#: contrib/localflavor/usa/forms.py:17
+msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
+msgstr "Zadajte americkรฝ poลกtovรฝ kรณd (ZIP) vo formรกte XXXXX alebo XXXXX-XXXX."
-#: utils/dates.py:19
-msgid "feb"
+#: contrib/localflavor/jp/jp_prefectures.py:4
+msgid "Hokkaido"
msgstr ""
-#: utils/dates.py:19
-msgid "mar"
+#: contrib/localflavor/jp/jp_prefectures.py:5
+msgid "Aomori"
msgstr ""
-#: utils/dates.py:19
-msgid "apr"
+#: contrib/localflavor/jp/jp_prefectures.py:6
+msgid "Iwate"
msgstr ""
-#: utils/dates.py:19
-msgid "may"
-msgstr "mรกj"
-
-#: utils/dates.py:19
-msgid "jun"
-msgstr "jรบn"
+#: contrib/localflavor/jp/jp_prefectures.py:7
+msgid "Miyagi"
+msgstr ""
-#: utils/dates.py:20
-msgid "jul"
-msgstr "jรบl"
+#: contrib/localflavor/jp/jp_prefectures.py:8
+msgid "Akita"
+msgstr ""
-#: utils/dates.py:20
-msgid "aug"
+#: contrib/localflavor/jp/jp_prefectures.py:9
+msgid "Yamagata"
msgstr ""
-#: utils/dates.py:20
-msgid "sep"
+#: contrib/localflavor/jp/jp_prefectures.py:10
+msgid "Fukushima"
msgstr ""
-#: utils/dates.py:20
-msgid "oct"
-msgstr "okt"
+#: contrib/localflavor/jp/jp_prefectures.py:11
+msgid "Ibaraki"
+msgstr ""
-#: utils/dates.py:20
-msgid "nov"
+#: contrib/localflavor/jp/jp_prefectures.py:12
+msgid "Tochigi"
msgstr ""
-#: utils/dates.py:20
-msgid "dec"
+#: contrib/localflavor/jp/jp_prefectures.py:13
+msgid "Gunma"
msgstr ""
-#: utils/dates.py:27
-msgid "Jan."
-msgstr "Jan."
+#: contrib/localflavor/jp/jp_prefectures.py:14
+msgid "Saitama"
+msgstr ""
-#: utils/dates.py:27
-msgid "Feb."
-msgstr "Feb."
+#: contrib/localflavor/jp/jp_prefectures.py:15
+msgid "Chiba"
+msgstr ""
-#: utils/dates.py:28
-msgid "Aug."
-msgstr "Aug."
+#: contrib/localflavor/jp/jp_prefectures.py:16
+msgid "Tokyo"
+msgstr ""
-#: utils/dates.py:28
-msgid "Sept."
-msgstr "Sept."
+#: contrib/localflavor/jp/jp_prefectures.py:17
+msgid "Kanagawa"
+msgstr ""
-#: utils/dates.py:28
-msgid "Oct."
-msgstr "Okt."
+#: contrib/localflavor/jp/jp_prefectures.py:18
+msgid "Yamanashi"
+msgstr ""
-#: utils/dates.py:28
-msgid "Nov."
-msgstr "Nov."
+#: contrib/localflavor/jp/jp_prefectures.py:19
+msgid "Nagano"
+msgstr ""
-#: utils/dates.py:28
-msgid "Dec."
-msgstr "Dec."
+#: contrib/localflavor/jp/jp_prefectures.py:20
+msgid "Niigata"
+msgstr ""
-#: utils/timesince.py:12
-msgid "year"
-msgid_plural "years"
-msgstr[0] "rok"
-msgstr[1] "rokov"
+#: contrib/localflavor/jp/jp_prefectures.py:21
+msgid "Toyama"
+msgstr ""
-#: utils/timesince.py:13
-msgid "month"
-msgid_plural "months"
-msgstr[0] "mesiac"
-msgstr[1] "mesiacov"
+#: contrib/localflavor/jp/jp_prefectures.py:22
+msgid "Ishikawa"
+msgstr ""
-#: utils/timesince.py:14
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
+#: contrib/localflavor/jp/jp_prefectures.py:23
+msgid "Fukui"
+msgstr ""
-#: utils/timesince.py:15
-msgid "day"
-msgid_plural "days"
-msgstr[0] "ฤeล"
-msgstr[1] "dnรญ"
+#: contrib/localflavor/jp/jp_prefectures.py:24
+msgid "Gifu"
+msgstr ""
-#: utils/timesince.py:16
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hodina"
-msgstr[1] "hodรญn"
+#: contrib/localflavor/jp/jp_prefectures.py:25
+msgid "Shizuoka"
+msgstr ""
-#: utils/timesince.py:17
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minรบta"
-msgstr[1] "minรบt"
+#: contrib/localflavor/jp/jp_prefectures.py:26
+msgid "Aichi"
+msgstr ""
-#: conf/global_settings.py:37
-msgid "Bengali"
-msgstr "Bengรกlsky"
+#: contrib/localflavor/jp/jp_prefectures.py:27
+msgid "Mie"
+msgstr ""
-#: conf/global_settings.py:38
-msgid "Czech"
-msgstr "ฤeskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:28
+msgid "Shiga"
+msgstr ""
-#: conf/global_settings.py:39
-msgid "Welsh"
-msgstr "Waleskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:29
+msgid "Kyoto"
+msgstr ""
-#: conf/global_settings.py:40
-msgid "Danish"
-msgstr "Dรกnsky"
+#: contrib/localflavor/jp/jp_prefectures.py:30
+msgid "Osaka"
+msgstr ""
-#: conf/global_settings.py:41
-msgid "German"
-msgstr "Nemeckรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:31
+msgid "Hyogo"
+msgstr ""
-#: conf/global_settings.py:42
-msgid "Greek"
-msgstr "Grรฉckรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:32
+msgid "Nara"
+msgstr ""
-#: conf/global_settings.py:43
-msgid "English"
-msgstr "Anglickรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:33
+msgid "Wakayama"
+msgstr ""
-#: conf/global_settings.py:44
-msgid "Spanish"
-msgstr "ล panielsky"
+#: contrib/localflavor/jp/jp_prefectures.py:34
+msgid "Tottori"
+msgstr ""
-#: conf/global_settings.py:45
-msgid "Argentinean Spanish"
-msgstr "Argentรญnska ลกpanielฤina"
+#: contrib/localflavor/jp/jp_prefectures.py:35
+msgid "Shimane"
+msgstr ""
-#: conf/global_settings.py:46
-msgid "French"
-msgstr "Francรบzsky"
+#: contrib/localflavor/jp/jp_prefectures.py:36
+msgid "Okayama"
+msgstr ""
-#: conf/global_settings.py:47
-msgid "Galician"
-msgstr "Galicijskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:37
+msgid "Hiroshima"
+msgstr ""
-#: conf/global_settings.py:48
-msgid "Hungarian"
-msgstr "Maฤarskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:38
+msgid "Yamaguchi"
+msgstr ""
-#: conf/global_settings.py:49
-msgid "Hebrew"
-msgstr "Hebrejskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:39
+msgid "Tokushima"
+msgstr ""
-#: conf/global_settings.py:50
-msgid "Icelandic"
-msgstr "Islandskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:40
+msgid "Kagawa"
+msgstr ""
-#: conf/global_settings.py:51
-msgid "Italian"
-msgstr "Taliansky"
+#: contrib/localflavor/jp/jp_prefectures.py:41
+msgid "Ehime"
+msgstr ""
-#: conf/global_settings.py:52
-msgid "Japanese"
-msgstr "Japรณnsky"
+#: contrib/localflavor/jp/jp_prefectures.py:42
+msgid "Kochi"
+msgstr ""
-#: conf/global_settings.py:53
-msgid "Dutch"
-msgstr "Holรกndsky"
+#: contrib/localflavor/jp/jp_prefectures.py:43
+msgid "Fukuoka"
+msgstr ""
-#: conf/global_settings.py:54
-msgid "Norwegian"
-msgstr "Nรณrsky"
+#: contrib/localflavor/jp/jp_prefectures.py:44
+msgid "Saga"
+msgstr ""
-#: conf/global_settings.py:55
-msgid "Brazilian"
-msgstr "Brazรญlsky"
+#: contrib/localflavor/jp/jp_prefectures.py:45
+msgid "Nagasaki"
+msgstr ""
-#: conf/global_settings.py:56
-msgid "Romanian"
-msgstr "Rumรบnsky"
+#: contrib/localflavor/jp/jp_prefectures.py:46
+msgid "Kumamoto"
+msgstr ""
-#: conf/global_settings.py:57
-msgid "Russian"
-msgstr "Ruskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:47
+msgid "Oita"
+msgstr ""
-#: conf/global_settings.py:58
-msgid "Slovak"
-msgstr "Slovenskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:48
+msgid "Miyazaki"
+msgstr ""
-#: conf/global_settings.py:59
-msgid "Slovenian"
-msgstr "Slovinskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:49
+msgid "Kagoshima"
+msgstr ""
-#: conf/global_settings.py:60
-msgid "Serbian"
-msgstr "Srbskรฝ"
+#: contrib/localflavor/jp/jp_prefectures.py:50
+msgid "Okinawa"
+msgstr ""
-#: conf/global_settings.py:61
-msgid "Swedish"
-msgstr "ล vรฉdsky"
+#: contrib/localflavor/jp/forms.py:21
+msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
+msgstr "Zadajte poลกtovรฉ smerovacie ฤรญslo v tvare XXXXXXX alebo XXX-XXXX."
-#: conf/global_settings.py:62
-msgid "Ukrainian"
-msgstr "Ukrajรญnsky"
+#: contrib/localflavor/no/forms.py:15
+msgid "Enter a zip code in the format XXXX."
+msgstr "Vloลพte poลกtovรฉ smerovacie ฤรญslo v tvare XXXX."
-#: conf/global_settings.py:63
-msgid "Simplified Chinese"
-msgstr "Zjednoduลกenรก ฤinลกtina "
+#: contrib/localflavor/no/forms.py:36
+msgid "Enter a valid Norwegian social security number."
+msgstr "Vloลพte platnรฉ nรณrske ฤรญslo sociรกlneho poistenia (social security number)."
-#: conf/global_settings.py:64
-msgid "Traditional Chinese"
-msgstr "Tradiฤnรก ฤรญnลกtina"
+#: contrib/localflavor/fi/forms.py:40 contrib/localflavor/fi/forms.py:46
+msgid "Enter a valid Finnish social security number."
+msgstr "Vloลพte platnรฉ fรญnske ฤรญslo sociรกlneho poistenia (social security number)."
-#: db/models/manipulators.py:302
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
-msgstr "%(object)s s %(type)s uลพ existuje pre prvok %(field)s."
+#: contrib/sessions/models.py:68
+msgid "session key"
+msgstr "kฤพรบฤ session"
-#: db/models/fields/__init__.py:40
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "%(optname)s s %(fieldname)s uลพ existuje."
+#: contrib/sessions/models.py:69
+msgid "session data"
+msgstr "รบdaje session"
-#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553
-#: forms/__init__.py:346
-msgid "This field is required."
-msgstr "Toto pole je nevyhnutnรฉ."
+#: contrib/sessions/models.py:70
+msgid "expire date"
+msgstr "dรกtum vyprลกania platnosti"
-#: db/models/fields/__init__.py:337
-msgid "This value must be an integer."
-msgstr "Tรกto hodnota musรญ byลฅ integer."
+#: contrib/sessions/models.py:74
+msgid "session"
+msgstr "session"
-#: db/models/fields/__init__.py:369
-msgid "This value must be either True or False."
-msgstr "Tรกto hodnota musรญ byลฅ buฤ True alebo False."
+#: contrib/sessions/models.py:75
+msgid "sessions"
+msgstr "sessions"
-#: db/models/fields/__init__.py:385
-msgid "This field cannot be null."
-msgstr "Toto pole nemรดลพe obsahovaลฅ null."
+#: contrib/flatpages/models.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Prรญklad: '/about/contact/'. Uistite sa, ลพe adresa obsahuje na zaฤiatku a na konci.lomรญtka."
-#: db/models/fields/__init__.py:468 core/validators.py:132
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Vloลพ platnรฝ dรกtum/ฤas vo formรกte RRRR-MM-DD HH:MM"
+#: contrib/flatpages/models.py:9
+msgid "title"
+msgstr "nรกzov"
-#: db/models/fields/__init__.py:562
-msgid "Enter a valid filename."
-msgstr "Vloลพ platnรฉ meno sรบboru."
+#: contrib/flatpages/models.py:10
+msgid "content"
+msgstr "obsah"
-#: db/models/fields/related.py:43
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Prosรญm vloลพ platnรฉ %s."
+#: contrib/flatpages/models.py:11
+msgid "enable comments"
+msgstr "povoliลฅ komentรกre"
-#: db/models/fields/related.py:579
-msgid "Separate multiple IDs with commas."
-msgstr "Oddeฤพ viacnรกsobnรฉ ID ฤiarkami."
+#: contrib/flatpages/models.py:12
+msgid "template name"
+msgstr "nรกzov ลกablรณny"
-#: db/models/fields/related.py:581
+#: contrib/flatpages/models.py:13
msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
msgstr ""
-" Podrลพte \"Control\", alebo \"Command\" na Mac_u, na vรฝber viac ako jednej "
-"poloลพky."
+"Prรญklad: 'flatpages/contact_page'. Ak tรกto ลกablรณna neexistuje, systรฉm pouลพije "
+"'flatpages/default'."
-#: db/models/fields/related.py:625
-#, 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 vloลพ platnรฉ %(self)s IDs. Hodnota %(value)r je neplatnรก."
-msgstr[1] "Prosรญm vloลพ platnรฉ %(self)s IDs. Hodnoty %(value)r sรบ neplatnรฉ."
+#: contrib/flatpages/models.py:14
+msgid "registration required"
+msgstr "je vyลพadovanรก registrรกcia"
-#: forms/__init__.py:380
-#, python-format
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] "Zabezpeฤ aby tvoj text bol menลกรญ ako %s znak."
-msgstr[1] "Zabezpeฤ aby tvoj text bol menลกรญ ako %s znakov."
+#: contrib/flatpages/models.py:14
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "Ak je zaลกkrtnutรฉ, tak sa strรกnka zobrazรญ len prihlรกsenรฉmu uลพรญvateฤพovi."
-#: forms/__init__.py:385
-msgid "Line breaks are not allowed here."
-msgstr "Novรฝ riadok tu nieje povolenรฝ."
+#: contrib/flatpages/models.py:18
+msgid "flat page"
+msgstr "statickรก strรกnka"
-#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr "Vyber si platnรบ voฤพbu; '%(data)s' nie je v %(choices)s."
+#: contrib/flatpages/models.py:19
+msgid "flat pages"
+msgstr "statickรฉ strรกnky"
-#: forms/__init__.py:645
-msgid "The submitted file is empty."
-msgstr "Poslanรฝ sรบbor je prรกzdnรฝ."
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Pondelok"
-#: forms/__init__.py:699
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Vloลพ celรฉ ฤรญslo s hodnotou medzi -32768 a 32767."
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Utorok"
-#: forms/__init__.py:708
-msgid "Enter a positive number."
-msgstr "Vloลพ celรฉ kladnรฉ ฤรญslo."
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Streda"
-#: forms/__init__.py:717
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Vloลพ celรฉ ฤรญslo s hodnotou medzi 0 a 32767."
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "ล tvrtok"
-#: core/validators.py:60
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Toto mรดลพe obsahovaลฅ len pรญsmenรก, ฤรญslice a podฤiarkovnรญky."
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Piatok"
-#: core/validators.py:64
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
-"slashes."
-msgstr ""
-"Toto mรดลพe obsahovaลฅ len pรญsmena, ฤรญslice, podฤiarkovniky, pomlฤky a lomรญtka."
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Sobota"
-#: core/validators.py:72
-msgid "Uppercase letters are not allowed here."
-msgstr "Veฤพkรฉ pรญsmenรก tu nie sรบ povolenรฉ."
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Nedeฤพa"
-#: core/validators.py:76
-msgid "Lowercase letters are not allowed here."
-msgstr "Malรฉ pรญsmena tu nie sรบ povolenรฉ."
+#: utils/dates.py:14
+msgid "January"
+msgstr "Januรกr"
-#: core/validators.py:83
-msgid "Enter only digits separated by commas."
-msgstr "Vloลพ len ฤรญslice, oddelenรฉ ฤiarkami."
+#: utils/dates.py:14
+msgid "February"
+msgstr "Februรกr"
-#: core/validators.py:95
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Vloลพ platnรฉ e-mail adresy oddelenรฉ ฤiarkami."
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
+msgstr "Marec"
-#: core/validators.py:99
-msgid "Please enter a valid IP address."
-msgstr "Prosรญm vloลพ platnรบ IP adresu."
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
+msgstr "Aprรญl"
-#: core/validators.py:103
-msgid "Empty values are not allowed here."
-msgstr "Prรกzdne hodnoty tu nie sรบ povolenรฉ."
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
+msgstr "Mรกj"
-#: core/validators.py:107
-msgid "Non-numeric characters aren't allowed here."
-msgstr "Znaky, ktorรฉ nie sรบ ฤรญslicami, tu nie sรบ povolenรฉ."
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
+msgstr "Jรบn"
-#: core/validators.py:111
-msgid "This value can't be comprised solely of digits."
-msgstr "Tento รบdaj nemรดลพe byลฅ vytvorenรฝ len z ฤรญslic."
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
+msgstr "Jรบl"
-#: core/validators.py:116
-msgid "Enter a whole number."
-msgstr "Vloลพ celรฉ ฤรญslo."
+#: utils/dates.py:15
+msgid "August"
+msgstr "August"
-#: core/validators.py:120
-msgid "Only alphabetical characters are allowed here."
-msgstr "Tu sรบ povolenรฉ len alfanumerickรฉ znaky."
+#: utils/dates.py:15
+msgid "September"
+msgstr "September"
-#: core/validators.py:124
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Vloลพ platnรฝ dรกtum vo formรกte RRRR-MM-DD."
+#: utils/dates.py:15
+msgid "October"
+msgstr "Oktรณber"
-#: core/validators.py:128
-msgid "Enter a valid time in HH:MM format."
-msgstr "Vloลพ platnรฝ ฤas vo formรกte HH:MM."
+#: utils/dates.py:15
+msgid "November"
+msgstr "November"
-#: core/validators.py:136
-msgid "Enter a valid e-mail address."
-msgstr "Vloลพ platnรบ e-mail adresu."
+#: utils/dates.py:16
+msgid "December"
+msgstr "December"
-#: core/validators.py:148
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"Nahraj platnรฝ obrรกzok. Sรบbor, ktorรฝ si nahral buฤ nebol obrรกzok alebo je "
-"nahratรฝ poลกkodenรฝ obrรกzok."
+#: utils/dates.py:19
+msgid "jan"
+msgstr "jan"
-#: core/validators.py:155
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "URL %s neukazuje na platnรฝ obrรกzok."
+#: utils/dates.py:19
+msgid "feb"
+msgstr "feb"
-#: core/validators.py:159
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr ""
-"Telefรณnne ฤรญslo musรญ maลฅ formรกt XXX-XXX-XXXX. ฤรญslo \"%s\" je neplatnรฉ."
+#: utils/dates.py:19
+msgid "mar"
+msgstr "mar"
-#: core/validators.py:167
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "URL %s neukazuje na platnรฉ QuickTime video."
+#: utils/dates.py:19
+msgid "apr"
+msgstr "apr"
-#: core/validators.py:171
-msgid "A valid URL is required."
-msgstr "Platnรฉ URL je poลพadovanรฉ."
+#: utils/dates.py:19
+msgid "may"
+msgstr "mรกj"
-#: core/validators.py:185
-#, python-format
-msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
-msgstr ""
-"Je poลพadovanรก bezchybnรก strรกnka HTML. Zistenรฉ chyby sรบ:\n"
-"%s"
+#: utils/dates.py:19
+msgid "jun"
+msgstr "jรบn"
-#: core/validators.py:192
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "Chybne formovanรฉ XML: %s"
+#: utils/dates.py:20
+msgid "jul"
+msgstr "jรบl"
-#: core/validators.py:202
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "Neplatnรฉ URL: %s"
+#: utils/dates.py:20
+msgid "aug"
+msgstr "aug"
-#: core/validators.py:206 core/validators.py:208
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "Odkaz na URL %s je neplatnรฝ."
+#: utils/dates.py:20
+msgid "sep"
+msgstr "sep"
-#: core/validators.py:214
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Vloลพ platnรบ skratku U.S. ลกtรกtu."
+#: utils/dates.py:20
+msgid "oct"
+msgstr "okt"
-#: core/validators.py:229
-#, 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] "Vyjadruj sa sluลกne! Slovo %s tu nie je dovolenรฉ pouลพivaลฅ."
-msgstr[1] "Vyjadruj sa sluลกne! Slovรก %s tu nie je dovolenรฉ pouลพivaลฅ."
+#: utils/dates.py:20
+msgid "nov"
+msgstr "nov"
-#: core/validators.py:236
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Toto pole sa musรญ zhodovaลฅ s poฤพom '%s'. "
+#: utils/dates.py:20
+msgid "dec"
+msgstr "dec"
-#: core/validators.py:255
-msgid "Please enter something for at least one field."
-msgstr "Prosรญm vloลพ nieฤo aspoล pre jedno pole."
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "Jan."
-#: core/validators.py:264 core/validators.py:275
-msgid "Please enter both fields or leave them both empty."
-msgstr "Prosรญm vloลพ obidve polia, alebo nechaj ich obe prรกzdne. "
+#: utils/dates.py:27
+msgid "Feb."
+msgstr "Feb."
-#: core/validators.py:282
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "Toto pole musรญ byลฅ vyplnenรฉ tak, ลพe %(field)s obsahuje %(value)s"
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "Aug."
-#: core/validators.py:294
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr ""
-"Toto pole musรญ byลฅ vyplnenรฉ tak, ลพe %(field)s nesmie obsahovaลฅ %(value)s"
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "Sept."
-#: core/validators.py:313
-msgid "Duplicate values are not allowed."
-msgstr "Duplicitnรฉ hodnoty nie sรบ povolenรฉ."
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "Okt."
-#: core/validators.py:336
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "Tรกto hodnota musรญ byลฅ mocninou %s."
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "Nov."
-#: core/validators.py:347
-msgid "Please enter a valid decimal number."
-msgstr "Prosรญm vloลพ platnรฉ desiatkovรฉ ฤรญslo. "
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "Dec."
-#: core/validators.py:349
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
-msgstr[0] "Prosรญm vloลพ platnรฉ desiatkovรฉ ฤรญslo s najviac %s ฤรญslicou."
-msgstr[1] "Prosรญm vloลพ platnรฉ desiatkovรฉ ฤรญslo s najviac %s ฤรญslicami."
+#: utils/timesince.py:12
+msgid "year"
+msgstr "rok"
-#: core/validators.py:352
-#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] "Prosรญm vloลพ platnรฉ desatinnรฉ ฤรญslo s najviac %s desatinnรฝm miestom."
-msgstr[1] ""
-"Prosรญm vloลพ platnรฉ desatinnรฉ ฤรญslo s najviac %s desatinnรฝmi miestami."
+#: utils/timesince.py:13
+msgid "month"
+msgstr "mesiac"
-#: core/validators.py:362
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Presvedฤ sa, ลพe posielanรฝ sรบbor nemรก menej ako %s bytov."
+#: utils/timesince.py:14
+msgid "week"
+msgstr "tรฝลพdeล"
-#: core/validators.py:363
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Presvedฤ sa, ลพe posielanรฝ sรบbor nemรก viac ako %s bytov."
+#: utils/timesince.py:15
+msgid "day"
+msgstr "deล"
-#: core/validators.py:376
-msgid "The format for this field is wrong."
-msgstr "Formรกt pre toto pole je chybnรฝ."
+#: utils/timesince.py:16
+msgid "hour"
+msgstr "hodina"
-#: core/validators.py:391
-msgid "This field is invalid."
-msgstr "Toto pole nie je platnรฉ."
+#: utils/timesince.py:17
+msgid "minute"
+msgstr "minรบta"
-#: core/validators.py:426
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "Niฤ som nemohol zรญskaลฅ z %s."
+#: utils/dateformat.py:40
+msgid "p.m."
+msgstr "p.m."
-#: core/validators.py:429
-#, python-format
-msgid ""
-"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+#: utils/dateformat.py:41
+msgid "a.m."
+msgstr "a.m."
+
+#: utils/dateformat.py:46
+msgid "PM"
msgstr ""
-" URL %(url)s vrรกtilo neplatnรบ hlaviฤku Content-Type '%(contenttype)s'."
-#: core/validators.py:462
-#, python-format
-msgid ""
-"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
-"\"%(start)s\".)"
+#: utils/dateformat.py:47
+msgid "AM"
msgstr ""
-"Prosรญm zavri nezavretรฝ %(tag)s popisovaฤ v riadku %(line)s. (Riadok zaฤรญna "
-"s \"%(start)s\".)"
-#: core/validators.py:466
-#, python-format
-msgid ""
-"Some text starting on line %(line)s is not allowed in that context. (Line "
-"starts with \"%(start)s\".)"
+#: utils/dateformat.py:95
+msgid "midnight"
+msgstr "polnoc"
+
+#: utils/dateformat.py:97
+msgid "noon"
+msgstr "poludnie"
+
+#: utils/translation/trans_real.py:362
+msgid "DATE_FORMAT"
msgstr ""
-"Nejakรฝ text zaฤรญnajรบci na riadku %(line)s nie je povolenรฝ v tomto kontexte. "
-"(Riadok zaฤรญna s \"%(start)s\".)"
-#: core/validators.py:471
-#, python-format
-msgid ""
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
-"(start)s\".)"
+#: utils/translation/trans_real.py:363
+msgid "DATETIME_FORMAT"
msgstr ""
-"\"%(attr)s\" na riadku %(line)s je neplatnรฝ atribรบt. (Riadok zaฤรญna s \"%"
-"(start)s\".)"
-#: core/validators.py:476
-#, python-format
-msgid ""
-"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
-"(start)s\".)"
+#: utils/translation/trans_real.py:364
+msgid "TIME_FORMAT"
msgstr ""
-"\"<%(tag)s>\" na riadku %(line)s je neplatnรฝ popisovaฤ. (Riadok zaฤรญna s \"%"
-"(start)s\".)"
-#: core/validators.py:480
-#, python-format
-msgid ""
-"A tag on line %(line)s is missing one or more required attributes. (Line "
-"starts with \"%(start)s\".)"
+#: utils/translation/trans_real.py:380
+msgid "YEAR_MONTH_FORMAT"
msgstr ""
-"Popisovaฤu na riadku %(line)s chรฝba jeden alebo viac atribรบtov. (Riadok "
-"zaฤรญna s \"%(start)s\".)"
-#: core/validators.py:485
-#, python-format
-msgid ""
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-"starts with \"%(start)s\".)"
+#: utils/translation/trans_real.py:381
+msgid "MONTH_DAY_FORMAT"
msgstr ""
-"Atribรบt \"%(attr)s\" na riadku %(line)s mรก neplatnรบ hodnotu. (Riadok zaฤรญna "
-"s \"%(start)s\".)"
-#: template/defaultfilters.py:383
+#: template/defaultfilters.py:491
msgid "yes,no,maybe"
-msgstr "ano,nie,moลพno"
-
-#~ msgid "Comment"
-#~ msgstr "Komentรกr"
-
-#~ msgid "Comments"
-#~ msgstr "Komentรกre"
-
-#~ msgid "Delete this file."
-#~ msgstr "Vymaลพ tento sรบbor."
-
-#~ msgid "label"
-#~ msgstr "popis"
-
-#~ msgid "package"
-#~ msgstr "balรญk"
-
-#~ msgid "packages"
-#~ msgstr "balรญky"
+msgstr "รกno,nie,moลพno"
-#~ msgid "String (up to 50)"
-#~ msgstr "Reลฅazec (do 50 )"
diff --git a/django/conf/locale/sk/LC_MESSAGES/djangojs.mo b/django/conf/locale/sk/LC_MESSAGES/djangojs.mo
index a4f5b84a53..1a168078c6 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 df24a19442..f442a15ff1 100644
--- a/django/conf/locale/sk/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/sk/LC_MESSAGES/djangojs.po
@@ -1,20 +1,15 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# VLADO LABATH , 2005.
-#
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Django 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-18 19:38-0500\n"
-"PO-Revision-Date: 2005-12-18 19:26-0500\n"
-"Last-Translator: VLADO LABATH \n"
-"Language-Team: LANGUAGE \n"
+"POT-Creation-Date: 2007-04-01 19:21+0200\n"
+"PO-Revision-Date: 2007-04-03 21:48+0200\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
@@ -23,15 +18,15 @@ msgstr "Moลพnรฝ %s"
#: contrib/admin/media/js/SelectFilter2.js:41
msgid "Choose all"
-msgstr "Vyber vลกetko"
+msgstr "Vybraลฅ vลกetko"
#: contrib/admin/media/js/SelectFilter2.js:46
msgid "Add"
-msgstr "Pridaj"
+msgstr "Pridaลฅ"
#: contrib/admin/media/js/SelectFilter2.js:48
msgid "Remove"
-msgstr "Vymaลพ"
+msgstr "Vymazaลฅ"
#: contrib/admin/media/js/SelectFilter2.js:53
#, perl-format
@@ -40,13 +35,13 @@ msgstr "Vybranรฉ %s"
#: contrib/admin/media/js/SelectFilter2.js:54
msgid "Select your choice(s) and click "
-msgstr "Vyber si svoju voฤพbu a klikni"
+msgstr "Vyberte poloลพku a kliknite"
#: contrib/admin/media/js/SelectFilter2.js:59
msgid "Clear all"
-msgstr "Vyฤisti vลกetko"
+msgstr "Odstrรกniลฅ vybranรฉ"
-#: contrib/admin/media/js/dateparse.js:26
+#: contrib/admin/media/js/dateparse.js:32
#: contrib/admin/media/js/calendar.js:24
msgid ""
"January February March April May June July August September October November "
@@ -55,7 +50,7 @@ msgstr ""
"Januรกr Februรกr Marec Aprรญl Mรกj Jรบn Jรบl August September Oktรณber November "
"December"
-#: contrib/admin/media/js/dateparse.js:27
+#: contrib/admin/media/js/dateparse.js:33
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
msgstr "Nedeฤพa Pondelok Utorok Streda ล tvrtok Piatok Sobota"
@@ -63,49 +58,59 @@ msgstr "Nedeฤพa Pondelok Utorok Streda ล tvrtok Piatok Sobota"
msgid "S M T W T F S"
msgstr "N P U S ล P S"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+#: 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
msgid "Now"
msgstr "Prรกve teraz"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
msgid "Clock"
msgstr "Hodiny"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
msgid "Choose a time"
-msgstr "Vyber ฤas"
+msgstr "Vybraลฅ ฤas"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
msgid "Midnight"
msgstr "Polnoc"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "6 a.m."
msgstr "6 rรกno"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Noon"
msgstr "Poludnie"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
msgid "Cancel"
-msgstr "Zruลก"
+msgstr "Zruลกiลฅ"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
msgid "Today"
msgstr "Dnes"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
msgid "Calendar"
msgstr "Kalendรกr"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
msgid "Yesterday"
msgstr "Vฤera"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Tomorrow"
msgstr "Zajtra"
+
diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css
index 0cfe2ff28e..72e57501e9 100644
--- a/django/contrib/admin/media/css/forms.css
+++ b/django/contrib/admin/media/css/forms.css
@@ -26,7 +26,7 @@ form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; }
form .aligned table p { margin-left:0; padding-left:0; }
form .aligned p.help { padding-left:38px; }
.aligned .vCheckboxLabel { float:none !important; display:inline; padding-left:4px; }
-.colM .aligned .vLargeTextField, colM .aligned .vXMLLargeTextField { width:610px; }
+.colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField { width:610px; }
.checkbox-row p.help { margin-left:0; padding-left:0 !important; }
/* WIDE FIELDSETS */
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index c3aa863892..f686d90e7a 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -38,6 +38,7 @@ class Permission(models.Model):
name = models.CharField(_('name'), maxlength=50)
content_type = models.ForeignKey(ContentType)
codename = models.CharField(_('codename'), maxlength=100)
+
class Meta:
verbose_name = _('permission')
verbose_name_plural = _('permissions')
@@ -56,10 +57,12 @@ class Group(models.Model):
"""
name = models.CharField(_('name'), maxlength=80, unique=True)
permissions = models.ManyToManyField(Permission, verbose_name=_('permissions'), blank=True, filter_interface=models.HORIZONTAL)
+
class Meta:
verbose_name = _('group')
verbose_name_plural = _('groups')
ordering = ('name',)
+
class Admin:
search_fields = ('name',)
@@ -95,16 +98,18 @@ class User(models.Model):
is_staff = models.BooleanField(_('staff status'), default=False, help_text=_("Designates whether the user can log into this admin site."))
is_active = models.BooleanField(_('active'), default=True, help_text=_("Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts."))
is_superuser = models.BooleanField(_('superuser status'), default=False, help_text=_("Designates that this user has all permissions without explicitly assigning them."))
- last_login = models.DateTimeField(_('last login'), default=models.LazyDate())
- date_joined = models.DateTimeField(_('date joined'), default=models.LazyDate())
+ last_login = models.DateTimeField(_('last login'), default=datetime.datetime.now)
+ date_joined = models.DateTimeField(_('date joined'), default=datetime.datetime.now)
groups = models.ManyToManyField(Group, verbose_name=_('groups'), blank=True,
help_text=_("In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."))
user_permissions = models.ManyToManyField(Permission, verbose_name=_('user permissions'), blank=True, filter_interface=models.HORIZONTAL)
objects = UserManager()
+
class Meta:
verbose_name = _('user')
verbose_name_plural = _('users')
ordering = ('username',)
+
class Admin:
fields = (
(None, {'fields': ('username', 'password')}),
diff --git a/django/contrib/localflavor/au/__init__.py b/django/contrib/localflavor/au/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/contrib/localflavor/au/au_states.py b/django/contrib/localflavor/au/au_states.py
new file mode 100644
index 0000000000..578d61bb01
--- /dev/null
+++ b/django/contrib/localflavor/au/au_states.py
@@ -0,0 +1,17 @@
+"""
+An alphabetical list of states for use as `choices` in a formfield.
+
+This exists in this standalone file so that it's only imported into memory
+when explicitly needed.
+"""
+
+STATE_CHOICES = (
+ ('ACT', 'Australian Capital Territory'),
+ ('NSW', 'New South Wales'),
+ ('NT', 'Northern Territory'),
+ ('QLD', 'Queensland'),
+ ('SA', 'South Australia'),
+ ('TAS', 'Tasmania'),
+ ('VIC', 'Victoria'),
+ ('WA', 'Western Australia'),
+)
diff --git a/django/contrib/localflavor/au/forms.py b/django/contrib/localflavor/au/forms.py
new file mode 100644
index 0000000000..b81a903d13
--- /dev/null
+++ b/django/contrib/localflavor/au/forms.py
@@ -0,0 +1,43 @@
+"""
+Australian-specific Form helpers
+"""
+
+from django.newforms import ValidationError
+from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
+from django.newforms.util import smart_unicode
+from django.utils.translation import gettext
+import re
+
+PHONE_DIGITS_RE = re.compile(r'^(\d{10})$')
+
+class AUPostCodeField(RegexField):
+ """Australian post code field."""
+ def __init__(self, *args, **kwargs):
+ super(AUPostCodeField, self).__init__(r'^\d{4}$',
+ max_length=None, min_length=None,
+ error_message=gettext(u'Enter a 4 digit post code.'),
+ *args, **kwargs)
+
+class AUPhoneNumberField(Field):
+ """Australian phone number field."""
+ def clean(self, value):
+ """Validate a phone number. Strips parentheses, whitespace and
+ hyphens.
+ """
+ super(AUPhoneNumberField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+ value = re.sub('(\(|\)|\s+|-)', '', smart_unicode(value))
+ phone_match = PHONE_DIGITS_RE.search(value)
+ if phone_match:
+ return u'%s' % phone_match.group(1)
+ raise ValidationError(u'Phone numbers must contain 10 digits.')
+
+class AUStateSelect(Select):
+ """
+ A Select widget that uses a list of Australian states/territories as its
+ choices.
+ """
+ def __init__(self, attrs=None):
+ from au_states import STATE_CHOICES # relative import
+ super(AUStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
diff --git a/django/contrib/localflavor/br/br_states.py b/django/contrib/localflavor/br/br_states.py
index c6ce0a1bb7..98e54bca2c 100644
--- a/django/contrib/localflavor/br/br_states.py
+++ b/django/contrib/localflavor/br/br_states.py
@@ -1,11 +1,9 @@
# -*- coding: utf-8 -*-
"""
-A brazilian mapping of state misspellings/abbreviations to normalized
-abbreviations, and an alphabetical list of states for use as `choices
-in a formfield.
+An alphabetical list of Brazilian states for use as `choices` in a formfield.
-This exists in this standalone file so that it's only imported into
-memory when explicitly needed.
+This exists in this standalone file so that it's only imported into memory
+when explicitly needed.
"""
STATE_CHOICES = (
diff --git a/django/contrib/localflavor/de/forms.py b/django/contrib/localflavor/de/forms.py
index c82d2d5b8d..8e140c125f 100644
--- a/django/contrib/localflavor/de/forms.py
+++ b/django/contrib/localflavor/de/forms.py
@@ -12,9 +12,9 @@ id_re = re.compile(r"^(?P\d{10})(?P\w{1,3})[-\ ]?(?P([0-2]\d|3[01])
@@ -35,13 +35,11 @@ class FISocialSecurityNumber(Field):
(\d{2}))
[A+-]
(?P(\d{3}))
- (?P[%s])$""" % checkmarks, value, re.VERBOSE | re.IGNORECASE)
+ (?P[%s])$""" % checkmarks, value, re.VERBOSE | re.IGNORECASE)
if not result:
raise ValidationError(gettext(u'Enter a valid Finnish social security number.'))
- checksum = int(result.groupdict()['date'] + result.groupdict()['serial'])
-
- if checkmarks[checksum % len(checkmarks)] == result.groupdict()['chechsum'].upper():
+ gd = result.groupdict()
+ checksum = int(gd['date'] + gd['serial'])
+ if checkmarks[checksum % len(checkmarks)] == gd['checksum'].upper():
return u'%s' % value.upper()
-
raise ValidationError(gettext(u'Enter a valid Finnish social security number.'))
-
diff --git a/django/contrib/localflavor/us/__init__.py b/django/contrib/localflavor/us/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/contrib/localflavor/us/forms.py b/django/contrib/localflavor/us/forms.py
new file mode 100644
index 0000000000..feda68291b
--- /dev/null
+++ b/django/contrib/localflavor/us/forms.py
@@ -0,0 +1,99 @@
+"""
+USA-specific Form helpers
+"""
+
+from django.newforms import ValidationError
+from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
+from django.utils.encoding import smart_unicode
+from django.utils.translation import gettext
+import re
+
+phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$')
+ssn_re = re.compile(r"^(?P\d{3})[-\ ]?(?P\d{2})[-\ ]?(?P\d{4})$")
+
+class USZipCodeField(RegexField):
+ def __init__(self, *args, **kwargs):
+ super(USZipCodeField, self).__init__(r'^\d{5}(?:-\d{4})?$',
+ max_length=None, min_length=None,
+ error_message=gettext(u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'),
+ *args, **kwargs)
+
+class USPhoneNumberField(Field):
+ def clean(self, value):
+ super(USPhoneNumberField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+ value = re.sub('(\(|\)|\s+)', '', smart_unicode(value))
+ m = phone_digits_re.search(value)
+ if m:
+ return u'%s-%s-%s' % (m.group(1), m.group(2), m.group(3))
+ raise ValidationError(u'Phone numbers must be in XXX-XXX-XXXX format.')
+
+class USSocialSecurityNumberField(Field):
+ """
+ A United States Social Security number.
+
+ Checks the following rules to determine whether the number is valid:
+
+ * Conforms to the XXX-XX-XXXX format.
+ * No group consists entirely of zeroes.
+ * The leading group is not "666" (block "666" will never be allocated).
+ * The number is not in the promotional block 987-65-4320 through 987-65-4329,
+ which are permanently invalid.
+ * The number is not one known to be invalid due to otherwise widespread
+ promotional use or distribution (e.g., the Woolworth's number or the 1962
+ promotional number).
+ """
+ def clean(self, value):
+ super(USSocialSecurityNumberField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+ msg = gettext(u'Enter a valid U.S. Social Security number in XXX-XX-XXXX format.')
+ match = re.match(ssn_re, value)
+ if not match:
+ raise ValidationError(msg)
+ area, group, serial = match.groupdict()['area'], match.groupdict()['group'], match.groupdict()['serial']
+
+ # First pass: no blocks of all zeroes.
+ if area == '000' or \
+ group == '00' or \
+ serial == '0000':
+ raise ValidationError(msg)
+
+ # Second pass: promotional and otherwise permanently invalid numbers.
+ if area == '666' or \
+ (area == '987' and group == '65' and 4320 <= int(serial) <= 4329) or \
+ value == '078-05-1120' or \
+ value == '219-09-9999':
+ raise ValidationError(msg)
+ return u'%s-%s-%s' % (area, group, serial)
+
+class USStateField(Field):
+ """
+ A form field that validates its input is a U.S. state name or abbreviation.
+ It normalizes the input to the standard two-leter postal service
+ abbreviation for the given state.
+ """
+ def clean(self, value):
+ from us_states import STATES_NORMALIZED # relative import
+ super(USStateField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+ try:
+ value = value.strip().lower()
+ except AttributeError:
+ pass
+ else:
+ try:
+ return STATES_NORMALIZED[value.strip().lower()].decode('ascii')
+ except KeyError:
+ pass
+ raise ValidationError(u'Enter a U.S. state or territory.')
+
+class USStateSelect(Select):
+ """
+ A Select widget that uses a list of U.S. states/territories as its choices.
+ """
+ def __init__(self, attrs=None):
+ from us_states import STATE_CHOICES # relative import
+ super(USStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
diff --git a/django/contrib/localflavor/us/us_states.py b/django/contrib/localflavor/us/us_states.py
new file mode 100644
index 0000000000..89124a4b69
--- /dev/null
+++ b/django/contrib/localflavor/us/us_states.py
@@ -0,0 +1,239 @@
+"""
+A mapping of state misspellings/abbreviations to normalized abbreviations, and
+an alphabetical list of states for use as `choices` in a formfield.
+
+This exists in this standalone file so that it's only imported into memory
+when explicitly needed.
+"""
+
+STATE_CHOICES = (
+ ('AL', 'Alabama'),
+ ('AK', 'Alaska'),
+ ('AS', 'American Samoa'),
+ ('AZ', 'Arizona'),
+ ('AR', 'Arkansas'),
+ ('CA', 'California'),
+ ('CO', 'Colorado'),
+ ('CT', 'Connecticut'),
+ ('DE', 'Deleware'),
+ ('DC', 'District of Columbia'),
+ ('FM', 'Federated States of Micronesia'),
+ ('FL', 'Florida'),
+ ('GA', 'Georgia'),
+ ('GU', 'Guam'),
+ ('HI', 'Hawaii'),
+ ('ID', 'Idaho'),
+ ('IL', 'Illinois'),
+ ('IN', 'Indiana'),
+ ('IA', 'Iowa'),
+ ('KS', 'Kansas'),
+ ('KY', 'Kentucky'),
+ ('LA', 'Louisiana'),
+ ('ME', 'Maine'),
+ ('MH', 'Marshall Islands'),
+ ('MD', 'Maryland'),
+ ('MA', 'Massachusetts'),
+ ('MI', 'Michigan'),
+ ('MN', 'Minnesota'),
+ ('MS', 'Mississippi'),
+ ('MO', 'Missouri'),
+ ('MT', 'Montana'),
+ ('NE', 'Nebraska'),
+ ('NV', 'Nevada'),
+ ('NH', 'New Hampshire'),
+ ('NJ', 'New Jersey'),
+ ('NM', 'New Mexico'),
+ ('NY', 'New York'),
+ ('NC', 'North Carolina'),
+ ('ND', 'North Dakota'),
+ ('MP', 'Northern Mariana Islands'),
+ ('OH', 'Ohio'),
+ ('OK', 'Oklahoma'),
+ ('OR', 'Oregon'),
+ ('PW', 'Palau'),
+ ('PA', 'Pennsylvania'),
+ ('PR', 'Puerto Rico'),
+ ('RI', 'Rhode Island'),
+ ('SC', 'South Carolina'),
+ ('SD', 'South Dakota'),
+ ('TN', 'Tennessee'),
+ ('TX', 'Texas'),
+ ('UT', 'Utah'),
+ ('VT', 'Vermont'),
+ ('VI', 'Virgin Islands'),
+ ('VA', 'Virginia'),
+ ('WA', 'Washington'),
+ ('WV', 'West Virginia'),
+ ('WI', 'Wisconsin'),
+ ('WY', 'Wyoming'),
+)
+
+STATES_NORMALIZED = {
+ 'ak': 'AK',
+ 'al': 'AL',
+ 'ala': 'AL',
+ 'alabama': 'AL',
+ 'alaska': 'AK',
+ 'american samao': 'AS',
+ 'american samoa': 'AS',
+ 'ar': 'AR',
+ 'ariz': 'AZ',
+ 'arizona': 'AZ',
+ 'ark': 'AR',
+ 'arkansas': 'AR',
+ 'as': 'AS',
+ 'az': 'AZ',
+ 'ca': 'CA',
+ 'calf': 'CA',
+ 'calif': 'CA',
+ 'california': 'CA',
+ 'co': 'CO',
+ 'colo': 'CO',
+ 'colorado': 'CO',
+ 'conn': 'CT',
+ 'connecticut': 'CT',
+ 'ct': 'CT',
+ 'dc': 'DC',
+ 'de': 'DE',
+ 'del': 'DE',
+ 'delaware': 'DE',
+ 'district of columbia': 'DC',
+ 'federated states of micronesia': 'FM',
+ 'fl': 'FL',
+ 'fla': 'FL',
+ 'florida': 'FL',
+ 'fm': 'FM',
+ 'ga': 'GA',
+ 'georgia': 'GA',
+ 'gu': 'GU',
+ 'guam': 'GU',
+ 'hawaii': 'HI',
+ 'hi': 'HI',
+ 'ia': 'IA',
+ 'id': 'ID',
+ 'idaho': 'ID',
+ 'il': 'IL',
+ 'ill': 'IL',
+ 'illinois': 'IL',
+ 'in': 'IN',
+ 'ind': 'IN',
+ 'indiana': 'IN',
+ 'iowa': 'IA',
+ 'kan': 'KS',
+ 'kans': 'KS',
+ 'kansas': 'KS',
+ 'kentucky': 'KY',
+ 'ks': 'KS',
+ 'ky': 'KY',
+ 'la': 'LA',
+ 'louisiana': 'LA',
+ 'ma': 'MA',
+ 'maine': 'ME',
+ 'marianas islands': 'MP',
+ 'marianas islands of the pacific': 'MP',
+ 'marinas islands of the pacific': 'MP',
+ 'maryland': 'MD',
+ 'mass': 'MA',
+ 'massachusetts': 'MA',
+ 'massachussetts': 'MA',
+ 'md': 'MD',
+ 'me': 'ME',
+ 'mi': 'MI',
+ 'mich': 'MI',
+ 'michigan': 'MI',
+ 'micronesia': 'FM',
+ 'minn': 'MN',
+ 'minnesota': 'MN',
+ 'miss': 'MS',
+ 'mississippi': 'MS',
+ 'missouri': 'MO',
+ 'mn': 'MN',
+ 'mo': 'MO',
+ 'mont': 'MT',
+ 'montana': 'MT',
+ 'mp': 'MP',
+ 'ms': 'MS',
+ 'mt': 'MT',
+ 'n d': 'ND',
+ 'n dak': 'ND',
+ 'n h': 'NH',
+ 'n j': 'NJ',
+ 'n m': 'NM',
+ 'n mex': 'NM',
+ 'nc': 'NC',
+ 'nd': 'ND',
+ 'ne': 'NE',
+ 'neb': 'NE',
+ 'nebr': 'NE',
+ 'nebraska': 'NE',
+ 'nev': 'NV',
+ 'nevada': 'NV',
+ 'new hampshire': 'NH',
+ 'new jersey': 'NJ',
+ 'new mexico': 'NM',
+ 'new york': 'NY',
+ 'nh': 'NH',
+ 'nj': 'NJ',
+ 'nm': 'NM',
+ 'nmex': 'NM',
+ 'north carolina': 'NC',
+ 'north dakota': 'ND',
+ 'northern mariana islands': 'MP',
+ 'nv': 'NV',
+ 'ny': 'NY',
+ 'oh': 'OH',
+ 'ohio': 'OH',
+ 'ok': 'OK',
+ 'okla': 'OK',
+ 'oklahoma': 'OK',
+ 'or': 'OR',
+ 'ore': 'OR',
+ 'oreg': 'OR',
+ 'oregon': 'OR',
+ 'pa': 'PA',
+ 'penn': 'PA',
+ 'pennsylvania': 'PA',
+ 'pr': 'PR',
+ 'puerto rico': 'PR',
+ 'rhode island': 'RI',
+ 'ri': 'RI',
+ 's dak': 'SD',
+ 'sc': 'SC',
+ 'sd': 'SD',
+ 'sdak': 'SD',
+ 'south carolina': 'SC',
+ 'south dakota': 'SD',
+ 'tenn': 'TN',
+ 'tennessee': 'TN',
+ 'territory of hawaii': 'HI',
+ 'tex': 'TX',
+ 'texas': 'TX',
+ 'tn': 'TN',
+ 'tx': 'TX',
+ 'us virgin islands': 'VI',
+ 'usvi': 'VI',
+ 'ut': 'UT',
+ 'utah': 'UT',
+ 'va': 'VA',
+ 'vermont': 'VT',
+ 'vi': 'VI',
+ 'viginia': 'VA',
+ 'virgin islands': 'VI',
+ 'virgina': 'VA',
+ 'virginia': 'VA',
+ 'vt': 'VT',
+ 'w va': 'WV',
+ 'wa': 'WA',
+ 'wash': 'WA',
+ 'washington': 'WA',
+ 'west virginia': 'WV',
+ 'wi': 'WI',
+ 'wis': 'WI',
+ 'wisc': 'WI',
+ 'wisconsin': 'WI',
+ 'wv': 'WV',
+ 'wva': 'WV',
+ 'wy': 'WY',
+ 'wyo': 'WY',
+ 'wyoming': 'WY',
+}
diff --git a/django/contrib/localflavor/usa/__init__.py b/django/contrib/localflavor/usa/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/django/contrib/localflavor/usa/forms.py b/django/contrib/localflavor/usa/forms.py
deleted file mode 100644
index feda68291b..0000000000
--- a/django/contrib/localflavor/usa/forms.py
+++ /dev/null
@@ -1,99 +0,0 @@
-"""
-USA-specific Form helpers
-"""
-
-from django.newforms import ValidationError
-from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
-from django.utils.encoding import smart_unicode
-from django.utils.translation import gettext
-import re
-
-phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$')
-ssn_re = re.compile(r"^(?P\d{3})[-\ ]?(?P\d{2})[-\ ]?(?P\d{4})$")
-
-class USZipCodeField(RegexField):
- def __init__(self, *args, **kwargs):
- super(USZipCodeField, self).__init__(r'^\d{5}(?:-\d{4})?$',
- max_length=None, min_length=None,
- error_message=gettext(u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'),
- *args, **kwargs)
-
-class USPhoneNumberField(Field):
- def clean(self, value):
- super(USPhoneNumberField, self).clean(value)
- if value in EMPTY_VALUES:
- return u''
- value = re.sub('(\(|\)|\s+)', '', smart_unicode(value))
- m = phone_digits_re.search(value)
- if m:
- return u'%s-%s-%s' % (m.group(1), m.group(2), m.group(3))
- raise ValidationError(u'Phone numbers must be in XXX-XXX-XXXX format.')
-
-class USSocialSecurityNumberField(Field):
- """
- A United States Social Security number.
-
- Checks the following rules to determine whether the number is valid:
-
- * Conforms to the XXX-XX-XXXX format.
- * No group consists entirely of zeroes.
- * The leading group is not "666" (block "666" will never be allocated).
- * The number is not in the promotional block 987-65-4320 through 987-65-4329,
- which are permanently invalid.
- * The number is not one known to be invalid due to otherwise widespread
- promotional use or distribution (e.g., the Woolworth's number or the 1962
- promotional number).
- """
- def clean(self, value):
- super(USSocialSecurityNumberField, self).clean(value)
- if value in EMPTY_VALUES:
- return u''
- msg = gettext(u'Enter a valid U.S. Social Security number in XXX-XX-XXXX format.')
- match = re.match(ssn_re, value)
- if not match:
- raise ValidationError(msg)
- area, group, serial = match.groupdict()['area'], match.groupdict()['group'], match.groupdict()['serial']
-
- # First pass: no blocks of all zeroes.
- if area == '000' or \
- group == '00' or \
- serial == '0000':
- raise ValidationError(msg)
-
- # Second pass: promotional and otherwise permanently invalid numbers.
- if area == '666' or \
- (area == '987' and group == '65' and 4320 <= int(serial) <= 4329) or \
- value == '078-05-1120' or \
- value == '219-09-9999':
- raise ValidationError(msg)
- return u'%s-%s-%s' % (area, group, serial)
-
-class USStateField(Field):
- """
- A form field that validates its input is a U.S. state name or abbreviation.
- It normalizes the input to the standard two-leter postal service
- abbreviation for the given state.
- """
- def clean(self, value):
- from us_states import STATES_NORMALIZED # relative import
- super(USStateField, self).clean(value)
- if value in EMPTY_VALUES:
- return u''
- try:
- value = value.strip().lower()
- except AttributeError:
- pass
- else:
- try:
- return STATES_NORMALIZED[value.strip().lower()].decode('ascii')
- except KeyError:
- pass
- raise ValidationError(u'Enter a U.S. state or territory.')
-
-class USStateSelect(Select):
- """
- A Select widget that uses a list of U.S. states/territories as its choices.
- """
- def __init__(self, attrs=None):
- from us_states import STATE_CHOICES # relative import
- super(USStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
diff --git a/django/contrib/localflavor/usa/us_states.py b/django/contrib/localflavor/usa/us_states.py
deleted file mode 100644
index 89124a4b69..0000000000
--- a/django/contrib/localflavor/usa/us_states.py
+++ /dev/null
@@ -1,239 +0,0 @@
-"""
-A mapping of state misspellings/abbreviations to normalized abbreviations, and
-an alphabetical list of states for use as `choices` in a formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-
-STATE_CHOICES = (
- ('AL', 'Alabama'),
- ('AK', 'Alaska'),
- ('AS', 'American Samoa'),
- ('AZ', 'Arizona'),
- ('AR', 'Arkansas'),
- ('CA', 'California'),
- ('CO', 'Colorado'),
- ('CT', 'Connecticut'),
- ('DE', 'Deleware'),
- ('DC', 'District of Columbia'),
- ('FM', 'Federated States of Micronesia'),
- ('FL', 'Florida'),
- ('GA', 'Georgia'),
- ('GU', 'Guam'),
- ('HI', 'Hawaii'),
- ('ID', 'Idaho'),
- ('IL', 'Illinois'),
- ('IN', 'Indiana'),
- ('IA', 'Iowa'),
- ('KS', 'Kansas'),
- ('KY', 'Kentucky'),
- ('LA', 'Louisiana'),
- ('ME', 'Maine'),
- ('MH', 'Marshall Islands'),
- ('MD', 'Maryland'),
- ('MA', 'Massachusetts'),
- ('MI', 'Michigan'),
- ('MN', 'Minnesota'),
- ('MS', 'Mississippi'),
- ('MO', 'Missouri'),
- ('MT', 'Montana'),
- ('NE', 'Nebraska'),
- ('NV', 'Nevada'),
- ('NH', 'New Hampshire'),
- ('NJ', 'New Jersey'),
- ('NM', 'New Mexico'),
- ('NY', 'New York'),
- ('NC', 'North Carolina'),
- ('ND', 'North Dakota'),
- ('MP', 'Northern Mariana Islands'),
- ('OH', 'Ohio'),
- ('OK', 'Oklahoma'),
- ('OR', 'Oregon'),
- ('PW', 'Palau'),
- ('PA', 'Pennsylvania'),
- ('PR', 'Puerto Rico'),
- ('RI', 'Rhode Island'),
- ('SC', 'South Carolina'),
- ('SD', 'South Dakota'),
- ('TN', 'Tennessee'),
- ('TX', 'Texas'),
- ('UT', 'Utah'),
- ('VT', 'Vermont'),
- ('VI', 'Virgin Islands'),
- ('VA', 'Virginia'),
- ('WA', 'Washington'),
- ('WV', 'West Virginia'),
- ('WI', 'Wisconsin'),
- ('WY', 'Wyoming'),
-)
-
-STATES_NORMALIZED = {
- 'ak': 'AK',
- 'al': 'AL',
- 'ala': 'AL',
- 'alabama': 'AL',
- 'alaska': 'AK',
- 'american samao': 'AS',
- 'american samoa': 'AS',
- 'ar': 'AR',
- 'ariz': 'AZ',
- 'arizona': 'AZ',
- 'ark': 'AR',
- 'arkansas': 'AR',
- 'as': 'AS',
- 'az': 'AZ',
- 'ca': 'CA',
- 'calf': 'CA',
- 'calif': 'CA',
- 'california': 'CA',
- 'co': 'CO',
- 'colo': 'CO',
- 'colorado': 'CO',
- 'conn': 'CT',
- 'connecticut': 'CT',
- 'ct': 'CT',
- 'dc': 'DC',
- 'de': 'DE',
- 'del': 'DE',
- 'delaware': 'DE',
- 'district of columbia': 'DC',
- 'federated states of micronesia': 'FM',
- 'fl': 'FL',
- 'fla': 'FL',
- 'florida': 'FL',
- 'fm': 'FM',
- 'ga': 'GA',
- 'georgia': 'GA',
- 'gu': 'GU',
- 'guam': 'GU',
- 'hawaii': 'HI',
- 'hi': 'HI',
- 'ia': 'IA',
- 'id': 'ID',
- 'idaho': 'ID',
- 'il': 'IL',
- 'ill': 'IL',
- 'illinois': 'IL',
- 'in': 'IN',
- 'ind': 'IN',
- 'indiana': 'IN',
- 'iowa': 'IA',
- 'kan': 'KS',
- 'kans': 'KS',
- 'kansas': 'KS',
- 'kentucky': 'KY',
- 'ks': 'KS',
- 'ky': 'KY',
- 'la': 'LA',
- 'louisiana': 'LA',
- 'ma': 'MA',
- 'maine': 'ME',
- 'marianas islands': 'MP',
- 'marianas islands of the pacific': 'MP',
- 'marinas islands of the pacific': 'MP',
- 'maryland': 'MD',
- 'mass': 'MA',
- 'massachusetts': 'MA',
- 'massachussetts': 'MA',
- 'md': 'MD',
- 'me': 'ME',
- 'mi': 'MI',
- 'mich': 'MI',
- 'michigan': 'MI',
- 'micronesia': 'FM',
- 'minn': 'MN',
- 'minnesota': 'MN',
- 'miss': 'MS',
- 'mississippi': 'MS',
- 'missouri': 'MO',
- 'mn': 'MN',
- 'mo': 'MO',
- 'mont': 'MT',
- 'montana': 'MT',
- 'mp': 'MP',
- 'ms': 'MS',
- 'mt': 'MT',
- 'n d': 'ND',
- 'n dak': 'ND',
- 'n h': 'NH',
- 'n j': 'NJ',
- 'n m': 'NM',
- 'n mex': 'NM',
- 'nc': 'NC',
- 'nd': 'ND',
- 'ne': 'NE',
- 'neb': 'NE',
- 'nebr': 'NE',
- 'nebraska': 'NE',
- 'nev': 'NV',
- 'nevada': 'NV',
- 'new hampshire': 'NH',
- 'new jersey': 'NJ',
- 'new mexico': 'NM',
- 'new york': 'NY',
- 'nh': 'NH',
- 'nj': 'NJ',
- 'nm': 'NM',
- 'nmex': 'NM',
- 'north carolina': 'NC',
- 'north dakota': 'ND',
- 'northern mariana islands': 'MP',
- 'nv': 'NV',
- 'ny': 'NY',
- 'oh': 'OH',
- 'ohio': 'OH',
- 'ok': 'OK',
- 'okla': 'OK',
- 'oklahoma': 'OK',
- 'or': 'OR',
- 'ore': 'OR',
- 'oreg': 'OR',
- 'oregon': 'OR',
- 'pa': 'PA',
- 'penn': 'PA',
- 'pennsylvania': 'PA',
- 'pr': 'PR',
- 'puerto rico': 'PR',
- 'rhode island': 'RI',
- 'ri': 'RI',
- 's dak': 'SD',
- 'sc': 'SC',
- 'sd': 'SD',
- 'sdak': 'SD',
- 'south carolina': 'SC',
- 'south dakota': 'SD',
- 'tenn': 'TN',
- 'tennessee': 'TN',
- 'territory of hawaii': 'HI',
- 'tex': 'TX',
- 'texas': 'TX',
- 'tn': 'TN',
- 'tx': 'TX',
- 'us virgin islands': 'VI',
- 'usvi': 'VI',
- 'ut': 'UT',
- 'utah': 'UT',
- 'va': 'VA',
- 'vermont': 'VT',
- 'vi': 'VI',
- 'viginia': 'VA',
- 'virgin islands': 'VI',
- 'virgina': 'VA',
- 'virginia': 'VA',
- 'vt': 'VT',
- 'w va': 'WV',
- 'wa': 'WA',
- 'wash': 'WA',
- 'washington': 'WA',
- 'west virginia': 'WV',
- 'wi': 'WI',
- 'wis': 'WI',
- 'wisc': 'WI',
- 'wisconsin': 'WI',
- 'wv': 'WV',
- 'wva': 'WV',
- 'wy': 'WY',
- 'wyo': 'WY',
- 'wyoming': 'WY',
-}
diff --git a/django/core/management.py b/django/core/management.py
index bcb4c299de..024ff72042 100644
--- a/django/core/management.py
+++ b/django/core/management.py
@@ -439,30 +439,10 @@ get_sql_initial_data.help_doc = "RENAMED: see 'sqlcustom'"
get_sql_initial_data.args = ''
def get_sql_sequence_reset(app):
- "Returns a list of the SQL statements to reset PostgreSQL sequences for the given app."
+ "Returns a list of the SQL statements to reset sequences for the given app."
from django.db import backend, models
- output = []
- for model in models.get_models(app):
- for f in model._meta.fields:
- if isinstance(f, models.AutoField):
- output.append("%s setval('%s', (%s max(%s) %s %s));" % \
- (style.SQL_KEYWORD('SELECT'),
- style.SQL_FIELD('%s_%s_seq' % (model._meta.db_table, f.column)),
- style.SQL_KEYWORD('SELECT'),
- style.SQL_FIELD(backend.quote_name(f.column)),
- style.SQL_KEYWORD('FROM'),
- style.SQL_TABLE(backend.quote_name(model._meta.db_table))))
- break # Only one AutoField is allowed per model, so don't bother continuing.
- for f in model._meta.many_to_many:
- output.append("%s setval('%s', (%s max(%s) %s %s));" % \
- (style.SQL_KEYWORD('SELECT'),
- style.SQL_FIELD('%s_id_seq' % f.m2m_db_table()),
- style.SQL_KEYWORD('SELECT'),
- style.SQL_FIELD(backend.quote_name('id')),
- style.SQL_KEYWORD('FROM'),
- style.SQL_TABLE(f.m2m_db_table())))
- return output
-get_sql_sequence_reset.help_doc = "Prints the SQL statements for resetting PostgreSQL sequences for the given app name(s)."
+ return backend.get_sql_sequence_reset(style, models.get_models(app))
+get_sql_sequence_reset.help_doc = "Prints the SQL statements for resetting sequences for the given app name(s)."
get_sql_sequence_reset.args = APP_ARGS
def get_sql_indexes(app):
@@ -843,11 +823,12 @@ def startapp(app_name, directory):
# Determine the project_name a bit naively -- by looking at the name of
# the parent directory.
project_dir = os.path.normpath(os.path.join(directory, '..'))
- project_name = os.path.basename(project_dir)
- if app_name == os.path.basename(directory):
+ parent_dir = os.path.basename(project_dir)
+ project_name = os.path.basename(directory)
+ if app_name == project_name:
sys.stderr.write(style.ERROR("Error: You cannot create an app with the same name (%r) as your project.\n" % app_name))
sys.exit(1)
- _start_helper('app', app_name, directory, project_name)
+ _start_helper('app', app_name, directory, parent_dir)
startapp.help_doc = "Creates a Django app directory structure for the given app name in the current directory."
startapp.args = "[appname]"
@@ -1367,13 +1348,14 @@ def load_data(fixture_labels, verbosity=1):
"Installs the provided fixture file(s) as data in the database."
from django.db.models import get_apps
from django.core import serializers
- from django.db import connection, transaction
+ from django.db import connection, transaction, backend
from django.conf import settings
import sys
# Keep a count of the installed objects and fixtures
count = [0,0]
-
+ models = set()
+
humanize = lambda dirname: dirname and "'%s'" % dirname or 'absolute path'
# Get a cursor (even though we don't need one yet). This has
@@ -1435,6 +1417,7 @@ def load_data(fixture_labels, verbosity=1):
objects = serializers.deserialize(format, fixture)
for obj in objects:
count[0] += 1
+ models.add(obj.object.__class__)
obj.save()
label_found = True
except Exception, e:
@@ -1456,6 +1439,12 @@ def load_data(fixture_labels, verbosity=1):
else:
if verbosity > 0:
print "Installed %d object(s) from %d fixture(s)" % tuple(count)
+ sequence_sql = backend.get_sql_sequence_reset(style, models)
+ if sequence_sql:
+ if verbosity > 1:
+ print "Resetting sequences"
+ for line in sequence_sql:
+ cursor.execute(line)
transaction.commit()
transaction.leave_transaction_management()
diff --git a/django/db/backends/ado_mssql/base.py b/django/db/backends/ado_mssql/base.py
index 7dc197a3d9..a1ee4e428d 100644
--- a/django/db/backends/ado_mssql/base.py
+++ b/django/db/backends/ado_mssql/base.py
@@ -156,7 +156,7 @@ def get_start_transaction_sql():
def get_autoinc_sql(table):
return None
-def get_sql_flush(sql_styler, full_table_list):
+def get_sql_flush(style, tables, sequences):
"""Return a list of SQL statements required to remove all data from
all tables in the database (without actually removing the tables
themselves) and put the database in an empty 'initial' state
@@ -165,9 +165,14 @@ def get_sql_flush(sql_styler, full_table_list):
# TODO - SQL not actually tested against ADO MSSQL yet!
# TODO - autoincrement indices reset required? See other get_sql_flush() implementations
sql_list = ['%s %s;' % \
- (sql_styler.SQL_KEYWORD('TRUNCATE'),
- sql_styler.SQL_FIELD(quote_name(table))
- ) for table in full_table_list]
+ (style.SQL_KEYWORD('TRUNCATE'),
+ style.SQL_FIELD(quote_name(table))
+ ) for table in tables]
+
+def get_sql_sequence_reset(style, model_list):
+ "Returns a list of the SQL statements to reset sequences for the given models."
+ # No sequence reset required
+ return []
OPERATOR_MAPPING = {
'exact': '= %s',
diff --git a/django/db/backends/dummy/base.py b/django/db/backends/dummy/base.py
index e36a99e982..eb3c3867c2 100644
--- a/django/db/backends/dummy/base.py
+++ b/django/db/backends/dummy/base.py
@@ -40,5 +40,6 @@ get_deferrable_sql = complain
get_fulltext_search_sql = complain
get_drop_foreignkey_sql = complain
get_sql_flush = complain
+get_sql_sequence_reset = complain
OPERATOR_MAPPING = {}
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
index 3928776bb9..3424366878 100644
--- a/django/db/backends/mysql/base.py
+++ b/django/db/backends/mysql/base.py
@@ -233,6 +233,11 @@ def get_sql_flush(style, tables, sequences):
else:
return []
+def get_sql_sequence_reset(style, model_list):
+ "Returns a list of the SQL statements to reset sequences for the given models."
+ # No sequence reset required
+ return []
+
OPERATOR_MAPPING = {
'exact': '= %s',
'iexact': 'LIKE %s',
diff --git a/django/db/backends/mysql_old/base.py b/django/db/backends/mysql_old/base.py
index 4bd87518e8..ded0b6cbcb 100644
--- a/django/db/backends/mysql_old/base.py
+++ b/django/db/backends/mysql_old/base.py
@@ -217,6 +217,11 @@ def get_sql_flush(style, tables, sequences):
else:
return []
+def get_sql_sequence_reset(style, model_list):
+ "Returns a list of the SQL statements to reset sequences for the given models."
+ # No sequence reset required
+ return []
+
OPERATOR_MAPPING = {
'exact': '= %s',
'iexact': 'LIKE %s',
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 1f78df0bf7..e95fffcf76 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -81,7 +81,6 @@ class FormatStylePlaceholderCursor(Database.Cursor):
you'll need to use "%%s".
"""
def _rewrite_args(self, query, params=None):
- from django.db.models import LazyDate
if params is None:
params = []
else:
@@ -92,8 +91,6 @@ class FormatStylePlaceholderCursor(Database.Cursor):
params[i] = param.encode('utf-8')
except UnicodeError:
params[i] = str(param)
- if type(param) == LazyDate:
- params[i] = param.__get_value__()
args = [(':arg%d' % i) for i in range(len(params))]
query = query % tuple(args)
# cx_Oracle cannot execute a query with the closing ';'
@@ -226,6 +223,11 @@ def get_sequence_name(table):
name_length = get_max_name_length() - 3
return '%s_SQ' % util.truncate_name(table, name_length).upper()
+def get_sql_sequence_reset(style, model_list):
+ "Returns a list of the SQL statements to reset sequences for the given models."
+ # TODO: Run ALTER statements to reset Oracle sequence w/out dropping it.
+ return []
+
def get_trigger_name(table):
name_length = get_max_name_length() - 3
return '%s_TR' % util.truncate_name(table, name_length).upper()
diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py
index 05559bd0f0..9f191f27a3 100644
--- a/django/db/backends/postgresql/base.py
+++ b/django/db/backends/postgresql/base.py
@@ -231,6 +231,31 @@ def get_sql_flush(style, tables, sequences):
else:
return []
+def get_sql_sequence_reset(style, model_list):
+ "Returns a list of the SQL statements to reset sequences for the given models."
+ from django.db import models
+ output = []
+ for model in model_list:
+ for f in model._meta.fields:
+ if isinstance(f, models.AutoField):
+ output.append("%s setval('%s', (%s max(%s) %s %s));" % \
+ (style.SQL_KEYWORD('SELECT'),
+ style.SQL_FIELD('%s_%s_seq' % (model._meta.db_table, f.column)),
+ style.SQL_KEYWORD('SELECT'),
+ style.SQL_FIELD(quote_name(f.column)),
+ style.SQL_KEYWORD('FROM'),
+ style.SQL_TABLE(quote_name(model._meta.db_table))))
+ break # Only one AutoField is allowed per model, so don't bother continuing.
+ for f in model._meta.many_to_many:
+ output.append("%s setval('%s', (%s max(%s) %s %s));" % \
+ (style.SQL_KEYWORD('SELECT'),
+ style.SQL_FIELD('%s_id_seq' % f.m2m_db_table()),
+ style.SQL_KEYWORD('SELECT'),
+ style.SQL_FIELD(quote_name('id')),
+ style.SQL_KEYWORD('FROM'),
+ style.SQL_TABLE(f.m2m_db_table())))
+ return output
+
# Register these custom typecasts, because Django expects dates/times to be
# in Python's native (standard-library) datetime/time format, whereas psycopg
# use mx.DateTime by default.
diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py
index 81cee69208..25dbd7873a 100644
--- a/django/db/backends/postgresql_psycopg2/base.py
+++ b/django/db/backends/postgresql_psycopg2/base.py
@@ -188,6 +188,31 @@ def get_sql_flush(style, tables, sequences):
else:
return []
+def get_sql_sequence_reset(style, model_list):
+ "Returns a list of the SQL statements to reset sequences for the given models."
+ from django.db import models
+ output = []
+ for model in model_list:
+ for f in model._meta.fields:
+ if isinstance(f, models.AutoField):
+ output.append("%s setval('%s', (%s max(%s) %s %s));" % \
+ (style.SQL_KEYWORD('SELECT'),
+ style.SQL_FIELD('%s_%s_seq' % (model._meta.db_table, f.column)),
+ style.SQL_KEYWORD('SELECT'),
+ style.SQL_FIELD(quote_name(f.column)),
+ style.SQL_KEYWORD('FROM'),
+ style.SQL_TABLE(quote_name(model._meta.db_table))))
+ break # Only one AutoField is allowed per model, so don't bother continuing.
+ for f in model._meta.many_to_many:
+ output.append("%s setval('%s', (%s max(%s) %s %s));" % \
+ (style.SQL_KEYWORD('SELECT'),
+ style.SQL_FIELD('%s_id_seq' % f.m2m_db_table()),
+ style.SQL_KEYWORD('SELECT'),
+ style.SQL_FIELD(quote_name('id')),
+ style.SQL_KEYWORD('FROM'),
+ style.SQL_TABLE(f.m2m_db_table())))
+ return output
+
OPERATOR_MAPPING = {
'exact': '= %s',
'iexact': 'ILIKE %s',
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
index 15f73ae4e7..d518a83585 100644
--- a/django/db/backends/sqlite3/base.py
+++ b/django/db/backends/sqlite3/base.py
@@ -188,6 +188,11 @@ def get_sql_flush(style, tables, sequences):
# get_sql_flush() implementations). Just return SQL at this point
return sql
+def get_sql_sequence_reset(style, model_list):
+ "Returns a list of the SQL statements to reset sequences for the given models."
+ # No sequence reset required
+ return []
+
def _sqlite_date_trunc(lookup_type, dt):
try:
dt = util.typecast_timestamp(dt)
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 13832f95a3..ccd60023f9 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -27,32 +27,3 @@ def permalink(func):
viewname = bits[0]
return reverse(bits[0], None, *bits[1:3])
return inner
-
-class LazyDate(object):
- """
- Use in limit_choices_to to compare the field to dates calculated at run time
- instead of when the model is loaded. For example::
-
- ... limit_choices_to = {'date__gt' : models.LazyDate(days=-3)} ...
-
- which will limit the choices to dates greater than three days ago.
- """
- def __init__(self, **kwargs):
- self.delta = datetime.timedelta(**kwargs)
-
- def __str__(self):
- return str(self.__get_value__())
-
- def __repr__(self):
- return "" % self.delta
-
- def __get_value__(self):
- return (datetime.datetime.now() + self.delta).date()
-
- def __getattr__(self, attr):
- if attr == 'delta':
- # To fix ticket #3377. Note that normal accesses to LazyDate.delta
- # (after construction) will still work, because they don't go
- # through __getattr__). This is mainly needed for unpickling.
- raise AttributeError
- return getattr(self.__get_value__(), attr)
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index cb167004bc..657ac4d47f 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -782,7 +782,7 @@ class PhoneNumberField(IntegerField):
validators.isValidPhone(field_data, all_data)
def formfield(self, **kwargs):
- from django.contrib.localflavor.usa.forms import USPhoneNumberField
+ from django.contrib.localflavor.us.forms import USPhoneNumberField
defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
defaults.update(kwargs)
return USPhoneNumberField(**defaults)
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 28ad4310ff..fcbe299399 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -855,6 +855,8 @@ def parse_lookup(kwarg_items, opts):
# all uses of None as a query value.
if lookup_type != 'exact':
raise ValueError, "Cannot use None as a query value"
+ elif callable(value):
+ value = value()
joins2, where2, params2 = lookup_inner(path, lookup_type, value, opts, opts.db_table, None)
joins.update(joins2)
diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py
index 8d292673a5..f701faa35d 100644
--- a/django/newforms/widgets.py
+++ b/django/newforms/widgets.py
@@ -121,6 +121,12 @@ class FileInput(Input):
input_type = 'file'
class Textarea(Widget):
+ def __init__(self, attrs=None):
+ # The 'rows' and 'cols' attributes are required for HTML correctness.
+ self.attrs = {'cols': '40', 'rows': '10'}
+ if attrs:
+ self.attrs.update(attrs)
+
def render(self, name, value, attrs=None):
if value is None: value = ''
value = smart_unicode(value)
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
index 9397789d6a..aa315b5292 100644
--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@@ -132,6 +132,7 @@ class RssFeed(SyndicationFeed):
handler.addQuickElement(u"category", cat)
if self.feed['feed_copyright'] is not None:
handler.addQuickElement(u"copyright", self.feed['feed_copyright'])
+ handler.addQuickElement(u"lastBuildDate", rfc2822_date(self.latest_post_date()).decode('ascii'))
self.write_items(handler)
self.endChannelElement(handler)
handler.endElement(u"rss")
diff --git a/django/views/debug.py b/django/views/debug.py
index 77b6c2fac2..b49a98a864 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -144,6 +144,7 @@ def technical_404_response(request, exception):
t = Template(TECHNICAL_404_TEMPLATE, name='Technical 404 template')
c = Context({
'root_urlconf': settings.ROOT_URLCONF,
+ 'request_path': request.path[1:], # Trim leading slash
'urlpatterns': tried,
'reason': str(exception),
'request': request,
@@ -591,7 +592,7 @@ TECHNICAL_404_TEMPLATE = """
{{ pattern|escape }}
{% endfor %}
-
The current URL, {{ request.path|escape }}, didn't match any of these.
+
The current URL, {{ request_path|escape }}, didn't match any of these.
{% else %}
{{ reason|escape }}
{% endif %}
diff --git a/django/views/generic/simple.py b/django/views/generic/simple.py
index 355bd25ef8..69a494931e 100644
--- a/django/views/generic/simple.py
+++ b/django/views/generic/simple.py
@@ -1,8 +1,8 @@
from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.template import loader, RequestContext
from django.http import HttpResponse, HttpResponsePermanentRedirect, HttpResponseGone
-def direct_to_template(request, template, extra_context={}, **kwargs):
+def direct_to_template(request, template, extra_context={}, mimetype=None, **kwargs):
"""
Render a given template with any extra URL parameters in the context as
``{{ params }}``.
@@ -13,7 +13,9 @@ def direct_to_template(request, template, extra_context={}, **kwargs):
dictionary[key] = value()
else:
dictionary[key] = value
- return render_to_response(template, dictionary, context_instance=RequestContext(request))
+ c = RequestContext(request, dictionary)
+ t = loader.get_template(template)
+ return HttpResponse(t.render(c), mimetype=mimetype)
def redirect_to(request, url, **kwargs):
"""
diff --git a/docs/django-admin.txt b/docs/django-admin.txt
index b6028dc2a0..52ee823cc3 100644
--- a/docs/django-admin.txt
+++ b/docs/django-admin.txt
@@ -29,6 +29,9 @@ Generally, when working on a single Django project, it's easier to use
``--settings`` command line option, if you need to switch between multiple
Django settings files.
+The command-line examples throughout this document use ``django-admin.py`` to
+be consistent, but any example can use ``manage.py`` just as well.
+
Usage
=====
@@ -100,23 +103,24 @@ if you're ever curious to see the full list of defaults.
dumpdata [appname appname ...]
------------------------------
-Output to standard output all data in the database associated with the named
+Output to standard output all data in the database associated with the named
application(s).
By default, the database will be dumped in JSON format. If you want the output
-to be in another format, use the ``--format`` option (e.g., ``format=xml``).
-You may specify any Django serialization backend (including any user specified
-serialization backends named in the ``SERIALIZATION_MODULES`` setting).
+to be in another format, use the ``--format`` option (e.g., ``format=xml``).
+You may specify any Django serialization backend (including any user specified
+serialization backends named in the ``SERIALIZATION_MODULES`` setting). The
+``--indent`` option can be used to pretty-print the output.
If no application name is provided, all installed applications will be dumped.
-The output of ``dumpdata`` can be used as input for ``loaddata``.
+The output of ``dumpdata`` can be used as input for ``loaddata``.
flush
-----
-Return the database to the state it was in immediately after syncdb was
-executed. This means that all data will be removed from the database, any
+Return the database to the state it was in immediately after syncdb was
+executed. This means that all data will be removed from the database, any
post-synchronization handlers will be re-executed, and the ``initial_data``
fixture will be re-installed.
@@ -178,37 +182,37 @@ Django will search in three locations for fixtures:
3. In the literal path named by the fixture
Django will load any and all fixtures it finds in these locations that match
-the provided fixture names.
+the provided fixture names.
-If the named fixture has a file extension, only fixtures of that type
+If the named fixture has a file extension, only fixtures of that type
will be loaded. For example::
django-admin.py loaddata mydata.json
-
-would only load JSON fixtures called ``mydata``. The fixture extension
-must correspond to the registered name of a serializer (e.g., ``json`` or
+
+would only load JSON fixtures called ``mydata``. The fixture extension
+must correspond to the registered name of a serializer (e.g., ``json`` or
``xml``).
-If you omit the extension, Django will search all available fixture types
+If you omit the extension, Django will search all available fixture types
for a matching fixture. For example::
django-admin.py loaddata mydata
-
+
would look for any fixture of any fixture type called ``mydata``. If a fixture
directory contained ``mydata.json``, that fixture would be loaded
-as a JSON fixture. However, if two fixtures with the same name but different
-fixture type are discovered (for example, if ``mydata.json`` and
-``mydata.xml`` were found in the same fixture directory), fixture
-installation will be aborted, and any data installed in the call to
+as a JSON fixture. However, if two fixtures with the same name but different
+fixture type are discovered (for example, if ``mydata.json`` and
+``mydata.xml`` were found in the same fixture directory), fixture
+installation will be aborted, and any data installed in the call to
``loaddata`` will be removed from the database.
-The fixtures that are named can include directory components. These
+The fixtures that are named can include directory components. These
directories will be included in the search path. For example::
django-admin.py loaddata foo/bar/mydata.json
-
-would search ``/fixtures/foo/bar/mydata.json`` for each installed
-application, ``/foo/bar/mydata.json`` for each directory in
+
+would search ``/fixtures/foo/bar/mydata.json`` for each installed
+application, ``/foo/bar/mydata.json`` for each directory in
``FIXTURE_DIRS``, and the literal path ``foo/bar/mydata.json``.
Note that the order in which fixture files are processed is undefined. However,
@@ -217,16 +221,18 @@ one fixture can reference data in another fixture. If the database backend
supports row-level constraints, these constraints will be checked at the
end of the transaction.
+The ``dumpdata`` command can be used to generate input for ``loaddata``.
+
.. admonition:: MySQL and Fixtures
- Unfortunately, MySQL isn't capable of completely supporting all the
+ Unfortunately, MySQL isn't capable of completely supporting all the
features of Django fixtures. If you use MyISAM tables, MySQL doesn't
- support transactions or constraints, so you won't get a rollback if
- multiple transaction files are found, or validation of fixture data.
- If you use InnoDB tables, you won't be able to have any forward
- references in your data files - MySQL doesn't provide a mechanism to
- defer checking of row constraints until a transaction is committed.
-
+ support transactions or constraints, so you won't get a rollback if
+ multiple transaction files are found, or validation of fixture data.
+ If you use InnoDB tables, you won't be able to have any forward
+ references in your data files - MySQL doesn't provide a mechanism to
+ defer checking of row constraints until a transaction is committed.
+
reset [appname appname ...]
---------------------------
Executes the equivalent of ``sqlreset`` for the given appnames.
@@ -366,7 +372,7 @@ Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given appnames.
sqlsequencereset [appname appname ...]
----------------------------------------------
-Prints the SQL statements for resetting PostgreSQL sequences for the given
+Prints the SQL statements for resetting sequences for the given
appnames.
See http://simon.incutio.com/archive/2004/04/21/postgres for more information.
@@ -397,8 +403,8 @@ this command to install the default apps.
If you're installing the ``django.contrib.auth`` application, ``syncdb`` will
give you the option of creating a superuser immediately.
-``syncdb`` will also search for and install any fixture named ``initial_data``.
-See the documentation for ``loaddata`` for details on the specification of
+``syncdb`` will also search for and install any fixture named ``initial_data``.
+See the documentation for ``loaddata`` for details on the specification of
fixture data files.
test
@@ -471,7 +477,7 @@ Example usage::
django-admin.py dumpdata --indent=4
-Specifies the number of spaces that will be used for indentation when
+Specifies the number of spaces that will be used for indentation when
pretty-printing output. By default, output will *not* be pretty-printed.
Pretty-printing will only be enabled if the indent option is provided.
@@ -512,7 +518,8 @@ and `2` is verbose output.
------------
Example usage::
- django-admin.py manage.py --adminmedia=/tmp/new-admin-style/
+
+ django-admin.py --adminmedia=/tmp/new-admin-style/
Tells Django where to find the various CSS and JavaScript files for the admin
interface when running the development server. Normally these files are served
diff --git a/docs/documentation.txt b/docs/documentation.txt
index bacfb176b1..e72dd47ba1 100644
--- a/docs/documentation.txt
+++ b/docs/documentation.txt
@@ -42,25 +42,25 @@ On the Web
The most recent version of the Django documentation lives at
http://www.djangoproject.com/documentation/ . These HTML pages are generated
-automatically from the text files in source control every 15 minutes. That
-means they reflect the "latest and greatest" in Django -- they include the very
-latest corrections and additions, and they discuss the latest Django features,
+automatically from the text files in source control. That means they reflect
+the "latest and greatest" in Django -- they include the very latest
+corrections and additions, and they discuss the latest Django features,
which may only be available to users of the Django development version. (See
"Differences between versions" below.)
-A key advantage of the Web-based documentation is the comment section at the
-bottom of each document. This is an area for anybody to submit changes,
-corrections and suggestions about the given document. The Django developers
-frequently monitor the comments there and use them to improve the documentation
-for everybody.
+We encourage you to help improve the docs by submitting changes, corrections
+and suggestions in the `ticket system`_. The Django developers actively monitor
+the ticket system and use your feedback to improve the documentation for
+everybody.
-We encourage you to help improve the docs: it's easy! Note, however, that
-comments should explicitly relate to the documentation, rather than asking
-broad tech-support questions. If you need help with your particular Django
-setup, try the `django-users mailing list`_ instead of posting a comment to the
-documentation.
+Note, however, that tickets should explicitly relate to the documentation,
+rather than asking broad tech-support questions. If you need help with your
+particular Django setup, try the `django-users mailing list`_ or the
+`#django IRC channel`_ instead.
+.. _ticket system: http://code.djangoproject.com/simpleticket?component=Documentation
.. _django-users mailing list: http://groups.google.com/group/django-users
+.. _#django IRC channel: irc://irc.freenode.net/django
In plain text
-------------
@@ -134,14 +134,6 @@ We follow this policy:
frozen document that says "These docs are frozen for Django version XXX"
and links to the current version of that document.
- * Once a document is frozen for a Django release, we remove comments from
- that page, in favor of having comments on the latest version of that
- document. This is for the sake of maintainability and usability, so that
- users have one, and only one, place to leave comments on a particular
- document. We realize that some people may be stuck on a previous version
- of Django, but we believe the usability problems with multiple versions
- of a document the outweigh the benefits.
-
* The `main documentation Web page`_ includes links to documentation for
all previous versions.
diff --git a/docs/legacy_databases.txt b/docs/legacy_databases.txt
index 8230c11f61..3e2753baca 100644
--- a/docs/legacy_databases.txt
+++ b/docs/legacy_databases.txt
@@ -39,11 +39,11 @@ Auto-generate the models
Django comes with a utility that can create models by introspecting an existing
database. You can view the output by running this command::
- django-admin.py inspectdb --settings=path.to.settings
+ python manage.py inspectdb
Save this as a file by using standard Unix output redirection::
- django-admin.py inspectdb --settings=path.to.settings > models.py
+ python manage.py inspectdb > models.py
This feature is meant as a shortcut, not as definitive model generation. See
the `django-admin.py documentation`_ for more information.
@@ -60,7 +60,7 @@ Install the core Django tables
Next, run the ``manage.py syncdb`` command to install any extra needed database
records such as admin permissions and content types::
- django-admin.py init --settings=path.to.settings
+ python manage.py syncdb
See whether it worked
=====================
diff --git a/docs/model-api.txt b/docs/model-api.txt
index a03ed09eb2..400617a012 100644
--- a/docs/model-api.txt
+++ b/docs/model-api.txt
@@ -734,10 +734,10 @@ relationship should work. All are optional:
``limit_choices_to`` A dictionary of lookup arguments and values (see
the `Database API reference`_) that limit the
available admin choices for this object. Use this
- with ``models.LazyDate`` to limit choices of objects
- by date. For example::
+ with functions from the Python ``datetime`` module
+ to limit choices of objects by date. For example::
- limit_choices_to = {'pub_date__lte': models.LazyDate()}
+ limit_choices_to = {'pub_date__lte': datetime.now}
only allows the choice of related objects with a
``pub_date`` before the current date/time to be
diff --git a/docs/modpython.txt b/docs/modpython.txt
index 31ec1efe49..37909a09fd 100644
--- a/docs/modpython.txt
+++ b/docs/modpython.txt
@@ -57,17 +57,16 @@ on it, you'll need to tell mod_python::
.. caution::
- Is you are using Windows, remember that the path will contain backslashes.
+ If you're using Windows, remember that the path will contain backslashes.
This string is passed through Python's string parser twice, so you need to
escape each backslash **twice**::
PythonPath "['c:\\\\path\\\\to\\\\project'] + sys.path"
- or use raw strings::
+ Or, use raw strings::
PythonPath "[r'c:\\path\\to\\project'] + sys.path"
-
You can also add directives such as ``PythonAutoReload Off`` for performance.
See the `mod_python documentation`_ for a full list of options.
@@ -161,7 +160,7 @@ If, however, you have no option but to serve media files on the same Apache
``VirtualHost`` as Django, here's how you can turn off mod_python for a
particular part of the site::
-
+
SetHandler None
@@ -178,7 +177,7 @@ the ``media`` subdirectory and any URL that ends with ``.jpg``, ``.gif`` or
SetEnv DJANGO_SETTINGS_MODULE mysite.settings
-
+
SetHandler None
diff --git a/docs/request_response.txt b/docs/request_response.txt
index 40f06c859f..c0272461ca 100644
--- a/docs/request_response.txt
+++ b/docs/request_response.txt
@@ -483,8 +483,8 @@ In order to use the ``Http404`` exception to its fullest, you should create a
template that is displayed when a 404 error is raised. This template should be
called ``404.html`` and located in the top level of your template tree.
-Customing error views
----------------------
+Customizing error views
+-----------------------
The 404 (page not found) view
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/syndication_feeds.txt b/docs/syndication_feeds.txt
index a64914de3f..2a09307e09 100644
--- a/docs/syndication_feeds.txt
+++ b/docs/syndication_feeds.txt
@@ -114,6 +114,9 @@ Note:
`object-relational mapper`_, ``items()`` doesn't have to return model
instances. Although you get a few bits of functionality "for free" by
using Django models, ``items()`` can return any type of object you want.
+ * If you're creating an Atom feed, rather than an RSS feed, set the
+ ``subtitle`` attribute instead of the ``description`` attribute. See
+ `Publishing Atom and RSS feeds in tandem`_, later, for an example.
One thing's left to do. In an RSS feed, each ```` has a ````,
```` and ````. We need to tell the framework what data to
@@ -298,7 +301,7 @@ Publishing Atom and RSS feeds in tandem
---------------------------------------
Some developers like to make available both Atom *and* RSS versions of their
-feeds. That's easy to do with Django: Just create a subclass of your ``feed``
+feeds. That's easy to do with Django: Just create a subclass of your ``Feed``
class and set the ``feed_type`` to something different. Then update your
URLconf to add the extra versions.
@@ -318,6 +321,20 @@ Here's a full example::
class AtomSiteNewsFeed(RssSiteNewsFeed):
feed_type = Atom1Feed
+ subtitle = RssSiteNewsFeed.description
+
+.. Note::
+ In this example, the RSS feed uses a ``description`` while the Atom feed
+ uses a ``subtitle``. That's because Atom feeds don't provide for a
+ feed-level "description," but they *do* provide for a "subtitle."
+
+ If you provide a ``description`` in your ``Feed`` class, Django will *not*
+ automatically put that into the ``subtitle`` element, because a subtitle
+ and description are not necessarily the same thing. Instead, you should
+ define a ``subtitle`` attribute.
+
+ In the above example, we simply set the Atom feed's ``subtitle`` to the
+ RSS feed's ``description``, because it's quite short already.
And the accompanying URLconf::
diff --git a/docs/tutorial02.txt b/docs/tutorial02.txt
index 2eabae96f0..e9523ebfd5 100644
--- a/docs/tutorial02.txt
+++ b/docs/tutorial02.txt
@@ -61,8 +61,8 @@ tutorial, remember?) You should see the Django admin index page:
:alt: Django admin index page
:target: http://media.djangoproject.com/img/doc/tutorial/admin02.png
-By default, you should see two types of editable content: groups and users.
-These are core features Django ships with by default.
+You should see a few other types of editable content, including groups, users
+and sites. These are core features Django ships with by default.
.. _"I can't log in" questions: ../faq/#the-admin-site
diff --git a/docs/url_dispatch.txt b/docs/url_dispatch.txt
index e6e1cb6cbf..39eed0625b 100644
--- a/docs/url_dispatch.txt
+++ b/docs/url_dispatch.txt
@@ -192,10 +192,11 @@ The remaining arguments should be tuples in this format::
url
---
-**New in development version**
-The ``url()`` function can be used instead of a tuple as an argument to
-``patterns()``. This is convenient if you wish to specify a name without the
+**New in Django development version**
+
+You can use the ``url()`` function, instead of a tuple, as an argument to
+``patterns()``. This is convenient if you want to specify a name without the
optional extra arguments dictionary. For example::
urlpatterns = patterns('',
@@ -498,26 +499,40 @@ the view prefix (as explained in "The view prefix" above) will have no effect.
Naming URL patterns
===================
-**New in development version**
+**New in Django development version**
+
+It's fairly common to use the same view function in multiple URL patterns in
+your URLconf. For example, these two URL patterns both point to the ``archive``
+view::
+
+ urlpatterns = patterns('',
+ (r'/archive/(\d{4})/$', archive),
+ (r'/archive-summary/(\d{4})/$', archive, {'summary': True}),
+ )
+
+This is completely valid, but it leads to problems when you try to do reverse
+URL matching (through the ``permalink()`` decorator or the ``{% url %}``
+template tag). Continuing this example, if you wanted to retrieve the URL for
+the ``archive`` view, Django's reverse URL matcher would get confused, because
+*two* URLpatterns point at that view.
-It is fairly common to use the same view function in multiple URL patterns in
-your URLConf. This leads to problems when you come to do reverse URL matching,
-because the ``permalink()`` decorator and ``{% url %}`` template tag use the
-name of the view function to find a match.
+To solve this problem, Django supports **named URL patterns**. That is, you can
+give a name to a URL pattern in order to distinguish it from other patterns
+using the same view and parameters. Then, you can use this name in reverse URL
+matching.
-To solve this problem, you can give a name to each of your URL patterns in
-order to distinguish them from other patterns using the same views and
-parameters. You can then use this name wherever you would otherwise use the
-name of the view function. For example, if you URLConf contains::
+Here's the above example, rewritten to used named URL patterns::
urlpatterns = patterns('',
url(r'/archive/(\d{4})/$', archive, name="full-archive"),
url(r'/archive-summary/(\d{4})/$', archive, {'summary': True}, "arch-summary"),
)
-...you could refer to either the summary archive view in a template as::
+With these names in place (``full-archive`` and ``arch-summary``), you can
+target each pattern individually by using its name::
{% url arch-summary 1945 %}
+ {% url full-archive 2007 %}
Even though both URL patterns refer to the ``archive`` view here, using the
``name`` parameter to ``url()`` allows you to tell them apart in templates.
@@ -527,11 +542,12 @@ not restricted to valid Python names.
.. note::
- Make sure that when you name your URLs, you use names that are unlikely to
- clash with any other application's choice of names. If you call your URL
- pattern *comment* and another application does the same thing, there is no
- guarantee which URL will be inserted into your template when you use this
- name. Putting a prefix on your URL names, perhaps derived from
- the application name, will decrease the chances of collision. Something
- like *myapp-comment* is recommended over simply *comment*.
+ When you name your URL patterns, make sure you use names that are unlikely
+ to clash with any other application's choice of names. If you call your URL
+ pattern ``comment``, and another application does the same thing, there's
+ no guarantee which URL will be inserted into your template when you use
+ this name.
+ Putting a prefix on your URL names, perhaps derived from the application
+ name, will decrease the chances of collision. We recommend something like
+ ``myapp-comment`` instead of ``comment``.
diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py
index d91f1d2d45..2757787571 100644
--- a/tests/modeltests/model_forms/models.py
+++ b/tests/modeltests/model_forms/models.py
@@ -159,7 +159,7 @@ represented by a ChoiceField.
-