From 7eade9a5bbafa890074747de0feeacc6c61c7aaa Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Sun, 15 Jul 2007 09:39:13 +0000
Subject: [PATCH] Fixed #4880 -- Updated Spanish translation (includes
 re-encoding to UTF-8). Thanks, Jorge Gajon.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5705 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/conf/locale/es/LC_MESSAGES/django.mo   |  Bin 48226 -> 49337 bytes
 django/conf/locale/es/LC_MESSAGES/django.po   | 3420 ++++++++---------
 django/conf/locale/es/LC_MESSAGES/djangojs.mo |  Bin 1427 -> 1561 bytes
 django/conf/locale/es/LC_MESSAGES/djangojs.po |   83 +-
 4 files changed, 1751 insertions(+), 1752 deletions(-)

diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index d5c78da2c98e18baea621152188a26e9eb377746..4b8254b95aa46375506ede0cb98821452f236c3f 100644
GIT binary patch
delta 18608
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

delta 17933
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

diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 377ffa723b..4dcc433098 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -6,76 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 08:58-0400\n"
-"PO-Revision-Date: 2007-02-24 18:02-0600\n"
+"POT-Creation-Date: 2007-07-14 13:46-0500\n"
+"PO-Revision-Date: 2007-07-14 13:00-0500\n"
 "Last-Translator: Mario Gonzalez <gonzalemario @t gmail.com>\n"
 "Language-Team: Castellano <Django-I18N@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: oldforms/__init__.py:369 db/models/fields/__init__.py:127
-#: db/models/fields/__init__.py:284 db/models/fields/__init__.py:681
-#: db/models/fields/__init__.py:692 newforms/models.py:187
-#: newforms/fields.py:87 newforms/fields.py:444 newforms/fields.py:523
-#: newforms/fields.py:534
-msgid "This field is required."
-msgstr "Este campo es obligatorio."
-
-#: oldforms/__init__.py:404
-#, python-format
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] "Aseg�rese de que su texto tiene menos de %s car�cter."
-msgstr[1] "Aseg�rese de que su texto tiene menos de %s caracteres."
-
-#: oldforms/__init__.py:409
-msgid "Line breaks are not allowed here."
-msgstr "No se permiten saltos de l�nea."
-
-#: oldforms/__init__.py:507 oldforms/__init__.py:581 oldforms/__init__.py:620
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr "Escoja una opci�n v�lida; '%(data)s' no est� en %(choices)s."
-
-#: oldforms/__init__.py:587 newforms/widgets.py:181
-#: contrib/admin/filterspecs.py:152
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: oldforms/__init__.py:587 newforms/widgets.py:181
-#: contrib/admin/filterspecs.py:145
-msgid "Yes"
-msgstr "S�"
-
-#: oldforms/__init__.py:587 newforms/widgets.py:181
-#: contrib/admin/filterspecs.py:145
-msgid "No"
-msgstr "No"
-
-#: oldforms/__init__.py:682 core/validators.py:178 core/validators.py:456
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-"No se ha enviado ning�n fichero. Compruebe el tipo de codificaci�n en el "
-"formulario."
-
-#: oldforms/__init__.py:684
-msgid "The submitted file is empty."
-msgstr "El fichero enviado est� vac�o."
-
-#: oldforms/__init__.py:740
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Introduzca un n�mero entero entre -32,768 y 32,767."
-
-#: oldforms/__init__.py:750
-msgid "Enter a positive number."
-msgstr "Introduzca un n�mero positivo."
-
-#: oldforms/__init__.py:760
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Introduzca un n�mero entero entre 0 y 32,767."
-
 #: db/models/manipulators.py:309
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
@@ -86,11 +25,46 @@ msgstr "%(object)s de este %(type)s ya existen en este %(field)s."
 msgid "and"
 msgstr "y"
 
+#: db/models/fields/related.py:55
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Por favor, introduzca un %s válido."
+
+#: db/models/fields/related.py:641
+msgid "Separate multiple IDs with commas."
+msgstr "Separe múltiples IDs con comas."
+
+#: db/models/fields/related.py:643
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar "
+"más de uno."
+
+#: db/models/fields/related.py:690
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] ""
+"Por favor, introduzca IDs de %(self)s válidos. El valor %(value)r no es "
+"válido."
+msgstr[1] ""
+"Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son "
+"válidos."
+
 #: db/models/fields/__init__.py:47
 #, python-format
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr "Ya existe %(optname)s con este %(fieldname)s."
 
+#: db/models/fields/__init__.py:127 db/models/fields/__init__.py:284
+#: db/models/fields/__init__.py:681 db/models/fields/__init__.py:692
+#: oldforms/__init__.py:369 newforms/fields.py:92 newforms/fields.py:440
+#: newforms/fields.py:516 newforms/fields.py:527 newforms/models.py:187
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
+
 #: db/models/fields/__init__.py:379
 msgid "This value must be an integer."
 msgstr "Este valor debe ser un entero."
@@ -101,15 +75,15 @@ msgstr "Este valor debe ser Verdadero o Falso."
 
 #: db/models/fields/__init__.py:435
 msgid "This field cannot be null."
-msgstr "Este campo no puede estar vac�o."
+msgstr "Este campo no puede estar vacío."
 
-#: db/models/fields/__init__.py:469 core/validators.py:152
+#: db/models/fields/__init__.py:469 core/validators.py:155
 msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduzca una fecha v�lida en formato AAAA-MM-DD."
+msgstr "Introduzca una fecha válida en formato AAAA-MM-DD."
 
-#: db/models/fields/__init__.py:538 core/validators.py:161
+#: db/models/fields/__init__.py:538 core/validators.py:164
 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."
+msgstr "Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM."
 
 #: db/models/fields/__init__.py:598
 msgid "This value must be a decimal number."
@@ -117,611 +91,1603 @@ msgstr "Este valor debe ser un entero."
 
 #: db/models/fields/__init__.py:701
 msgid "Enter a valid filename."
-msgstr "Introduzca un nombre de fichero v�lido"
+msgstr "Introduzca un nombre de fichero válido"
 
 #: db/models/fields/__init__.py:826
 msgid "This value must be either None, True or False."
 msgstr "Este valor debe ser Verdadero o Falso."
 
-#: db/models/fields/related.py:55
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Por favor, introduzca un %s v�lido."
-
-#: db/models/fields/related.py:641
-msgid "Separate multiple IDs with commas."
-msgstr "Separe m�ltiples IDs con comas."
-
-#: db/models/fields/related.py:643
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
-"Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar "
-"m�s de uno."
-
-#: db/models/fields/related.py:690
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural ""
-"Please enter valid %(self)s IDs. The values %(value)r are invalid."
-msgstr[0] ""
-"Por favor, introduzca IDs de %(self)s v�lidos. El valor %(value)r no es "
-"v�lido."
-msgstr[1] ""
-"Por favor, introduzca IDs de %(self)s v�lidos. Los valores %(value)r no son "
-"v�lidos."
+#: conf/global_settings.py:38
+msgid "Arabic"
+msgstr "Árabe"
 
 #: conf/global_settings.py:39
-msgid "Arabic"
-msgstr "�rabe"
+msgid "Bengali"
+msgstr "Bengalí"
 
 #: conf/global_settings.py:40
-msgid "Bengali"
-msgstr "Bengal�"
+msgid "Bulgarian"
+msgstr "Búlgaro"
 
 #: conf/global_settings.py:41
-msgid "Bulgarian"
-msgstr "B�lgaro"
+msgid "Catalan"
+msgstr "Catalán"
 
 #: conf/global_settings.py:42
-msgid "Catalan"
-msgstr "Catal�n"
-
-#: conf/global_settings.py:43
 msgid "Czech"
 msgstr "Checo"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:43
 msgid "Welsh"
-msgstr "Gal�s"
+msgstr "Galés"
+
+#: conf/global_settings.py:44
+msgid "Danish"
+msgstr "Danés"
 
 #: conf/global_settings.py:45
-msgid "Danish"
-msgstr "Dan�s"
+msgid "German"
+msgstr "Alemán"
 
 #: conf/global_settings.py:46
-msgid "German"
-msgstr "Alem�n"
-
-#: conf/global_settings.py:47
 msgid "Greek"
 msgstr "Griego"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:47
 msgid "English"
-msgstr "Ingl�s"
+msgstr "Inglés"
+
+#: conf/global_settings.py:48
+msgid "Spanish"
+msgstr "Español"
 
 #: conf/global_settings.py:49
-msgid "Spanish"
-msgstr "Espa�ol"
+msgid "Argentinean Spanish"
+msgstr "Español Argentino"
 
 #: conf/global_settings.py:50
-msgid "Argentinean Spanish"
-msgstr "Espa�ol Argentino"
-
-#: conf/global_settings.py:51
 msgid "Persian"
 msgstr "Persa"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:51
 msgid "Finnish"
-msgstr "Fin�s"
+msgstr "Finés"
+
+#: conf/global_settings.py:52
+msgid "French"
+msgstr "Francés"
 
 #: conf/global_settings.py:53
-msgid "French"
-msgstr "Franc�s"
-
-#: conf/global_settings.py:54
 msgid "Galician"
 msgstr "Gallego"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:54
 msgid "Hungarian"
-msgstr "H�ngaro"
+msgstr "Húngaro"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:55
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:56
 msgid "Icelandic"
-msgstr "Island�s"
+msgstr "Islandés"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:57
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:58
 msgid "Japanese"
-msgstr "Japon�s"
+msgstr "Japonés"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:59
 msgid "Korean"
 msgstr "Koreano"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:60
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:61
 msgid "Latvian"
 msgstr "Latvio"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:62
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:63
 msgid "Dutch"
-msgstr "Alem�n"
+msgstr "Alemán"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:64
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:65
 msgid "Polish"
 msgstr "Polaco"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:66
 msgid "Portugese"
-msgstr "Portug�s"
+msgstr "Portugés"
+
+#: conf/global_settings.py:67
+msgid "Brazilian"
+msgstr "Brasileño"
 
 #: conf/global_settings.py:68
-msgid "Brazilian"
-msgstr "Brasile�o"
-
-#: conf/global_settings.py:69
 msgid "Romanian"
 msgstr "Rumano"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:69
 msgid "Russian"
 msgstr "Ruso"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:70
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:71
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:72
 msgid "Serbian"
 msgstr "Serbio"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:73
 msgid "Swedish"
 msgstr "Sueco"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:74
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:75
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:76
 msgid "Turkish"
 msgstr "Turco"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:77
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:78
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:79
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
-#: core/validators.py:68
+#: core/validators.py:71
 msgid "This value must contain only letters, numbers and underscores."
-msgstr "Este valor debe contener s�lo letras, n�meros y guiones bajos."
+msgstr "Este valor debe contener sólo letras, números y guiones bajos."
 
-#: core/validators.py:72
+#: core/validators.py:75
 msgid ""
 "This value must contain only letters, numbers, underscores, dashes or "
 "slashes."
 msgstr ""
-"Este valor debe contener letras, n�meros, guiones bajos o barras solamente."
+"Este valor debe contener letras, números, guiones bajos o barras solamente."
 
-#: core/validators.py:76
+#: core/validators.py:79
 msgid "This value must contain only letters, numbers, underscores or hyphens."
-msgstr "Este valor debe contener s�lo letras, n�meros, guiones bajos o medios."
+msgstr "Este valor debe contener sólo letras, números, guiones bajos o medios."
 
-#: core/validators.py:80
+#: core/validators.py:83
 msgid "Uppercase letters are not allowed here."
-msgstr "No se admiten letras may�sculas."
+msgstr "No se admiten letras mayúsculas."
 
-#: core/validators.py:84
+#: core/validators.py:87
 msgid "Lowercase letters are not allowed here."
-msgstr "No se admiten letras min�sculas."
+msgstr "No se admiten letras minúsculas."
 
-#: core/validators.py:91
+#: core/validators.py:94
 msgid "Enter only digits separated by commas."
-msgstr "Introduzca s�lo d�gitos separados por comas."
+msgstr "Introduzca sólo dígitos separados por comas."
 
-#: core/validators.py:103
+#: core/validators.py:106
 msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Introduzca direcciones de correo v�lidas separadas por comas."
+msgstr "Introduzca direcciones de correo válidas separadas por comas."
 
-#: core/validators.py:107
+#: core/validators.py:110
 msgid "Please enter a valid IP address."
-msgstr "Por favor introduzca una direcci�n IP v�lida."
+msgstr "Por favor introduzca una dirección IP válida."
 
-#: core/validators.py:111
+#: core/validators.py:114
 msgid "Empty values are not allowed here."
-msgstr "No se admiten valores vac�os."
+msgstr "No se admiten valores vacíos."
 
-#: core/validators.py:115
+#: core/validators.py:118
 msgid "Non-numeric characters aren't allowed here."
-msgstr "No se admiten caracteres no num�ricos."
+msgstr "No se admiten caracteres no numéricos."
 
-#: core/validators.py:119
+#: core/validators.py:122
 msgid "This value can't be comprised solely of digits."
-msgstr "Este valor no puede comprender s�lo d�gitos."
+msgstr "Este valor no puede comprender sólo dígitos."
 
-#: core/validators.py:124 newforms/fields.py:135
+#: core/validators.py:127 newforms/fields.py:141
 msgid "Enter a whole number."
-msgstr "Introduzca un n�mero entero."
+msgstr "Introduzca un número entero."
 
-#: core/validators.py:128
+#: core/validators.py:131
 msgid "Only alphabetical characters are allowed here."
-msgstr "S�lo se admiten caracteres alfab�ticos."
+msgstr "Sólo se admiten caracteres alfabéticos."
 
-#: core/validators.py:143
+#: core/validators.py:146
 msgid "Year must be 1900 or later."
-msgstr "El a�o debe ser 1900 o posterior."
+msgstr "El año debe ser 1900 o posterior."
 
-#: core/validators.py:147
+#: core/validators.py:150
 #, python-format
 msgid "Invalid date: %s"
-msgstr "Fecha no v�lida: %s"
+msgstr "Fecha no válida: %s"
 
-#: core/validators.py:157
+#: core/validators.py:160
 msgid "Enter a valid time in HH:MM format."
-msgstr "Introduzca una hora v�lida en formato HH:MM."
+msgstr "Introduzca una hora válida en formato HH:MM."
 
-#: core/validators.py:166 newforms/fields.py:339
+#: core/validators.py:169 newforms/fields.py:335
 msgid "Enter a valid e-mail address."
-msgstr "Introduzca una direcci�n de correo electr�nico v�lida"
+msgstr "Introduzca una dirección de correo electrónico válida"
 
-#: core/validators.py:182
+#: core/validators.py:181 core/validators.py:461 oldforms/__init__.py:682
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+"No se ha enviado ningún fichero. Compruebe el tipo de codificación en el "
+"formulario."
+
+#: core/validators.py:185
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
-"Env�e una imagen v�lida. El fichero que ha enviado no era una imagen o se "
+"Envíe una imagen válida. El fichero que ha enviado no era una imagen o se "
 "trataba de una imagen corrupta."
 
-#: core/validators.py:189
+#: core/validators.py:192
 #, python-format
 msgid "The URL %s does not point to a valid image."
-msgstr "La URL %s no apunta a una imagen v�lida."
+msgstr "La URL %s no apunta a una imagen válida."
 
-#: core/validators.py:193
+#: core/validators.py:196
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
-"Los n�meros de tel�fono deben guardar el formato XXX-XXX-XXXX. \"%s\" no es "
-"v�lido."
+"Los números de teléfono deben guardar el formato XXX-XXX-XXXX. \"%s\" no es "
+"válido."
 
-#: core/validators.py:201
+#: core/validators.py:204
 #, 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."
+msgstr "La URL %s no apunta a un vídeo QuickTime válido."
 
-#: core/validators.py:205
+#: core/validators.py:208
 msgid "A valid URL is required."
-msgstr "Se precisa una URL v�lida."
+msgstr "Se precisa una URL válida."
 
-#: core/validators.py:219
+#: core/validators.py:222
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
 "%s"
 msgstr ""
-"Se precisa HTML v�lido. Los errores espec�ficos son:\n"
+"Se precisa HTML válido. Los errores específicos son:\n"
 "%s"
 
-#: core/validators.py:226
+#: core/validators.py:229
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "XML mal formado: %s"
 
-#: core/validators.py:243
+#: core/validators.py:246
 #, python-format
 msgid "Invalid URL: %s"
-msgstr "URL no v�lida: %s"
+msgstr "URL no válida: %s"
 
-#: core/validators.py:248 core/validators.py:250
+#: core/validators.py:251 core/validators.py:253
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "La URL %s es un enlace roto."
 
-#: core/validators.py:256
+#: core/validators.py:259
 msgid "Enter a valid U.S. state abbreviation."
-msgstr "Introduzca una abreviatura v�lida de estado de los EEUU."
+msgstr "Introduzca una abreviatura válida de estado de los EEUU."
 
-#: core/validators.py:270
+#: core/validators.py:273
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "�Cuida tu vocabulario! Aqu� no admitimos la palabra %s."
-msgstr[1] "�Cuida tu vocabulario! Aqu� no admitimos las palabras %s."
+msgstr[0] "¡Cuida tu vocabulario! Aquí no admitimos la palabra %s."
+msgstr[1] "¡Cuida tu vocabulario! Aquí no admitimos las palabras %s."
 
-#: core/validators.py:277
+#: core/validators.py:280
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Este campo debe concordar con el campo '%s'."
 
-#: core/validators.py:296
+#: core/validators.py:299
 msgid "Please enter something for at least one field."
 msgstr "Por favor, introduzca algo en al menos un campo."
 
-#: core/validators.py:305 core/validators.py:316
+#: core/validators.py:308 core/validators.py:319
 msgid "Please enter both fields or leave them both empty."
-msgstr "Por favor, rellene ambos campos o deje ambos vac�os."
+msgstr "Por favor, rellene ambos campos o deje ambos vacíos."
 
-#: core/validators.py:324
+#: core/validators.py:327
 #, 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"
 
-#: core/validators.py:337
+#: core/validators.py:340
 #, 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"
 
-#: core/validators.py:356
+#: core/validators.py:359
 msgid "Duplicate values are not allowed."
 msgstr "No se admiten valores duplicados."
 
-#: core/validators.py:371
+#: core/validators.py:374
 #, python-format
 msgid "This value must be between %(lower)s and %(upper)s."
 msgstr "Este valor debe estar entre %(lower)s y %(upper)s."
 
-#: core/validators.py:373
+#: core/validators.py:376
 #, python-format
 msgid "This value must be at least %s."
-msgstr "Este valor debe ser como m�nimo %s."
+msgstr "Este valor debe ser como mínimo %s."
 
-#: core/validators.py:375
+#: core/validators.py:378
 #, python-format
 msgid "This value must be no more than %s."
 msgstr "Este valor no debe ser mayor que %s."
 
-#: core/validators.py:411
+#: core/validators.py:414
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Este valor debe ser una potencia de %s."
 
-#: core/validators.py:420
+#: core/validators.py:424
 msgid "Please enter a valid decimal number."
-msgstr "Por favor, introduzca un n�mero decimal v�lido."
+msgstr "Por favor, introduzca un número decimal válido."
 
-#: core/validators.py:426
+#: core/validators.py:431
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
 "Please enter a valid decimal number with at most %s total digits."
 msgstr[0] ""
-"Por favor, introduzca un n�mero decimal v�lido con a lo m�s %s d�gito en "
+"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 "
+"Por favor, introduzca un número decimal válido con a lo más %s dígitos en "
 "total."
 
-#: core/validators.py:429
+#: core/validators.py:434
 #, python-format
 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 su "
+"Por favor, introduzca un número decimal válido con a lo más %s dígito en su "
 "parte entera."
 msgstr[1] ""
-"Por favor, introduzca un n�mero decimal v�lido con a lo m�s %s d�gitos en su "
+"Por favor, introduzca un número decimal válido con a lo más %s dígitos en su "
 "parte entera."
 
-#: core/validators.py:432
+#: core/validators.py:437
 #, python-format
 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] ""
-"Por favor, introduzca un n�mero decimal v�lido con a lo m�s %s d�gito "
+"Por favor, introduzca un número decimal válido con a lo más %s dígito "
 "decimal."
 msgstr[1] ""
-"Por favor, introduzca un n�mero decimal v�lido con a lo m�s %s d�gitos "
+"Por favor, introduzca un número decimal válido con a lo más %s dígitos "
 "decimales."
 
-#: core/validators.py:440
+#: core/validators.py:445
 msgid "Please enter a valid floating point number."
-msgstr "Por favor, introduzca un n�mero decimal v�lido."
+msgstr "Por favor, introduzca un número decimal válido."
 
-#: core/validators.py:449
+#: core/validators.py:454
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Aseg�rese de que el fichero que env�a tiene al menos %s bytes."
+msgstr "Asegúrese de que el fichero que envía tiene al menos %s bytes."
 
-#: core/validators.py:450
+#: core/validators.py:455
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Aseg�rese de que el fichero que env�a tiene como m�ximo %s bytes."
+msgstr "Asegúrese de que el fichero que envía tiene como máximo %s bytes."
 
-#: core/validators.py:467
+#: core/validators.py:472
 msgid "The format for this field is wrong."
 msgstr "El formato de este campo es incorrecto."
 
-#: core/validators.py:482
+#: core/validators.py:487
 msgid "This field is invalid."
-msgstr "Este campo no es v�lido."
+msgstr "Este campo no es válido."
 
-#: core/validators.py:518
+#: core/validators.py:523
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "No pude obtener nada de %s."
 
-#: core/validators.py:521
+#: core/validators.py:526
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
-"La URL %(url)s devolvi� la cabecera Content-Type '%(contenttype)s', que no "
-"es v�lida."
+"La URL %(url)s devolvió la cabecera Content-Type '%(contenttype)s', que no "
+"es válida."
 
-#: core/validators.py:554
+#: core/validators.py:559
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
 "\"%(start)s\".)"
 msgstr ""
-"Por favor, cierre la etiqueta %(tag)s de la l�nea %(line)s. (La l�nea "
+"Por favor, cierre la etiqueta %(tag)s de la línea %(line)s. (La línea "
 "empieza por \"%(start)s\".)"
 
-#: core/validators.py:558
+#: core/validators.py:563
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
-"Parte del texto que comienza en la l�nea %(line)s no est� permitido en ese "
-"contexto. (La l�nea empieza por \"%(start)s\".)"
+"Parte del texto que comienza en la línea %(line)s no está permitido en ese "
+"contexto. (La línea empieza por \"%(start)s\".)"
 
-#: core/validators.py:563
+#: core/validators.py:568
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
-"El \"%(attr)s\" de la l�nea %(line)s no es un atributo v�lido. (La l�nea "
+"El \"%(attr)s\" de la línea %(line)s no es un atributo válido. (La línea "
 "empieza por \"%(start)s\".)"
 
-#: core/validators.py:568
+#: core/validators.py:573
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
-"La \"<%(tag)s>\" de la l�nea %(line)s no es una etiqueta v�lida. (La l�nea "
+"La \"<%(tag)s>\" de la línea %(line)s no es una etiqueta válida. (La línea "
 "empieza por \"%(start)s\".)"
 
-#: core/validators.py:572
+#: core/validators.py:577
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
-"A una etiqueta de la l�nea %(line)s le faltan uno o m�s atributos "
-"requeridos. (La l�nea empieza por \"%(start)s\".)"
+"A una etiqueta de la línea %(line)s le faltan uno o más atributos "
+"requeridos. (La línea empieza por \"%(start)s\".)"
 
-#: core/validators.py:577
+#: core/validators.py:582
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
-"El atributo \"%(attr)s\" de la l�nea %(line)s tiene un valor que no es "
-"v�lido. (La l�nea empieza por \"%(start)s\".)"
+"El atributo \"%(attr)s\" de la línea %(line)s tiene un valor que no es "
+"válido. (La línea empieza por \"%(start)s\".)"
 
-#: views/generic/create_update.py:43
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+msgid "The two password fields didn't match."
+msgstr "Las dos contraseñas no coinciden."
+
+#: contrib/auth/forms.py:25
+msgid "A user with that username already exists."
+msgstr "Ya existe  un usuario con este nombre."
+
+#: contrib/auth/forms.py:53
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Tu navegador de internet parece no tener las cookies habilitadas. Las "
+"cookies se necesitan para poder ingresar."
+
+#: contrib/auth/forms.py:60 contrib/admin/views/decorators.py:10
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Por favor, introduzca un correcto nombre de usuario y contraseña. Note que "
+"ambos campos son sensibles a mayúsculas/minúsculas."
+
+#: contrib/auth/forms.py:62
+msgid "This account is inactive."
+msgstr "Esta cuenta está inactiva."
+
+#: contrib/auth/forms.py:84
+msgid ""
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+"Esta dirección de correo electrónico no tiene una cuenta de usuario "
+"asociada. ¿Está seguro de que se ha registrado?"
+
+#: contrib/auth/forms.py:117
+msgid "The two 'new password' fields didn't match."
+msgstr ""
+"Las contraseñas introducidas en los campos 'nueva contraseña' no coinciden."
+
+#: contrib/auth/forms.py:124
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+"Tu contraseña antigua es incorrecta. Por favor, vuelve a introducirla "
+"correctamente."
+
+#: contrib/auth/models.py:51 contrib/auth/models.py:71
+msgid "name"
+msgstr "nombre"
+
+#: contrib/auth/models.py:53
+msgid "codename"
+msgstr "nombre en código"
+
+#: contrib/auth/models.py:56
+msgid "permission"
+msgstr "permiso"
+
+#: contrib/auth/models.py:57 contrib/auth/models.py:72
+msgid "permissions"
+msgstr "permisos"
+
+#: contrib/auth/models.py:75
+msgid "group"
+msgstr "grupo"
+
+#: contrib/auth/models.py:76 contrib/auth/models.py:116
+msgid "groups"
+msgstr "grupos"
+
+#: contrib/auth/models.py:106
+msgid "username"
+msgstr "nombre de usuario"
+
+#: contrib/auth/models.py:106
+msgid ""
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
+"digits and underscores)."
+msgstr ""
+"Requerido. 30 caracteres o menos. Sólo caracteres alfanuméricos (letras, "
+"dígitos y guiones bajos)."
+
+#: contrib/auth/models.py:107
+msgid "first name"
+msgstr "nombre"
+
+#: contrib/auth/models.py:108
+msgid "last name"
+msgstr "apellidos"
+
+#: contrib/auth/models.py:109
+msgid "e-mail address"
+msgstr "dirección de correo"
+
+#: contrib/auth/models.py:110
+msgid "password"
+msgstr "clave"
+
+#: contrib/auth/models.py:110
+msgid ""
+"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
+"password form</a>."
+msgstr ""
+"Use'[algo]$[sal]$[hash hexadecimal]' o use <a href=\"password/\">el "
+"formulario para cambiar la contraseña</a>."
+
+#: contrib/auth/models.py:111
+msgid "staff status"
+msgstr "es staff"
+
+#: contrib/auth/models.py:111
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica si el usuario puede entrar en este sitio de administración."
+
+#: contrib/auth/models.py:112
+msgid "active"
+msgstr "activo"
+
+#: contrib/auth/models.py:112
+msgid ""
+"Designates whether this user can log into the Django admin. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Indica si el usuario puede entrar en este sitio de administración. Desmarque "
+"esto en lugar de borrar la cuenta."
+
+#: contrib/auth/models.py:113
+msgid "superuser status"
+msgstr "es superusuario"
+
+#: contrib/auth/models.py:113
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Indica que este usuario tiene todos los permisos sin asignárselos "
+"explícitamente."
+
+#: contrib/auth/models.py:114
+msgid "last login"
+msgstr "Último registro"
+
+#: contrib/auth/models.py:115
+msgid "date joined"
+msgstr "fecha de creación"
+
+#: contrib/auth/models.py:117
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Además de los permisos asignados manualmente, este usuario también tendrá "
+"todos los permisos de los grupos en los que esté."
+
+#: contrib/auth/models.py:118
+msgid "user permissions"
+msgstr "permisos"
+
+#: contrib/auth/models.py:122
+msgid "user"
+msgstr "usuario"
+
+#: contrib/auth/models.py:123
+msgid "users"
+msgstr "usuarios"
+
+#: contrib/auth/models.py:129
+msgid "Personal info"
+msgstr "Información personal"
+
+#: contrib/auth/models.py:130
+msgid "Permissions"
+msgstr "Permisos"
+
+#: contrib/auth/models.py:131
+msgid "Important dates"
+msgstr "Fechas importantes"
+
+#: contrib/auth/models.py:132
+msgid "Groups"
+msgstr "Grupos"
+
+#: contrib/auth/models.py:274
+msgid "message"
+msgstr "mensaje"
+
+#: contrib/auth/views.py:41
+msgid "Logged out"
+msgstr "Sesión terminada"
+
+#: contrib/admin/models.py:17
+msgid "action time"
+msgstr "hora de acción"
+
+#: contrib/admin/models.py:20
+msgid "object id"
+msgstr "id de objeto"
+
+#: contrib/admin/models.py:21
+msgid "object repr"
+msgstr "repr de objeto"
+
+#: contrib/admin/models.py:22
+msgid "action flag"
+msgstr "marca de acción"
+
+#: contrib/admin/models.py:23
+msgid "change message"
+msgstr "mensaje de cambio"
+
+#: contrib/admin/models.py:26
+msgid "log entry"
+msgstr "entrada de registro"
+
+#: contrib/admin/models.py:27
+msgid "log entries"
+msgstr "entradas de registro"
+
+#: contrib/admin/filterspecs.py:42
 #, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "El %(verbose_name)s se ha creado correctamente."
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Por %s:</h3>\n"
+"<ul>\n"
 
-#: views/generic/create_update.py:117
+#: contrib/admin/filterspecs.py:72 contrib/admin/filterspecs.py:90
+#: contrib/admin/filterspecs.py:145 contrib/admin/filterspecs.py:171
+msgid "All"
+msgstr "Todo"
+
+#: contrib/admin/filterspecs.py:111
+msgid "Any date"
+msgstr "Cualquier fecha"
+
+#: contrib/admin/filterspecs.py:112
+msgid "Today"
+msgstr "Hoy"
+
+#: contrib/admin/filterspecs.py:115
+msgid "Past 7 days"
+msgstr "Últimos 7 días"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This month"
+msgstr "Este mes"
+
+#: contrib/admin/filterspecs.py:119
+msgid "This year"
+msgstr "Este año"
+
+#: contrib/admin/filterspecs.py:145 oldforms/__init__.py:587
+#: newforms/widgets.py:181
+msgid "Yes"
+msgstr "Sí"
+
+#: contrib/admin/filterspecs.py:145 oldforms/__init__.py:587
+#: newforms/widgets.py:181
+msgid "No"
+msgstr "No"
+
+#: contrib/admin/filterspecs.py:152 oldforms/__init__.py:587
+#: newforms/widgets.py:181
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: contrib/admin/views/decorators.py:24
+#: contrib/admin/templates/admin/login.html:25
+msgid "Log in"
+msgstr "Identificarse"
+
+#: contrib/admin/views/decorators.py:62
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Por favor, identifíquese de nuevo, porque su sesión ha caducado. No se "
+"preocupe: se ha guardado su envío."
+
+#: contrib/admin/views/decorators.py:69
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Parece que su navegador no está configurado para aceptar cookies. Actívelas "
+"por favor, recargue esta página, e inténtelo de nuevo."
+
+#: contrib/admin/views/decorators.py:83
+msgid "Usernames cannot contain the '@' character."
+msgstr "Los nombres de usuario no pueden contener el carácter '@'."
+
+#: contrib/admin/views/decorators.py:85
 #, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Se actualiz� con �xito el %(verbose_name)s."
+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."
 
-#: views/generic/create_update.py:184
+#: contrib/admin/views/main.py:230
+msgid "Site administration"
+msgstr "Sitio administrativo"
+
+#: contrib/admin/views/main.py:264 contrib/admin/views/auth.py:20
 #, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "El %(verbose_name)s ha sido eliminado."
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"."
 
-#: newforms/models.py:174 newforms/fields.py:432
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Escoja una opci�n v�lida. Esa opci�n no est� entre las aceptadas."
+#: contrib/admin/views/main.py:268 contrib/admin/views/main.py:354
+#: contrib/admin/views/auth.py:25
+msgid "You may edit it again below."
+msgstr "Puede editarlo de nuevo abajo."
 
-#: newforms/models.py:191 newforms/fields.py:448 newforms/fields.py:527
-msgid "Enter a list of values."
-msgstr "Introduzca una lista de valores."
-
-#: newforms/models.py:197 newforms/fields.py:457
+#: contrib/admin/views/main.py:278 contrib/admin/views/main.py:363
 #, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Escoja una opci�n v�lida; '%s' no es una de las opciones disponibles."
+msgid "You may add another %s below."
+msgstr "Puede agregar otro %s abajo."
 
-#: newforms/fields.py:110 newforms/fields.py:324
+#: contrib/admin/views/main.py:296
 #, python-format
-msgid "Ensure this value has at most %d characters."
-msgstr "Aseg�rese de que su texto tiene a lo m�s %d caracteres."
+msgid "Add %s"
+msgstr "Agregar %s"
 
-#: newforms/fields.py:112 newforms/fields.py:326
+#: contrib/admin/views/main.py:342
 #, python-format
-msgid "Ensure this value has at least %d characters."
-msgstr "Aseg�rese de que su texto tiene al menos %d caracteres."
+msgid "Added %s."
+msgstr "Agregado %s."
 
-#: newforms/fields.py:137 newforms/fields.py:160 newforms/fields.py:192
+#: contrib/admin/views/main.py:344
 #, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr "Aseg�rese de que este valor es menor o igual a %s."
+msgid "Changed %s."
+msgstr "Modificado %s."
 
-#: newforms/fields.py:139 newforms/fields.py:162 newforms/fields.py:194
+#: contrib/admin/views/main.py:346
 #, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr "Aseg�rese de que este valor es mayor o igual a %s."
+msgid "Deleted %s."
+msgstr "Borrado %s."
 
-#: newforms/fields.py:158 newforms/fields.py:186
-msgid "Enter a number."
-msgstr "Introduzca un n�mero."
+#: contrib/admin/views/main.py:349
+msgid "No fields changed."
+msgstr "No ha cambiado ningún campo."
 
-#: newforms/fields.py:196
+#: contrib/admin/views/main.py:352
 #, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr "Aseg�rese de que no hay m�s de %s d�gitos en total."
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Se modificó con éxito el %(name)s \"%(obj)s."
 
-#: newforms/fields.py:198
+#: contrib/admin/views/main.py:360
 #, python-format
-msgid "Ensure that there are no more than %s decimal places."
-msgstr "Aseg�rese de que no hay m�s de %s decimales."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"Se agregó con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
 
-#: newforms/fields.py:200
-#, fuzzy, python-format
-msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Aseg�rese de que no hay m�s de %s d�gitos antes del n�mero decimal."
+#: contrib/admin/views/main.py:398
+#, python-format
+msgid "Change %s"
+msgstr "Modificar %s"
 
-#: newforms/fields.py:233 newforms/fields.py:567
-msgid "Enter a valid date."
-msgstr "Introduzca una fecha v�lida."
+#: contrib/admin/views/main.py:483
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s"
 
-#: newforms/fields.py:260 newforms/fields.py:569
-msgid "Enter a valid time."
-msgstr "Introduzca una hora v�lida."
+#: contrib/admin/views/main.py:488
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Uno o más %(fieldname)s en %(name)s:"
 
-#: newforms/fields.py:296
-msgid "Enter a valid date/time."
-msgstr "Introduzca una fecha/hora v�lida."
+#: contrib/admin/views/main.py:520
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"."
 
-#: newforms/fields.py:310
-msgid "Enter a valid value."
-msgstr "Introduzca un valor correcto."
+#: contrib/admin/views/main.py:523
+msgid "Are you sure?"
+msgstr "¿Está seguro?"
 
-#: newforms/fields.py:357 newforms/fields.py:379
-msgid "Enter a valid URL."
-msgstr "Introduzca una URL v�lida."
+#: contrib/admin/views/main.py:545
+#, python-format
+msgid "Change history: %s"
+msgstr "Modificar histórico: %s"
 
-#: newforms/fields.py:381
-msgid "This URL appears to be a broken link."
-msgstr "La URL parece ser un enlace roto."
+#: contrib/admin/views/main.py:579
+#, python-format
+msgid "Select %s"
+msgstr "Escoja %s"
+
+#: contrib/admin/views/main.py:579
+#, python-format
+msgid "Select %s to change"
+msgstr "Escoja %s para modificar"
+
+#: contrib/admin/views/main.py:780
+msgid "Database error"
+msgstr "Erorr en la base de datos"
+
+#: contrib/admin/views/doc.py:47 contrib/admin/views/doc.py:49
+#: contrib/admin/views/doc.py:51
+msgid "tag:"
+msgstr "etiqueta:"
+
+#: contrib/admin/views/doc.py:78 contrib/admin/views/doc.py:80
+#: contrib/admin/views/doc.py:82
+msgid "filter:"
+msgstr "filtro:"
+
+#: contrib/admin/views/doc.py:136 contrib/admin/views/doc.py:138
+#: contrib/admin/views/doc.py:140
+msgid "view:"
+msgstr "vista:"
+
+#: contrib/admin/views/doc.py:165
+#, python-format
+msgid "App %r not found"
+msgstr "Aplicación %r no encontrada"
+
+#: contrib/admin/views/doc.py:172
+#, python-format
+msgid "Model %(name)r not found in app %(label)r"
+msgstr "El modelo %(name)s no se ha encontrado en la aplicación %(label)r"
+
+#: contrib/admin/views/doc.py:184
+#, python-format
+msgid "the related `%(label)s.%(type)s` object"
+msgstr "el objeto relacionado`%(label)s.%(type)s` "
+
+#: contrib/admin/views/doc.py:184 contrib/admin/views/doc.py:206
+#: contrib/admin/views/doc.py:220 contrib/admin/views/doc.py:225
+msgid "model:"
+msgstr "modelo:"
+
+#: contrib/admin/views/doc.py:215
+#, python-format
+msgid "related `%(label)s.%(name)s` objects"
+msgstr "los objetos relacionados `%(label)s.%(name)s`"
+
+#: contrib/admin/views/doc.py:220
+#, python-format
+msgid "all %s"
+msgstr "todo %s"
+
+#: contrib/admin/views/doc.py:225
+#, python-format
+msgid "number of %s"
+msgstr "número de %s"
+
+#: contrib/admin/views/doc.py:230
+#, python-format
+msgid "Fields on %s objects"
+msgstr "Campos en %s objetos"
+
+#: contrib/admin/views/doc.py:292 contrib/admin/views/doc.py:303
+#: contrib/admin/views/doc.py:305 contrib/admin/views/doc.py:311
+#: contrib/admin/views/doc.py:312 contrib/admin/views/doc.py:314
+msgid "Integer"
+msgstr "Entero"
+
+#: contrib/admin/views/doc.py:293
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (Verdadero o Falso)"
+
+#: contrib/admin/views/doc.py:294 contrib/admin/views/doc.py:313
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr "Cadena (máximo %(maxlength)s)"
+
+#: contrib/admin/views/doc.py:295
+msgid "Comma-separated integers"
+msgstr "Enteros separados por comas"
+
+#: contrib/admin/views/doc.py:296
+msgid "Date (without time)"
+msgstr "Fecha (sin hora)"
+
+#: contrib/admin/views/doc.py:297
+msgid "Date (with time)"
+msgstr "Fecha (con hora)"
+
+#: contrib/admin/views/doc.py:298
+msgid "Decimal number"
+msgstr "Número decimal"
+
+#: contrib/admin/views/doc.py:299
+msgid "E-mail address"
+msgstr "Dirección de correo electrónico"
+
+#: contrib/admin/views/doc.py:300 contrib/admin/views/doc.py:301
+#: contrib/admin/views/doc.py:304
+msgid "File path"
+msgstr "Ruta de fichero"
+
+#: contrib/admin/views/doc.py:302
+msgid "Floating point number"
+msgstr "Número decimal"
+
+#: contrib/admin/views/doc.py:306 contrib/comments/models.py:85
+msgid "IP address"
+msgstr "Dirección IP"
+
+#: contrib/admin/views/doc.py:308
+msgid "Boolean (Either True, False or None)"
+msgstr "Booleano (Verdadero, Falso o Nulo)"
+
+#: contrib/admin/views/doc.py:309
+msgid "Relation to parent model"
+msgstr "Relación con el modelo padre"
+
+#: contrib/admin/views/doc.py:310
+msgid "Phone number"
+msgstr "Número de teléfono"
+
+#: contrib/admin/views/doc.py:315
+msgid "Text"
+msgstr "Texto"
+
+#: contrib/admin/views/doc.py:316
+msgid "Time"
+msgstr "Hora"
+
+#: contrib/admin/views/doc.py:317 contrib/flatpages/models.py:7
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:318
+msgid "U.S. state (two uppercase letters)"
+msgstr "Estado de los EEUU (dos letras mayúsculas)"
+
+#: contrib/admin/views/doc.py:319
+msgid "XML text"
+msgstr "Texto XML"
+
+#: contrib/admin/views/doc.py:345
+#, 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:31
+msgid "Add user"
+msgstr "Añadir usuario"
+
+#: contrib/admin/views/auth.py:58
+msgid "Password changed successfully."
+msgstr "La clave se ha cambiado exitosamente."
+
+#: contrib/admin/views/auth.py:65
+#, python-format
+msgid "Change password: %s"
+msgstr "Cambiar clave: %s"
+
+#: contrib/admin/templatetags/admin_list.py:254
+msgid "All dates"
+msgstr "Todas las fechas"
+
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Mostrarlo todo"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+msgid "Documentation"
+msgstr "Documentación"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/admin/auth/user/change_password.html:15
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+msgid "Change password"
+msgstr "Cambiar clave"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/comments/templates/comments/form.html:6
+msgid "Log out"
+msgstr "Terminar sesión"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/change_form.html:13
+#: contrib/admin/templates/admin/change_list.html:6
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/auth/user/change_password.html:12
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
+msgid "Home"
+msgstr "Inicio"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "Eliminar"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+"Eliminar el %(object_name)s '%(escaped_object)s' provocaría la eliminación "
+"de objetos relacionados, pero su cuenta no tiene permiso para borrar los "
+"siguientes tipos de objetos:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:21
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+"¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_object)s"
+"\"? Se borrarán los siguientes objetos relacionados:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:26
+msgid "Yes, I'm sure"
+msgstr "Sí, estoy seguro"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Página no encontrada"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Lo sentimos, pero no se encuentra la página solicitada."
+
+#: contrib/admin/templates/admin/change_form.html:15
+#: contrib/admin/templates/admin/index.html:28
+msgid "Add"
+msgstr "Agregar"
+
+#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/object_history.html:5
+msgid "History"
+msgstr "Histórico"
+
+#: contrib/admin/templates/admin/change_form.html:22
+msgid "View on site"
+msgstr "Ver en el sitio"
+
+#: contrib/admin/templates/admin/change_form.html:32
+#: contrib/admin/templates/admin/auth/user/change_password.html:24
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Por favor, corrija el siguiente error."
+msgstr[1] "Por favor, corrija los siguientes errores."
+
+#: contrib/admin/templates/admin/change_form.html:50
+msgid "Ordering"
+msgstr "Ordenación"
+
+#: contrib/admin/templates/admin/change_form.html:53
+msgid "Order:"
+msgstr "Orden:"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Por %(filter_title)s "
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Grabar como nuevo"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Grabar y añadir otro"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Grabar y continuar editando"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Grabar"
+
+#: contrib/admin/templates/admin/change_list.html:12
+#, python-format
+msgid "Add %(name)s"
+msgstr "Agregar %(name)s"
+
+#: contrib/admin/templates/admin/index.html:17
+#, python-format
+msgid "Models available in the %(name)s application."
+msgstr "Modelos disponibles en la aplicación %(name)s."
+
+#: contrib/admin/templates/admin/index.html:18
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
+
+#: contrib/admin/templates/admin/index.html:34
+msgid "Change"
+msgstr "Modificar"
+
+#: contrib/admin/templates/admin/index.html:44
+msgid "You don't have permission to edit anything."
+msgstr "No tiene permiso para editar nada."
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "Recent Actions"
+msgstr "Acciones recientes"
+
+#: contrib/admin/templates/admin/index.html:53
+msgid "My Actions"
+msgstr "Mis acciones"
+
+#: contrib/admin/templates/admin/index.html:57
+msgid "None available"
+msgstr "Ninguno disponible"
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Sitio de administración de Django"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administración de Django"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "Fecha/hora"
+
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "User"
+msgstr "Usuario"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "Acción"
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "j M Y P"
+
+#: contrib/admin/templates/admin/object_history.html:36
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Este objeto no tiene histórico de cambios. Probablemente no fue añadido "
+"usando este sitio de administración."
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Error del servidor"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Error del servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Error de servidor <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Ha ocurrido un error. Se ha informado a los administradores del sitio "
+"mediante correo electrónico y debería arreglarse en breve. Gracias por su "
+"paciencia."
+
+#: 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 ""
+"Algo va mal con la instalación de la base de datos. Asegúrate que las tablas "
+"necesarias han sido creadas, y que la base de datos puede ser leída por el "
+"usuario apropiado."
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Buscar"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] "1 resultado"
+msgstr[1] "%(counter)s resultados"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s total"
+
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Filtro"
+
+#: contrib/admin/templates/admin/login.html:17
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+msgid "Username:"
+msgstr "Usuario:"
+
+#: contrib/admin/templates/admin/login.html:20
+#: contrib/comments/templates/comments/form.html:8
+msgid "Password:"
+msgstr "Clave:"
+
+#: contrib/admin/templates/admin/base.html:25
+msgid "Welcome,"
+msgstr "Bienvenido,"
+
+#: 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 introduzca un nombre de usuario y una contraseña. Luego podrá editar "
+"el resto de opciones del usuario."
+
+#: 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
+#: contrib/admin/templates/admin/auth/user/change_password.html:34
+msgid "Password"
+msgstr "Contraseña"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+msgid "Password (again)"
+msgstr "Contraseña (de nuevo)"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+#: contrib/admin/templates/admin/auth/user/change_password.html:40
+msgid "Enter the same password as above, for verification."
+msgstr "Introduzca la misma contraseña que arriba, para verificación"
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr ""
+"Introduzca una nueva contraseña para el usuario <strong>%(username)s</"
+"strong>."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Bookmarklets de documentación"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Para instalar bookmarklets, arrastre el enlace a su barra\n"
+"de favoritos, o pulse con el botón derecho el enlace y añádalo a sus "
+"favoritos.\n"
+"Ahora puede escoger el bookmarklet desde cualquier página en el sitio.\n"
+"Observer que algunos de estos bookmarklets precisan que esté viendo\n"
+"el sitio desde un computador señalado como \"interno\" (hable\n"
+"con su administrador de sistemas si no está seguro de si el suyo lo es).</"
+"p>\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Documentación de esta página"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Le lleva desde cualquier página a la documentación de la vista que la genera."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "Mostrar ID de objeto"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Muestra el tipo de contenido e ID unívoco de las páginas que representan un "
+"único objeto."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Editar este objeto (ventana actual)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+"Le lleva a la página de administración de páginas que representan un único "
+"objeto."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Editar este objeto (nueva ventana)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+"Como antes, pero abre la página de administración en una nueva ventana."
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "Fecha:"
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "Hora:"
+
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "Actualmente:"
+
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "Modificar:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "Recuperar clave"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"¿Ha olvidado su clave? Introduzca su dirección de correo electrónico, y "
+"crearemos una nueva que le enviaremos por correo."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Dirección de correo electrónico:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Recuperar mi clave"
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Está recibiendo este mensaje debido a que solicitó recuperar la clave"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "de su cuenta de usuario en %(site_name)s."
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr "Su nueva clave es: %(new_password)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr "Puede cambiarla accediendo a esta página:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "Su nombre de usuario, en caso de haberlo olvidado:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "¡Gracias por usar nuestro sitio!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "El equipo de %(site_name)s"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Identificarse de nuevo"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Recuperación de clave exitosa"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Le hemos enviado una clave nueva a la dirección que ha suministrado. Debería "
+"recibirla en breve."
+
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
+#: contrib/admin/templates/registration/password_change_done.html:4
+msgid "Password change"
+msgstr "Cambio de clave"
+
+#: contrib/admin/templates/registration/password_change_form.html:12
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Por favor, introduzca su clave antigua, por seguridad, y después introduzca "
+"la nueva clave dos veces para verificar que la ha escrito correctamente."
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "Clave antigua:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "Clave nueva:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "Confirme clave:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "Cambiar mi clave"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "Cambio de clave exitoso"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "Su clave ha sido cambiada."
+
+#: contrib/sites/models.py:15
+msgid "domain name"
+msgstr "nombre de dominio"
+
+#: contrib/sites/models.py:16
+msgid "display name"
+msgstr "nombre para mostrar"
+
+#: contrib/sites/models.py:20
+msgid "site"
+msgstr "sitio"
+
+#: contrib/sites/models.py:21
+msgid "sites"
+msgstr "sitios"
 
 #: contrib/humanize/templatetags/humanize.py:17
 msgid "th"
@@ -743,22 +1709,22 @@ msgstr "rd"
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
-msgstr[0] "%(value).1f mill�n"
-msgstr[1] "%(value).1f milli�n"
+msgstr[0] "%(value).1f millón"
+msgstr[1] "%(value).1f millión"
 
 #: contrib/humanize/templatetags/humanize.py:50
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
-msgstr[0] "%(value).1f billi�n"
-msgstr[1] "%(value).1f billi�n"
+msgstr[0] "%(value).1f billión"
+msgstr[1] "%(value).1f billión"
 
 #: contrib/humanize/templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
-msgstr[0] "%(value).1f trilli�n"
-msgstr[1] "%(value).1f trilli�n"
+msgstr[0] "%(value).1f trillión"
+msgstr[1] "%(value).1f trillión"
 
 #: contrib/humanize/templatetags/humanize.py:68
 msgid "one"
@@ -796,6 +1762,53 @@ msgstr "ocho"
 msgid "nine"
 msgstr "nueve"
 
+#: contrib/flatpages/models.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Ejemplo: '/about/contact/'. Asegúrese de que pone barras al principio y al "
+"final."
+
+#: contrib/flatpages/models.py:9
+msgid "title"
+msgstr "título"
+
+#: contrib/flatpages/models.py:10
+msgid "content"
+msgstr "contenido"
+
+#: contrib/flatpages/models.py:11
+msgid "enable comments"
+msgstr "admitir comentarios"
+
+#: contrib/flatpages/models.py:12
+msgid "template name"
+msgstr "nombre de plantilla"
+
+#: contrib/flatpages/models.py:13
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+"Ejemplo: 'flatpages/contact_page.html'. Si no es proporcionado, el sistema "
+"usará 'flatpages/default.html'."
+
+#: contrib/flatpages/models.py:14
+msgid "registration required"
+msgstr "debe estar registrado"
+
+#: contrib/flatpages/models.py:14
+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."
+
+#: contrib/flatpages/models.py:18
+msgid "flat page"
+msgstr "página estática"
+
+#: contrib/flatpages/models.py:19
+msgid "flat pages"
+msgstr "páginas estáticas"
+
 #: contrib/redirects/models.py:7
 msgid "redirect from"
 msgstr "redirigir desde"
@@ -805,7 +1818,7 @@ msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
-"Esta ruta deber�a ser absoluta, excluyendo el nombre de dominio. Ejeplo: '/"
+"Esta ruta debería ser absoluta, excluyendo el nombre de dominio. Ejeplo: '/"
 "events/search/'."
 
 #: contrib/redirects/models.py:9
@@ -822,7 +1835,7 @@ msgstr ""
 
 #: contrib/redirects/models.py:13
 msgid "redirect"
-msgstr "redirecci�n"
+msgstr "redirección"
 
 #: contrib/redirects/models.py:14
 msgid "redirects"
@@ -843,62 +1856,58 @@ msgstr "comentario"
 
 #: contrib/comments/models.py:70
 msgid "rating #1"
-msgstr "calificaci�n 1"
+msgstr "calificación 1"
 
 #: contrib/comments/models.py:71
 msgid "rating #2"
-msgstr "calificaci�n 2"
+msgstr "calificación 2"
 
 #: contrib/comments/models.py:72
 msgid "rating #3"
-msgstr "calificaci�n 3"
+msgstr "calificación 3"
 
 #: contrib/comments/models.py:73
 msgid "rating #4"
-msgstr "calificaci�n 4"
+msgstr "calificación 4"
 
 #: contrib/comments/models.py:74
 msgid "rating #5"
-msgstr "calificaci�n 5"
+msgstr "calificación 5"
 
 #: contrib/comments/models.py:75
 msgid "rating #6"
-msgstr "calificaci�n 6"
+msgstr "calificación 6"
 
 #: contrib/comments/models.py:76
 msgid "rating #7"
-msgstr "calificaci�n 7"
+msgstr "calificación 7"
 
 #: contrib/comments/models.py:77
 msgid "rating #8"
-msgstr "calificaci�n 8"
+msgstr "calificación 8"
 
 #: contrib/comments/models.py:82
 msgid "is valid rating"
-msgstr "es calificaci�n v�lida"
+msgstr "es calificación válida"
 
 #: contrib/comments/models.py:83 contrib/comments/models.py:169
 msgid "date/time submitted"
-msgstr "fecha/hora de env�o"
+msgstr "fecha/hora de envío"
 
 #: contrib/comments/models.py:84 contrib/comments/models.py:170
 msgid "is public"
-msgstr "es p�blico"
-
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:306
-msgid "IP address"
-msgstr "Direcci�n IP"
+msgstr "es público"
 
 #: contrib/comments/models.py:86
 msgid "is removed"
-msgstr "est� eliminado"
+msgstr "está eliminado"
 
 #: contrib/comments/models.py:86
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
-"Marque esta caja si el comentario es inapropiado. En su lugar se mostrar� "
+"Marque esta caja si el comentario es inapropiado. En su lugar se mostrará "
 "\"Este comentario ha sido eliminado\"."
 
 #: contrib/comments/models.py:91
@@ -930,7 +1939,7 @@ msgstr "nombre de la persona"
 
 #: contrib/comments/models.py:171
 msgid "ip address"
-msgstr "direcci�n ip"
+msgstr "dirección ip"
 
 #: contrib/comments/models.py:173
 msgid "approved by staff"
@@ -946,11 +1955,11 @@ msgstr "comentarios libres"
 
 #: contrib/comments/models.py:233
 msgid "score"
-msgstr "puntuaci�n"
+msgstr "puntuación"
 
 #: contrib/comments/models.py:234
 msgid "score date"
-msgstr "fecha de la puntuaci�n"
+msgstr "fecha de la puntuación"
 
 #: contrib/comments/models.py:237
 msgid "karma score"
@@ -995,11 +2004,11 @@ msgstr "Marca de %r"
 
 #: contrib/comments/models.py:278
 msgid "deletion date"
-msgstr "fecha de eliminaci�n"
+msgstr "fecha de eliminación"
 
 #: contrib/comments/models.py:280
 msgid "moderator deletion"
-msgstr "eliminaci�n de moderador"
+msgstr "eliminación de moderador"
 
 #: contrib/comments/models.py:281
 msgid "moderator deletions"
@@ -1008,24 +2017,24 @@ msgstr "eliminaciones de moderador"
 #: contrib/comments/models.py:285
 #, python-format
 msgid "Moderator deletion by %r"
-msgstr "Eliminaci�n del moderador %r"
+msgstr "Eliminación del moderador %r"
 
 #: contrib/comments/views/karma.py:20
 msgid "Anonymous users cannot vote"
-msgstr "Los usuarios an�nimos no pueden votar"
+msgstr "Los usuarios anónimos no pueden votar"
 
 #: contrib/comments/views/karma.py:24
 msgid "Invalid comment ID"
-msgstr "ID de comentario no v�lido"
+msgstr "ID de comentario no válido"
 
 #: contrib/comments/views/karma.py:26
 msgid "No voting for yourself"
-msgstr "No puedes votarte t� mismo"
+msgstr "No puedes votarte tú mismo"
 
 #: contrib/comments/views/comments.py:28
 msgid ""
 "This rating is required because you've entered at least one other rating."
-msgstr "Se precisa esta puntuaci�n porque ha introducido al menos otra m�s."
+msgstr "Se precisa esta puntuación porque ha introducido al menos otra más."
 
 #: contrib/comments/views/comments.py:112
 #, python-format
@@ -1040,12 +2049,12 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
-"Este comentario lo envi� un usuario que ha enviado menos de %(count)s "
+"Este comentario lo envió un usuario que ha enviado menos de %(count)s "
 "comentario:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
-"Este comentario lo envi� un usuario que ha enviado menos de %(count)s "
+"Este comentario lo envió un usuario que ha enviado menos de %(count)s "
 "comentarios:\n"
 "\n"
 "%(text)s"
@@ -1064,18 +2073,18 @@ msgstr ""
 #: contrib/comments/views/comments.py:189
 #: contrib/comments/views/comments.py:281
 msgid "Only POSTs are allowed"
-msgstr "S�lo se admite POST"
+msgstr "Sólo se admite POST"
 
 #: contrib/comments/views/comments.py:193
 #: contrib/comments/views/comments.py:285
 msgid "One or more of the required fields wasn't submitted"
-msgstr "No se proporcion� uno o m�s de los siguientes campos requeridos"
+msgstr "No se proporcionó uno o más de los siguientes campos requeridos"
 
 #: contrib/comments/views/comments.py:197
 #: contrib/comments/views/comments.py:287
 msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
-"Alguien est� jugando con el formulario de comentarios (violaci�n de "
+"Alguien está jugando con el formulario de comentarios (violación de "
 "seguridad)"
 
 #: contrib/comments/views/comments.py:207
@@ -1084,50 +2093,17 @@ msgid ""
 "The comment form had an invalid 'target' parameter -- the object ID was "
 "invalid"
 msgstr ""
-"El formulario de comentarios tiene un par�metro 'target' no v�lido (el ID de "
-"objeto era inv�lido)"
+"El formulario de comentarios tiene un parámetro 'target' no válido (el ID de "
+"objeto era inválido)"
 
 #: contrib/comments/views/comments.py:258
 #: contrib/comments/views/comments.py:322
 msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr "El formulario de comentario no proporcion� 'previsualizar' ni 'enviar'"
-
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/login.html:17
-msgid "Username:"
-msgstr "Usuario:"
-
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-msgid "Log out"
-msgstr "Terminar sesi�n"
-
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/login.html:20
-msgid "Password:"
-msgstr "Clave:"
+msgstr "El formulario de comentario no proporcionó 'previsualizar' ni 'enviar'"
 
 #: contrib/comments/templates/comments/form.html:8
 msgid "Forgotten your password?"
-msgstr "�Has olvidado tu contrase�a?"
+msgstr "¿Has olvidado tu contraseña?"
 
 #: contrib/comments/templates/comments/form.html:12
 msgid "Ratings"
@@ -1145,7 +2121,7 @@ msgstr "Opcional"
 
 #: contrib/comments/templates/comments/form.html:23
 msgid "Post a photo"
-msgstr "Postea una fotograf�a"
+msgstr "Postea una fotografía"
 
 #: contrib/comments/templates/comments/form.html:28
 #: contrib/comments/templates/comments/freeform.html:5
@@ -1161,1088 +2137,21 @@ msgstr "Previsualizar comentario"
 msgid "Your name:"
 msgstr "Tu nombre:"
 
-#: contrib/sites/models.py:10
-msgid "domain name"
-msgstr "nombre de dominio"
-
-#: contrib/sites/models.py:11
-msgid "display name"
-msgstr "nombre para mostrar"
-
-#: contrib/sites/models.py:15
-msgid "site"
-msgstr "sitio"
-
-#: contrib/sites/models.py:16
-msgid "sites"
-msgstr "sitios"
-
-#: contrib/admin/filterspecs.py:42
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Por %s:</h3>\n"
-"<ul>\n"
-
-#: contrib/admin/filterspecs.py:72 contrib/admin/filterspecs.py:90
-#: contrib/admin/filterspecs.py:145 contrib/admin/filterspecs.py:171
-msgid "All"
-msgstr "Todo"
-
-#: contrib/admin/filterspecs.py:111
-msgid "Any date"
-msgstr "Cualquier fecha"
-
-#: contrib/admin/filterspecs.py:112
-msgid "Today"
-msgstr "Hoy"
-
-#: contrib/admin/filterspecs.py:115
-msgid "Past 7 days"
-msgstr "�ltimos 7 d�as"
-
-#: contrib/admin/filterspecs.py:117
-msgid "This month"
-msgstr "Este mes"
-
-#: contrib/admin/filterspecs.py:119
-msgid "This year"
-msgstr "Este a�o"
-
-#: contrib/admin/models.py:17
-msgid "action time"
-msgstr "hora de acci�n"
-
-#: contrib/admin/models.py:20
-msgid "object id"
-msgstr "id de objeto"
-
-#: contrib/admin/models.py:21
-msgid "object repr"
-msgstr "repr de objeto"
-
-#: contrib/admin/models.py:22
-msgid "action flag"
-msgstr "marca de acci�n"
-
-#: contrib/admin/models.py:23
-msgid "change message"
-msgstr "mensaje de cambio"
-
-#: contrib/admin/models.py:26
-msgid "log entry"
-msgstr "entrada de registro"
-
-#: contrib/admin/models.py:27
-msgid "log entries"
-msgstr "entradas de registro"
-
-#: contrib/admin/templatetags/admin_list.py:252
-msgid "All dates"
-msgstr "Todas las fechas"
-
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:264
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Se a�adi� con �xito el %(name)s \"%(obj)s\"."
-
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:268
-#: contrib/admin/views/main.py:354
-msgid "You may edit it again below."
-msgstr "Puede editarlo de nuevo abajo."
-
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "A�adir usuario"
-
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "La clave se ha cambiado exitosamente."
-
-#: contrib/admin/views/auth.py:65
-#, python-format
-msgid "Change password: %s"
-msgstr "Cambiar clave: %s"
-
-#: contrib/admin/views/main.py:230
-msgid "Site administration"
-msgstr "Sitio administrativo"
-
-#: contrib/admin/views/main.py:278 contrib/admin/views/main.py:363
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puede agregar otro %s abajo."
-
-#: contrib/admin/views/main.py:296
-#, python-format
-msgid "Add %s"
-msgstr "Agregar %s"
-
-#: contrib/admin/views/main.py:342
-#, python-format
-msgid "Added %s."
-msgstr "Agregado %s."
-
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Changed %s."
-msgstr "Modificado %s."
-
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Deleted %s."
-msgstr "Borrado %s."
-
-#: contrib/admin/views/main.py:349
-msgid "No fields changed."
-msgstr "No ha cambiado ning�n campo."
-
-#: contrib/admin/views/main.py:352
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Se modific� con �xito el %(name)s \"%(obj)s."
-
-#: contrib/admin/views/main.py:360
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-"Se agreg� con �xito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
-
-#: contrib/admin/views/main.py:398
-#, python-format
-msgid "Change %s"
-msgstr "Modificar %s"
-
-#: contrib/admin/views/main.py:483
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Uno o m�s %(fieldname)s en %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:488
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Uno o m�s %(fieldname)s en %(name)s:"
-
-#: contrib/admin/views/main.py:520
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "Se elimin� con �xito el %(name)s \"%(obj)s\"."
-
-#: contrib/admin/views/main.py:523
-msgid "Are you sure?"
-msgstr "�Est� seguro?"
-
-#: contrib/admin/views/main.py:545
-#, python-format
-msgid "Change history: %s"
-msgstr "Modificar hist�rico: %s"
-
-#: contrib/admin/views/main.py:579
-#, python-format
-msgid "Select %s"
-msgstr "Escoja %s"
-
-#: contrib/admin/views/main.py:579
-#, python-format
-msgid "Select %s to change"
-msgstr "Escoja %s para modificar"
-
-#: contrib/admin/views/main.py:780
-msgid "Database error"
-msgstr "Erorr en la base de datos"
-
-#: contrib/admin/views/decorators.py:10 contrib/auth/forms.py:60
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Por favor, introduzca un correcto nombre de usuario y contrase�a. Note que "
-"ambos campos son sensibles a may�sculas/min�sculas."
-
-#: contrib/admin/views/decorators.py:24
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Identificarse"
-
-#: contrib/admin/views/decorators.py:62
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"Por favor, identif�quese de nuevo, porque su sesi�n ha caducado. No se "
-"preocupe: se ha guardado su env�o."
-
-#: contrib/admin/views/decorators.py:69
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Parece que su navegador no est� configurado para aceptar cookies. Act�velas "
-"por favor, recargue esta p�gina, e int�ntelo de nuevo."
-
-#: contrib/admin/views/decorators.py:83
-msgid "Usernames cannot contain the '@' character."
-msgstr "Los nombres de usuario no pueden contener el car�cter '@'."
-
-#: contrib/admin/views/decorators.py:85
-#, 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:47 contrib/admin/views/doc.py:49
-#: contrib/admin/views/doc.py:51
-msgid "tag:"
-msgstr "etiqueta:"
-
-#: contrib/admin/views/doc.py:78 contrib/admin/views/doc.py:80
-#: contrib/admin/views/doc.py:82
-msgid "filter:"
-msgstr "filtro:"
-
-#: contrib/admin/views/doc.py:136 contrib/admin/views/doc.py:138
-#: contrib/admin/views/doc.py:140
-msgid "view:"
-msgstr "vista:"
-
-#: contrib/admin/views/doc.py:165
-#, python-format
-msgid "App %r not found"
-msgstr "Aplicaci�n %r no encontrada"
-
-#: contrib/admin/views/doc.py:172
-#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "El modelo %(name)s no se ha encontrado en la aplicaci�n %(label)r"
-
-#: contrib/admin/views/doc.py:184
-#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "el objeto relacionado`%(label)s.%(type)s` "
-
-#: contrib/admin/views/doc.py:184 contrib/admin/views/doc.py:206
-#: contrib/admin/views/doc.py:220 contrib/admin/views/doc.py:225
-msgid "model:"
-msgstr "modelo:"
-
-#: contrib/admin/views/doc.py:215
-#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "los objetos relacionados `%(label)s.%(name)s`"
-
-#: contrib/admin/views/doc.py:220
-#, python-format
-msgid "all %s"
-msgstr "todo %s"
-
-#: contrib/admin/views/doc.py:225
-#, python-format
-msgid "number of %s"
-msgstr "n�mero de %s"
-
-#: contrib/admin/views/doc.py:230
-#, python-format
-msgid "Fields on %s objects"
-msgstr "Campos en %s objetos"
-
-#: contrib/admin/views/doc.py:292 contrib/admin/views/doc.py:303
-#: contrib/admin/views/doc.py:305 contrib/admin/views/doc.py:311
-#: contrib/admin/views/doc.py:312 contrib/admin/views/doc.py:314
-msgid "Integer"
-msgstr "Entero"
-
-#: contrib/admin/views/doc.py:293
-msgid "Boolean (Either True or False)"
-msgstr "Booleano (Verdadero o Falso)"
-
-#: contrib/admin/views/doc.py:294 contrib/admin/views/doc.py:313
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Cadena (m�ximo %(maxlength)s)"
-
-#: contrib/admin/views/doc.py:295
-msgid "Comma-separated integers"
-msgstr "Enteros separados por comas"
-
-#: contrib/admin/views/doc.py:296
-msgid "Date (without time)"
-msgstr "Fecha (sin hora)"
-
-#: contrib/admin/views/doc.py:297
-msgid "Date (with time)"
-msgstr "Fecha (con hora)"
-
-#: contrib/admin/views/doc.py:298
-msgid "Decimal number"
-msgstr "N�mero decimal"
-
-#: contrib/admin/views/doc.py:299
-msgid "E-mail address"
-msgstr "Direcci�n de correo electr�nico"
-
-#: contrib/admin/views/doc.py:300 contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:304
-msgid "File path"
-msgstr "Ruta de fichero"
-
-#: contrib/admin/views/doc.py:302
-msgid "Floating point number"
-msgstr "N�mero decimal"
-
-#: contrib/admin/views/doc.py:308
-msgid "Boolean (Either True, False or None)"
-msgstr "Booleano (Verdadero, Falso o Nulo)"
-
-#: contrib/admin/views/doc.py:309
-msgid "Relation to parent model"
-msgstr "Relaci�n con el modelo padre"
-
-#: contrib/admin/views/doc.py:310
-msgid "Phone number"
-msgstr "N�mero de tel�fono"
-
-#: contrib/admin/views/doc.py:315
-msgid "Text"
-msgstr "Texto"
-
-#: contrib/admin/views/doc.py:316
-msgid "Time"
-msgstr "Hora"
-
-#: contrib/admin/views/doc.py:317 contrib/flatpages/models.py:7
-msgid "URL"
-msgstr "URL"
-
-#: contrib/admin/views/doc.py:318
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado de los EEUU (dos letras may�sculas)"
-
-#: contrib/admin/views/doc.py:319
-msgid "XML text"
-msgstr "Texto XML"
-
-#: contrib/admin/views/doc.py:345
-#, python-format
-msgid "%s does not appear to be a urlpattern object"
-msgstr "%s no parece ser un objeto urlpattern"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Actualmente:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Modificar:"
-
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Fecha:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Hora:"
-
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Documentation"
-msgstr "Documentaci�n"
-
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin/auth/user/change_password.html:15
-#: contrib/admin/templates/admin/auth/user/change_password.html:46
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-msgid "Change password"
-msgstr "Cambiar clave"
-
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/base.html:30
-#: contrib/admin/templates/admin/auth/user/change_password.html:12
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Home"
-msgstr "Inicio"
-
-#: contrib/admin/templates/admin/change_list.html:12
-#, python-format
-msgid "Add %(name)s"
-msgstr "Agregar %(name)s"
-
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(filter_title)s "
-msgstr " Por %(filter_title)s "
-
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:21
-msgid "History"
-msgstr "Hist�rico"
-
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "Fecha/hora"
-
-#: contrib/admin/templates/admin/object_history.html:19
-msgid "User"
-msgstr "Usuario"
-
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "Acci�n"
-
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "j M Y P"
-
-#: contrib/admin/templates/admin/object_history.html:36
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
-msgstr ""
-"Este objeto no tiene hist�rico de cambios. Probablemente no fue a�adido "
-"usando este sitio de administraci�n."
-
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "Buscar"
-
-#: contrib/admin/templates/admin/search_form.html:10
-#, python-format
-msgid "1 result"
-msgid_plural "%(counter)s results"
-msgstr[0] "1 resultado"
-msgstr[1] "%(counter)s resultados"
-
-#: contrib/admin/templates/admin/search_form.html:10
-#, python-format
-msgid "%(full_result_count)s total"
-msgstr "%(full_result_count)s total"
-
-#: contrib/admin/templates/admin/pagination.html:10
-msgid "Show all"
-msgstr "Mostrarlo todo"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Sitio de administraci�n de Django"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administraci�n de Django"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Error del servidor"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Error del servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Error de servidor <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Ha ocurrido un error. Se ha informado a los administradores del sitio "
-"mediante correo electr�nico y deber�a arreglarse en breve. Gracias por su "
-"paciencia."
-
-#: 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 ""
-"Algo va mal con la instalaci�n de la base de datos. Aseg�rate que las tablas "
-"necesarias han sido creadas, y que la base de datos puede ser le�da por el "
-"usuario apropiado."
-
-#: contrib/admin/templates/admin/index.html:17
-#, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelos disponibles en la aplicaci�n %(name)s."
-
-#: contrib/admin/templates/admin/index.html:18
-#, python-format
-msgid "%(name)s"
-msgstr "%(name)s"
-
-#: contrib/admin/templates/admin/index.html:28
-#: contrib/admin/templates/admin/change_form.html:15
-msgid "Add"
-msgstr "Agregar"
-
-#: contrib/admin/templates/admin/index.html:34
-msgid "Change"
-msgstr "Modificar"
-
-#: contrib/admin/templates/admin/index.html:44
-msgid "You don't have permission to edit anything."
-msgstr "No tiene permiso para editar nada."
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "Recent Actions"
-msgstr "Acciones recientes"
-
-#: contrib/admin/templates/admin/index.html:53
-msgid "My Actions"
-msgstr "Mis acciones"
-
-#: contrib/admin/templates/admin/index.html:57
-msgid "None available"
-msgstr "Ninguno disponible"
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "P�gina no encontrada"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Lo sentimos, pero no se encuentra la p�gina solicitada."
-
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filtro"
-
-#: contrib/admin/templates/admin/change_form.html:22
-msgid "View on site"
-msgstr "Ver en el sitio"
-
-#: contrib/admin/templates/admin/change_form.html:32
-#: contrib/admin/templates/admin/auth/user/change_password.html:24
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Por favor, corrija el siguiente error."
-msgstr[1] "Por favor, corrija los siguientes errores."
-
-#: contrib/admin/templates/admin/change_form.html:50
-msgid "Ordering"
-msgstr "Ordenaci�n"
-
-#: contrib/admin/templates/admin/change_form.html:53
-msgid "Order:"
-msgstr "Orden:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-msgstr "Eliminar"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
-msgid ""
-"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
-"related objects, but your account doesn't have permission to delete the "
-"following types of objects:"
-msgstr ""
-"Eliminar el %(object_name)s '%(escaped_object)s' provocar�a la eliminaci�n "
-"de objetos relacionados, pero su cuenta no tiene permiso para borrar los "
-"siguientes tipos de objetos:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:21
-#, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
-"All of the following related items will be deleted:"
-msgstr ""
-"�Est� seguro de que quiere borrar los %(object_name)s \"%(escaped_object)s"
-"\"? Se borrar�n los siguientes objetos relacionados:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:26
-msgid "Yes, I'm sure"
-msgstr "S�, estoy seguro"
-
-#: contrib/admin/templates/admin/base.html:25
-msgid "Welcome,"
-msgstr "Bienvenido,"
-
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "Grabar como nuevo"
-
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "Grabar y a�adir otro"
-
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "Grabar y continuar editando"
-
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "Grabar"
-
-#: contrib/admin/templates/admin/auth/user/change_password.html:28
-#, python-format
-msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr ""
-"Introduzca una nueva contrase�a para el usuario <strong>%(username)s</"
-"strong>."
-
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
-msgid "Password"
-msgstr "Contrase�a"
-
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-msgid "Password (again)"
-msgstr "Contrase�a (de nuevo)"
-
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-msgid "Enter the same password as above, for verification."
-msgstr "Introduzca la misma contrase�a que arriba, para verificaci�n"
-
-#: 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 introduzca un nombre de usuario y una contrase�a. Luego podr� editar "
-"el resto de opciones del usuario."
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
-msgid "Password change"
-msgstr "Cambio de clave"
-
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
-msgstr "Cambio de clave exitoso"
-
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-msgstr "Su clave ha sido cambiada."
-
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/registration/password_reset_form.html:10
-#: contrib/admin/templates/registration/password_reset_done.html:4
-msgid "Password reset"
-msgstr "Recuperar clave"
-
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"�Ha olvidado su clave? Introduzca su direcci�n de correo electr�nico, y "
-"crearemos una nueva que le enviaremos por correo."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Direcci�n de correo electr�nico:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Recuperar mi clave"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Identificarse de nuevo"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Recuperaci�n de clave exitosa"
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"Le hemos enviado una clave nueva a la direcci�n que ha suministrado. Deber�a "
-"recibirla en breve."
-
-#: contrib/admin/templates/registration/password_change_form.html:12
-msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
-"password twice so we can verify you typed it in correctly."
-msgstr ""
-"Por favor, introduzca su clave antigua, por seguridad, y despu�s introduzca "
-"la nueva clave dos veces para verificar que la ha escrito correctamente."
-
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Clave antigua:"
-
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
-msgstr "Clave nueva:"
-
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
-msgstr "Confirme clave:"
-
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
-msgstr "Cambiar mi clave"
-
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Est� recibiendo este mensaje debido a que solicit� recuperar la clave"
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
-#, python-format
-msgid "for your user account at %(site_name)s"
-msgstr "de su cuenta de usuario en %(site_name)s."
-
-#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "Su nueva clave es: %(new_password)s"
-
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr "Puede cambiarla accediendo a esta p�gina:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:11
-msgid "Your username, in case you've forgotten:"
-msgstr "Su nombre de usuario, en caso de haberlo olvidado:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-msgstr "�Gracias por usar nuestro sitio!"
-
-#: contrib/admin/templates/registration/password_reset_email.html:15
-#, python-format
-msgid "The %(site_name)s team"
-msgstr "El equipo de %(site_name)s"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
-msgstr "Bookmarklets de documentaci�n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
-msgid ""
-"\n"
-"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site.  Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").</p>\n"
-msgstr ""
-"\n"
-"<p class=\"help\">Para instalar bookmarklets, arrastre el enlace a su barra\n"
-"de favoritos, o pulse con el bot�n derecho el enlace y a��dalo a sus "
-"favoritos.\n"
-"Ahora puede escoger el bookmarklet desde cualquier p�gina en el sitio.\n"
-"Observer que algunos de estos bookmarklets precisan que est� viendo\n"
-"el sitio desde un computador se�alado como \"interno\" (hable\n"
-"con su administrador de sistemas si no est� seguro de si el suyo lo es).</"
-"p>\n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "Documentaci�n de esta p�gina"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
-msgstr ""
-"Le lleva desde cualquier p�gina a la documentaci�n de la vista que la genera."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-msgstr "Mostrar ID de objeto"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
-msgstr ""
-"Muestra el tipo de contenido e ID un�voco de las p�ginas que representan un "
-"�nico objeto."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "Editar este objeto (ventana actual)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
-"Le lleva a la p�gina de administraci�n de p�ginas que representan un �nico "
-"objeto."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "Editar este objeto (nueva ventana)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-msgstr ""
-"Como antes, pero abre la p�gina de administraci�n en una nueva ventana."
-
-#: contrib/contenttypes/models.py:37
-msgid "python model class name"
-msgstr "nombre de m�dulo python"
-
-#: contrib/contenttypes/models.py:40
-msgid "content type"
-msgstr "tipo de contenido"
-
-#: contrib/contenttypes/models.py:41
-msgid "content types"
-msgstr "tipos de contenido"
-
-#: contrib/auth/views.py:41
-msgid "Logged out"
-msgstr "Sesi�n terminada"
-
-#: contrib/auth/models.py:51 contrib/auth/models.py:71
-msgid "name"
-msgstr "nombre"
-
-#: contrib/auth/models.py:53
-msgid "codename"
-msgstr "nombre en c�digo"
-
-#: contrib/auth/models.py:56
-msgid "permission"
-msgstr "permiso"
-
-#: contrib/auth/models.py:57 contrib/auth/models.py:72
-msgid "permissions"
-msgstr "permisos"
-
-#: contrib/auth/models.py:75
-msgid "group"
-msgstr "grupo"
-
-#: contrib/auth/models.py:76 contrib/auth/models.py:116
-msgid "groups"
-msgstr "grupos"
-
-#: contrib/auth/models.py:106
-msgid "username"
-msgstr "nombre de usuario"
-
-#: contrib/auth/models.py:106
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
-msgstr ""
-"Requerido. 30 caracteres o menos. S�lo caracteres alfanum�ricos (letras, "
-"d�gitos y guiones bajos)."
-
-#: contrib/auth/models.py:107
-msgid "first name"
-msgstr "nombre"
-
-#: contrib/auth/models.py:108
-msgid "last name"
-msgstr "apellidos"
-
-#: contrib/auth/models.py:109
-msgid "e-mail address"
-msgstr "direcci�n de correo"
-
-#: contrib/auth/models.py:110
-msgid "password"
-msgstr "clave"
-
-#: contrib/auth/models.py:110
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Use'[algo]$[sal]$[hash hexadecimal]' o use <a href=\"password/\">el "
-"formulario para cambiar la contrase�a</a>."
-
-#: contrib/auth/models.py:111
-msgid "staff status"
-msgstr "es staff"
-
-#: contrib/auth/models.py:111
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si el usuario puede entrar en este sitio de administraci�n."
-
-#: contrib/auth/models.py:112
-msgid "active"
-msgstr "activo"
-
-#: contrib/auth/models.py:112
-msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Indica si el usuario puede entrar en este sitio de administraci�n. Desmarque "
-"esto en lugar de borrar la cuenta."
-
-#: contrib/auth/models.py:113
-msgid "superuser status"
-msgstr "es superusuario"
-
-#: contrib/auth/models.py:113
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Indica que este usuario tiene todos los permisos sin asign�rselos "
-"expl�citamente."
-
-#: contrib/auth/models.py:114
-msgid "last login"
-msgstr "�ltimo registro"
-
-#: contrib/auth/models.py:115
-msgid "date joined"
-msgstr "fecha de creaci�n"
-
-#: contrib/auth/models.py:117
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr ""
-"Adem�s de los permisos asignados manualmente, este usuario tambi�n tendr� "
-"todos los permisos de los grupos en los que est�."
-
-#: contrib/auth/models.py:118
-msgid "user permissions"
-msgstr "permisos"
-
-#: contrib/auth/models.py:122
-msgid "user"
-msgstr "usuario"
-
-#: contrib/auth/models.py:123
-msgid "users"
-msgstr "usuarios"
-
-#: contrib/auth/models.py:129
-msgid "Personal info"
-msgstr "Informaci�n personal"
-
-#: contrib/auth/models.py:130
-msgid "Permissions"
-msgstr "Permisos"
-
-#: contrib/auth/models.py:131
-msgid "Important dates"
-msgstr "Fechas importantes"
-
-#: contrib/auth/models.py:132
-msgid "Groups"
-msgstr "Grupos"
-
-#: contrib/auth/models.py:274
-msgid "message"
-msgstr "mensaje"
-
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
-msgid "The two password fields didn't match."
-msgstr "Las dos contrase�as no coinciden."
-
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Ya existe  un usuario con este nombre."
-
-#: contrib/auth/forms.py:53
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"Tu navegador de internet parece no tener las cookies habilitadas. Las "
-"cookies se necesitan para poder ingresar."
-
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "Esta cuenta est� inactiva."
-
-#: contrib/auth/forms.py:84
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
-msgstr ""
-"Esta direcci�n de correo electr�nico no tiene una cuenta de usuario "
-"asociada. �Est� seguro de que se ha registrado?"
-
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr ""
-"Las contrase�as introducidas en los campos 'nueva contrase�a' no coinciden."
-
-#: contrib/auth/forms.py:124
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr ""
-"Tu contrase�a antigua es incorrecta. Por favor, vuelve a introducirla "
-"correctamente."
-
-#: contrib/localflavor/uk/forms.py:18
-msgid "Enter a postcode. A space is required between the two postcode parts."
-msgstr ""
-"Introduzca un c�digo postal. Se necesita un espacio entre las dos partes del "
-"c�digo."
+#: contrib/localflavor/au/forms.py:18
+msgid "Enter a 4 digit post code."
+msgstr "Introduzca un código postal de 4 dígitos."
 
 #: contrib/localflavor/br/forms.py:18
 msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Introduzca un c�digo postal en el formato XXXX-XXXX."
+msgstr "Introduzca un código postal en el formato XXXX-XXXX."
 
 #: contrib/localflavor/br/forms.py:30
 msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Los n�meros de tel�fono deben tener el formato XXX-XXX-XXXX."
+msgstr "Los números de teléfono deben tener el formato XXX-XXX-XXXX."
 
 #: contrib/localflavor/br/forms.py:72
 msgid "This field requires only numbers."
-msgstr "Este campo s�lo acepta n�meros."
+msgstr "Este campo sólo acepta números."
 
 #: contrib/localflavor/br/forms.py:74
 msgid "This field requires at most 11 digits or 14 characters."
@@ -2250,35 +2159,150 @@ msgstr "Este campo necesita al menos 11 o 14 caracteres"
 
 #: contrib/localflavor/br/forms.py:84
 msgid "Invalid CPF number."
-msgstr "N�mero CPF inv�lido."
+msgstr "Número CPF inválido."
 
 #: contrib/localflavor/br/forms.py:106
 msgid "This field requires at least 14 digits"
-msgstr "Este campo necesita 14 d�gitos como m�ximo"
+msgstr "Este campo necesita 14 dígitos como máximo"
 
 #: contrib/localflavor/br/forms.py:116
-#, fuzzy
 msgid "Invalid CNPJ number."
-msgstr "N�mero CNPJ inv�lido"
+msgstr "Número CNPJ inválido"
 
-#: contrib/localflavor/au/forms.py:18
-msgid "Enter a 4 digit post code."
-msgstr "Introduzca un c�digo postal de 4 d�gitos."
+#: contrib/localflavor/ch/forms.py:18 contrib/localflavor/no/forms.py:14
+msgid "Enter a zip code in the format XXXX."
+msgstr "Introduzca un código postal en el formato XXXX."
 
-#: contrib/localflavor/fr/forms.py:17 contrib/localflavor/de/forms.py:16
-#: contrib/localflavor/fi/forms.py:14
-#, fuzzy
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Introduzca un c�digo postal en el formato XXXXX."
-
-#: contrib/localflavor/us/forms.py:18
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Introduzca un c�digo postal en el formato XXXXX o XXXX-XXXX."
-
-#: contrib/localflavor/us/forms.py:51
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
+#: contrib/localflavor/ch/forms.py:90
+msgid ""
+"Enter a valid Swiss identity or passport card number in X1234567<0 or "
+"1234567890 format."
 msgstr ""
-"Introduzca un N�mero Seguro Social de EEUU v�lido en el formato XXX-XX-XXXX"
+
+#: contrib/localflavor/ch/ch_states.py:5
+msgid "Aargau"
+msgstr "Aargau"
+
+#: contrib/localflavor/ch/ch_states.py:6
+msgid "Appenzell Innerrhoden"
+msgstr "Appenzell Innerrhoden"
+
+#: contrib/localflavor/ch/ch_states.py:7
+msgid "Appenzell Ausserrhoden"
+msgstr "Appenzell Ausserrhoden"
+
+#: contrib/localflavor/ch/ch_states.py:8
+msgid "Basel-Stadt"
+msgstr "Basel-Stadt"
+
+#: contrib/localflavor/ch/ch_states.py:9
+msgid "Basel-Land"
+msgstr "Basel-Land"
+
+#: contrib/localflavor/ch/ch_states.py:10
+msgid "Berne"
+msgstr "Berne"
+
+#: contrib/localflavor/ch/ch_states.py:11
+msgid "Fribourg"
+msgstr "Fribourg"
+
+#: contrib/localflavor/ch/ch_states.py:12
+msgid "Geneva"
+msgstr "Geneva"
+
+#: contrib/localflavor/ch/ch_states.py:13
+msgid "Glarus"
+msgstr "Glarus"
+
+#: contrib/localflavor/ch/ch_states.py:14
+msgid "Graubuenden"
+msgstr "Graubuenden"
+
+#: contrib/localflavor/ch/ch_states.py:15
+msgid "Jura"
+msgstr "Jura"
+
+#: contrib/localflavor/ch/ch_states.py:16
+msgid "Lucerne"
+msgstr "Lucerne"
+
+#: contrib/localflavor/ch/ch_states.py:17
+msgid "Neuchatel"
+msgstr "Neuchatel"
+
+#: contrib/localflavor/ch/ch_states.py:18
+msgid "Nidwalden"
+msgstr "Nidwalden"
+
+#: contrib/localflavor/ch/ch_states.py:19
+msgid "Obwalden"
+msgstr "Obwalden"
+
+#: contrib/localflavor/ch/ch_states.py:20
+msgid "Schaffhausen"
+msgstr "Schaffhausen"
+
+#: contrib/localflavor/ch/ch_states.py:21
+msgid "Schwyz"
+msgstr "Schwyz"
+
+#: contrib/localflavor/ch/ch_states.py:22
+msgid "Solothurn"
+msgstr "Solothurn"
+
+#: contrib/localflavor/ch/ch_states.py:23
+msgid "St. Gallen"
+msgstr "St. Gallen"
+
+#: contrib/localflavor/ch/ch_states.py:24
+msgid "Thurgau"
+msgstr "Thurgau"
+
+#: contrib/localflavor/ch/ch_states.py:25
+msgid "Ticino"
+msgstr "Ticino"
+
+#: contrib/localflavor/ch/ch_states.py:26
+msgid "Uri"
+msgstr "Uri"
+
+#: contrib/localflavor/ch/ch_states.py:27
+msgid "Valais"
+msgstr "Valais"
+
+#: contrib/localflavor/ch/ch_states.py:28
+msgid "Vaud"
+msgstr "Vaud"
+
+#: contrib/localflavor/ch/ch_states.py:29
+msgid "Zug"
+msgstr "Zug"
+
+#: contrib/localflavor/ch/ch_states.py:30
+msgid "Zurich"
+msgstr "Zurich"
+
+#: contrib/localflavor/cl/forms.py:32
+msgid "Enter valid a Chilean RUT. The format is XX.XXX.XXX-X."
+msgstr "Introduzca un RUT chileno válido. El formato es XX.XXX.XXXX-X."
+
+#: contrib/localflavor/cl/forms.py:37
+msgid "Enter valid a Chilean RUT"
+msgstr "Introduzca un RUT chileno válido"
+
+#: contrib/localflavor/de/forms.py:16 contrib/localflavor/fi/forms.py:14
+#: contrib/localflavor/fr/forms.py:17
+msgid "Enter a zip code in the format XXXXX."
+msgstr "Introduzca un código postal en el formato XXXXX."
+
+#: contrib/localflavor/de/forms.py:60
+msgid ""
+"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
+"format."
+msgstr ""
+"Introduzca un número de tarjeta de identidad de Alemania válida en el "
+"formato XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
 
 #: contrib/localflavor/de/de_states.py:5
 msgid "Baden-Wuerttemberg"
@@ -2290,7 +2314,7 @@ msgstr "Bavaria"
 
 #: contrib/localflavor/de/de_states.py:7
 msgid "Berlin"
-msgstr "Berl�n"
+msgstr "Berlín"
 
 #: contrib/localflavor/de/de_states.py:8
 msgid "Brandenburg"
@@ -2344,13 +2368,25 @@ msgstr "Schleswig-Holstein"
 msgid "Thuringia"
 msgstr "Thuringia"
 
-#: contrib/localflavor/de/forms.py:60
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Introduzca un n�mero de tarjeta de identidad de Alemania v�lida en el "
-"formato XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
+#: contrib/localflavor/fi/forms.py:40 contrib/localflavor/fi/forms.py:45
+msgid "Enter a valid Finnish social security number."
+msgstr "Introduzca un número de seguro social finlandés válido."
+
+#: contrib/localflavor/it/forms.py:16
+msgid "Enter a valid zip code."
+msgstr "Introduzca un código postal válido."
+
+#: contrib/localflavor/it/forms.py:41
+msgid "Enter a valid Social Security number."
+msgstr "Introduzca un número de Seguro Social válido."
+
+#: contrib/localflavor/it/forms.py:68
+msgid "Enter a valid VAT number."
+msgstr "Introduzca un número VAT válido."
+
+#: contrib/localflavor/jp/forms.py:21
+msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
+msgstr "Introduzca un código postal en el formato XXXXX o XXXX-XXXX."
 
 #: contrib/localflavor/jp/jp_prefectures.py:4
 msgid "Hokkaido"
@@ -2540,171 +2576,43 @@ msgstr "Kagoshima"
 msgid "Okinawa"
 msgstr "Okinawa"
 
-#: contrib/localflavor/jp/forms.py:21
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Introduzca un c�digo postal en el formato XXXXX o XXXX-XXXX."
-
-#: contrib/localflavor/it/forms.py:16
-#, fuzzy
-msgid "Enter a valid zip code."
-msgstr "Introduzca un c�digo zip v�lido."
-
-#: contrib/localflavor/it/forms.py:41
-msgid "Enter a valid Social Security number."
-msgstr "Introduzca un n�mero de Seguro Social v�lido."
-
-#: contrib/localflavor/it/forms.py:68
-#, fuzzy
-msgid "Enter a valid VAT number."
-msgstr "Introduzca un n�mero VAT v�lido."
-
-#: contrib/localflavor/no/forms.py:15 contrib/localflavor/ch/forms.py:18
-#, fuzzy
-msgid "Enter a zip code in the format XXXX."
-msgstr "Introduzca c�digo ZIP en el formato XXXX."
-
-#: contrib/localflavor/no/forms.py:36
+#: contrib/localflavor/no/forms.py:35
 msgid "Enter a valid Norwegian social security number."
-msgstr "Introduzca un n�mero de seguro social de Noruega v�lido."
+msgstr "Introduzca un número de seguro social de Noruega válido."
 
-#: contrib/localflavor/fi/forms.py:40 contrib/localflavor/fi/forms.py:45
-msgid "Enter a valid Finnish social security number."
-msgstr "Introduzca un n�mero de seguro social finland�s v�lido."
-
-#: contrib/localflavor/ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: contrib/localflavor/ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: contrib/localflavor/ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: contrib/localflavor/ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: contrib/localflavor/ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: contrib/localflavor/ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: contrib/localflavor/ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: contrib/localflavor/ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: contrib/localflavor/ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: contrib/localflavor/ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: contrib/localflavor/ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: contrib/localflavor/ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: contrib/localflavor/ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: contrib/localflavor/ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: contrib/localflavor/ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: contrib/localflavor/ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: contrib/localflavor/ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: contrib/localflavor/ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: contrib/localflavor/ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: contrib/localflavor/ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: contrib/localflavor/ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: contrib/localflavor/ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: contrib/localflavor/ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: contrib/localflavor/ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: contrib/localflavor/ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: contrib/localflavor/ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: contrib/localflavor/ch/forms.py:90
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
+#: contrib/localflavor/uk/forms.py:18
+msgid "Enter a postcode. A space is required between the two postcode parts."
 msgstr ""
+"Introduzca un código postal. Se necesita un espacio entre las dos partes del "
+"código."
+
+#: contrib/localflavor/us/forms.py:18
+msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
+msgstr "Introduzca un código postal en el formato XXXXX o XXXX-XXXX."
+
+#: contrib/localflavor/us/forms.py:51
+msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
+msgstr ""
+"Introduzca un Número Seguro Social de EEUU válido en el formato XXX-XX-XXXX"
 
 #: contrib/localflavor/is_/forms.py:17
 msgid ""
 "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Introduzca un n�mero de identificaci�n de Islandia v�lido. El formato es XXXXXX-XXXX."
+msgstr ""
+"Introduzca un número de identificación de Islandia válido. El formato es "
+"XXXXXX-XXXX."
 
 #: contrib/localflavor/is_/forms.py:31
 msgid "The Icelandic identification number is not valid."
-msgstr "El n�mero de identificaci�n de Islandia no es v�lido."
-
-#: contrib/localflavor/cl/forms.py:22
-msgid "Enter valid a Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Introduzca un RUT chileno v�lido. El formato es XX.XXX.XXXX-X."
-
-#: contrib/localflavor/cl/forms.py:27
-msgid "Enter valid a Chilean RUT"
-msgstr "Introduzca un RUT chileno v�lido"
+msgstr "El número de identificación de Islandia no es válido."
 
 #: contrib/sessions/models.py:68
 msgid "session key"
-msgstr "clave de sesi�n"
+msgstr "clave de sesión"
 
 #: contrib/sessions/models.py:69
 msgid "session data"
-msgstr "datos de sesi�n"
+msgstr "datos de sesión"
 
 #: contrib/sessions/models.py:70
 msgid "expire date"
@@ -2712,58 +2620,70 @@ msgstr "fecha de caducidad"
 
 #: contrib/sessions/models.py:74
 msgid "session"
-msgstr "sesi�n"
+msgstr "sesión"
 
 #: contrib/sessions/models.py:75
 msgid "sessions"
 msgstr "sesiones"
 
-#: contrib/flatpages/models.py:8
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Ejemplo: '/about/contact/'. Aseg�rese de que pone barras al principio y al "
-"final."
+#: contrib/contenttypes/models.py:37
+msgid "python model class name"
+msgstr "nombre de módulo python"
 
-#: contrib/flatpages/models.py:9
-msgid "title"
-msgstr "t�tulo"
+#: contrib/contenttypes/models.py:40
+msgid "content type"
+msgstr "tipo de contenido"
 
-#: contrib/flatpages/models.py:10
-msgid "content"
-msgstr "contenido"
+#: contrib/contenttypes/models.py:41
+msgid "content types"
+msgstr "tipos de contenido"
 
-#: contrib/flatpages/models.py:11
-msgid "enable comments"
-msgstr "admitir comentarios"
+#: oldforms/__init__.py:404
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Asegúrese de que su texto tiene menos de %s carácter."
+msgstr[1] "Asegúrese de que su texto tiene menos de %s caracteres."
 
-#: contrib/flatpages/models.py:12
-msgid "template name"
-msgstr "nombre de plantilla"
+#: oldforms/__init__.py:409
+msgid "Line breaks are not allowed here."
+msgstr "No se permiten saltos de línea."
 
-#: contrib/flatpages/models.py:13
-msgid ""
-"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
-"will use 'flatpages/default.html'."
-msgstr ""
-"Ejemplo: 'flatpages/contact_page.html'. Si no es proporcionado, el sistema "
-"usar� 'flatpages/default.html'."
+#: oldforms/__init__.py:507 oldforms/__init__.py:581 oldforms/__init__.py:620
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Escoja una opción válida; '%(data)s' no está en %(choices)s."
 
-#: contrib/flatpages/models.py:14
-msgid "registration required"
-msgstr "debe estar registrado"
+#: oldforms/__init__.py:684
+msgid "The submitted file is empty."
+msgstr "El fichero enviado está vacío."
 
-#: contrib/flatpages/models.py:14
-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."
+#: oldforms/__init__.py:740
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Introduzca un número entero entre -32,768 y 32,767."
 
-#: contrib/flatpages/models.py:18
-msgid "flat page"
-msgstr "p�gina est�tica"
+#: oldforms/__init__.py:750
+msgid "Enter a positive number."
+msgstr "Introduzca un número positivo."
 
-#: contrib/flatpages/models.py:19
-msgid "flat pages"
-msgstr "p�ginas est�ticas"
+#: oldforms/__init__.py:760
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Introduzca un número entero entre 0 y 32,767."
+
+#: views/generic/create_update.py:43
+#, python-format
+msgid "The %(verbose_name)s was created successfully."
+msgstr "El %(verbose_name)s se ha creado correctamente."
+
+#: views/generic/create_update.py:117
+#, python-format
+msgid "The %(verbose_name)s was updated successfully."
+msgstr "Se actualizó con éxito el %(verbose_name)s."
+
+#: views/generic/create_update.py:184
+#, python-format
+msgid "The %(verbose_name)s was deleted."
+msgstr "El %(verbose_name)s ha sido eliminado."
 
 #: utils/dates.py:6
 msgid "Monday"
@@ -2775,7 +2695,7 @@ msgstr "Martes"
 
 #: utils/dates.py:6
 msgid "Wednesday"
-msgstr "Mi�rcoles"
+msgstr "Miércoles"
 
 #: utils/dates.py:6
 msgid "Thursday"
@@ -2787,7 +2707,7 @@ msgstr "Viernes"
 
 #: utils/dates.py:7
 msgid "Saturday"
-msgstr "S�bado"
+msgstr "Sábado"
 
 #: utils/dates.py:7
 msgid "Sunday"
@@ -2948,8 +2868,8 @@ msgstr "Dic."
 #: utils/timesince.py:12
 msgid "year"
 msgid_plural "years"
-msgstr[0] "a�o"
-msgstr[1] "a�os"
+msgstr[0] "año"
+msgstr[1] "años"
 
 #: utils/timesince.py:13
 msgid "month"
@@ -2966,8 +2886,8 @@ msgstr[1] "semanas"
 #: utils/timesince.py:15
 msgid "day"
 msgid_plural "days"
-msgstr[0] "d�a"
-msgstr[1] "d�as"
+msgstr[0] "día"
+msgstr[1] "días"
 
 #: utils/timesince.py:16
 msgid "hour"
@@ -2981,17 +2901,12 @@ msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: utils/timesince.py:40
-#, python-format
-msgid "%d milliseconds"
-msgstr "%d milisegundos"
-
-#: utils/timesince.py:41
+#: utils/timesince.py:39
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:47
+#: utils/timesince.py:45
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
@@ -3018,7 +2933,7 @@ msgstr "media noche"
 
 #: utils/dateformat.py:99
 msgid "noon"
-msgstr "medio d�a"
+msgstr "medio día"
 
 #: utils/translation/trans_real.py:391
 msgid "DATE_FORMAT"
@@ -3042,7 +2957,7 @@ msgstr "j \\de F"
 
 #: template/defaultfilters.py:485
 msgid "yes,no,maybe"
-msgstr "s�,no,tal vez"
+msgstr "sí,no,tal vez"
 
 #: template/defaultfilters.py:514
 #, python-format
@@ -3066,5 +2981,82 @@ msgstr "%.1f MB"
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#~ msgid "AnonymousUser"
-#~ msgstr "UsuarioAnonimo"
+#: newforms/fields.py:116
+#, python-format
+msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"Asegúrese de que su texto tiene a lo más %(max)d caracteres (actualmente "
+"tiene %(length)d)."
+
+#: newforms/fields.py:118
+#, python-format
+msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
+msgstr ""
+"Asegúrese de que su texto tiene al menos %(min)d caracteres (actualmente "
+"tiene %(length)d)."
+
+#: newforms/fields.py:143 newforms/fields.py:166 newforms/fields.py:196
+#, python-format
+msgid "Ensure this value is less than or equal to %s."
+msgstr "Asegúrese de que este valor es menor o igual a %s."
+
+#: newforms/fields.py:145 newforms/fields.py:168 newforms/fields.py:198
+#, python-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "Asegúrese de que este valor es mayor o igual a %s."
+
+#: newforms/fields.py:164 newforms/fields.py:191
+msgid "Enter a number."
+msgstr "Introduzca un número."
+
+#: newforms/fields.py:200
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Asegúrese de que no hay más de %s dígitos en total."
+
+#: newforms/fields.py:202
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Asegúrese de que no hay más de %s decimales."
+
+#: newforms/fields.py:204
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Asegúrese de que no hay más de %s dígitos antes del punto decimal."
+
+#: newforms/fields.py:237 newforms/fields.py:560
+msgid "Enter a valid date."
+msgstr "Introduzca una fecha válida."
+
+#: newforms/fields.py:264 newforms/fields.py:562
+msgid "Enter a valid time."
+msgstr "Introduzca una hora válida."
+
+#: newforms/fields.py:300
+msgid "Enter a valid date/time."
+msgstr "Introduzca una fecha/hora válida."
+
+#: newforms/fields.py:313
+msgid "Enter a valid value."
+msgstr "Introduzca un valor correcto."
+
+#: newforms/fields.py:353 newforms/fields.py:375
+msgid "Enter a valid URL."
+msgstr "Introduzca una URL válida."
+
+#: newforms/fields.py:377
+msgid "This URL appears to be a broken link."
+msgstr "La URL parece ser un enlace roto."
+
+#: newforms/fields.py:428 newforms/models.py:174
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Escoja una opción válida. Esa opción no está entre las aceptadas."
+
+#: newforms/fields.py:444 newforms/fields.py:520 newforms/models.py:191
+msgid "Enter a list of values."
+msgstr "Introduzca una lista de valores."
+
+#: newforms/fields.py:450 newforms/models.py:197
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Escoja una opción válida; '%s' no es una de las opciones disponibles."
diff --git a/django/conf/locale/es/LC_MESSAGES/djangojs.mo b/django/conf/locale/es/LC_MESSAGES/djangojs.mo
index 701443cace2d5c2ef15e0f29d58db22635be24b8..6d098c504123bcdcd2af950f74ef6db1ab48db9c 100644
GIT binary patch
delta 794
zcmZ9}ziSjh6u|M9`{BjQdB%8ZK!sI^-QupE<_HQ(M51sgi4iT=z0n+5cVPEC2?T-`
zX|xH8MZiMSNCd(B2f|e%2!f^BSlC)<VdwY7MZw`_KJ)XvnZ0aey|(gYtn@@E<J3dc
zPt*zO(;*s)R}k5OJ{GZsH9UjEcqw0>#a)bVVioV;PE2x_vCMcCOZXV)MOI{ujt2Uc
zFMLN$^b<AlFVw&~=|CMdz;SG06E*N%)Ho?>;$=L@BUVx4Y;dT8n^?y!tdd{e(9whM
z@`aB$%J?ge;1Ars09iCqoksUJ@CF`6eQ_T(@dM;1k7zXE8tVCVJc2Ls`L}qQ{PKYg
zmy}_ysRwFEPHCY23oLJca*zg9lj+~3LG@*N87=y%{Zx(df7zE$=)?Brea+z?pwZ-G
z`6ORkc2oD{V||f+g}){HJaqP$O^p*okxVbpi=By7rXv$1f94_^F3L=|V=}MsthiwB
zXYUIyTa&Ig>H1B_KRMN;f6DW!SFgCUrr%AwHg+!rJu~H;@YwWkpU=MRb@6t2{@O*i
zl{uwwbk0O33^@@vJ=?Kq_ONucl7=?!m?YaMEfxl^vU>SkrESw*5+qr>Jnj!Rlh8&c
jbuQmCeYoB=NsM!Y=eL56l^MGv?O?DK#DSb&GKu^KvmI;Y

delta 623
zcmY+=ze_?<6u|N8^O>prFw1PHc+U00XBj30)s#U+MA4X)fg}o+fs;W)wDg0EgF_Uw
zH1$`sNB=<NR!~FG5;XKZ=F)-lKKH%*?m35B@6dtjbI7bIB1{gF59AP;ckv)zunimN
z##ijXcWlS+*1lmV)ycaLeHdvOMGx;IxP}hOxf3*%s;UbXQn-fFsE$(T1}(hDBtD`P
zYUgJu(1p!LXfZ?-<@_8~y_m)>TtPo>qMX}neLuhe{narGX?Tv(;0ibJ7Ukd%%0Vxi
zvLECj4f;{e4Pz8XaRQf+S=2GgKqp8Eb%xB@T=!u!HhId`v-dA#@@`TJN%J03u3bW!
za~Vwk*Fc8oB}1fy+=>h?5!ALZt;<G4UmDjs;l2wdY$tBVrYy%vC7h9%qd(jOt&fvd
z+)0hc<zv{~^`}>t?PM}BWjp%F+}2-aR1bS{t`B|cnbA+4$k<zHyO_`JTMOmvA*|=J
br2?)twlX_KHD9c##mr}>kWsUhY)SnBjjl!x

diff --git a/django/conf/locale/es/LC_MESSAGES/djangojs.po b/django/conf/locale/es/LC_MESSAGES/djangojs.po
index 99856cec36..d193cf660e 100644
--- a/django/conf/locale/es/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/es/LC_MESSAGES/djangojs.po
@@ -1,26 +1,41 @@
 # Spanish translation for the django-admin JS files.
 # Copyright (C)
 # This file is distributed under the same license as the PACKAGE package.
-# Jorge Gajon <gajon@gajon.org>, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Django JavaScript 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 11:51+0100\n"
-"PO-Revision-Date: 2005-12-06 21:32+0100\n"
+"POT-Creation-Date: 2007-07-14 13:47-0500\n"
+"PO-Revision-Date: 2007-07-14 13:41-0500\n"
 "Last-Translator: Jorge Gajon <gajon@gajon.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: contrib/admin/media/js/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:32
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Septiembre Octubre "
+"Noviembre Diciembre"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "D L M M J V S"
+
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Domingo Lunes Martes Miércoles Jueves Viernes Sábado"
+
 #: contrib/admin/media/js/SelectFilter2.js:33
 #, perl-format
 msgid "Available %s"
 msgstr "%s Disponibles"
 
 #: contrib/admin/media/js/SelectFilter2.js:41
-#, fuzzy
 msgid "Choose all"
 msgstr "Selecciona todos"
 
@@ -45,66 +60,58 @@ msgstr "Haz tus elecciones y da click en "
 msgid "Clear all"
 msgstr "Elimina todos"
 
-#: contrib/admin/media/js/dateparse.js:26
-#: contrib/admin/media/js/calendar.js:24
-msgid ""
-"January February March April May June July August September October November "
-"December"
-msgstr ""
-"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Septiembre Octubre "
-"Noviembre Diciembre"
-
-#: contrib/admin/media/js/dateparse.js:27
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Domingo Lunes Martes Mi�rcoles Jueves Viernes S�bado"
-
-#: contrib/admin/media/js/calendar.js:25
-msgid "S M T W T F S"
-msgstr "D L M M J V S"
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
 msgid "Now"
 msgstr "Ahora"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
 msgid "Clock"
 msgstr "Reloj"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
 msgid "Choose a time"
 msgstr "Elige una hora"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
 msgid "Midnight"
 msgstr "Medianoche"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
 msgid "6 a.m."
 msgstr "6 a.m."
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
 msgid "Noon"
-msgstr "Mediod�a"
+msgstr "Mediodía"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
 msgid "Today"
 msgstr "Hoy"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
 msgid "Calendar"
 msgstr "Calendario"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
 msgid "Tomorrow"
-msgstr "Ma�ana"
+msgstr "Mañana"
+
+#: 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 "Esconder"