diff --git a/AUTHORS b/AUTHORS
index a2cf8c68cc..900335efbc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -44,6 +44,7 @@ answer newbie questions, and generally made Django that much better:
     adurdin@gmail.com
     Andreas
     andy@jadedplanet.net
+    Fabrice Aneche <akh@nobugware.com>
     ant9000@netwise.it
     David Ascher <http://ascher.ca/>
     Arthur <avandorp@gmail.com>
@@ -66,6 +67,7 @@ answer newbie questions, and generally made Django that much better:
     Ian Clelland <clelland@gmail.com>
     crankycoder@gmail.com
     Matt Croydon <http://www.postneo.com/>
+    flavio.curella@gmail.com
     Jure Cuhalev <gandalf@owca.info>
     dackze+django@gmail.com
     Dirk Datzert <dummy@habmalnefrage.de>
@@ -182,6 +184,7 @@ answer newbie questions, and generally made Django that much better:
     Radek Švarz <http://www.svarz.cz/translate/>
     Swaroop C H <http://www.swaroopch.info>
     Aaron Swartz <http://www.aaronsw.com/>
+    Ville Säävuori <http://www.unessa.net/>
     Tyson Tate <tyson@fallingbullets.com>
     Tom Tobin
     Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
index b7f777611b..7fb381c78f 100644
Binary files a/django/conf/locale/es_AR/LC_MESSAGES/django.mo and b/django/conf/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po
index c299f2c502..27472353e4 100644
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-25 17:21-0300\n"
-"PO-Revision-Date: 2007-02-25 17:46-0300\n"
+"POT-Creation-Date: 2007-03-24 11:16-0300\n"
+"PO-Revision-Date: 2007-03-24 11:54-0300\n"
 "Last-Translator: Ramiro Morales <rm0@gmx.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,1529 +16,156 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: contrib/contenttypes/models.py:26
-msgid "python model class name"
-msgstr "nombre de la clase python del modelo"
-
-#: contrib/contenttypes/models.py:29
-msgid "content type"
-msgstr "tipo de contenido"
-
-#: contrib/contenttypes/models.py:30
-msgid "content types"
-msgstr "tipos de contenido"
-
-#: contrib/auth/views.py:39
-msgid "Logged out"
-msgstr "Sesi�n cerrada"
-
-#: contrib/auth/models.py:38 contrib/auth/models.py:57
-msgid "name"
-msgstr "nombre"
-
-#: contrib/auth/models.py:40
-msgid "codename"
-msgstr "nombre en c�digo"
-
-#: contrib/auth/models.py:42
-msgid "permission"
-msgstr "permiso"
-
-#: contrib/auth/models.py:43 contrib/auth/models.py:58
-msgid "permissions"
-msgstr "permisos"
-
-#: contrib/auth/models.py:60
-msgid "group"
-msgstr "grupo"
-
-#: contrib/auth/models.py:61 contrib/auth/models.py:100
-msgid "groups"
-msgstr "grupos"
-
-#: contrib/auth/models.py:90
-msgid "username"
-msgstr "nombre de usuario"
-
-#: contrib/auth/models.py:90
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
-msgstr ""
-"Requerido. Longitud m�xima 30 caracteres alfanum�ricos (letras, d�gitos y "
-"guiones bajos)."
-
-#: contrib/auth/models.py:91
-msgid "first name"
-msgstr "nombre"
-
-#: contrib/auth/models.py:92
-msgid "last name"
-msgstr "apellido"
-
-#: contrib/auth/models.py:93
-msgid "e-mail address"
-msgstr "direcci�n de correo"
-
-#: contrib/auth/models.py:94
-msgid "password"
-msgstr "contrase�a"
-
-#: contrib/auth/models.py:94
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Use '[algo]$[salt]$[hexdigest]' o use el <a href=\"password/\">formulario de "
-"cambio de contrase�a</a>."
-
-#: contrib/auth/models.py:95
-msgid "staff status"
-msgstr "es staff"
-
-#: contrib/auth/models.py:95
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si el usuario puede ingresar a este sitio de administraci�n."
-
-#: contrib/auth/models.py:96
-msgid "active"
-msgstr "activo"
-
-#: contrib/auth/models.py:96
-msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Indica si el usuario puede ingresar al sitio de administraci�n Django."
-"Desactive este campo en lugar de eliminar usuarios."
-
-#: contrib/auth/models.py:97
-msgid "superuser status"
-msgstr "es superusuario"
-
-#: contrib/auth/models.py:97
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Indica que este usuario posee todos los permisos, sin asignarle los mismos "
-"expl�citamente."
-
-#: contrib/auth/models.py:98
-msgid "last login"
-msgstr "�ltimo registro"
-
-#: contrib/auth/models.py:99
-msgid "date joined"
-msgstr "fecha de creaci�n"
-
-#: contrib/auth/models.py:101
-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 poseer� "
-"todos los permisos de los grupos a los que pertenezca."
-
-#: contrib/auth/models.py:102
-msgid "user permissions"
-msgstr "permisos de usuario"
-
-#: contrib/auth/models.py:105
-msgid "user"
-msgstr "usuario"
-
-#: contrib/auth/models.py:106
-msgid "users"
-msgstr "usuarios"
-
-#: contrib/auth/models.py:111
-msgid "Personal info"
-msgstr "Informaci�n personal"
-
-#: contrib/auth/models.py:112
-msgid "Permissions"
-msgstr "Permisos"
-
-#: contrib/auth/models.py:113
-msgid "Important dates"
-msgstr "Fechas importantes"
-
-#: contrib/auth/models.py:114
-msgid "Groups"
-msgstr "Grupos"
-
-#: contrib/auth/models.py:258
-msgid "message"
-msgstr "mensaje"
-
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
-msgid "The two password fields didn't match."
-msgstr "Los dos campos de contrase�as no coinciden entre si."
-
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Ya existe un usuario con ese nombre."
-
-#: contrib/auth/forms.py:53
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"Su navegador Web aparenta no tener cookies activas. Las cookies son un "
-"requerimiento 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 nombre de usuario y una contrase�a correctos. 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:85
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
-msgstr ""
-"Esa direcci�n de e-mail no est� asociada a ninguna cuenta de usuario. �Est� "
-"seguro de que ya se ha registrado?"
-
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "Los dos campos 'nueva contrase�a' no coinciden entre si."
-
-#: contrib/auth/forms.py:124
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr ""
-"La antigua contrase�a ingresada es incorrecta. Por favor ingr�sela "
-"nuevamente."
-
-#: contrib/redirects/models.py:7
-msgid "redirect from"
-msgstr "redirigir desde"
-
-#: contrib/redirects/models.py:8
-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. Ejemplo: '/"
-"events/search/'."
-
-#: contrib/redirects/models.py:9
-msgid "redirect to"
-msgstr "redirigir a"
-
-#: contrib/redirects/models.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Esto puede ser bien una ruta absoluta (como antes) o una URL completa que "
-"empiece con 'http://'."
-
-#: contrib/redirects/models.py:13
-msgid "redirect"
-msgstr "redirecci�n"
-
-#: contrib/redirects/models.py:14
-msgid "redirects"
-msgstr "redirecciones"
-
-#: contrib/comments/models.py:67 contrib/comments/models.py:166
-msgid "object ID"
-msgstr "ID de objeto"
-
-#: contrib/comments/models.py:68
-msgid "headline"
-msgstr "encabezado"
-
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:167
-msgid "comment"
-msgstr "comentario"
-
-#: contrib/comments/models.py:70
-msgid "rating #1"
-msgstr "calificaci�n 1"
-
-#: contrib/comments/models.py:71
-msgid "rating #2"
-msgstr "calificaci�n 2"
-
-#: contrib/comments/models.py:72
-msgid "rating #3"
-msgstr "calificaci�n 3"
-
-#: contrib/comments/models.py:73
-msgid "rating #4"
-msgstr "calificaci�n 4"
-
-#: contrib/comments/models.py:74
-msgid "rating #5"
-msgstr "calificaci�n 5"
-
-#: contrib/comments/models.py:75
-msgid "rating #6"
-msgstr "calificaci�n 6"
-
-#: contrib/comments/models.py:76
-msgid "rating #7"
-msgstr "calificaci�n 7"
-
-#: contrib/comments/models.py:77
-msgid "rating #8"
-msgstr "calificaci�n 8"
-
-#: contrib/comments/models.py:82
-msgid "is valid rating"
-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"
-
-#: 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:304
-msgid "IP address"
-msgstr "Direcci�n IP"
-
-#: contrib/comments/models.py:86
-msgid "is removed"
-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� "
-"\"Este comentario ha sido eliminado\"."
-
-#: contrib/comments/models.py:91
-msgid "comments"
-msgstr "comentarios"
-
-#: contrib/comments/models.py:131 contrib/comments/models.py:207
-msgid "Content object"
-msgstr "Objeto contenido"
-
-#: contrib/comments/models.py:159
+#: newforms/fields.py:78 newforms/fields.py:374 newforms/fields.py:450
+#: newforms/fields.py:461 newforms/models.py:177
+#: db/models/fields/__init__.py:117 db/models/fields/__init__.py:274
+#: db/models/fields/__init__.py:610 db/models/fields/__init__.py:621
+#: oldforms/__init__.py:357
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
+
+#: newforms/fields.py:101 newforms/fields.py:254
 #, python-format
-msgid ""
-"Posted by %(user)s at %(date)s\n"
-"\n"
-"%(comment)s\n"
-"\n"
-"http://%(domain)s%(url)s"
-msgstr ""
-"Enviado por %(user)s el %(date)s\n"
-"\n"
-"%(comment)s\n"
-"\n"
-"http://%(domain)s%(url)s"
+msgid "Ensure this value has at most %d characters."
+msgstr "Aseg�rese de que este valor tenga como m�ximo %d caracteres."
 
-#: contrib/comments/models.py:168
-msgid "person's name"
-msgstr "nombre de la persona"
-
-#: contrib/comments/models.py:171
-msgid "ip address"
-msgstr "direcci�n ip"
-
-#: contrib/comments/models.py:173
-msgid "approved by staff"
-msgstr "aprobado por el staff"
-
-#: contrib/comments/models.py:176
-msgid "free comment"
-msgstr "comentario libre"
-
-#: contrib/comments/models.py:177
-msgid "free comments"
-msgstr "comentarios libres"
-
-#: contrib/comments/models.py:233
-msgid "score"
-msgstr "puntuaci�n"
-
-#: contrib/comments/models.py:234
-msgid "score date"
-msgstr "fecha de la puntuaci�n"
-
-#: contrib/comments/models.py:237
-msgid "karma score"
-msgstr "punto karma"
-
-#: contrib/comments/models.py:238
-msgid "karma scores"
-msgstr "puntos karma"
-
-#: contrib/comments/models.py:242
+#: newforms/fields.py:103 newforms/fields.py:256
 #, python-format
-msgid "%(score)d rating by %(user)s"
-msgstr "puntuado %(score)d por %(user)s"
+msgid "Ensure this value has at least %d characters."
+msgstr "Aseg�rese de que este valor tenga al menos %d caracteres."
 
-#: contrib/comments/models.py:258
+#: newforms/fields.py:126 core/validators.py:120
+msgid "Enter a whole number."
+msgstr "Introduzca un n�mero entero."
+
+#: newforms/fields.py:128
 #, python-format
-msgid ""
-"This comment was flagged by %(user)s:\n"
-"\n"
-"%(text)s"
-msgstr ""
-"Este comentario fue marcado por %(user)s:\n"
-"\n"
-"%(text)s"
+msgid "Ensure this value is less than or equal to %s."
+msgstr "Aseg�rese de que este valor sea menor o igual a %s."
 
-#: contrib/comments/models.py:265
-msgid "flag date"
-msgstr "fecha de la marca"
-
-#: contrib/comments/models.py:268
-msgid "user flag"
-msgstr "marca de usuario"
-
-#: contrib/comments/models.py:269
-msgid "user flags"
-msgstr "marcas de usuario"
-
-#: contrib/comments/models.py:273
+#: newforms/fields.py:130
 #, python-format
-msgid "Flag by %r"
-msgstr "Marca de %r"
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "Aseg�rese de que este valor sea mayor o igual a %s."
 
-#: contrib/comments/models.py:278
-msgid "deletion date"
-msgstr "fecha de eliminaci�n"
+#: newforms/fields.py:163
+msgid "Enter a valid date."
+msgstr "Ingrese una fecha v�lida."
 
-#: contrib/comments/models.py:280
-msgid "moderator deletion"
-msgstr "Eliminaci�n por moderador"
+#: newforms/fields.py:190
+msgid "Enter a valid time."
+msgstr "Introduzca una hora v�lida."
 
-#: contrib/comments/models.py:281
-msgid "moderator deletions"
-msgstr "eliminaciones por moderador"
+#: newforms/fields.py:226
+msgid "Enter a valid date/time."
+msgstr "Introduzca una fecha/hora v�lida."
 
-#: contrib/comments/models.py:285
+#: newforms/fields.py:240
+msgid "Enter a valid value."
+msgstr "Introduzca un valor v�lido."
+
+#: newforms/fields.py:269 core/validators.py:162
+msgid "Enter a valid e-mail address."
+msgstr "Introduzca una direcci�n de correo electr�nico v�lida"
+
+#: newforms/fields.py:287 newforms/fields.py:309
+msgid "Enter a valid URL."
+msgstr "Introduzca una URL v�lida."
+
+#: newforms/fields.py:311
+msgid "This URL appears to be a broken link."
+msgstr "La URL parece ser un enlace roto."
+
+#: newforms/fields.py:360 newforms/models.py:164
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Seleccione una opci�n v�lida. Esa opci�n no es una de las opciones "
+"disponibles."
+
+#: newforms/fields.py:378 newforms/fields.py:454 newforms/models.py:181
+msgid "Enter a list of values."
+msgstr "Introduzca una lista de valores."
+
+#: newforms/fields.py:387 newforms/models.py:187
 #, python-format
-msgid "Moderator deletion by %r"
-msgstr "Eliminaci�n del moderador %r"
-
-#: contrib/comments/views/karma.py:19
-msgid "Anonymous users cannot vote"
-msgstr "Los usuarios an�nimos no pueden votar"
-
-#: contrib/comments/views/karma.py:23
-msgid "Invalid comment ID"
-msgstr "ID de comentario no v�lido"
-
-#: contrib/comments/views/karma.py:25
-msgid "No voting for yourself"
-msgstr "No puedes votarte t� mismo"
-
-#: contrib/comments/views/comments.py:27
-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."
-
-#: contrib/comments/views/comments.py:111
-#, python-format
-msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comment:\n"
-"\n"
-"%(text)s"
-msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comments:\n"
-"\n"
-"%(text)s"
-msgstr[0] ""
-"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 "
-"comentarios:\n"
-"\n"
-"%(text)s"
-
-#: contrib/comments/views/comments.py:116
-#, python-format
-msgid ""
-"This comment was posted by a sketchy user:\n"
-"\n"
-"%(text)s"
+msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
-"Este comentario ha sido enviado por un usuario 'semi-an�nimo':\n"
-"\n"
-"%(text)s"
+"Seleccione una opci�n v�lida. %s no es una de las opciones disponibles."
 
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:280
-msgid "Only POSTs are allowed"
-msgstr "S�lo se admiten POSTs"
-
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
-msgstr "No se proporcion� uno o m�s de los siguientes campos requeridos"
-
-#: contrib/comments/views/comments.py:196
-#: contrib/comments/views/comments.py:286
-msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
-"Alguien est� jugando con el formulario de comentarios (violaci�n de "
-"seguridad)"
-
-#: contrib/comments/views/comments.py:206
-#: contrib/comments/views/comments.py:292
-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)"
-
-#: contrib/comments/views/comments.py:257
-#: contrib/comments/views/comments.py:321
-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/freeform.html:4
-msgid "Your name:"
-msgstr "Su nombre:"
-
-#: contrib/comments/templates/comments/freeform.html:5
-#: contrib/comments/templates/comments/form.html:28
-msgid "Comment:"
-msgstr "Comentario:"
-
-#: contrib/comments/templates/comments/freeform.html:10
-#: contrib/comments/templates/comments/form.html:35
-msgid "Preview comment"
-msgstr "Previsualizar comentario"
-
-#: 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/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: 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:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_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
-msgid "Log out"
-msgstr "Cerrar sesi�n"
-
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/login.html:20
-msgid "Password:"
-msgstr "Contrase�a:"
-
-#: contrib/comments/templates/comments/form.html:8
-msgid "Forgotten your password?"
-msgstr "Olvid� su contrase�a?"
-
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-msgstr "Calificaciones"
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-msgstr "Requerido"
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-msgstr "Opcional"
-
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-msgstr "Enviar una foto"
-
-#: contrib/flatpages/models.py:7 contrib/admin/views/doc.py:315
-msgid "URL"
-msgstr "URL"
-
-#: 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 "activar 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 lo proporciona, 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/sessions/models.py:51
-msgid "session key"
-msgstr "clave de sesi�n"
-
-#: contrib/sessions/models.py:52
-msgid "session data"
-msgstr "datos de sesi�n"
-
-#: contrib/sessions/models.py:53
-msgid "expire date"
-msgstr "fecha de caducidad"
-
-#: contrib/sessions/models.py:57
-msgid "session"
-msgstr "sesi�n"
-
-#: contrib/sessions/models.py:58
-msgid "sessions"
-msgstr "sesiones"
-
-#: contrib/sites/models.py:10
-msgid "domain name"
-msgstr "nombre de dominio"
-
-#: contrib/sites/models.py:11
-msgid "display name"
-msgstr "nombre para visualizar"
-
-#: contrib/sites/models.py:15
-msgid "site"
-msgstr "sitio"
-
-#: contrib/sites/models.py:16
-msgid "sites"
-msgstr "sitios"
-
-#: contrib/admin/filterspecs.py:40
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Por %s:</h3>\n"
-"<ul>\n"
-
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169
-msgid "All"
-msgstr "Todos/as"
-
-#: contrib/admin/filterspecs.py:109
-msgid "Any date"
-msgstr "Cualquier fecha"
-
-#: contrib/admin/filterspecs.py:110
-msgid "Today"
-msgstr "Hoy"
-
-#: contrib/admin/filterspecs.py:113
-msgid "Past 7 days"
-msgstr "�ltimos 7 d�as"
-
-#: contrib/admin/filterspecs.py:115
-msgid "This month"
-msgstr "Este mes"
-
-#: contrib/admin/filterspecs.py:117
-msgid "This year"
-msgstr "Este a�o"
-
-#: contrib/admin/filterspecs.py:143 newforms/widgets.py:170
-#: oldforms/__init__.py:572
-msgid "Yes"
-msgstr "S�"
-
-#: contrib/admin/filterspecs.py:143 newforms/widgets.py:170
-#: oldforms/__init__.py:572
-msgid "No"
-msgstr "No"
-
-#: contrib/admin/filterspecs.py:150 newforms/widgets.py:170
-#: oldforms/__init__.py:572
+#: newforms/widgets.py:170 contrib/admin/filterspecs.py:150
+#: oldforms/__init__.py:577
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: contrib/admin/models.py:16
-msgid "action time"
-msgstr "hora de acci�n"
+#: newforms/widgets.py:170 contrib/admin/filterspecs.py:143
+#: oldforms/__init__.py:577
+msgid "Yes"
+msgstr "S�"
 
-#: contrib/admin/models.py:19
-msgid "object id"
-msgstr "id de objeto"
+#: newforms/widgets.py:170 contrib/admin/filterspecs.py:143
+#: oldforms/__init__.py:577
+msgid "No"
+msgstr "No"
 
-#: contrib/admin/models.py:20
-msgid "object repr"
-msgstr "repr de objeto"
-
-#: contrib/admin/models.py:21
-msgid "action flag"
-msgstr "marca de acci�n"
-
-#: contrib/admin/models.py:22
-msgid "change message"
-msgstr "mensaje de cambio"
-
-#: contrib/admin/models.py:25
-msgid "log entry"
-msgstr "entrada de registro"
-
-#: contrib/admin/models.py:26
-msgid "log entries"
-msgstr "entradas de registro"
-
-#: contrib/admin/templatetags/admin_list.py:238
-msgid "All dates"
-msgstr "Todas las fechas"
-
-#: 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."
+#: utils/dateformat.py:40
+msgid "p.m."
 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."
+#: utils/dateformat.py:41
+msgid "a.m."
 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."
+#: utils/dateformat.py:46
+msgid "PM"
 msgstr ""
-"Su direcci�n de correo no es su nombre de usuario. Pruebe con '%s' en su "
-"lugar."
 
-#: contrib/admin/views/main.py:223
-msgid "Site administration"
-msgstr "Sitio administrativo"
-
-#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:19
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Se agreg� con �xito %(name)s \"%(obj)s\"."
-
-#: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347
-#: contrib/admin/views/auth.py:24
-msgid "You may edit it again below."
-msgstr "Puede modificarlo nuevamente abajo."
-
-#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puede agregar otro %s abajo."
-
-#: contrib/admin/views/main.py:289
-#, python-format
-msgid "Add %s"
-msgstr "Agregar %s"
-
-#: contrib/admin/views/main.py:335
-#, python-format
-msgid "Added %s."
-msgstr "Agregado %s."
-
-#: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337
-#: contrib/admin/views/main.py:339 db/models/manipulators.py:306
-msgid "and"
-msgstr "y"
-
-#: contrib/admin/views/main.py:337
-#, python-format
-msgid "Changed %s."
-msgstr "Modifica %s."
-
-#: contrib/admin/views/main.py:339
-#, python-format
-msgid "Deleted %s."
-msgstr "Elimina %s."
-
-#: contrib/admin/views/main.py:342
-msgid "No fields changed."
-msgstr "No ha modificado ning�n campo."
-
-#: contrib/admin/views/main.py:345
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Se modific� con �xito %(name)s \"%(obj)s."
-
-#: contrib/admin/views/main.py:353
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+#: utils/dateformat.py:47
+msgid "AM"
 msgstr ""
-"Se agreg� con �xito %(name)s \"%(obj)s. Puede modificarlo nuevamente abajo."
 
-#: contrib/admin/views/main.py:391
-#, python-format
-msgid "Change %s"
-msgstr "Modificar %s"
-
-#: contrib/admin/views/main.py:473
-#, 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:478
-#, 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:511
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "Se elimin� con �xito %(name)s \"%(obj)s\"."
-
-#: contrib/admin/views/main.py:514
-msgid "Are you sure?"
-msgstr "�Est� seguro?"
-
-#: contrib/admin/views/main.py:536
-#, python-format
-msgid "Change history: %s"
-msgstr "Historia de modificaciones: %s"
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "Select %s"
-msgstr "Seleccione %s"
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "Select %s to change"
-msgstr "Seleccione %s a modificar"
-
-#: contrib/admin/views/main.py:758
-msgid "Database error"
-msgstr "Error de base de datos"
-
-#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48
-#: contrib/admin/views/doc.py:50
-msgid "tag:"
-msgstr "etiqueta:"
-
-#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79
-#: contrib/admin/views/doc.py:81
-msgid "filter:"
-msgstr "Filtrar:"
-
-#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137
-#: contrib/admin/views/doc.py:139
-msgid "view:"
-msgstr "ver:"
-
-#: contrib/admin/views/doc.py:164
-#, python-format
-msgid "App %r not found"
-msgstr "App %r no encontrada"
-
-#: contrib/admin/views/doc.py:171
-#, python-format
-msgid "Model %r not found in app %r"
-msgstr "Modelo %r no encontrado en app %r"
-
-#: contrib/admin/views/doc.py:183
-#, python-format
-msgid "the related `%s.%s` object"
-msgstr "El objeto relacionado `%s.%s`"
-
-#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205
-#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224
-msgid "model:"
-msgstr "modelo:"
-
-#: contrib/admin/views/doc.py:214
-#, python-format
-msgid "related `%s.%s` objects"
-msgstr "objetos relacionados `%s.%s`"
-
-#: contrib/admin/views/doc.py:219
-#, python-format
-msgid "all %s"
-msgstr "todos %s"
-
-#: contrib/admin/views/doc.py:224
-#, python-format
-msgid "number of %s"
-msgstr "n�mero de %s"
-
-#: contrib/admin/views/doc.py:229
-#, python-format
-msgid "Fields on %s objects"
-msgstr "Campos en %s objetos"
-
-#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
-#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312
-msgid "Integer"
-msgstr "Entero"
-
-#: contrib/admin/views/doc.py:292
-msgid "Boolean (Either True or False)"
-msgstr "Booleano (Verdadero o Falso)"
-
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Cadena (m�ximo %(maxlength)s)"
-
-#: contrib/admin/views/doc.py:294
-msgid "Comma-separated integers"
-msgstr "Enteros separados por comas"
-
-#: contrib/admin/views/doc.py:295
-msgid "Date (without time)"
-msgstr "Fecha (sin hora)"
-
-#: contrib/admin/views/doc.py:296
-msgid "Date (with time)"
-msgstr "Fecha (con hora)"
-
-#: contrib/admin/views/doc.py:297
-msgid "E-mail address"
-msgstr "Direcci�n de correo electr�nico"
-
-#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299
-#: contrib/admin/views/doc.py:302
-msgid "File path"
-msgstr "Ruta de archivo"
-
-#: contrib/admin/views/doc.py:300
-msgid "Decimal number"
-msgstr "N�mero decimal"
-
-#: contrib/admin/views/doc.py:306
-msgid "Boolean (Either True, False or None)"
-msgstr "Booleano (Verdadero, Falso o Nulo)"
-
-#: contrib/admin/views/doc.py:307
-msgid "Relation to parent model"
-msgstr "Relaci�n con el modelo padre"
-
-#: contrib/admin/views/doc.py:308
-msgid "Phone number"
-msgstr "N�mero de tel�fono"
-
-#: contrib/admin/views/doc.py:313
-msgid "Text"
-msgstr "Texto"
-
-#: contrib/admin/views/doc.py:314
-msgid "Time"
-msgstr "Hora"
-
-#: contrib/admin/views/doc.py:316
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado de los EEUU (dos letras may�sculas)"
-
-#: contrib/admin/views/doc.py:317
-msgid "XML text"
-msgstr "Texto XML"
-
-#: contrib/admin/views/doc.py:343
-#, 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:30
-msgid "Add user"
-msgstr "Agregar usuario"
-
-#: contrib/admin/views/auth.py:57
-msgid "Password changed successfully."
-msgstr "Cambio de contrase�a exitoso"
-
-#: contrib/admin/views/auth.py:64
-#, python-format
-msgid "Change password: %s"
-msgstr "Cambiar contrase�a: %S"
-
-#: 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/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: 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/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: 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/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_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
-msgid "Change password"
-msgstr "Cambiar contrase�a"
-
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/admin/base.html:30
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/invalid_setup.html:4
-#: 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/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:21
-msgid "History"
-msgstr "Historia"
-
-#: 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 historia de modificaciones. Probablemente no fue "
-"a�adido usando este sitio de administraci�n."
-
-#: 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/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/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] "un resultado"
-msgstr[1] "%(counter)s resultados"
-
-#: contrib/admin/templates/admin/search_form.html:10
-#, python-format
-msgid "%(full_result_count)s total"
-msgstr "total: %(full_result_count)s"
-
-#: contrib/admin/templates/admin/pagination.html:10
-msgid "Show all"
-msgstr "Mostrar todos/as"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-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/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 "Ninguna 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 "Filtrar"
-
-#: 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/base.html:25
-msgid "Welcome,"
-msgstr "Bienvenido,"
-
-#: 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 eliminar 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 eliminar los %(object_name)s \"%(escaped_object)s"
-"\"? Se eliminar�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/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/invalid_setup.html:8
-msgid ""
-"Something's wrong with your database installation. Make sure the appropriate "
-"database tables have been created, and make sure the database is readable by "
-"the appropriate user."
-msgstr ""
-"hay alg�n problema con su instalaci�n de base de datos. Aseg�rese de que las "
-"tablas de la misma hayan sido creadas, y aseg�rese de que el usuario "
-"apropiado tenga permisos de escritura en la base de datos."
-
-#: contrib/admin/templates/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�na 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 "Para verificaci�n, introduzca la misma contrase�a que ingres� arriba."
-
-#: 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� "
-"configurar opciones adicionales."
-
-#: 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 contrase�a"
-
-#: 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 contrase�a exitoso"
-
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-msgstr "Su contrase�a 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 contrase�a"
-
-#: 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 contrase�a? 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 c�ntrase�a"
-
-#: 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 contrase�a 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 nueva contrase�a 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 contrase�a antigua, por seguridad, y despu�s "
-"introduzca la nueva contrase�a dos veces para verificar que la ha escrito "
-"correctamente."
-
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Contrase�a antigua:"
-
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
-msgstr "Contrase�a nueva:"
-
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
-msgstr "Confirme contrase�a:"
-
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
-msgstr "Cambiar mi contrase�a"
-
-#: 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 contrase�a"
-
-#: 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 contrase�a 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 sleccionar 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 equipo 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/localflavor/uk/forms.py:18
-msgid "Enter a postcode. A space is required between the two postcode parts."
-msgstr ""
-"Introduzca un postcode. Se requiere un espacio entre ambas partes del "
-"postcode."
-
-#: contrib/localflavor/usa/forms.py:17
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Introduzca un zip code en el formato XXXXX o XXXXX-XXXX."
+#: utils/dateformat.py:95
+msgid "midnight"
+msgstr "medianoche"
+
+#: utils/dateformat.py:97
+msgid "noon"
+msgstr "mediod�a"
+
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] "a�o"
+msgstr[1] "a�os"
+
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mes"
+msgstr[1] "meses"
+
+#: utils/timesince.py:14
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "semana"
+msgstr[1] "semanas"
+
+#: utils/timesince.py:15
+msgid "day"
+msgid_plural "days"
+msgstr[0] "d�a"
+msgstr[1] "d�as"
+
+#: utils/timesince.py:16
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "horas"
+
+#: utils/timesince.py:17
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minutos"
 
 #: utils/dates.py:6
 msgid "Monday"
@@ -1692,42 +319,6 @@ msgstr "Nov."
 msgid "Dec."
 msgstr "Dic."
 
-#: utils/timesince.py:12
-msgid "year"
-msgid_plural "years"
-msgstr[0] "a�o"
-msgstr[1] "a�os"
-
-#: utils/timesince.py:13
-msgid "month"
-msgid_plural "months"
-msgstr[0] "mes"
-msgstr[1] "meses"
-
-#: utils/timesince.py:14
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "semana"
-msgstr[1] "semanas"
-
-#: utils/timesince.py:15
-msgid "day"
-msgid_plural "days"
-msgstr[0] "d�a"
-msgstr[1] "d�as"
-
-#: utils/timesince.py:16
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "horas"
-
-#: utils/timesince.py:17
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutos"
-
 #: utils/translation/trans_real.py:362
 msgid "DATE_FORMAT"
 msgstr "j N Y"
@@ -1748,6 +339,1706 @@ msgstr "F Y"
 msgid "MONTH_DAY_FORMAT"
 msgstr "j \\de F"
 
+#: contrib/redirects/models.py:7
+msgid "redirect from"
+msgstr "redirigir desde"
+
+#: contrib/redirects/models.py:8
+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. Ejemplo: '/"
+"events/search/'."
+
+#: contrib/redirects/models.py:9
+msgid "redirect to"
+msgstr "redirigir a"
+
+#: contrib/redirects/models.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Esto puede ser bien una ruta absoluta (como antes) o una URL completa que "
+"empiece con 'http://'."
+
+#: contrib/redirects/models.py:13
+msgid "redirect"
+msgstr "redirecci�n"
+
+#: contrib/redirects/models.py:14
+msgid "redirects"
+msgstr "redirecciones"
+
+#: contrib/auth/models.py:38 contrib/auth/models.py:57
+msgid "name"
+msgstr "nombre"
+
+#: contrib/auth/models.py:40
+msgid "codename"
+msgstr "nombre en c�digo"
+
+#: contrib/auth/models.py:42
+msgid "permission"
+msgstr "permiso"
+
+#: contrib/auth/models.py:43 contrib/auth/models.py:58
+msgid "permissions"
+msgstr "permisos"
+
+#: contrib/auth/models.py:60
+msgid "group"
+msgstr "grupo"
+
+#: contrib/auth/models.py:61 contrib/auth/models.py:100
+msgid "groups"
+msgstr "grupos"
+
+#: contrib/auth/models.py:90
+msgid "username"
+msgstr "nombre de usuario"
+
+#: contrib/auth/models.py:90
+msgid ""
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
+"digits and underscores)."
+msgstr ""
+"Requerido. Longitud m�xima 30 caracteres alfanum�ricos (letras, d�gitos y "
+"guiones bajos)."
+
+#: contrib/auth/models.py:91
+msgid "first name"
+msgstr "nombre"
+
+#: contrib/auth/models.py:92
+msgid "last name"
+msgstr "apellido"
+
+#: contrib/auth/models.py:93
+msgid "e-mail address"
+msgstr "direcci�n de correo"
+
+#: contrib/auth/models.py:94
+msgid "password"
+msgstr "contrase�a"
+
+#: contrib/auth/models.py:94
+msgid ""
+"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
+"password form</a>."
+msgstr ""
+"Use '[algo]$[salt]$[hexdigest]' o use el <a href=\"password/\">formulario de "
+"cambio de contrase�a</a>."
+
+#: contrib/auth/models.py:95
+msgid "staff status"
+msgstr "es staff"
+
+#: contrib/auth/models.py:95
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica si el usuario puede ingresar a este sitio de administraci�n."
+
+#: contrib/auth/models.py:96
+msgid "active"
+msgstr "activo"
+
+#: contrib/auth/models.py:96
+msgid ""
+"Designates whether this user can log into the Django admin. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Indica si el usuario puede ingresar al sitio de administraci�n Django."
+"Desactive este campo en lugar de eliminar usuarios."
+
+#: contrib/auth/models.py:97
+msgid "superuser status"
+msgstr "es superusuario"
+
+#: contrib/auth/models.py:97
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Indica que este usuario posee todos los permisos, sin asignarle los mismos "
+"expl�citamente."
+
+#: contrib/auth/models.py:98
+msgid "last login"
+msgstr "�ltimo ingreso"
+
+#: contrib/auth/models.py:99
+msgid "date joined"
+msgstr "fecha de creaci�n"
+
+#: contrib/auth/models.py:101
+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 poseer� "
+"todos los permisos de los grupos a los que pertenezca."
+
+#: contrib/auth/models.py:102
+msgid "user permissions"
+msgstr "permisos de usuario"
+
+#: contrib/auth/models.py:105
+msgid "user"
+msgstr "usuario"
+
+#: contrib/auth/models.py:106
+msgid "users"
+msgstr "usuarios"
+
+#: contrib/auth/models.py:111
+msgid "Personal info"
+msgstr "Informaci�n personal"
+
+#: contrib/auth/models.py:112
+msgid "Permissions"
+msgstr "Permisos"
+
+#: contrib/auth/models.py:113
+msgid "Important dates"
+msgstr "Fechas importantes"
+
+#: contrib/auth/models.py:114
+msgid "Groups"
+msgstr "Grupos"
+
+#: contrib/auth/models.py:258
+msgid "message"
+msgstr "mensaje"
+
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+msgid "The two password fields didn't match."
+msgstr "Los dos campos de contrase�as no coinciden entre si."
+
+#: contrib/auth/forms.py:25
+msgid "A user with that username already exists."
+msgstr "Ya existe un usuario con ese nombre."
+
+#: contrib/auth/forms.py:53
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Su navegador Web aparenta no tener cookies activas. Las cookies son un "
+"requerimiento 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 nombre de usuario y una contrase�a correctos. 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:85
+msgid ""
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+"Esa direcci�n de e-mail no est� asociada a ninguna cuenta de usuario. �Est� "
+"seguro de que ya se ha registrado?"
+
+#: contrib/auth/forms.py:117
+msgid "The two 'new password' fields didn't match."
+msgstr "Los dos campos 'nueva contrase�a' no coinciden entre si."
+
+#: contrib/auth/forms.py:124
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+"La antigua contrase�a ingresada es incorrecta. Por favor ingr�sela "
+"nuevamente."
+
+#: contrib/auth/views.py:39
+msgid "Logged out"
+msgstr "Sesi�n cerrada"
+
+#: contrib/admin/filterspecs.py:40
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Por %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169
+msgid "All"
+msgstr "Todos/as"
+
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr "Cualquier fecha"
+
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "Hoy"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr "�ltimos 7 d�as"
+
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "Este mes"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "Este a�o"
+
+#: contrib/admin/models.py:16
+msgid "action time"
+msgstr "hora de acci�n"
+
+#: contrib/admin/models.py:19
+msgid "object id"
+msgstr "id de objeto"
+
+#: contrib/admin/models.py:20
+msgid "object repr"
+msgstr "repr de objeto"
+
+#: contrib/admin/models.py:21
+msgid "action flag"
+msgstr "marca de acci�n"
+
+#: contrib/admin/models.py:22
+msgid "change message"
+msgstr "mensaje de cambio"
+
+#: contrib/admin/models.py:25
+msgid "log entry"
+msgstr "entrada de registro"
+
+#: contrib/admin/models.py:26
+msgid "log entries"
+msgstr "entradas de registro"
+
+#: 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. Intente nuevamente "
+"usando '%s'."
+
+#: contrib/admin/views/auth.py:19 contrib/admin/views/main.py:257
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Se agreg� con �xito %(name)s \"%(obj)s\"."
+
+#: contrib/admin/views/auth.py:24 contrib/admin/views/main.py:261
+#: contrib/admin/views/main.py:347
+msgid "You may edit it again below."
+msgstr "Puede modificarlo nuevamente abajo."
+
+#: contrib/admin/views/auth.py:30
+msgid "Add user"
+msgstr "Agregar usuario"
+
+#: contrib/admin/views/auth.py:57
+msgid "Password changed successfully."
+msgstr "Cambio de contrase�a exitoso"
+
+#: contrib/admin/views/auth.py:64
+#, python-format
+msgid "Change password: %s"
+msgstr "Cambiar contrase�a: %S"
+
+#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48
+#: contrib/admin/views/doc.py:50
+msgid "tag:"
+msgstr "etiqueta:"
+
+#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79
+#: contrib/admin/views/doc.py:81
+msgid "filter:"
+msgstr "filtrar:"
+
+#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137
+#: contrib/admin/views/doc.py:139
+msgid "view:"
+msgstr "ver:"
+
+#: contrib/admin/views/doc.py:164
+#, python-format
+msgid "App %r not found"
+msgstr "Aplicaci�n %r no encontrada"
+
+#: contrib/admin/views/doc.py:171
+#, python-format
+msgid "Model %(name)r not found in app %(label)r"
+msgstr "Modelo %(name)r no encontrado en aplicaci�n %(label)r"
+
+#: contrib/admin/views/doc.py:183
+#, python-format
+msgid "the related `%(label)s.%(type)s` object"
+msgstr "el objeto relacionado `%(label)s%(type)s`"
+
+#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205
+#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224
+msgid "model:"
+msgstr "modelo:"
+
+#: contrib/admin/views/doc.py:214
+#, python-format
+msgid "related `%(label)s.%(name)s` objects"
+msgstr "objetos relacionados `%(label)s.%(name)s`"
+
+#: contrib/admin/views/doc.py:219
+#, python-format
+msgid "all %s"
+msgstr "todos %s"
+
+#: contrib/admin/views/doc.py:224
+#, python-format
+msgid "number of %s"
+msgstr "n�mero de %s"
+
+#: contrib/admin/views/doc.py:229
+#, python-format
+msgid "Fields on %s objects"
+msgstr "Campos en %s objetos"
+
+#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
+#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
+#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312
+msgid "Integer"
+msgstr "Entero"
+
+#: contrib/admin/views/doc.py:292
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (Verdadero o Falso)"
+
+#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr "Cadena (m�ximo %(maxlength)s)"
+
+#: contrib/admin/views/doc.py:294
+msgid "Comma-separated integers"
+msgstr "Enteros separados por comas"
+
+#: contrib/admin/views/doc.py:295
+msgid "Date (without time)"
+msgstr "Fecha (sin hora)"
+
+#: contrib/admin/views/doc.py:296
+msgid "Date (with time)"
+msgstr "Fecha (con hora)"
+
+#: contrib/admin/views/doc.py:297
+msgid "E-mail address"
+msgstr "Direcci�n de correo electr�nico"
+
+#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299
+#: contrib/admin/views/doc.py:302
+msgid "File path"
+msgstr "Ruta de archivo"
+
+#: contrib/admin/views/doc.py:300
+msgid "Decimal number"
+msgstr "N�mero decimal"
+
+#: contrib/admin/views/doc.py:304 contrib/comments/models.py:85
+msgid "IP address"
+msgstr "Direcci�n IP"
+
+#: contrib/admin/views/doc.py:306
+msgid "Boolean (Either True, False or None)"
+msgstr "Booleano (Verdadero, Falso o Nulo)"
+
+#: contrib/admin/views/doc.py:307
+msgid "Relation to parent model"
+msgstr "Relaci�n con el modelo padre"
+
+#: contrib/admin/views/doc.py:308
+msgid "Phone number"
+msgstr "N�mero de tel�fono"
+
+#: contrib/admin/views/doc.py:313
+msgid "Text"
+msgstr "Texto"
+
+#: contrib/admin/views/doc.py:314
+msgid "Time"
+msgstr "Hora"
+
+#: contrib/admin/views/doc.py:315 contrib/flatpages/models.py:7
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:316
+msgid "U.S. state (two uppercase letters)"
+msgstr "Estado de los EE.UU. (dos letras may�sculas)"
+
+#: contrib/admin/views/doc.py:317
+msgid "XML text"
+msgstr "Texto XML"
+
+#: contrib/admin/views/doc.py:343
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s no parece ser un objeto urlpattern"
+
+#: contrib/admin/views/main.py:223
+msgid "Site administration"
+msgstr "Sitio administrativo"
+
+#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356
+#, python-format
+msgid "You may add another %s below."
+msgstr "Puede agregar otro %s abajo."
+
+#: contrib/admin/views/main.py:289
+#, python-format
+msgid "Add %s"
+msgstr "Agregar %s"
+
+#: contrib/admin/views/main.py:335
+#, python-format
+msgid "Added %s."
+msgstr "Agregado %s."
+
+#: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337
+#: contrib/admin/views/main.py:339 db/models/manipulators.py:308
+msgid "and"
+msgstr "y"
+
+#: contrib/admin/views/main.py:337
+#, python-format
+msgid "Changed %s."
+msgstr "Modifica %s."
+
+#: contrib/admin/views/main.py:339
+#, python-format
+msgid "Deleted %s."
+msgstr "Elimina %s."
+
+#: contrib/admin/views/main.py:342
+msgid "No fields changed."
+msgstr "No ha modificado ning�n campo."
+
+#: contrib/admin/views/main.py:345
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Se modific� con �xito %(name)s \"%(obj)s."
+
+#: contrib/admin/views/main.py:353
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"Se agreg� con �xito %(name)s \"%(obj)s. Puede modificarlo nuevamente abajo."
+
+#: contrib/admin/views/main.py:391
+#, python-format
+msgid "Change %s"
+msgstr "Modificar %s"
+
+#: contrib/admin/views/main.py:476
+#, 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:481
+#, 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:514
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Se elimin� con �xito %(name)s \"%(obj)s\"."
+
+#: contrib/admin/views/main.py:517
+msgid "Are you sure?"
+msgstr "�Est� seguro?"
+
+#: contrib/admin/views/main.py:539
+#, python-format
+msgid "Change history: %s"
+msgstr "Historia de modificaciones: %s"
+
+#: contrib/admin/views/main.py:573
+#, python-format
+msgid "Select %s"
+msgstr "Seleccione %s"
+
+#: contrib/admin/views/main.py:573
+#, python-format
+msgid "Select %s to change"
+msgstr "Seleccione %s a modificar"
+
+#: contrib/admin/views/main.py:768
+msgid "Database error"
+msgstr "Error de base de datos"
+
+#: contrib/admin/templatetags/admin_list.py:247
+msgid "All dates"
+msgstr "Todas las fechas"
+
+#: 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/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 "Ninguna disponible"
+
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Filtrar"
+
+#: 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] "un resultado"
+msgstr[1] "%(counter)s resultados"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "total: %(full_result_count)s"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Por %(filter_title)s "
+
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Mostrar todos/as"
+
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: 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_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: 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/index.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+msgid "Change password"
+msgstr "Cambiar contrase�a"
+
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: 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/index.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/comments/templates/comments/form.html:6
+msgid "Log out"
+msgstr "Cerrar sesi�n"
+
+#: contrib/admin/templates/admin/change_form.html:13
+#: contrib/admin/templates/admin/change_list.html:6
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: 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/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Home"
+msgstr "Inicio"
+
+#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/object_history.html:5
+msgid "History"
+msgstr "Historia"
+
+#: 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/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/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/change_list.html:12
+#, python-format
+msgid "Add %(name)s"
+msgstr "Agregar %(name)s"
+
+#: 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 "Contrase�a:"
+
+#: contrib/admin/templates/admin/base.html:25
+msgid "Welcome,"
+msgstr "Bienvenido,"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/delete_confirmation.html:9
+msgid "Delete"
+msgstr "Eliminar"
+
+#: 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/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 historia de modificaciones. Probablemente no fu� "
+"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 ser solucionado en breve. Gracias "
+"por su paciencia."
+
+#: 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 eliminar 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 eliminar los %(object_name)s \"%(escaped_object)s"
+"\"? Se eliminar�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/invalid_setup.html:8
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+"Hay alg�n problema con su instalaci�n de base de datos. Aseg�rese de que las "
+"tablas de la misma hayan sido creadas, y aseg�rese de que el usuario "
+"apropiado tenga permisos de lectura en la base de datos."
+
+#: 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 "Para verificaci�n, introduzca la misma contrase�a que ingres� arriba."
+
+#: 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� "
+"configurar opciones adicionales."
+
+#: 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 contrase�a"
+
+#: 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 contrase�a exitoso"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "Su contrase�a 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 contrase�a"
+
+#: 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 contrase�a? 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 contrase�a"
+
+#: 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 contrase�a 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 nueva contrase�a 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, por razones de seguridad, introduzca su contrase�a antigua, y "
+"luego introduzca la nueva contrase�a dos veces para verificar que la ha "
+"escrito correctamente."
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "Contrase�a antigua:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "Contrase�a nueva:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "Confirme contrase�a:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "Cambiar mi contrase�a"
+
+#: 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 contrase�a"
+
+#: 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 contrase�a 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/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 seleccionar el bookmarklet desde cualquier p�gina en el sitio.\n"
+"Tenga en cuenta que algunos de estos bookmarklets precisan que est� viendo\n"
+"el sitio desde un equipo 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/sites/models.py:10
+msgid "domain name"
+msgstr "nombre de dominio"
+
+#: contrib/sites/models.py:11
+msgid "display name"
+msgstr "nombre para visualizar"
+
+#: contrib/sites/models.py:15
+msgid "site"
+msgstr "sitio"
+
+#: contrib/sites/models.py:16
+msgid "sites"
+msgstr "sitios"
+
+#: contrib/sessions/models.py:68
+msgid "session key"
+msgstr "clave de sesi�n"
+
+#: contrib/sessions/models.py:69
+msgid "session data"
+msgstr "datos de sesi�n"
+
+#: contrib/sessions/models.py:70
+msgid "expire date"
+msgstr "fecha de caducidad"
+
+#: contrib/sessions/models.py:74
+msgid "session"
+msgstr "sesi�n"
+
+#: contrib/sessions/models.py:75
+msgid "sessions"
+msgstr "sesiones"
+
+#: contrib/contenttypes/models.py:36
+msgid "python model class name"
+msgstr "nombre de la clase python del modelo"
+
+#: contrib/contenttypes/models.py:39
+msgid "content type"
+msgstr "tipo de contenido"
+
+#: contrib/contenttypes/models.py:40
+msgid "content types"
+msgstr "tipos de contenido"
+
+#: 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 "activar 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 lo proporciona, 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/localflavor/usa/forms.py:17
+msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
+msgstr "Introduzca un zip code en el formato XXXXX o XXXXX-XXXX."
+
+#: contrib/localflavor/uk/forms.py:18
+msgid "Enter a postcode. A space is required between the two postcode parts."
+msgstr ""
+"Introduzca un postcode. Se requiere un espacio entre las dos secciones del "
+"mismo."
+
+#: contrib/comments/models.py:67 contrib/comments/models.py:166
+msgid "object ID"
+msgstr "ID de objeto"
+
+#: contrib/comments/models.py:68
+msgid "headline"
+msgstr "encabezado"
+
+#: contrib/comments/models.py:69 contrib/comments/models.py:90
+#: contrib/comments/models.py:167
+msgid "comment"
+msgstr "comentario"
+
+#: contrib/comments/models.py:70
+msgid "rating #1"
+msgstr "calificaci�n 1"
+
+#: contrib/comments/models.py:71
+msgid "rating #2"
+msgstr "calificaci�n 2"
+
+#: contrib/comments/models.py:72
+msgid "rating #3"
+msgstr "calificaci�n 3"
+
+#: contrib/comments/models.py:73
+msgid "rating #4"
+msgstr "calificaci�n 4"
+
+#: contrib/comments/models.py:74
+msgid "rating #5"
+msgstr "calificaci�n 5"
+
+#: contrib/comments/models.py:75
+msgid "rating #6"
+msgstr "calificaci�n 6"
+
+#: contrib/comments/models.py:76
+msgid "rating #7"
+msgstr "calificaci�n 7"
+
+#: contrib/comments/models.py:77
+msgid "rating #8"
+msgstr "calificaci�n 8"
+
+#: contrib/comments/models.py:82
+msgid "is valid rating"
+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"
+
+#: contrib/comments/models.py:84 contrib/comments/models.py:170
+msgid "is public"
+msgstr "es p�blico"
+
+#: contrib/comments/models.py:86
+msgid "is removed"
+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� "
+"\"Este comentario ha sido eliminado\"."
+
+#: contrib/comments/models.py:91
+msgid "comments"
+msgstr "comentarios"
+
+#: contrib/comments/models.py:131 contrib/comments/models.py:207
+msgid "Content object"
+msgstr "Objeto contenido"
+
+#: contrib/comments/models.py:159
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"Enviado por %(user)s el %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+
+#: contrib/comments/models.py:168
+msgid "person's name"
+msgstr "nombre de la persona"
+
+#: contrib/comments/models.py:171
+msgid "ip address"
+msgstr "direcci�n ip"
+
+#: contrib/comments/models.py:173
+msgid "approved by staff"
+msgstr "aprobado por el staff"
+
+#: contrib/comments/models.py:176
+msgid "free comment"
+msgstr "comentario libre"
+
+#: contrib/comments/models.py:177
+msgid "free comments"
+msgstr "comentarios libres"
+
+#: contrib/comments/models.py:233
+msgid "score"
+msgstr "puntuaci�n"
+
+#: contrib/comments/models.py:234
+msgid "score date"
+msgstr "fecha de la puntuaci�n"
+
+#: contrib/comments/models.py:237
+msgid "karma score"
+msgstr "punto karma"
+
+#: contrib/comments/models.py:238
+msgid "karma scores"
+msgstr "puntos karma"
+
+#: contrib/comments/models.py:242
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr "puntuado %(score)d por %(user)s"
+
+#: contrib/comments/models.py:258
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Este comentario fue marcado por %(user)s:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/models.py:265
+msgid "flag date"
+msgstr "fecha de la marca"
+
+#: contrib/comments/models.py:268
+msgid "user flag"
+msgstr "marca de usuario"
+
+#: contrib/comments/models.py:269
+msgid "user flags"
+msgstr "marcas de usuario"
+
+#: contrib/comments/models.py:273
+#, python-format
+msgid "Flag by %r"
+msgstr "Marca de %r"
+
+#: contrib/comments/models.py:278
+msgid "deletion date"
+msgstr "fecha de eliminaci�n"
+
+#: contrib/comments/models.py:280
+msgid "moderator deletion"
+msgstr "Eliminaci�n por moderador"
+
+#: contrib/comments/models.py:281
+msgid "moderator deletions"
+msgstr "eliminaciones por moderador"
+
+#: contrib/comments/models.py:285
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr "Eliminaci�n del moderador %r"
+
+#: contrib/comments/views/karma.py:19
+msgid "Anonymous users cannot vote"
+msgstr "Los usuarios an�nimos no pueden votar"
+
+#: contrib/comments/views/karma.py:23
+msgid "Invalid comment ID"
+msgstr "ID de comentario no v�lido"
+
+#: contrib/comments/views/karma.py:25
+msgid "No voting for yourself"
+msgstr "Ud. no puede votarse a s� mismo"
+
+#: contrib/comments/views/comments.py:27
+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."
+
+#: contrib/comments/views/comments.py:111
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr[0] ""
+"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 "
+"comentarios:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:116
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Este comentario ha sido enviado por un usuario 'semi-an�nimo':\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:280
+msgid "Only POSTs are allowed"
+msgstr "S�lo se admiten POSTs"
+
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:284
+msgid "One or more of the required fields wasn't submitted"
+msgstr "No se proporcion� uno o m�s de los siguientes campos requeridos"
+
+#: contrib/comments/views/comments.py:196
+#: contrib/comments/views/comments.py:286
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+"Alguien est� jugando con el formulario de comentarios (violaci�n de "
+"seguridad)"
+
+#: contrib/comments/views/comments.py:206
+#: contrib/comments/views/comments.py:292
+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)"
+
+#: contrib/comments/views/comments.py:257
+#: contrib/comments/views/comments.py:321
+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:8
+msgid "Forgotten your password?"
+msgstr "Olvid� su contrase�a?"
+
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr "Calificaciones"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "Requerido"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr "Opcional"
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr "Enviar una foto"
+
+#: contrib/comments/templates/comments/form.html:28
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: contrib/comments/templates/comments/form.html:35
+#: contrib/comments/templates/comments/freeform.html:10
+msgid "Preview comment"
+msgstr "Previsualizar comentario"
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "Su nombre:"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "th"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "st"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "nd"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "rd"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:47
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f mill�n"
+msgstr[1] "%(value).1f millones"
+
+#: contrib/humanize/templatetags/humanize.py:50
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f millardo"
+msgstr[1] "%(value).1f millardos"
+
+#: contrib/humanize/templatetags/humanize.py:53
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f bill�n"
+msgstr[1] "%(value).1f billones"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "one"
+msgstr "uno"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "two"
+msgstr "dos"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "three"
+msgstr "tres"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "four"
+msgstr "cuatro"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "five"
+msgstr "cinco"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "six"
+msgstr "seis"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "seven"
+msgstr "siete"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "eight"
+msgstr "ocho"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "nine"
+msgstr "nueve"
+
+#: db/models/manipulators.py:307
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr "Ya existe un(a) %(object)s con este/a %(type)s para %(field)s."
+
+#: db/models/fields/__init__.py:42
+#, 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:367
+msgid "This value must be an integer."
+msgstr "Este valor debe ser un n�mero entero."
+
+#: db/models/fields/__init__.py:402
+msgid "This value must be either True or False."
+msgstr "Este valor debe ser True o False."
+
+#: db/models/fields/__init__.py:423
+msgid "This field cannot be null."
+msgstr "Este campo no puede ser nulo."
+
+#: db/models/fields/__init__.py:457 core/validators.py:148
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Introduzca una fecha v�lida en formato AAAA-MM-DD."
+
+#: db/models/fields/__init__.py:526 core/validators.py:157
+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."
+
+#: db/models/fields/__init__.py:630
+msgid "Enter a valid filename."
+msgstr "Introduzca un nombre de archivo v�lido."
+
+#: db/models/fields/__init__.py:751
+msgid "This value must be either None, True or False."
+msgstr "Este valor debe ser None, True o False."
+
+#: db/models/fields/related.py:53
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Por favor, introduzca un %s v�lido."
+
+#: db/models/fields/related.py:642
+msgid "Separate multiple IDs with commas."
+msgstr " Separe m�ltiples identificadores con comas."
+
+#: db/models/fields/related.py:644
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Mantenga presionada \"Control\" (\"Command\" en una Mac) para seleccionar "
+"m�s de uno."
+
+#: db/models/fields/related.py:691
+#, 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."
+
+#: oldforms/__init__.py:392
+#, 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 caracter."
+msgstr[1] "Aseg�rese de que su texto tiene menos de %s caracteres."
+
+#: oldforms/__init__.py:397
+msgid "Line breaks are not allowed here."
+msgstr "No se permiten saltos de l�nea."
+
+#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Seleccione una opci�n v�lida; '%(data)s' no est� en %(choices)s."
+
+#: oldforms/__init__.py:672 core/validators.py:174 core/validators.py:445
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+"No se envi� un archivo. Verifique el tipo de codificaci�n en el formulario."
+
+#: oldforms/__init__.py:674
+msgid "The submitted file is empty."
+msgstr "El archivo enviado est� vac�o."
+
+#: oldforms/__init__.py:730
+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:740
+msgid "Enter a positive number."
+msgstr "Introduzca un n�mero positivo."
+
+#: oldforms/__init__.py:750
+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 "Se cre� con �xito %(verbose_name)."
+
+#: views/generic/create_update.py:117
+#, python-format
+msgid "The %(verbose_name)s was updated successfully."
+msgstr "Se actualiz� con �xito %(verbose_name)s."
+
+#: views/generic/create_update.py:184
+#, python-format
+msgid "The %(verbose_name)s was deleted."
+msgstr "Se elimin� %(verbose_name)s."
+
 #: conf/global_settings.py:39
 msgid "Arabic"
 msgstr "�rabe"
@@ -1825,141 +2116,88 @@ msgid "Japanese"
 msgstr "Japon�s"
 
 #: conf/global_settings.py:58
-msgid "Latvian"
-msgstr "Latvio"
+msgid "Kannada"
+msgstr "Canar�s"
 
 #: conf/global_settings.py:59
+msgid "Latvian"
+msgstr "Let�n"
+
+#: conf/global_settings.py:60
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
 msgid "Dutch"
 msgstr "Holand�s"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
 msgid "Polish"
 msgstr "Polaco"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
+msgid "Portugese"
+msgstr "Portugu�s"
+
+#: conf/global_settings.py:65
 msgid "Brazilian"
 msgstr "Brasile�o"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:66
 msgid "Romanian"
 msgstr "Rumano"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:67
 msgid "Russian"
 msgstr "Ruso"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:68
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:69
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:70
 msgid "Serbian"
 msgstr "Serbio"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:71
 msgid "Swedish"
 msgstr "Sueco"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
+msgid "Telugu"
+msgstr "Telugu"
+
+#: conf/global_settings.py:74
 msgid "Turkish"
 msgstr "Turco"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:75
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:76
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:77
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
-#: db/models/manipulators.py:305
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
-msgstr "Ya existe un(a) %(object)s con este/a %(type)s para %(field)s."
-
-#: db/models/fields/__init__.py:42
-#, 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:116 db/models/fields/__init__.py:273
-#: db/models/fields/__init__.py:605 db/models/fields/__init__.py:616
-#: newforms/fields.py:78 newforms/fields.py:374 newforms/fields.py:450
-#: newforms/fields.py:461 newforms/models.py:177 oldforms/__init__.py:352
-msgid "This field is required."
-msgstr "Este campo es obligatorio."
-
-#: db/models/fields/__init__.py:366
-msgid "This value must be an integer."
-msgstr "Este valor debe ser un n�mero entero."
-
-#: db/models/fields/__init__.py:401
-msgid "This value must be either True or False."
-msgstr "Este valor debe ser True o False."
-
-#: db/models/fields/__init__.py:422
-msgid "This field cannot be null."
-msgstr "Este campo no puede ser nulo."
-
-#: db/models/fields/__init__.py:454 core/validators.py:147
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduzca una fecha v�lida en formato AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:521 core/validators.py:156
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Introduzca una fecha/hora v�lida en formato YYYY-MM-DD HH:MM."
-
-#: db/models/fields/__init__.py:625
-msgid "Enter a valid filename."
-msgstr "Introduzca un nombre de achivo v�lido."
-
-#: db/models/fields/related.py:53
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Por favor, introduzca un %s v�lido."
-
-#: db/models/fields/related.py:642
-msgid "Separate multiple IDs with commas."
-msgstr " Separe m�ltiples IDs con comas."
-
-#: db/models/fields/related.py:644
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
-"Mantenga presionada \"Control\" (\"Command\" en un Mac) para seleccionar m�s "
-"de uno."
-
-#: db/models/fields/related.py:691
-#, 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."
+#: template/defaultfilters.py:491
+msgid "yes,no,maybe"
+msgstr "si,no,talvez"
 
 #: core/validators.py:64
 msgid "This value must contain only letters, numbers and underscores."
@@ -2010,10 +2248,6 @@ msgstr "No se admiten caracteres no num
 msgid "This value can't be comprised solely of digits."
 msgstr "Este valor no puede estar formado s�lo por d�gitos."
 
-#: core/validators.py:120 newforms/fields.py:126
-msgid "Enter a whole number."
-msgstr "Introduzca un n�mero entero."
-
 #: core/validators.py:124
 msgid "Only alphabetical characters are allowed here."
 msgstr "S�lo se admiten caracteres alfab�ticos."
@@ -2024,23 +2258,14 @@ msgstr "El a
 
 #: core/validators.py:143
 #, python-format
-msgid "Invalid date: %s."
-msgstr "Fecha no v�lida: %s."
+msgid "Invalid date: %s"
+msgstr "Fecha no v�lida: %s"
 
-#: core/validators.py:152
+#: core/validators.py:153
 msgid "Enter a valid time in HH:MM format."
 msgstr "Introduzca una hora v�lida en formato HH:MM."
 
-#: core/validators.py:161 newforms/fields.py:269
-msgid "Enter a valid e-mail address."
-msgstr "Introduzca una direcci�n de correo electr�nico v�lida"
-
-#: core/validators.py:173 core/validators.py:444 oldforms/__init__.py:667
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-"No se envi� un archivo. Verifique el tipo de codificaci�n en el formulario."
-
-#: core/validators.py:177
+#: core/validators.py:178
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -2048,28 +2273,28 @@ msgstr ""
 "Env�e una imagen v�lida. El archivo que ha enviado no era una imagen o se "
 "trataba de una imagen corrupta."
 
-#: core/validators.py:184
+#: core/validators.py:185
 #, python-format
 msgid "The URL %s does not point to a valid image."
 msgstr "La URL %s no apunta a una imagen v�lida."
 
-#: core/validators.py:188
+#: core/validators.py:189
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
-"Los n�meros telef�nicos deben respetar el formato XXX-XXX-XXXX. \"%s\" no es "
-"v�lido."
+"Los n�meros telef�nicos deben respetar el formato XXX-XXX-XXXX. \"%s\" "
+"no es v�lido."
 
-#: core/validators.py:196
+#: core/validators.py:197
 #, 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."
 
-#: core/validators.py:200
+#: core/validators.py:201
 msgid "A valid URL is required."
 msgstr "Se precisa una URL v�lida."
 
-#: core/validators.py:214
+#: core/validators.py:215
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
@@ -2078,96 +2303,96 @@ msgstr ""
 "Se precisa HTML v�lido. Los errores espec�ficos son:\n"
 "%s"
 
-#: core/validators.py:221
+#: core/validators.py:222
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "XML mal formado: %s"
 
-#: core/validators.py:238
+#: core/validators.py:239
 #, python-format
 msgid "Invalid URL: %s"
 msgstr "URL no v�lida: %s"
 
-#: core/validators.py:243 core/validators.py:245
+#: core/validators.py:244 core/validators.py:246
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "La URL %s es un enlace roto."
 
-#: core/validators.py:251
+#: core/validators.py:252
 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 EE.UU."
 
-#: core/validators.py:265
+#: core/validators.py:266
 #, 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] "�Vigila tu boca! Aqu� no admitimos la palabra %s."
 msgstr[1] "�Vigila tu boca! Aqu� no admitimos las palabras %s."
 
-#: core/validators.py:272
+#: core/validators.py:273
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Este campo debe concordar con el campo '%s'."
 
-#: core/validators.py:291
+#: core/validators.py:292
 msgid "Please enter something for at least one field."
 msgstr "Por favor, introduzca algo en al menos un campo."
 
-#: core/validators.py:300 core/validators.py:311
+#: core/validators.py:301 core/validators.py:312
 msgid "Please enter both fields or leave them both empty."
 msgstr "Por favor, rellene ambos campos o deje ambos vac�os."
 
-#: core/validators.py:319
+#: core/validators.py:320
 #, 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:332
+#: core/validators.py:333
 #, 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:351
+#: core/validators.py:352
 msgid "Duplicate values are not allowed."
 msgstr "No se admiten valores duplicados."
 
-#: core/validators.py:366
+#: core/validators.py:367
 #, python-format
-msgid "This value must be between %s and %s."
-msgstr "Este valor debe ser estar entre %s y %s."
+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:368
+#: core/validators.py:369
 #, python-format
 msgid "This value must be at least %s."
 msgstr "Este valor debe ser al menos %s."
 
-#: core/validators.py:370
+#: core/validators.py:371
 #, python-format
 msgid "This value must be no more than %s."
 msgstr "Este valor debe ser no mayor que %s."
 
-#: core/validators.py:406
+#: core/validators.py:407
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Este valor debe ser una potencia de %s."
 
-#: core/validators.py:417
+#: core/validators.py:418
 msgid "Please enter a valid decimal number."
 msgstr "Por favor, introduzca un n�mero decimal v�lido."
 
-#: core/validators.py:421
+#: core/validators.py:422
 #, 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 con un m�ximo de un "
+"Por favor, introduzca un n�mero decimal v�lido con un m�ximo de un "
 "d�gito en total."
 msgstr[1] ""
 "Por favor, introduzca un n�mero decimal v�lido con un maximo de %s d�gitos "
 "en total."
 
-#: core/validators.py:424
+#: core/validators.py:425
 #, python-format
 msgid ""
 "Please enter a valid decimal number with a whole part of at most %s digit."
@@ -2180,7 +2405,7 @@ msgstr[1] ""
 "Por favor, introduzca un n�mero decimal v�lido con un m�ximo de %s d�gitos "
 "enteros."
 
-#: core/validators.py:427
+#: core/validators.py:428
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -2192,34 +2417,32 @@ msgstr[1] ""
 "Por favor, introduzca un n�mero decimal v�lido con un m�ximo de %s "
 "posiciones decimales."
 
-#: core/validators.py:437
+#: core/validators.py:438
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""
-"Aseg�rese de que el archivo que env�a es de un tama�o m�nimo de "
-"%s bytes."
+"Aseg�rese de que el archivo que env�a es de un tama�o m�nimo de %s bytes."
 
-#: core/validators.py:438
+#: core/validators.py:439
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""
-"Aseg�rese de que el archivo que env�a es de un tama�o m�ximo de "
-"%s bytes."
+"Aseg�rese de que el archivo que env�a es de un tama�o m�ximo de %s bytes."
 
-#: core/validators.py:455
+#: core/validators.py:456
 msgid "The format for this field is wrong."
 msgstr "El formato de este campo es incorrecto."
 
-#: core/validators.py:470
+#: core/validators.py:471
 msgid "This field is invalid."
 msgstr "Este campo no es v�lido."
 
-#: core/validators.py:506
+#: core/validators.py:507
 #, python-format
 msgid "Could not retrieve anything from %s."
-msgstr "No pude obtener nada de %s."
+msgstr "No se pudo obtener nada de %s."
 
-#: core/validators.py:509
+#: core/validators.py:510
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@@ -2227,170 +2450,59 @@ msgstr ""
 "La URL %(url)s devolvi� la cabecera Content-Type '%(contenttype)s', que no "
 "es v�lida."
 
-#: core/validators.py:542
+#: core/validators.py:543
 #, 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 "
-"empieza por \"%(start)s\".)"
+"empieza con \"%(start)s\".)"
 
-#: core/validators.py:546
+#: core/validators.py:547
 #, 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\".)"
+"contexto. (La l�nea empieza con \"%(start)s\".)"
 
-#: core/validators.py:551
+#: core/validators.py:552
 #, 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 "
-"empieza por \"%(start)s\".)"
+"empieza con \"%(start)s\".)"
 
-#: core/validators.py:556
+#: core/validators.py:557
 #, 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 "
-"empieza por \"%(start)s\".)"
+"empieza con \"%(start)s\".)"
 
-#: core/validators.py:560
+#: core/validators.py:561
 #, 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\".)"
+"requeridos. (La l�nea empieza con \"%(start)s\".)"
 
-#: core/validators.py:565
+#: core/validators.py:566
 #, 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\".)"
-
-#: template/defaultfilters.py:490
-msgid "yes,no,maybe"
-msgstr "si,no,talvez"
-
-#: views/generic/create_update.py:43
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Se cre� con �xito %(verbose_name)."
-
-#: views/generic/create_update.py:117
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Se actualiz� con �xito %(verbose_name)s."
-
-#: views/generic/create_update.py:184
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Se elimin� %(verbose_name)s."
-
-#: newforms/fields.py:101 newforms/fields.py:254
-#, python-format
-msgid "Ensure this value has at most %d characters."
-msgstr "Aseg�rese de que este valor tenga como m�ximo %d caracteres."
-
-#: newforms/fields.py:103 newforms/fields.py:256
-#, python-format
-msgid "Ensure this value has at least %d characters."
-msgstr "Aseg�rese de que este valor tenga al menos %d caracteres."
-
-#: newforms/fields.py:128
-#, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr "Aseg�rese de que este valor sea menor o igual a %s."
-
-#: newforms/fields.py:130
-#, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr "Aseg�rese de que este valor sea mayor o igual a %s."
-
-#: newforms/fields.py:163
-msgid "Enter a valid date."
-msgstr "Ingrse una fecha v�lida."
-
-#: newforms/fields.py:190
-msgid "Enter a valid time."
-msgstr "Introduzca una hora v�lida."
-
-#: newforms/fields.py:226
-msgid "Enter a valid date/time."
-msgstr "Introduzca una fecha/hora v�lida."
-
-#: newforms/fields.py:240
-msgid "Enter a valid value."
-msgstr "Introduzca un valor v�lido."
-
-#: newforms/fields.py:287 newforms/fields.py:309
-msgid "Enter a valid URL."
-msgstr "Introduzca una URL v�lida."
-
-#: newforms/fields.py:311
-msgid "This URL appears to be a broken link."
-msgstr "La URL parece ser un enlace roto."
-
-#: newforms/fields.py:360 newforms/models.py:164
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-"Seleccione una opci�n v�lida. Esa opci�n no es una de las opciones "
-"disponibles."
-
-#: newforms/fields.py:378 newforms/fields.py:454 newforms/models.py:181
-msgid "Enter a list of values."
-msgstr "Introduzca una lista de valores."
-
-#: newforms/fields.py:387 newforms/models.py:187
-#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
-msgstr ""
-"Seleccione una opci�n v�lida. %s no es una de las opciones disponibles."
-
-#: oldforms/__init__.py:387
-#, 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 caracter."
-msgstr[1] "Aseg�rese de que su texto tiene menos de %s caracteres."
-
-#: oldforms/__init__.py:392
-msgid "Line breaks are not allowed here."
-msgstr "No se permiten saltos de l�nea."
-
-#: oldforms/__init__.py:493 oldforms/__init__.py:566 oldforms/__init__.py:605
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr "Seleccione una opci�n v�lida; '%(data)s' no est� en %(choices)s."
-
-#: oldforms/__init__.py:669
-msgid "The submitted file is empty."
-msgstr "El archivo enviado est� vac�o."
-
-#: oldforms/__init__.py:725
-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:735
-msgid "Enter a positive number."
-msgstr "Introduzca un n�mero positivo."
-
-#: oldforms/__init__.py:745
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Introduzca un n�mero entero entre 0 y 32.767."
+"v�lido. (La l�nea empieza con \"%(start)s\".)"
 
 #~ msgid "Use '[algo]$[salt]$[hexdigest]'"
 #~ msgstr "Use '[algoritmo]$[salt]$[hexdigest]'"
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 14b8a935a1..7250343b45 100644
Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 62f3b46c37..14fc0083b8 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -673,19 +673,19 @@ msgstr "L'URL est un lien cassé."
 
 #: contrib/humanize/templatetags/humanize.py:16
 msgid "th"
-msgstr "e"
+msgstr "<sup>e</sup>"
 
 #: contrib/humanize/templatetags/humanize.py:16
 msgid "st"
-msgstr "er"
+msgstr "<sup>er</sup>"
 
 #: contrib/humanize/templatetags/humanize.py:16
 msgid "nd"
-msgstr "d"
+msgstr "<sup>d</sup>"
 
 #: contrib/humanize/templatetags/humanize.py:16
 msgid "rd"
-msgstr "e"
+msgstr "<sup>e</sup>"
 
 #: contrib/humanize/templatetags/humanize.py:48
 #, python-format
@@ -1346,7 +1346,7 @@ msgstr "Sélectionnez %s pour changer"
 
 #: contrib/admin/views/main.py:768
 msgid "Database error"
-msgstr ""
+msgstr "Erreur de base de données"
 
 #: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48
 #: contrib/admin/views/doc.py:50
@@ -1391,7 +1391,7 @@ msgstr "les objets `%(label)s.%(type)s en relation"
 #: contrib/admin/views/doc.py:219
 #, python-format
 msgid "all %s"
-msgstr ""
+msgstr "tous les %s"
 
 #: contrib/admin/views/doc.py:224
 #, python-format
@@ -1401,7 +1401,7 @@ msgstr "nombre de %s"
 #: contrib/admin/views/doc.py:229
 #, python-format
 msgid "Fields on %s objects"
-msgstr ""
+msgstr "Champs sur les objets %s"
 
 #: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
 #: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
@@ -1613,7 +1613,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 ""
+msgstr "Quelque chose ne va pas avec votre base de données. Vérifiez que les"
+"bonnes bases ont été créées, et qu'elle est lisible par le bon utilisateur."
 
 #: contrib/admin/templates/admin/search_form.html:8
 msgid "Go"
@@ -1930,6 +1931,13 @@ msgid ""
 "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\">Pour installer des bookmarklets, faîtes glisser le lien vers\n"
+"votre barre de marques-pages, ou cliquez droit dessus et ajoutez-y le.\n"
+"Maintenant vous pouvez le sélectionner depuis n'importe quelle page\n"
+"du site. Notez que certains d'entre eux nécessitent que vous visionniez\n"
+"le site depuis un ordinateur dit \"interne\" (veuillez contacter votre\n"
+"administrateur système si vous n'êtes pas sûr que votre ordinateur le soit).</p>\n"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:19
 msgid "Documentation for this page"
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo
index 97b8f4145b..07d3994755 100644
Binary files a/django/conf/locale/ja/LC_MESSAGES/django.mo and b/django/conf/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po
index 46700505ba..ab761254ae 100644
--- a/django/conf/locale/ja/LC_MESSAGES/django.po
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@@ -1,5 +1,5 @@
 # Translation of django.po to japanese.
-# Copyright (C) 2005,2006 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2005,2006,2007 makoto tsuyuki
 # This file is distributed under the same license as the PACKAGE package.
 # makoto tsuyuki <mtsuyuki@gmail.com>, 2005,2006,2007.
 # 
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 23:43+0900\n"
+"POT-Creation-Date: 2007-03-26 22:51+0900\n"
 "PO-Revision-Date: 2006-05-18 00:28+0900\n"
 "Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
 "Language-Team: Japanese <django-ja@googlegroups.com>\n"
@@ -92,70 +92,82 @@ msgid "Japanese"
 msgstr "日本語"
 
 #: conf/global_settings.py:58
+msgid "Kannada"
+msgstr "カンナダ語"
+
+#: conf/global_settings.py:59
 msgid "Latvian"
 msgstr "ラトビア語"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
 msgid "Macedonian"
 msgstr "マケドニア語"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
+msgid "Portugese"
+msgstr "ポルトガル語"
+
+#: conf/global_settings.py:65
 msgid "Brazilian"
 msgstr "ブラジル語"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:66
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:67
 msgid "Russian"
 msgstr "ロシア語"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:68
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:69
 msgid "Slovenian"
 msgstr "スロヴェニア語"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:70
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:71
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
 msgid "Tamil"
 msgstr "タミル語"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
+msgid "Telugu"
+msgstr "テルグ語"
+
+#: conf/global_settings.py:74
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:75
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:76
 msgid "Simplified Chinese"
 msgstr "簡体字中国語"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:77
 msgid "Traditional Chinese"
 msgstr "繁体字中国語"
 
@@ -194,17 +206,17 @@ msgid "This year"
 msgstr "今年"
 
 #: contrib/admin/filterspecs.py:143 newforms/widgets.py:170
-#: oldforms/__init__.py:572
+#: oldforms/__init__.py:577
 msgid "Yes"
 msgstr "はい"
 
 #: contrib/admin/filterspecs.py:143 newforms/widgets.py:170
-#: oldforms/__init__.py:572
+#: oldforms/__init__.py:577
 msgid "No"
 msgstr "いいえ"
 
 #: contrib/admin/filterspecs.py:150 newforms/widgets.py:170
-#: oldforms/__init__.py:572
+#: oldforms/__init__.py:577
 msgid "Unknown"
 msgstr "不明"
 
@@ -568,7 +580,8 @@ msgstr "確認のため、再度パスワードを入力してください。"
 #: 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 "<strong>%(username)s</strong>さんの新しいパスワードを入力してください。"
+msgstr ""
+"<strong>%(username)s</strong>さんの新しいパスワードを入力してください。"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Bookmarklets"
@@ -602,7 +615,6 @@ msgstr ""
 msgid "Documentation for this page"
 msgstr "このページのドキュメント"
 
-# TODO
 #: contrib/admin/templates/admin_doc/bookmarklets.html:20
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
@@ -769,7 +781,7 @@ msgstr "現在:"
 msgid "Change:"
 msgstr "変更:"
 
-#: contrib/admin/templatetags/admin_list.py:238
+#: contrib/admin/templatetags/admin_list.py:247
 msgid "All dates"
 msgstr "いつでも"
 
@@ -850,13 +862,13 @@ msgstr "アプリケーション %r が見つかりません"
 
 #: contrib/admin/views/doc.py:171
 #, python-format
-msgid "Model %r not found in app %r"
-msgstr "モデル %r が %r アプリケーションに見つかりません"
+msgid "Model %(name)r not found in app %(label)r"
+msgstr "モデル %(name)r が %(label)r アプリケーションに見つかりません"
 
 #: contrib/admin/views/doc.py:183
 #, python-format
-msgid "the related `%s.%s` object"
-msgstr "`%s.%s` (関連オブジェクト)"
+msgid "the related `%(label)s.%(type)s` object"
+msgstr "`%(label)s.%(type)s` (関連オブジェクト)"
 
 #: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205
 #: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224
@@ -865,8 +877,8 @@ msgstr "モデル :"
 
 #: contrib/admin/views/doc.py:214
 #, python-format
-msgid "related `%s.%s` objects"
-msgstr "`%s.%s` (関連オブジェクト)"
+msgid "related `%(label)s.%(name)s` objects"
+msgstr "`%(label)s.%(name)s` (関連オブジェクト)"
 
 #: contrib/admin/views/doc.py:219
 #, python-format
@@ -984,7 +996,7 @@ msgid "Added %s."
 msgstr "%s を追加しました。"
 
 #: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337
-#: contrib/admin/views/main.py:339 db/models/manipulators.py:306
+#: contrib/admin/views/main.py:339 db/models/manipulators.py:308
 msgid "and"
 msgstr "と"
 
@@ -1018,41 +1030,41 @@ msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます
 msgid "Change %s"
 msgstr "%s を変更"
 
-#: contrib/admin/views/main.py:473
+#: contrib/admin/views/main.py:476
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s"
 
-#: contrib/admin/views/main.py:478
+#: contrib/admin/views/main.py:481
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
 
-#: contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:514
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" を削除しました。"
 
-#: contrib/admin/views/main.py:514
+#: contrib/admin/views/main.py:517
 msgid "Are you sure?"
 msgstr "よろしいですか？"
 
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:539
 #, python-format
 msgid "Change history: %s"
 msgstr "変更履歴: %s"
 
-#: contrib/admin/views/main.py:570
+#: contrib/admin/views/main.py:573
 #, python-format
 msgid "Select %s"
 msgstr "%s を選択"
 
-#: contrib/admin/views/main.py:570
+#: contrib/admin/views/main.py:573
 #, python-format
 msgid "Select %s to change"
 msgstr "変更する %s を選択"
 
-#: contrib/admin/views/main.py:758
+#: contrib/admin/views/main.py:768
 msgid "Database error"
 msgstr "データベースエラー"
 
@@ -1147,8 +1159,8 @@ msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
 msgstr ""
-"'[algo]$[salt]$[hexdigest]'形式か、"
-"<a href=\"password/\">パスワード変更フォーム</a>を使ってください。"
+"'[algo]$[salt]$[hexdigest]'形式か、<a href=\"password/\">パスワード変更フォー"
+"ム</a>を使ってください。"
 
 #: contrib/auth/models.py:95
 msgid "staff status"
@@ -1517,15 +1529,15 @@ msgstr "コメント ID が不正です"
 msgid "No voting for yourself"
 msgstr "自分には投票できません。"
 
-#: contrib/contenttypes/models.py:26
+#: contrib/contenttypes/models.py:36
 msgid "python model class name"
 msgstr "Python モデルクラス名"
 
-#: contrib/contenttypes/models.py:29
+#: contrib/contenttypes/models.py:39
 msgid "content type"
 msgstr "コンテンツタイプ"
 
-#: contrib/contenttypes/models.py:30
+#: contrib/contenttypes/models.py:40
 msgid "content types"
 msgstr "コンテンツタイプ"
 
@@ -1575,7 +1587,281 @@ msgstr "フラットページ"
 msgid "flat pages"
 msgstr "フラットページ"
 
-#: contrib/localflavor/usa/forms.py:13
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "th"
+msgstr "番目"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "st"
+msgstr "番目"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "nd"
+msgstr "番目"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "rd"
+msgstr "番目"
+
+#: contrib/humanize/templatetags/humanize.py:47
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f 百万"
+msgstr[1] "%(value).1f 百万"
+
+#: contrib/humanize/templatetags/humanize.py:50
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f 十億"
+msgstr[1] "%(value).1f 十億"
+
+#: contrib/humanize/templatetags/humanize.py:53
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f 兆"
+msgstr[1] "%(value).1f 兆"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "one"
+msgstr "1"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "two"
+msgstr "2"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "three"
+msgstr "3"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "four"
+msgstr "4"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "five"
+msgstr "5"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "six"
+msgstr "6"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "seven"
+msgstr "7"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "eight"
+msgstr "8"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "nine"
+msgstr "9"
+
+#: contrib/localflavor/fr/forms.py:17
+#, fuzzy
+msgid "Enter a zip code in the format XXXXX."
+msgstr "XXXXXの形式でZipコードを入力してください。"
+
+#: contrib/localflavor/jp/forms.py:21
+msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
+msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。"
+
+#: contrib/localflavor/jp/jp_prefectures.py:4
+msgid "Hokkaido"
+msgstr "北海道"
+
+#: contrib/localflavor/jp/jp_prefectures.py:5
+msgid "Aomori"
+msgstr "青森県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:6
+msgid "Iwate"
+msgstr "岩手県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:7
+msgid "Miyagi"
+msgstr "宮城県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:8
+msgid "Akita"
+msgstr "秋田県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:9
+msgid "Yamagata"
+msgstr "山形県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:10
+msgid "Fukushima"
+msgstr "福島県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:11
+msgid "Ibaraki"
+msgstr "茨城県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:12
+msgid "Tochigi"
+msgstr "栃木県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:13
+msgid "Gunma"
+msgstr "群馬県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:14
+msgid "Saitama"
+msgstr "埼玉県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:15
+msgid "Chiba"
+msgstr "千葉県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:16
+msgid "Tokyo"
+msgstr "東京都"
+
+#: contrib/localflavor/jp/jp_prefectures.py:17
+msgid "Kanagawa"
+msgstr "神奈川県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:18
+msgid "Yamanashi"
+msgstr "山梨県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:19
+msgid "Nagano"
+msgstr "長野県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:20
+msgid "Niigata"
+msgstr "新潟県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:21
+msgid "Toyama"
+msgstr "富山県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:22
+msgid "Ishikawa"
+msgstr "石川県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:23
+msgid "Fukui"
+msgstr "福井県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:24
+msgid "Gifu"
+msgstr "岐阜県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:25
+msgid "Shizuoka"
+msgstr "静岡県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:26
+msgid "Aichi"
+msgstr "愛知県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:27
+msgid "Mie"
+msgstr "三重県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:28
+msgid "Shiga"
+msgstr "滋賀県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:29
+msgid "Kyoto"
+msgstr "京都府"
+
+#: contrib/localflavor/jp/jp_prefectures.py:30
+msgid "Osaka"
+msgstr "大阪府"
+
+#: contrib/localflavor/jp/jp_prefectures.py:31
+msgid "Hyogo"
+msgstr "兵庫県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:32
+msgid "Nara"
+msgstr "奈良県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:33
+msgid "Wakayama"
+msgstr "和歌山県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:34
+msgid "Tottori"
+msgstr "鳥取県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:35
+msgid "Shimane"
+msgstr "島根県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:36
+msgid "Okayama"
+msgstr "岡山県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:37
+msgid "Hiroshima"
+msgstr "広島県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:38
+msgid "Yamaguchi"
+msgstr "山口県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:39
+msgid "Tokushima"
+msgstr "徳島県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:40
+msgid "Kagawa"
+msgstr "香川県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:41
+msgid "Ehime"
+msgstr "愛媛県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:42
+msgid "Kochi"
+msgstr "高知県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:43
+msgid "Fukuoka"
+msgstr "福岡県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:44
+msgid "Saga"
+msgstr "佐賀県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:45
+msgid "Nagasaki"
+msgstr "長崎県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:46
+msgid "Kumamoto"
+msgstr "熊本県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:47
+msgid "Oita"
+msgstr "大分県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:48
+msgid "Miyazaki"
+msgstr "宮崎県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:49
+msgid "Kagoshima"
+msgstr "鹿児島県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:50
+msgid "Okinawa"
+msgstr "沖縄県"
+
+#: contrib/localflavor/uk/forms.py:18
+msgid "Enter a postcode. A space is required between the two postcode parts."
+msgstr "ポスタルコードを入力してください。コードとコードの間は半角のスペースで区切ってください。"
+
+#: contrib/localflavor/usa/forms.py:17
 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
 msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。"
 
@@ -1607,23 +1893,23 @@ msgstr "リダイレクト"
 msgid "redirects"
 msgstr "リダイレクト"
 
-#: contrib/sessions/models.py:51
+#: contrib/sessions/models.py:68
 msgid "session key"
 msgstr "セッションキー"
 
-#: contrib/sessions/models.py:52
+#: contrib/sessions/models.py:69
 msgid "session data"
 msgstr "セッションデータ"
 
-#: contrib/sessions/models.py:53
+#: contrib/sessions/models.py:70
 msgid "expire date"
 msgstr "有効期限"
 
-#: contrib/sessions/models.py:57
+#: contrib/sessions/models.py:74
 msgid "session"
 msgstr "セッション"
 
-#: contrib/sessions/models.py:58
+#: contrib/sessions/models.py:75
 msgid "sessions"
 msgstr "セッション"
 
@@ -1704,31 +1990,31 @@ msgstr "1900年以降を指定してください。"
 
 #: core/validators.py:143
 #, python-format
-msgid "Invalid date: %s."
+msgid "Invalid date: %s"
 msgstr "無効な日付: %s"
 
-#: core/validators.py:147 db/models/fields/__init__.py:454
+#: core/validators.py:148 db/models/fields/__init__.py:457
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "YYYY-MM-DD形式で日付を入力してください。"
 
-#: core/validators.py:152
+#: core/validators.py:153
 msgid "Enter a valid time in HH:MM format."
 msgstr "HH:MM形式で時刻を入力してください。"
 
-#: core/validators.py:156 db/models/fields/__init__.py:521
+#: core/validators.py:157 db/models/fields/__init__.py:526
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
 msgstr "YYYY-MM-DD HH:MM形式で日時を入力してください。"
 
-#: core/validators.py:161 newforms/fields.py:269
+#: core/validators.py:162 newforms/fields.py:269
 msgid "Enter a valid e-mail address."
 msgstr "有効なメールアドレスを入力してください。"
 
-#: core/validators.py:173 core/validators.py:442 oldforms/__init__.py:667
+#: core/validators.py:174 core/validators.py:445 oldforms/__init__.py:672
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "ファイルが取得できませんでした。formのencoding typeを確認してください。"
 
-#: core/validators.py:177
+#: core/validators.py:178
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -1736,26 +2022,26 @@ msgstr ""
 "画像をアップロードしてください。アップロードした画像は画像でないか、または壊"
 "れています。"
 
-#: core/validators.py:184
+#: core/validators.py:185
 #, python-format
 msgid "The URL %s does not point to a valid image."
 msgstr "URL ( %s )  は画像ではありません。"
 
-#: core/validators.py:188
+#: core/validators.py:189
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr "電話番号は XXX-XXX-XXXX 形式で入力してください。\"%s\" は無効です。"
 
-#: core/validators.py:196
+#: core/validators.py:197
 #, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
 msgstr "URL ( %s ) は QuickTime ビデオではありません。"
 
-#: core/validators.py:200
+#: core/validators.py:201
 msgid "A valid URL is required."
 msgstr "正しい URL を入力してください。"
 
-#: core/validators.py:214
+#: core/validators.py:215
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
@@ -1764,86 +2050,86 @@ msgstr ""
 "有効な HTML を入力してください。エラー:\n"
 "%s"
 
-#: core/validators.py:221
+#: core/validators.py:222
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "不正な XML です: %s"
 
-#: core/validators.py:238
+#: core/validators.py:239
 #, python-format
 msgid "Invalid URL: %s"
 msgstr "無効なURL: %s"
 
-#: core/validators.py:243 core/validators.py:245
+#: core/validators.py:244 core/validators.py:246
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL ( %s ) はリンクが壊れています。"
 
-#: core/validators.py:251
+#: core/validators.py:252
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "正しい米州略称を入力してください。"
 
-#: core/validators.py:265
+#: core/validators.py:266
 #, 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] "言葉使いに気を付けて！ %s という言葉は使えません。"
 msgstr[1] "言葉使いに気を付けて！ %s という言葉は使えません。"
 
-#: core/validators.py:272
+#: core/validators.py:273
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "このフィールドは '%s' フィールドと一致せねばなりません。"
 
-#: core/validators.py:291
+#: core/validators.py:292
 msgid "Please enter something for at least one field."
 msgstr "少なくとも一つのフィールドに何か入力してください。"
 
-#: core/validators.py:300 core/validators.py:311
+#: core/validators.py:301 core/validators.py:312
 msgid "Please enter both fields or leave them both empty."
 msgstr "両方のフィールドに入力するか、両方とも未入力にしてください。"
 
-#: core/validators.py:318
+#: core/validators.py:320
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""
 "%(field)s を %(value)s にするのなら、このフィールドに必ず入力してください。"
 
-#: core/validators.py:330
+#: core/validators.py:333
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 "%(field)s を %(value)s にしないのなら、このフィールドに必ず入力してください。"
 
-#: core/validators.py:349
+#: core/validators.py:352
 msgid "Duplicate values are not allowed."
 msgstr "重複する値は認められません。"
 
-#: core/validators.py:364
+#: core/validators.py:367
 #, python-format
-msgid "This value must be between %s and %s."
-msgstr "この値は %s から %s の間でなければなりません。"
+msgid "This value must be between %(lower)s and %(upper)s."
+msgstr "この値は %(lower)s から %(upper)s の間でなければなりません。"
 
-#: core/validators.py:366
+#: core/validators.py:369
 #, python-format
 msgid "This value must be at least %s."
 msgstr "この値は %s 以上でなければなりません。"
 
-#: core/validators.py:368
+#: core/validators.py:371
 #, python-format
 msgid "This value must be no more than %s."
 msgstr "この値は %s より小さくなければなりません。"
 
-#: core/validators.py:404
+#: core/validators.py:407
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "この値は %s の累乗でなければなりません。"
 
-#: core/validators.py:415
+#: core/validators.py:418
 msgid "Please enter a valid decimal number."
 msgstr "有効な 10 進数を入力してください。"
 
-#: core/validators.py:419
+#: core/validators.py:422
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -1851,7 +2137,7 @@ msgid_plural ""
 msgstr[0] "全体で %s 文字以下の数字を入力してください。"
 msgstr[1] "全体で %s 文字以下の数字を入力してください。"
 
-#: core/validators.py:422
+#: core/validators.py:425
 #, python-format
 msgid ""
 "Please enter a valid decimal number with a whole part of at most %s digit."
@@ -1860,7 +2146,7 @@ msgid_plural ""
 msgstr[0] "整数部は %s 文字以下の数字を入力してください。"
 msgstr[1] "整数部は %s 文字以下の数字を入力してください。"
 
-#: core/validators.py:425
+#: core/validators.py:428
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -1868,37 +2154,37 @@ msgid_plural ""
 msgstr[0] "小数部は %s 文字以下の数字を入力してください。"
 msgstr[1] "小数部は %s 文字以下の数字を入力してください。"
 
-#: core/validators.py:435
+#: core/validators.py:438
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "アップロードするファイルの大きさは %s バイト以上にしてください。"
 
-#: core/validators.py:436
+#: core/validators.py:439
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "アップロードするファイルの大きさは %s 最大バイトまでです。"
 
-#: core/validators.py:453
+#: core/validators.py:456
 msgid "The format for this field is wrong."
 msgstr "フィールドの形式が正しくありません。"
 
-#: core/validators.py:468
+#: core/validators.py:471
 msgid "This field is invalid."
 msgstr "このフィールドは無効です。"
 
-#: core/validators.py:504
+#: core/validators.py:507
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "%s から何も検索できませんでした。"
 
-#: core/validators.py:507
+#: core/validators.py:510
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 "URL %(url)s は無効なコンテンツタイプヘッダ '%(contenttype)s' を返しました。"
 
-#: core/validators.py:540
+#: core/validators.py:543
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -1907,7 +2193,7 @@ msgstr ""
 "%(line)s 行目から始まる %(tag)s タグを閉じてください (\"%(start)s\" で始まる"
 "行です)。"
 
-#: core/validators.py:544
+#: core/validators.py:547
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -1916,7 +2202,7 @@ msgstr ""
 "%(line)s 行目から始まるテキストはこのコンテキストでは使えません。 (\"%(start)"
 "s\" で始まる行です)。"
 
-#: core/validators.py:549
+#: core/validators.py:552
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -1925,7 +2211,7 @@ msgstr ""
 "%(line)s 行目の \"%(attr)s\" は無効なアトリビュートです (\"%(start)s\" で始ま"
 "る行です)。"
 
-#: core/validators.py:554
+#: core/validators.py:557
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -1934,7 +2220,7 @@ msgstr ""
 "%(line)s 行目の \"<%(tag)s>\" は無効なタグです( \"%(start)s\" で始まる行で"
 "す)。"
 
-#: core/validators.py:558
+#: core/validators.py:561
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -1943,7 +2229,7 @@ msgstr ""
 "%(line)s 行目のタグは必須アトリビュートが未入力です( \"%(start)s\" で始まる行"
 "です)。"
 
-#: core/validators.py:563
+#: core/validators.py:566
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -1952,7 +2238,7 @@ msgstr ""
 "%(line)s 行目の \"%(attr)s\" アトリビュートの値が正しくありません (\"%(start)"
 "s\" で始まる行です) 。"
 
-#: db/models/manipulators.py:305
+#: db/models/manipulators.py:307
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
@@ -1963,29 +2249,33 @@ msgstr ""
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr "%(fieldname)s に %(optname)s は既に存在します。"
 
-#: db/models/fields/__init__.py:116 db/models/fields/__init__.py:273
-#: db/models/fields/__init__.py:605 db/models/fields/__init__.py:616
-#: newforms/fields.py:78 newforms/fields.py:373 newforms/fields.py:449
-#: newforms/fields.py:460 oldforms/__init__.py:352
+#: db/models/fields/__init__.py:117 db/models/fields/__init__.py:274
+#: db/models/fields/__init__.py:610 db/models/fields/__init__.py:621
+#: newforms/fields.py:78 newforms/fields.py:374 newforms/fields.py:450
+#: newforms/fields.py:461 newforms/models.py:177 oldforms/__init__.py:357
 msgid "This field is required."
 msgstr "このフィールドは必須です。"
 
-#: db/models/fields/__init__.py:366
+#: db/models/fields/__init__.py:367
 msgid "This value must be an integer."
 msgstr "値は整数でなければなりません。"
 
-#: db/models/fields/__init__.py:401
+#: db/models/fields/__init__.py:402
 msgid "This value must be either True or False."
 msgstr "値は真: True または偽: False でなければなりません。"
 
-#: db/models/fields/__init__.py:422
+#: db/models/fields/__init__.py:423
 msgid "This field cannot be null."
 msgstr "このフィールドには NULL を指定できません。"
 
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:630
 msgid "Enter a valid filename."
 msgstr "正しいファイル名を入力してください。"
 
+#: db/models/fields/__init__.py:751
+msgid "This value must be either None, True or False."
+msgstr "値は、空: None、真: True または偽: False でなければなりません。"
+
 #: db/models/fields/related.py:53
 #, python-format
 msgid "Please enter a valid %s."
@@ -2054,55 +2344,79 @@ msgstr "URLを正しく入力してください。"
 msgid "This URL appears to be a broken link."
 msgstr "このURLはリンクが壊れています。"
 
-#: newforms/fields.py:359
+#: newforms/fields.py:360 newforms/models.py:164
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "正しく選択してください。選択したものは候補にありません。"
 
-#: newforms/fields.py:377 newforms/fields.py:453
+#: newforms/fields.py:378 newforms/fields.py:454 newforms/models.py:181
 msgid "Enter a list of values."
 msgstr "リストを入力してください。"
 
-#: newforms/fields.py:386
+#: newforms/fields.py:387 newforms/models.py:187
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "正しく選択してください。 %s は候補にありません。"
 
-#: oldforms/__init__.py:387
+#: oldforms/__init__.py:392
 #, python-format
 msgid "Ensure your text is less than %s character."
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] "%s 字以下で入力してください。"
 msgstr[1] "%s 字以下で入力してください。"
 
-#: oldforms/__init__.py:392
+#: oldforms/__init__.py:397
 msgid "Line breaks are not allowed here."
 msgstr "改行はできません。"
 
-#: oldforms/__init__.py:493 oldforms/__init__.py:566 oldforms/__init__.py:605
+#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "正しく選択してください。; '%(data)s' は %(choices)s にありません。"
 
-#: oldforms/__init__.py:669
+#: oldforms/__init__.py:674
 msgid "The submitted file is empty."
 msgstr "入力されたファイルは空です。"
 
-#: oldforms/__init__.py:725
+#: oldforms/__init__.py:730
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "-32,768 から 32,767 までの整数を入力してください。"
 
-#: oldforms/__init__.py:735
+#: oldforms/__init__.py:740
 msgid "Enter a positive number."
 msgstr "正の数を入力してください。"
 
-#: oldforms/__init__.py:745
+#: oldforms/__init__.py:750
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "0 から 32,767 までの整数を入力してください。"
 
-#: template/defaultfilters.py:436
+#: template/defaultfilters.py:491
 msgid "yes,no,maybe"
 msgstr "はい,いいえ,たぶん"
 
+#: utils/dateformat.py:40
+msgid "p.m."
+msgstr "p.m."
+
+#: utils/dateformat.py:41
+msgid "a.m."
+msgstr "a.m."
+
+#: utils/dateformat.py:46
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:47
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:95
+msgid "midnight"
+msgstr "0時"
+
+#: utils/dateformat.py:97
+msgid "noon"
+msgstr "12時"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "月曜日"
diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo
index bddecacb10..45a4ff9f67 100644
Binary files a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.po b/django/conf/locale/ja/LC_MESSAGES/djangojs.po
index 0ec1cadcf5..d35b88aa73 100644
--- a/django/conf/locale/ja/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/ja/LC_MESSAGES/djangojs.po
@@ -1,14 +1,12 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Japanese translation for js.
+# Copyright (C) 2005 makoto tsuyuki
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-#, fuzzy
+# makoto tsuyuki <mtsuyuki@gmail.com>, 2005.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-06 00:30+0900\n"
+"POT-Creation-Date: 2007-03-26 23:41+0900\n"
 "PO-Revision-Date: 2006-05-08 13:39+0900\n"
 "Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
 "Language-Team: Japanese <django-ja@googlegroups.com>\n"
@@ -85,7 +83,7 @@ msgstr "時間を選択"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
 msgid "Midnight"
-msgstr "夜中"
+msgstr "0時"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
 msgid "6 a.m."
@@ -93,7 +91,7 @@ msgstr "午前 6 時"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
 msgid "Noon"
-msgstr "正午"
+msgstr "12時"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
diff --git a/django/conf/locale/te/LC_MESSAGES/django.mo b/django/conf/locale/te/LC_MESSAGES/django.mo
index 29360bb660..318ce76779 100644
Binary files a/django/conf/locale/te/LC_MESSAGES/django.mo and b/django/conf/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/te/LC_MESSAGES/django.po b/django/conf/locale/te/LC_MESSAGES/django.po
index 0057bf97de..b2e450c0a7 100644
--- a/django/conf/locale/te/LC_MESSAGES/django.po
+++ b/django/conf/locale/te/LC_MESSAGES/django.po
@@ -163,11 +163,11 @@ msgstr "ఫ్లాగ్ తేది "
 
 #: contrib/comments/models.py:268
 msgid "user flag"
-msgstr "యూఙర్ ఫ్లాగ్"
+msgstr "యూజర్ ఫ్లాగ్"
 
 #: contrib/comments/models.py:269
 msgid "user flags"
-msgstr "యూఙర్ ఫ్లాగులు"
+msgstr "యూజర్ ఫ్లాగులు"
 
 #: contrib/comments/models.py:273
 #, python-format
@@ -193,7 +193,7 @@ msgstr "మొదరేటర్ తీసివేసిన %r"
 
 #: contrib/comments/views/karma.py:19
 msgid "Anonymous users cannot vote"
-msgstr "అపరిచిత  యూఙరులు వోటు వేయలేరు"
+msgstr "అపరిచిత  యూజర్లు వోటు వేయలేరు"
 
 #: contrib/comments/views/karma.py:23
 msgid "Invalid comment ID"
@@ -220,12 +220,12 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
-"ఈ  వ్యాఖ్యానము చేసిన యూఙర్  %(count)లు కన్న తక్కువ  సమర్పించాడు  "
+"ఈ  వ్యాఖ్యానము చేసిన యూజర్  %(count)లు కన్న తక్కువ  సమర్పించాడు  "
 "వ్యాఖ్యానము:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
-"ఈ  వ్యాఖ్యానము చేసిన యూఙర్  %(count)లు కన్న తక్కువ  సమర్పించాడు"
+"ఈ  వ్యాఖ్యానము చేసిన యూజర్  %(count)లు కన్న తక్కువ  సమర్పించాడు"
 "వ్యాఖ్యానములు:\n"
 "\n"
 "%(text)s"
@@ -237,7 +237,7 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
-"ఈ  వ్యాఖ్యానము స్కెచి  యూఙర్ చేసాడు  :\n"
+"ఈ  వ్యాఖ్యానము స్కెచి  యూజర్ చేసాడు  :\n"
 "\n"
 "%(text)s"
 
@@ -274,7 +274,7 @@ msgstr "వ్యాఖ్యానము ఫార్మ్ లో 'ప్ర
 #: contrib/comments/templates/comments/form.html:8
 #: contrib/admin/templates/admin/login.html:17
 msgid "Username:"
-msgstr "యూఙర్ పేరు"
+msgstr "యూజర్ పేరు"
 
 #: contrib/comments/templates/comments/form.html:6
 #: contrib/admin/templates/admin/object_history.html:3
@@ -353,15 +353,15 @@ msgstr "అన్నీ"
 
 #: contrib/admin/filterspecs.py:109
 msgid "Any date"
-msgstr "ఏ రోఙైన"
+msgstr "ఏ రోజైన"
 
 #: contrib/admin/filterspecs.py:110
 msgid "Today"
-msgstr "ఈ రోఙు"
+msgstr "ఈ రోజు"
 
 #: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
-msgstr "గత  7 రోఙుల గా"
+msgstr "గత  7 రోజుల గా"
 
 #: contrib/admin/filterspecs.py:115
 msgid "This month"
@@ -413,13 +413,13 @@ msgstr "లాగ్ ఎంట్రీలు"
 
 #: contrib/admin/templatetags/admin_list.py:230
 msgid "All dates"
-msgstr "అన్నీ  రోఙులు"
+msgstr "అన్నీ  రోజులు"
 
 #: contrib/admin/views/decorators.py:10 contrib/auth/forms.py:59
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
-msgstr "దయచేసి సరైన  యూఙర్ పేరు పాస్ వర్డ్ ఇవ్వండి"
+msgstr "దయచేసి సరైన  యూజర్ పేరు పాస్ వర్డ్ ఇవ్వండి"
 
 #: contrib/admin/views/decorators.py:24
 #: contrib/admin/templates/admin/login.html:25
@@ -430,22 +430,22 @@ msgstr "లాగ్ ఇన్"
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
-msgstr "దయచేసి మళీ  లాగ్ ఇన్ అవ్వండి ఎందుకంటే మీ సేస్సన్  ముగిసింది . బాధపడకండి మీ సమర్పన దాచిపెట్టాము"
+msgstr "దయచేసి మళ్ళీ  లాగ్ ఇన్ అవ్వండి ఎందుకంటే మీ సేస్సన్  ముగిసింది . బాధపడకండి మీ సమర్పన దాచిపెట్టాము"
 
 #: 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 "మీ  బ్రౌఙర్ పై కుకీస్ అంగీకరించబడేటట్లు చేయలేదు . దయ చేసి  కుకీస్ ఎనేబల్ చేసి ,మళ్ళీ ట్రై చేయండి"
+msgstr "మీ  బ్రౌజర్ పై కుకీస్ అంగీకరించేటట్లు చేయలేదు . దయ చేసి  కుకీస్ ఎనేబల్ చేసి ,మళ్ళీ ట్రై చేయండి"
 
 #: contrib/admin/views/decorators.py:83
 msgid "Usernames cannot contain the '@' character."
-msgstr "యూఙర్ పేరు లో  '@' అక్షరము ఉందకూడడు"
+msgstr "యూజర్ పేరు లో  '@' అక్షరము ఉందకూడడు"
 
 #: contrib/admin/views/decorators.py:85
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "మీ ఈ మెయిల్ అడ్రస్   మీ యూఙర్ పేరు కాదు . '%s' ఇచ్చి చూడండి "
+msgstr "మీ ఈ మెయిల్ అడ్రస్   మీ యూజర్ పేరు కాదు . '%s' ఇచ్చి చూడండి "
 
 #: contrib/admin/views/main.py:223
 msgid "Site administration"
@@ -454,7 +454,7 @@ msgstr "సైట్ నిర్వాహన"
 #: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:17
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\"ఙయప్రదంగా కలపబడ్డడి"
+msgstr "%(name)s \"%(obj)s\"జయప్రదంగా కలపబడ్డడి"
 
 #: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347
 #: contrib/admin/views/auth.py:22
@@ -464,12 +464,12 @@ msgstr "మీరు  మళ్ళీ దీనినీ  క్రింద మ
 #: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356
 #, python-format
 msgid "You may add another %s below."
-msgstr "మీరు ఇంకొక   %s ని  క్రింద ఙత చేయొచ్చు"
+msgstr "మీరు ఇంకొక   %s ని  క్రింద జత చేయొచ్చు"
 
 #: contrib/admin/views/main.py:289
 #, python-format
 msgid "Add %s"
-msgstr "%s ని ఙత చేయండి "
+msgstr "%s ని జత చేయండి "
 
 #: contrib/admin/views/main.py:335
 #, python-format
@@ -493,17 +493,17 @@ msgstr "%s తీసివేయబడ్డడి"
 
 #: contrib/admin/views/main.py:342
 msgid "No fields changed."
-msgstr "మార్చబడలేదు"
+msgstr "ఫీల్డ్స్  ఏమి మార్చబడలేదు"
 
 #: contrib/admin/views/main.py:345
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ఙయప్రదంగా మార్చబడిండి"
+msgstr "%(name)s \"%(obj)s\" జయప్రదంగా మార్చబడిండి"
 
 #: contrib/admin/views/main.py:353
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "%(name)s \"%(obj)s\" ఙయప్రదంగా కలపబడ్డడి  .మీరు  మళ్ళీ దీనినీ  క్రింద మార్చవచ్చు"
+msgstr "%(name)s \"%(obj)s\" జయప్రదంగా కలపబడ్డడి  .మీరు  మళ్ళీ దీనినీ  క్రింద మార్చవచ్చు"
 
 #: contrib/admin/views/main.py:391
 #, python-format
@@ -523,7 +523,7 @@ msgstr "ఒకటి కాని ,అంత కన్నఎక్కువ   %(
 #: contrib/admin/views/main.py:511
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)లు \"%(obj)s\"ఙయప్రదంగా తీసివేయబడ్డడి"
+msgstr "%(name)లు \"%(obj)s\"జయప్రదంగా తీసివేయబడ్డడి"
 
 #: contrib/admin/views/main.py:514
 msgid "Are you sure?"
@@ -601,7 +601,7 @@ msgstr ""
 #: contrib/admin/views/doc.py:229
 #, python-format
 msgid "Fields on %s objects"
-msgstr "వస్తువు"
+msgstr "%s వస్తువులలో ఫీల్డ్స్   "
 
 #: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
 #: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
@@ -682,7 +682,7 @@ msgstr ""
 
 #: contrib/admin/views/auth.py:28
 msgid "Add user"
-msgstr "యూఙర్"
+msgstr "యూజర్ ని జత చేయండి"
 
 #: contrib/admin/templates/admin/object_history.html:3
 #: contrib/admin/templates/admin/change_list.html:5
@@ -742,7 +742,7 @@ msgstr "తేది/వేళ"
 
 #: contrib/admin/templates/admin/object_history.html:19
 msgid "User"
-msgstr "యూఙర్"
+msgstr "యూజర్"
 
 #: contrib/admin/templates/admin/object_history.html:20
 msgid "Action"
@@ -760,11 +760,11 @@ msgstr ""
 
 #: contrib/admin/templates/admin/base_site.html:4
 msgid "Django site admin"
-msgstr "డ్ఙాంగొ యొక్క నిర్వాహనదారులు"
+msgstr "డ్జాంగొ యొక్క నిర్వాహనదారులు"
 
 #: contrib/admin/templates/admin/base_site.html:7
 msgid "Django administration"
-msgstr "డ్ఙాంగొ నిర్వాహన"
+msgstr "డ్జాంగొ నిర్వాహన"
 
 #: contrib/admin/templates/admin/500.html:4
 msgid "Server error"
@@ -782,16 +782,16 @@ msgstr "సర్వర్ తప్పు <em>(500)</em>"
 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 "తప్పు  ఙరిగిండి .  దానిని  నిర్వాహనాధికారులు కి ఈ మెయిల్  చేయబడ్డడి,మీ ఓపిక కి ధన్యవాదములు"
+msgstr "తప్పు  జరిగిండి .  దానిని  నిర్వాహనాధికారులు కి ఈ మెయిల్  చేయబడ్డడి,మీ ఓపిక కి ధన్యవాదములు"
 
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
 msgid "Page not found"
-msgstr "పేఙి  దొరకలేదు"
+msgstr "పేజి  దొరకలేదు"
 
 #: contrib/admin/templates/admin/404.html:10
 msgid "We're sorry, but the requested page could not be found."
-msgstr "క్షమించండి మీరు కోరిన పేఙి దొరకలేడు"
+msgstr "క్షమించండి మీరు కోరిన పేజి దొరకలేడు"
 
 #: contrib/admin/templates/admin/index.html:17
 #, python-format
@@ -801,12 +801,12 @@ msgstr "మొడల్ లు %(name)లో  దొరికే అప్ప్
 #: contrib/admin/templates/admin/index.html:18
 #, python-format
 msgid "%(name)s"
-msgstr ""
+msgstr "%(name)లు"
 
 #: contrib/admin/templates/admin/index.html:28
 #: contrib/admin/templates/admin/change_form.html:15
 msgid "Add"
-msgstr "ఙత చేయి"
+msgstr "జత చేయి"
 
 #: contrib/admin/templates/admin/index.html:34
 msgid "Change"
@@ -831,7 +831,7 @@ msgstr "ఏమి  దొరకలేదు"
 #: contrib/admin/templates/admin/change_list.html:11
 #, python-format
 msgid "Add %(name)s"
-msgstr "%(name)లు ఙత చేయు"
+msgstr "%(name)లు జత చేయు"
 
 #: contrib/admin/templates/admin/login.html:22
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
@@ -943,7 +943,7 @@ msgstr ""
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:12
 msgid "Username"
-msgstr "యూఙర్ పేరు"
+msgstr "యూజర్ పేరు"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:18
 msgid "Password"
@@ -967,7 +967,7 @@ msgstr "పాస్ వర్డ్ మార్పు"
 #: contrib/admin/templates/registration/password_change_done.html:6
 #: contrib/admin/templates/registration/password_change_done.html:10
 msgid "Password change successful"
-msgstr "పాస్ వర్డ్ మార్పు ఙయప్రదమైండి "
+msgstr "పాస్ వర్డ్ మార్పు జయప్రదమైండి "
 
 #: contrib/admin/templates/registration/password_change_done.html:12
 msgid "Your password was changed."
@@ -1005,7 +1005,7 @@ msgstr "మళ్ళీ లాగ్ ఇన్ అవ్వండి"
 #: contrib/admin/templates/registration/password_reset_done.html:6
 #: contrib/admin/templates/registration/password_reset_done.html:10
 msgid "Password reset successful"
-msgstr "పాస్ వర్డ్ రీసెట్  ఙయప్రదమైండి"
+msgstr "పాస్ వర్డ్ రీసెట్  జయప్రదమైండి"
 
 #: contrib/admin/templates/registration/password_reset_done.html:12
 msgid ""
@@ -1051,11 +1051,11 @@ msgstr "మీ  కొత్త పాస్ వర్డ్ : %(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 "నిస్సందేహము గా ఈ పేఙి క్ కి వెళ్ళి పాస్ వర్డ్  మార్చుకోండి "
+msgstr "నిస్సందేహము గా ఈ పేజి క్ కి వెళ్ళి పాస్ వర్డ్  మార్చుకోండి "
 
 #: contrib/admin/templates/registration/password_reset_email.html:11
 msgid "Your username, in case you've forgotten:"
-msgstr "మీ యూఙర్ పేరు, ఒక వేళ మర్చిపోయి ఉంటే "
+msgstr "మీ యూజర్ పేరు, ఒక వేళ మర్చిపోయి ఉంటే "
 
 #: contrib/admin/templates/registration/password_reset_email.html:13
 msgid "Thanks for using our site!"
@@ -1103,19 +1103,19 @@ msgstr "వస్తువు ఇడి చూడండి"
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
-msgstr "వస్తువు"
+msgstr ""
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Edit this object (current window)"
-msgstr "వస్తువు"
+msgstr "వస్తువు ని మార్చండి (ప్రస్తుత విండొ)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:26
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "వస్తువు"
+msgstr ""
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:28
 msgid "Edit this object (new window)"
-msgstr "వస్తువు"
+msgstr "వస్తువు ని మార్చండి(కొత్త విండొ) "
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:29
 msgid "As above, but opens the admin page in a new window."
@@ -1197,7 +1197,7 @@ msgstr "నమొదు చేయటము అవసరం"
 
 #: contrib/flatpages/models.py:14
 msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "ఇది చెక్ చేసి ఉంటే కేవలం లాగ్గడ్ ఇన్ యూఙర్లు పేఙి చూడలేస్తారు"
+msgstr "ఇది చెక్ చేసి ఉంటే కేవలం లాగ్గడ్ ఇన్ యూజర్లు పేజి చూడలేస్తారు"
 
 #: contrib/flatpages/models.py:18
 msgid "flat page"
@@ -1237,7 +1237,7 @@ msgstr "గుంపులు"
 
 #: contrib/auth/models.py:90
 msgid "username"
-msgstr "యూఙర్ పేరు"
+msgstr "యూజర్ పేరు"
 
 #: contrib/auth/models.py:90
 msgid ""
@@ -1309,15 +1309,15 @@ msgstr ""
 
 #: contrib/auth/models.py:102
 msgid "user permissions"
-msgstr "యూఙర్  అనుమతులు"
+msgstr "యూజర్  అనుమతులు"
 
 #: contrib/auth/models.py:105
 msgid "user"
-msgstr "యూఙర్"
+msgstr "యూజర్"
 
 #: contrib/auth/models.py:106
 msgid "users"
-msgstr "యూఙర్లు"
+msgstr "యూజర్లు"
 
 #: contrib/auth/models.py:111
 msgid "Personal info"
@@ -1427,7 +1427,7 @@ msgstr "ఆదివారము"
 
 #: utils/dates.py:14
 msgid "January"
-msgstr "ఙాన్వరి "
+msgstr "జాన్వరి "
 
 #: utils/dates.py:14
 msgid "February"
@@ -1447,11 +1447,11 @@ msgstr "మే"
 
 #: utils/dates.py:14 utils/dates.py:27
 msgid "June"
-msgstr "ఙూను"
+msgstr "జూను"
 
 #: utils/dates.py:15 utils/dates.py:27
 msgid "July"
-msgstr "ఙులై"
+msgstr "జులై"
 
 #: utils/dates.py:15
 msgid "August"
@@ -1475,7 +1475,7 @@ msgstr "డిసెంబర్"
 
 #: utils/dates.py:19
 msgid "jan"
-msgstr "ఙాన్"
+msgstr "జాన్"
 
 #: utils/dates.py:19
 msgid "feb"
@@ -1495,11 +1495,11 @@ msgstr "మే"
 
 #: utils/dates.py:19
 msgid "jun"
-msgstr "ఙూన్"
+msgstr "జూన్"
 
 #: utils/dates.py:20
 msgid "jul"
-msgstr "ఙుల్"
+msgstr "జుల్"
 
 #: utils/dates.py:20
 msgid "aug"
@@ -1523,7 +1523,7 @@ msgstr "డిస్"
 
 #: utils/dates.py:27
 msgid "Jan."
-msgstr "ఙాన్"
+msgstr "జాన్"
 
 #: utils/dates.py:27
 msgid "Feb."
@@ -1570,8 +1570,8 @@ msgstr[1] "వారాలు"
 #: utils/timesince.py:15
 msgid "day"
 msgid_plural "days"
-msgstr[0] "రోఙు"
-msgstr[1] "రోఙులు"
+msgstr[0] "రోజు"
+msgstr[1] "రోజులు"
 
 #: utils/timesince.py:16
 msgid "hour"
@@ -1615,7 +1615,7 @@ msgstr "బెంగాలి"
 
 #: conf/global_settings.py:41
 msgid "Czech"
-msgstr "క్ఙెఖ్"
+msgstr "క్జెఖ్"
 
 #: conf/global_settings.py:42
 msgid "Welsh"
@@ -1627,7 +1627,7 @@ msgstr "డానిశ్"
 
 #: conf/global_settings.py:44
 msgid "German"
-msgstr "ఙెర్మన్"
+msgstr "జెర్మన్"
 
 #: conf/global_settings.py:45
 msgid "Greek"
@@ -1643,7 +1643,7 @@ msgstr "స్పానిష్"
 
 #: conf/global_settings.py:48
 msgid "Argentinean Spanish"
-msgstr "అర్ఙంటీనా స్పానిష్"
+msgstr "అర్జంటీనా స్పానిష్"
 
 #: conf/global_settings.py:49
 msgid "Finnish"
@@ -1675,7 +1675,7 @@ msgstr "ఇటాలియవ్"
 
 #: conf/global_settings.py:56
 msgid "Japanese"
-msgstr "ఙపనీస్"
+msgstr "జపనీస్"
 
 #: conf/global_settings.py:57
 msgid "Dutch"
@@ -1683,11 +1683,11 @@ msgstr "డట్చ్"
 
 #: conf/global_settings.py:58
 msgid "Norwegian"
-msgstr "నార్వీఙియన్"
+msgstr "నార్వీజియన్"
 
 #: conf/global_settings.py:59
 msgid "Brazilian"
-msgstr "బ్రఙీలియన్"
+msgstr "బ్రజీలియన్"
 
 #: conf/global_settings.py:60
 msgid "Romanian"
@@ -1865,7 +1865,7 @@ msgstr ""
 
 #: core/validators.py:242
 msgid "Enter a valid U.S. state abbreviation."
-msgstr "దయచేసి  సరైన అగ్ర రాఙ్య  సంక్షేపము చేసిన  రాష్ట్రము పేరు ఇవ్వండి"
+msgstr "దయచేసి  సరైన అగ్ర రాజ్య  సంక్షేపము చేసిన  రాష్ట్రము పేరు ఇవ్వండి"
 
 #: core/validators.py:256
 #, python-format
@@ -2004,12 +2004,12 @@ msgstr ""
 #: views/generic/create_update.py:43
 #, python-format
 msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)లు ఙయప్రదంగా తయారయింది"
+msgstr "%(verbose_name)లు జయప్రదంగా తయారయింది"
 
 #: views/generic/create_update.py:117
 #, python-format
 msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)లు ఙయప్రదంగా  @@"
+msgstr "%(verbose_name)లు జయప్రదంగా  @@"
 
 #: views/generic/create_update.py:184
 #, python-format
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 4f4f0b7538..c3aa863892 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -45,7 +45,7 @@ class Permission(models.Model):
         ordering = ('content_type', 'codename')
 
     def __str__(self):
-        return "%s | %s" % (self.content_type, self.name)
+        return "%s | %s | %s" % (self.content_type.app_label, self.content_type, self.name)
 
 class Group(models.Model):
     """Groups are a generic way of categorizing users to apply permissions, or some other label, to those users. A user can belong to any number of groups.
diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py
index bc2a392121..8d0b2c0d90 100644
--- a/django/contrib/flatpages/models.py
+++ b/django/contrib/flatpages/models.py
@@ -4,7 +4,7 @@ from django.contrib.sites.models import Site
 from django.utils.translation import gettext_lazy as _
 
 class FlatPage(models.Model):
-    url = models.CharField(_('URL'), maxlength=100, validator_list=[validators.isAlphaNumericURL],
+    url = models.CharField(_('URL'), maxlength=100, validator_list=[validators.isAlphaNumericURL], db_index=True,
         help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes."))
     title = models.CharField(_('title'), maxlength=200)
     content = models.TextField(_('content'))
diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py
index a399e7eef1..a16cbcc9bb 100644
--- a/django/contrib/humanize/templatetags/humanize.py
+++ b/django/contrib/humanize/templatetags/humanize.py
@@ -43,7 +43,7 @@ def intword(value):
     if value < 1000000:
         return value
     if value < 1000000000:
-    	new_value = value / 1000000.0
+        new_value = value / 1000000.0
         return ngettext('%(value).1f million', '%(value).1f million', new_value) % {'value': new_value}
     if value < 1000000000000:
         new_value = value / 1000000000.0
diff --git a/django/contrib/localflavor/fi/__init__.py b/django/contrib/localflavor/fi/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/contrib/localflavor/fi/fi_municipalities.py b/django/contrib/localflavor/fi/fi_municipalities.py
new file mode 100644
index 0000000000..965a52d327
--- /dev/null
+++ b/django/contrib/localflavor/fi/fi_municipalities.py
@@ -0,0 +1,427 @@
+# -*- coding: utf-8 -*-
+"""
+An alphabetical list of Finnish municipalities for use as `choices` in a
+formfield.
+
+This exists in this standalone file so that it's only imported into memory
+when explicitly needed.
+"""
+
+MUNICIPALITY_CHOICES = (
+    ('akaa', u"Akaa"),
+    ('alaharma', u"Alahärmä"),
+    ('alajarvi', u"Alajärvi"),
+    ('alastaro', u"Alastaro"),
+    ('alavieska', u"Alavieska"),
+    ('alavus', u"Alavus"),
+    ('anjalankoski', u"Anjalankoski"),
+    ('artjarvi', u"Artjärvi"),
+    ('asikkala', u"Asikkala"),
+    ('askainen', u"Askainen"),
+    ('askola', u"Askola"),
+    ('aura', u"Aura"),
+    ('brando', u"Brändö"),
+    ('dragsfjard', u"Dragsfjärd"),
+    ('eckero', u"Eckerö"),
+    ('elimaki', u"Elimäki"),
+    ('eno', u"Eno"),
+    ('enonkoski', u"Enonkoski"),
+    ('enontekio', u"Enontekiö"),
+    ('espoo', u"Espoo"),
+    ('eura', u"Eura"),
+    ('eurajoki', u"Eurajoki"),
+    ('evijarvi', u"Evijärvi"),
+    ('finstrom', u"Finström"),
+    ('forssa', u"Forssa"),
+    ('foglo', u"Föglö"),
+    ('geta', u"Geta"),
+    ('haapajarvi', u"Haapajärvi"),
+    ('haapavesi', u"Haapavesi"),
+    ('hailuoto', u"Hailuoto"),
+    ('halikko', u"Halikko"),
+    ('halsua', u"Halsua"),
+    ('hamina', u"Hamina"),
+    ('hammarland', u"Hammarland"),
+    ('hankasalmi', u"Hankasalmi"),
+    ('hanko', u"Hanko"),
+    ('harjavalta', u"Harjavalta"),
+    ('hartola', u"Hartola"),
+    ('hattula', u"Hattula"),
+    ('hauho', u"Hauho"),
+    ('haukipudas', u"Haukipudas"),
+    ('hausjarvi', u"Hausjärvi"),
+    ('heinola', u"Heinola"),
+    ('heinavesi', u"Heinävesi"),
+    ('helsinki', u"Helsinki"),
+    ('himanka', u"Himanka"),
+    ('hirvensalmi', u"Hirvensalmi"),
+    ('hollola', u"Hollola"),
+    ('honkajoki', u"Honkajoki"),
+    ('houtskari', u"Houtskari"),
+    ('huittinen', u"Huittinen"),
+    ('humppila', u"Humppila"),
+    ('hyrynsalmi', u"Hyrynsalmi"),
+    ('hyvinkaa', u"Hyvinkää"),
+    ('hameenkoski', u"Hämeenkoski"),
+    ('hameenkyro', u"Hämeenkyrö"),
+    ('hameenlinna', u"Hämeenlinna"),
+    ('ii', u"Ii"),
+    ('iisalmi', u"Iisalmi"),
+    ('iitti', u"Iitti"),
+    ('ikaalinen', u"Ikaalinen"),
+    ('ilmajoki', u"Ilmajoki"),
+    ('ilomantsi', u"Ilomantsi"),
+    ('imatra', u"Imatra"),
+    ('inari', u"Inari"),
+    ('inio', u"Iniö"),
+    ('inkoo', u"Inkoo"),
+    ('isojoki', u"Isojoki"),
+    ('isokyro', u"Isokyrö"),
+    ('jaala', u"Jaala"),
+    ('jalasjarvi', u"Jalasjärvi"),
+    ('janakkala', u"Janakkala"),
+    ('joensuu', u"Joensuu"),
+    ('jokioinen', u"Jokioinen"),
+    ('jomala', u"Jomala"),
+    ('joroinen', u"Joroinen"),
+    ('joutsa', u"Joutsa"),
+    ('joutseno', u"Joutseno"),
+    ('juankoski', u"Juankoski"),
+    ('jurva', u"Jurva"),
+    ('juuka', u"Juuka"),
+    ('juupajoki', u"Juupajoki"),
+    ('juva', u"Juva"),
+    ('jyvaskyla', u"Jyväskylä"),
+    ('jyvaskylan_mlk', u"Jyväskylän maalaiskunta"),
+    ('jamijarvi', u"Jämijärvi"),
+    ('jamsa', u"Jämsä"),
+    ('jamsankoski', u"Jämsänkoski"),
+    ('jarvenpaa', u"Järvenpää"),
+    ('kaarina', u"Kaarina"),
+    ('kaavi', u"Kaavi"),
+    ('kajaani', u"Kajaani"),
+    ('kalajoki', u"Kalajoki"),
+    ('kalvola', u"Kalvola"),
+    ('kangasala', u"Kangasala"),
+    ('kangasniemi', u"Kangasniemi"),
+    ('kankaanpaa', u"Kankaanpää"),
+    ('kannonkoski', u"Kannonkoski"),
+    ('kannus', u"Kannus"),
+    ('karijoki', u"Karijoki"),
+    ('karjaa', u"Karjaa"),
+    ('karjalohja', u"Karjalohja"),
+    ('karkkila', u"Karkkila"),
+    ('karstula', u"Karstula"),
+    ('karttula', u"Karttula"),
+    ('karvia', u"Karvia"),
+    ('kaskinen', u"Kaskinen"),
+    ('kauhajoki', u"Kauhajoki"),
+    ('kauhava', u"Kauhava"),
+    ('kauniainen', u"Kauniainen"),
+    ('kaustinen', u"Kaustinen"),
+    ('keitele', u"Keitele"),
+    ('kemi', u"Kemi"),
+    ('kemijarvi', u"Kemijärvi"),
+    ('keminmaa', u"Keminmaa"),
+    ('kemio', u"Kemiö"),
+    ('kempele', u"Kempele"),
+    ('kerava', u"Kerava"),
+    ('kerimaki', u"Kerimäki"),
+    ('kestila', u"Kestilä"),
+    ('kesalahti', u"Kesälahti"),
+    ('keuruu', u"Keuruu"),
+    ('kihnio', u"Kihniö"),
+    ('kiikala', u"Kiikala"),
+    ('kiikoinen', u"Kiikoinen"),
+    ('kiiminki', u"Kiiminki"),
+    ('kinnula', u"Kinnula"),
+    ('kirkkonummi', u"Kirkkonummi"),
+    ('kisko', u"Kisko"),
+    ('kitee', u"Kitee"),
+    ('kittila', u"Kittilä"),
+    ('kiukainen', u"Kiukainen"),
+    ('kiuruvesi', u"Kiuruvesi"),
+    ('kivijarvi', u"Kivijärvi"),
+    ('kokemaki', u"Kokemäki"),
+    ('kokkola', u"Kokkola"),
+    ('kolari', u"Kolari"),
+    ('konnevesi', u"Konnevesi"),
+    ('kontiolahti', u"Kontiolahti"),
+    ('korpilahti', u"Korpilahti"),
+    ('korppoo', u"Korppoo"),
+    ('korsnas', u"Korsnäs"),
+    ('kortesjarvi', u"Kortesjärvi"),
+    ('koskitl', u"KoskiTl"),
+    ('kotka', u"Kotka"),
+    ('kouvola', u"Kouvola"),
+    ('kristiinankaupunki', u"Kristiinankaupunki"),
+    ('kruunupyy', u"Kruunupyy"),
+    ('kuhmalahti', u"Kuhmalahti"),
+    ('kuhmo', u"Kuhmo"),
+    ('kuhmoinen', u"Kuhmoinen"),
+    ('kumlinge', u"Kumlinge"),
+    ('kuopio', u"Kuopio"),
+    ('kuortane', u"Kuortane"),
+    ('kurikka', u"Kurikka"),
+    ('kuru', u"Kuru"),
+    ('kustavi', u"Kustavi"),
+    ('kuusamo', u"Kuusamo"),
+    ('kuusankoski', u"Kuusankoski"),
+    ('kuusjoki', u"Kuusjoki"),
+    ('kylmakoski', u"Kylmäkoski"),
+    ('kyyjarvi', u"Kyyjärvi"),
+    ('kalvia', u"Kälviä"),
+    ('karkola', u"Kärkölä"),
+    ('karsamaki', u"Kärsämäki"),
+    ('kokar', u"Kökar"),
+    ('koylio', u"Köyliö"),
+    ('lahti', u"Lahti"),
+    ('laihia', u"Laihia"),
+    ('laitila', u"Laitila"),
+    ('lammi', u"Lammi"),
+    ('lapinjarvi', u"Lapinjärvi"),
+    ('lapinlahti', u"Lapinlahti"),
+    ('lappajarvi', u"Lappajärvi"),
+    ('lappeenranta', u"Lappeenranta"),
+    ('lappi', u"Lappi"),
+    ('lapua', u"Lapua"),
+    ('laukaa', u"Laukaa"),
+    ('lavia', u"Lavia"),
+    ('lehtimaki', u"Lehtimäki"),
+    ('leivonmaki', u"Leivonmäki"),
+    ('lemi', u"Lemi"),
+    ('lemland', u"Lemland"),
+    ('lempaala', u"Lempäälä"),
+    ('lemu', u"Lemu"),
+    ('leppavirta', u"Leppävirta"),
+    ('lestijarvi', u"Lestijärvi"),
+    ('lieksa', u"Lieksa"),
+    ('lieto', u"Lieto"),
+    ('liljendal', u"Liljendal"),
+    ('liminka', u"Liminka"),
+    ('liperi', u"Liperi"),
+    ('lohja', u"Lohja"),
+    ('lohtaja', u"Lohtaja"),
+    ('loimaa', u"Loimaa"),
+    ('loppi', u"Loppi"),
+    ('loviisa', u"Loviisa"),
+    ('luhanka', u"Luhanka"),
+    ('lumijoki', u"Lumijoki"),
+    ('lumparland', u"Lumparland"),
+    ('luoto', u"Luoto"),
+    ('luumaki', u"Luumäki"),
+    ('luvia', u"Luvia"),
+    ('maalahti', u"Maalahti"),
+    ('maaninka', u"Maaninka"),
+    ('maarianhamina', u"Maarianhamina"),
+    ('marttila', u"Marttila"),
+    ('masku', u"Masku"),
+    ('mellila', u"Mellilä"),
+    ('merijarvi', u"Merijärvi"),
+    ('merikarvia', u"Merikarvia"),
+    ('merimasku', u"Merimasku"),
+    ('miehikkala', u"Miehikkälä"),
+    ('mikkeli', u"Mikkeli"),
+    ('mouhijarvi', u"Mouhijärvi"),
+    ('muhos', u"Muhos"),
+    ('multia', u"Multia"),
+    ('muonio', u"Muonio"),
+    ('mustasaari', u"Mustasaari"),
+    ('muurame', u"Muurame"),
+    ('muurla', u"Muurla"),
+    ('mynamaki', u"Mynämäki"),
+    ('myrskyla', u"Myrskylä"),
+    ('mantsala', u"Mäntsälä"),
+    ('mantta', u"Mänttä"),
+    ('mantyharju', u"Mäntyharju"),
+    ('naantali', u"Naantali"),
+    ('nakkila', u"Nakkila"),
+    ('nastola', u"Nastola"),
+    ('nauvo', u"Nauvo"),
+    ('nilsia', u"Nilsiä"),
+    ('nivala', u"Nivala"),
+    ('nokia', u"Nokia"),
+    ('noormarkku', u"Noormarkku"),
+    ('nousiainen', u"Nousiainen"),
+    ('nummi-pusula', u"Nummi-Pusula"),
+    ('nurmes', u"Nurmes"),
+    ('nurmijarvi', u"Nurmijärvi"),
+    ('nurmo', u"Nurmo"),
+    ('narpio', u"Närpiö"),
+    ('oravainen', u"Oravainen"),
+    ('orimattila', u"Orimattila"),
+    ('oripaa', u"Oripää"),
+    ('orivesi', u"Orivesi"),
+    ('oulainen', u"Oulainen"),
+    ('oulu', u"Oulu"),
+    ('oulunsalo', u"Oulunsalo"),
+    ('outokumpu', u"Outokumpu"),
+    ('padasjoki', u"Padasjoki"),
+    ('paimio', u"Paimio"),
+    ('paltamo', u"Paltamo"),
+    ('parainen', u"Parainen"),
+    ('parikkala', u"Parikkala"),
+    ('parkano', u"Parkano"),
+    ('pedersore', u"Pedersöre"),
+    ('pelkosenniemi', u"Pelkosenniemi"),
+    ('pello', u"Pello"),
+    ('perho', u"Perho"),
+    ('pernaja', u"Pernaja"),
+    ('pernio', u"Perniö"),
+    ('pertteli', u"Pertteli"),
+    ('pertunmaa', u"Pertunmaa"),
+    ('petajavesi', u"Petäjävesi"),
+    ('pieksamaki', u"Pieksämäki"),
+    ('pielavesi', u"Pielavesi"),
+    ('pietarsaari', u"Pietarsaari"),
+    ('pihtipudas', u"Pihtipudas"),
+    ('piikkio', u"Piikkiö"),
+    ('piippola', u"Piippola"),
+    ('pirkkala', u"Pirkkala"),
+    ('pohja', u"Pohja"),
+    ('polvijarvi', u"Polvijärvi"),
+    ('pomarkku', u"Pomarkku"),
+    ('pori', u"Pori"),
+    ('pornainen', u"Pornainen"),
+    ('porvoo', u"Porvoo"),
+    ('posio', u"Posio"),
+    ('pudasjarvi', u"Pudasjärvi"),
+    ('pukkila', u"Pukkila"),
+    ('pulkkila', u"Pulkkila"),
+    ('punkaharju', u"Punkaharju"),
+    ('punkalaidun', u"Punkalaidun"),
+    ('puolanka', u"Puolanka"),
+    ('puumala', u"Puumala"),
+    ('pyhtaa', u"Pyhtää"),
+    ('pyhajoki', u"Pyhäjoki"),
+    ('pyhajarvi', u"Pyhäjärvi"),
+    ('pyhanta', u"Pyhäntä"),
+    ('pyharanta', u"Pyhäranta"),
+    ('pyhaselka', u"Pyhäselkä"),
+    ('pylkonmaki', u"Pylkönmäki"),
+    ('palkane', u"Pälkäne"),
+    ('poytya', u"Pöytyä"),
+    ('raahe', u"Raahe"),
+    ('raisio', u"Raisio"),
+    ('rantasalmi', u"Rantasalmi"),
+    ('rantsila', u"Rantsila"),
+    ('ranua', u"Ranua"),
+    ('rauma', u"Rauma"),
+    ('rautalampi', u"Rautalampi"),
+    ('rautavaara', u"Rautavaara"),
+    ('rautjarvi', u"Rautjärvi"),
+    ('reisjarvi', u"Reisjärvi"),
+    ('renko', u"Renko"),
+    ('riihimaki', u"Riihimäki"),
+    ('ristiina', u"Ristiina"),
+    ('ristijarvi', u"Ristijärvi"),
+    ('rovaniemi', u"Rovaniemi"),
+    ('ruokolahti', u"Ruokolahti"),
+    ('ruotsinpyhtaa', u"Ruotsinpyhtää"),
+    ('ruovesi', u"Ruovesi"),
+    ('rusko', u"Rusko"),
+    ('rymattyla', u"Rymättylä"),
+    ('raakkyla', u"Rääkkylä"),
+    ('saarijarvi', u"Saarijärvi"),
+    ('salla', u"Salla"),
+    ('salo', u"Salo"),
+    ('saltvik', u"Saltvik"),
+    ('sammatti', u"Sammatti"),
+    ('sauvo', u"Sauvo"),
+    ('savitaipale', u"Savitaipale"),
+    ('savonlinna', u"Savonlinna"),
+    ('savonranta', u"Savonranta"),
+    ('savukoski', u"Savukoski"),
+    ('seinajoki', u"Seinäjoki"),
+    ('sievi', u"Sievi"),
+    ('siikainen', u"Siikainen"),
+    ('siikajoki', u"Siikajoki"),
+    ('siilinjarvi', u"Siilinjärvi"),
+    ('simo', u"Simo"),
+    ('sipoo', u"Sipoo"),
+    ('siuntio', u"Siuntio"),
+    ('sodankyla', u"Sodankylä"),
+    ('soini', u"Soini"),
+    ('somero', u"Somero"),
+    ('sonkajarvi', u"Sonkajärvi"),
+    ('sotkamo', u"Sotkamo"),
+    ('sottunga', u"Sottunga"),
+    ('sulkava', u"Sulkava"),
+    ('sund', u"Sund"),
+    ('suomenniemi', u"Suomenniemi"),
+    ('suomusjarvi', u"Suomusjärvi"),
+    ('suomussalmi', u"Suomussalmi"),
+    ('suonenjoki', u"Suonenjoki"),
+    ('sysma', u"Sysmä"),
+    ('sakyla', u"Säkylä"),
+    ('sarkisalo', u"Särkisalo"),
+    ('taipalsaari', u"Taipalsaari"),
+    ('taivalkoski', u"Taivalkoski"),
+    ('taivassalo', u"Taivassalo"),
+    ('tammela', u"Tammela"),
+    ('tammisaari', u"Tammisaari"),
+    ('tampere', u"Tampere"),
+    ('tarvasjoki', u"Tarvasjoki"),
+    ('tervo', u"Tervo"),
+    ('tervola', u"Tervola"),
+    ('teuva', u"Teuva"),
+    ('tohmajarvi', u"Tohmajärvi"),
+    ('toholampi', u"Toholampi"),
+    ('toivakka', u"Toivakka"),
+    ('tornio', u"Tornio"),
+    ('turku', u"Turku"),
+    ('tuulos', u"Tuulos"),
+    ('tuusniemi', u"Tuusniemi"),
+    ('tuusula', u"Tuusula"),
+    ('tyrnava', u"Tyrnävä"),
+    ('toysa', u"Töysä"),
+    ('ullava', u"Ullava"),
+    ('ulvila', u"Ulvila"),
+    ('urjala', u"Urjala"),
+    ('utajarvi', u"Utajärvi"),
+    ('utsjoki', u"Utsjoki"),
+    ('uurainen', u"Uurainen"),
+    ('uusikaarlepyy', u"Uusikaarlepyy"),
+    ('uusikaupunki', u"Uusikaupunki"),
+    ('vaala', u"Vaala"),
+    ('vaasa', u"Vaasa"),
+    ('vahto', u"Vahto"),
+    ('valkeakoski', u"Valkeakoski"),
+    ('valkeala', u"Valkeala"),
+    ('valtimo', u"Valtimo"),
+    ('vammala', u"Vammala"),
+    ('vampula', u"Vampula"),
+    ('vantaa', u"Vantaa"),
+    ('varkaus', u"Varkaus"),
+    ('varpaisjarvi', u"Varpaisjärvi"),
+    ('vehmaa', u"Vehmaa"),
+    ('velkua', u"Velkua"),
+    ('vesanto', u"Vesanto"),
+    ('vesilahti', u"Vesilahti"),
+    ('veteli', u"Veteli"),
+    ('vierema', u"Vieremä"),
+    ('vihanti', u"Vihanti"),
+    ('vihti', u"Vihti"),
+    ('viitasaari', u"Viitasaari"),
+    ('vilppula', u"Vilppula"),
+    ('vimpeli', u"Vimpeli"),
+    ('virolahti', u"Virolahti"),
+    ('virrat', u"Virrat"),
+    ('vardo', u"Vårdö"),
+    ('vahakyro', u"Vähäkyrö"),
+    ('vastanfjard', u"Västanfjärd"),
+    ('voyri-maksamaa', u"Vöyri-Maksamaa"),
+    ('yliharma', u"Ylihärmä"),
+    ('yli-ii', u"Yli-Ii"),
+    ('ylikiiminki', u"Ylikiiminki"),
+    ('ylistaro', u"Ylistaro"),
+    ('ylitornio', u"Ylitornio"),
+    ('ylivieska', u"Ylivieska"),
+    ('ylamaa', u"Ylämaa"),
+    ('ylane', u"Yläne"),
+    ('ylojarvi', u"Ylöjärvi"),
+    ('ypaja', u"Ypäjä"),
+    ('aetsa', u"Äetsä"),
+    ('ahtari', u"Ähtäri"),
+    ('aanekoski', u"Äänekoski")
+)
\ No newline at end of file
diff --git a/django/contrib/localflavor/fi/forms.py b/django/contrib/localflavor/fi/forms.py
new file mode 100644
index 0000000000..a2b2eed5c2
--- /dev/null
+++ b/django/contrib/localflavor/fi/forms.py
@@ -0,0 +1,47 @@
+"""
+FI-specific Form helpers
+"""
+
+import re
+from django.newforms import ValidationError
+from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
+from django.utils.translation import gettext
+
+class FIZipCodeField(RegexField):
+    def __init__(self, *args, **kwargs):
+        super(FIZipCodeField, self).__init__(r'^\d{5}$',
+            max_length=None, min_length=None,
+            error_message=gettext(u'Enter a zip code in the format XXXXX.'),
+            *args, **kwargs)
+
+class FIMunicipalitySelect(Select):
+    """
+    A Select widget that uses a list of Finnish municipalities as its choices.
+    """
+    def __init__(self, attrs=None):
+        from fi_municipalities import MUNICIPALITY_CHOICES # relative import
+        super(FIMunicipalitySelect, self).__init__(attrs, choices=MUNICIPALITY_CHOICES)
+
+class FISocialSecurityNumber(Field):
+    def clean(self, value):
+        super(FISocialSecurityNumber, self).clean(value)
+        if value in EMPTY_VALUES:
+ 	        return u''
+        
+        checkmarks = "0123456789ABCDEFHJKLMNPRSTUVWXY"
+        result = re.match(r"""^
+            (?P<date>([0-2]\d|3[01])
+            (0\d|1[012])
+            (\d{2}))
+            [A+-]
+            (?P<serial>(\d{3}))
+            (?P<chechsum>[%s])$""" % checkmarks, value, re.VERBOSE | re.IGNORECASE)
+        if not result:
+            raise ValidationError(gettext(u'Enter a valid Finnish social security number.'))
+        checksum = int(result.groupdict()['date'] + result.groupdict()['serial'])
+
+        if checkmarks[checksum % len(checkmarks)] == result.groupdict()['chechsum'].upper():
+            return u'%s' % value.upper()
+        
+        raise ValidationError(gettext(u'Enter a valid Finnish social security number.'))
+
diff --git a/django/contrib/localflavor/fr/__init__.py b/django/contrib/localflavor/fr/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/contrib/localflavor/fr/forms.py b/django/contrib/localflavor/fr/forms.py
new file mode 100644
index 0000000000..ee87c5cda2
--- /dev/null
+++ b/django/contrib/localflavor/fr/forms.py
@@ -0,0 +1,44 @@
+"""
+FR-specific Form helpers
+"""
+
+from django.newforms import ValidationError
+from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
+from django.newforms.util import smart_unicode
+from django.utils.translation import gettext
+import re
+
+phone_digits_re = re.compile(r'^0\d(\s|\.)?(\d{2}(\s|\.)?){3}\d{2}$')
+
+class FRZipCodeField(RegexField):
+    def __init__(self, *args, **kwargs):
+        super(FRZipCodeField, self).__init__(r'^\d{5}$',
+            max_length=None, min_length=None,
+            error_message=gettext(u'Enter a zip code in the format XXXXX.'),
+            *args, **kwargs)
+
+class FRPhoneNumberField(Field):
+    """
+    Validate local French phone number (not international ones)
+    The correct format is '0X XX XX XX XX'.
+    '0X.XX.XX.XX.XX' and '0XXXXXXXXX' validate but are corrected to
+    '0X XX XX XX XX'.
+    """
+    def clean(self, value):
+        super(FRPhoneNumberField, self).clean(value)
+        if value in EMPTY_VALUES:
+            return u''
+        value = re.sub('(\.|\s)', '', smart_unicode(value))
+        m = phone_digits_re.search(value)
+        if m:
+            return u'%s %s %s %s %s' % (value[0:2], value[2:4], value[4:6], value[6:8], value[8:10])
+        raise ValidationError(u'Phone numbers must be in 0X XX XX XX XX format.')
+
+class FRDepartmentSelect(Select):
+    """
+    A Select widget that uses a list of FR departments as its choices.
+    """
+    def __init__(self, attrs=None):
+        from fr_department import DEPARTMENT_ASCII_CHOICES # relative import
+        super(FRDepartmentSelect, self).__init__(attrs, choices=DEPARTMENT_ASCII_CHOICES)
+
diff --git a/django/contrib/localflavor/fr/fr_department.py b/django/contrib/localflavor/fr/fr_department.py
new file mode 100644
index 0000000000..02de295f88
--- /dev/null
+++ b/django/contrib/localflavor/fr/fr_department.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+
+DEPARTMENT_ASCII_CHOICES = (
+    ('01', '01 - Ain'),
+    ('02', '02 - Aisne'),
+    ('03', '03 - Allier'),
+    ('04', '04 - Alpes-de-Haute-Provence'),
+    ('05', '05 - Hautes-Alpes'),
+    ('06', '06 - Alpes-Maritimes'),
+    ('07', '07 - Ardeche'),
+    ('08', '08 - Ardennes'),
+    ('09', '09 - Ariege'),
+    ('10', '10 - Aube'),
+    ('11', '11 - Aude'),
+    ('12', '12 - Aveyron'),
+    ('13', '13 - Bouches-du-Rhone'),
+    ('14', '14 - Calvados'),
+    ('15', '15 - Cantal'),
+    ('16', '16 - Charente'),
+    ('17', '17 - Charente-Maritime'),
+    ('18', '18 - Cher'),
+    ('19', '19 - Correze'),
+    ('21', '21 - Cote-d\'Or'),
+    ('22', '22 - Cotes-d\'Armor'),
+    ('23', '23 - Creuse'),
+    ('24', '24 - Dordogne'),
+    ('25', '25 - Doubs'),
+    ('26', '26 - Drome'),
+    ('27', '27 - Eure'),
+    ('28', '28 - Eure-et-Loire'),
+    ('29', '29 - Finistere'),
+    ('2A', '2A - Corse-du-Sud'),
+    ('2B', '2B - Haute-Corse'),
+    ('30', '30 - Gard'),
+    ('31', '31 - Haute-Garonne'),
+    ('32', '32 - Gers'),
+    ('33', '33 - Gironde'),
+    ('34', '34 - Herault'),
+    ('35', '35 - Ille-et-Vilaine'),
+    ('36', '36 - Indre'),
+    ('37', '37 - Indre-et-Loire'),
+    ('38', '38 - Isere'),
+    ('39', '39 - Jura'),
+    ('40', '40 - Landes'),
+    ('41', '41 - Loir-et-Cher'),
+    ('42', '42 - Loire'),
+    ('43', '43 - Haute-Loire'),
+    ('44', '44 - Loire-Atlantique'),
+    ('45', '45 - Loiret'),
+    ('46', '46 - Lot'),
+    ('47', '47 - Lot-et-Garonne'),
+    ('48', '48 - Lozere'),
+    ('49', '49 - Maine-et-Loire'),
+    ('50', '50 - Manche'),
+    ('51', '51 - Marne'),
+    ('52', '52 - Haute-Marne'),
+    ('53', '53 - Mayenne'),
+    ('54', '54 - Meurthe-et-Moselle'),
+    ('55', '55 - Meuse'),
+    ('56', '56 - Morbihan'),
+    ('57', '57 - Moselle'),
+    ('58', '58 - Nievre'),
+    ('59', '59 - Nord'),
+    ('60', '60 - Oise'),
+    ('61', '61 - Orne'),
+    ('62', '62 - Pas-de-Calais'),
+    ('63', '63 - Puy-de-Dome'),
+    ('64', '64 - Pyrenees-Atlantiques'),
+    ('65', '65 - Hautes-Pyrenees'),
+    ('66', '66 - Pyrenees-Orientales'),
+    ('67', '67 - Bas-Rhin'),
+    ('68', '68 - Haut-Rhin'),
+    ('69', '69 - Rhone'),
+    ('70', '70 - Haute-Saone'),
+    ('71', '71 - Saone-et-Loire'),
+    ('72', '72 - Sarthe'),
+    ('73', '73 - Savoie'),
+    ('74', '74 - Haute-Savoie'),
+    ('75', '75 - Paris'),
+    ('76', '76 - Seine-Maritime'),
+    ('77', '77 - Seine-et-Marne'),
+    ('78', '78 - Yvelines'),
+    ('79', '79 - Deux-Sevres'),
+    ('80', '80 - Somme'),
+    ('81', '81 - Tarn'),
+    ('82', '82 - Tarn-et-Garonne'),
+    ('83', '83 - Var'),
+    ('84', '84 - Vaucluse'),
+    ('85', '85 - Vendee'),
+    ('86', '86 - Vienne'),
+    ('87', '87 - Haute-Vienne'),
+    ('88', '88 - Vosges'),
+    ('89', '89 - Yonne'),
+    ('90', '90 - Territoire de Belfort'),
+    ('91', '91 - Essonne'),
+    ('92', '92 - Hauts-de-Seine'),
+    ('93', '93 - Seine-Saint-Denis'),
+    ('94', '94 - Val-de-Marne'),
+    ('95', '95 - Val-d\'Oise'),
+    ('2A', '2A - Corse du sud'),
+    ('2B', '2B - Haute Corse'),
+    ('971', '971 - Guadeloupe'),
+    ('972', '972 - Martinique'),
+    ('973', '973 - Guyane'),
+    ('974', '974 - La Reunion'),
+    ('975', '975 - Saint-Pierre-et-Miquelon'),
+    ('976', '976 - Mayotte'),
+    ('984', '984 - Terres Australes et Antarctiques'),
+    ('986', '986 - Wallis et Futuna'),
+    ('987', '987 - Polynesie Francaise'),
+    ('988', '988 - Nouvelle-Caledonie'),
+)
diff --git a/django/contrib/localflavor/it/__init__.py b/django/contrib/localflavor/it/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/contrib/localflavor/it/forms.py b/django/contrib/localflavor/it/forms.py
new file mode 100644
index 0000000000..6760d91799
--- /dev/null
+++ b/django/contrib/localflavor/it/forms.py
@@ -0,0 +1,32 @@
+"""
+IT-specific Form helpers
+"""
+
+from django.newforms import ValidationError
+from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
+from django.newforms.util import smart_unicode
+from django.utils.translation import gettext
+import re
+
+class ITZipCodeField(RegexField):
+    def __init__(self, *args, **kwargs):
+        super(ITZipCodeField, self).__init__(r'^\d{5}$',
+        max_length=None, min_length=None,
+        error_message=gettext(u'Enter a zip code in the format XXXXX.'),
+        *args, **kwargs)
+
+class ITRegionSelect(Select):
+    """
+    A Select widget that uses a list of IT regions as its choices.
+    """
+    def __init__(self, attrs=None):
+        from it_region import REGION_CHOICES # relative import
+        super(ITRegionSelect, self).__init__(attrs, choices=REGION_CHOICES)
+
+class ITProvinceSelect(Select):
+    """
+    A Select widget that uses a list of IT regions as its choices.
+    """
+    def __init__(self, attrs=None):
+        from it_province import PROVINCE_CHOICES # relative import
+        super(ITProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
diff --git a/django/contrib/localflavor/it/it_province.py b/django/contrib/localflavor/it/it_province.py
new file mode 100644
index 0000000000..1867191b31
--- /dev/null
+++ b/django/contrib/localflavor/it/it_province.py
@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*
+
+PROVINCE_CHOICES = (
+    ('AG', 'Agrigento'),
+    ('AL', 'Alessandria'),
+    ('AN', 'Ancona'),
+    ('AO', 'Aosta'),
+    ('AR', 'Arezzo'),
+    ('AP', 'Ascoli Piceno'),
+    ('AT', 'Asti'),
+    ('AV', 'Avellino'),
+    ('BA', 'Bari'),
+#    ('BT', 'Barletta-Andria-Trani'), # active starting from 2009
+    ('BL', 'Belluno'),
+    ('BN', 'Benevento'),
+    ('BG', 'Bergamo'),
+    ('BI', 'Biella'),
+    ('BO', 'Bologna'),
+    ('BZ', 'Bolzano/Bozen'),
+    ('BS', 'Brescia'),
+    ('BR', 'Brindisi'),
+    ('CA', 'Cagliari'),
+    ('CL', 'Caltanissetta'),
+    ('CB', 'Campobasso'),
+    ('CI', 'Carbonia-Iglesias'),
+    ('CE', 'Caserta'),
+    ('CT', 'Catania'),
+    ('CZ', 'Catanzaro'),
+    ('CH', 'Chieti'),
+    ('CO', 'Como'),
+    ('CS', 'Cosenza'),
+    ('CR', 'Cremona'),
+    ('KR', 'Crotone'),
+    ('CN', 'Cuneo'),
+    ('EN', 'Enna'),
+#    ('FM', 'Fermo'), # active starting from 2009    
+    ('FE', 'Ferrara'),
+    ('FI', 'Firenze'),
+    ('FG', 'Foggia'),
+    ('FC', 'Forlì-Cesena'),
+    ('FR', 'Frosinone'),
+    ('GE', 'Genova'),
+    ('GO', 'Gorizia'),
+    ('GR', 'Grosseto'),
+    ('IM', 'Imperia'),
+    ('IS', 'Isernia'),
+    ('SP', 'La Spezia'),
+    ('AQ', u'L’Acquila'),
+    ('LT', 'Latina'),
+    ('LE', 'Lecce'),
+    ('LC', 'Lecco'),
+    ('LI', 'Livorno'),
+    ('LO', 'Lodi'),
+    ('LU', 'Lucca'),
+    ('MC', 'Macerata'),
+    ('MN', 'Mantova'),
+    ('MS', 'Massa-Carrara'),
+    ('MT', 'Matera'),
+    ('VS', 'Medio Campidano'),
+    ('ME', 'Messina'),
+    ('MI', 'Milano'),
+    ('MO', 'Modena'),
+#    ('MB', 'Monza e Brianza'), # active starting from 2009
+    ('NA', 'Napoli'),
+    ('NO', 'Novara'),
+    ('NU', 'Nuoro'),
+    ('OG', 'Ogliastra'),
+    ('OT', 'Olbia-Tempio'),
+    ('OR', 'Oristano'),
+    ('PD', 'Padova'),
+    ('PA', 'Palermo'),
+    ('PR', 'Parma'),
+    ('PV', 'Pavia'),
+    ('PG', 'Perugia'),
+    ('PU', 'Pesaro e Urbino'),
+    ('PE', 'Pescara'),
+    ('PC', 'Piacenza'),
+    ('PI', 'Pisa'),
+    ('PT', 'Pistoia'),
+    ('PN', 'Pordenone'),
+    ('PZ', 'Potenza'),
+    ('PO', 'Prato'),
+    ('RG', 'Ragusa'),
+    ('RA', 'Ravenna'),
+    ('RC', 'Reggio Calabria'),
+    ('RE', 'Reggio Emilia'),
+    ('RI', 'Rieti'),
+    ('RN', 'Rimini')
+    ('RM', 'Roma'),
+    ('RO', 'Rovigo'),
+    ('SA', 'Salerno'),
+    ('SS', 'Sassari'),
+    ('SV', 'Savona'),
+    ('SI', 'Siena'),
+    ('SR', 'Siracusa'),
+    ('SO', 'Sondrio'),
+    ('TA', 'Taranto'),
+    ('TE', 'Teramo'),
+    ('TR', 'Terni'),
+    ('TO', 'Torino'),
+    ('TP', 'Trapani'),
+    ('TN', 'Trento'),
+    ('TV', 'Treviso'),
+    ('TS', 'Trieste'),
+    ('UD', 'Udine'),
+    ('VA', 'Varese'),
+    ('VE', 'Venezia'),
+    ('VB', 'Verbano Cusio Ossola'),
+    ('VC', 'Vercelli'),
+    ('VR', 'Verona'),
+    ('VV', 'Vibo Valentia'),
+    ('VI', 'Vicenza'),
+    ('VT', 'Viterbo'),
+)
diff --git a/django/contrib/localflavor/it/it_region.py b/django/contrib/localflavor/it/it_region.py
new file mode 100644
index 0000000000..0700b46ea8
--- /dev/null
+++ b/django/contrib/localflavor/it/it_region.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*
+
+REGION_CHOICES = (
+    ('ABR', 'Abruzzo'),
+    ('BAS', 'Basilicata'),
+    ('CAL', 'Calabria'),
+    ('CAM', 'Campania'),
+    ('EMR', 'Emilia-Romagna'),
+    ('FVG', 'Friuli-Venezia Giulia'),
+    ('LAZ', 'Lazio'),
+    ('LIG', 'Liguria'),
+    ('LOM', 'Lombardia'),
+    ('MAR', 'Marche'),
+    ('MOL', 'Molise'),
+    ('PMN', 'Piemonte'),
+    ('PUG', 'Puglia'),
+    ('SAR', 'Sardegna'),
+    ('SIC', 'Sicilia'),
+    ('TOS', 'Toscana'),
+    ('TAA', 'Trentino-Alto Adige'),
+    ('UMB', 'Umbria'),
+    ('VAO', u'Valle d’Aosta'),
+    ('VEN', 'Veneto'),
+)
diff --git a/django/contrib/localflavor/jp/__init__.py b/django/contrib/localflavor/jp/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/contrib/localflavor/jp/forms.py b/django/contrib/localflavor/jp/forms.py
new file mode 100644
index 0000000000..4d93a21227
--- /dev/null
+++ b/django/contrib/localflavor/jp/forms.py
@@ -0,0 +1,38 @@
+"""
+JP-specific Form helpers
+"""
+
+from django.core import validators
+from django.newforms import ValidationError
+from django.utils.translation import gettext
+from django.newforms.fields import RegexField, Select
+
+import re
+
+class JPPostalCodeField(RegexField):
+    """
+    A form field that validates its input is a Japanese postcode.
+
+    Accepts 7 digits, with or without a hyphen.
+    """
+    def __init__(self, *args, **kwargs):
+        super(JPPostalCodeField, self).__init__(r'^\d{3}-\d{4}$|^\d{7}$',
+            max_length=None, min_length=None,
+            error_message=gettext(u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'),
+            *args, **kwargs)
+
+    def clean(self, value):
+        """
+        Validates the input and returns a string that contains only numbers.
+        Returns an empty string for empty values.
+        """
+        v = super(JPPostalCodeField, self).clean(value)
+        return v.replace('-', '')
+
+class JPPrefectureSelect(Select):
+    """
+    A Select widget that uses a list of Japanese prefectures as its choices.
+    """
+    def __init__(self, attrs=None):
+        from jp_prefectures import JP_PREFECTURES
+        super(JPPrefectureSelect, self).__init__(attrs, choices=JP_PREFECTURES)
diff --git a/django/contrib/localflavor/jp/jp_prefectures.py b/django/contrib/localflavor/jp/jp_prefectures.py
new file mode 100644
index 0000000000..72ac4f9474
--- /dev/null
+++ b/django/contrib/localflavor/jp/jp_prefectures.py
@@ -0,0 +1,51 @@
+from django.utils.translation import gettext_lazy as gettext_lazy
+
+JP_PREFECTURES = (
+    ('hokkaido', gettext_lazy('Hokkaido'),),
+    ('aomori', gettext_lazy('Aomori'),),
+    ('iwate', gettext_lazy('Iwate'),),
+    ('miyagi', gettext_lazy('Miyagi'),),
+    ('akita', gettext_lazy('Akita'),),
+    ('yamagata', gettext_lazy('Yamagata'),),
+    ('fukushima', gettext_lazy('Fukushima'),),
+    ('ibaraki', gettext_lazy('Ibaraki'),),
+    ('tochigi', gettext_lazy('Tochigi'),),
+    ('gunma', gettext_lazy('Gunma'),),
+    ('saitama', gettext_lazy('Saitama'),),
+    ('chiba', gettext_lazy('Chiba'),),
+    ('tokyo', gettext_lazy('Tokyo'),),
+    ('kanagawa', gettext_lazy('Kanagawa'),),
+    ('yamanashi', gettext_lazy('Yamanashi'),),
+    ('nagano', gettext_lazy('Nagano'),),
+    ('niigata', gettext_lazy('Niigata'),),
+    ('toyama', gettext_lazy('Toyama'),),
+    ('ishikawa', gettext_lazy('Ishikawa'),),
+    ('fukui', gettext_lazy('Fukui'),),
+    ('gifu', gettext_lazy('Gifu'),),
+    ('shizuoka', gettext_lazy('Shizuoka'),),
+    ('aichi', gettext_lazy('Aichi'),),
+    ('mie', gettext_lazy('Mie'),),
+    ('shiga', gettext_lazy('Shiga'),),
+    ('kyoto', gettext_lazy('Kyoto'),),
+    ('osaka', gettext_lazy('Osaka'),),
+    ('hyogo', gettext_lazy('Hyogo'),),
+    ('nara', gettext_lazy('Nara'),),
+    ('wakayama', gettext_lazy('Wakayama'),),
+    ('tottori', gettext_lazy('Tottori'),),
+    ('shimane', gettext_lazy('Shimane'),),
+    ('okayama', gettext_lazy('Okayama'),),
+    ('hiroshima', gettext_lazy('Hiroshima'),),
+    ('yamaguchi', gettext_lazy('Yamaguchi'),),
+    ('tokushima', gettext_lazy('Tokushima'),),
+    ('kagawa', gettext_lazy('Kagawa'),),
+    ('ehime', gettext_lazy('Ehime'),),
+    ('kochi', gettext_lazy('Kochi'),),
+    ('fukuoka', gettext_lazy('Fukuoka'),),
+    ('saga', gettext_lazy('Saga'),),
+    ('nagasaki', gettext_lazy('Nagasaki'),),
+    ('kumamoto', gettext_lazy('Kumamoto'),),
+    ('oita', gettext_lazy('Oita'),),
+    ('miyazaki', gettext_lazy('Miyazaki'),),
+    ('kagoshima', gettext_lazy('Kagoshima'),),
+    ('okinawa', gettext_lazy('Okinawa'),),
+)
diff --git a/django/contrib/webdesign/__init__.py b/django/contrib/webdesign/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/contrib/webdesign/lorem_ipsum.py b/django/contrib/webdesign/lorem_ipsum.py
new file mode 100644
index 0000000000..b5a3d3b5db
--- /dev/null
+++ b/django/contrib/webdesign/lorem_ipsum.py
@@ -0,0 +1,66 @@
+"""
+Utility functions for generating "lorem ipsum" Latin text.
+"""
+
+import random
+
+COMMON_P = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
+WORDS = ('exercitationem', 'perferendis', 'perspiciatis', 'laborum', 'eveniet', 'sunt', 'iure', 'nam', 'nobis', 'eum', 'cum', 'officiis', 'excepturi', 'odio', 'consectetur', 'quasi', 'aut', 'quisquam', 'vel', 'eligendi', 'itaque', 'non', 'odit', 'tempore', 'quaerat', 'dignissimos', 'facilis', 'neque', 'nihil', 'expedita', 'vitae', 'vero', 'ipsum', 'nisi', 'animi', 'cumque', 'pariatur', 'velit', 'modi', 'natus', 'iusto', 'eaque', 'sequi', 'illo', 'sed', 'ex', 'et', 'voluptatibus', 'tempora', 'veritatis', 'ratione', 'assumenda', 'incidunt', 'nostrum', 'placeat', 'aliquid', 'fuga', 'provident', 'praesentium', 'rem', 'necessitatibus', 'suscipit', 'adipisci', 'quidem', 'possimus', 'voluptas', 'debitis', 'sint', 'accusantium', 'unde', 'sapiente', 'voluptate', 'qui', 'aspernatur', 'laudantium', 'soluta', 'amet', 'quo', 'aliquam', 'saepe', 'culpa', 'libero', 'ipsa', 'dicta', 'reiciendis', 'nesciunt', 'doloribus', 'autem', 'impedit', 'minima', 'maiores', 'repudiandae', 'ipsam', 'obcaecati', 'ullam', 'enim', 'totam', 'delectus', 'ducimus', 'quis', 'voluptates', 'dolores', 'molestiae', 'harum', 'dolorem', 'quia', 'voluptatem', 'molestias', 'magni', 'distinctio', 'omnis', 'illum', 'dolorum', 'voluptatum', 'ea', 'quas', 'quam', 'corporis', 'quae', 'blanditiis', 'atque', 'deserunt', 'laboriosam', 'earum', 'consequuntur', 'hic', 'cupiditate', 'quibusdam', 'accusamus', 'ut', 'rerum', 'error', 'minus', 'eius', 'ab', 'ad', 'nemo', 'fugit', 'officia', 'at', 'in', 'id', 'quos', 'reprehenderit', 'numquam', 'iste', 'fugiat', 'sit', 'inventore', 'beatae', 'repellendus', 'magnam', 'recusandae', 'quod', 'explicabo', 'doloremque', 'aperiam', 'consequatur', 'asperiores', 'commodi', 'optio', 'dolor', 'labore', 'temporibus', 'repellat', 'veniam', 'architecto', 'est', 'esse', 'mollitia', 'nulla', 'a', 'similique', 'eos', 'alias', 'dolore', 'tenetur', 'deleniti', 'porro', 'facere', 'maxime', 'corrupti')
+COMMON_WORDS = ('lorem', 'ipsum', 'dolor', 'sit', 'amet', 'consectetur', 'adipisicing', 'elit', 'sed', 'do', 'eiusmod', 'tempor', 'incididunt', 'ut', 'labore', 'et', 'dolore', 'magna', 'aliqua')
+
+def sentence():
+    """
+    Returns a randomly generated sentence of lorem ipsum text.
+
+    The first word is capitalized, and the sentence ends in either a period or
+    question mark. Commas are added at random.
+    """
+    # Determine the number of comma-separated sections and number of words in
+    # each section for this sentence.
+    sections = [' '.join(random.sample(WORDS, random.randint(3, 12))) for i in range(random.randint(1, 5))]
+    s = ', '.join(sections)
+    # Convert to sentence case and add end punctuation.
+    return '%s%s%s' % (s[0].upper(), s[1:], random.choice('?.'))
+
+def paragraph():
+    """
+    Returns a randomly generated paragraph of lorem ipsum text.
+
+    The paragraph consists of between 1 and 4 sentences, inclusive.
+    """
+    return ' '.join([sentence() for i in range(random.randint(1, 4))])
+
+def paragraphs(count, common=True):
+    """
+    Returns a list of paragraphs as returned by paragraph().
+
+    If `common` is True, then the first paragraph will be the standard
+    'lorem ipsum' paragraph. Otherwise, the first paragraph will be random
+    Latin text. Either way, subsequent paragraphs will be random Latin text.
+    """
+    paras = []
+    for i in range(count):
+        if common and i == 0:
+            paras.append(COMMON_P)
+        else:
+            paras.append(paragraph())
+    return paras
+
+def words(count, common=True):
+    """
+    Returns a string of `count` lorem ipsum words separated by a single space.
+
+    If `common` is True, then the first 19 words will be the standard
+    'lorem ipsum' words. Otherwise, all words will be selected randomly.
+    """
+    if common:
+        word_list = list(COMMON_WORDS)
+    else:
+        word_list = []
+    c = len(word_list)
+    if count > c:
+        count = min(count - c, len(WORDS))
+        word_list += random.sample(WORDS, count - c)
+    else:
+        word_list = word_list[:count]
+    return ' '.join(word_list)
diff --git a/django/contrib/webdesign/templatetags/__init__.py b/django/contrib/webdesign/templatetags/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/contrib/webdesign/templatetags/webdesign.py b/django/contrib/webdesign/templatetags/webdesign.py
new file mode 100644
index 0000000000..e5117093f8
--- /dev/null
+++ b/django/contrib/webdesign/templatetags/webdesign.py
@@ -0,0 +1,67 @@
+from django.contrib.webdesign.lorem_ipsum import words, paragraphs
+from django import template
+
+register = template.Library()
+
+class LoremNode(template.Node):
+    def __init__(self, count, method, common):
+        self.count, self.method, self.common = count, method, common
+
+    def render(self, context):
+        try:
+            count = int(self.count.resolve(context))
+        except (ValueError, TypeError):
+            count = 1
+        if self.method == 'w':
+            return words(count, common=self.common)
+        else:
+            paras = paragraphs(count, common=self.common)
+        if self.method == 'p':
+            paras = ['<p>%s</p>' % p for p in paras]
+        return '\n\n'.join(paras)
+
+#@register.tag
+def lorem(parser, token):
+    """
+    Creates random Latin text useful for providing test data in templates.
+
+    Usage format::
+
+        {% lorem [count] [method] [random] %}
+
+    ``count`` is a number (or variable) containing the number of paragraphs or
+    words to generate (default is 1).
+
+    ``method`` is either ``w`` for words, ``p`` for HTML paragraphs, ``b`` for
+    plain-text paragraph blocks (default is ``b``).
+
+    ``random`` is the word ``random``, which if given, does not use the common
+    paragraph (starting "Lorem ipsum dolor sit amet, consectetuer...").
+
+    Examples:
+        * ``{% lorem %}`` will output the common "lorem ipsum" paragraph
+        * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph
+          and two random paragraphs each wrapped in HTML ``<p>`` tags
+        * ``{% lorem 2 w random %}`` will output two random latin words
+    """
+    bits = list(token.split_contents())
+    tagname = bits[0]
+    # Random bit
+    common = bits[-1] != 'random'
+    if not common:
+        bits.pop()
+    # Method bit
+    if bits[-1] in ('w', 'p', 'b'):
+        method = bits.pop()
+    else:
+        method = 'b'
+    # Count bit
+    if len(bits) > 1:
+        count = bits.pop()
+    else:
+        count = '1'
+    count = parser.compile_filter(count)
+    if len(bits) != 1:
+        raise TemplateSyntaxError("Incorrect format for %r tag" % tagname)
+    return LoremNode(count, method, common)
+lorem = register.tag(lorem)
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index 180f95da73..1ab019221a 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -3,9 +3,12 @@
 from django.core.cache.backends.base import BaseCache, InvalidCacheBackendError
 
 try:
-    import memcache
+    import cmemcache as memcache
 except ImportError:
-    raise InvalidCacheBackendError, "Memcached cache backend requires the 'memcache' library"
+    try:
+        import memcache
+    except:
+        raise InvalidCacheBackendError("Memcached cache backend requires either the 'memcache' or 'cmemcache' library")
 
 class CacheClass(BaseCache):
     def __init__(self, server, params):
diff --git a/django/core/management.py b/django/core/management.py
index 091c38b637..fd37eb1e25 100644
--- a/django/core/management.py
+++ b/django/core/management.py
@@ -186,7 +186,7 @@ def _get_sql_model_create(model, known_models=set()):
                 if f.rel.to in known_models:
                     field_output.append(style.SQL_KEYWORD('REFERENCES') + ' ' + \
                         style.SQL_TABLE(backend.quote_name(f.rel.to._meta.db_table)) + ' (' + \
-                        style.SQL_FIELD(backend.quote_name(f.rel.to._meta.get_field(f.rel.field_name).column)) + ')' + 
+                        style.SQL_FIELD(backend.quote_name(f.rel.to._meta.get_field(f.rel.field_name).column)) + ')' +
                         backend.get_deferrable_sql()
                     )
                 else:
@@ -232,7 +232,7 @@ def _get_sql_for_pending_references(model, pending_references):
                 r_name = '%s_refs_%s_%x' % (r_col, col, abs(hash((r_table, table))))
                 final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s;' % \
                     (backend.quote_name(r_table), r_name,
-                    backend.quote_name(r_col), backend.quote_name(table), backend.quote_name(col), 
+                    backend.quote_name(r_col), backend.quote_name(table), backend.quote_name(col),
                     backend.get_deferrable_sql()))
             del pending_references[model]
     return final_output
@@ -456,7 +456,7 @@ def get_sql_indexes_for_model(model):
             unique = f.unique and 'UNIQUE ' or ''
             output.append(
                 style.SQL_KEYWORD('CREATE %sINDEX' % unique) + ' ' + \
-                style.SQL_TABLE('%s_%s' % (model._meta.db_table, f.column)) + ' ' + \
+                style.SQL_TABLE(backend.quote_name('%s_%s' % (model._meta.db_table, f.column))) + ' ' + \
                 style.SQL_KEYWORD('ON') + ' ' + \
                 style.SQL_TABLE(backend.quote_name(model._meta.db_table)) + ' ' + \
                 "(%s);" % style.SQL_FIELD(backend.quote_name(f.column))
@@ -554,7 +554,7 @@ def syncdb(verbosity=1, interactive=True):
     # to do at this point.
     _emit_post_sync_signal(created_models, verbosity, interactive)
 
-    # Install custom SQL for the app (but only if this 
+    # Install custom SQL for the app (but only if this
     # is a model we've just created)
     for app in models.get_apps():
         for model in models.get_models(app):
@@ -696,7 +696,7 @@ def flush(verbosity=1, interactive=True):
     from django.conf import settings
     from django.db import connection, transaction, models
     from django.dispatch import dispatcher
-    
+
     disable_termcolors()
 
     # First, try validating the models.
@@ -709,7 +709,7 @@ def flush(verbosity=1, interactive=True):
             __import__(app_name + '.management', {}, {}, [''])
         except ImportError:
             pass
-    
+
     sql_list = get_sql_flush()
 
     if interactive:
@@ -743,10 +743,10 @@ The full error: """ % settings.DATABASE_NAME + style.ERROR_OUTPUT(str(e)) + '\n'
         # applications to respond as if the database had been
         # sync'd from scratch.
         _emit_post_sync_signal(models.get_models(), verbosity, interactive)
-        
+
         # Reinstall the initial_data fixture
         load_data(['initial_data'], verbosity=verbosity)
-        
+
     else:
         print "Flush cancelled."
 flush.help_doc = "Executes ``sqlflush`` on the current database."
@@ -1325,7 +1325,7 @@ def test(app_labels, verbosity=1):
     failures = test_runner(app_list, verbosity)
     if failures:
         sys.exit(failures)
-        
+
 test.help_doc = 'Runs the test suite for the specified applications, or the entire site if no apps are specified'
 test.args = '[--verbosity] ' + APP_ARGS
 
@@ -1336,37 +1336,45 @@ def load_data(fixture_labels, verbosity=1):
     from django.db import connection, transaction
     from django.conf import settings
     import sys
-     
+
     # Keep a count of the installed objects and fixtures
     count = [0,0]
-    
+
     humanize = lambda dirname: dirname and "'%s'" % dirname or 'absolute path'
 
     # Get a cursor (even though we don't need one yet). This has
-    # the side effect of initializing the test database (if 
+    # the side effect of initializing the test database (if
     # it isn't already initialized).
     cursor = connection.cursor()
-    
-    # Start transaction management. All fixtures are installed in a 
+
+    # Start transaction management. All fixtures are installed in a
     # single transaction to ensure that all references are resolved.
     transaction.commit_unless_managed()
     transaction.enter_transaction_management()
     transaction.managed(True)
-    
+
     app_fixtures = [os.path.join(os.path.dirname(app.__file__),'fixtures') for app in get_apps()]
     for fixture_label in fixture_labels:
+        parts = fixture_label.split('.')
+        if len(parts) == 1:
+            fixture_name = fixture_label
+            formats = serializers.get_serializer_formats()
+        else:
+            fixture_name, format = '.'.join(parts[:-1]), parts[-1]
+            if format in serializers.get_serializer_formats():
+                formats = [format]
+            else:
+                formats = []
+
         if verbosity > 0:
-            print "Loading '%s' fixtures..." % fixture_label
+            if formats:
+                print "Loading '%s' fixtures..." % fixture_name
+            else:
+                print "Skipping fixture '%s': %s is not a known serialization format" % (fixture_name, format)
+
         for fixture_dir in app_fixtures + list(settings.FIXTURE_DIRS) + ['']:
             if verbosity > 1:
                 print "Checking %s for fixtures..." % humanize(fixture_dir)
-            parts = fixture_label.split('.')
-            if len(parts) == 1:
-                fixture_name = fixture_label
-                formats = serializers.get_serializer_formats()
-            else:
-                fixture_name, format = '.'.join(parts[:-1]), parts[-1]
-                formats = [format]
 
             label_found = False
             for format in formats:
@@ -1379,7 +1387,7 @@ def load_data(fixture_labels, verbosity=1):
                     fixture = open(full_path, 'r')
                     if label_found:
                         fixture.close()
-                        print style.ERROR("Multiple fixtures named '%s' in %s. Aborting." % 
+                        print style.ERROR("Multiple fixtures named '%s' in %s. Aborting." %
                             (fixture_name, humanize(fixture_dir)))
                         transaction.rollback()
                         transaction.leave_transaction_management()
@@ -1398,7 +1406,7 @@ def load_data(fixture_labels, verbosity=1):
                         except Exception, e:
                             fixture.close()
                             sys.stderr.write(
-                                style.ERROR("Problem installing fixture '%s': %s\n" % 
+                                style.ERROR("Problem installing fixture '%s': %s\n" %
                                      (full_path, str(e))))
                             transaction.rollback()
                             transaction.leave_transaction_management()
@@ -1416,27 +1424,27 @@ def load_data(fixture_labels, verbosity=1):
             print "Installed %d object(s) from %d fixture(s)" % tuple(count)
     transaction.commit()
     transaction.leave_transaction_management()
-        
+
 load_data.help_doc = 'Installs the named fixture(s) in the database'
 load_data.args = "[--verbosity] fixture, fixture, ..."
- 
+
 def dump_data(app_labels, format='json', indent=None):
     "Output the current contents of the database as a fixture of the given format"
     from django.db.models import get_app, get_apps, get_models
     from django.core import serializers
- 
+
     if len(app_labels) == 0:
         app_list = get_apps()
     else:
         app_list = [get_app(app_label) for app_label in app_labels]
- 
+
     # Check that the serialization format exists; this is a shortcut to
     # avoid collating all the objects and _then_ failing.
     try:
         serializers.get_serializer(format)
     except KeyError:
-        sys.stderr.write(style.ERROR("Unknown serialization format: %s\n" % format))        
-    
+        sys.stderr.write(style.ERROR("Unknown serialization format: %s\n" % format))
+
     objects = []
     for app in app_list:
         for model in get_models(app):
@@ -1531,7 +1539,7 @@ def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING, argv=None):
     parser.add_option('--noreload', action='store_false', dest='use_reloader', default=True,
         help='Tells Django to NOT use the auto-reloader when running the development server.')
     parser.add_option('--format', default='json', dest='format',
-        help='Specifies the output serialization format for fixtures')    
+        help='Specifies the output serialization format for fixtures')
     parser.add_option('--indent', default=None, dest='indent',
         type='int', help='Specifies the indent level to use when pretty-printing output')
     parser.add_option('--verbosity', action='store', dest='verbosity', default='1',
diff --git a/django/http/__init__.py b/django/http/__init__.py
index 0ae90c4921..ed2c128a16 100644
--- a/django/http/__init__.py
+++ b/django/http/__init__.py
@@ -155,6 +155,9 @@ def parse_cookie(cookie):
 
 class HttpResponse(object):
     "A basic HTTP response, with content and dictionary-accessed headers"
+
+    status_code = 200
+
     def __init__(self, content='', mimetype=None):
         from django.conf import settings
         self._charset = settings.DEFAULT_CHARSET
@@ -168,7 +171,6 @@ class HttpResponse(object):
             self._is_string = True
         self.headers = {'Content-Type': mimetype}
         self.cookies = SimpleCookie()
-        self.status_code = 200
 
     def __str__(self):
         "Full HTTP message, including headers"
@@ -254,47 +256,49 @@ class HttpResponse(object):
         return sum([len(chunk) for chunk in self._container])
 
 class HttpResponseRedirect(HttpResponse):
+    status_code = 302
+
     def __init__(self, redirect_to):
         HttpResponse.__init__(self)
         self['Location'] = quote(redirect_to, safe=RESERVED_CHARS)
-        self.status_code = 302
 
 class HttpResponsePermanentRedirect(HttpResponse):
+    status_code = 301
+
     def __init__(self, redirect_to):
         HttpResponse.__init__(self)
         self['Location'] = quote(redirect_to, safe=RESERVED_CHARS)
-        self.status_code = 301
 
 class HttpResponseNotModified(HttpResponse):
-    def __init__(self):
-        HttpResponse.__init__(self)
-        self.status_code = 304
+    status_code = 304
+
+class HttpResponseBadRequest(HttpResponse):
+    status_code = 400
 
 class HttpResponseNotFound(HttpResponse):
-    def __init__(self, *args, **kwargs):
-        HttpResponse.__init__(self, *args, **kwargs)
-        self.status_code = 404
+    status_code = 404
 
 class HttpResponseForbidden(HttpResponse):
-    def __init__(self, *args, **kwargs):
-        HttpResponse.__init__(self, *args, **kwargs)
-        self.status_code = 403
+    status_code = 403
 
 class HttpResponseNotAllowed(HttpResponse):
+    status_code = 405
+
     def __init__(self, permitted_methods):
         HttpResponse.__init__(self)
         self['Allow'] = ', '.join(permitted_methods)
-        self.status_code = 405
 
 class HttpResponseGone(HttpResponse):
+    status_code = 410
+
     def __init__(self, *args, **kwargs):
         HttpResponse.__init__(self, *args, **kwargs)
-        self.status_code = 410
 
 class HttpResponseServerError(HttpResponse):
+    status_code = 500
+
     def __init__(self, *args, **kwargs):
         HttpResponse.__init__(self, *args, **kwargs)
-        self.status_code = 500
 
 def get_host(request):
     "Gets the HTTP host from the environment or request headers."
diff --git a/django/middleware/cache.py b/django/middleware/cache.py
index 58800b24da..a88b4956b2 100644
--- a/django/middleware/cache.py
+++ b/django/middleware/cache.py
@@ -10,7 +10,7 @@ class CacheMiddleware(object):
     Only parameter-less GET or HEAD-requests with status code 200 are cached.
 
     If CACHE_MIDDLEWARE_ANONYMOUS_ONLY is set to True, only anonymous requests
-    (i.e., those node made by a logged-in user) will be cached. This is a
+    (i.e., those not made by a logged-in user) will be cached. This is a
     simple and effective way of avoiding the caching of the Django admin (and
     any other user-specific content).
 
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index b18fa1dce7..52bbe8fea2 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -140,7 +140,7 @@ class IfChangedNode(Node):
             else:
                 compare_to = self.nodelist.render(context)
         except VariableDoesNotExist:
-            compare_to = None        
+            compare_to = None
 
         if  compare_to != self._last_seen:
             firstloop = (self._last_seen == None)
@@ -320,7 +320,7 @@ class URLNode(Node):
         self.view_name = view_name
         self.args = args
         self.kwargs = kwargs
-      
+
     def render(self, context):
         from django.core.urlresolvers import reverse, NoReverseMatch
         args = [arg.resolve(context) for arg in self.args]
@@ -354,6 +354,23 @@ class WidthRatioNode(Node):
             return ''
         return str(int(round(ratio)))
 
+class WithNode(Node):
+    def __init__(self, var, name, nodelist):
+        self.var = var
+        self.name = name
+        self.nodelist = nodelist
+
+    def __repr__(self):
+        return "<WithNode>"
+
+    def render(self, context):
+        val = self.var.resolve(context)
+        context.push()
+        context[self.name] = val
+        output = self.nodelist.render(context)
+        context.pop()
+        return output
+
 #@register.tag
 def comment(parser, token):
     """
@@ -595,8 +612,8 @@ def do_if(parser, token):
 
     ::
 
-        {% if althlete_list %}
-            Number of athletes: {{ althete_list|count }}
+        {% if athlete_list %}
+            Number of athletes: {{ athlete_list|count }}
         {% else %}
             No athletes.
         {% endif %}
@@ -899,12 +916,12 @@ templatetag = register.tag(templatetag)
 
 def url(parser, token):
     """
-    Returns an absolute URL matching given view with its parameters. 
-    
+    Returns an absolute URL matching given view with its parameters.
+
     This is a way to define links that aren't tied to a particular URL configuration::
-    
+
         {% url path.to.some_view arg1,arg2,name1=value1 %}
-    
+
     The first argument is a path to a view. It can be an absolute python path
     or just ``app_name.view_name`` without the project name if the view is
     located inside the project.  Other arguments are comma-separated values
@@ -913,18 +930,18 @@ def url(parser, token):
 
     For example if you have a view ``app_name.client`` taking client's id and
     the corresponding line in a URLconf looks like this::
-    
+
         ('^client/(\d+)/$', 'app_name.client')
-    
+
     and this app's URLconf is included into the project's URLconf under some
     path::
-    
+
         ('^clients/', include('project_name.app_name.urls'))
-    
+
     then in a template you can create a link for a certain client like this::
-    
+
         {% url app_name.client client.id %}
-    
+
     The URL will look like ``/clients/client/123/``.
     """
     bits = token.contents.split(' ', 2)
@@ -967,3 +984,23 @@ def widthratio(parser, token):
     return WidthRatioNode(parser.compile_filter(this_value_expr),
                           parser.compile_filter(max_value_expr), max_width)
 widthratio = register.tag(widthratio)
+
+#@register.tag
+def do_with(parser, token):
+    """
+    Add a value to the context (inside of this block) for caching and easy
+    access. For example::
+
+        {% with person.some_sql_method as total %}
+            {{ total }} object{{ total|pluralize }}
+        {% endwith %}
+    """
+    bits = list(token.split_contents())
+    if len(bits) != 4 or bits[2] != "as":
+        raise TemplateSyntaxError, "%r expected format is 'value as name'" % tagname
+    var = parser.compile_filter(bits[1])
+    name = bits[3]
+    nodelist = parser.parse(('endwith',))
+    parser.delete_first_token()
+    return WithNode(var, name, nodelist)
+do_with = register.tag('with', do_with)
diff --git a/django/test/simple.py b/django/test/simple.py
index 200f150594..fed6237929 100644
--- a/django/test/simple.py
+++ b/django/test/simple.py
@@ -84,5 +84,5 @@ def run_tests(module_list, verbosity=1, extra_tests=[]):
     
     teardown_test_environment()
     
-    return len(result.failures)
+    return len(result.failures) + len(result.errors)
     
\ No newline at end of file
diff --git a/docs/add_ons.txt b/docs/add_ons.txt
index 9809cf46f8..b92ae0bd17 100644
--- a/docs/add_ons.txt
+++ b/docs/add_ons.txt
@@ -9,6 +9,13 @@ problems.
 This code lives in ``django/contrib`` in the Django distribution. Here's a
 rundown of the packages in ``contrib``:
 
+.. admonition:: Note
+
+    For most of these add-ons -- specifically, the add-ons that include either
+    models or template tags -- you'll need to add the package name (e.g.,
+    ``'django.contrib.admin'``) to your ``INSTALLED_APPS`` setting and re-run
+    ``manage.py syncdb``.
+
 .. _"batteries included" philosophy: http://docs.python.org/tut/node12.html#batteries-included
 
 admin
@@ -147,13 +154,20 @@ contains a ``USZipCodeField`` that you can use to validate U.S. zip codes.
 markup
 ======
 
-A collection of template filters that implement these common markup languages:
+A collection of template filters that implement common markup languages:
 
-    * `Textile`_
-    * `Markdown`_
-    * `ReST (ReStructured Text)`_
+    * ``textile`` -- implements `Textile`_
+    * ``markdown`` -- implements `Markdown`_
+    * ``restructuredtext`` -- implements `ReST (ReStructured Text)`_
 
-For documentation, read the source code in django/contrib/markup/templatetags/markup.py.
+In each case, the filter expects formatted markup as a string and returns a
+string representing the marked-up text. For example, the ``textile`` filter
+converts text that is marked-up in Textile format to HTML.
+
+To activate these filters, add ``'django.contrib.markup'`` to your
+``INSTALLED_APPS`` setting. Once you've done that, use ``{% load markup %}`` in
+a template, and you'll have access to these filters. For more documentation,
+read the source code in django/contrib/markup/templatetags/markup.py.
 
 .. _Textile: http://en.wikipedia.org/wiki/Textile_%28markup_language%29
 .. _Markdown: http://en.wikipedia.org/wiki/Markdown
diff --git a/docs/cache.txt b/docs/cache.txt
index 054d99819d..e245e100e7 100644
--- a/docs/cache.txt
+++ b/docs/cache.txt
@@ -66,10 +66,19 @@ deleting arbitrary data in the cache. All data is stored directly in memory,
 so there's no overhead of database or filesystem usage.
 
 After installing Memcached itself, you'll need to install the Memcached Python
-bindings. They're in a single Python module, memcache.py, available at
-ftp://ftp.tummy.com/pub/python-memcached/ . If that URL is no longer valid,
-just go to the Memcached Web site (http://www.danga.com/memcached/) and get the
-Python bindings from the "Client APIs" section.
+bindings. Two versions of this are available. Choose and install *one* of the
+following modules:
+
+    * The fastest available option is a module called ``cmemcache``, available
+      at http://gijsbert.org/cmemcache/ . (This module is only compatible with
+      the Django development version. Django 0.96 is only compatible with the
+      second option, below.)
+
+    * If you can't install ``cmemcache``, you can install ``python-memcached``,
+      available at ftp://ftp.tummy.com/pub/python-memcached/ . If that URL is
+      no longer valid, just go to the Memcached Web site
+      (http://www.danga.com/memcached/) and get the Python bindings from the
+      "Client APIs" section.
 
 To use Memcached with Django, set ``CACHE_BACKEND`` to
 ``memcached://ip:port/``, where ``ip`` is the IP address of the Memcached
diff --git a/docs/django-admin.txt b/docs/django-admin.txt
index 28e28089cc..b6028dc2a0 100644
--- a/docs/django-admin.txt
+++ b/docs/django-admin.txt
@@ -342,7 +342,7 @@ Prints the custom SQL statements for the given appnames.
 For each model in each specified app, this command looks for the file
 ``<appname>/sql/<modelname>.sql``, where ``<appname>`` is the given appname and
 ``<modelname>`` is the model's name in lowercase. For example, if you have an
-app ``news`` that includes a ``Story`` model, ``sqlinitialdata`` will attempt
+app ``news`` that includes a ``Story`` model, ``sqlcustom`` will attempt
 to read a file ``news/sql/story.sql`` and append it to the output of this
 command.
 
diff --git a/docs/modpython.txt b/docs/modpython.txt
index 2c999753c7..297763c95a 100644
--- a/docs/modpython.txt
+++ b/docs/modpython.txt
@@ -37,7 +37,8 @@ Then edit your ``httpd.conf`` file and add the following::
         PythonDebug On
     </Location>
 
-...and replace ``mysite.settings`` with the Python path to your settings file.
+...and replace ``mysite.settings`` with the Python import path to your Django
+project's settings file.
 
 This tells Apache: "Use mod_python for any URL at or under '/mysite/', using the
 Django mod_python handler." It passes the value of ``DJANGO_SETTINGS_MODULE``
diff --git a/docs/newforms.txt b/docs/newforms.txt
index d7ef4d2599..ddb850f54c 100644
--- a/docs/newforms.txt
+++ b/docs/newforms.txt
@@ -860,6 +860,16 @@ level and at the form instance level, and the latter gets precedence::
     <tr><th>Url:</th><td><input type="text" name="url" /></td></tr>
     <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
 
+Creating custom fields
+----------------------
+
+If the built-in ``Field`` classes don't meet your needs, you can easily create
+custom ``Field`` classes. To do this, just create a subclass of
+``django.newforms.Field``. Its only requirements are that it implement a
+``clean()`` method and that its ``__init__()`` method accept the core arguments
+mentioned above (``required``, ``label``, ``initial``, ``widget``,
+``help_text``).
+
 More coming soon
 ================
 
diff --git a/docs/release_notes_0.96.txt b/docs/release_notes_0.96.txt
index ca5f5e045c..f62780c6b2 100644
--- a/docs/release_notes_0.96.txt
+++ b/docs/release_notes_0.96.txt
@@ -62,7 +62,7 @@ Database constraint names changed
 The format of the constraint names Django generates for foreign key
 references have changed slightly. These names are generally only used
 when it is not possible to put the reference directly on the affected
-column, so they is not always visible.
+column, so they are not always visible.
 
 The effect of this change is that running ``manage.py reset`` and
 similar commands against an existing database may generate SQL with
@@ -261,4 +261,4 @@ all their hard work:
       that went into 0.96 -- but everyone who's contributed to Django is listed
       in AUTHORS_.
       
-.. _AUTHORS: http://code.djangoproject.com/browser/django/trunk/AUTHORS
\ No newline at end of file
+.. _AUTHORS: http://code.djangoproject.com/browser/django/trunk/AUTHORS
diff --git a/docs/sessions.txt b/docs/sessions.txt
index 660718b4e2..55fbc2c3da 100644
--- a/docs/sessions.txt
+++ b/docs/sessions.txt
@@ -158,7 +158,7 @@ is defined in ``django/contrib/sessions/models.py``. Because it's a normal
 model, you can access sessions using the normal Django database API::
 
     >>> from django.contrib.sessions.models import Session
-    >>> s = Session.objects.get_object(pk='2b1189a188b44ad18c35e113ac6ceead')
+    >>> s = Session.objects.get(pk='2b1189a188b44ad18c35e113ac6ceead')
     >>> s.expire_date
     datetime.datetime(2005, 8, 20, 13, 35, 12)
 
diff --git a/docs/templates.txt b/docs/templates.txt
index db748ae432..8ab383c461 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -737,6 +737,7 @@ The following snippet of template code would accomplish this dubious task::
             <li>{{ item }}</li>
             {% endfor %}
         </ul>
+        </li>
     {% endfor %}
     </ul>
 
@@ -872,6 +873,23 @@ Above, if ``this_value`` is 175 and ``max_value`` is 200, the the image in the
 above example will be 88 pixels wide (because 175/200 = .875; .875 * 100 = 87.5
 which is rounded up to 88).
 
+with
+~~~~
+
+**New in Django development version**
+
+Caches a complex variable under a simpler name. This is useful when accessing
+an "expensive" method (e.g., one that hits the database) multiple times.
+
+For example::
+
+    {% with business.employees.count as total %}
+        {{ total }} employee{{ total|pluralize }}
+    {% endwith %}
+
+The populated variable (in the example above, ``total``) is only available
+between the ``{% with %}`` and ``{% endwith %}`` tags.
+
 Built-in filter reference
 -------------------------
 
@@ -970,7 +988,7 @@ place -- but only if there's a decimal part to be displayed. For example:
     * ``36.15`` gets converted to ``36.2``
     * ``36`` gets converted to ``36``
 
-If used with a numeric integer argument, ``floatformat`` rounds a number to that 
+If used with a numeric integer argument, ``floatformat`` rounds a number to that
 many decimal places.  For example:
 
     * ``36.1234`` with floatformat:3 gets converted to ``36.123``
@@ -983,7 +1001,7 @@ For example:
     * ``36.1234`` with floatformat:-3 gets converted to ``36.123``
     * ``36`` with floatformat:-4 gets converted to ``36``
 
-Using ``floatformat`` with no argument is equivalent to using ``floatformat`` with 
+Using ``floatformat`` with no argument is equivalent to using ``floatformat`` with
 an argument of ``-1``.
 
 get_digit
diff --git a/docs/testing.txt b/docs/testing.txt
index 31cea791d3..5b27ae6484 100644
--- a/docs/testing.txt
+++ b/docs/testing.txt
@@ -276,7 +276,7 @@ for testing purposes:
     ``status_code``  The HTTP status of the response. See RFC2616_ for a
                      full list of HTTP status codes.
 
-    ``content``      The body of the response. The is the final page
+    ``content``      The body of the response. This is the final page
                      content as rendered by the view, or any error message
                      (such as the URL for a 302 redirect).
 
@@ -468,7 +468,8 @@ failed::
 
     FAILED (failures=1)
 
-The return code for the script will indicate the number of tests that failed.
+The return code for the script is the total number of failed and erroneous 
+tests. If all the tests pass, the return code is 0.
 
 Regardless of whether the tests pass or fail, the test database is destroyed when
 all the tests have been executed. 
diff --git a/docs/tutorial01.txt b/docs/tutorial01.txt
index 56c5fa769e..0e857d09ca 100644
--- a/docs/tutorial01.txt
+++ b/docs/tutorial01.txt
@@ -133,8 +133,8 @@ Now, edit ``settings.py``. It's a normal Python module with module-level
 variables representing Django settings. Change these settings to match your
 database's connection parameters:
 
-    * ``DATABASE_ENGINE`` -- Either 'postgresql', 'mysql' or 'sqlite3'.
-      More coming soon.
+    * ``DATABASE_ENGINE`` -- Either 'postgresql_psycopg2', 'mysql' or 'sqlite3'.
+      Other backends are `also available`_.
     * ``DATABASE_NAME`` -- The name of your database, or the full (absolute)
       path to the database file if you're using SQLite.
     * ``DATABASE_USER`` -- Your database username (not used for SQLite).
@@ -143,6 +143,8 @@ database's connection parameters:
       empty string if your database server is on the same physical machine
       (not used for SQLite).
 
+.. _also available: ../settings/
+
 .. admonition:: Note
 
     If you're using PostgreSQL or MySQL, make sure you've created a database by
@@ -319,7 +321,8 @@ Now Django knows ``mysite`` includes the ``polls`` app. Let's run another comman
 
     python manage.py sql polls
 
-You should see the following (the CREATE TABLE SQL statements for the polls app)::
+You should see something similar to the following (the CREATE TABLE SQL statements 
+for the polls app)::
 
     BEGIN;
     CREATE TABLE "polls_poll" (
@@ -337,6 +340,8 @@ You should see the following (the CREATE TABLE SQL statements for the polls app)
 
 Note the following:
 
+    * The exact output will vary depending on the database you are using.
+    
     * Table names are automatically generated by combining the name of the app
       (``polls``) and the lowercase name of the model -- ``poll`` and
       ``choice``. (You can override this behavior.)
@@ -365,8 +370,9 @@ If you're interested, also run the following commands:
     * ``python manage.py validate polls`` -- Checks for any errors in the
       construction of your models.
 
-    * ``python manage.py sqlinitialdata polls`` -- Outputs any initial data
-      required for Django's admin framework and your models.
+    * ``python manage.py sqlcustom polls`` -- Outputs any custom SQL statements
+      (such as table modifications or constraints) that are defined for the 
+      application. 
 
     * ``python manage.py sqlclear polls`` -- Outputs the necessary ``DROP
       TABLE`` statements for this app, according to which tables already exist
diff --git a/docs/webdesign.txt b/docs/webdesign.txt
new file mode 100644
index 0000000000..8e6eae89dd
--- /dev/null
+++ b/docs/webdesign.txt
@@ -0,0 +1,53 @@
+========================
+django.contrib.webdesign
+========================
+
+The ``django.contrib.webdesign`` package, part of the `"django.contrib" add-ons`_,
+provides various Django helpers that are particularly useful to Web *designers*
+(as opposed to developers).
+
+At present, the package contains only a single template tag. If you have ideas
+for Web-designer-friendly functionality in Django, please `suggest them`_.
+
+.. _"django.contrib" add-ons: ../add_ons/
+.. _suggest them: ../contributing/
+
+Template tags
+=============
+
+To use these template tags, add ``'django.contrib.webdesign'`` to your
+``INSTALLED_APPS`` setting. Once you've done that, use
+``{% load webdesign %}`` in a template to give your template access to the tags.
+
+
+lorem
+=====
+
+Displays random "lorem ipsum" Latin text. This is useful for providing sample
+data in templates.
+
+Usage::
+
+    {% lorem [count] [method] [random] %}
+
+The ``{% lorem %}`` tag can be used with zero, one, two or three arguments.
+The arguments are:
+
+    ===========  =============================================================
+    Argument     Description
+    ===========  =============================================================
+    ``count``    A number (or variable) containing the number of paragraphs or
+                 words to generate (default is 1).
+    ``method``   Either ``w`` for words, ``p`` for HTML paragraphs or ``b``
+                 for plain-text paragraph blocks (default is ``b``).
+    ``random``   The word ``random``, which if given, does not use the common
+                 paragraph ("Lorem ipsum dolor sit amet...") when generating
+                 text.
+    ===========  =============================================================
+
+Examples:
+
+    * ``{% lorem %}`` will output the common "lorem ipsum" paragraph.
+    * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph
+      and two random paragraphs each wrapped in HTML ``<p>`` tags.
+    * ``{% lorem 2 w random %}`` will output two random Latin words.
diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py
index a9ce8d23b3..b2d66469c4 100644
--- a/tests/regressiontests/forms/tests.py
+++ b/tests/regressiontests/forms/tests.py
@@ -3556,6 +3556,424 @@ u''
 >>> f.clean('')
 u''
 
+# FRZipCodeField #############################################################
+
+FRZipCodeField validates that the data is a valid FR zipcode.
+>>> from django.contrib.localflavor.fr.forms import FRZipCodeField
+>>> f = FRZipCodeField()
+>>> f.clean('75001')
+u'75001'
+>>> f.clean('93200')
+u'93200'
+>>> f.clean('2A200')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXXX.']
+>>> f.clean('980001')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXXX.']
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f = FRZipCodeField(required=False)
+>>> f.clean('75001')
+u'75001'
+>>> f.clean('93200')
+u'93200'
+>>> f.clean('2A200')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXXX.']
+>>> f.clean('980001')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXXX.']
+>>> f.clean(None)
+u''
+>>> f.clean('')
+u''
+
+
+# FRPhoneNumberField ##########################################################
+
+FRPhoneNumberField validates that the data is a valid french phone number.
+It's normalized to 0X XX XX XX XX format. Dots are valid too.
+>>> from django.contrib.localflavor.fr.forms import FRPhoneNumberField
+>>> f = FRPhoneNumberField()
+>>> f.clean('01 55 44 58 64')
+u'01 55 44 58 64'
+>>> f.clean('0155445864')
+u'01 55 44 58 64'
+>>> f.clean('01 5544 5864')
+u'01 55 44 58 64'
+>>> f.clean('01 55.44.58.64')
+u'01 55 44 58 64'
+>>> f.clean('01.55.44.58.64')
+u'01 55 44 58 64'
+>>> f.clean('01,55,44,58,64')
+Traceback (most recent call last):
+...
+ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.']
+>>> f.clean('555 015 544')
+Traceback (most recent call last):
+...
+ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.']
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f = FRPhoneNumberField(required=False)
+>>> f.clean('01 55 44 58 64')
+u'01 55 44 58 64'
+>>> f.clean('0155445864')
+u'01 55 44 58 64'
+>>> f.clean('01 5544 5864')
+u'01 55 44 58 64'
+>>> f.clean('01 55.44.58.64')
+u'01 55 44 58 64'
+>>> f.clean('01.55.44.58.64')
+u'01 55 44 58 64'
+>>> f.clean('01,55,44,58,64')
+Traceback (most recent call last):
+...
+ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.']
+>>> f.clean('555 015 544')
+Traceback (most recent call last):
+...
+ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.']
+>>> f.clean(None)
+u''
+>>> f.clean('')
+u''
+
+# FRDepartmentSelect ###############################################################
+
+FRDepartmentSelect is a Select widget that uses a list of french departments 
+including DOM TOM
+>>> from django.contrib.localflavor.fr.forms import FRDepartmentSelect
+>>> w = FRDepartmentSelect()
+>>> print w.render('dep', 'Paris')
+<select name="dep">
+<option value="01">01 - Ain</option>
+<option value="02">02 - Aisne</option>
+<option value="03">03 - Allier</option>
+<option value="04">04 - Alpes-de-Haute-Provence</option>
+<option value="05">05 - Hautes-Alpes</option>
+<option value="06">06 - Alpes-Maritimes</option>
+<option value="07">07 - Ardeche</option>
+<option value="08">08 - Ardennes</option>
+<option value="09">09 - Ariege</option>
+<option value="10">10 - Aube</option>
+<option value="11">11 - Aude</option>
+<option value="12">12 - Aveyron</option>
+<option value="13">13 - Bouches-du-Rhone</option>
+<option value="14">14 - Calvados</option>
+<option value="15">15 - Cantal</option>
+<option value="16">16 - Charente</option>
+<option value="17">17 - Charente-Maritime</option>
+<option value="18">18 - Cher</option>
+<option value="19">19 - Correze</option>
+<option value="21">21 - Cote-d&#39;Or</option>
+<option value="22">22 - Cotes-d&#39;Armor</option>
+<option value="23">23 - Creuse</option>
+<option value="24">24 - Dordogne</option>
+<option value="25">25 - Doubs</option>
+<option value="26">26 - Drome</option>
+<option value="27">27 - Eure</option>
+<option value="28">28 - Eure-et-Loire</option>
+<option value="29">29 - Finistere</option>
+<option value="2A">2A - Corse-du-Sud</option>
+<option value="2B">2B - Haute-Corse</option>
+<option value="30">30 - Gard</option>
+<option value="31">31 - Haute-Garonne</option>
+<option value="32">32 - Gers</option>
+<option value="33">33 - Gironde</option>
+<option value="34">34 - Herault</option>
+<option value="35">35 - Ille-et-Vilaine</option>
+<option value="36">36 - Indre</option>
+<option value="37">37 - Indre-et-Loire</option>
+<option value="38">38 - Isere</option>
+<option value="39">39 - Jura</option>
+<option value="40">40 - Landes</option>
+<option value="41">41 - Loir-et-Cher</option>
+<option value="42">42 - Loire</option>
+<option value="43">43 - Haute-Loire</option>
+<option value="44">44 - Loire-Atlantique</option>
+<option value="45">45 - Loiret</option>
+<option value="46">46 - Lot</option>
+<option value="47">47 - Lot-et-Garonne</option>
+<option value="48">48 - Lozere</option>
+<option value="49">49 - Maine-et-Loire</option>
+<option value="50">50 - Manche</option>
+<option value="51">51 - Marne</option>
+<option value="52">52 - Haute-Marne</option>
+<option value="53">53 - Mayenne</option>
+<option value="54">54 - Meurthe-et-Moselle</option>
+<option value="55">55 - Meuse</option>
+<option value="56">56 - Morbihan</option>
+<option value="57">57 - Moselle</option>
+<option value="58">58 - Nievre</option>
+<option value="59">59 - Nord</option>
+<option value="60">60 - Oise</option>
+<option value="61">61 - Orne</option>
+<option value="62">62 - Pas-de-Calais</option>
+<option value="63">63 - Puy-de-Dome</option>
+<option value="64">64 - Pyrenees-Atlantiques</option>
+<option value="65">65 - Hautes-Pyrenees</option>
+<option value="66">66 - Pyrenees-Orientales</option>
+<option value="67">67 - Bas-Rhin</option>
+<option value="68">68 - Haut-Rhin</option>
+<option value="69">69 - Rhone</option>
+<option value="70">70 - Haute-Saone</option>
+<option value="71">71 - Saone-et-Loire</option>
+<option value="72">72 - Sarthe</option>
+<option value="73">73 - Savoie</option>
+<option value="74">74 - Haute-Savoie</option>
+<option value="75">75 - Paris</option>
+<option value="76">76 - Seine-Maritime</option>
+<option value="77">77 - Seine-et-Marne</option>
+<option value="78">78 - Yvelines</option>
+<option value="79">79 - Deux-Sevres</option>
+<option value="80">80 - Somme</option>
+<option value="81">81 - Tarn</option>
+<option value="82">82 - Tarn-et-Garonne</option>
+<option value="83">83 - Var</option>
+<option value="84">84 - Vaucluse</option>
+<option value="85">85 - Vendee</option>
+<option value="86">86 - Vienne</option>
+<option value="87">87 - Haute-Vienne</option>
+<option value="88">88 - Vosges</option>
+<option value="89">89 - Yonne</option>
+<option value="90">90 - Territoire de Belfort</option>
+<option value="91">91 - Essonne</option>
+<option value="92">92 - Hauts-de-Seine</option>
+<option value="93">93 - Seine-Saint-Denis</option>
+<option value="94">94 - Val-de-Marne</option>
+<option value="95">95 - Val-d&#39;Oise</option>
+<option value="2A">2A - Corse du sud</option>
+<option value="2B">2B - Haute Corse</option>
+<option value="971">971 - Guadeloupe</option>
+<option value="972">972 - Martinique</option>
+<option value="973">973 - Guyane</option>
+<option value="974">974 - La Reunion</option>
+<option value="975">975 - Saint-Pierre-et-Miquelon</option>
+<option value="976">976 - Mayotte</option>
+<option value="984">984 - Terres Australes et Antarctiques</option>
+<option value="986">986 - Wallis et Futuna</option>
+<option value="987">987 - Polynesie Francaise</option>
+<option value="988">988 - Nouvelle-Caledonie</option>
+</select>
+
+# JPPostalCodeField ###############################################################
+
+A form field that validates its input is a Japanese postcode.
+
+Accepts 7 digits(with/out hyphen).
+>>> from django.contrib.localflavor.jp.forms import JPPostalCodeField
+>>> f = JPPostalCodeField()
+>>> f.clean('251-0032')
+u'2510032'
+>>> f.clean('2510032')
+u'2510032'
+>>> f.clean('2510-032')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.']
+>>> f.clean('251a0032')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.']
+>>> f.clean('a51-0032')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.']
+>>> f.clean('25100321')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.']
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f = JPPostalCodeField(required=False)
+>>> f.clean('251-0032')
+u'2510032'
+>>> f.clean('2510032')
+u'2510032'
+>>> f.clean('2510-032')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.']
+>>> f.clean('')
+u''
+>>> f.clean(None)
+u''
+
+# JPPrefectureSelect ###############################################################
+
+A Select widget that uses a list of Japanese prefectures as its choices.
+>>> from django.contrib.localflavor.jp.forms import JPPrefectureSelect
+>>> w = JPPrefectureSelect()
+>>> print w.render('prefecture', 'kanagawa')
+<select name="prefecture">
+<option value="hokkaido">Hokkaido</option>
+<option value="aomori">Aomori</option>
+<option value="iwate">Iwate</option>
+<option value="miyagi">Miyagi</option>
+<option value="akita">Akita</option>
+<option value="yamagata">Yamagata</option>
+<option value="fukushima">Fukushima</option>
+<option value="ibaraki">Ibaraki</option>
+<option value="tochigi">Tochigi</option>
+<option value="gunma">Gunma</option>
+<option value="saitama">Saitama</option>
+<option value="chiba">Chiba</option>
+<option value="tokyo">Tokyo</option>
+<option value="kanagawa" selected="selected">Kanagawa</option>
+<option value="yamanashi">Yamanashi</option>
+<option value="nagano">Nagano</option>
+<option value="niigata">Niigata</option>
+<option value="toyama">Toyama</option>
+<option value="ishikawa">Ishikawa</option>
+<option value="fukui">Fukui</option>
+<option value="gifu">Gifu</option>
+<option value="shizuoka">Shizuoka</option>
+<option value="aichi">Aichi</option>
+<option value="mie">Mie</option>
+<option value="shiga">Shiga</option>
+<option value="kyoto">Kyoto</option>
+<option value="osaka">Osaka</option>
+<option value="hyogo">Hyogo</option>
+<option value="nara">Nara</option>
+<option value="wakayama">Wakayama</option>
+<option value="tottori">Tottori</option>
+<option value="shimane">Shimane</option>
+<option value="okayama">Okayama</option>
+<option value="hiroshima">Hiroshima</option>
+<option value="yamaguchi">Yamaguchi</option>
+<option value="tokushima">Tokushima</option>
+<option value="kagawa">Kagawa</option>
+<option value="ehime">Ehime</option>
+<option value="kochi">Kochi</option>
+<option value="fukuoka">Fukuoka</option>
+<option value="saga">Saga</option>
+<option value="nagasaki">Nagasaki</option>
+<option value="kumamoto">Kumamoto</option>
+<option value="oita">Oita</option>
+<option value="miyazaki">Miyazaki</option>
+<option value="kagoshima">Kagoshima</option>
+<option value="okinawa">Okinawa</option>
+</select>
+
+# FIZipCodeField #############################################################
+
+FIZipCodeField validates that the data is a valid FI zipcode.
+>>> from django.contrib.localflavor.fi.forms import FIZipCodeField
+>>> f = FIZipCodeField()
+>>> f.clean('20540')
+u'20540'
+>>> f.clean('20101')
+u'20101'
+>>> f.clean('20s40')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXXX.']
+>>> f.clean('205401')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXXX.']
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f = FIZipCodeField(required=False)
+>>> f.clean('20540')
+u'20540'
+>>> f.clean('20101')
+u'20101'
+>>> f.clean('20s40')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXXX.']
+>>> f.clean('205401')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXXX.']
+>>> f.clean(None)
+u''
+>>> f.clean('')
+u''
+
+# FIMunicipalitySelect ############################################################### 
+
+A Select widget that uses a list of Finnish municipalities as its choices. 
+>>> from django.contrib.localflavor.fi.forms import FIMunicipalitySelect 
+>>> w = FIMunicipalitySelect() 
+>>> unicode(w.render('municipalities', 'turku'))
+u'<select name="municipalities">\n<option value="akaa">Akaa</option>\n<option value="alaharma">Alah\xe4rm\xe4</option>\n<option value="alajarvi">Alaj\xe4rvi</option>\n<option value="alastaro">Alastaro</option>\n<option value="alavieska">Alavieska</option>\n<option value="alavus">Alavus</option>\n<option value="anjalankoski">Anjalankoski</option>\n<option value="artjarvi">Artj\xe4rvi</option>\n<option value="asikkala">Asikkala</option>\n<option value="askainen">Askainen</option>\n<option value="askola">Askola</option>\n<option value="aura">Aura</option>\n<option value="brando">Br\xe4nd\xf6</option>\n<option value="dragsfjard">Dragsfj\xe4rd</option>\n<option value="eckero">Ecker\xf6</option>\n<option value="elimaki">Elim\xe4ki</option>\n<option value="eno">Eno</option>\n<option value="enonkoski">Enonkoski</option>\n<option value="enontekio">Enonteki\xf6</option>\n<option value="espoo">Espoo</option>\n<option value="eura">Eura</option>\n<option value="eurajoki">Eurajoki</option>\n<option value="evijarvi">Evij\xe4rvi</option>\n<option value="finstrom">Finstr\xf6m</option>\n<option value="forssa">Forssa</option>\n<option value="foglo">F\xf6gl\xf6</option>\n<option value="geta">Geta</option>\n<option value="haapajarvi">Haapaj\xe4rvi</option>\n<option value="haapavesi">Haapavesi</option>\n<option value="hailuoto">Hailuoto</option>\n<option value="halikko">Halikko</option>\n<option value="halsua">Halsua</option>\n<option value="hamina">Hamina</option>\n<option value="hammarland">Hammarland</option>\n<option value="hankasalmi">Hankasalmi</option>\n<option value="hanko">Hanko</option>\n<option value="harjavalta">Harjavalta</option>\n<option value="hartola">Hartola</option>\n<option value="hattula">Hattula</option>\n<option value="hauho">Hauho</option>\n<option value="haukipudas">Haukipudas</option>\n<option value="hausjarvi">Hausj\xe4rvi</option>\n<option value="heinola">Heinola</option>\n<option value="heinavesi">Hein\xe4vesi</option>\n<option value="helsinki">Helsinki</option>\n<option value="himanka">Himanka</option>\n<option value="hirvensalmi">Hirvensalmi</option>\n<option value="hollola">Hollola</option>\n<option value="honkajoki">Honkajoki</option>\n<option value="houtskari">Houtskari</option>\n<option value="huittinen">Huittinen</option>\n<option value="humppila">Humppila</option>\n<option value="hyrynsalmi">Hyrynsalmi</option>\n<option value="hyvinkaa">Hyvink\xe4\xe4</option>\n<option value="hameenkoski">H\xe4meenkoski</option>\n<option value="hameenkyro">H\xe4meenkyr\xf6</option>\n<option value="hameenlinna">H\xe4meenlinna</option>\n<option value="ii">Ii</option>\n<option value="iisalmi">Iisalmi</option>\n<option value="iitti">Iitti</option>\n<option value="ikaalinen">Ikaalinen</option>\n<option value="ilmajoki">Ilmajoki</option>\n<option value="ilomantsi">Ilomantsi</option>\n<option value="imatra">Imatra</option>\n<option value="inari">Inari</option>\n<option value="inio">Ini\xf6</option>\n<option value="inkoo">Inkoo</option>\n<option value="isojoki">Isojoki</option>\n<option value="isokyro">Isokyr\xf6</option>\n<option value="jaala">Jaala</option>\n<option value="jalasjarvi">Jalasj\xe4rvi</option>\n<option value="janakkala">Janakkala</option>\n<option value="joensuu">Joensuu</option>\n<option value="jokioinen">Jokioinen</option>\n<option value="jomala">Jomala</option>\n<option value="joroinen">Joroinen</option>\n<option value="joutsa">Joutsa</option>\n<option value="joutseno">Joutseno</option>\n<option value="juankoski">Juankoski</option>\n<option value="jurva">Jurva</option>\n<option value="juuka">Juuka</option>\n<option value="juupajoki">Juupajoki</option>\n<option value="juva">Juva</option>\n<option value="jyvaskyla">Jyv\xe4skyl\xe4</option>\n<option value="jyvaskylan_mlk">Jyv\xe4skyl\xe4n maalaiskunta</option>\n<option value="jamijarvi">J\xe4mij\xe4rvi</option>\n<option value="jamsa">J\xe4ms\xe4</option>\n<option value="jamsankoski">J\xe4ms\xe4nkoski</option>\n<option value="jarvenpaa">J\xe4rvenp\xe4\xe4</option>\n<option value="kaarina">Kaarina</option>\n<option value="kaavi">Kaavi</option>\n<option value="kajaani">Kajaani</option>\n<option value="kalajoki">Kalajoki</option>\n<option value="kalvola">Kalvola</option>\n<option value="kangasala">Kangasala</option>\n<option value="kangasniemi">Kangasniemi</option>\n<option value="kankaanpaa">Kankaanp\xe4\xe4</option>\n<option value="kannonkoski">Kannonkoski</option>\n<option value="kannus">Kannus</option>\n<option value="karijoki">Karijoki</option>\n<option value="karjaa">Karjaa</option>\n<option value="karjalohja">Karjalohja</option>\n<option value="karkkila">Karkkila</option>\n<option value="karstula">Karstula</option>\n<option value="karttula">Karttula</option>\n<option value="karvia">Karvia</option>\n<option value="kaskinen">Kaskinen</option>\n<option value="kauhajoki">Kauhajoki</option>\n<option value="kauhava">Kauhava</option>\n<option value="kauniainen">Kauniainen</option>\n<option value="kaustinen">Kaustinen</option>\n<option value="keitele">Keitele</option>\n<option value="kemi">Kemi</option>\n<option value="kemijarvi">Kemij\xe4rvi</option>\n<option value="keminmaa">Keminmaa</option>\n<option value="kemio">Kemi\xf6</option>\n<option value="kempele">Kempele</option>\n<option value="kerava">Kerava</option>\n<option value="kerimaki">Kerim\xe4ki</option>\n<option value="kestila">Kestil\xe4</option>\n<option value="kesalahti">Kes\xe4lahti</option>\n<option value="keuruu">Keuruu</option>\n<option value="kihnio">Kihni\xf6</option>\n<option value="kiikala">Kiikala</option>\n<option value="kiikoinen">Kiikoinen</option>\n<option value="kiiminki">Kiiminki</option>\n<option value="kinnula">Kinnula</option>\n<option value="kirkkonummi">Kirkkonummi</option>\n<option value="kisko">Kisko</option>\n<option value="kitee">Kitee</option>\n<option value="kittila">Kittil\xe4</option>\n<option value="kiukainen">Kiukainen</option>\n<option value="kiuruvesi">Kiuruvesi</option>\n<option value="kivijarvi">Kivij\xe4rvi</option>\n<option value="kokemaki">Kokem\xe4ki</option>\n<option value="kokkola">Kokkola</option>\n<option value="kolari">Kolari</option>\n<option value="konnevesi">Konnevesi</option>\n<option value="kontiolahti">Kontiolahti</option>\n<option value="korpilahti">Korpilahti</option>\n<option value="korppoo">Korppoo</option>\n<option value="korsnas">Korsn\xe4s</option>\n<option value="kortesjarvi">Kortesj\xe4rvi</option>\n<option value="koskitl">KoskiTl</option>\n<option value="kotka">Kotka</option>\n<option value="kouvola">Kouvola</option>\n<option value="kristiinankaupunki">Kristiinankaupunki</option>\n<option value="kruunupyy">Kruunupyy</option>\n<option value="kuhmalahti">Kuhmalahti</option>\n<option value="kuhmo">Kuhmo</option>\n<option value="kuhmoinen">Kuhmoinen</option>\n<option value="kumlinge">Kumlinge</option>\n<option value="kuopio">Kuopio</option>\n<option value="kuortane">Kuortane</option>\n<option value="kurikka">Kurikka</option>\n<option value="kuru">Kuru</option>\n<option value="kustavi">Kustavi</option>\n<option value="kuusamo">Kuusamo</option>\n<option value="kuusankoski">Kuusankoski</option>\n<option value="kuusjoki">Kuusjoki</option>\n<option value="kylmakoski">Kylm\xe4koski</option>\n<option value="kyyjarvi">Kyyj\xe4rvi</option>\n<option value="kalvia">K\xe4lvi\xe4</option>\n<option value="karkola">K\xe4rk\xf6l\xe4</option>\n<option value="karsamaki">K\xe4rs\xe4m\xe4ki</option>\n<option value="kokar">K\xf6kar</option>\n<option value="koylio">K\xf6yli\xf6</option>\n<option value="lahti">Lahti</option>\n<option value="laihia">Laihia</option>\n<option value="laitila">Laitila</option>\n<option value="lammi">Lammi</option>\n<option value="lapinjarvi">Lapinj\xe4rvi</option>\n<option value="lapinlahti">Lapinlahti</option>\n<option value="lappajarvi">Lappaj\xe4rvi</option>\n<option value="lappeenranta">Lappeenranta</option>\n<option value="lappi">Lappi</option>\n<option value="lapua">Lapua</option>\n<option value="laukaa">Laukaa</option>\n<option value="lavia">Lavia</option>\n<option value="lehtimaki">Lehtim\xe4ki</option>\n<option value="leivonmaki">Leivonm\xe4ki</option>\n<option value="lemi">Lemi</option>\n<option value="lemland">Lemland</option>\n<option value="lempaala">Lemp\xe4\xe4l\xe4</option>\n<option value="lemu">Lemu</option>\n<option value="leppavirta">Lepp\xe4virta</option>\n<option value="lestijarvi">Lestij\xe4rvi</option>\n<option value="lieksa">Lieksa</option>\n<option value="lieto">Lieto</option>\n<option value="liljendal">Liljendal</option>\n<option value="liminka">Liminka</option>\n<option value="liperi">Liperi</option>\n<option value="lohja">Lohja</option>\n<option value="lohtaja">Lohtaja</option>\n<option value="loimaa">Loimaa</option>\n<option value="loppi">Loppi</option>\n<option value="loviisa">Loviisa</option>\n<option value="luhanka">Luhanka</option>\n<option value="lumijoki">Lumijoki</option>\n<option value="lumparland">Lumparland</option>\n<option value="luoto">Luoto</option>\n<option value="luumaki">Luum\xe4ki</option>\n<option value="luvia">Luvia</option>\n<option value="maalahti">Maalahti</option>\n<option value="maaninka">Maaninka</option>\n<option value="maarianhamina">Maarianhamina</option>\n<option value="marttila">Marttila</option>\n<option value="masku">Masku</option>\n<option value="mellila">Mellil\xe4</option>\n<option value="merijarvi">Merij\xe4rvi</option>\n<option value="merikarvia">Merikarvia</option>\n<option value="merimasku">Merimasku</option>\n<option value="miehikkala">Miehikk\xe4l\xe4</option>\n<option value="mikkeli">Mikkeli</option>\n<option value="mouhijarvi">Mouhij\xe4rvi</option>\n<option value="muhos">Muhos</option>\n<option value="multia">Multia</option>\n<option value="muonio">Muonio</option>\n<option value="mustasaari">Mustasaari</option>\n<option value="muurame">Muurame</option>\n<option value="muurla">Muurla</option>\n<option value="mynamaki">Myn\xe4m\xe4ki</option>\n<option value="myrskyla">Myrskyl\xe4</option>\n<option value="mantsala">M\xe4nts\xe4l\xe4</option>\n<option value="mantta">M\xe4ntt\xe4</option>\n<option value="mantyharju">M\xe4ntyharju</option>\n<option value="naantali">Naantali</option>\n<option value="nakkila">Nakkila</option>\n<option value="nastola">Nastola</option>\n<option value="nauvo">Nauvo</option>\n<option value="nilsia">Nilsi\xe4</option>\n<option value="nivala">Nivala</option>\n<option value="nokia">Nokia</option>\n<option value="noormarkku">Noormarkku</option>\n<option value="nousiainen">Nousiainen</option>\n<option value="nummi-pusula">Nummi-Pusula</option>\n<option value="nurmes">Nurmes</option>\n<option value="nurmijarvi">Nurmij\xe4rvi</option>\n<option value="nurmo">Nurmo</option>\n<option value="narpio">N\xe4rpi\xf6</option>\n<option value="oravainen">Oravainen</option>\n<option value="orimattila">Orimattila</option>\n<option value="oripaa">Orip\xe4\xe4</option>\n<option value="orivesi">Orivesi</option>\n<option value="oulainen">Oulainen</option>\n<option value="oulu">Oulu</option>\n<option value="oulunsalo">Oulunsalo</option>\n<option value="outokumpu">Outokumpu</option>\n<option value="padasjoki">Padasjoki</option>\n<option value="paimio">Paimio</option>\n<option value="paltamo">Paltamo</option>\n<option value="parainen">Parainen</option>\n<option value="parikkala">Parikkala</option>\n<option value="parkano">Parkano</option>\n<option value="pedersore">Peders\xf6re</option>\n<option value="pelkosenniemi">Pelkosenniemi</option>\n<option value="pello">Pello</option>\n<option value="perho">Perho</option>\n<option value="pernaja">Pernaja</option>\n<option value="pernio">Perni\xf6</option>\n<option value="pertteli">Pertteli</option>\n<option value="pertunmaa">Pertunmaa</option>\n<option value="petajavesi">Pet\xe4j\xe4vesi</option>\n<option value="pieksamaki">Pieks\xe4m\xe4ki</option>\n<option value="pielavesi">Pielavesi</option>\n<option value="pietarsaari">Pietarsaari</option>\n<option value="pihtipudas">Pihtipudas</option>\n<option value="piikkio">Piikki\xf6</option>\n<option value="piippola">Piippola</option>\n<option value="pirkkala">Pirkkala</option>\n<option value="pohja">Pohja</option>\n<option value="polvijarvi">Polvij\xe4rvi</option>\n<option value="pomarkku">Pomarkku</option>\n<option value="pori">Pori</option>\n<option value="pornainen">Pornainen</option>\n<option value="porvoo">Porvoo</option>\n<option value="posio">Posio</option>\n<option value="pudasjarvi">Pudasj\xe4rvi</option>\n<option value="pukkila">Pukkila</option>\n<option value="pulkkila">Pulkkila</option>\n<option value="punkaharju">Punkaharju</option>\n<option value="punkalaidun">Punkalaidun</option>\n<option value="puolanka">Puolanka</option>\n<option value="puumala">Puumala</option>\n<option value="pyhtaa">Pyht\xe4\xe4</option>\n<option value="pyhajoki">Pyh\xe4joki</option>\n<option value="pyhajarvi">Pyh\xe4j\xe4rvi</option>\n<option value="pyhanta">Pyh\xe4nt\xe4</option>\n<option value="pyharanta">Pyh\xe4ranta</option>\n<option value="pyhaselka">Pyh\xe4selk\xe4</option>\n<option value="pylkonmaki">Pylk\xf6nm\xe4ki</option>\n<option value="palkane">P\xe4lk\xe4ne</option>\n<option value="poytya">P\xf6yty\xe4</option>\n<option value="raahe">Raahe</option>\n<option value="raisio">Raisio</option>\n<option value="rantasalmi">Rantasalmi</option>\n<option value="rantsila">Rantsila</option>\n<option value="ranua">Ranua</option>\n<option value="rauma">Rauma</option>\n<option value="rautalampi">Rautalampi</option>\n<option value="rautavaara">Rautavaara</option>\n<option value="rautjarvi">Rautj\xe4rvi</option>\n<option value="reisjarvi">Reisj\xe4rvi</option>\n<option value="renko">Renko</option>\n<option value="riihimaki">Riihim\xe4ki</option>\n<option value="ristiina">Ristiina</option>\n<option value="ristijarvi">Ristij\xe4rvi</option>\n<option value="rovaniemi">Rovaniemi</option>\n<option value="ruokolahti">Ruokolahti</option>\n<option value="ruotsinpyhtaa">Ruotsinpyht\xe4\xe4</option>\n<option value="ruovesi">Ruovesi</option>\n<option value="rusko">Rusko</option>\n<option value="rymattyla">Rym\xe4ttyl\xe4</option>\n<option value="raakkyla">R\xe4\xe4kkyl\xe4</option>\n<option value="saarijarvi">Saarij\xe4rvi</option>\n<option value="salla">Salla</option>\n<option value="salo">Salo</option>\n<option value="saltvik">Saltvik</option>\n<option value="sammatti">Sammatti</option>\n<option value="sauvo">Sauvo</option>\n<option value="savitaipale">Savitaipale</option>\n<option value="savonlinna">Savonlinna</option>\n<option value="savonranta">Savonranta</option>\n<option value="savukoski">Savukoski</option>\n<option value="seinajoki">Sein\xe4joki</option>\n<option value="sievi">Sievi</option>\n<option value="siikainen">Siikainen</option>\n<option value="siikajoki">Siikajoki</option>\n<option value="siilinjarvi">Siilinj\xe4rvi</option>\n<option value="simo">Simo</option>\n<option value="sipoo">Sipoo</option>\n<option value="siuntio">Siuntio</option>\n<option value="sodankyla">Sodankyl\xe4</option>\n<option value="soini">Soini</option>\n<option value="somero">Somero</option>\n<option value="sonkajarvi">Sonkaj\xe4rvi</option>\n<option value="sotkamo">Sotkamo</option>\n<option value="sottunga">Sottunga</option>\n<option value="sulkava">Sulkava</option>\n<option value="sund">Sund</option>\n<option value="suomenniemi">Suomenniemi</option>\n<option value="suomusjarvi">Suomusj\xe4rvi</option>\n<option value="suomussalmi">Suomussalmi</option>\n<option value="suonenjoki">Suonenjoki</option>\n<option value="sysma">Sysm\xe4</option>\n<option value="sakyla">S\xe4kyl\xe4</option>\n<option value="sarkisalo">S\xe4rkisalo</option>\n<option value="taipalsaari">Taipalsaari</option>\n<option value="taivalkoski">Taivalkoski</option>\n<option value="taivassalo">Taivassalo</option>\n<option value="tammela">Tammela</option>\n<option value="tammisaari">Tammisaari</option>\n<option value="tampere">Tampere</option>\n<option value="tarvasjoki">Tarvasjoki</option>\n<option value="tervo">Tervo</option>\n<option value="tervola">Tervola</option>\n<option value="teuva">Teuva</option>\n<option value="tohmajarvi">Tohmaj\xe4rvi</option>\n<option value="toholampi">Toholampi</option>\n<option value="toivakka">Toivakka</option>\n<option value="tornio">Tornio</option>\n<option value="turku" selected="selected">Turku</option>\n<option value="tuulos">Tuulos</option>\n<option value="tuusniemi">Tuusniemi</option>\n<option value="tuusula">Tuusula</option>\n<option value="tyrnava">Tyrn\xe4v\xe4</option>\n<option value="toysa">T\xf6ys\xe4</option>\n<option value="ullava">Ullava</option>\n<option value="ulvila">Ulvila</option>\n<option value="urjala">Urjala</option>\n<option value="utajarvi">Utaj\xe4rvi</option>\n<option value="utsjoki">Utsjoki</option>\n<option value="uurainen">Uurainen</option>\n<option value="uusikaarlepyy">Uusikaarlepyy</option>\n<option value="uusikaupunki">Uusikaupunki</option>\n<option value="vaala">Vaala</option>\n<option value="vaasa">Vaasa</option>\n<option value="vahto">Vahto</option>\n<option value="valkeakoski">Valkeakoski</option>\n<option value="valkeala">Valkeala</option>\n<option value="valtimo">Valtimo</option>\n<option value="vammala">Vammala</option>\n<option value="vampula">Vampula</option>\n<option value="vantaa">Vantaa</option>\n<option value="varkaus">Varkaus</option>\n<option value="varpaisjarvi">Varpaisj\xe4rvi</option>\n<option value="vehmaa">Vehmaa</option>\n<option value="velkua">Velkua</option>\n<option value="vesanto">Vesanto</option>\n<option value="vesilahti">Vesilahti</option>\n<option value="veteli">Veteli</option>\n<option value="vierema">Vierem\xe4</option>\n<option value="vihanti">Vihanti</option>\n<option value="vihti">Vihti</option>\n<option value="viitasaari">Viitasaari</option>\n<option value="vilppula">Vilppula</option>\n<option value="vimpeli">Vimpeli</option>\n<option value="virolahti">Virolahti</option>\n<option value="virrat">Virrat</option>\n<option value="vardo">V\xe5rd\xf6</option>\n<option value="vahakyro">V\xe4h\xe4kyr\xf6</option>\n<option value="vastanfjard">V\xe4stanfj\xe4rd</option>\n<option value="voyri-maksamaa">V\xf6yri-Maksamaa</option>\n<option value="yliharma">Ylih\xe4rm\xe4</option>\n<option value="yli-ii">Yli-Ii</option>\n<option value="ylikiiminki">Ylikiiminki</option>\n<option value="ylistaro">Ylistaro</option>\n<option value="ylitornio">Ylitornio</option>\n<option value="ylivieska">Ylivieska</option>\n<option value="ylamaa">Yl\xe4maa</option>\n<option value="ylane">Yl\xe4ne</option>\n<option value="ylojarvi">Yl\xf6j\xe4rvi</option>\n<option value="ypaja">Yp\xe4j\xe4</option>\n<option value="aetsa">\xc4ets\xe4</option>\n<option value="ahtari">\xc4ht\xe4ri</option>\n<option value="aanekoski">\xc4\xe4nekoski</option>\n</select>'
+
+# FISocialSecurityNumber
+##############################################################
+
+>>> from django.contrib.localflavor.fi.forms import FISocialSecurityNumber
+>>> f = FISocialSecurityNumber()
+>>> f.clean('010101-0101')
+u'010101-0101'
+>>> f.clean('010101+0101')
+u'010101+0101'
+>>> f.clean('010101A0101')
+u'010101A0101'
+>>> f.clean('101010-0102')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Finnish social security number.']
+>>> f.clean('10a010-0101')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Finnish social security number.']
+>>> f.clean('101010-0\xe401')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Finnish social security number.']
+>>> f.clean('101010b0101')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Finnish social security number.']
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f = FISocialSecurityNumber(required=False)
+>>> f.clean('010101-0101')
+u'010101-0101'
+>>> f.clean(None)
+u''
+>>> f.clean('')
+u''
+
 #################################
 # Tests of underlying functions #
 #################################
diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index 375fd36196..a77b1dcb7a 100644
--- a/tests/regressiontests/templates/tests.py
+++ b/tests/regressiontests/templates/tests.py
@@ -149,7 +149,7 @@ class Templates(unittest.TestCase):
 
             # Dictionary lookup wins out when there is a string and int version of the key.
             'list-index07': ("{{ var.1 }}", {"var": {'1': "hello", 1: "world"}}, "hello"),
-            
+
             # Basic filter usage
             'basic-syntax21': ("{{ var|upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"),
 
@@ -650,6 +650,10 @@ class Templates(unittest.TestCase):
             'widthratio09': ('{% widthratio a b %}', {'a':50,'b':100}, template.TemplateSyntaxError),
             'widthratio10': ('{% widthratio a b 100.0 %}', {'a':50,'b':100}, template.TemplateSyntaxError),
 
+            ### WITH TAG ########################################################
+            'with01': ('{% with dict.key as key %}{{ key }}{% endwith %}', {'dict': {'key':50}}, '50'),
+            'with02': ('{{ key }}{% with dict.key as key %}{{ key }}-{{ dict.key }}-{{ key }}{% endwith %}{{ key }}', {'dict': {'key':50}}, ('50-50-50', 'INVALID50-50-50INVALID')),
+
             ### NOW TAG ########################################################
             # Simple case
             'now01' : ('{% now "j n Y"%}', {}, str(datetime.now().day) + ' ' + str(datetime.now().month) + ' ' + str(datetime.now().year)),