Changeset 3940

Timestamp:

10/26/06 21:11:46 (2 years ago)

Author:

clong

Message:

[per-object-permissions] Merged to trunk [3938]

Files:

• django/branches/per-object-permissions/AUTHORS (modified) (10 diffs)
• django/branches/per-object-permissions/django/bin/daily_cleanup.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/conf/global_settings.py (modified) (4 diffs)
• django/branches/per-object-permissions/django/conf/locale/cs/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/cs/LC_MESSAGES/django.po (modified) (30 diffs)
• django/branches/per-object-permissions/django/conf/locale/da/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/da/LC_MESSAGES/django.po (modified) (74 diffs)
• django/branches/per-object-permissions/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/de/LC_MESSAGES/django.po (modified) (56 diffs)
• django/branches/per-object-permissions/django/conf/locale/en/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/en/LC_MESSAGES/django.po (modified) (45 diffs)
• django/branches/per-object-permissions/django/conf/locale/ja/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/ja/LC_MESSAGES/djangojs.po (modified) (2 diffs)
• django/branches/per-object-permissions/django/conf/locale/ja/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/ja/LC_MESSAGES/django.po (modified) (57 diffs)
• django/branches/per-object-permissions/django/conf/locale/tr (copied) (copied from django/trunk/django/conf/locale/tr)
• django/branches/per-object-permissions/django/conf/locale/tr/LC_MESSAGES (copied) (copied from django/trunk/django/conf/locale/tr/LC_MESSAGES)
• django/branches/per-object-permissions/django/conf/locale/tr/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/tr/LC_MESSAGES/djangojs.mo)
• django/branches/per-object-permissions/django/conf/locale/tr/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/tr/LC_MESSAGES/djangojs.po)
• django/branches/per-object-permissions/django/conf/locale/tr/LC_MESSAGES/django.mo (copied) (copied from django/trunk/django/conf/locale/tr/LC_MESSAGES/django.mo)
• django/branches/per-object-permissions/django/conf/locale/tr/LC_MESSAGES/django.po (copied) (copied from django/trunk/django/conf/locale/tr/LC_MESSAGES/django.po)
• django/branches/per-object-permissions/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po (modified) (4 diffs)
• django/branches/per-object-permissions/django/conf/locale/zh_CN/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/zh_CN/LC_MESSAGES/django.po (modified) (2 diffs)
• django/branches/per-object-permissions/django/contrib/admin/templates/admin_doc/view_detail.html (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/templates/admin/login.html (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/templatetags/admin_modify.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/views/auth.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/views/decorators.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/views/main.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/auth/create_superuser.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/auth/decorators.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/auth/forms.py (modified) (5 diffs)
• django/branches/per-object-permissions/django/contrib/auth/models.py (modified) (5 diffs)
• django/branches/per-object-permissions/django/contrib/comments/views/comments.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/contrib/sitemaps/templates/sitemap_index.xml (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/sitemaps/templates/sitemap.xml (modified) (2 diffs)
• django/branches/per-object-permissions/django/core/handlers/base.py (modified) (6 diffs)
• django/branches/per-object-permissions/django/core/handlers/modpython.py (modified) (5 diffs)
• django/branches/per-object-permissions/django/core/handlers/wsgi.py (modified) (3 diffs)
• django/branches/per-object-permissions/django/core/management.py (modified) (23 diffs)
• django/branches/per-object-permissions/django/core/servers/basehttp.py (modified) (1 diff)
• django/branches/per-object-permissions/django/core/urlresolvers.py (modified) (1 diff)
• django/branches/per-object-permissions/django/core/validators.py (modified) (5 diffs)
• django/branches/per-object-permissions/django/db/backends/mysql/base.py (modified) (4 diffs)
• django/branches/per-object-permissions/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/branches/per-object-permissions/django/db/models/fields/__init__.py (modified) (4 diffs)
• django/branches/per-object-permissions/django/db/models/fields/related.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/db/models/manipulators.py (modified) (3 diffs)
• django/branches/per-object-permissions/django/db/models/query.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/forms/__init__.py (modified) (4 diffs)
• django/branches/per-object-permissions/django/middleware/common.py (modified) (3 diffs)
• django/branches/per-object-permissions/django/template/defaulttags.py (modified) (3 diffs)
• django/branches/per-object-permissions/django/template/__init__.py (modified) (6 diffs)
• django/branches/per-object-permissions/django/test/client.py (modified) (15 diffs)
• django/branches/per-object-permissions/django/test/doctest.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/utils/itercompat.py (copied) (copied from django/trunk/django/utils/itercompat.py)
• django/branches/per-object-permissions/django/utils/simplejson/scanner.py (modified) (1 diff)
• django/branches/per-object-permissions/django/views/debug.py (modified) (1 diff)
• django/branches/per-object-permissions/django/views/generic/create_update.py (modified) (3 diffs)
• django/branches/per-object-permissions/docs/admin_css.txt (modified) (1 diff)
• django/branches/per-object-permissions/docs/apache_auth.txt (modified) (1 diff)
• django/branches/per-object-permissions/docs/api_stability.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/authentication.txt (modified) (8 diffs)
• django/branches/per-object-permissions/docs/contributing.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/db-api.txt (modified) (5 diffs)
• django/branches/per-object-permissions/docs/django-admin.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/faq.txt (modified) (3 diffs)
• django/branches/per-object-permissions/docs/forms.txt (modified) (9 diffs)
• django/branches/per-object-permissions/docs/generic_views.txt (modified) (8 diffs)
• django/branches/per-object-permissions/docs/install.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/model-api.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/release_notes_0.95.txt (modified) (1 diff)
• django/branches/per-object-permissions/docs/request_response.txt (modified) (1 diff)
• django/branches/per-object-permissions/docs/serialization.txt (modified) (8 diffs)
• django/branches/per-object-permissions/docs/settings.txt (modified) (3 diffs)
• django/branches/per-object-permissions/docs/templates_python.txt (modified) (6 diffs)
• django/branches/per-object-permissions/docs/templates.txt (modified) (4 diffs)
• django/branches/per-object-permissions/docs/testing.txt (modified) (3 diffs)
• django/branches/per-object-permissions/docs/tutorial02.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/tutorial03.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/tutorial04.txt (modified) (1 diff)
• django/branches/per-object-permissions/ez_setup.py (deleted)
• django/branches/per-object-permissions/MANIFEST.in (copied) (copied from django/trunk/MANIFEST.in)
• django/branches/per-object-permissions/setup.py (modified) (2 diffs)
• django/branches/per-object-permissions/tests/modeltests/basic/models.py (modified) (1 diff)
• django/branches/per-object-permissions/tests/modeltests/custom_pk/models.py (modified) (1 diff)
• django/branches/per-object-permissions/tests/modeltests/one_to_one/models.py (modified) (2 diffs)
• django/branches/per-object-permissions/tests/regressiontests/dateformat/tests.py (modified) (4 diffs)
• django/branches/per-object-permissions/tests/regressiontests/initial_sql_regress/sql/simple.sql (modified) (1 diff)
• django/branches/per-object-permissions/tests/regressiontests/null_queries (copied) (copied from django/trunk/tests/regressiontests/null_queries)
• django/branches/per-object-permissions/tests/regressiontests/null_queries/__init__.py (copied) (copied from django/trunk/tests/regressiontests/null_queries/__init__.py)
• django/branches/per-object-permissions/tests/regressiontests/null_queries/models.py (copied) (copied from django/trunk/tests/regressiontests/null_queries/models.py)
• django/branches/per-object-permissions/tests/regressiontests/templates/tests.py (modified) (6 diffs)

django/branches/per-object-permissions/AUTHORS

@@ -43 +43 @@
-answer newbie questions, and generally made Django that much better:
-
+    adurdin@gmail.com
-    akaihola
-    Andreas
@@ -64 +65 @@
-    crankycoder@gmail.com
-    Matt Croydon <http://www.postneo.com/>
+    dackze+django@gmail.com
-    Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
-    Jason Davies (Esaj) <http://www.jasondavies.com/>
@@ -74 +76 @@
-    Andy Dustman <farcepest@gmail.com>
-    Clint Ecker
+    Enrico <rico.bl@gmail.com>
-    favo@exoweb.net
-    gandalf@owca.info
@@ -81 +84 @@
-    Espen Grindhaug <http://grindhaug.org/>
-    Brant Harris
+    Hawkeye
-    heckj@mac.com
+    Joel Heenan <joelh-django@planetjoel.com>
-    hipertracker@gmail.com
-    Ian Holsman <http://feh.holsman.net/>
@@ -95 +100 @@
-    Sune Kirkeby <http://ibofobi.dk/>
-    Cameron Knight (ckknight)
+    Meir Kriheli <http://mksoft.co.il/>
-    Bruce Kroeze <http://coderseye.com/>
-    Joseph Kocherhans
@@ -101 +107 @@
-    Stuart Langridge <http://www.kryogenix.org/>
-    Eugene Lazutkin <http://lazutkin.com/blog/>
-
+ <falsetru@gmail.com>
-    Christopher Lenz <http://www.cmlenz.net/>
+    lerouxb@gmail.com
-    limodou
+    mattmcc
-    Martin Maney <http://www.chipy.org/Martin_Maney>
-    Manuzhai
@@ -110 +118 @@
-    mattycakes@gmail.com
-    Jason McBrayer <http://www.carcosa.net/jason/>
+    mccutchen@gmail.com
-    michael.mcewan@gmail.com
-    mmarshall
@@ -115 +124 @@
-    Robin Munn <http://www.geekforgod.com/>
-    Nebojša Dorđević
+    Fraser Nevett <mail@nevett.org>
-    Sam Newman <http://www.magpiebrain.com/>
-    Neal Norwitz <nnorwitz@google.com>
@@ -142 +152 @@
-    Swaroop C H <http://www.swaroopch.info>
-    Aaron Swartz <http://www.aaronsw.com/>
+    Tyson Tate <tyson@fallingbullets.com>
-    Tom Tobin
-    Tom Insam
@@ -151 +162 @@
-    Dan Watson <http://theidioteque.net/>
-    Rachel Willmer <http://www.willmer.com/kb/>
+    Gary Wilson <gary.wilson@gmail.com>
-    wojtek
-    ye7cakf02@sneakemail.com
+    ymasuda@ethercube.com
-    Cheng Zhang
-

django/branches/per-object-permissions/django/bin/daily_cleanup.py

@@ -1 @@
-
+
+
+
+
+
+
-
-from django.db import backend, connection, transaction
-
-DOCUMENTATION_DIRECTORY = '/home/html/documentation/'
-
-def clean_up():
@@ -9 +12 @@
-    cursor = connection.cursor()
-    cursor.execute("DELETE FROM %s WHERE %s < NOW()" % \
-
-
-
+
-    transaction.commit_unless_managed()
-

django/branches/per-object-permissions/django/conf/global_settings.py

@@ -57 +57 @@
-    ('nl', gettext_noop('Dutch')),
-    ('no', gettext_noop('Norwegian')),
+    ('pl', gettext_noop('Polish')),
-    ('pt-br', gettext_noop('Brazilian')),
-    ('ro', gettext_noop('Romanian')),
@@ -65 +66 @@
-    ('sv', gettext_noop('Swedish')),
-    ('ta', gettext_noop('Tamil')),
+    ('tr', gettext_noop('Turkish')),
-    ('uk', gettext_noop('Ukrainian')),
-    ('zh-cn', gettext_noop('Simplified Chinese')),
@@ -223 +225 @@
-MONTH_DAY_FORMAT = 'F j'
-
-# Whether to enable Psyco, which optimizes Python code. Requires Psyco.
-# http://psyco.sourceforge.net/
-ENABLE_PSYCO = False
-
-# Do you want to manage transactions manually?
-# Hint: you really don't!
@@ -274 +272 @@
-
-# The profanities that will trigger a validation error in the
--
-['asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit']
+
+('asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit')
-
-# The group ID that designates which users are banned.

django/branches/per-object-permissions/django/conf/locale/cs/LC_MESSAGES/django.po

@@ -9 +9 @@
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:11+0200\n"
-05-20 22:44
-Radek Švarz <translate@svarz.cz>
+10-07 13:10
+
-"Language-Team: Czech\n"
-"MIME-Version: 1.0\n"
@@ -17 +17 @@
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Poedit-Country: CZECH REPUBLIC\n"
-"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,-1,139\n"
-
-#: contrib/comments/models.py:67
@@ -81 +80 @@
-
-#: contrib/comments/models.py:85
-289
+304
-msgid "IP address"
-msgstr "IP adresa"
@@ -215 +214 @@
-msgstr "Nelze hlasovat pro sebe"
-
-8
+7
-msgid "This rating is required because you've entered at least one other rating."
-msgstr "Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné hodnocení."
-
-2
+1
-#, python-format
-msgid ""
@@ -242 +241 @@
-"%(text)s"
-
-7
+6
-#, python-format
-msgid ""
@@ -253 +252 @@
-"%(text)s"
-
-9
+8
-#: contrib/comments/views/comments.py:280
-msgid "Only POSTs are allowed"
-msgstr "Je povolená pouze metoda POST"
-
-3
+2
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
-msgstr "Jedno nebo více povinných polí nebylo vyplněné"
-
-7
+6
-#: contrib/comments/views/comments.py:286
-msgid "Somebody tampered with the comment form (security violation)"
-msgstr "Někdo falšoval formulář komentáře (bezpečnostní narušení)"
-
-7
+6
-#: contrib/comments/views/comments.py:292
-msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
@@ -285 +284 @@
-
-#: 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 "Zapomenuté heslo?"
-
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-3
+5
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
@@ -314 +304 @@
-msgstr "Odhlásit se"
-
+#: 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 "Zapomenuté heslo?"
+
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
@@ -332 +331 @@
-msgstr "Zařadit fotografii"
-
-7
+8
-#: contrib/comments/templates/comments/freeform.html:5
-msgid "Comment:"
-msgstr "Komentář:"
-
-2
-9
+5
+10
-msgid "Preview comment"
-msgstr "Náhled komentáře"
@@ -358 +357 @@
-#: contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143
+#: contrib/admin/filterspecs.py:169
-msgid "All"
-msgstr "Vše"
@@ -421 +421 @@
-msgstr "log záznamy"
-
-28
+30
-msgid "All dates"
-msgstr "Všechna data"
-
-
-
-
+
+
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
-msgstr "Prosíme, vložte správné uživatelské jméno a heslo. Poznámka - u obou položek se rozlišuje velikost písmen."
-
-3
+4
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Přihlášení"
-
-1
+2
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše podání je uloženo."
-
-8
+9
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, zapněte cookies, obnovte tuto stránku a zkuste znovu."
-
-2
+3
-msgid "Usernames cannot contain the '@' character."
-msgstr "Uživatelská jména nemohou obsahovat znak '@'."
-
-4
+5
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'."
-
-6
+3
-msgid "Site administration"
-msgstr "Django správa"
-
-
+
+
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně přidán."
-
-
-
+
+
+
-msgid "You may edit it again below."
-msgstr "Můžete to opět upravit níže."
-
-2
-7
+1
+6
-#, python-format
-msgid "You may add another %s below."
-msgstr "Můžete přidat další %s níže."
-
-90
+89
-#, python-format
-msgid "Add %s"
-msgstr "%s: přidat"
-
-6
+5
-#, python-format
-msgid "Added %s."
-msgstr "Záznam %s byl přidán."
-
-6
-8
-40
+5
+7
+39
-msgid "and"
-msgstr "a"
-
-8
+7
-#, python-format
-msgid "Changed %s."
-msgstr "%s: změněno"
-
-40
+39
-#, python-format
-msgid "Deleted %s."
-msgstr "Záznam %s byl smazán."
-
-3
+2
-msgid "No fields changed."
-msgstr "Nebyly změněny žádné pole."
-
-6
+5
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" byl úspěšně změněn."
-
-4
+3
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže."
-
-2
+1
-#, python-format
-msgid "Change %s"
-msgstr "%s: změnit"
-
-0
+3
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Jedno nebo více %(fieldname)s z %(name)s: %(obj)s"
-
-5
+8
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Jedno nebo více %(fieldname)s z %(name)s:"
-
-08
+11
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně smazán."
-
-1
+4
-msgid "Are you sure?"
-msgstr "Jste si jist(á)?"
-
-3
+6
-#, python-format
-msgid "Change history: %s"
-msgstr "Historie změn: %s"
-
-65
+70
-#, python-format
-msgid "Select %s"
-msgstr "Vybrat %s"
-
-65
+70
-#, python-format
-msgid "Select %s to change"
-msgstr "Vyberte %s pro změnu"
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Integer"
-msgstr "Celé číslo"
-
-78
+92
-msgid "Boolean (Either True or False)"
-msgstr "Boolean (buď Ano (True), nebo Ne (False))"
-
-79
-296
+93
+311
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Text (maximálně %(maxlength)s znaků)"
-
-80
+94
-msgid "Comma-separated integers"
-msgstr "Celá čísla oddělená čárkou"
-
-81
+95
-msgid "Date (without time)"
-msgstr "Datum (bez času)"
-
-82
+96
-msgid "Date (with time)"
-msgstr "Datum (s časem)"
-
-83
+97
-msgid "E-mail address"
-msgstr "E-mailová adresa"
-
-
-
+
+
+
-msgid "File path"
-msgstr "Cesta k souboru"
-
-285
+300
-msgid "Decimal number"
-msgstr "Desetiné číslo"
-
-291
+306
-msgid "Boolean (Either True, False or None)"
-msgstr "Boolean (buď Ano (True), Ne (False), nebo Nic (None))"
-
-292
+307
-msgid "Relation to parent model"
-msgstr "V relaci k rodičovskému modelu"
-
-293
+308
-msgid "Phone number"
-msgstr "Telefonní číslo"
-
-298
+313
-msgid "Text"
-msgstr "Text"
-
-299
+314
-msgid "Time"
-msgstr "Čas"
-
-00
+15
-#: contrib/flatpages/models.py:7
-msgid "URL"
-msgstr "URL"
-
-01
+16
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stát US (2 velké znaky)"
-
-02
+17
-msgid "XML text"
-msgstr "text XML"
-
+#: contrib/admin/views/doc.py:343
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s pravděpodobně není objekt urlpattern"
+
+#: contrib/admin/views/auth.py:28
+msgid "Add user"
+msgstr "Přidat uživatele"
+
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-3
+5
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
@@ -642 +717 @@
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-3
+5
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
@@ -663 +738 @@
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:6
-28
+30
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/change_form.html:13
+#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
@@ -738 +814 @@
-msgstr "Dostupné modely v aplikaci %(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
@@ -772 +853 @@
-msgstr "<a href=\"/password_reset/\">Zapomněl(a) jste své heslo?</a>"
-
-3
+5
-msgid "Welcome,"
-msgstr "Vítejte,"
@@ -783 +864 @@
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
-
-
+escaped_
+escaped_
-
-#: contrib/admin/templates/admin/delete_confirmation.html:21
-#, python-format
-
-
+escaped_
+escaped_
-
-#: contrib/admin/templates/admin/delete_confirmation.html:26
@@ -797 +878 @@
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-
-Od %(title)s
+filter_
+ Dle %(filter_title)s 
-
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "Provést"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] "1 výsledek"
+msgstr[1] "%(counter)s výsledky"
+msgstr[2] "%(counter)s výsledků"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "celkem %(full_result_count)s"
+
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Zobrazit všechny"
+
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Filtr"
-
-#: contrib/admin/templates/admin/change_form.html:21
@@ -838 +940 @@
-msgid "Save"
-msgstr "Uložit"
+
+#: 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 "Něco není v pořádku s Vaší instalací databáze. Ujistěte se, že byly vytvořeny odpovídající tabulky databáze a že databáze je přístupná pro čtení daným databázovým uživatelem."
+
+#: 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 "Nejdříve vložte uživatelské jméno a heslo. Poté budete moci upravovat více uživatelských možností."
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
+msgid "Password"
+msgstr "Heslo"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+msgid "Password (again)"
+msgstr "Heslo (znova)"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+msgid "Enter the same password as above, for verification."
+msgstr "Pro ověření vložte stejné heslo znovu."
-
-#: contrib/admin/templates/registration/password_change_done.html:4
@@ -1032 +1158 @@
-msgstr "Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na 'http://'."
-