Changeset 3770

Timestamp:

09/20/06 03:40:46 (2 years ago)

Author:

rmunn

Message:

sqlalchemy: Merged revisions 3724 to 3769 from trunk.

Files:

• django/branches/sqlalchemy/AUTHORS (modified) (2 diffs)
• django/branches/sqlalchemy/django/conf/global_settings.py (modified) (1 diff)
• django/branches/sqlalchemy/django/conf/locale/es_AR/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/sqlalchemy/django/conf/locale/es_AR/LC_MESSAGES/django.po (modified) (37 diffs)
• django/branches/sqlalchemy/django/conf/locale/fi (copied) (copied from django/trunk/django/conf/locale/fi)
• django/branches/sqlalchemy/django/conf/locale/fi/LC_MESSAGES (copied) (copied from django/trunk/django/conf/locale/fi/LC_MESSAGES)
• django/branches/sqlalchemy/django/conf/locale/fi/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/fi/LC_MESSAGES/djangojs.mo)
• django/branches/sqlalchemy/django/conf/locale/fi/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/fi/LC_MESSAGES/djangojs.po)
• django/branches/sqlalchemy/django/conf/locale/fi/LC_MESSAGES/django.mo (copied) (copied from django/trunk/django/conf/locale/fi/LC_MESSAGES/django.mo)
• django/branches/sqlalchemy/django/conf/locale/fi/LC_MESSAGES/django.po (copied) (copied from django/trunk/django/conf/locale/fi/LC_MESSAGES/django.po)
• django/branches/sqlalchemy/django/conf/locale/no/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/sqlalchemy/django/conf/locale/no/LC_MESSAGES/djangojs.po (modified) (2 diffs)
• django/branches/sqlalchemy/django/conf/locale/no/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/sqlalchemy/django/conf/locale/no/LC_MESSAGES/django.po (modified) (63 diffs)
• django/branches/sqlalchemy/django/conf/locale/pl/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/sqlalchemy/django/conf/locale/pl/LC_MESSAGES/django.po (modified) (28 diffs)
• django/branches/sqlalchemy/django/conf/locale/ru/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/sqlalchemy/django/conf/locale/ru/LC_MESSAGES/django.po (modified) (81 diffs)
• django/branches/sqlalchemy/django/contrib/admin/media/js/admin/DateTimeShortcuts.js (modified) (1 diff)
• django/branches/sqlalchemy/django/contrib/admin/views/auth.py (modified) (3 diffs)
• django/branches/sqlalchemy/django/contrib/auth/middleware.py (modified) (1 diff)
• django/branches/sqlalchemy/django/core/management.py (modified) (5 diffs)
• django/branches/sqlalchemy/django/core/servers/fastcgi.py (modified) (1 diff)
• django/branches/sqlalchemy/django/db/backends/mysql/introspection.py (modified) (2 diffs)
• django/branches/sqlalchemy/django/db/backends/postgresql_psycopg2/base.py (modified) (1 diff)
• django/branches/sqlalchemy/django/db/models/related.py (modified) (1 diff)
• django/branches/sqlalchemy/django/test/simple.py (modified) (1 diff)
• django/branches/sqlalchemy/django/utils/functional.py (modified) (1 diff)
• django/branches/sqlalchemy/docs/authentication.txt (modified) (1 diff)
• django/branches/sqlalchemy/docs/django-admin.txt (modified) (3 diffs)
• django/branches/sqlalchemy/docs/fastcgi.txt (modified) (2 diffs)
• django/branches/sqlalchemy/docs/forms.txt (modified) (2 diffs)
• django/branches/sqlalchemy/docs/testing.txt (modified) (7 diffs)
• django/branches/sqlalchemy/tests/modeltests/invalid_models/models.py (modified) (2 diffs)

django/branches/sqlalchemy/AUTHORS

@@ -45 +45 @@
-    akaihola
-    Andreas
+    ant9000@netwise.it
-    David Ascher <http://ascher.ca/>
-    Arthur <avandorp@gmail.com>
@@ -127 +128 @@
-    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
-    David Schein
+    serbaut@gmail.com
-    Pete Shinners <pete@shinners.org>
-    SmileyChris <smileychris@gmail.com>

django/branches/sqlalchemy/django/conf/global_settings.py

@@ -47 +47 @@
-    ('es', gettext_noop('Spanish')),
-    ('es_AR', gettext_noop('Argentinean Spanish')),
+    ('fi', gettext_noop('Finnish')),
-    ('fr', gettext_noop('French')),
-    ('gl', gettext_noop('Galician')),

django/branches/sqlalchemy/django/conf/locale/es_AR/LC_MESSAGES/django.po

@@ -9 +9 @@
-"Project-Id-Version: django\n"
-"Report-Msgid-Bugs-To: \n"
-6-19 11:19
-5-16 10:05
+8-18 18:57
+8-21 18:06
-"Last-Translator: Ramiro Morales <rm0@gmx.net>\n"
-"Language-Team: Spanish <es@li.org>\n"
@@ -18 +18 @@
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-
-5
+0
-msgid "python model class name"
-msgstr "nombre de la clase python del modelo"
-
-8
+3
-msgid "content type"
-msgstr "tipo de contenido"
-
-9
+4
-msgid "content types"
-msgstr "tipos de contenido"
@@ -34 +34 @@
-msgstr "Sesi�errada"
-
-13 contrib/auth/models.py:26
+38 contrib/auth/models.py:57
-msgid "name"
-msgstr "nombre"
-
-15
+40
-msgid "codename"
-msgstr "nombre en c�o"
-
-17
+42
-msgid "permission"
-msgstr "permiso"
-
-18 contrib/auth/models.py:27
+43 contrib/auth/models.py:58
-msgid "permissions"
-msgstr "permisos"
-
-29
+60
-msgid "group"
-msgstr "grupo"
-
-30 contrib/auth/models.py:65
+61 contrib/auth/models.py:100
-msgid "groups"
-msgstr "grupos"
-
-55
+90
-msgid "username"
-msgstr "nombre de usuario"
-
-
+
+
+
+
+
+
+
+
+
-msgid "first name"
-msgstr "nombre"
-
-57
+92
-msgid "last name"
-msgstr "apellido"
-
-58
+93
-msgid "e-mail address"
-msgstr "direcci�e correo"
-
-59
+94
-msgid "password"
-msgstr "contrase�
-59
+94
-msgid "Use '[algo]$[salt]$[hexdigest]'"
-msgstr "Use '[algoritmo]$[salt]$[hexdigest]'"
-
-60
+95
-msgid "staff status"
-msgstr "es staff"
-
-60
+95
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si el usuario puede ingresar a este sitio de administraci�
-
-61
+96
-msgid "active"
-msgstr "activo"
-
-
+
+
+
+
+
+
+
+
+
-msgid "superuser status"
-msgstr "es superusuario"
-
-
+
+
+
+
+
+
+
+
+
-msgid "last login"
-msgstr "�o registro"
-
-64
+99
-msgid "date joined"
-msgstr "fecha de creaci�
-66
+101
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
@@ -112 +136 @@
-"todos los permisos de los grupos a los que pertenezca."
-
-67
+102
-msgid "user permissions"
-msgstr "permisos de usuario"
-
-70
+105
-msgid "user"
-msgstr "usuario"
-
-71
+106
-msgid "users"
-msgstr "usuarios"
-
-76
+111
-msgid "Personal info"
-msgstr "Informaci�ersonal"
-
-77
+112
-msgid "Permissions"
-msgstr "Permisos"
-
-78
+113
-msgid "Important dates"
-msgstr "Fechas importantes"
-
-79
+114
-msgid "Groups"
-msgstr "Grupos"
-
-19
+56
-msgid "message"
-msgstr "mensaje"
-
-30
+52
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
@@ -152 +176 @@
-"requerimiento para poder ingresar."
-
-
-
+
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
@@ -161 +184 @@
-"ambos campos son sensibles a may�as/min�as."
-
-45
+61
-msgid "This account is inactive."
-msgstr "Esta cuenta est�nactiva"
@@ -253 +276 @@
-msgstr "es p�o"
-
-292
+304
-msgid "IP address"
-msgstr "Direcci�P"
@@ -387 +410 @@
-msgstr "No puedes votarte t�mo"
-
-8
+7
-msgid ""
-"This rating is required because you've entered at least one other rating."
-msgstr "Se precisa esta puntuaci�orque ha introducido al menos otra m�"
-
-2
+1
-#, python-format
-msgid ""
@@ -415 +438 @@
-"%(text)s"
-
-7
+6
-#, fuzzy, python-format
-msgid ""
@@ -426 +449 @@
-"%(text)s"
-
-9
+8
-#: contrib/comments/views/comments.py:280
-msgid "Only POSTs are allowed"
-msgstr "S�se admiten POSTs"
-
-3
+2
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
-msgstr "No se proporcion�o o m�de los siguientes campos requeridos"
-
-7
+6
-#: contrib/comments/views/comments.py:286
-msgid "Somebody tampered with the comment form (security violation)"
@@ -443 +466 @@
-"seguridad)"
-
-7
+6
-#: contrib/comments/views/comments.py:292
-msgid ""
@@ -462 +485 @@
-
-#: contrib/comments/templates/comments/freeform.html:5
-7
+8
-msgid "Comment:"
-msgstr "Comentario:"
-
-9
-2
+10
+5
-msgid "Preview comment"
-msgstr "Previsualizar comentario"
@@ -478 +501 @@
-
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/admin/templates/admin/login.html:20
-msgid "Password:"
-msgstr "Contrase�
-
-#: contrib/comments/templates/comments/form.html:6
-msgid "Forgotten your password?"
-msgstr "Olvid� contrase�
-
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-4
+5
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
@@ -506 +520 @@
-msgid "Log out"
-msgstr "Cerrar sesi�
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:20
+msgid "Password:"
+msgstr "Contrase�
+
+#: contrib/comments/templates/comments/form.html:8
+msgid "Forgotten your password?"
+msgstr "Olvid� contrase�
+
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
@@ -524 +547 @@
-msgstr "Enviar una foto"
-
-03
+15
-msgid "URL"
-msgstr "URL"
@@ -553 +576 @@
-#: contrib/flatpages/models.py:13
-msgid ""
-'. If this isn't provided, the system will
-use 'flatpages/default
-
-'. Si no lo proporciona, el sistema usar�
-'flatpages/default
+.html'. If this isn't provided, the system
+will use 'flatpages/default.html
+
+.html'. Si no lo proporciona, el sistema "
+usar�flatpages/default.html
-
-#: contrib/flatpages/models.py:14
@@ -575 +598 @@
-msgstr "p�nas est�cas"
-
-35
+51
-msgid "session key"
-msgstr "clave de sesi�
-36
+52
-msgid "session data"
-msgstr "datos de sesi�
-37
+53
-msgid "expire date"
-msgstr "fecha de caducidad"
-
-41
+57
-msgid "session"
-msgstr "sesi�
-42
+58
-msgid "sessions"
-msgstr "sesiones"
@@ -682 +705 @@
-msgstr "Todas las fechas"
-
-3
+4
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Identificarse"
-
-1
+2
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
@@ -695 +718 @@
-"preocupe: se ha guardado su env�"
-
-8
+9
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
@@ -703 +726 @@
-"por favor, recargue esta p�na, e int�elo de nuevo."
-
-2
+3
-msgid "Usernames cannot contain the '@' character."
-msgstr "Los nombres de usuario no pueden contener el car�er '@'."
-
-4
+5
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
@@ -714 +737 @@
-"lugar."
-
-6
+3
-msgid "Site administration"
-msgstr "Sitio administrativo"
-
-60
+57 contrib/admin/views/auth.py:14
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-
-
-
+
+
+
+
-msgid "You may edit it again below."
-editarlo de nuevo
-
-2 contrib/admin/views/main.py:357
+modificarlo nuevamente
+
+1 contrib/admin/views/main.py:356
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puede agregar otro %s abajo."
-
-90
+89
-#, python-format
-msgid "Add %s"
-msgstr "Agregar %s"
-
-6
+5
-#, python-format
-msgid "Added %s."
-msgstr "Agregado %s."
-
-6 contrib/admin/views/main.py:338
-40
+5 contrib/admin/views/main.py:337
+39
-msgid "and"
-msgstr "y"
-
-8
+7
-#, python-format
-msgid "Changed %s."
-msgstr "Modifica %s."
-
-40
+39
-#, python-format
-msgid "Deleted %s."
-msgstr "Elimina %s."
-
-3
+2
-msgid "No fields changed."
-cambi
-
-6
+modific
+
+5
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Se modific�n �to el %(name)s \"%(obj)s."
-
-4
+3
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-
-
-
+
+
+
+
-#, python-format
-msgid "Change %s"
-msgstr "Modificar %s"
-
-0
+3
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Uno o m�%(fieldname)s en %(name)s: %(obj)s"
-
-5
+8
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Uno o m�%(fieldname)s en %(name)s:"
-
-08
+11
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "Se elimin�n �to el %(name)s \"%(obj)s\"."
-
-1
+4
-msgid "Are you sure?"
-msgstr "�Est�eguro?"
-
-3
+6
-#, python-format
-msgid "Change history: %s"
-msgstr "Historia de modificaciones: %s"
-
-67
+70
-#, python-format
-msgid "Select %s"
-msgstr "Seleccione %s"
-
-67
+70
-#, python-format
-msgid "Select %s to change"
-msgstr "Seleccione %s a modificar"
-
-43
+56
-msgid "Database error"
-msgstr "Error de base de datos"
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Integer"
-msgstr "Entero"
-
-80
+92
-msgid "Boolean (Either True or False)"
-msgstr "Booleano (Verdadero o Falso)"
-
-81 contrib/admin/views/doc.py:299
+93 contrib/admin/views/doc.py:311
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Cadena (m�mo %(maxlength)s)"
-
-82
+94
-msgid "Comma-separated integers"
-msgstr "Enteros separados por comas"
-
-83
+95
-msgid "Date (without time)"
-msgstr "Fecha (sin hora)"
-
-84
+96
-msgid "Date (with time)"
-msgstr "Fecha (con hora)"
-
-85
+97
-msgid "E-mail address"
-msgstr "Direcci�e correo electr�o"
-
-86 contrib/admin/views/doc.py:287
-290
+98 contrib/admin/views/doc.py:299
+302
-msgid "File path"
-msgstr "Ruta de archivo"
-
-288
+300
-msgid "Decimal number"
-msgstr "N� decimal"
-
-294
+306
-msgid "Boolean (Either True, False or None)"
-msgstr "Booleano (Verdadero, Falso o Nulo)"
-
-295
+307
-msgid "Relation to parent model"
-msgstr "Relaci�on el modelo padre"
-
-296
+308
-msgid "Phone number"
-msgstr "N� de tel�no"
-
-01
+13
-msgid "Text"
-msgstr "Texto"
-
-02
+14
-msgid "Time"
-msgstr "Hora"
-
-04
+16
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado de los EEUU (dos letras may�as)"
-
-05
+17
-msgid "XML text"
-msgstr "Texto XML"
+
+#: contrib/admin/views/doc.py:339
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s no parece ser un objeto urlpattern"
+
+#: contrib/admin/views/auth.py:25
+msgid "Add user"
+msgstr "Agregar usuario"
-
-#: contrib/admin/templates/widget/file.html:2
@@ -903 +992 @@
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-4
+5
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
@@ -913 +1002 @@
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-4
+5
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
@@ -933 +1022 @@
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:13
-29
+30
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/invalid_setup.html:4
@@ -980 +1069 @@
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-
-
+filter_
+filter_
-
-#: contrib/admin/templates/admin/500.html:4
@@ -1036 +1125 @@
-msgid "Models available in the %(name)s application."
-msgstr "Modelos disponibles en la aplicaci�(name)s."
+
+#: contrib/admin/templates/admin/index.html:18
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
-
-#: contrib/admin/templates/admin/index.html:28
@@ -1096 +1190 @@
-msgstr "Orden:"
-
-4
+5
-msgid "Welcome,"
-msgstr "Bienvenido,"
@@ -1108 +1202 @@
-#, python-format
-msgid ""
-object)s' would result in deleting related
-objects, but your account doesn't have permission to delete the following
-
-
-object)s' provocar�la eliminaci�e "
-
+escaped_object)s' would result in deleting
+related objects, but your account doesn't have permission to delete the
+following 
+
+escaped_object)s' provocar�la eliminaci�
+de 
-"siguientes tipos de objetos:"
-
@@ -1119 +1213 @@
-#, python-format
-msgid ""
-object)s\"? All of
-
-
-object)s\"? Se 
-
+escaped_object)s\"?
+All of 
+
+escaped_object)s
+\"? Se 
-
-#: contrib/admin/templates/admin/delete_confirmation.html:26
@@ -1154 +1248 @@
-"tablas de la misma hayan sido creadas, y aseg� de que el usuario "
-"apropiado tenga permisos de escritura en la base de datos."
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+"Primero, ingrese un nombre de usuario y una contrase�Luego podr�
+"configurar opciones adicionales."
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
+msgid "Username"
+msgstr "Nombre de usuario:"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
+msgid "Password"
+msgstr "Contrase�
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+msgid "Password (again)"
+msgstr "Contrase�de nuevo)"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+msgid "Enter the same password as above, for verification."
+msgstr "Para verificaci�ingrese la misma contrase�ue ingres�riba."
-
-#: contrib/admin/templates/registration/password_change_done.html:4
@@ -1336 +1454 @@
-"Como antes, pero abre la p�na de administraci�n una nueva ventana."
-
-#: utils/translation.py:363
-msgid "DATE_FORMAT"
-msgstr "j N Y"
-
-#: utils/translation.py:364
-msgid "DATETIME_FORMAT"
-msgstr "j N Y P"
-
-#: utils/translation.py:365
-msgid "TIME_FORMAT"
-msgstr "P"
-
-#: utils/translation.py:381
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
-
-#: utils/translation.py:382
-msgid "MONTH_DAY_FORMAT"
-msgstr "j \\de F"
-
-#: utils/dates.py:6
-msgid "Monday"
@@ -1543 +1641 @@
-msgstr[1] "minutos"
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Bengali"
-msgstr "Bengal�
-38
+41
-msgid "Czech"
-msgstr "Checo"
-
-39
+42
-msgid "Welsh"
-msgstr "Gal�
-
-0
+3
-msgid "Danish"
-msgstr "Dan�
-
-1
+4
-msgid "German"
-msgstr "Alem�
-
-2
+5
-msgid "Greek"
-msgstr "Griego"
-
-3
+6
-msgid "English"
-msgstr "Ingl�
-
-4
+7
-msgid "Spanish"
-msgstr "Espa�
-
-5
+8
-msgid "Argentinean Spanish"
-msgstr "Espa�Argentino"
-
-6
+9
-msgid "French"
-msgstr "Franc�
-
-47
+50
-msgid "Galician"
-msgstr "Gallego"
-
-48
+51
-msgid "Hungarian"
-msgstr "H�o"
-
-49
+52
-msgid "Hebrew"
-msgstr "Hebreo"
-
-0
+3
-msgid "Icelandic"
-msgstr "Island�
-
-1
+4
-msgid "Italian"
-msgstr "Italiano"
-
-2
+5
-msgid "Japanese"
-msgstr "Japon�
-
-3
+6
-msgid "Dutch"
-msgstr "Holand�
-
-4
+7
-msgid "Norwegian"
-msgstr "Noruego"
-
-5
+8
-msgid "Brazilian"
-msgstr "Brasile�
-6
+9
-msgid "Romanian"
-msgstr "Rumano"
-
-57
+60
-msgid "Russian"
-msgstr "Ruso"
-
-58
+61
-msgid "Slovak"
-msgstr "Eslovaco"
-
-59
+62
-msgid "Slovenian"
-msgstr "Esloveno"
-
-0
+3
-msgid "Serbian"
-msgstr "Serbio"
-
-1
+4
-msgid "Swedish"
-msgstr "Sueco"
-