diff options
| -rw-r--r-- | django/conf/locale/de/LC_MESSAGES/django.mo | bin | 13734 -> 16412 bytes | |||
| -rw-r--r-- | django/conf/locale/de/LC_MESSAGES/django.po | 363 | ||||
| -rw-r--r-- | django/conf/locale/es/LC_MESSAGES/django.mo | bin | 5508 -> 5508 bytes | |||
| -rw-r--r-- | django/conf/locale/es/LC_MESSAGES/django.po | 329 | ||||
| -rw-r--r-- | django/conf/locale/it/LC_MESSAGES/django.mo | bin | 5583 -> 5583 bytes | |||
| -rw-r--r-- | django/conf/locale/it/LC_MESSAGES/django.po | 329 | ||||
| -rw-r--r-- | django/conf/locale/pt_BR/LC_MESSAGES/django.mo | bin | 5514 -> 5514 bytes | |||
| -rw-r--r-- | django/conf/locale/pt_BR/LC_MESSAGES/django.po | 329 | ||||
| -rw-r--r-- | django/conf/locale/ru/LC_MESSAGES/django.mo | bin | 5426 -> 5426 bytes | |||
| -rw-r--r-- | django/conf/locale/ru/LC_MESSAGES/django.po | 329 | ||||
| -rw-r--r-- | django/conf/locale/sr/LC_MESSAGES/django.mo | bin | 5613 -> 5613 bytes | |||
| -rw-r--r-- | django/conf/locale/sr/LC_MESSAGES/django.po | 329 | ||||
| -rw-r--r-- | django/core/meta/fields.py | 19 | ||||
| -rw-r--r-- | django/models/auth.py | 61 | ||||
| -rw-r--r-- | django/models/core.py | 57 |
15 files changed, 1788 insertions, 357 deletions
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo Binary files differindex 8959ba83e5..9038f36a01 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.mo +++ b/django/conf/locale/de/LC_MESSAGES/django.mo diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 8048f23e48..02e0aed857 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -3,19 +3,66 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-17 16:26+0200\n" +"POT-Creation-Date: 2005-10-17 20:56+0200\n" "PO-Revision-Date: 2005-10-08 00:03+0200\n" "Last-Translator: Georg Bauer <gb@bofh.ms>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: models/core.py:57 +#: models/core.py:5 +msgid "domain name" +msgstr "Domainname" + +#: models/core.py:6 +msgid "display name" +msgstr "Anzeigename" + +#: models/core.py:8 +msgid "site" +msgstr "Website" + +#: models/core.py:9 +msgid "sites" +msgstr "Websites" + +#: models/core.py:22 +msgid "label" +msgstr "Label" + +#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19 +msgid "name" +msgstr "Name" + +#: models/core.py:25 +msgid "package" +msgstr "Paket" + +#: models/core.py:26 +msgid "packages" +msgstr "Pakete" + +#: models/core.py:36 +msgid "python module name" +msgstr "Python Modulname" + +#: models/core.py:38 +msgid "content type" +msgstr "Inhaltstyp" + +#: models/core.py:39 +msgid "content types" +msgstr "Inhaltstypen" + +#: models/core.py:62 +msgid "redirect from" +msgstr "Umleitung von" + +#: models/core.py:63 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." @@ -23,7 +70,11 @@ msgstr "" "Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/" "events/search/'." -#: models/core.py:59 +#: models/core.py:64 +msgid "redirect to" +msgstr "Umleitung zu" + +#: models/core.py:65 msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." @@ -31,13 +82,41 @@ msgstr "" "Hier mus entweder ein absoluter Pfad oder eine komplette URL mit http:// am " "Anfang stehen." -#: models/core.py:74 +#: models/core.py:67 +msgid "redirect" +msgstr "Umleitung" + +#: models/core.py:68 +msgid "redirects" +msgstr "Umleitungen" + +#: models/core.py:81 +msgid "URL" +msgstr "URL" + +#: models/core.py:82 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" "Beispiel: '/about/contact/'. Wichtig: vorne und hinten muss ein / stehen." -#: models/core.py:79 +#: models/core.py:83 +msgid "title" +msgstr "Titel" + +#: models/core.py:84 +msgid "content" +msgstr "Inhalt" + +#: models/core.py:85 +msgid "enable comments" +msgstr "Kommentare aktivieren" + +#: models/core.py:86 +msgid "template name" +msgstr "Name der Vorlage" + +#: models/core.py:87 msgid "" "Example: 'flatfiles/contact_page'. If this isn't provided, the system will " "use 'flatfiles/default'." @@ -45,21 +124,113 @@ msgstr "" "Beispiel: 'flatfiles/contact_page'. Wenn dieses Feld nicht gefllt ist, wird " "'flatfiles/default' als Standard gewhlt." -#: models/core.py:80 +#: models/core.py:88 +msgid "registration required" +msgstr "Registrierung erforderlich" + +#: models/core.py:88 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" "Wenn hier ein Haken ist, knnen nur angemeldete Benutzer diese Seite sehen." +#: models/core.py:92 +msgid "flat page" +msgstr "Webseite" + +#: models/core.py:93 +msgid "flat pages" +msgstr "Webseiten" + +#: models/core.py:114 +msgid "session key" +msgstr "Sitzungs-ID" + +#: models/core.py:115 +msgid "session data" +msgstr "Sitzungsdaten" + +#: models/core.py:116 +msgid "expire date" +msgstr "Ablaufdatum" + +#: models/core.py:118 +msgid "session" +msgstr "Sitzung" + +#: models/core.py:119 +msgid "sessions" +msgstr "Sitzungen" + +#: models/auth.py:8 +msgid "codename" +msgstr "Codename" + +#: models/auth.py:10 +msgid "Permission" +msgstr "Berechtigung" + +#: models/auth.py:11 models/auth.py:58 +msgid "Permissions" +msgstr "Berechtigungen" + +#: models/auth.py:22 +msgid "Group" +msgstr "Gruppe" + +#: models/auth.py:23 models/auth.py:60 +msgid "Groups" +msgstr "Gruppen" + #: models/auth.py:33 +msgid "username" +msgstr "Benutzername" + +#: models/auth.py:34 +msgid "first name" +msgstr "Vorname" + +#: models/auth.py:35 +msgid "last name" +msgstr "Nachname" + +#: models/auth.py:36 +msgid "e-mail address" +msgstr "eMail-Adresse" + +#: models/auth.py:37 +msgid "password" +msgstr "Passwort" + +#: models/auth.py:37 msgid "Use an MD5 hash -- not the raw password." msgstr "Nicht das Passwort selber eintragen, sondern dessen MD5 signatur." -#: models/auth.py:34 +#: models/auth.py:38 +msgid "staff status" +msgstr "Administratorstatus" + +#: models/auth.py:38 msgid "Designates whether the user can log into this admin site." msgstr "" "Gibt an, ob der Benutzer sich an der Administrationsseite anmelden kann." +#: models/auth.py:39 +msgid "active" +msgstr "Aktiv" + #: models/auth.py:40 +msgid "superuser status" +msgstr "Hauptadministratorstatus" + +#: models/auth.py:41 +msgid "last login" +msgstr "letzte Anmeldung" + +#: models/auth.py:42 +msgid "date joined" +msgstr "Mitglied seit" + +#: models/auth.py:44 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." @@ -67,13 +238,53 @@ msgstr "" "Zustzlich zu den manuell angelegten Rechten erhlt dieser Benutzer auch " "alle Rechte, die seine zugewiesenen Gruppen haben." -#: conf/admin_templates/base_site.html:3 -msgid "Django site admin" -msgstr "Django Systemverwaltung" +#: models/auth.py:47 conf/admin_templates/admin_object_history.html:18 +msgid "User" +msgstr "Benutzer" -#: conf/admin_templates/base_site.html:6 -msgid "Django administration" -msgstr "Django Verwaltung" +#: models/auth.py:48 +msgid "Users" +msgstr "Benutzer" + +#: models/auth.py:57 +msgid "Personal info" +msgstr "Persnliche Infos" + +#: models/auth.py:59 +msgid "Important dates" +msgstr "Wichtige Daten" + +#: models/auth.py:182 models/auth.py:188 +msgid "Message" +msgstr "Mitteilung" + +#: models/auth.py:189 +msgid "Messages" +msgstr "Mitteilungen" + +#: models/auth.py:192 +msgid "action time" +msgstr "Zeit der Aktion" + +#: models/auth.py:195 +msgid "object id" +msgstr "Objekt ID" + +#: models/auth.py:196 +msgid "object repr" +msgstr "Objekt Darst." + +#: models/auth.py:197 +msgid "action flag" +msgstr "Aktionskennzeichen" + +#: models/auth.py:201 +msgid "log entry" +msgstr "Logeintrag" + +#: models/auth.py:202 +msgid "log entries" +msgstr "Logeintrge" #: conf/admin_templates/admin_object_history.html:4 #: conf/admin_templates/base.html:28 @@ -93,10 +304,6 @@ msgstr "Geschichte" msgid "Date/time" msgstr "Datum/Zeit" -#: conf/admin_templates/admin_object_history.html:18 -msgid "User" -msgstr "Benutzer" - #: conf/admin_templates/admin_object_history.html:19 msgid "Action" msgstr "Aktion" @@ -109,6 +316,38 @@ msgstr "" "Dieses Objekt hat keine nderungsgeschichte. Es wurde mglicherweise nicht " "ber diese Verwaltungsseiten angelegt." +#: conf/admin_templates/base_site.html:3 +msgid "Django site admin" +msgstr "Django Systemverwaltung" + +#: conf/admin_templates/base_site.html:6 +msgid "Django administration" +msgstr "Django Verwaltung" + +#: conf/admin_templates/index.html:26 +msgid "Add" +msgstr "Zufgen" + +#: conf/admin_templates/index.html:32 +msgid "Change" +msgstr "ndern" + +#: conf/admin_templates/index.html:42 +msgid "You don't have permission to edit anything." +msgstr "Sie haben keine Berechtigung irgendwas zu ndern." + +#: conf/admin_templates/index.html:50 +msgid "Recent Actions" +msgstr "Krzliche Aktionen" + +#: conf/admin_templates/index.html:51 +msgid "My Actions" +msgstr "Meine Aktionen" + +#: conf/admin_templates/index.html:55 +msgid "None available" +msgstr "Keine vorhanden" + #: conf/admin_templates/500.html:5 msgid "Server error (500)" msgstr "Serverfehler (500)" @@ -126,6 +365,15 @@ msgstr "" "eMail weitergegeben und sollte bald behoben sein. Vielen Dank fr Ihr " "Verstndnis." +#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 +msgid "Page not found" +msgstr "Seite nicht gefunden" + +#: conf/admin_templates/404.html:9 +msgid "We're sorry, but the requested page could not be found." +msgstr "" +"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." + #: conf/admin_templates/delete_confirmation_generic.html:6 #, python-format msgid "" @@ -150,39 +398,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ja, ich bin sicher" -#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 -msgid "Page not found" -msgstr "Seite nicht gefunden" - -#: conf/admin_templates/404.html:9 -msgid "We're sorry, but the requested page could not be found." -msgstr "" -"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." - -#: conf/admin_templates/index.html:26 -msgid "Add" -msgstr "Zufgen" - -#: conf/admin_templates/index.html:32 -msgid "Change" -msgstr "ndern" - -#: conf/admin_templates/index.html:42 -msgid "You don't have permission to edit anything." -msgstr "Sie haben keine Berechtigung irgendwas zu ndern." - -#: conf/admin_templates/index.html:50 -msgid "Recent Actions" -msgstr "Krzliche Aktionen" - -#: conf/admin_templates/index.html:51 -msgid "My Actions" -msgstr "Meine Aktionen" - -#: conf/admin_templates/index.html:55 -msgid "None available" -msgstr "Keine vorhanden" - #: conf/admin_templates/login.html:14 msgid "Username:" msgstr "Benutzername:" @@ -474,12 +689,14 @@ msgstr "Bitte entweder beide Felder ausfllen, oder beide leer lassen." #: core/validators.py:274 #, python-format msgid "This field must be given if %(field)s is %(value)s" -msgstr "Dieses Feld muss gefllt sein, wenn Feld %(field)s den Wert %(value)s hat." +msgstr "" +"Dieses Feld muss gefllt sein, wenn Feld %(field)s den Wert %(value)s hat." #: core/validators.py:286 #, python-format msgid "This field must be given if %(field)s is not %(value)s" -msgstr "Dieses Feld muss gefllt sein, wenn Feld %(field)s nicht %(value)s ist." +msgstr "" +"Dieses Feld muss gefllt sein, wenn Feld %(field)s nicht %(value)s ist." #: core/validators.py:305 msgid "Duplicate values are not allowed." @@ -507,8 +724,10 @@ msgstr[1] "Bitte eine gltige Dezimalzahl mit maximal %s Ziffern eingeben." msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" "Please enter a valid decimal number with at most %s decimal places." -msgstr[0] "Bitte eine gltige Dezimalzahl mit maximal %s Dezimalstelle eingeben." -msgstr[1] "Bitte eine gltige Dezimalzahl mit maximal %s Dezimalstellen eingeben." +msgstr[0] "" +"Bitte eine gltige Dezimalzahl mit maximal %s Dezimalstelle eingeben." +msgstr[1] "" +"Bitte eine gltige Dezimalzahl mit maximal %s Dezimalstellen eingeben." #: core/validators.py:354 #, python-format @@ -547,40 +766,62 @@ msgstr "Die URL %(url)s lieferte den falschen Content-Type '%(contenttype)s'." msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " "\"%(start)s\".)" -msgstr "Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schlieen. Die Zeile beginnt mit \"%(start)s\"." +msgstr "" +"Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schlieen. Die Zeile " +"beginnt mit \"%(start)s\"." #: core/validators.py:458 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " "starts with \"%(start)s\".)" -msgstr "In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile beginnt mit \"%(start)s\"." +msgstr "" +"In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile " +"beginnt mit \"%(start)s\"." #: core/validators.py:463 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" "(start)s\".)" -msgstr "Das Attribute %(attr)s in Zeile %(line)s ist ungltig. Die Zeile beginnt mit \"%(start)s\"." +msgstr "" +"Das Attribute %(attr)s in Zeile %(line)s ist ungltig. Die Zeile beginnt mit " +"\"%(start)s\"." #: core/validators.py:468 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" "(start)s\".)" -msgstr "<%(tag)s> in Zeile %(line)s ist ungltig. Die Zeile beginnt mit \"%(start)s\"." +msgstr "" +"<%(tag)s> in Zeile %(line)s ist ungltig. Die Zeile beginnt mit \"%(start)s" +"\"." #: core/validators.py:472 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " "starts with \"%(start)s\".)" -msgstr "Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die Zeile beginnt mit \"%(start)s\"." +msgstr "" +"Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die " +"Zeile beginnt mit \"%(start)s\"." #: core/validators.py:477 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " "starts with \"%(start)s\".)" -msgstr "Das Attribut %(attr)s in Zeile %(line)s hat einen ungltigen Wert. Die Zeile beginnt mit \"%(start)s\"." +msgstr "" +"Das Attribut %(attr)s in Zeile %(line)s hat einen ungltigen Wert. Die Zeile " +"beginnt mit \"%(start)s\"." + +#: core/meta/fields.py:95 +msgid " Separate multiple IDs with commas." +msgstr "Mehrere IDs knnen mit Komma getrennt werden." +#: core/meta/fields.py:98 +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +" Um mehr als eine Selektion zu treffen, \"Control\" oder auf dem Mac " +"\"Command\" beim Klicken gedrckt halten." diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo Binary files differindex db8f41c11f..0e9cb1eb77 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.mo +++ b/django/conf/locale/es/LC_MESSAGES/django.mo diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index e0897f4f42..35f3b244e8 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-17 16:26+0200\n" +"POT-Creation-Date: 2005-10-17 20:56+0200\n" "PO-Revision-Date: 2005-10-04 20:59GMT\n" "Last-Translator: Ricardo Javier Crdenes Medina <ricardo.cardenes@gmail." "com>\n" @@ -17,54 +17,272 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -#: models/core.py:57 +#: models/core.py:5 +msgid "domain name" +msgstr "" + +#: models/core.py:6 +msgid "display name" +msgstr "" + +#: models/core.py:8 +msgid "site" +msgstr "" + +#: models/core.py:9 +msgid "sites" +msgstr "" + +#: models/core.py:22 +msgid "label" +msgstr "" + +#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19 +#, fuzzy +msgid "name" +msgstr "Usuario:" + +#: models/core.py:25 +msgid "package" +msgstr "" + +#: models/core.py:26 +msgid "packages" +msgstr "" + +#: models/core.py:36 +msgid "python module name" +msgstr "" + +#: models/core.py:38 +msgid "content type" +msgstr "" + +#: models/core.py:39 +msgid "content types" +msgstr "" + +#: models/core.py:62 +msgid "redirect from" +msgstr "" + +#: models/core.py:63 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -#: models/core.py:59 +#: models/core.py:64 +msgid "redirect to" +msgstr "" + +#: models/core.py:65 msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -#: models/core.py:74 +#: models/core.py:67 +msgid "redirect" +msgstr "" + +#: models/core.py:68 +msgid "redirects" +msgstr "" + +#: models/core.py:81 +msgid "URL" +msgstr "" + +#: models/core.py:82 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -#: models/core.py:79 +#: models/core.py:83 +msgid "title" +msgstr "" + +#: models/core.py:84 +msgid "content" +msgstr "" + +#: models/core.py:85 +msgid "enable comments" +msgstr "" + +#: models/core.py:86 +msgid "template name" +msgstr "" + +#: models/core.py:87 msgid "" "Example: 'flatfiles/contact_page'. If this isn't provided, the system will " "use 'flatfiles/default'." msgstr "" -#: models/core.py:80 +#: models/core.py:88 +msgid "registration required" +msgstr "" + +#: models/core.py:88 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" +#: models/core.py:92 +msgid "flat page" +msgstr "" + +#: models/core.py:93 +msgid "flat pages" +msgstr "" + +#: models/core.py:114 +msgid "session key" +msgstr "" + +#: models/core.py:115 +msgid "session data" +msgstr "" + +#: models/core.py:116 +msgid "expire date" +msgstr "" + +#: models/core.py:118 +msgid "session" +msgstr "" + +#: models/core.py:119 +msgid "sessions" +msgstr "" + +#: models/auth.py:8 +msgid "codename" +msgstr "" + +#: models/auth.py:10 +msgid "Permission" +msgstr "" + +#: models/auth.py:11 models/auth.py:58 +msgid "Permissions" +msgstr "" + +#: models/auth.py:22 +msgid "Group" +msgstr "" + +#: models/auth.py:23 models/auth.py:60 +msgid "Groups" +msgstr "" + #: models/auth.py:33 +#, fuzzy +msgid "username" +msgstr "Usuario:" + +#: models/auth.py:34 +msgid "first name" +msgstr "" + +#: models/auth.py:35 +msgid "last name" +msgstr "" + +#: models/auth.py:36 +#, fuzzy +msgid "e-mail address" +msgstr "Direccin de correo:" + +#: models/auth.py:37 +#, fuzzy +msgid "password" +msgstr "Clave:" + +#: models/auth.py:37 msgid "Use an MD5 hash -- not the raw password." msgstr "" -#: models/auth.py:34 +#: models/auth.py:38 +msgid "staff status" +msgstr "" + +#: models/auth.py:38 msgid "Designates whether the user can log into this admin site." msgstr "" +#: models/auth.py:39 +msgid "active" +msgstr "" + #: models/auth.py:40 +msgid "superuser status" +msgstr "" + +#: models/auth.py:41 +msgid "last login" +msgstr "" + +#: models/auth.py:42 +msgid "date joined" +msgstr "" + +#: models/auth.py:44 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -#: conf/admin_templates/base_site.html:3 -msgid "Django site admin" -msgstr "Sitio de administracin de Django" +#: models/auth.py:47 conf/admin_templates/admin_object_history.html:18 +msgid "User" +msgstr "Usuario" -#: conf/admin_templates/base_site.html:6 -msgid "Django administration" -msgstr "Administracin de Django" +#: models/auth.py:48 +#, fuzzy +msgid "Users" +msgstr "Usuario" + +#: models/auth.py:57 +msgid "Personal info" +msgstr "" + +#: models/auth.py:59 +msgid "Important dates" +msgstr "" + +#: models/auth.py:182 models/auth.py:188 +msgid "Message" +msgstr "" + +#: models/auth.py:189 +msgid "Messages" +msgstr "" + +#: models/auth.py:192 +#, fuzzy +msgid "action time" +msgstr "Fecha/hora" + +#: models/auth.py:195 +msgid "object id" +msgstr "" + +#: models/auth.py:196 +msgid "object repr" +msgstr "" + +#: models/auth.py:197 +msgid "action flag" +msgstr "" + +#: models/auth.py:201 +msgid "log entry" +msgstr "" + +#: models/auth.py:202 +msgid "log entries" +msgstr "" #: conf/admin_templates/admin_object_history.html:4 #: conf/admin_templates/base.html:28 @@ -84,10 +302,6 @@ msgstr "Histrico" msgid "Date/time" msgstr "Fecha/hora" -#: conf/admin_templates/admin_object_history.html:18 -msgid "User" -msgstr "Usuario" - #: conf/admin_templates/admin_object_history.html:19 msgid "Action" msgstr "Accin" @@ -100,6 +314,38 @@ msgstr "" "Este objeto no tiene histrico de cambios. Probablemente no fue aadido " "usando este sitio de administracin." +#: conf/admin_templates/base_site.html:3 +msgid "Django site admin" +msgstr "Sitio de administracin de Django" + +#: conf/admin_templates/base_site.html:6 +msgid "Django administration" +msgstr "Administracin de Django" + +#: conf/admin_templates/index.html:26 +msgid "Add" +msgstr "Agregar" + +#: conf/admin_templates/index.html:32 +msgid "Change" +msgstr "Modificar" + +#: conf/admin_templates/index.html:42 +msgid "You don't have permission to edit anything." +msgstr "No tiene permiso para editar nada." + +#: conf/admin_templates/index.html:50 +msgid "Recent Actions" +msgstr "Acciones recientes" + +#: conf/admin_templates/index.html:51 +msgid "My Actions" +msgstr "Mis acciones" + +#: conf/admin_templates/index.html:55 +msgid "None available" +msgstr "Ninguno disponible" + #: conf/admin_templates/500.html:5 msgid "Server error (500)" msgstr "Error del servidor (500)" @@ -117,6 +363,14 @@ msgstr "" "mediante correo electrnico y debera arreglarse en breve. Gracias por su " "paciencia" +#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 +msgid "Page not found" +msgstr "Pgina no encontrada" + +#: conf/admin_templates/404.html:9 +msgid "We're sorry, but the requested page could not be found." +msgstr "Lo sentimos, pero no se encuentra la pgina solicitada." + #: conf/admin_templates/delete_confirmation_generic.html:6 #, python-format msgid "" @@ -141,38 +395,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "S, estoy seguro" -#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 -msgid "Page not found" -msgstr "Pgina no encontrada" - -#: conf/admin_templates/404.html:9 -msgid "We're sorry, but the requested page could not be found." -msgstr "Lo sentimos, pero no se encuentra la pgina solicitada." - -#: conf/admin_templates/index.html:26 -msgid "Add" -msgstr "Agregar" - -#: conf/admin_templates/index.html:32 -msgid "Change" -msgstr "Modificar" - -#: conf/admin_templates/index.html:42 -msgid "You don't have permission to edit anything." -msgstr "No tiene permiso para editar nada." - -#: conf/admin_templates/index.html:50 -msgid "Recent Actions" -msgstr "Acciones recientes" - -#: conf/admin_templates/index.html:51 -msgid "My Actions" -msgstr "Mis acciones" - -#: conf/admin_templates/index.html:55 -msgid "None available" -msgstr "Ninguno disponible" - #: conf/admin_templates/login.html:14 msgid "Username:" msgstr "Usuario:" @@ -563,6 +785,15 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/fields.py:95 +msgid " Separate multiple IDs with commas." +msgstr "" + +#: core/meta/fields.py:98 +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" + #~ msgid "Server error <em>(500)</em>" #~ msgstr "Error del servidor <em>(500)</em>" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo Binary files differindex 5ff502c1cf..83670a2c8c 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.mo +++ b/django/conf/locale/it/LC_MESSAGES/django.mo diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 2e7aff6bb2..7ab817715f 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-17 16:27+0200\n" +"POT-Creation-Date: 2005-10-17 20:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,54 +16,272 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: models/core.py:57 +#: models/core.py:5 +msgid "domain name" +msgstr "" + +#: models/core.py:6 +msgid "display name" +msgstr "" + +#: models/core.py:8 +msgid "site" +msgstr "" + +#: models/core.py:9 +msgid "sites" +msgstr "" + +#: models/core.py:22 +msgid "label" +msgstr "" + +#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19 +#, fuzzy +msgid "name" +msgstr "Nome utente:" + +#: models/core.py:25 +msgid "package" +msgstr "" + +#: models/core.py:26 +msgid "packages" +msgstr "" + +#: models/core.py:36 +msgid "python module name" +msgstr "" + +#: models/core.py:38 +msgid "content type" +msgstr "" + +#: models/core.py:39 +msgid "content types" +msgstr "" + +#: models/core.py:62 +msgid "redirect from" +msgstr "" + +#: models/core.py:63 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -#: models/core.py:59 +#: models/core.py:64 +msgid "redirect to" +msgstr "" + +#: models/core.py:65 msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -#: models/core.py:74 +#: models/core.py:67 +msgid "redirect" +msgstr "" + +#: models/core.py:68 +msgid "redirects" +msgstr "" + +#: models/core.py:81 +msgid "URL" +msgstr "" + +#: models/core.py:82 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -#: models/core.py:79 +#: models/core.py:83 +msgid "title" +msgstr "" + +#: models/core.py:84 +msgid "content" +msgstr "" + +#: models/core.py:85 +msgid "enable comments" +msgstr "" + +#: models/core.py:86 +msgid "template name" +msgstr "" + +#: models/core.py:87 msgid "" "Example: 'flatfiles/contact_page'. If this isn't provided, the system will " "use 'flatfiles/default'." msgstr "" -#: models/core.py:80 +#: models/core.py:88 +msgid "registration required" +msgstr "" + +#: models/core.py:88 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" +#: models/core.py:92 +msgid "flat page" +msgstr "" + +#: models/core.py:93 +msgid "flat pages" +msgstr "" + +#: models/core.py:114 +msgid "session key" +msgstr "" + +#: models/core.py:115 +msgid "session data" +msgstr "" + +#: models/core.py:116 +msgid "expire date" +msgstr "" + +#: models/core.py:118 +msgid "session" +msgstr "" + +#: models/core.py:119 +msgid "sessions" +msgstr "" + +#: models/auth.py:8 +msgid "codename" +msgstr "" + +#: models/auth.py:10 +msgid "Permission" +msgstr "" + +#: models/auth.py:11 models/auth.py:58 +msgid "Permissions" +msgstr "" + +#: models/auth.py:22 +msgid "Group" +msgstr "" + +#: models/auth.py:23 models/auth.py:60 +msgid "Groups" +msgstr "" + #: models/auth.py:33 +#, fuzzy +msgid "username" +msgstr "Nome utente:" + +#: models/auth.py:34 +msgid "first name" +msgstr "" + +#: models/auth.py:35 +msgid "last name" +msgstr "" + +#: models/auth.py:36 +#, fuzzy +msgid "e-mail address" +msgstr "Indirizzo e-mail:" + +#: models/auth.py:37 +#, fuzzy +msgid "password" +msgstr "Password:" + +#: models/auth.py:37 msgid "Use an MD5 hash -- not the raw password." msgstr "" -#: models/auth.py:34 +#: models/auth.py:38 +msgid "staff status" +msgstr "" + +#: models/auth.py:38 msgid "Designates whether the user can log into this admin site." msgstr "" +#: models/auth.py:39 +msgid "active" +msgstr "" + #: models/auth.py:40 +msgid "superuser status" +msgstr "" + +#: models/auth.py:41 +msgid "last login" +msgstr "" + +#: models/auth.py:42 +msgid "date joined" +msgstr "" + +#: models/auth.py:44 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -#: conf/admin_templates/base_site.html:3 -msgid "Django site admin" -msgstr "Amministrazione sito Django" +#: models/auth.py:47 conf/admin_templates/admin_object_history.html:18 +msgid "User" +msgstr "Utente" -#: conf/admin_templates/base_site.html:6 -msgid "Django administration" -msgstr "Amministrazione Django" +#: models/auth.py:48 +#, fuzzy +msgid "Users" +msgstr "Utente" + +#: models/auth.py:57 +msgid "Personal info" +msgstr "" + +#: models/auth.py:59 +msgid "Important dates" +msgstr "" + +#: models/auth.py:182 models/auth.py:188 +msgid "Message" +msgstr "" + +#: models/auth.py:189 +msgid "Messages" +msgstr "" + +#: models/auth.py:192 +#, fuzzy +msgid "action time" +msgstr "Data/ora" + +#: models/auth.py:195 +msgid "object id" +msgstr "" + +#: models/auth.py:196 +msgid "object repr" +msgstr "" + +#: models/auth.py:197 +msgid "action flag" +msgstr "" + +#: models/auth.py:201 +msgid "log entry" +msgstr "" + +#: models/auth.py:202 +msgid "log entries" +msgstr "" #: conf/admin_templates/admin_object_history.html:4 #: conf/admin_templates/base.html:28 @@ -83,10 +301,6 @@ msgstr "Storia" msgid "Date/time" msgstr "Data/ora" -#: conf/admin_templates/admin_object_history.html:18 -msgid "User" -msgstr "Utente" - #: conf/admin_templates/admin_object_history.html:19 msgid "Action" msgstr "Azione" @@ -99,6 +313,38 @@ msgstr "" "Questo oggetto non ha cambiamenti storicizzati. Probabilmente non stato " "creato con questo sito amministrativo." +#: conf/admin_templates/base_site.html:3 +msgid "Django site admin" +msgstr "Amministrazione sito Django" + +#: conf/admin_templates/base_site.html:6 +msgid "Django administration" +msgstr "Amministrazione Django" + +#: conf/admin_templates/index.html:26 +msgid "Add" +msgstr "Aggiungi" + +#: conf/admin_templates/index.html:32 +msgid "Change" +msgstr "Cambia" + +#: conf/admin_templates/index.html:42 +msgid "You don't have permission to edit anything." +msgstr "Non hai i permessi di modificare nulla." + +#: conf/admin_templates/index.html:50 +msgid "Recent Actions" +msgstr "Azioni Recenti" + +#: conf/admin_templates/index.html:51 +msgid "My Actions" +msgstr "Proprie Azioni" + +#: conf/admin_templates/index.html:55 +msgid "None available" +msgstr "Nessuna disponibile" + #: conf/admin_templates/500.html:5 msgid "Server error (500)" msgstr "Errore del server (500)" @@ -115,6 +361,14 @@ msgstr "" "C' stato un errore. E' stato riportato agli amministratori del sito via e-" "mail e verr risolto a breve. Grazie per la vostra pazienza" +#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 +msgid "Page not found" +msgstr "Pagina non trovata" + +#: conf/admin_templates/404.html:9 +msgid "We're sorry, but the requested page could not be found." +msgstr "Spiacente, ma la pagina richiesta non esiste." + #: conf/admin_templates/delete_confirmation_generic.html:6 #, python-format msgid "" @@ -139,38 +393,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "S, sono sicuro" -#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 -msgid "Page not found" -msgstr "Pagina non trovata" - -#: conf/admin_templates/404.html:9 -msgid "We're sorry, but the requested page could not be found." -msgstr "Spiacente, ma la pagina richiesta non esiste." - -#: conf/admin_templates/index.html:26 -msgid "Add" -msgstr "Aggiungi" - -#: conf/admin_templates/index.html:32 -msgid "Change" -msgstr "Cambia" - -#: conf/admin_templates/index.html:42 -msgid "You don't have permission to edit anything." -msgstr "Non hai i permessi di modificare nulla." - -#: conf/admin_templates/index.html:50 -msgid "Recent Actions" -msgstr "Azioni Recenti" - -#: conf/admin_templates/index.html:51 -msgid "My Actions" -msgstr "Proprie Azioni" - -#: conf/admin_templates/index.html:55 -msgid "None available" -msgstr "Nessuna disponibile" - #: conf/admin_templates/login.html:14 msgid "Username:" msgstr "Nome utente:" @@ -562,6 +784,15 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/fields.py:95 +msgid " Separate multiple IDs with commas." +msgstr "" + +#: core/meta/fields.py:98 +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" + #~ msgid "Server error <em>(500)</em>" #~ msgstr "Errore del server <em>(500)</em>" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo Binary files differindex 1ce1976f4c..05a4b1c6c6 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 85d707618f..5ca9f9ad67 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-17 16:26+0200\n" +"POT-Creation-Date: 2005-10-17 20:56+0200\n" "PO-Revision-Date: 2005-10-11 09:12GMT-3\n" "Last-Translator: João Paulo Farias <jpaulofarias@gmail.com>\n" "Language-Team: Português do Brasil <pt-br@li.org>\n" @@ -16,54 +16,272 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: models/core.py:57 +#: models/core.py:5 +msgid "domain name" +msgstr "" + +#: models/core.py:6 +msgid "display name" +msgstr "" + +#: models/core.py:8 +msgid "site" +msgstr "" + +#: models/core.py:9 +msgid "sites" +msgstr "" + +#: models/core.py:22 +msgid "label" +msgstr "" + +#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19 +#, fuzzy +msgid "name" +msgstr "Usuário:" + +#: models/core.py:25 +msgid "package" +msgstr "" + +#: models/core.py:26 +msgid "packages" +msgstr "" + +#: models/core.py:36 +msgid "python module name" +msgstr "" + +#: models/core.py:38 +msgid "content type" +msgstr "" + +#: models/core.py:39 +msgid "content types" +msgstr "" + +#: models/core.py:62 +msgid "redirect from" +msgstr "" + +#: models/core.py:63 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -#: models/core.py:59 +#: models/core.py:64 +msgid "redirect to" +msgstr "" + +#: models/core.py:65 msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -#: models/core.py:74 +#: models/core.py:67 +msgid "redirect" +msgstr "" + +#: models/core.py:68 +msgid "redirects" +msgstr "" + +#: models/core.py:81 +msgid "URL" +msgstr "" + +#: models/core.py:82 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -#: models/core.py:79 +#: models/core.py:83 +msgid "title" +msgstr "" + +#: models/core.py:84 +msgid "content" +msgstr "" + +#: models/core.py:85 +msgid "enable comments" +msgstr "" + +#: models/core.py:86 +msgid "template name" +msgstr "" + +#: models/core.py:87 msgid "" "Example: 'flatfiles/contact_page'. If this isn't provided, the system will " "use 'flatfiles/default'." msgstr "" -#: models/core.py:80 +#: models/core.py:88 +msgid "registration required" +msgstr "" + +#: models/core.py:88 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" +#: models/core.py:92 +msgid "flat page" +msgstr "" + +#: models/core.py:93 +msgid "flat pages" +msgstr "" + +#: models/core.py:114 +msgid "session key" +msgstr "" + +#: models/core.py:115 +msgid "session data" +msgstr "" + +#: models/core.py:116 +msgid "expire date" +msgstr "" + +#: models/core.py:118 +msgid "session" +msgstr "" + +#: models/core.py:119 +msgid "sessions" +msgstr "" + +#: models/auth.py:8 +msgid "codename" +msgstr "" + +#: models/auth.py:10 +msgid "Permission" +msgstr "" + +#: models/auth.py:11 models/auth.py:58 +msgid "Permissions" +msgstr "" + +#: models/auth.py:22 +msgid "Group" +msgstr "" + +#: models/auth.py:23 models/auth.py:60 +msgid "Groups" +msgstr "" + #: models/auth.py:33 +#, fuzzy +msgid "username" +msgstr "Usuário:" + +#: models/auth.py:34 +msgid "first name" +msgstr "" + +#: models/auth.py:35 +msgid "last name" +msgstr "" + +#: models/auth.py:36 +#, fuzzy +msgid "e-mail address" +msgstr "Endereço de e-mail:" + +#: models/auth.py:37 +#, fuzzy +msgid "password" +msgstr "Senha:" + +#: models/auth.py:37 msgid "Use an MD5 hash -- not the raw password." msgstr "" -#: models/auth.py:34 +#: models/auth.py:38 +msgid "staff status" +msgstr "" + +#: models/auth.py:38 msgid "Designates whether the user can log into this admin site." msgstr "" +#: models/auth.py:39 +msgid "active" +msgstr "" + #: models/auth.py:40 +msgid "superuser status" +msgstr "" + +#: models/auth.py:41 +msgid "last login" +msgstr "" + +#: models/auth.py:42 +msgid "date joined" +msgstr "" + +#: models/auth.py:44 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -#: conf/admin_templates/base_site.html:3 -msgid "Django site admin" -msgstr "Site de administração do Django" +#: models/auth.py:47 conf/admin_templates/admin_object_history.html:18 +msgid "User" +msgstr "Usuário" -#: conf/admin_templates/base_site.html:6 -msgid "Django administration" -msgstr "Administração do Django" +#: models/auth.py:48 +#, fuzzy +msgid "Users" +msgstr "Usuário" + +#: models/auth.py:57 +msgid "Personal info" +msgstr "" + +#: models/auth.py:59 +msgid "Important dates" +msgstr "" + +#: models/auth.py:182 models/auth.py:188 +msgid "Message" +msgstr "" + +#: models/auth.py:189 +msgid "Messages" +msgstr "" + +#: models/auth.py:192 +#, fuzzy +msgid "action time" +msgstr "Data/hora" + +#: models/auth.py:195 +msgid "object id" +msgstr "" + +#: models/auth.py:196 +msgid "object repr" +msgstr "" + +#: models/auth.py:197 +msgid "action flag" +msgstr "" + +#: models/auth.py:201 +msgid "log entry" +msgstr "" + +#: models/auth.py:202 +msgid "log entries" +msgstr "" #: conf/admin_templates/admin_object_history.html:4 #: conf/admin_templates/base.html:28 @@ -83,10 +301,6 @@ msgstr "Histórico" msgid "Date/time" msgstr "Data/hora" -#: conf/admin_templates/admin_object_history.html:18 -msgid "User" -msgstr "Usuário" - #: conf/admin_templates/admin_object_history.html:19 msgid "Action" msgstr "Ação" @@ -99,6 +313,38 @@ msgstr "" "Este objeto não tem um histórico de alterações. Ele provavelmente não foi " "adicionado por este site de administração." +#: conf/admin_templates/base_site.html:3 +msgid "Django site admin" +msgstr "Site de administração do Django" + +#: conf/admin_templates/base_site.html:6 +msgid "Django administration" +msgstr "Administração do Django" + +#: conf/admin_templates/index.html:26 +msgid "Add" +msgstr "Adicionar" + +#: conf/admin_templates/index.html:32 +msgid "Change" +msgstr "Modificar" + +#: conf/admin_templates/index.html:42 +msgid "You don't have permission to edit anything." +msgstr "Você não tem permissão para edição." + +#: conf/admin_templates/index.html:50 +msgid "Recent Actions" +msgstr "Ações Recentes" + +#: conf/admin_templates/index.html:51 +msgid "My Actions" +msgstr "Minhas Ações" + +#: conf/admin_templates/index.html:55 +msgid "None available" +msgstr "Nenhuma disponível" + #: conf/admin_templates/500.html:5 msgid "Server error (500)" msgstr "Erro no servidor (500)" @@ -115,6 +361,14 @@ msgstr "" "Houve um erro. Este foi reportado aos administradores do site através d e-" "mail e deve ser consertado em breve. Obrigado pela compreensão." +#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 +msgid "Page not found" +msgstr "Página não encontrada" + +#: conf/admin_templates/404.html:9 +msgid "We're sorry, but the requested page could not be found." +msgstr "Desculpe, mas a página requisitada não pode ser encontrada." + #: conf/admin_templates/delete_confirmation_generic.html:6 #, python-format msgid "" @@ -139,38 +393,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Sim, tenho certeza" -#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 -msgid "Page not found" -msgstr "Página não encontrada" - -#: conf/admin_templates/404.html:9 -msgid "We're sorry, but the requested page could not be found." -msgstr "Desculpe, mas a página requisitada não pode ser encontrada." - -#: conf/admin_templates/index.html:26 -msgid "Add" -msgstr "Adicionar" - -#: conf/admin_templates/index.html:32 -msgid "Change" -msgstr "Modificar" - -#: conf/admin_templates/index.html:42 -msgid "You don't have permission to edit anything." -msgstr "Você não tem permissão para edição." - -#: conf/admin_templates/index.html:50 -msgid "Recent Actions" -msgstr "Ações Recentes" - -#: conf/admin_templates/index.html:51 -msgid "My Actions" -msgstr "Minhas Ações" - -#: conf/admin_templates/index.html:55 -msgid "None available" -msgstr "Nenhuma disponível" - #: conf/admin_templates/login.html:14 msgid "Username:" msgstr "Usuário:" @@ -561,5 +783,14 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/fields.py:95 +msgid " Separate multiple IDs with commas." +msgstr "" + +#: core/meta/fields.py:98 +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" + #~ msgid "Click to change" #~ msgstr "Clique para alterar" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo Binary files differindex fcbf92d9af..8d6d5a36c3 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.mo +++ b/django/conf/locale/ru/LC_MESSAGES/django.mo diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index 7f5844da47..43e6c3bdbb 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-17 16:26+0200\n" +"POT-Creation-Date: 2005-10-17 20:56+0200\n" "PO-Revision-Date: 2005-10-05 00:00\n" "Last-Translator: Dmitry Sorokin <ds@@dial.com.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -15,54 +15,272 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" -#: models/core.py:57 +#: models/core.py:5 +msgid "domain name" +msgstr "" + +#: models/core.py:6 +msgid "display name" +msgstr "" + +#: models/core.py:8 +msgid "site" +msgstr "" + +#: models/core.py:9 +msgid "sites" +msgstr "" + +#: models/core.py:22 +msgid "label" +msgstr "" + +#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19 +#, fuzzy +msgid "name" +msgstr ":" + +#: models/core.py:25 +msgid "package" +msgstr "" + +#: models/core.py:26 +msgid "packages" +msgstr "" + +#: models/core.py:36 +msgid "python module name" +msgstr "" + +#: models/core.py:38 +msgid "content type" +msgstr "" + +#: models/core.py:39 +msgid "content types" +msgstr "" + +#: models/core.py:62 +msgid "redirect from" +msgstr "" + +#: models/core.py:63 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -#: models/core.py:59 +#: models/core.py:64 +msgid "redirect to" +msgstr "" + +#: models/core.py:65 msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -#: models/core.py:74 +#: models/core.py:67 +msgid "redirect" +msgstr "" + +#: models/core.py:68 +msgid "redirects" +msgstr "" + +#: models/core.py:81 +msgid "URL" +msgstr "" + +#: models/core.py:82 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -#: models/core.py:79 +#: models/core.py:83 +msgid "title" +msgstr "" + +#: models/core.py:84 +msgid "content" +msgstr "" + +#: models/core.py:85 +msgid "enable comments" +msgstr "" + +#: models/core.py:86 +msgid "template name" +msgstr "" + +#: models/core.py:87 msgid "" "Example: 'flatfiles/contact_page'. If this isn't provided, the system will " "use 'flatfiles/default'." msgstr "" -#: models/core.py:80 +#: models/core.py:88 +msgid "registration required" +msgstr "" + +#: models/core.py:88 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" +#: models/core.py:92 +msgid "flat page" +msgstr "" + +#: models/core.py:93 +msgid "flat pages" +msgstr "" + +#: models/core.py:114 +msgid "session key" +msgstr "" + +#: models/core.py:115 +msgid "session data" +msgstr "" + +#: models/core.py:116 +msgid "expire date" +msgstr "" + +#: models/core.py:118 +msgid "session" +msgstr "" + +#: models/core.py:119 +msgid "sessions" +msgstr "" + +#: models/auth.py:8 +msgid "codename" +msgstr "" + +#: models/auth.py:10 +msgid "Permission" +msgstr "" + +#: models/auth.py:11 models/auth.py:58 +msgid "Permissions" +msgstr "" + +#: models/auth.py:22 +msgid "Group" +msgstr "" + +#: models/auth.py:23 models/auth.py:60 +msgid "Groups" +msgstr "" + #: models/auth.py:33 +#, fuzzy +msgid "username" +msgstr ":" + +#: models/auth.py:34 +msgid "first name" +msgstr "" + +#: models/auth.py:35 +msgid "last name" +msgstr "" + +#: models/auth.py:36 +#, fuzzy +msgid "e-mail address" +msgstr "E-mail :" + +#: models/auth.py:37 +#, fuzzy +msgid "password" +msgstr ":" + +#: models/auth.py:37 msgid "Use an MD5 hash -- not the raw password." msgstr "" -#: models/auth.py:34 +#: models/auth.py:38 +msgid "staff status" +msgstr "" + +#: models/auth.py:38 msgid "Designates whether the user can log into this admin site." msgstr "" +#: models/auth.py:39 +msgid "active" +msgstr "" + #: models/auth.py:40 +msgid "superuser status" +msgstr "" + +#: models/auth.py:41 +msgid "last login" +msgstr "" + +#: models/auth.py:42 +msgid "date joined" +msgstr "" + +#: models/auth.py:44 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -#: conf/admin_templates/base_site.html:3 -msgid "Django site admin" -msgstr " Django" +#: models/auth.py:47 conf/admin_templates/admin_object_history.html:18 +msgid "User" +msgstr "" -#: conf/admin_templates/base_site.html:6 -msgid "Django administration" -msgstr " Django" +#: models/auth.py:48 +#, fuzzy +msgid "Users" +msgstr "" + +#: models/auth.py:57 +msgid "Personal info" +msgstr "" + +#: models/auth.py:59 +msgid "Important dates" +msgstr "" + +#: models/auth.py:182 models/auth.py:188 +msgid "Message" +msgstr "" + +#: models/auth.py:189 +msgid "Messages" +msgstr "" + +#: models/auth.py:192 +#, fuzzy +msgid "action time" +msgstr "/" + +#: models/auth.py:195 +msgid "object id" +msgstr "" + +#: models/auth.py:196 +msgid "object repr" +msgstr "" + +#: models/auth.py:197 +msgid "action flag" +msgstr "" + +#: models/auth.py:201 +msgid "log entry" +msgstr "" + +#: models/auth.py:202 +msgid "log entries" +msgstr "" #: conf/admin_templates/admin_object_history.html:4 #: conf/admin_templates/base.html:28 @@ -82,10 +300,6 @@ msgstr "" msgid "Date/time" msgstr "/" -#: conf/admin_templates/admin_object_history.html:18 -msgid "User" -msgstr "" - #: conf/admin_templates/admin_object_history.html:19 msgid "Action" msgstr "" @@ -98,6 +312,38 @@ msgstr "" " . " " ." +#: conf/admin_templates/base_site.html:3 +msgid "Django site admin" +msgstr " Django" + +#: conf/admin_templates/base_site.html:6 +msgid "Django administration" +msgstr " Django" + +#: conf/admin_templates/index.html:26 +msgid "Add" +msgstr "" + +#: conf/admin_templates/index.html:32 +msgid "Change" +msgstr "" + +#: conf/admin_templates/index.html:42 +msgid "You don't have permission to edit anything." +msgstr " ." + +#: conf/admin_templates/index.html:50 +msgid "Recent Actions" +msgstr " " + +#: conf/admin_templates/index.html:51 +msgid "My Actions" +msgstr " " + +#: conf/admin_templates/index.html:55 +msgid "None available" +msgstr "" + #: conf/admin_templates/500.html:5 msgid "Server error (500)" msgstr " (500)" @@ -114,6 +360,14 @@ msgstr "" " . e-mail " " . ." +#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 +msgid "Page not found" +msgstr " " + +#: conf/admin_templates/404.html:9 +msgid "We're sorry, but the requested page could not be found." +msgstr " , ." + #: conf/admin_templates/delete_confirmation_generic.html:6 #, python-format msgid "" @@ -138,38 +392,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr ", " -#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 -msgid "Page not found" -msgstr " " - -#: conf/admin_templates/404.html:9 -msgid "We're sorry, but the requested page could not be found." -msgstr " , ." - -#: conf/admin_templates/index.html:26 -msgid "Add" -msgstr "" - -#: conf/admin_templates/index.html:32 -msgid "Change" -msgstr "" - -#: conf/admin_templates/index.html:42 -msgid "You don't have permission to edit anything." -msgstr " ." - -#: conf/admin_templates/index.html:50 -msgid "Recent Actions" -msgstr " " - -#: conf/admin_templates/index.html:51 -msgid "My Actions" -msgstr " " - -#: conf/admin_templates/index.html:55 -msgid "None available" -msgstr "" - #: conf/admin_templates/login.html:14 msgid "Username:" msgstr ":" @@ -560,6 +782,15 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/fields.py:95 +msgid " Separate multiple IDs with commas." +msgstr "" + +#: core/meta/fields.py:98 +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" + #~ msgid "Server error <em>(500)</em>" #~ msgstr " <em>(500)</em>" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo Binary files differindex 5f5508c6a6..bfaa8f6d5f 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.mo +++ b/django/conf/locale/sr/LC_MESSAGES/django.mo diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index b3f1ca89b7..87a04f9ad5 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-17 16:26+0200\n" +"POT-Creation-Date: 2005-10-17 20:56+0200\n" "PO-Revision-Date: 2005-10-05 14:39+0100\n" "Last-Translator: Petar Marić <petar.maric@gmail.com>\n" "Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail." @@ -17,54 +17,272 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Basepath: ../../../../\n" -#: models/core.py:57 +#: models/core.py:5 +msgid "domain name" +msgstr "" + +#: models/core.py:6 +msgid "display name" +msgstr "" + +#: models/core.py:8 +msgid "site" +msgstr "" + +#: models/core.py:9 +msgid "sites" +msgstr "" + +#: models/core.py:22 +msgid "label" +msgstr "" + +#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19 +#, fuzzy +msgid "name" +msgstr "Korisničko ime:" + +#: models/core.py:25 +msgid "package" +msgstr "" + +#: models/core.py:26 +msgid "packages" +msgstr "" + +#: models/core.py:36 +msgid "python module name" +msgstr "" + +#: models/core.py:38 +msgid "content type" +msgstr "" + +#: models/core.py:39 +msgid "content types" +msgstr "" + +#: models/core.py:62 +msgid "redirect from" +msgstr "" + +#: models/core.py:63 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -#: models/core.py:59 +#: models/core.py:64 +msgid "redirect to" +msgstr "" + +#: models/core.py:65 msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -#: models/core.py:74 +#: models/core.py:67 +msgid "redirect" +msgstr "" + +#: models/core.py:68 +msgid "redirects" +msgstr "" + +#: models/core.py:81 +msgid "URL" +msgstr "" + +#: models/core.py:82 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -#: models/core.py:79 +#: models/core.py:83 +msgid "title" +msgstr "" + +#: models/core.py:84 +msgid "content" +msgstr "" + +#: models/core.py:85 +msgid "enable comments" +msgstr "" + +#: models/core.py:86 +msgid "template name" +msgstr "" + +#: models/core.py:87 msgid "" "Example: 'flatfiles/contact_page'. If this isn't provided, the system will " "use 'flatfiles/default'." msgstr "" -#: models/core.py:80 +#: models/core.py:88 +msgid "registration required" +msgstr "" + +#: models/core.py:88 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" +#: models/core.py:92 +msgid "flat page" +msgstr "" + +#: models/core.py:93 +msgid "flat pages" +msgstr "" + +#: models/core.py:114 +msgid "session key" +msgstr "" + +#: models/core.py:115 +msgid "session data" +msgstr "" + +#: models/core.py:116 +msgid "expire date" +msgstr "" + +#: models/core.py:118 +msgid "session" +msgstr "" + +#: models/core.py:119 +msgid "sessions" +msgstr "" + +#: models/auth.py:8 +msgid "codename" +msgstr "" + +#: models/auth.py:10 +msgid "Permission" +msgstr "" + +#: models/auth.py:11 models/auth.py:58 +msgid "Permissions" +msgstr "" + +#: models/auth.py:22 +msgid "Group" +msgstr "" + +#: models/auth.py:23 models/auth.py:60 +msgid "Groups" +msgstr "" + #: models/auth.py:33 +#, fuzzy +msgid "username" +msgstr "Korisničko ime:" + +#: models/auth.py:34 +msgid "first name" +msgstr "" + +#: models/auth.py:35 +msgid "last name" +msgstr "" + +#: models/auth.py:36 +#, fuzzy +msgid "e-mail address" +msgstr "E-mail adresa:" + +#: models/auth.py:37 +#, fuzzy +msgid "password" +msgstr "Lozinka:" + +#: models/auth.py:37 msgid "Use an MD5 hash -- not the raw password." msgstr "" -#: models/auth.py:34 +#: models/auth.py:38 +msgid "staff status" +msgstr "" + +#: models/auth.py:38 msgid "Designates whether the user can log into this admin site." msgstr "" +#: models/auth.py:39 +msgid "active" +msgstr "" + #: models/auth.py:40 +msgid "superuser status" +msgstr "" + +#: models/auth.py:41 +msgid "last login" +msgstr "" + +#: models/auth.py:42 +msgid "date joined" +msgstr "" + +#: models/auth.py:44 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -#: conf/admin_templates/base_site.html:3 -msgid "Django site admin" -msgstr "Django administracija sajta" +#: models/auth.py:47 conf/admin_templates/admin_object_history.html:18 +msgid "User" +msgstr "Korisnik" -#: conf/admin_templates/base_site.html:6 -msgid "Django administration" -msgstr "Django administracija" +#: models/auth.py:48 +#, fuzzy +msgid "Users" +msgstr "Korisnik" + +#: models/auth.py:57 +msgid "Personal info" +msgstr "" + +#: models/auth.py:59 +msgid "Important dates" +msgstr "" + +#: models/auth.py:182 models/auth.py:188 +msgid "Message" +msgstr "" + +#: models/auth.py:189 +msgid "Messages" +msgstr "" + +#: models/auth.py:192 +#, fuzzy +msgid "action time" +msgstr "Datum/vreme" + +#: models/auth.py:195 +msgid "object id" +msgstr "" + +#: models/auth.py:196 +msgid "object repr" +msgstr "" + +#: models/auth.py:197 +msgid "action flag" +msgstr "" + +#: models/auth.py:201 +msgid "log entry" +msgstr "" + +#: models/auth.py:202 +msgid "log entries" +msgstr "" #: conf/admin_templates/admin_object_history.html:4 #: conf/admin_templates/base.html:28 @@ -84,10 +302,6 @@ msgstr "Istorija" msgid "Date/time" msgstr "Datum/vreme" -#: conf/admin_templates/admin_object_history.html:18 -msgid "User" -msgstr "Korisnik" - #: conf/admin_templates/admin_object_history.html:19 msgid "Action" msgstr "Akcija" @@ -100,6 +314,38 @@ msgstr "" "Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem " "administracije sajta." +#: conf/admin_templates/base_site.html:3 +msgid "Django site admin" +msgstr "Django administracija sajta" + +#: conf/admin_templates/base_site.html:6 +msgid "Django administration" +msgstr "Django administracija" + +#: conf/admin_templates/index.html:26 +msgid "Add" +msgstr "Dodaj" + +#: conf/admin_templates/index.html:32 +msgid "Change" +msgstr "Izmena" + +#: conf/admin_templates/index.html:42 +msgid "You don't have permission to edit anything." +msgstr "Nemate dozvolu da vršite izmene." + +#: conf/admin_templates/index.html:50 +msgid "Recent Actions" +msgstr "Skorije akcije" + +#: conf/admin_templates/index.html:51 +msgid "My Actions" +msgstr "Moje akcije" + +#: conf/admin_templates/index.html:55 +msgid "None available" +msgstr "Nema dostupnih" + #: conf/admin_templates/500.html:5 msgid "Server error (500)" msgstr "Greška na serveru (500)" @@ -116,6 +362,14 @@ msgstr "" "Dogodila se greška koja je prijavljena administratorima i biće popravljena " "uskoro. Hvala Vam na strpljenju." +#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 +msgid "Page not found" +msgstr "Strana nije pronađena" + +#: conf/admin_templates/404.html:9 +msgid "We're sorry, but the requested page could not be found." +msgstr "Tražena strana ne postoji" + # pridruženih =? related #: conf/admin_templates/delete_confirmation_generic.html:6 #, python-format @@ -140,38 +394,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Da, siguran sam" -#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7 -msgid "Page not found" -msgstr "Strana nije pronađena" - -#: conf/admin_templates/404.html:9 -msgid "We're sorry, but the requested page could not be found." -msgstr "Tražena strana ne postoji" - -#: conf/admin_templates/index.html:26 -msgid "Add" -msgstr "Dodaj" - -#: conf/admin_templates/index.html:32 -msgid "Change" -msgstr "Izmena" - -#: conf/admin_templates/index.html:42 -msgid "You don't have permission to edit anything." -msgstr "Nemate dozvolu da vršite izmene." - -#: conf/admin_templates/index.html:50 -msgid "Recent Actions" -msgstr "Skorije akcije" - -#: conf/admin_templates/index.html:51 -msgid "My Actions" -msgstr "Moje akcije" - -#: conf/admin_templates/index.html:55 -msgid "None available" -msgstr "Nema dostupnih" - #: conf/admin_templates/login.html:14 msgid "Username:" msgstr "Korisničko ime:" @@ -566,5 +788,14 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/fields.py:95 +msgid " Separate multiple IDs with commas." +msgstr "" + +#: core/meta/fields.py:98 +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" + #~ msgid "Click to change" #~ msgstr "Kliknite za izmenu" diff --git a/django/core/meta/fields.py b/django/core/meta/fields.py index 0740010579..a718484e53 100644 --- a/django/core/meta/fields.py +++ b/django/core/meta/fields.py @@ -1,8 +1,9 @@ from django.conf import settings from django.core import formfields, validators from django.core.exceptions import ObjectDoesNotExist -from django.utils.functional import curry +from django.utils.functional import curry, lazy from django.utils.text import capfirst +from django.utils.translation import gettext_lazy import datetime, os # Random entropy string used by "default" param. @@ -26,6 +27,16 @@ prep_for_like_query = lambda x: str(x).replace("%", "\%").replace("_", "\_") # returns the <ul> class for a given radio_admin value get_ul_class = lambda x: 'radiolist%s' % ((x == HORIZONTAL) and ' inline' or '') +def string_concat(*strings): + """" + lazy variant of string concatenation, needed for translations that are + constructed from multiple parts. Handles lazy strings and non-strings by + first turning all arguments to strings, before joining them. + """ + return ''.join([str(el) for el in strings]) + +string_concat = lazy(string_concat, str) + def manipulator_valid_rel_key(f, self, field_data, all_data): "Validates that the value is a valid foreign key" mod = f.rel.to.get_model_module() @@ -80,9 +91,11 @@ class Field(object): self.db_column = db_column if rel and isinstance(rel, ManyToMany): if rel.raw_id_admin: - self.help_text += ' Separate multiple IDs with commas.' + self.help_text = string_concat(self.help_text, + gettext_lazy(' Separate multiple IDs with commas.')) else: - self.help_text += ' Hold down "Control", or "Command" on a Mac, to select more than one.' + self.help_text = string_concat(self.help_text, + gettext_lazy(' Hold down "Control", or "Command" on a Mac, to select more than one.')) # Set db_index to True if the field has a relationship and doesn't explicitly set db_index. if db_index is None: diff --git a/django/models/auth.py b/django/models/auth.py index 9a10434c94..5d74d4645f 100644 --- a/django/models/auth.py +++ b/django/models/auth.py @@ -1,12 +1,14 @@ from django.core import meta, validators from django.models import core -from django.utils.translation import gettext_lazy +from django.utils.translation import gettext_lazy as _ class Permission(meta.Model): - name = meta.CharField(maxlength=50) + name = meta.CharField(_('name'), maxlength=50) package = meta.ForeignKey(core.Package, db_column='package') - codename = meta.CharField(maxlength=100) + codename = meta.CharField(_('codename'), maxlength=100) class META: + verbose_name = _('Permission') + verbose_name_plural = _('Permissions') unique_together = (('package', 'codename'),) ordering = ('package', 'codename') @@ -14,9 +16,11 @@ class Permission(meta.Model): return "%s | %s" % (self.package, self.name) class Group(meta.Model): - name = meta.CharField(maxlength=80, unique=True) + name = meta.CharField(_('name'), maxlength=80, unique=True) permissions = meta.ManyToManyField(Permission, blank=True, filter_interface=meta.HORIZONTAL) class META: + verbose_name = _('Group') + verbose_name_plural = _('Groups') ordering = ('name',) admin = meta.Admin( search_fields = ('name',), @@ -26,20 +30,22 @@ class Group(meta.Model): return self.name class User(meta.Model): - username = meta.CharField(maxlength=30, unique=True, validator_list=[validators.isAlphaNumeric]) - first_name = meta.CharField(maxlength=30, blank=True) - last_name = meta.CharField(maxlength=30, blank=True) - email = meta.EmailField('e-mail address', blank=True) - password_md5 = meta.CharField('password', maxlength=32, help_text=gettext_lazy("Use an MD5 hash -- not the raw password.")) - is_staff = meta.BooleanField('staff status', help_text=gettext_lazy("Designates whether the user can log into this admin site.")) - is_active = meta.BooleanField('active', default=True) - is_superuser = meta.BooleanField('superuser status') - last_login = meta.DateTimeField(default=meta.LazyDate()) - date_joined = meta.DateTimeField(default=meta.LazyDate()) + username = meta.CharField(_('username'), maxlength=30, unique=True, validator_list=[validators.isAlphaNumeric]) + first_name = meta.CharField(_('first name'), maxlength=30, blank=True) + last_name = meta.CharField(_('last name'), maxlength=30, blank=True) + email = meta.EmailField(_('e-mail address'), blank=True) + password_md5 = meta.CharField(_('password'), maxlength=32, help_text=_("Use an MD5 hash -- not the raw password.")) + is_staff = meta.BooleanField(_('staff status'), help_text=_("Designates whether the user can log into this admin site.")) + is_active = meta.BooleanField(_('active'), default=True) + is_superuser = meta.BooleanField(_('superuser status')) + last_login = meta.DateTimeField(_('last login'), default=meta.LazyDate()) + date_joined = meta.DateTimeField(_('date joined'), default=meta.LazyDate()) groups = meta.ManyToManyField(Group, blank=True, - help_text=gettext_lazy("In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in.")) + help_text=_("In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in.")) user_permissions = meta.ManyToManyField(Permission, blank=True, filter_interface=meta.HORIZONTAL) class META: + verbose_name = _('User') + verbose_name_plural = _('Users') module_constants = { 'SESSION_KEY': '_auth_user_id', } @@ -48,10 +54,10 @@ class User(meta.Model): admin = meta.Admin( fields = ( (None, {'fields': ('username', 'password_md5')}), - ('Personal info', {'fields': ('first_name', 'last_name', 'email')}), - ('Permissions', {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}), - ('Important dates', {'fields': ('last_login', 'date_joined')}), - ('Groups', {'fields': ('groups',)}), + (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}), + (_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}), + (_('Important dates'), {'fields': ('last_login', 'date_joined')}), + (_('Groups'), {'fields': ('groups',)}), ), list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff'), list_filter = ('is_staff', 'is_superuser'), @@ -173,22 +179,27 @@ class User(meta.Model): class Message(meta.Model): user = meta.ForeignKey(User) - message = meta.TextField() + message = meta.TextField(_('Message')) def __repr__(self): return self.message + class META: + verbose_name = _('Message') + verbose_name_plural = _('Messages') + class LogEntry(meta.Model): - action_time = meta.DateTimeField(auto_now=True) + action_time = meta.DateTimeField(_('action time'), auto_now=True) user = meta.ForeignKey(User) content_type = meta.ForeignKey(core.ContentType, blank=True, null=True) # TODO: content_type_id name? - object_id = meta.TextField(blank=True, null=True) - object_repr = meta.CharField(maxlength=200) - action_flag = meta.PositiveSmallIntegerField() + object_id = meta.TextField(_('object id'), blank=True, null=True) + object_repr = meta.CharField(_('object repr'), maxlength=200) + action_flag = meta.PositiveSmallIntegerField(_('action flag')) change_message = meta.TextField(blank=True) class META: module_name = 'log' - verbose_name_plural = 'log entries' + verbose_name = _('log entry') + verbose_name_plural = _('log entries') db_table = 'auth_admin_log' ordering = ('-action_time',) module_constants = { diff --git a/django/models/core.py b/django/models/core.py index d56a4fc64b..89695c21b2 100644 --- a/django/models/core.py +++ b/django/models/core.py @@ -1,10 +1,12 @@ from django.core import meta, validators -from django.utils.translation import gettext_lazy +from django.utils.translation import gettext_lazy as _ class Site(meta.Model): - domain = meta.CharField('domain name', maxlength=100) - name = meta.CharField('display name', maxlength=50) + domain = meta.CharField(_('domain name'), maxlength=100) + name = meta.CharField(_('display name'), maxlength=50) class META: + verbose_name = _('site') + verbose_name_plural = _('sites') db_table = 'sites' ordering = ('domain',) @@ -17,9 +19,11 @@ class Site(meta.Model): return get_object(pk=SITE_ID) class Package(meta.Model): - label = meta.CharField(maxlength=20, primary_key=True) - name = meta.CharField(maxlength=30, unique=True) + label = meta.CharField(_('label'), maxlength=20, primary_key=True) + name = meta.CharField(_('name'), maxlength=30, unique=True) class META: + verbose_name = _('package') + verbose_name_plural = _('packages') db_table = 'packages' ordering = ('name',) @@ -27,10 +31,12 @@ class Package(meta.Model): return self.name class ContentType(meta.Model): - name = meta.CharField(maxlength=100) + name = meta.CharField(_('name'), maxlength=100) package = meta.ForeignKey(Package, db_column='package') - python_module_name = meta.CharField(maxlength=50) + python_module_name = meta.CharField(_('python module name'), maxlength=50) class META: + verbose_name = _('content type') + verbose_name_plural = _('content types') db_table = 'content_types' ordering = ('package', 'name') unique_together = (('package', 'python_module_name'),) @@ -53,11 +59,13 @@ class ContentType(meta.Model): class Redirect(meta.Model): site = meta.ForeignKey(Site, radio_admin=meta.VERTICAL) - old_path = meta.CharField('redirect from', maxlength=200, db_index=True, - help_text=gettext_lazy("This should be an absolute path, excluding the domain name. Example: '/events/search/'.")) - new_path = meta.CharField('redirect to', maxlength=200, blank=True, - help_text=gettext_lazy("This can be either an absolute path (as above) or a full URL starting with 'http://'.")) + old_path = meta.CharField(_('redirect from'), maxlength=200, db_index=True, + help_text=_("This should be an absolute path, excluding the domain name. Example: '/events/search/'.")) + new_path = meta.CharField(_('redirect to'), maxlength=200, blank=True, + help_text=_("This can be either an absolute path (as above) or a full URL starting with 'http://'.")) class META: + verbose_name = _('redirect') + verbose_name_plural = _('redirects') db_table = 'redirects' unique_together=(('site', 'old_path'),) ordering = ('old_path',) @@ -70,18 +78,19 @@ class Redirect(meta.Model): return "%s ---> %s" % (self.old_path, self.new_path) class FlatFile(meta.Model): - url = meta.CharField('URL', maxlength=100, validator_list=[validators.isAlphaNumericURL], - help_text=gettext_lazy("Example: '/about/contact/'. Make sure to have leading and trailing slashes.")) - title = meta.CharField(maxlength=200) - content = meta.TextField() - enable_comments = meta.BooleanField() - template_name = meta.CharField(maxlength=70, blank=True, - help_text=gettext_lazy("Example: 'flatfiles/contact_page'. If this isn't provided, the system will use 'flatfiles/default'.")) - registration_required = meta.BooleanField(help_text=gettext_lazy("If this is checked, only logged-in users will be able to view the page.")) + url = meta.CharField(_('URL'), maxlength=100, validator_list=[validators.isAlphaNumericURL], + help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes.")) + title = meta.CharField(_('title'), maxlength=200) + content = meta.TextField(_('content')) + enable_comments = meta.BooleanField(_('enable comments')) + template_name = meta.CharField(_('template name'), maxlength=70, blank=True, + help_text=_("Example: 'flatfiles/contact_page'. If this isn't provided, the system will use 'flatfiles/default'.")) + registration_required = meta.BooleanField(_('registration required'), help_text=_("If this is checked, only logged-in users will be able to view the page.")) sites = meta.ManyToManyField(Site) class META: db_table = 'flatfiles' - verbose_name = 'flat page' + verbose_name = _('flat page') + verbose_name_plural = _('flat pages') ordering = ('url',) admin = meta.Admin( fields = ( @@ -102,10 +111,12 @@ import base64, md5, random, sys import cPickle as pickle class Session(meta.Model): - session_key = meta.CharField(maxlength=40, primary_key=True) - session_data = meta.TextField() - expire_date = meta.DateTimeField() + session_key = meta.CharField(_('session key'), maxlength=40, primary_key=True) + session_data = meta.TextField(_('session data')) + expire_date = meta.DateTimeField(_('expire date')) class META: + verbose_name = _('session') + verbose_name_plural = _('sessions') module_constants = { 'base64': base64, 'md5': md5, |