Changeset 3227

Timestamp:

06/28/06 12:00:52 (2 years ago)

Author:

jpellerin

Message:

Merge trunk to [3216]

Files:

• django/branches/multiple-db-support/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po (modified) (6 diffs)
• django/branches/multiple-db-support/django/conf/locale/es_AR/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/es_AR/LC_MESSAGES/django.po (modified) (58 diffs)
• django/branches/multiple-db-support/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po)
• django/branches/multiple-db-support/django/contrib/admin/views/doc.py (modified) (5 diffs)
• django/branches/multiple-db-support/django/contrib/comments/templates/comments/form.html (modified) (2 diffs)
• django/branches/multiple-db-support/django/contrib/comments/templates/comments/freeform.html (modified) (1 diff)
• django/branches/multiple-db-support/django/contrib/syndication/feeds.py (modified) (3 diffs)
• django/branches/multiple-db-support/django/core/management.py (modified) (4 diffs)
• django/branches/multiple-db-support/django/db/models/base.py (modified) (2 diffs)
• django/branches/multiple-db-support/django/db/models/loading.py (modified) (6 diffs)
• django/branches/multiple-db-support/django/db/models/options.py (modified) (1 diff)
• django/branches/multiple-db-support/docs/faq.txt (modified) (1 diff)
• django/branches/multiple-db-support/docs/fastcgi.txt (modified) (11 diffs)
• django/branches/multiple-db-support/docs/modpython.txt (modified) (2 diffs)
• django/branches/multiple-db-support/docs/syndication_feeds.txt (modified) (2 diffs)
• django/branches/multiple-db-support/docs/templates_python.txt (modified) (2 diffs)
• django/branches/multiple-db-support/tests/modeltests/invalid_models/models.py (modified) (7 diffs)
• django/branches/multiple-db-support/tests/modeltests/m2m_recursive/models.py (modified) (1 diff)

django/branches/multiple-db-support/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
-"Project-Id-Version: Django JavaScript 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-5-12-09 11:51+01
+6-06-19 12:15-03
-"PO-Revision-Date: 2006-05-16 10:20-0300\n"
-"Last-Translator: Ramiro Morales <rm0@gmx.net>\n"
@@ -23 +23 @@
-#: contrib/admin/media/js/SelectFilter2.js:41
-msgid "Choose all"
-
+r
-
-#: contrib/admin/media/js/SelectFilter2.js:46
@@ -44 +44 @@
-#: contrib/admin/media/js/SelectFilter2.js:59
-msgid "Clear all"
-
+r
-
-26
+32
-#: contrib/admin/media/js/calendar.js:24
-msgid ""
@@ -55 +55 @@
-"Noviembre Diciembre"
-
-27
+33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Domingo Lunes Martes Miércoles Jueves Viernes Sábado"
@@ -63 +63 @@
-msgstr "D L M M J V S"
-
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+msgid "Show"
+msgstr "Mostrar"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+msgid "Hide"
+msgstr "Ocultar"
+
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
-0
+9
-msgid "Now"
-msgstr "Ahora"
@@ -72 +81 @@
-msgstr "Reloj"
-
-77
+86
-msgid "Choose a time"
-msgstr "Elija una hora"
-
-81
+90
-msgid "Midnight"
-msgstr "Medianoche"
-
-82
+91
-msgid "6 a.m."
-msgstr "6 a.m."
-
-83
+92
-msgid "Noon"
-msgstr "Mediodía"
-
-87
-68
+96
+87
-msgid "Cancel"
-msgstr "Cancelar"
-
-11
-62
+20
+81
-msgid "Today"
-msgstr "Hoy"
-
-14
+23
-msgid "Calendar"
-msgstr "Calendario"
-
-60
+79
-msgid "Yesterday"
-msgstr "Ayer"
-
-64
+83
-msgid "Tomorrow"
-msgstr "Mañana"

django/branches/multiple-db-support/django/conf/locale/es_AR/LC_MESSAGES/django.po

@@ -9 +9 @@
-"Project-Id-Version: django\n"
-"Report-Msgid-Bugs-To: \n"
-5-16 09:26
+6-19 11:19
-"PO-Revision-Date: 2006-05-16 10:05-0300\n"
-"Last-Translator: Ramiro Morales <rm0@gmx.net>\n"
-n
+s
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -30 +30 @@
-msgstr "tipos de contenido"
-
+#: contrib/auth/views.py:39
+msgid "Logged out"
+msgstr "Sesión cerrada"
+
-#: contrib/auth/models.py:13 contrib/auth/models.py:26
-msgid "name"
@@ -64 +68 @@
-#: contrib/auth/models.py:57
-msgid "last name"
-(s)
+
-
-#: contrib/auth/models.py:58
@@ -84 +88 @@
-#: contrib/auth/models.py:60
-msgid "Designates whether the user can log into this admin site."
-entrar en
+ingresar a
-
-#: contrib/auth/models.py:61
@@ -150 +154 @@
-"requerimiento para poder ingresar."
-
-1
+3
-#: contrib/admin/views/decorators.py:9
-msgid ""
@@ -158 +162 @@
-"Por favor ingrese un nombre de usuario y una contraseña correctos. Note que "
-"ambos campos son sensibles a mayúsculas/minúsculas."
+
+#: contrib/auth/forms.py:45
+msgid "This account is inactive."
+msgstr "Esta cuenta está inactiva"
-
-#: contrib/redirects/models.py:7
@@ -183 +191 @@
-"empiece con 'http://'."
-
-2
+3
-msgid "redirect"
-msgstr "redirección"
-
-3
+4
-msgid "redirects"
-msgstr "redirecciones"
@@ -248 +256 @@
-msgstr "es público"
-
-89
+92
-msgid "IP address"
-msgstr "Dirección IP"
@@ -414 +422 @@
-
-#: contrib/comments/views/comments.py:117
-
+fuzzy, 
-msgid ""
-"This comment was posted by a sketchy user:\n"
@@ -420 +428 @@
-"%(text)s"
-msgstr ""
+"Este comentario ha sido enviado por un usuario 'sketcky':\n"
+"\n"
+"%(text)s"
-
-#: contrib/comments/views/comments.py:189
-#: contrib/comments/views/comments.py:280
-msgid "Only POSTs are allowed"
- POST
+n POSTs
-
-#: contrib/comments/views/comments.py:193
@@ -485 +496 @@
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-3
+4
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
@@ -500 +511 @@
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Log out"
-Termin
+Cerr
-
-#: contrib/comments/templates/comments/form.html:12
@@ -520 +531 @@
-msgstr "Enviar una foto"
-
-0
+3
-msgid "URL"
-msgstr "URL"
@@ -597 +608 @@
-#: contrib/sites/models.py:11
-msgid "display name"
-mostr
+visualiz
-
-#: contrib/sites/models.py:15
@@ -617 +628 @@
-
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-
+ contrib/admin/filterspecs.py:169
-msgid "All"
-
+s/as
-
-#: contrib/admin/filterspecs.py:109
@@ -681 +692 @@
-msgstr "entradas de registro"
-
-28
+30
-msgid "All dates"
-msgstr "Todas las fechas"
@@ -753 +764 @@
-#, python-format
-msgid "Changed %s."
-do
+
-
-#: contrib/admin/views/main.py:340
-#, python-format
-msgid "Deleted %s."
-do
+
-
-#: contrib/admin/views/main.py:343
@@ -803 +814 @@
-#, python-format
-msgid "Change history: %s"
-Modificar histórico
-
-5
+Historia de modificaciones
+
+7
-#, python-format
-msgid "Select %s"
-msgstr "Seleccione %s"
-
-5
+7
-#, python-format
-msgid "Select %s to change"
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-msgid "Integer"
-msgstr "Entero"
-
-78
+80
-msgid "Boolean (Either True or False)"
-msgstr "Booleano (Verdadero o Falso)"
-
-79 contrib/admin/views/doc.py:296
+81 contrib/admin/views/doc.py:299
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Cadena (máximo %(maxlength)s)"
-
-0
+2
-msgid "Comma-separated integers"
-msgstr "Enteros separados por comas"
-
-1
+3
-msgid "Date (without time)"
-msgstr "Fecha (sin hora)"
-
-2
+4
-msgid "Date (with time)"
-msgstr "Fecha (con hora)"
-
-3
+5
-msgid "E-mail address"
-msgstr "Dirección de correo electrónico"
-
-
+
+
-msgid "File path"
-msgstr "Ruta de archivo"
-
-5
+8
-msgid "Decimal number"
-msgstr "Número decimal"
-
-1
+4
-msgid "Boolean (Either True, False or None)"
-msgstr "Booleano (Verdadero, Falso o Nulo)"
-
-2
+5
-msgid "Relation to parent model"
-msgstr "Relación con el modelo padre"
-
-3
+6
-msgid "Phone number"
-msgstr "Número de teléfono"
-
-298
+301
-msgid "Text"
-msgstr "Texto"
-
-299
+302
-msgid "Time"
-msgstr "Hora"
-
-1
+4
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado de los EEUU (dos letras mayúsculas)"
-
-2
+5
-msgid "XML text"
-msgstr "Texto XML"
@@ -901 +917 @@
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-3
+4
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
@@ -912 +928 @@
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-3
+4
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
@@ -933 +949 @@
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:13
-8
+9
-#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
@@ -947 +964 @@
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "History"
-órico
+oria
-
-#: contrib/admin/templates/admin/object_history.html:18
@@ -963 +980 @@
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-
+j M Y P
-
-#: contrib/admin/templates/admin/object_history.html:36
@@ -970 +987 @@
-"admin site."
-msgstr ""
-órico de cambios. Probablemente no fue añadido
-
+oria de modificaciones. Probablemente no fue
+añadido 
-
-#: contrib/admin/templates/admin/change_list.html:11
@@ -1008 +1025 @@
-msgstr "Buscar"
-
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] "un resultado"
+msgstr[1] "%(counter)s resultados"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "total: %(full_result_count)s"
+
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Mostrar todos/as"
+
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
@@ -1019 +1052 @@
-#, python-format
-msgid "Models available in the %(name)s application."
-ci
+ic
-
-#: contrib/admin/templates/admin/index.html:28
@@ -1044 +1077 @@
-#: contrib/admin/templates/admin/index.html:57
-msgid "None available"
-o
+a
-
-#: contrib/admin/templates/admin/404.html:4
@@ -1058 +1091 @@
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "¿Ha <a href=\"/password_reset/\">olvidado su contraseña</a>?"
+
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Filtrar"
-
-#: contrib/admin/templates/admin/change_form.html:21
@@ -1077 +1114 @@
-msgstr "Orden:"
-
-3
+4
-msgid "Welcome,"
-msgstr "Bienvenido,"
@@ -1125 +1162 @@
-msgid "Save"
-msgstr "Grabar"
+
+#: contrib/admin/templates/admin/invalid_setup.html:8
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+"hay algún problema con su instalación de base de datos. Asegúrese de que las "
+"tablas de la misma hayan sido creadas, y asegúrese de que el usuario "
+"apropiado tenga permisos de escritura en la base de datos."
-
-#: contrib/admin/templates/registration/password_change_done.html:4
@@ -1313 +1360 @@
-"Como antes, pero abre la página de administración en una nueva ventana."
-
-0
+3
-msgid "DATE_FORMAT"
-
-
-1
+j N Y
+
+4
-msgid "DATETIME_FORMAT"
-
-
-2
+j N Y P
+
+5
-msgid "TIME_FORMAT"
-
+
+
+
+
+
+
+
+
+
-
-#: utils/dates.py:6
@@ -1387 +1442 @@
-#: utils/dates.py:15
-msgid "September"
-p
+
-
-#: utils/dates.py:15
@@ -1431 +1486 @@
-#: utils/dates.py:20
-msgid "aug"
-
+ago
-
-#: utils/dates.py:20
-msgid "sep"
-
+set
-
-#: utils/dates.py:20
@@ -1451 +1506 @@
-#: utils/dates.py:27
-msgid "Jan."
-.
+ro
-
-#: utils/dates.py:27
-msgid "Feb."
-Feb.
+
-
-#: utils/dates.py:28
@@ -1463 +1518 @@
-#: utils/dates.py:28
-msgid "Sept."
-p
+
-
-#: utils/dates.py:28
-msgid "Oct."
-Oct.
+
-
-#: utils/dates.py:28
-msgid "Nov."
-Nov.
+
-
-#: utils/dates.py:28
@@ -1492 +1547 @@
-msgid "week"
-msgid_plural "weeks"
-m
+
-msgstr[1] "semanas"
-
@@ -1547 +1602 @@
-#: conf/global_settings.py:45
-msgid "Argentinean Spanish"
-
+Español Argentino
-
-#: conf/global_settings.py:46
@@ -1559 +1614 @@
-#: conf/global_settings.py:48
-msgid "Hungarian"
-
+Húngaro
-
-#: conf/global_settings.py:49
@@ -1637 +1692 @@
-
-#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265
-2 db/models/fields/__init__.py:553
+5 db/models/fields/__init__.py:556
-#: forms/__init__.py:346
-msgid "This field is required."
@@ -1654 +1709 @@
-msgstr "Este campo no puede ser nulo."
-
-68 core/validators.py:132
+71 core/validators.py:135
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Introduzca una fecha/hora válida en formato YYYY-MM-DD HH:MM."
-
-2
+5
-msgid "Enter a valid filename."
-msgstr "Introduzca un nombre de achivo válido"
@@ -1689 +1744 @@
-"válidos."
-
-0
+1
-#, python-format
-msgid "Ensure your text is less than %s character."
@@ -1696 +1751 @@
-msgstr[1] "Asegúrese de que su texto tiene menos de %s caracteres."
-
-5
+6
-msgid "Line breaks are not allowed here."
-msgstr "No se permiten saltos de línea."
-
-0 forms/__init__.py:551 forms/__init__.py:589
+5 forms/__init__.py:558 forms/__init__.py:597
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr "Seleccione una opción válida; '%(data)s' no está en %(choices)s."
-
-
+
+
+
+
+
+
-msgid "The submitted file is empty."
-msgstr "El archivo enviado está vacío."
-
-699
+717
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Introduzca un número entero entre -32,768 y 32,767."
-
-08
+27
-msgid "Enter a positive number."
-msgstr "Introduzca un número positivo."
-
-1
+3
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Introduzca un número entero entre 0 y 32,767."
-
-0
+3
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Este valor debe contener sólo letras, números y guiones bajos."
-
-4
+7
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
@@ -1733 +1793 @@
-"slashes."
-
-2
+5
-msgid "Uppercase letters are not allowed here."
-msgstr "No se admiten letras mayúsculas."
-
-6
+9
-msgid "Lowercase letters are not allowed here."
-msgstr "No se admiten letras minúsculas."
-
-3
+6
-msgid "Enter only digits separated by commas."
-msgstr "Introduzca sólo dígitos separados por comas."
-
-5
+8
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Introduzca direcciones de correo válidas separadas por comas."
-
-99
+102
-msgid "Please enter a valid IP address."
-msgstr "Por favor introduzca una dirección IP válida."
-
-3
+6
-msgid "Empty values are not allowed here."
-msgstr "No se admiten valores vacíos."
-
-07
+10
-msgid "Non-numeric characters aren't allowed here."
-msgstr "No se admiten caracteres no numéricos."
-
-1
+4
-msgid "This value can't be comprised solely of digits."
-msgstr "Este valor no puede estar formado sólo por dígitos."
-
-6
+9
-msgid "Enter a whole number."
-msgstr "Introduzca un número entero."
-
-0
+3
-msgid "Only alphabetical characters are allowed here."
-msgstr "Sólo se admiten caracteres alfabéticos."
-
-4
+7
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduzca una fecha válida en formato AAAA-MM-DD."
-
-28
+31
-msgid "Enter a valid time in HH:MM format."
-msgstr "Introduzca una hora válida en formato HH:MM."
-
-6
+9
-msgid "Enter a valid e-mail address."
-msgstr "Introduzca una dirección de correo electrónico válida"
-
-48
+55
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
@@ -1793 +1853 @@
-"trataba de una imagen corrupta."
-
-55
+62
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "La URL %s no apunta a una imagen válida."
-
-59
+66
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
@@ -1805 +1865 @@
-"no es válido."
-
-67
+74
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "La URL %s no apunta a un vídeo QuickTime válido."
-
-1
+8
-msgid "A valid URL is required."
-msgstr "Se precisa una URL válida."
-
-85
+92
-#, python-format
-msgid ""
@@ -1823 +1883 @@
-"%s"
-
-2
+9
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "XML mal formado: %s"
-
-2
+9
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "URL no válida: %s"
-
-06 core/validators.py:208
+13 core/validators.py:215
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "La URL %s es un enlace roto."
-
-14
+21
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Introduzca una abreviatura válida de estado de los EEUU."
-
-29
+36
-#, python-format
-msgid "Watch your mouth! The word %s is not allowed here."
@@ -1849 +1909 @@
-msgstr[1] "¡Vigila tu boca! Aquí no admitimos las palabras %s."
-
-36
+43
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Este campo debe concordar con el campo '%s'."
-
-55
+62
-msgid "Please enter something for at least one field."
-msgstr "Por favor, introduzca algo en al menos un campo."
-
-64 core/validators.py:275
+71 core/validators.py:282
-msgid "Please enter both fields or leave them both empty."
-msgstr "Por favor, rellene ambos campos o deje ambos vacíos."
-
-2
+9
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "Se debe proporcionar este campo si %(field)s es %(value)s"
-
-294
+301
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s"
-
-13
+20
-msgid "Duplicate values are not allowed."
-msgstr "No se admiten valores duplicados."
-
-36
+43
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "Este valor debe ser una potencia de %s."
-
-47
+54
-msgid "Please enter a valid decimal number."
-msgstr "Por favor, introduzca un número decimal válido."
-
-49
+56
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
@@ -1891 +1951 @@
-"Please enter a valid decimal number with at most %s total digits."
-msgstr[0] ""
-%s
+un
-"dígito en total."
-msgstr[1] ""
@@ -1897 +1957 @@
-"en total."
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
@@ -1903 +1976 @@
-"Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] ""
-%s
-posición 
+una posición
+
-msgstr[1] ""
-"Por favor, introduzca un número decimal válido con un máximo de %s "
-"posiciones decimales."
-
-6
+7
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Asegúrese de que el archivo que envía tiene al menos %s bytes."
-
-6
+7
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Asegúrese de que el archivo que envía tiene como máximo %s bytes."
-
-76
+90
-msgid "The format for this field is wrong."
-msgstr "El formato de este campo es incorrecto."
-
-391
+405
-msgid "This field is invalid."
-msgstr "Este campo no es válido."
-
-26
+41
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "No pude obtener nada de %s."
-
-29
+44
-#, python-format
-msgid ""
@@ -1940 +2013 @@
-"es válida."
-
-62
+77
-#, python-format
-msgid ""
@@ -1949 +2022 @@
-"empieza por \"%(start)s\".)"
-
-66
+81
-#, python-format
-msgid ""
@@ -1958 +2031 @@
-"contexto. (La línea empieza por \"%(start)s\".)"
-
-71
+86
-#, python-format
-msgid ""
@@ -1967 +2040 @@
-"empieza por \"%(start)s\".)"
-
-76
+91
-#, python-format
-msgid ""
@@ -1976 +2049 @@
-"empieza por \"%(start)s\".)"
-
-80
+95
-#, python-format
-msgid ""
@@ -1985 +2058 @@
-"requeridos. (La línea empieza por \"%(start)s\".)"
-
-485
+500
-#, python-format
-msgid ""
@@ -1994 +2067 @@
-"válido. (La línea empieza por \"%(start)s\".)"
-
-7
+8
-msgid "yes,no,maybe"
-msgstr "si,no,tal vez"
-
+#, fuzzy
+#~ msgid "%(content_type_name)s"
+#~ msgstr "tipos de contenido"
+
+#, fuzzy
+#~ msgid "%(myname)s"
+#~ msgstr "Agregar %(name)s"
+
+#~ msgid "%(result_count)s result"
+#~ msgid_plural "%(counter)s results"
+#~ msgstr[0] "un resultado"
+#~ msgstr[1] "%(counter)s resultados"
+
-#~ msgid "Comment"
-#~ msgstr "Comentario"
@@ -2015 +2101 @@
-#~ msgid "packages"
-#~ msgstr "paquetes"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please enter a valid decimal number with a whole part of at most %s digit."
-#~ msgid_plural ""
-#~ "Please enter a valid decimal number with a whole part of at most %s "
-#~ "digits."
-#~ msgstr[0] ""
-#~ "Por favor, introduzca un número decimal válido con a lo más %s dígito en "
-#~ "total."
-#~ msgstr[1] ""
-#~ "Por favor, introduzca un número decimal válido con a lo más %s dígitos en "
-#~ "total."

django/branches/multiple-db-support/django/contrib/admin/views/doc.py

@@ -14 +14 @@
-# Exclude methods starting with these strings from documentation
-MODEL_METHODS_EXCLUDE = ('_', 'add_', 'delete', 'save', 'set_')
+
+class GenericSite(object):
+    domain = 'example.com'
+    name = 'my site'
-
-def doc_index(request):