Changeset 7584

Timestamp:

06/07/08 12:10:16 (6 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7583].

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/AUTHORS (modified) (5 diffs)
• django/branches/newforms-admin/django/conf/locale/ca/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/newforms-admin/django/conf/locale/ca/LC_MESSAGES/django.po (modified) (4 diffs)
• django/branches/newforms-admin/django/conf/locale/es/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/newforms-admin/django/conf/locale/es/LC_MESSAGES/django.po (modified) (17 diffs)
• django/branches/newforms-admin/django/conf/locale/it/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/newforms-admin/django/conf/locale/it/LC_MESSAGES/django.po (modified) (4 diffs)
• django/branches/newforms-admin/django/conf/locale/sv/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/newforms-admin/django/conf/locale/sv/LC_MESSAGES/django.po (modified) (26 diffs)
• django/branches/newforms-admin/django/core/management/commands/syncdb.py (modified) (2 diffs)
• django/branches/newforms-admin/django/core/management/sql.py (modified) (4 diffs)
• django/branches/newforms-admin/django/db/models/fields/related.py (modified) (5 diffs)
• django/branches/newforms-admin/django/db/transaction.py (modified) (4 diffs)
• django/branches/newforms-admin/django/template/defaulttags.py (modified) (1 diff)
• django/branches/newforms-admin/django/template/__init__.py (modified) (2 diffs)
• django/branches/newforms-admin/django/template/loader.py (modified) (2 diffs)
• django/branches/newforms-admin/django/template/loaders/eggs.py (modified) (1 diff)
• django/branches/newforms-admin/django/test/client.py (modified) (3 diffs)
• django/branches/newforms-admin/django/test/testcases.py (modified) (1 diff)
• django/branches/newforms-admin/django/utils/text.py (modified) (4 diffs)
• django/branches/newforms-admin/docs/db-api.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/flatpages.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/outputting_pdf.txt (modified) (2 diffs)
• django/branches/newforms-admin/docs/serialization.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/testing.txt (modified) (3 diffs)
• django/branches/newforms-admin/docs/url_dispatch.txt (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/basic/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/one_to_one/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/or_lookups/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/test_client/fixtures/testdata.json (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/many_to_one_regress/models.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/one_to_one_regress/models.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/queries/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/templates/loaders.py (copied) (copied from django/trunk/tests/regressiontests/templates/loaders.py)
• django/branches/newforms-admin/tests/regressiontests/templates/tests.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/test_client_regress/fixtures/testdata.json (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/test_client_regress/models.py (modified) (4 diffs)
• django/branches/newforms-admin/tests/regressiontests/test_client_regress/urls.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/test_client_regress/views.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/runtests.py (modified) (2 diffs)

django/branches/newforms-admin/AUTHORS

@@ -69 +69 @@
-    Chris Bennett <chrisrbennett@yahoo.com>
-    James Bennett
-<afternoon@uk2.net
+Godfrey <http://aftnn.org
-    Arvis Bickovskis <viestards.lists@gmail.com>
-    Paul Bissex <http://e-scribe.com/>
@@ -80 +80 @@
-    btoll@bestweb.net
-    Jonathan Buchanan <jonathan.buchanan@gmail.com>
-Can Burak Çilingir <canburak@cs.bilgi.edu.tr
+Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com
-    Trevor Caira <trevor@caira.com>
-    Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
@@ -94 +94 @@
-    Bryan Chow <bryan at verdjn dot com>
-    Michal Chruszcz <troll@pld-linux.org>
+    Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
-    Ian Clelland <clelland@gmail.com>
-    Russell Cloran <russell@rucus.net>
@@ -143 +144 @@
-    Stefane Fermgier <sf@fermigier.com>
-    Afonso Fernández Nogueira <fonzzo.django@gmail.com>
+    J. Pablo Fernandez <pupeno@pupeno.com>
-    Matthew Flanagan <http://wadofstuff.blogspot.com>
-    Eric Floehr <eric@intellovations.com>
@@ -374 +376 @@
-    Vlado <vlado@labath.org>
-    Milton Waddams
+    Chris Wagner <cw264701@ohio.edu>
-    wam-djangobug@wamber.net
-    Wang Chun <wangchun@exoweb.net>

django/branches/newforms-admin/django/conf/locale/ca/LC_MESSAGES/django.po

@@ -6 +6 @@
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-7-02-15 00:00
+8-05-26 10:35
-"PO-Revision-Date: 2008-05-14 11:15+0200\n"
-"Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
@@ -15 +15 @@
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-39
+43
-msgid "Arabic"
-msgstr "Arabic"
-
-0
+4
-msgid "Bengali"
-msgstr "Bengalí"
-
-1
+5
-msgid "Bulgarian"
-msgstr "Búlgar"
-
-2
+6
-msgid "Catalan"
-msgstr "Català"
-
-3
+7
-msgid "Czech"
-msgstr "Txec"
-
-4
+8
-msgid "Welsh"
-msgstr "Galès"
-
-5
+9
-msgid "Danish"
-msgstr "Danès"
-
-46
+50
-msgid "German"
-msgstr "Alemany"
-
-47
+51
-msgid "Greek"
-msgstr "Grec"
-
-48
+52
-msgid "English"
-msgstr "Anglès"
-
-49
+53
-msgid "Spanish"
-msgstr "Espanyol"
-
-0
+4
-msgid "Argentinean Spanish"
-msgstr "Castellà Argentí"
-
-1
+5
-msgid "Basque"
-msgstr "Euskera"
-
-2
+6
-msgid "Persian"
-msgstr "Persa"
-
-3
+7
-msgid "Finnish"
-msgstr "Finlandès"
-
-4
+8
-msgid "French"
-msgstr "Francès"
-
-5
+9
-msgid "Irish"
-msgstr "Irlandès"
-
-56
+60
-msgid "Galician"
-msgstr "Gallec"
-
-57
+61
-msgid "Hungarian"
-msgstr "Húngar"
-
-58
+62
-msgid "Hebrew"
-msgstr "Hebreu"
-
-59
+63
-msgid "Croatian"
-msgstr "Croat"
-
-0
+4
-msgid "Icelandic"
-msgstr "Islandès"
-
-1
+5
-msgid "Italian"
-msgstr "Italià"
-
-2
+6
-msgid "Japanese"
-msgstr "Japonès"
-
-3
+7
-msgid "Georgian"
-msgstr "Georgià"
-
-4
+8
-msgid "Korean"
-msgstr "Coreà"
-
-5
+9
-msgid "Khmer"
-msgstr "Khmer"
-
-66
+70
-msgid "Kannada"
-msgstr "Canès"
-
-67
+71
-msgid "Latvian"
-msgstr "Letó"
-
-68
+72
-msgid "Macedonian"
-msgstr "Macedoni"
-
-69
+73
-msgid "Dutch"
-msgstr "Holandès"
-
-0
+4
-msgid "Norwegian"
-msgstr "Norueg"
-
-1
+5
-msgid "Polish"
-msgstr "Polac"
-
-2
+6
-msgid "Portugese"
-msgstr "Portuguès"
-
-3
+7
-msgid "Brazilian Portuguese"
-msgstr "Portuguès de Brasil"
-
-4
+8
-msgid "Romanian"
-msgstr "Rumanès"
-
-5
+9
-msgid "Russian"
-msgstr "Rús"
-
-76
+80
-msgid "Slovak"
-msgstr "Eslovac"
-
-77
+81
-msgid "Slovenian"
-msgstr "Esloveni"
-
-78
+82
-msgid "Serbian"
-msgstr "Serbi"
-
-79
+83
-msgid "Swedish"
-msgstr "Suec"
-
-0
+4
-msgid "Tamil"
-msgstr "Tàmil"
-
-1
+5
-msgid "Telugu"
-msgstr "Telugu"
-
-2
+6
-msgid "Turkish"
-msgstr "Turc"
-
-3
+7
-msgid "Ukrainian"
-msgstr "Ucranià"
-
-4
+8
-msgid "Simplified Chinese"
-msgstr "Xinès simplificat"
-
-5
+9
-msgid "Traditional Chinese"
-msgstr "Xinès tradicional"
@@ -830 +830 @@
-"aquesta pàgina i proveu-ho de nou. "
-
-
+
+
+
+
+
+
+
+
-msgid "Usernames cannot contain the '@' character."
-msgstr "Els noms d'usuari no poden contenir el caracter '@'."
-
-#: contrib/admin/views/decorators.py:92
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot "
-"cas."
-
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
@@ -4039 +4039 @@
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-
-
+
-
-#: newforms/fields.py:599

django/branches/newforms-admin/django/conf/locale/es/LC_MESSAGES/django.po

@@ -6 +6 @@
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-5-10-04 00:00
+8-05-26 10:38
-"PO-Revision-Date: 2008-03-30 01:04+0100\n"
-"Last-Translator: Django Spanish Group <django-i18n@googlegroups.com>\n"
@@ -15 +15 @@
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-39
+43
-msgid "Arabic"
-msgstr "Árabe"
-
-0
+4
-msgid "Bengali"
-msgstr "Bengalí"
-
-1
+5
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-2
+6
-msgid "Catalan"
-msgstr "Catalán"
-
-3
+7
-msgid "Czech"
-msgstr "Checo"
-
-4
+8
-msgid "Welsh"
-msgstr "Galés"
-
-5
+9
-msgid "Danish"
-msgstr "Danés"
-
-46
+50
-msgid "German"
-msgstr "Alemán"
-
-47
+51
-msgid "Greek"
-msgstr "Griego"
-
-48
+52
-msgid "English"
-msgstr "Inglés"
-
-49
+53
-msgid "Spanish"
-msgstr "Español"
-
-0
+4
-msgid "Argentinean Spanish"
-msgstr "Español Argentino"
-
-1
+5
-msgid "Basque"
-msgstr "Vasco"
-
-2
+6
-msgid "Persian"
-msgstr "Persa"
-
-3
+7
-msgid "Finnish"
-msgstr "Finés"
-
-4
+8
-msgid "French"
-msgstr "Francés"
-
-5
+9
-msgid "Irish"
-msgstr "Irlandés"
-
-56
+60
-msgid "Galician"
-msgstr "Gallego"
-
-57
+61
-msgid "Hungarian"
-msgstr "Húngaro"
-
-58
+62
-msgid "Hebrew"
-msgstr "Hebreo"
-
-59
+63
-msgid "Croatian"
-msgstr "Croata"
-
-0
+4
-msgid "Icelandic"
-msgstr "Islandés"
-
-1
+5
-msgid "Italian"
-msgstr "Italiano"
-
-2
+6
-msgid "Japanese"
-msgstr "Japonés"
-
-3
+7
-msgid "Georgian"
-msgstr "Georgiano"
-
-4
+8
-msgid "Korean"
-msgstr "Koreano"
-
-5
+9
-msgid "Khmer"
-msgstr "Khmer"
-
-66
+70
-msgid "Kannada"
-msgstr "Kannada"
-
-67
+71
-msgid "Latvian"
-msgstr "Latvio"
-
-68
+72
-msgid "Macedonian"
-msgstr "Macedonio"
-
-69
+73
-msgid "Dutch"
-msgstr "Alemán"
-
-0
+4
-msgid "Norwegian"
-msgstr "Noruego"
-
-1
+5
-msgid "Polish"
-msgstr "Polaco"
-
-2
+6
-msgid "Portugese"
-msgstr "Portugés"
-
-
-
-
-
-
+
+
+
+
+
+
-msgid "Romanian"
-msgstr "Rumano"
-
-5
+9
-msgid "Russian"
-msgstr "Ruso"
-
-76
+80
-msgid "Slovak"
-msgstr "Eslovaco"
-
-77
+81
-msgid "Slovenian"
-msgstr "Esloveno"
-
-78
+82
-msgid "Serbian"
-msgstr "Serbio"
-
-79
+83
-msgid "Swedish"
-msgstr "Sueco"
-
-0
+4
-msgid "Tamil"
-msgstr "Tamil"
-
-1
+5
-msgid "Telugu"
-msgstr "Telugu"
-
-2
+6
-msgid "Turkish"
-msgstr "Turco"
-
-3
+7
-msgid "Ukrainian"
-msgstr "Ucraniano"
-
-4
+8
-msgid "Simplified Chinese"
-msgstr "Chino simplificado"
-
-5
+9
-msgid "Traditional Chinese"
-msgstr "Chino tradicional"
@@ -829 +830 @@
-"por favor, recargue esta página, e inténtelo de nuevo."
-
-
+
+
+
+
+
+
+
+
-msgid "Usernames cannot contain the '@' character."
-msgstr "Los nombres de usuario no pueden contener el carácter '@'."
-
-#: contrib/admin/views/decorators.py:92
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Su dirección de correo no es su nombre de usuario. Pruebe con '%s' en su "
-"lugar."
-
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
@@ -963 +964 @@
-msgstr "Hora"
-
-7
+8
-msgid "URL"
-msgstr "URL"
@@ -1022 +1023 @@
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-
+\"
-
-#: contrib/admin/views/main.py:362
@@ -1070 +1071 @@
-msgstr "Escoja %s para modificar"
-
-84
+65
-msgid "Database error"
-msgstr "Error en la base de datos"
@@ -1191 +1192 @@
-
-#: contrib/auth/models.py:137
-
-
+
+
+
-"instead of deleting accounts."
-msgstr ""
@@ -1570 +1572 @@
-msgstr "tipos de contenido"
-
-8
+9
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -1577 +1579 @@
-"final."
-
-9
+10
-msgid "title"
-msgstr "título"
-
-0
+1
-msgid "content"
-msgstr "contenido"
-
-1
+2
-msgid "enable comments"
-msgstr "admitir comentarios"
-
-2
+3
-msgid "template name"
-msgstr "nombre de plantilla"
-
-3
+4
-msgid ""
-"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
@@ -1601 +1603 @@
-"usará 'flatpages/default.html'."
-
-4
+5
-msgid "registration required"
-msgstr "debe estar registrado"
-
-4
+5
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Si está marcado, sólo los usuarios registrados podrán ver la página."
-
-18
+20
-msgid "flat page"
-msgstr "página estática"
-
-19
+21
-msgid "flat pages"
-msgstr "páginas estáticas"
-
-4
+7
-msgid "Advanced options"
-msgstr "Opciones avanzadas"
@@ -1771 +1773 @@
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-XXX-
-
+
+-XXX
-
-#: contrib/localflavor/ch/ch_states.py:5
@@ -3629 +3631 @@
-msgstr "Fecha no válida: %s"
-
-27
+48
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduzca una fecha válida en formato AAAA-MM-DD."
@@ -3637 +3639 @@
-msgstr "Introduzca una hora válida en formato HH:MM."
-
-04
+25
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM."
@@ -3898 +3900 @@
-msgstr "%(object)s de este %(type)s ya existen en este %(field)s."
-
-2
+4
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "Ya existe %(optname)s con este %(fieldname)s."
-
-61 db/models/fields/__init__.py:327
-59 db/models/fields/__init__.py:770
+79 db/models/fields/__init__.py:348
+80 db/models/fields/__init__.py:791
-#: newforms/fields.py:46 oldforms/__init__.py:374
-msgid "This field is required."
-msgstr "Este campo es obligatorio."
-
-27
+48
-msgid "This value must be an integer."
-msgstr "Este valor debe ser un entero."
-
-66
+87
-msgid "This value must be either True or False."
-msgstr "Este valor debe ser Verdadero o Falso."
-
-490
+511
-msgid "This field cannot be null."
-msgstr "Este campo no puede estar vacío."
-
-68
+89
-msgid "This value must be a decimal number."
-msgstr "Este valor debe ser un entero."
-
-779
+800
-msgid "Enter a valid filename."
-msgstr "Introduzca un nombre de fichero válido"
-
-60
+81
-msgid "This value must be either None, True or False."
-msgstr "Este valor debe ser Verdadero o Falso."
-
-3
+4
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Por favor, introduzca un %s válido."
-
-0
+2
-msgid "Separate multiple IDs with commas."
-msgstr "Separe múltiples IDs con comas."
-
-0
+2
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
@@ -3949 +3951 @@
-"más de uno."
-
-5
+7
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
@@ -4043 +4045 @@
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-
+
+
-
-#: newforms/fields.py:600 newforms/fields.py:662 newforms/models.py:371
@@ -4405 +4408 @@
-msgstr "El %(verbose_name)s ha sido eliminado."
-
+#~ msgid "Brazilian"
+#~ msgstr "Brasileño"
+
-#~ msgid "Gaeilge"
-#~ msgstr "Gaeilge"

django/branches/newforms-admin/django/conf/locale/it/LC_MESSAGES/django.po

@@ -1 +1 @@
-# translation of django.po to Italiano
-# Nicola Larosa <nico@tekNico.net>, 2008.
-# Italian translation of Django.
-# Copyright (C) 2006 the Lawrence Journal-World
@@ -6 +5 @@
-msgid ""
-msgstr ""
-django
+Django vSVN
-"Report-Msgid-Bugs-To: \n"
-5-18 18:39
+6-02 18:40
-"PO-Revision-Date: 2008-05-18 19:13+0200\n"
-"Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
@@ -1711 +1710 @@
-#: contrib/localflavor/pe/forms.py:51
-msgid "This field requires only numbers."
-In questo campo possono essere solo presenti
+Questo campo può contenere solo
-
-#: contrib/localflavor/ar/forms.py:50
@@ -2309 +2308 @@
-#: contrib/localflavor/it/forms.py:43
-msgid "Enter a valid Social Security number."
-assistenza soci
+codice fisc
-
-#: contrib/localflavor/it/forms.py:68

django/branches/newforms-admin/django/conf/locale/sv/LC_MESSAGES/django.po

@@ -7 +7 @@
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-3-16 16:53+01
-3-02 00:49+01
+5-26 10:58+02
+5-26 11:15+02
-"Last-Translator: Ludvig Ericson <ludvig.ericson@gmail.com>\n"
-"Language-Team: Django I18N <Django-I18N@googlegroups.com>\n"
@@ -18 +18 @@
-"X-Poedit-Country: SWEDEN\n"
-
-39
+43
-msgid "Arabic"
-msgstr "Arabiska"
-
-0
+4
-msgid "Bengali"
-msgstr "Bengaliska"
-
-1
+5
-msgid "Bulgarian"
-msgstr "Bulgariska"
-
-2
+6
-msgid "Catalan"
-msgstr "Katalanska"
-
-3
+7
-msgid "Czech"
-msgstr "Tjeckiska"
-
-4
+8
-msgid "Welsh"
-msgstr "Walesiska"
-
-5
+9
-msgid "Danish"
-msgstr "Danska"
-
-46
+50
-msgid "German"
-msgstr "Tyska"
-
-47
+51
-msgid "Greek"
-msgstr "Grekiska"
-
-48
+52
-msgid "English"
-msgstr "Engelska"
-
-49
+53
-msgid "Spanish"
-msgstr "Spanska"
-
-0
+4
-msgid "Argentinean Spanish"
-msgstr "Argentisk Spanska"
-
-1
+5
-msgid "Basque"
-msgstr "Baskiska"
-
-2
+6
-msgid "Persian"
-msgstr "Persiska"
-
-3
+7
-msgid "Finnish"
-msgstr "Finska"
-
-4
+8
-msgid "French"
-msgstr "Franska"
-
-5
+9
-msgid "Irish"
-msgstr "Irländska"
-
-56
+60
-msgid "Galician"
-msgstr "Galisiska"
-
-57
+61
-msgid "Hungarian"
-msgstr "Ungerska"
-
-58
+62
-msgid "Hebrew"
-msgstr "Hebreiska"
-
-59
+63
-msgid "Croatian"
-msgstr "Kroatiska"
-
-