Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (4 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214
  • django/branches/gis/django/conf/global_settings.py

    r7836 r8215  
    189189PREPEND_WWW = False 
    190190 
     191# Override the server-derived value of SCRIPT_NAME 
     192FORCE_SCRIPT_NAME = None 
     193 
    191194# List of compiled regular expression objects representing User-Agent strings 
    192195# that are not allowed to visit any page, systemwide. Use this for bad 
     
    364367LOGIN_REDIRECT_URL = '/accounts/profile/' 
    365368 
     369# The number of days a password reset link is valid for 
     370PASSWORD_RESET_TIMEOUT_DAYS = 3 
     371 
    366372########### 
    367373# TESTING # 
  • django/branches/gis/django/conf/locale/de/LC_MESSAGES/django.po

    r7768 r8215  
    88"Project-Id-Version: Django\n" 
    99"Report-Msgid-Bugs-To: \n" 
    10 "POT-Creation-Date: 2008-06-23 20:23+0200\n" 
    11 "PO-Revision-Date: 2008-06-23 20:51+0100\n" 
     10"POT-Creation-Date: 2008-08-01 11:38+0200\n" 
     11"PO-Revision-Date: 2008-08-01 12:42+0100\n" 
    1212"Last-Translator: Jannis Leidel <jannis@leidel.info>\n" 
    1313"Language-Team: \n" 
     
    253253 
    254254#: contrib/admin/filterspecs.py:147 
    255 #: newforms/widgets.py:231 
     255#: forms/widgets.py:379 
    256256#: oldforms/__init__.py:592 
    257257msgid "Yes" 
     
    259259 
    260260#: contrib/admin/filterspecs.py:147 
    261 #: newforms/widgets.py:231 
     261#: forms/widgets.py:379 
    262262#: oldforms/__init__.py:592 
    263263msgid "No" 
     
    265265 
    266266#: contrib/admin/filterspecs.py:154 
    267 #: newforms/widgets.py:231 
     267#: forms/widgets.py:379 
    268268#: oldforms/__init__.py:592 
    269269msgid "Unknown" 
    270270msgstr "Unbekannt" 
    271271 
    272 #: contrib/admin/models.py:18 
     272#: contrib/admin/models.py:19 
    273273msgid "action time" 
    274274msgstr "Zeitpunkt der Aktion" 
    275275 
    276 #: contrib/admin/models.py:21 
     276#: contrib/admin/models.py:22 
    277277msgid "object id" 
    278278msgstr "Objekt-ID" 
    279279 
    280 #: contrib/admin/models.py:22 
     280#: contrib/admin/models.py:23 
    281281msgid "object repr" 
    282282msgstr "Objekt Darst." 
    283283 
    284 #: contrib/admin/models.py:23 
     284#: contrib/admin/models.py:24 
    285285msgid "action flag" 
    286286msgstr "Aktionskennzeichen" 
    287287 
    288 #: contrib/admin/models.py:24 
     288#: contrib/admin/models.py:25 
    289289msgid "change message" 
    290290msgstr "Änderungsmeldung" 
    291291 
    292 #: contrib/admin/models.py:27 
     292#: contrib/admin/models.py:28 
    293293msgid "log entry" 
    294294msgstr "Logeintrag" 
    295295 
    296 #: contrib/admin/models.py:28 
     296#: contrib/admin/models.py:29 
    297297msgid "log entries" 
    298298msgstr "Logeinträge" 
     299 
     300#: contrib/admin/options.py:140 
     301#: contrib/admin/options.py:178 
     302msgid "None" 
     303msgstr "-" 
     304 
     305#: contrib/admin/options.py:358 
     306#: contrib/auth/admin.py:37 
     307#, python-format 
     308msgid "The %(name)s \"%(obj)s\" was added successfully." 
     309msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt." 
     310 
     311#: contrib/admin/options.py:362 
     312#: contrib/admin/options.py:430 
     313#: contrib/auth/admin.py:42 
     314msgid "You may edit it again below." 
     315msgstr "Das Element kann jetzt weiter bearbeitet werden." 
     316 
     317#: contrib/admin/options.py:372 
     318#: contrib/admin/options.py:439 
     319#, python-format 
     320msgid "You may add another %s below." 
     321msgstr "Jetzt kann ein weiteres Element des Typs %s angelegt werden." 
     322 
     323#: contrib/admin/options.py:406 
     324#, python-format 
     325msgid "Changed %s." 
     326msgstr "%s geändert." 
     327 
     328#: contrib/admin/options.py:406 
     329#: contrib/admin/options.py:416 
     330#: core/validators.py:279 
     331#: db/models/manipulators.py:305 
     332msgid "and" 
     333msgstr "und" 
     334 
     335#: contrib/admin/options.py:411 
     336#, python-format 
     337msgid "Added %(name)s \"%(object)s\"." 
     338msgstr "%(name)s \"%(object)s\" hinzugefügt." 
     339 
     340#: contrib/admin/options.py:415 
     341#, python-format 
     342msgid "Changed %(list)s for %(name)s \"%(object)s\"." 
     343msgstr "%(list)s von %(name)s \"%(object)s\" geändert." 
     344 
     345#: contrib/admin/options.py:420 
     346#, python-format 
     347msgid "Deleted %(name)s \"%(object)s\"." 
     348msgstr "%(name)s \"%(object)s\" gelöscht." 
     349 
     350#: contrib/admin/options.py:425 
     351msgid "No fields changed." 
     352msgstr "Keine Felder geändert." 
     353 
     354#: contrib/admin/options.py:428 
     355#, python-format 
     356msgid "The %(name)s \"%(obj)s\" was changed successfully." 
     357msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert." 
     358 
     359#: contrib/admin/options.py:436 
     360#, python-format 
     361msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." 
     362msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt geändert werden." 
     363 
     364#: contrib/admin/options.py:517 
     365#, python-format 
     366msgid "Add %s" 
     367msgstr "%s hinzufügen" 
     368 
     369#: contrib/admin/options.py:579 
     370#, python-format 
     371msgid "Change %s" 
     372msgstr "%s ändern" 
     373 
     374#: contrib/admin/options.py:609 
     375msgid "Database error" 
     376msgstr "Datenbankfehler" 
     377 
     378#: contrib/admin/options.py:658 
     379#, python-format 
     380msgid "The %(name)s \"%(obj)s\" was deleted successfully." 
     381msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht." 
     382 
     383#: contrib/admin/options.py:664 
     384msgid "Are you sure?" 
     385msgstr "Sind Sie ganz sicher?" 
     386 
     387#: contrib/admin/options.py:691 
     388#, python-format 
     389msgid "Change history: %s" 
     390msgstr "Änderungsgeschichte: %s" 
     391 
     392#: contrib/admin/sites.py:18 
     393#: contrib/admin/views/decorators.py:16 
     394#: contrib/auth/forms.py:72 
     395#: contrib/comments/views/comments.py:56 
     396msgid "Please enter a correct username and password. Note that both fields are case-sensitive." 
     397msgstr "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder berücksichtigen die Groß-/Kleinschreibung." 
     398 
     399#: contrib/admin/sites.py:233 
     400#: contrib/admin/views/decorators.py:68 
     401msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved." 
     402msgstr "Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst, die Beiträge wurden gesichert." 
     403 
     404#: contrib/admin/sites.py:240 
     405#: contrib/admin/views/decorators.py:75 
     406msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again." 
     407msgstr "Es sieht danach aus, dass der Browser keine Cookies akzeptiert. Bitte im Browser Cookies aktivieren und diese Seite neu laden." 
     408 
     409#: contrib/admin/sites.py:254 
     410#: contrib/admin/sites.py:260 
     411#: contrib/admin/views/decorators.py:92 
     412msgid "Usernames cannot contain the '@' character." 
     413msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten." 
     414 
     415#: contrib/admin/sites.py:257 
     416#: contrib/admin/views/decorators.py:88 
     417#, python-format 
     418msgid "Your e-mail address is not your username. Try '%s' instead." 
     419msgstr "Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen '%s' versuchen." 
     420 
     421#: contrib/admin/sites.py:325 
     422msgid "Site administration" 
     423msgstr "Seitenverwaltung" 
     424 
     425#: contrib/admin/sites.py:347 
     426#: contrib/admin/templates/admin/login.html:27 
     427#: contrib/admin/views/decorators.py:30 
     428msgid "Log in" 
     429msgstr "Anmelden" 
     430 
     431#: contrib/admin/util.py:126 
     432#, python-format 
     433msgid "One or more %(fieldname)s in %(name)s: %(obj)s" 
     434msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s" 
     435 
     436#: contrib/admin/util.py:131 
     437#, python-format 
     438msgid "One or more %(fieldname)s in %(name)s:" 
     439msgstr "Ein oder mehrere %(fieldname)s in %(name)s:" 
     440 
     441#: contrib/admin/widgets.py:65 
     442msgid "Date:" 
     443msgstr "Datum:" 
     444 
     445#: contrib/admin/widgets.py:65 
     446msgid "Time:" 
     447msgstr "Zeit:" 
     448 
     449#: contrib/admin/widgets.py:89 
     450msgid "Currently:" 
     451msgstr "Derzeit:" 
     452 
     453#: contrib/admin/widgets.py:89 
     454msgid "Change:" 
     455msgstr "Ändern:" 
    299456 
    300457#: contrib/admin/templates/admin/404.html:4 
     
    308465 
    309466#: contrib/admin/templates/admin/500.html:4 
    310 #: contrib/admin/templates/admin/base.html:37 
    311 #: contrib/admin/templates/admin/change_form.html:12 
    312 #: contrib/admin/templates/admin/change_list.html:5 
    313 #: contrib/admin/templates/admin/delete_confirmation.html:5 
     467#: contrib/admin/templates/admin/base.html:30 
     468#: contrib/admin/templates/admin/change_form.html:17 
     469#: contrib/admin/templates/admin/change_list.html:8 
     470#: contrib/admin/templates/admin/delete_confirmation.html:6 
    314471#: contrib/admin/templates/admin/invalid_setup.html:4 
    315 #: contrib/admin/templates/admin/object_history.html:4 
    316 #: contrib/admin/templates/admin/auth/user/change_password.html:11 
     472#: contrib/admin/templates/admin/object_history.html:5 
     473#: contrib/admin/templates/admin/auth/user/change_password.html:10 
    317474#: contrib/admin/templates/admin_doc/bookmarklets.html:3 
    318475#: contrib/admin/templates/registration/logged_out.html:4 
    319 #: contrib/admin/templates/registration/password_change_done.html:3 
    320 #: contrib/admin/templates/registration/password_change_form.html:3 
     476#: contrib/admin/templates/registration/password_change_done.html:4 
     477#: contrib/admin/templates/registration/password_change_form.html:4 
     478#: contrib/admin/templates/registration/password_reset_complete.html:4 
     479#: contrib/admin/templates/registration/password_reset_confirm.html:4 
    321480#: contrib/admin/templates/registration/password_reset_done.html:4 
    322481#: contrib/admin/templates/registration/password_reset_form.html:4 
     
    340499msgstr "Ein Fehler ist aufgetreten. Dieser Fehler wurde an die Serververwalter per E-Mail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr Verständnis." 
    341500 
    342 #: contrib/admin/templates/admin/base.html:26 
     501#: contrib/admin/templates/admin/base.html:25 
    343502msgid "Welcome," 
    344503msgstr "Willkommen," 
    345504 
    346 #: contrib/admin/templates/admin/base.html:28 
     505#: contrib/admin/templates/admin/base.html:25 
    347506#: contrib/admin/templates/admin_doc/bookmarklets.html:3 
     507#: contrib/admin/templates/registration/password_change_done.html:3 
     508#: contrib/admin/templates/registration/password_change_form.html:3 
    348509msgid "Documentation" 
    349510msgstr "Dokumentation" 
    350511 
    351 #: contrib/admin/templates/admin/base.html:29 
    352 #: contrib/admin/templates/admin/auth/user/change_password.html:14 
    353 #: contrib/admin/templates/admin/auth/user/change_password.html:45 
     512#: contrib/admin/templates/admin/base.html:25 
     513#: contrib/admin/templates/admin/auth/user/change_password.html:13 
     514#: contrib/admin/templates/admin/auth/user/change_password.html:46 
     515#: contrib/admin/templates/registration/password_change_done.html:3 
     516#: contrib/admin/templates/registration/password_change_form.html:3 
    354517msgid "Change password" 
    355518msgstr "Passwort ändern" 
    356519 
    357 #: contrib/admin/templates/admin/base.html:30 
     520#: contrib/admin/templates/admin/base.html:25 
     521#: contrib/admin/templates/registration/password_change_done.html:3 
     522#: contrib/admin/templates/registration/password_change_form.html:3 
    358523#: contrib/comments/templates/comments/form.html:6 
    359524msgid "Log out" 
     
    368533msgstr "Django-Verwaltung" 
    369534 
    370 #: contrib/admin/templates/admin/change_form.html:14 
    371 #: contrib/admin/templates/admin/index.html:28 
     535#: contrib/admin/templates/admin/change_form.html:19 
     536#: contrib/admin/templates/admin/index.html:29 
    372537msgid "Add" 
    373538msgstr "Hinzufügen" 
    374539 
    375 #: contrib/admin/templates/admin/change_form.html:20 
    376 #: contrib/admin/templates/admin/object_history.html:4 
     540#: contrib/admin/templates/admin/change_form.html:26 
     541#: contrib/admin/templates/admin/object_history.html:5 
    377542msgid "History" 
    378543msgstr "Geschichte" 
    379544 
    380 #: contrib/admin/templates/admin/change_form.html:21 
     545#: contrib/admin/templates/admin/change_form.html:27 
    381546msgid "View on site" 
    382547msgstr "Im Web anzeigen" 
    383548 
    384 #: contrib/admin/templates/admin/change_form.html:31 
    385 #: contrib/admin/templates/admin/auth/user/change_password.html:23 
     549#: contrib/admin/templates/admin/change_form.html:37 
     550#: contrib/admin/templates/admin/auth/user/change_password.html:22 
    386551msgid "Please correct the error below." 
    387552msgid_plural "Please correct the errors below." 
     
    389554msgstr[1] "Bitte die aufgeführten Fehler korrigieren." 
    390555 
    391 #: contrib/admin/templates/admin/change_form.html:49 
    392 msgid "Ordering" 
    393 msgstr "Sortierung" 
    394  
    395 #: contrib/admin/templates/admin/change_form.html:52 
    396 msgid "Order:" 
    397 msgstr "Reihenfolge:" 
    398  
    399 #: contrib/admin/templates/admin/change_list.html:11 
     556#: contrib/admin/templates/admin/change_list.html:16 
    400557#, python-format 
    401558msgid "Add %(name)s" 
    402559msgstr "%(name)s hinzufügen" 
    403560 
    404 #: contrib/admin/templates/admin/delete_confirmation.html:8 
     561#: contrib/admin/templates/admin/change_list.html:26 
     562msgid "Filter" 
     563msgstr "Filter" 
     564 
     565#: contrib/admin/templates/admin/delete_confirmation.html:9 
    405566#: contrib/admin/templates/admin/submit_line.html:3 
     567#: contrib/admin/templates/admin/edit_inline/tabular.html:15 
    406568msgid "Delete" 
    407569msgstr "Löschen" 
    408570 
    409 #: contrib/admin/templates/admin/delete_confirmation.html:13 
     571#: contrib/admin/templates/admin/delete_confirmation.html:15 
    410572#, python-format 
    411573msgid "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:" 
    412574msgstr "Die Löschung des %(object_name)s '%(escaped_object)s' hätte die Löschung von abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die folgenden abhängigen Daten zu löschen:" 
    413575 
    414 #: contrib/admin/templates/admin/delete_confirmation.html:20 
     576#: contrib/admin/templates/admin/delete_confirmation.html:22 
    415577#, python-format 
    416578msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:" 
    417579msgstr "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen wollen? Es werden zusätzlich die folgenden abhängigen Daten mit gelöscht:" 
    418580 
    419 #: contrib/admin/templates/admin/delete_confirmation.html:25 
     581#: contrib/admin/templates/admin/delete_confirmation.html:27 
    420582msgid "Yes, I'm sure" 
    421583msgstr "Ja, ich bin sicher" 
     
    426588msgstr " Nach %(filter_title)s " 
    427589 
    428 #: contrib/admin/templates/admin/filters.html:4 
    429 msgid "Filter" 
    430 msgstr "Filter" 
    431  
    432 #: contrib/admin/templates/admin/index.html:17 
     590#: contrib/admin/templates/admin/index.html:18 
    433591#, python-format 
    434592msgid "Models available in the %(name)s application." 
    435593msgstr "Modelle, die in der Anwendung %(name)s vorhanden sind." 
    436594 
    437 #: contrib/admin/templates/admin/index.html:18 
     595#: contrib/admin/templates/admin/index.html:19 
    438596#, python-format 
    439597msgid "%(name)s" 
    440598msgstr "%(name)s" 
    441599 
    442 #: contrib/admin/templates/admin/index.html:34 
     600#: contrib/admin/templates/admin/index.html:35 
    443601msgid "Change" 
    444602msgstr "Ändern" 
    445603 
    446 #: contrib/admin/templates/admin/index.html:44 
     604#: contrib/admin/templates/admin/index.html:45 
    447605msgid "You don't have permission to edit anything." 
    448606msgstr "Sie haben keine Berechtigung, irgendetwas zu ändern." 
    449607 
    450 #: contrib/admin/templates/admin/index.html:52 
     608#: contrib/admin/templates/admin/index.html:53 
    451609msgid "Recent Actions" 
    452610msgstr "Kürzliche Aktionen" 
    453611 
    454 #: contrib/admin/templates/admin/index.html:53 
     612#: contrib/admin/templates/admin/index.html:54 
    455613msgid "My Actions" 
    456614msgstr "Meine Aktionen" 
    457615 
    458 #: contrib/admin/templates/admin/index.html:57 
     616#: contrib/admin/templates/admin/index.html:58 
    459617msgid "None available" 
    460618msgstr "Keine vorhanden" 
    461619 
    462 #: contrib/admin/templates/admin/invalid_setup.html:8 
     620#: contrib/admin/templates/admin/invalid_setup.html:7 
    463621msgid "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." 
    464622msgstr "Etwas stimmt nicht mit der Datenbankkonfiguration. Bitte sicherstellen, dass die richtigen Datenbanktabellen angelegt wurden und die Datenbank vom verwendeten Datenbankbenutzer auch lesbar ist." 
    465623 
    466 #: contrib/admin/templates/admin/login.html:17 
     624#: contrib/admin/templates/admin/login.html:19 
    467625#: contrib/comments/templates/comments/form.html:6 
    468626#: contrib/comments/templates/comments/form.html:8 
     
    470628msgstr "Benutzername:" 
    471629 
    472 #: contrib/admin/templates/admin/login.html:20 
     630#: contrib/admin/templates/admin/login.html:22 
    473631#: contrib/comments/templates/comments/form.html:8 
    474632msgid "Password:" 
    475633msgstr "Passwort:" 
    476634 
    477 #: contrib/admin/templates/admin/login.html:25 
    478 #: contrib/admin/views/decorators.py:31 
    479 msgid "Log in" 
    480 msgstr "Anmelden" 
    481  
    482 #: contrib/admin/templates/admin/object_history.html:17 
     635#: contrib/admin/templates/admin/object_history.html:16 
    483636msgid "Date/time" 
    484637msgstr "Datum/Zeit" 
    485638 
    486 #: contrib/admin/templates/admin/object_history.html:18 
     639#: contrib/admin/templates/admin/object_history.html:17 
    487640msgid "User" 
    488641msgstr "Benutzer" 
    489642 
    490 #: contrib/admin/templates/admin/object_history.html:19 
     643#: contrib/admin/templates/admin/object_history.html:18 
    491644msgid "Action" 
    492645msgstr "Aktion" 
    493646 
    494 #: contrib/admin/templates/admin/object_history.html:25 
     647#: contrib/admin/templates/admin/object_history.html:24 
    495648msgid "DATE_WITH_TIME_FULL" 
    496649msgstr "j. N Y, H:i" 
    497650 
    498 #: contrib/admin/templates/admin/object_history.html:35 
     651#: contrib/admin/templates/admin/object_history.html:32 
    499652msgid "This object doesn't have a change history. It probably wasn't added via this admin site." 
    500653msgstr "Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht über diese Verwaltungsseiten angelegt." 
     
    540693msgstr "Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere Optionen für den Benutzer geändert werden." 
    541694 
    542 #: contrib/admin/templates/admin/auth/user/add_form.html:12 
     695#: contrib/admin/templates/admin/auth/user/add_form.html:13 
     696#: contrib/auth/forms.py:14 
     697#: contrib/auth/forms.py:51 
    543698msgid "Username" 
    544699msgstr "Benutzername" 
    545700 
    546 #: contrib/admin/templates/admin/auth/user/add_form.html:18 
     701#: contrib/admin/templates/admin/auth/user/add_form.html:20 
    547702#: contrib/admin/templates/admin/auth/user/change_password.html:33 
     703#: contrib/auth/forms.py:17 
     704#: contrib/auth/forms.py:52 
     705#: contrib/auth/forms.py:176 
    548706msgid "Password" 
    549707msgstr "Passwort" 
    550708 
    551 #: contrib/admin/templates/admin/auth/user/add_form.html:23 
    552 #: contrib/admin/templates/admin/auth/user/change_password.html:38 
     709#: contrib/admin/templates/admin/auth/user/add_form.html:26 
     710#: contrib/admin/templates/admin/auth/user/change_password.html:39 
     711#: contrib/auth/forms.py:177 
    553712msgid "Password (again)" 
    554713msgstr "Passwort (wiederholen)" 
    555714 
    556 #: contrib/admin/templates/admin/auth/user/add_form.html:24 
    557 #: contrib/admin/templates/admin/auth/user/change_password.html:39 
     715#: contrib/admin/templates/admin/auth/user/add_form.html:27 
     716#: contrib/admin/templates/admin/auth/user/change_password.html:40 
    558717msgid "Enter the same password as above, for verification." 
    559718msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben." 
    560719 
    561 #: contrib/admin/templates/admin/auth/user/change_password.html:27 
     720#: contrib/admin/templates/admin/auth/user/change_password.html:26 
    562721#, python-format 
    563722msgid "Enter a new password for the user <strong>%(username)s</strong>." 
     
    630789msgstr "Erneut anmelden" 
    631790 
    632 #: contrib/admin/templates/registration/password_change_done.html:3 
    633 #: contrib/admin/templates/registration/password_change_form.html:3 
    634 #: contrib/admin/templates/registration/password_change_form.html:5 
    635 #: contrib/admin/templates/registration/password_change_form.html:9 
     791#: contrib/admin/templates/registration/password_change_done.html:4 
     792#: contrib/admin/templates/registration/password_change_form.html:4 
     793#: contrib/admin/templates/registration/password_change_form.html:6 
     794#: contrib/admin/templates/registration/password_change_form.html:10 
    636795msgid "Password change" 
    637796msgstr "Passwort ändern" 
    638797 
    639 #: contrib/admin/templates/registration/password_change_done.html:5 
    640 #: contrib/admin/templates/registration/password_change_done.html:9 
     798#: contrib/admin/templates/registration/password_change_done.html:6 
     799#: contrib/admin/templates/registration/password_change_done.html:10 
    641800msgid "Password change successful" 
    642801msgstr "Passwort erfolgreich geändert" 
    643802 
    644 #: contrib/admin/templates/registration/password_change_done.html:11 
     803#: contrib/admin/templates/registration/password_change_done.html:12 
    645804msgid "Your password was changed." 
    646805msgstr "Ihr Passwort wurde geändert." 
    647806 
    648 #: contrib/admin/templates/registration/password_change_form.html:11 
     807#: contrib/admin/templates/registration/password_change_form.html:12 
    649808msgid "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." 
    650809msgstr "Bitte geben Sie aus Sicherheitsgründen erst Ihr altes Passwort und darunter dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das neue Kennwort ein." 
    651810 
    652 #: contrib/admin/templates/registration/password_change_form.html:16 
     811#: contrib/admin/templates/registration/password_change_form.html:17 
    653812msgid "Old password:" 
    654813msgstr "Altes Passwort:" 
    655814 
    656 #: contrib/admin/templates/registration/password_change_form.html:18 
     815#: contrib/admin/templates/registration/password_change_form.html:19 
     816#: contrib/admin/templates/registration/password_reset_confirm.html:18 
    657817msgid "New password:" 
    658818msgstr "Neues Passwort:" 
    659819 
    660 #: contrib/admin/templates/registration/password_change_form.html:20 
     820#: contrib/admin/templates/registration/password_change_form.html:21 
     821#: contrib/admin/templates/registration/password_reset_confirm.html:20 
    661822msgid "Confirm password:" 
    662823msgstr "Passwort wiederholen:" 
    663824 
    664 #: contrib/admin/templates/registration/password_change_form.html:22 
     825#: contrib/admin/templates/registration/password_change_form.html:23 
     826#: contrib/admin/templates/registration/password_reset_confirm.html:21 
    665827msgid "Change my password" 
    666828msgstr "Mein Passwort ändern" 
    667829 
     830#: contrib/admin/templates/registration/password_reset_complete.html:4 
     831#: contrib/admin/templates/registration/password_reset_confirm.html:6 
    668832#: contrib/admin/templates/registration/password_reset_done.html:4 
    669833#: contrib/admin/templates/registration/password_reset_form.html:4 
     
    673837msgstr "Passwort zurücksetzen" 
    674838 
     839#: contrib/admin/templates/registration/password_reset_complete.html:6 
     840#: contrib/admin/templates/registration/password_reset_complete.html:10 
     841msgid "Password reset complete" 
     842msgstr "Passwort zurücksetzen beendet" 
     843 
     844#: contrib/admin/templates/registration/password_reset_complete.html:12 
     845msgid "Your password has been set.  You may go ahead and log in now." 
     846msgstr "Ihr Passwort wurde zurückgesetzt. Sie können sich nun anmelden." 
     847 
     848#: contrib/admin/templates/registration/password_reset_confirm.html:4 
     849msgid "Password reset confirmation" 
     850msgstr "Zurücksetzen des Passworts bestätigen" 
     851 
     852#: contrib/admin/templates/registration/password_reset_confirm.html:12 
     853msgid "Enter new password" 
     854msgstr "Neues Passwort eingeben" 
     855 
     856#: contrib/admin/templates/registration/password_reset_confirm.html:14 
     857msgid "Please enter your new password twice so we can verify you typed it in correctly." 
     858msgstr "Bitte geben Sie Ihr neues Passwort zweimal ein, damit wir überprüfen können, ob es richtig eingetippt wurde." 
     859 
     860#: contrib/admin/templates/registration/password_reset_confirm.html:26 
     861msgid "Password reset unsuccessful" 
     862msgstr "Passwort wurde nicht erfolgreich zurückgesetzt" 
     863 
     864#: contrib/admin/templates/registration/password_reset_confirm.html:28 
     865msgid "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." 
     866msgstr "Der Link zum Zurücksetzen Ihres Passworts ist ungültig, wahrscheinlich weil er schon einmal benutzt wurde. Bitte setzen Sie Ihr Passwort erneut zurück." 
     867 
    675868#: contrib/admin/templates/registration/password_reset_done.html:6 
    676869#: contrib/admin/templates/registration/password_reset_done.html:10 
     
    679872 
    680873#: contrib/admin/templates/registration/password_reset_done.html:12 
    681 msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly." 
    682 msgstr "Wir haben ein neues Passwort an die von Ihnen angegebene E-Mail-Adresse geschickt. Sie sollten es in Kürze erhalten." 
     874msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." 
     875msgstr "Wir haben Ihnen eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passwort an die von Ihnen angegebene E-Mail-Adresse geschickt. Sie sollten sie in Kürze erhalten." 
    683876 
    684877#: contrib/admin/templates/registration/password_reset_email.html:2 
     
    692885 
    693886#: contrib/admin/templates/registration/password_reset_email.html:5 
    694 #, python-format 
    695 msgid "Your new password is: %(new_password)s" 
    696 msgstr "Ihr neues Passwort lautet: %(new_password)s" 
    697  
    698 #: contrib/admin/templates/registration/password_reset_email.html:7 
    699 msgid "Feel free to change this password by going to this page:" 
    700 msgstr "Sie können das Passwort auf folgender Seite ändern:" 
    701  
    702 #: contrib/admin/templates/registration/password_reset_email.html:11 
     887msgid "Please go to the following page and choose a new password:" 
     888msgstr "Bitte öffnen Sie folgende Seite, um Ihr neues Passwort einzugeben:" 
     889 
     890#: contrib/admin/templates/registration/password_reset_email.html:9 
    703891msgid "Your username, in case you've forgotten:" 
    704892msgstr "Ihr Benutzername, falls Sie ihn vergessen haben:" 
    705893 
    706 #: contrib/admin/templates/registration/password_reset_email.html:13 
     894#: contrib/admin/templates/registration/password_reset_email.html:11 
    707895msgid "Thanks for using our site!" 
    708896msgstr "Vielen Dank, dass Sie unsere Seiten benutzen!" 
    709897 
    710 #: contrib/admin/templates/registration/password_reset_email.html:15 
     898#: contrib/admin/templates/registration/password_reset_email.html:13 
    711899#, python-format 
    712900msgid "The %(site_name)s team" 
     
    714902 
    715903#: contrib/admin/templates/registration/password_reset_form.html:12 
    716 msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you." 
    717 msgstr "Passwort vergessen? Einfach die E-Mail-Adresse eingeben und wir setzen das Passwort zurück und lassen es Ihnen per E-Mail zukommen." 
     904msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." 
     905msgstr "Passwort vergessen? Einfach Ihre E-Mail-Adresse eingeben und wir senden Ihnen Anweisungen zum Zurücksetzen Ihres Passworts." 
    718906 
    719907#: contrib/admin/templates/registration/password_reset_form.html:16 
     
    725913msgstr "Mein Passwort zurücksetzen" 
    726914 
    727 #: contrib/admin/templates/widget/date_time.html:3 
    728 msgid "Date:" 
    729 msgstr "Datum:" 
    730  
    731 #: contrib/admin/templates/widget/date_time.html:4 
    732 msgid "Time:" 
    733 msgstr "Zeit:" 
    734  
    735 #: contrib/admin/templates/widget/file.html:2 
    736 msgid "Currently:" 
    737 msgstr "Derzeit:" 
    738  
    739 #: contrib/admin/templates/widget/file.html:3 
    740 msgid "Change:" 
    741 msgstr "Ändern:" 
    742  
    743915#: contrib/admin/templatetags/admin_list.py:257 
    744916msgid "All dates" 
    745917msgstr "Alle Tage" 
    746918 
    747 #: contrib/admin/views/auth.py:20 
    748 #: contrib/admin/views/main.py:267 
    749 #, python-format 
    750 msgid "The %(name)s \"%(obj)s\" was added successfully." 
    751 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt." 
    752  
    753 #: contrib/admin/views/auth.py:25 
    754 #: contrib/admin/views/main.py:271 
    755 #: contrib/admin/views/main.py:356 
    756 msgid "You may edit it again below." 
    757 msgstr "Das Element kann jetzt weiter bearbeitet werden." 
    758  
    759 #: contrib/admin/views/auth.py:31 
    760 msgid "Add user" 
    761 msgstr "Benutzer hinzufügen" 
    762  
    763 #: contrib/admin/views/auth.py:58 
    764 msgid "Password changed successfully." 
    765 msgstr "Passwort erfolgreich geändert." 
    766  
    767 #: contrib/admin/views/auth.py:65 
    768 #, python-format 
    769 msgid "Change password: %s" 
    770 msgstr "Passwort ändern: %s" 
    771  
    772 #: contrib/admin/views/decorators.py:17 
    773 #: contrib/auth/forms.py:60 
    774 msgid "Please enter a correct username and password. Note that both fields are case-sensitive." 
    775 msgstr "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder berücksichtigen die Groß-/Kleinschreibung." 
    776  
    777 #: contrib/admin/views/decorators.py:69 
    778 msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved." 
    779 msgstr "Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst, die Beiträge wurden gesichert." 
    780  
    781 #: contrib/admin/views/decorators.py:76 
    782 msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again." 
    783 msgstr "Es sieht danach aus, dass der Browser keine Cookies akzeptiert. Bitte im Browser Cookies aktivieren und diese Seite neu laden." 
    784  
    785 #: contrib/admin/views/decorators.py:89 
    786 #, python-format 
    787 msgid "Your e-mail address is not your username. Try '%s' instead." 
    788 msgstr "Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen '%s' versuchen." 
    789  
    790 #: contrib/admin/views/decorators.py:93 
    791 msgid "Usernames cannot contain the '@' character." 
    792 msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten." 
    793  
    794 #: contrib/admin/views/doc.py:48 
    795 #: contrib/admin/views/doc.py:50 
    796 #: contrib/admin/views/doc.py:52 
     919#: contrib/admin/views/main.py:65 
     920#, python-format 
     921msgid "Select %s" 
     922msgstr "%s auswählen" 
     923 
     924#: contrib/admin/views/main.py:65 
     925#, python-format 
     926msgid "Select %s to change" 
     927msgstr "%s zur Änderung auswählen" 
     928 
     929#: contrib/admindocs/views.py:53 
     930#: contrib/admindocs/views.py:55 
     931#: contrib/admindocs/views.py:57 
    797932msgid "tag:" 
    798933msgstr "Schlagwort:" 
    799934 
    800 #: contrib/admin/views/doc.py:79 
    801 #: contrib/admin/views/doc.py:81 
    802 #: contrib/admin/views/doc.py:83 
     935#: contrib/admindocs/views.py:87 
     936#: contrib/admindocs/views.py:89 
     937#: contrib/admindocs/views.py:91 
    803938msgid "filter:" 
    804939msgstr "Filter:" 
    805940 
    806 #: contrib/admin/views/doc.py:137 
    807 #: contrib/admin/views/doc.py:139 
    808 #: contrib/admin/views/doc.py:141 
     941#: contrib/admindocs/views.py:153 
     942#: contrib/admindocs/views.py:155 
     943#: contrib/admindocs/views.py:157 
    809944msgid "view:" 
    810945msgstr "Ansicht:" 
    811946 
    812 #: contrib/admin/views/doc.py:166 
     947#: contrib/admindocs/views.py:187 
    813948#, python-format 
    814949msgid "App %r not found" 
    815950msgstr "Anwendung %r nicht gefunden" 
    816951 
    817 #: contrib/admin/views/doc.py:173 
    818 #, python-format 
    819 msgid "Model %(name)r not found in app %(label)r" 
    820 msgstr "Modell %(name)r wurde nicht in Anwendung %(label)r gefunden" 
    821  
    822 #: contrib/admin/views/doc.py:185 
    823 #, python-format 
    824 msgid "the related `%(label)s.%(type)s` object" 
    825 msgstr "Das verknüpfte `%(label)s.%(type)s` Objekt" 
    826  
    827 #: contrib/admin/views/doc.py:185 
    828 #: contrib/admin/views/doc.py:207 
    829 #: contrib/admin/views/doc.py:221 
    830 #: contrib/admin/views/doc.py:226 
     952#: contrib/admindocs/views.py:194 
     953#, python-format 
     954msgid "Model %(model_name)r not found in app %(app_label)r" 
     955msgstr "Modell %(model_name)r wurde nicht in Anwendung %(app_label)r gefunden" 
     956 
     957#: contrib/admindocs/views.py:206 
     958#, python-format 
     959msgid "the related `%(app_label)s.%(data_type)s` object" 
     960msgstr "Das verknüpfte `%(app_label)s.%(data_type)s` Objekt" 
     961 
     962#: contrib/admindocs/views.py:206 
     963#: contrib/admindocs/views.py:228 
     964#: contrib/admindocs/views.py:242 
     965#: contrib/admindocs/views.py:247 
    831966msgid "model:" 
    832967msgstr "Modell:" 
    833968 
    834 #: contrib/admin/views/doc.py:216 
    835 #, python-format 
    836 msgid "related `%(label)s.%(name)s` objects" 
    837 msgstr "verknüpftes `%(label)s.%(name)s` Objekt" 
    838  
    839 #: contrib/admin/views/doc.py:221 
     969#: contrib/admindocs/views.py:237 
     970#, python-format 
     971msgid "related `%(app_label)s.%(object_name)s` objects" 
     972msgstr "verknüpftes `%(app_label)s.%(object_name)s` Objekt" 
     973 
     974#: contrib/admindocs/views.py:242 
    840975#, python-format 
    841976msgid "all %s" 
    842977msgstr "Alle %s" 
    843978 
    844 #: contrib/admin/views/doc.py:226 
     979#: contrib/admindocs/views.py:247 
    845980#, python-format 
    846981msgid "number of %s" 
    847982msgstr "Anzahl von %s" 
    848983 
    849 #: contrib/admin/views/doc.py:231 
     984#: contrib/admindocs/views.py:253 
    850985#, python-format 
    851986msgid "Fields on %s objects" 
    852987msgstr "Felder am %s Objekt" 
    853988 
    854 #: contrib/admin/views/doc.py:293 
    855 #: contrib/admin/views/doc.py:304 
    856 #: contrib/admin/views/doc.py:306 
    857 #: contrib/admin/views/doc.py:312 
    858 #: contrib/admin/views/doc.py:313 
    859 #: contrib/admin/views/doc.py:315 
     989#: contrib/admindocs/views.py:317 
     990#: contrib/admindocs/views.py:328 
     991#: contrib/admindocs/views.py:330 
     992#: contrib/admindocs/views.py:336 
     993#: contrib/admindocs/views.py:337 
     994#: contrib/admindocs/views.py:339 
    860995msgid "Integer" 
    861996msgstr "Ganzzahl" 
    862997 
    863 #: contrib/admin/views/doc.py:294 
     998#: contrib/admindocs/views.py:318 
    864999msgid "Boolean (Either True or False)" 
    8651000msgstr "Boolscher Wert (True oder False)" 
    8661001 
    867 #: contrib/admin/views/doc.py:295 
    868 #: contrib/admin/views/doc.py:314 
     1002#: contrib/admindocs/views.py:319 
     1003#: contrib/admindocs/views.py:338 
    8691004#, python-format 
    8701005msgid "String (up to %(max_length)s)" 
    8711006msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)" 
    8721007 
    873 #: contrib/admin/views/doc.py:296 
     1008#: contrib/admindocs/views.py:320 
    8741009msgid "Comma-separated integers" 
    8751010msgstr "Kommaseparierte Liste von Ganzzahlen" 
    8761011 
    877 #: contrib/admin/views/doc.py:297 
     1012#: contrib/admindocs/views.py:321 
    8781013msgid "Date (without time)" 
    8791014msgstr "Datum (ohne Uhrzeit)" 
    8801015 
    881 #: contrib/admin/views/doc.py:298 
     1016#: contrib/admindocs/views.py:322 
    8821017msgid "Date (with time)" 
    8831018msgstr "Datum (mit Uhrzeit)" 
    8841019 
    885 #: contrib/admin/views/doc.py:299 
     1020#: contrib/admindocs/views.py:323 
    8861021msgid "Decimal number" 
    8871022msgstr "Dezimalzahl" 
    8881023 
    889 #: contrib/admin/views/doc.py:300 
     1024#: contrib/admindocs/views.py:324 
    8901025msgid "E-mail address" 
    8911026msgstr "E-Mail-Adresse" 
    8921027 
    893 #: contrib/admin/views/doc.py:301 
    894 #: contrib/admin/views/doc.py:302 
    895 #: contrib/admin/views/doc.py:305 
     1028#: contrib/admindocs/views.py:325 
     1029#: contrib/admindocs/views.py:326 
     1030#: contrib/admindocs/views.py:329 
    8961031msgid "File path" 
    8971032msgstr "Dateipfad" 
    8981033 
    899 #: contrib/admin/views/doc.py:303 
     1034#: contrib/admindocs/views.py:327 
    9001035msgid "Floating point number" 
    9011036msgstr "Fließkommazahl" 
    9021037 
    903 #: contrib/admin/views/doc.py:307 
     1038#: contrib/admindocs/views.py:331 
    9041039#: contrib/comments/models.py:89 
    9051040msgid "IP address" 
    9061041msgstr "IP-Adresse" 
    9071042 
    908 #: contrib/admin/views/doc.py:309 
     1043#: contrib/admindocs/views.py:333 
    9091044msgid "Boolean (Either True, False or None)" 
    9101045msgstr "Boolscher Wert (True, False oder None)" 
    9111046 
    912 #: contrib/admin/views/doc.py:310 
     1047#: contrib/admindocs/views.py:334 
    9131048msgid "Relation to parent model" 
    9141049msgstr "Beziehung zum Eltern-Modell" 
    9151050 
    916 #: contrib/admin/views/doc.py:311 
     1051#: contrib/admindocs/views.py:335 
    9171052msgid "Phone number" 
    9181053msgstr "Telefonnummer" 
    9191054 
    920 #: contrib/admin/views/doc.py:316 
     1055#: contrib/admindocs/views.py:340 
    9211056msgid "Text" 
    9221057msgstr "Text" 
    9231058 
    924 #: contrib/admin/views/doc.py:317 
     1059#: contrib/admindocs/views.py:341 
    9251060msgid "Time" 
    9261061msgstr "Zeit" 
    9271062 
    928 #: contrib/admin/views/doc.py:318 
     1063#: contrib/admindocs/views.py:342 
    9291064#: contrib/flatpages/models.py:8 
    9301065msgid "URL" 
    9311066msgstr "Adresse (URL)" 
    9321067 
    933 #: contrib/admin/views/doc.py:319 
     1068#: contrib/admindocs/views.py:343 
    9341069msgid "U.S. state (two uppercase letters)" 
    9351070msgstr "U.S. Bundesstaat (zwei Großbuchstaben)" 
    9361071 
    937 #: contrib/admin/views/doc.py:320 
     1072#: contrib/admindocs/views.py:344 
    9381073msgid "XML text" 
    9391074msgstr "XML-Text" 
    9401075 
    941 #: contrib/admin/views/doc.py:346 
     1076#: contrib/admindocs/views.py:370 
    9421077#, python-format 
    9431078msgid "%s does not appear to be a urlpattern object" 
    9441079msgstr "%s ist scheinbar kein urlpattern Objekt" 
    9451080 
    946 #: contrib/admin/views/main.py:233 
    947 msgid "Site administration" 
    948 msgstr "Website-Verwaltung" 
    949  
    950 #: contrib/admin/views/main.py:280 
    951 #: contrib/admin/views/main.py:365 
    952 #, python-format 
    953 msgid "You may add another %s below." 
    954 msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden." 
    955  
    956 #: contrib/admin/views/main.py:298 
    957 #, python-format 
    958 msgid "Add %s" 
    959 msgstr "%s hinzufügen" 
    960  
    961 #: contrib/admin/views/main.py:344 
    962 #, python-format 
    963 msgid "Added %s." 
    964 msgstr "%s hinzugefügt." 
    965  
    966 #: contrib/admin/views/main.py:344 
    967 #: contrib/admin/views/main.py:346 
    968 #: contrib/admin/views/main.py:348 
    969 #: core/validators.py:283 
    970 #: db/models/manipulators.py:309 </