Django

Code

Changeset 3918

Show
Ignore:
Timestamp:
10/24/06 02:49:37 (2 years ago)
Author:
rmunn
Message:

sqlalchemy: Merged revisions 3832 to 3917 from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/sqlalchemy/AUTHORS

    r3832 r3918  
    6565    crankycoder@gmail.com 
    6666    Matt Croydon <http://www.postneo.com/> 
     67    dackze+django@gmail.com 
    6768    Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/> 
    6869    Jason Davies (Esaj) <http://www.jasondavies.com/> 
     
    7576    Andy Dustman <farcepest@gmail.com> 
    7677    Clint Ecker 
     78    Enrico <rico.bl@gmail.com> 
    7779    favo@exoweb.net 
    7880    gandalf@owca.info 
     
    8385    Brant Harris 
    8486    heckj@mac.com 
     87    Joel Heenan <joelh-django@planetjoel.com> 
    8588    hipertracker@gmail.com 
    8689    Ian Holsman <http://feh.holsman.net/> 
     
    9699    Sune Kirkeby <http://ibofobi.dk/> 
    97100    Cameron Knight (ckknight) 
     101    Meir Kriheli <http://mksoft.co.il/> 
    98102    Bruce Kroeze <http://coderseye.com/> 
    99103    Joseph Kocherhans 
     
    104108    Jeong-Min Lee 
    105109    Christopher Lenz <http://www.cmlenz.net/> 
     110    lerouxb@gmail.com 
    106111    limodou 
     112    mattmcc 
    107113    Martin Maney <http://www.chipy.org/Martin_Maney> 
    108114    Manuzhai 
     
    116122    Robin Munn <http://www.geekforgod.com/> 
    117123    Nebojša Dorđević 
     124    Fraser Nevett <mail@nevett.org> 
    118125    Sam Newman <http://www.magpiebrain.com/> 
    119126    Neal Norwitz <nnorwitz@google.com> 
     
    143150    Swaroop C H <http://www.swaroopch.info> 
    144151    Aaron Swartz <http://www.aaronsw.com/> 
     152    Tyson Tate <tyson@fallingbullets.com> 
    145153    Tom Tobin 
    146154    Tom Insam 
  • django/branches/sqlalchemy/django/bin/daily_cleanup.py

    r2809 r3918  
    1 "Daily cleanup file" 
     1""" 
     2Daily cleanup job. 
     3 
     4Can be run as a cronjob to clean out old data from the database (only expired 
     5sessions at the moment). 
     6""" 
    27 
    38from django.db import backend, connection, transaction 
    4  
    5 DOCUMENTATION_DIRECTORY = '/home/html/documentation/' 
    69 
    710def clean_up(): 
     
    912    cursor = connection.cursor() 
    1013    cursor.execute("DELETE FROM %s WHERE %s < NOW()" % \ 
    11         (backend.quote_name('core_sessions'), backend.quote_name('expire_date'))) 
    12     cursor.execute("DELETE FROM %s WHERE %s < NOW() - INTERVAL '1 week'" % \ 
    13         (backend.quote_name('registration_challenges'), backend.quote_name('request_date'))) 
     14        (backend.quote_name('django_session'), backend.quote_name('expire_date'))) 
    1415    transaction.commit_unless_managed() 
    1516 
  • django/branches/sqlalchemy/django/conf/global_settings.py

    r3832 r3918  
    5757    ('nl', gettext_noop('Dutch')), 
    5858    ('no', gettext_noop('Norwegian')), 
     59    ('pl', gettext_noop('Polish')), 
    5960    ('pt-br', gettext_noop('Brazilian')), 
    6061    ('ro', gettext_noop('Romanian')), 
     
    224225MONTH_DAY_FORMAT = 'F j' 
    225226 
    226 # Whether to enable Psyco, which optimizes Python code. Requires Psyco. 
    227 # http://psyco.sourceforge.net/ 
    228 ENABLE_PSYCO = False 
    229  
    230227# Do you want to manage transactions manually? 
    231228# Hint: you really don't! 
     
    275272 
    276273# The profanities that will trigger a validation error in the 
    277 # 'hasNoProfanities' validator. All of these should be in lower-case. 
    278 PROFANITIES_LIST = ['asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit'] 
     274# 'hasNoProfanities' validator. All of these should be in lowercase. 
     275PROFANITIES_LIST = ('asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit') 
    279276 
    280277# The group ID that designates which users are banned. 
  • django/branches/sqlalchemy/django/conf/locale/cs/LC_MESSAGES/django.po

    <
    r2975 r3918  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2006-05-16 10:11+0200\n" 
    11 "PO-Revision-Date: 2006-05-20 22:44+0100\n" 
    12 "Last-Translator: Radek Švarz <translate@svarz.cz>\n" 
     11"PO-Revision-Date: 2006-10-07 13:10+0100\n" 
     12"Last-Translator: \n" 
    1313"Language-Team: Czech\n" 
    1414"MIME-Version: 1.0\n" 
     
    1717"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" 
    1818"X-Poedit-Country: CZECH REPUBLIC\n" 
    19 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,-1,139\n" 
    2019 
    2120#: contrib/comments/models.py:67 
     
    8180 
    8281#: contrib/comments/models.py:85 
    83 #: contrib/admin/views/doc.py:289 
     82#: contrib/admin/views/doc.py:304 
    8483msgid "IP address" 
    8584msgstr "IP adresa" 
     
    215214msgstr "Nelze hlasovat pro sebe" 
    216215 
    217 #: contrib/comments/views/comments.py:28 
     216#: contrib/comments/views/comments.py:27 
    218217msgid "This rating is required because you've entered at least one other rating." 
    219218msgstr "Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné hodnocení." 
    220219 
    221 #: contrib/comments/views/comments.py:112 
     220#: contrib/comments/views/comments.py:111 
    222221#, python-format 
    223222msgid "" 
     
    242241"%(text)s" 
    243242 
    244 #: contrib/comments/views/comments.py:117 
     243#: contrib/comments/views/comments.py:116 
    245244#, python-format 
    246245msgid "" 
     
    253252"%(text)s" 
    254253 
    255 #: contrib/comments/views/comments.py:189 
     254#: contrib/comments/views/comments.py:188 
    256255#: contrib/comments/views/comments.py:280 
    257256msgid "Only POSTs are allowed" 
    258257msgstr "Je povolená pouze metoda POST" 
    259258 
    260 #: contrib/comments/views/comments.py:193 
     259#: contrib/comments/views/comments.py:192 
    261260#: contrib/comments/views/comments.py:284 
    262261msgid "One or more of the required fields wasn't submitted" 
    263262msgstr "Jedno nebo více povinných polí nebylo vyplněné" 
    264263 
    265 #: contrib/comments/views/comments.py:197 
     264#: contrib/comments/views/comments.py:196 
    266265#: contrib/comments/views/comments.py:286 
    267266msgid "Somebody tampered with the comment form (security violation)" 
    268267msgstr "Někdo falšoval formulář komentáře (bezpečnostní narušení)" 
    269268 
    270 #: contrib/comments/views/comments.py:207 
     269#: contrib/comments/views/comments.py:206 
    271270#: contrib/comments/views/comments.py:292 
    272271msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid" 
     
    285284 
    286285#: contrib/comments/templates/comments/form.html:6 
    287 #: contrib/admin/templates/admin/login.html:20 
    288 msgid "Password:" 
    289 msgstr "Heslo:" 
    290  
    291 #: contrib/comments/templates/comments/form.html:6 
    292 msgid "Forgotten your password?" 
    293 msgstr "Zapomenuté heslo?" 
    294  
    295 #: contrib/comments/templates/comments/form.html:8 
    296286#: contrib/admin/templates/admin/object_history.html:3 
    297287#: contrib/admin/templates/admin/change_list.html:5 
    298 #: contrib/admin/templates/admin/base.html:23 
     288#: contrib/admin/templates/admin/base.html:25 
    299289#: contrib/admin/templates/admin/delete_confirmation.html:3 
    300290#: contrib/admin/templates/admin/change_form.html:10 
     
    314304msgstr "Odhlásit se" 
    315305 
     306#: contrib/comments/templates/comments/form.html:8 
     307#: contrib/admin/templates/admin/login.html:20 
     308msgid "Password:" 
     309msgstr "Heslo:" 
     310 
     311#: contrib/comments/templates/comments/form.html:8 
     312msgid "Forgotten your password?" 
     313msgstr "Zapomenuté heslo?" 
     314 
    316315#: contrib/comments/templates/comments/form.html:12 
    317316msgid "Ratings" 
     
    332331msgstr "Zařadit fotografii" 
    333332 
    334 #: contrib/comments/templates/comments/form.html:27 
     333#: contrib/comments/templates/comments/form.html:28 
    335334#: contrib/comments/templates/comments/freeform.html:5 
    336335msgid "Comment:" 
    337336msgstr "Komentář:" 
    338337 
    339 #: contrib/comments/templates/comments/form.html:32 
    340 #: contrib/comments/templates/comments/freeform.html:9 
     338#: contrib/comments/templates/comments/form.html:35 
     339#: contrib/comments/templates/comments/freeform.html:10 
    341340msgid "Preview comment" 
    342341msgstr "Náhled komentáře" 
     
    358357#: contrib/admin/filterspecs.py:88 
    359358#: contrib/admin/filterspecs.py:143 
     359#: contrib/admin/filterspecs.py:169 
    360360msgid "All" 
    361361msgstr "Vše" 
     
    421421msgstr "log záznamy" 
    422422 
    423 #: contrib/admin/templatetags/admin_list.py:228 
     423#: contrib/admin/templatetags/admin_list.py:230 
    424424msgid "All dates" 
    425425msgstr "Všechna data" 
    426426 
    427 #: contrib/admin/views/decorators.py:9 
    428 #: contrib/auth/forms.py:36 
    429 #: contrib/auth/forms.py:41 
     427#: contrib/admin/views/decorators.py:10 
     428#: contrib/auth/forms.py:59 
    430429msgid "Please enter a correct username and password. Note that both fields are case-sensitive." 
    431430msgstr "Prosíme, vložte správné uživatelské jméno a heslo. Poznámka - u obou položek se rozlišuje velikost písmen." 
    432431 
    433 #: contrib/admin/views/decorators.py:23 
     432#: contrib/admin/views/decorators.py:24 
    434433#: contrib/admin/templates/admin/login.html:25 
    435434msgid "Log in" 
    436435msgstr "Přihlášení" 
    437436 
    438 #: contrib/admin/views/decorators.py:61 
     437#: contrib/admin/views/decorators.py:62 
    439438msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved." 
    440439msgstr "Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše podání je uloženo." 
    441440 
    442 #: contrib/admin/views/decorators.py:68 
     441#: contrib/admin/views/decorators.py:69 
    443442msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again." 
    444443msgstr "Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, zapněte cookies, obnovte tuto stránku a zkuste znovu." 
    445444 
    446 #: contrib/admin/views/decorators.py:82 
     445#: contrib/admin/views/decorators.py:83 
    447446msgid "Usernames cannot contain the '@' character." 
    448447msgstr "Uživatelská jména nemohou obsahovat znak '@'." 
    449448 
    450 #: contrib/admin/views/decorators.py:84 
     449#: contrib/admin/views/decorators.py:85 
    451450#, python-format 
    452451msgid "Your e-mail address is not your username. Try '%s' instead." 
    453452msgstr "Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'." 
    454453 
    455 #: contrib/admin/views/main.py:226 
     454#: contrib/admin/views/main.py:223 
    456455msgid "Site administration" 
    457456msgstr "Django správa" 
    458457 
    459 #: contrib/admin/views/main.py:260 
     458#: contrib/admin/views/main.py:257 
     459#: contrib/admin/views/auth.py:17 
    460460#, python-format 
    461461msgid "The %(name)s \"%(obj)s\" was added successfully." 
    462462msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně přidán." 
    463463 
    464 #: contrib/admin/views/main.py:264 
    465 #: contrib/admin/views/main.py:348 
     464#: contrib/admin/views/main.py:261 
     465#: contrib/admin/views/main.py:347 
     466#: contrib/admin/views/auth.py:22 
    466467msgid "You may edit it again below." 
    467468msgstr "Můžete to opět upravit níže." 
    468469 
    469 #: contrib/admin/views/main.py:272 
    470 #: contrib/admin/views/main.py:357 
     470#: contrib/admin/views/main.py:271 
     471#: contrib/admin/views/main.py:356 
    471472#, python-format 
    472473msgid "You may add another %s below." 
    473474msgstr "Můžete přidat další %s níže." 
    474475 
    475 #: contrib/admin/views/main.py:290 
     476#: contrib/admin/views/main.py:289 
    476477#, python-format 
    477478msgid "Add %s" 
    478479msgstr "%s: přidat" 
    479480 
    480 #: contrib/admin/views/main.py:336 
     481#: contrib/admin/views/main.py:335 
    481482#, python-format 
    482483msgid "Added %s." 
    483484msgstr "Záznam %s byl přidán." 
    484485 
    485 #: contrib/admin/views/main.py:336 
    486 #: contrib/admin/views/main.py:338 
    487 #: contrib/admin/views/main.py:340 
     486#: contrib/admin/views/main.py:335 
     487#: contrib/admin/views/main.py:337 
     488#: contrib/admin/views/main.py:339 
    488489msgid "and" 
    489490msgstr "a" 
    490491 
    491 #: contrib/admin/views/main.py:338 
     492#: contrib/admin/views/main.py:337 
    492493#, python-format 
    493494msgid "Changed %s." 
    494495msgstr "%s: změněno" 
    495496 
    496 #: contrib/admin/views/main.py:340 
     497#: contrib/admin/views/main.py:339 
    497498#, python-format 
    498499msgid "Deleted %s." 
    499500msgstr "Záznam %s byl smazán." 
    500501 
    501 #: contrib/admin/views/main.py:343 
     502#: contrib/admin/views/main.py:342 
    502503msgid "No fields changed." 
    503504msgstr "Nebyly změněny žádné pole." 
    504505 
    505 #: contrib/admin/views/main.py:346 
     506#: contrib/admin/views/main.py:345 
    506507#, python-format 
    507508msgid "The %(name)s \"%(obj)s\" was changed successfully." 
    508509msgstr "%(name)s \"%(obj)s\" byl úspěšně změněn." 
    509510 
    510 #: contrib/admin/views/main.py:354 
     511#: contrib/admin/views/main.py:353 
    511512#, python-format 
    512513msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." 
    513514msgstr "The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže." 
    514515 
    515 #: contrib/admin/views/main.py:392 
     516#: contrib/admin/views/main.py:391 
    516517#, python-format 
    517518msgid "Change %s" 
    518519msgstr "%s: změnit" 
    519520 
    520 #: contrib/admin/views/main.py:470 
     521#: contrib/admin/views/main.py:473 
    521522#, python-format 
    522523msgid "One or more %(fieldname)s in %(name)s: %(obj)s" 
    523524msgstr "Jedno nebo více %(fieldname)s z %(name)s: %(obj)s" 
    524525 
    525 #: contrib/admin/views/main.py:475 
     526#: contrib/admin/views/main.py:478 
    526527#, python-format 
    527528msgid "One or more %(fieldname)s in %(name)s:" 
    528529msgstr "Jedno nebo více %(fieldname)s z %(name)s:" 
    529530 
    530 #: contrib/admin/views/main.py:508 
     531#: contrib/admin/views/main.py:511 
    531532#, python-format 
    532533msgid "The %(name)s \"%(obj)s\" was deleted successfully." 
    533534msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně smazán." 
    534535 
    535 #: contrib/admin/views/main.py:511 
     536#: contrib/admin/views/main.py:514 
    536537msgid "Are you sure?" 
    537538msgstr "Jste si jist(á)?" 
    538539 
    539 #: contrib/admin/views/main.py:533 
     540#: contrib/admin/views/main.py:536 
    540541#, python-format 
    541542msgid "Change history: %s" 
    542543msgstr "Historie změn: %s" 
    543544 
    544 #: contrib/admin/views/main.py:565 
     545#: contrib/admin/views/main.py:570 
    545546#, python-format 
    546547msgid "Select %s" 
    547548msgstr "Vybrat %s" 
    548549 
    549 #: contrib/admin/views/main.py:565 
     550#: contrib/admin/views/main.py:570 
    550551#, python-format 
    551552msgid "Select %s to change" 
    552553msgstr "Vyberte %s pro změnu" 
    553554 
    554 #: contrib/admin/views/doc.py:277 
    555 #: contrib/admin/views/doc.py:286 
    556 #: contrib/admin/views/doc.py:288 
    557 #: contrib/admin/views/doc.py:294 
    558 #: contrib/admin/views/doc.py:295 
    559 #: contrib/admin/views/doc.py:297 
     555#: contrib/admin/views/main.py:758 
     556msgid "Database error" 
     557msgstr "Databázová chyba" 
     558 
     559#: contrib/admin/views/doc.py:46 
     560#: contrib/admin/views/doc.py:48 
     561#: contrib/admin/views/doc.py:50 
     562msgid "tag:" 
     563msgstr "tag:" 
     564 
     565#: contrib/admin/views/doc.py:77 
     566#: contrib/admin/views/doc.py:79 
     567#: contrib/admin/views/doc.py:81 
     568msgid "filter:" 
     569msgstr "filtr:" 
     570 
     571#: contrib/admin/views/doc.py:135 
     572#: contrib/admin/views/doc.py:137 
     573#: contrib/admin/views/doc.py:139 
     574msgid "view:" 
     575msgstr "pohled (view):" 
     576 
     577#: contrib/admin/views/doc.py:164 
     578#, python-format 
     579msgid "App %r not found" 
     580msgstr "Aplikace %r nenalezena" 
     581 
     582#: contrib/admin/views/doc.py:171 
     583#, python-format 
     584msgid "Model %r not found in app %r" 
     585msgstr "Model %r v aplikaci %r nenalezen" 
     586 
     587#: contrib/admin/views/doc.py:183 
     588#, python-format 
     589msgid "the related `%s.%s` object" 
     590msgstr "související objekt `%s.%s`" 
     591 
     592#: contrib/admin/views/doc.py:183 
     593#: contrib/admin/views/doc.py:205 
     594#: contrib/admin/views/doc.py:219 
     595#: contrib/admin/views/doc.py:224 
     596msgid "model:" 
     597msgstr "model:" 
     598 
     599#: contrib/admin/views/doc.py:214 
     600#, python-format 
     601msgid "related `%s.%s` objects" 
     602msgstr "související objekty `%s.%s`" 
     603 
     604#: contrib/admin/views/doc.py:219 
     605#, python-format 
     606msgid "all %s" 
     607msgstr "%s: vše" 
     608 
     609#: contrib/admin/views/doc.py:224 
     610#, python-format 
     611msgid "number of %s" 
     612msgstr "%s: počet" 
     613 
     614#: contrib/admin/views/doc.py:229 
     615#, python-format 
     616msgid "Fields on %s objects" 
     617msgstr "Pole na objektech  %s" 
     618 
     619#: contrib/admin/views/doc.py:291 
     620#: contrib/admin/views/doc.py:301 
     621#: contrib/admin/views/doc.py:303 
     622#: contrib/admin/views/doc.py:309 
     623#: contrib/admin/views/doc.py:310 
     624#: contrib/admin/views/doc.py:312 
    560625msgid "Integer" 
    561626msgstr "Celé číslo" 
    562627 
    563 #: contrib/admin/views/doc.py:278 
     628#: contrib/admin/views/doc.py:292 
    564629msgid "Boolean (Either True or False)" 
    565630msgstr "Boolean (buď Ano (True), nebo Ne (False))" 
    566631 
    567 #: contrib/admin/views/doc.py:279 
    568 #: contrib/admin/views/doc.py:296 
     632#: contrib/admin/views/doc.py:293 
     633#: contrib/admin/views/doc.py:311 
    569634#, python-format 
    570635msgid "String (up to %(maxlength)s)" 
    571636msgstr "Text (maximálně %(maxlength)s znaků)" 
    572637 
    573 #: contrib/admin/views/doc.py:280 
     638#: contrib/admin/views/doc.py:294 
    574639msgid "Comma-separated integers" 
    575640msgstr "Celá čísla oddělená čárkou" 
    576641 
    577 #: contrib/admin/views/doc.py:281 
     642#: contrib/admin/views/doc.py:295 
    578643msgid "Date (without time)" 
    579644msgstr "Datum (bez času)" 
    580645 
    581 #: contrib/admin/views/doc.py:282 
     646#: contrib/admin/views/doc.py:296 
    582647msgid "Date (with time)" 
    583648msgstr "Datum (s časem)" 
    584649 
    585 #: contrib/admin/views/doc.py:283 
     650#: contrib/admin/views/doc.py:297 
    586651msgid "E-mail address" 
    587652msgstr "E-mailová adresa" 
    588653 
    589 #: contrib/admin/views/doc.py:284 
    590 #: contrib/admin/views/doc.py:287 
     654#: contrib/admin/views/doc.py:298 
     655#: contrib/admin/views/doc.py:299 
     656#: contrib/admin/views/doc.py:302 
    591657msgid "File path" 
    592658msgstr "Cesta k souboru" 
    593659 
    594 #: contrib/admin/views/doc.py:285 
     660#: contrib/admin/views/doc.py:300 
    595661msgid "Decimal number" 
    596662msgstr "Desetiné číslo" 
    597663 
    598 #: contrib/admin/views/doc.py:291 
     664#: contrib/admin/views/doc.py:306 
    599665msgid "Boolean (Either True, False or None)" 
    600666msgstr "Boolean (buď Ano (True), Ne (False), nebo Nic (None))" 
    601667 
    602 #: contrib/admin/views/doc.py:292 
     668#: contrib/admin/views/doc.py:307 
    603669msgid "Relation to parent model" 
    604670msgstr "V relaci k rodičovskému modelu" 
    605671 
    606 #: contrib/admin/views/doc.py:293 
     672#: contrib/admin/views/doc.py:308 
    607673msgid "Phone number" 
    608674msgstr "Telefonní číslo" 
    609675 
    610 #: contrib/admin/views/doc.py:298 
     676#: contrib/admin/views/doc.py:313 
    611677msgid "Text" 
    612678msgstr "Text" 
    613679 
    614 #: contrib/admin/views/doc.py:299 
     680#: contrib/admin/views/doc.py:314 
    615681msgid "Time" 
    616682msgstr "Čas" 
    617683 
    618 #: contrib/admin/views/doc.py:300 
     684#: contrib/admin/views/doc.py:315 
    619685#: contrib/flatpages/models.py:7 
    620686msgid "URL" 
    621687msgstr "URL" 
    622688 
    623 #: contrib/admin/views/doc.py:301 
     689#: contrib/admin/views/doc.py:316 
    624690msgid "U.S. state (two uppercase letters)" 
    625691msgstr "Stát US (2 velké znaky)" 
    626692 
    627 #: contrib/admin/views/doc.py:302 
     693#: contrib/admin/views/doc.py:317 
    628694msgid "XML text" 
    629695msgstr "text XML" 
    630696 
     697#: contrib/admin/views/doc.py:343 
     698#, python-format 
     699msgid "%s does not appear to be a urlpattern object" 
     700msgstr "%s pravděpodobně není objekt urlpattern" 
     701 
     702#: contrib/admin/views/auth.py:28 
     703msgid "Add user" 
     704msgstr "Přidat uživatele" 
     705 
    631706#: contrib/admin/templates/admin/object_history.html:3 
    632707#: contrib/admin/templates/admin/change_list.html:5 
    633 #: contrib/admin/templates/admin/base.html:23 
     708#: contrib/admin/templates/admin/base.html:25 
    634709#: contrib/admin/templates/admin/delete_confirmation.html:3 
    635710#: contrib/admin/templates/admin/change_form.html:10 
     
    642717#: contrib/admin/templates/admin/object_history.html:3 
    643718#: contrib/admin/templates/admin/change_list.html:5 
    644 #: contrib/admin/templates/admin/base.html:23 
     719#: contrib/admin/templates/admin/base.html:25 
    645720#: contrib/admin/templates/admin/delete_confirmation.html:3 
    646721#: contrib/admin/templates/admin/change_form.html:10 
     
    663738#: contrib/admin/templates/admin/500.html:4 
    664739#: contrib/admin/templates/admin/change_list.html:6 
    665 #: contrib/admin/templates/admin/base.html:28 
     740#: contrib/admin/templates/admin/base.html:30 
    666741#: contrib/admin/templates/admin/delete_confirmation.html:6 
    667742#: contrib/admin/templates/admin/change_form.html:13 
     743#: contrib/admin/templates/admin/invalid_setup.html:4 
    668744#: contrib/admin/templates/registration/password_change_done.html:4 
    669745#: contrib/admin/templates/registration/password_reset_form.html:4 
     
    738814msgstr "Dostupné modely v aplikaci %(name)s." 
    739815 
     816#: contrib/admin/templates/admin/index.html:18 
     817#, python-format 
     818msgid "%(name)s" 
     819msgstr "%(name)s" 
     820 
    740821#: contrib/admin/templates/admin/index.html:28 
    741822#: contrib/admin/templates/admin/change_form.html:15 
     
    772853msgstr "<a href=\"/password_reset/\">Zapomněl(a) jste své heslo?</a>" 
    773854 
    774 #: contrib/admin/templates/admin/base.html:23 
     855#: contrib/admin/templates/admin/base.html:25 
    775856msgid "Welcome," 
    776857msgstr "Vítejte," 
     
    783864#: contrib/admin/templates/admin/delete_confirmation.html:14 
    784865#, python-format 
    785 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:" 
    786 msgstr "Mazání %(object_name)s  '%(object)s' by vyústilo ve vymazání souvisejících objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:" 
     866msgid "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:" 
     867msgstr "Mazání %(object_name)s  '%(escaped_object)s' by vyústilo ve vymazání souvisejících objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:" 
    787868 
    788869#: contrib/admin/templates/admin/delete_confirmation.html:21 
    789870#, python-format 
    790 msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:" 
    791 msgstr "Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny následující související položky budou smazány:" 
     871msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:" 
     872msgstr "Jste si jist(á), že chcete smazat %(object_name)s \"%(escaped_object)s\"? Všechny následující související položky budou smazány:" 
    792873 
    793874#: contrib/admin/templates/admin/delete_confirmation.html:26 
     
    797878#: contrib/admin/templates/admin/filter.html:2 
    798879#, python-format 
    799 msgid " By %(title)s " 
    800 msgstr "Od %(title)s
     880msgid " By %(filter_title)s " 
     881msgstr " Dle %(filter_title)s
    801882 
    802883#: contrib/admin/templates/admin/search_form.html:8 
    803884msgid "Go" 
    804885msgstr "Provést" 
     886 
     887#: contrib/admin/templates/admin/search_form.html:10 
     888#, python-format 
     889msgid "1 result" 
     890msgid_plural "%(counter)s results" 
     891msgstr[0] "1 výsledek" 
     892msgstr[1] "%(counter)s výsledky" 
     893msgstr[2] "%(counter)s výsledků" 
     894 
     895#: contrib/admin/templates/admin/search_form.html:10 
     896#, python-format 
     897msgid "%(full_result_count)s total" 
     898msgstr "celkem %(full_result_count)s" 
     899 
     900#: contrib/admin/templates/admin/pagination.html:10 
     901msgid "Show all" 
     902msgstr "Zobrazit všechny" 
     903 
     904#: contrib/admin/templates/admin/filters.html:4 
     905msgid "Filter" 
     906msgstr "Filtr" 
    805907 
    806908#: contrib/admin/templates/admin/change_form.html:21 
     
    838940msgid "Save" 
    839941msgstr "Uložit" 
     942 
     943#: contrib/admin/templates/admin/invalid_setup.html:8 
     944msgid "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." 
     945msgstr "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." 
     946 
     947#: contrib/admin/templates/admin/auth/user/add_form.html:6 
     948msgid "First, enter a username and password. Then, you'll be able to edit more user options." 
     949msgstr "Nejdříve vložte uživatelské jméno a heslo. Poté budete moci upravovat více uživatelských možností." 
     950 
     951#: contrib/admin/templates/admin/auth/user/add_form.html:12 
     952msgid "Username" 
     953msgstr "Uživatelské jméno" 
     954 
     955#: contrib/admin/templates/admin/auth/user/add_form.html:18 
     956msgid "Password" 
     957msgstr "Heslo" 
     958 
     959#: contrib/admin/templates/admin/auth/user/add_form.html:23 
     960msgid "Password (again)" 
     961msgstr "Heslo (znova)" 
     962 
     963#: contrib/admin/templates/admin/auth/user/add_form.html:24 
     964msgid "Enter the same password as above, for verification." 
     965msgstr "Pro ověření vložte stejné heslo znovu." 
    840966 
    841967#: contrib/admin/templates/registration/password_change_done.html:4 
     
    10321158msgstr "Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na 'http://'." 
    10331159 
    1034 #: contrib/redirects/models.py:12 
     1160#: contrib/redirects/models.py:13 
    10351161msgid "redirect" 
    10361162msgstr "přesměrovat" 
    10371163 
    1038 #: contrib/redirects/models.py:13 
     1164#: contrib/redirects/models.py:14 
    10391165msgid "redirects" 
    10401166msgstr "přesměrování" 
     
    10611187 
    10621188#: contrib/flatpages/models.py:13 
    1063 msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'." 
    1064 msgstr "Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém použije 'flatfiles/default'." 
     1189msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'." 
     1190msgstr "Například: 'flatpages/kontaktni_stranka.html'. Pokud toto není zadáno, systém použije 'flatpages/default.html'." 
    10651191 
    10661192#: contrib/flatpages/models.py:14 
     
    10801206msgstr "statické stránky" 
    10811207 
    1082 #: contrib/auth/models.py:13 
    1083 #: contrib/auth/models.py:26 
     1208#: contrib/auth/views.py:39 
     1209msgid "Logged out" 
     1210msgstr "Odhlášeno" 
     1211 
     1212#: contrib/auth/models.py:38 
     1213#: contrib/auth/models.py:57 
    10841214msgid "name" 
    10851215msgstr "jméno" 
    10861216 
    1087 #: contrib/auth/models.py:15 
     1217#: contrib/auth/models.py:40 
    10881218msgid "codename" 
    10891219msgstr "codename" 
    10901220 
    1091 #: contrib/auth/models.py:17 
     1221#: contrib/auth/models.py:42 
    10921222msgid "permission" 
    10931223msgstr "oprávnění" 
    10941224 
    1095 #: contrib/auth/models.py:18 
    1096 #: contrib/auth/models.py:27 
     1225#: contrib/auth/models.py:43 
     1226#: contrib/auth/models.py:58 
    10971227msgid "permissions" 
    10981228msgstr "oprávnění" 
    10991229 
    1100 #: contrib/auth/models.py:29 
     1230#: contrib/auth/models.py:60 
    11011231msgid "group" 
    11021232msgstr "skupina" 
    11031233 
    1104 #: contrib/auth/models.py:30 
    1105 #: contrib/auth/models.py:65 
     1234#: contrib/auth/models.py:61 
     1235#: contrib/auth/models.py:100 
    11061236msgid "groups" 
    11071237msgstr "skupiny" 
    11081238 
    1109 #: contrib/auth/models.py:55 
     1239#: contrib/auth/models.py:90 
    11101240msgid "username" 
    11111241msgstr "uživatelské jméno" 
    11121242 
    1113 #: contrib/auth/models.py:56 
     1243#: contrib/auth/models.py:90 
     1244msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)." 
     1245msgstr "Požadováno. 30 znaků nebo méně. Pouze alfanumerické znaky (znaky, čísla a podtržítka)." 
     1246 
     1247#: contrib/auth/models.py:91 
    11141248msgid "first name" 
    11151249msgstr "křestní jméno" 
    11161250 
    1117 #: contrib/auth/models.py:57 
     1251#: contrib/auth/models.py:92 
    11181252msgid "last name" 
    11191253msgstr "příjmení" 
    11201254 
    1121 #: contrib/auth/models.py:58 
     1255#: contrib/auth/models.py:93 
    11221256msgid "e-mail address" 
    11231257msgstr "e-mailová adresa" 
    11241258 
    1125 #: contrib/auth/models.py:59 
     1259#: contrib/auth/models.py:94 
    11261260msgid "password" 
    11271261msgstr "heslo" 
    11281262 
    1129 #: contrib/auth/models.py:59 
     1263#: contrib/auth/models.py:94 
    11301264msgid "Use '[algo]$[salt]$[hexdigest]'" 
    11311265msgstr "Použijte '[algo]$[salt]$[hexdigest]'" 
    11321266 
    1133 #: contrib/auth/models.py:60 
     1267#: contrib/auth/models.py:95 
    11341268msgid "staff status" 
    11351269msgstr "administrativní přístup " 
    11361270 
    1137 #: contrib/auth/models.py:60 
     1271#: contrib/auth/models.py:95 
    11381272msgid "Designates whether the user can log into this admin site." 
    11391273msgstr "Rozhodne, zda se může uživatel přihlásit do správy webu." 
    11401274 
    1141 #: contrib/auth/models.py:61 
     1275#: contrib/auth/models.py:96 
    11421276msgid "active" 
    11431277msgstr "aktivní" 
    11441278 
    1145 #: contrib/auth/models.py:62 
     1279#: contrib/auth/models.py:96 
     1280msgid "Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts." 
     1281msgstr "Rozhodne, zda se může uživatel přihlásit do správy webu. Nastavte toto místo mazání účtů." 
     1282 
     1283#: contrib/auth/models.py:97 
    11461284msgid "superuser status" 
    11471285msgstr "stav superuživatel" 
    11481286 
    1149 #: contrib/auth/models.py:63 
     1287#: contrib/auth/models.py:97 
     1288msgid "Designates that this user has all permissions without explicitly assigning them." 
     1289msgstr "Stanoví, že tento uživatel má veškerá oprávnění bez jejich explicitního přiřazení." 
     1290 
     1291#: contrib/auth/models.py:98 
    11501292msgid "last login" 
    11511293msgstr "poslední přihlášení" 
    11521294 
    1153 #: contrib/auth/models.py:64 
     1295#: contrib/auth/models.py:99 
    11541296msgid "date joined" 
    11551297msgstr "datum zaregistrování" 
    11561298 
    1157 #: contrib/auth/models.py:66 
     1299#: contrib/auth/models.py:101 
    11581300msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." 
    11591301msgstr "Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro každou skupinu, ve které je." 
    11601302 
    1161 #: contrib/auth/models.py:67 
     1303#: contrib/auth/models.py:102 
    11621304msgid "user permissions" 
    11631305msgstr "uživatelskí oprávnění" 
    11641306 
    1165 #: contrib/auth/models.py:70 
     1307#: contrib/auth/models.py:105 
    11661308msgid "user" 
    11671309msgstr "uživatel" 
    11681310 
    1169 #: contrib/auth/models.py:71