\n"
@@ -367,13 +367,19 @@ msgstr "entradas de registro"
msgid "All dates"
msgstr "Todas las fechas"
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
-#: contrib/admin/templates/templates/admin/login.html:24
msgid "Log in"
msgstr "Identificarse"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
@@ -381,7 +387,7 @@ msgstr ""
"Por favor, identifquese de nuevo, porque su sesin ha caducado. No se "
"preocupe: se ha guardado su envo."
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -389,11 +395,11 @@ msgstr ""
"Parece que su navegador no est configurado para aceptar cookies. Actvelas "
"por favor, recargue esta pgina, e intntelo de nuevo."
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr "Los nombres de usuario no pueden contener el carcter '@'."
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
@@ -419,81 +425,81 @@ msgstr "Escoja %s para modificar"
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Se aadi con xito el %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "Puede editarlo de nuevo abajo."
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "Puede agregar otro %s abajo."
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "Agregar %s"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "Agregado %s."
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "y"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "Modificado %s."
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "Borrado %s."
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "No ha cambiado ningn campo."
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "Se modific con xito el %(name)s \"%(obj)s."
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
"Se agreg con xito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "Uno o ms %(fieldname)s en %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Uno o ms %(fieldname)s en %(name)s:"
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Se elimin con xito el %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "Est seguro?"
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr "Modificar histrico: %s"
@@ -588,21 +594,6 @@ msgstr "Texto XML"
#: contrib/admin/templates/admin_doc/model_detail.html:3
#: contrib/admin/templates/admin_doc/index.html:4
#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/templates/admin/object_history.html:3
-#: contrib/admin/templates/templates/admin/change_list.html:4
-#: contrib/admin/templates/templates/admin/base.html:23
-#: contrib/admin/templates/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/templates/admin/change_form.html:9
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/templates/admin_doc/index.html:4
-#: contrib/admin/templates/templates/admin_doc/model_index.html:5
msgid "Change password"
msgstr "Cambiar clave"
@@ -621,21 +612,6 @@ msgstr "Cambiar clave"
#: contrib/admin/templates/admin_doc/model_detail.html:3
#: contrib/admin/templates/admin_doc/index.html:4
#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/templates/admin/object_history.html:3
-#: contrib/admin/templates/templates/admin/change_list.html:4
-#: contrib/admin/templates/templates/admin/base.html:23
-#: contrib/admin/templates/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/templates/admin/change_form.html:9
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/templates/admin_doc/index.html:4
-#: contrib/admin/templates/templates/admin_doc/model_index.html:5
msgid "Log out"
msgstr "Terminar sesin"
@@ -650,50 +626,31 @@ msgstr "Terminar sesi
#: 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
-#: contrib/admin/templates/templates/admin/object_history.html:5
-#: contrib/admin/templates/templates/admin/500.html:4
-#: contrib/admin/templates/templates/admin/change_list.html:5
-#: contrib/admin/templates/templates/admin/base.html:29
-#: contrib/admin/templates/templates/admin/change_form.html:12
-#: contrib/admin/templates/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/templates/registration/logged_out.html:4
-#: contrib/admin/templates/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/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:19
-#: contrib/admin/templates/templates/admin/object_history.html:5
-#: contrib/admin/templates/templates/admin/change_form.html:19
msgid "History"
msgstr "Histrico"
#: contrib/admin/templates/admin/object_history.html:18
-#: contrib/admin/templates/templates/admin/object_history.html:18
msgid "Date/time"
msgstr "Fecha/hora"
-#: contrib/admin/templates/admin/object_history.html:19
-#: contrib/admin/templates/templates/admin/object_history.html:19
-#: models/auth.py:47
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
msgid "User"
msgstr "Usuario"
#: contrib/admin/templates/admin/object_history.html:20
-#: contrib/admin/templates/templates/admin/object_history.html:20
msgid "Action"
msgstr "Accin"
#: contrib/admin/templates/admin/object_history.html:26
-#: contrib/admin/templates/templates/admin/object_history.html:26
msgid "DATE_WITH_TIME_FULL"
msgstr ""
#: contrib/admin/templates/admin/object_history.html:36
-#: contrib/admin/templates/templates/admin/object_history.html:36
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
@@ -702,32 +659,26 @@ msgstr ""
"usando este sitio de administracin."
#: contrib/admin/templates/admin/base_site.html:4
-#: contrib/admin/templates/templates/admin/base_site.html:4
msgid "Django site admin"
msgstr "Sitio de administracin de Django"
#: contrib/admin/templates/admin/base_site.html:7
-#: contrib/admin/templates/templates/admin/base_site.html:7
msgid "Django administration"
msgstr "Administracin de Django"
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/templates/admin/500.html:4
msgid "Server error"
msgstr "Error del servidor"
#: contrib/admin/templates/admin/500.html:6
-#: contrib/admin/templates/templates/admin/500.html:6
msgid "Server error (500)"
msgstr "Error del servidor (500)"
#: contrib/admin/templates/admin/500.html:9
-#: contrib/admin/templates/templates/admin/500.html:9
msgid "Server Error (500)"
msgstr "Error de servidor (500)"
#: contrib/admin/templates/admin/500.html:10
-#: contrib/admin/templates/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."
@@ -738,77 +689,60 @@ msgstr ""
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
-#: contrib/admin/templates/templates/admin/404.html:4
-#: contrib/admin/templates/templates/admin/404.html:8
msgid "Page not found"
msgstr "Pgina no encontrada"
#: contrib/admin/templates/admin/404.html:10
-#: contrib/admin/templates/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 pgina solicitada."
#: contrib/admin/templates/admin/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/templates/admin/index.html:27
-#: contrib/admin/templates/templates/admin/change_form.html:14
msgid "Add"
msgstr "Agregar"
#: contrib/admin/templates/admin/index.html:33
-#: contrib/admin/templates/widget/file.html:3
-#: contrib/admin/templates/templates/admin/index.html:33
msgid "Change"
msgstr "Modificar"
#: contrib/admin/templates/admin/index.html:43
-#: contrib/admin/templates/templates/admin/index.html:43
msgid "You don't have permission to edit anything."
msgstr "No tiene permiso para editar nada."
#: contrib/admin/templates/admin/index.html:51
-#: contrib/admin/templates/templates/admin/index.html:51
msgid "Recent Actions"
msgstr "Acciones recientes"
#: contrib/admin/templates/admin/index.html:52
-#: contrib/admin/templates/templates/admin/index.html:52
msgid "My Actions"
msgstr "Mis acciones"
#: contrib/admin/templates/admin/index.html:56
-#: contrib/admin/templates/templates/admin/index.html:56
msgid "None available"
msgstr "Ninguno disponible"
#: contrib/admin/templates/admin/change_list.html:10
-#: contrib/admin/templates/templates/admin/change_list.html:10
#, python-format
msgid "Add %(name)s"
msgstr "Agregar %(name)s"
#: contrib/admin/templates/admin/login.html:15
-#: contrib/admin/templates/templates/admin/login.html:15
msgid "Username:"
msgstr "Usuario:"
#: contrib/admin/templates/admin/login.html:18
-#: contrib/admin/templates/templates/admin/login.html:18
msgid "Password:"
msgstr "Clave:"
#: contrib/admin/templates/admin/login.html:20
-#: contrib/admin/templates/templates/admin/login.html:20
msgid "Have you forgotten your password?"
msgstr "Ha olvidado su clave?"
#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/templates/admin/base.html:23
msgid "Welcome,"
msgstr "Bienvenido,"
#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -820,7 +754,6 @@ msgstr ""
"siguientes tipos de objetos:"
#: contrib/admin/templates/admin/delete_confirmation.html:13
-#: contrib/admin/templates/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -830,65 +763,53 @@ msgstr ""
"borrarn los siguientes objetos relacionados:"
#: contrib/admin/templates/admin/delete_confirmation.html:17
-#: contrib/admin/templates/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "S, estoy seguro"
#: contrib/admin/templates/admin/filter.html:2
-#: contrib/admin/templates/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr " Por %(title)s "
#: contrib/admin/templates/admin/search_form.html:7
-#: contrib/admin/templates/templates/admin/search_form.html:7
msgid "Go"
msgstr "Buscar"
#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/templates/admin/change_form.html:20
msgid "View on site"
msgstr "Ver en el sitio"
#: contrib/admin/templates/admin/change_form.html:28
-#: contrib/admin/templates/templates/admin/change_form.html:28
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:45
-#: contrib/admin/templates/templates/admin/change_form.html:45
msgid "Ordering"
msgstr "Ordenacin"
#: contrib/admin/templates/admin/change_form.html:48
-#: contrib/admin/templates/templates/admin/change_form.html:48
msgid "Order:"
msgstr "Orden:"
#: contrib/admin/templates/admin/submit_line.html:3
-#: contrib/admin/templates/templates/admin/submit_line.html:3
msgid "Delete"
msgstr "Eliminar"
#: contrib/admin/templates/admin/submit_line.html:4
-#: contrib/admin/templates/templates/admin/submit_line.html:4
msgid "Save as new"
msgstr "Grabar como nuevo"
#: contrib/admin/templates/admin/submit_line.html:5
-#: contrib/admin/templates/templates/admin/submit_line.html:5
msgid "Save and add another"
msgstr "Grabar y aadir otro"
#: contrib/admin/templates/admin/submit_line.html:6
-#: contrib/admin/templates/templates/admin/submit_line.html:6
msgid "Save and continue editing"
msgstr "Grabar y continuar editando"
#: contrib/admin/templates/admin/submit_line.html:7
-#: contrib/admin/templates/templates/admin/submit_line.html:7
msgid "Save"
msgstr "Grabar"
@@ -896,22 +817,15 @@ msgstr "Grabar"
#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_change_form.html:6
#: contrib/admin/templates/registration/password_change_form.html:10
-#: contrib/admin/templates/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/templates/registration/password_change_form.html:10
msgid "Password change"
msgstr "Cambio de clave"
#: contrib/admin/templates/registration/password_change_done.html:6
#: contrib/admin/templates/registration/password_change_done.html:10
-#: contrib/admin/templates/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/templates/registration/password_change_done.html:10
msgid "Password change successful"
msgstr "Cambio de clave exitoso"
#: contrib/admin/templates/registration/password_change_done.html:12
-#: contrib/admin/templates/templates/registration/password_change_done.html:12
msgid "Your password was changed."
msgstr "Su clave ha sido cambiada."
@@ -919,15 +833,10 @@ msgstr "Su clave ha sido cambiada."
#: 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
-#: contrib/admin/templates/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/templates/registration/password_reset_form.html:10
-#: contrib/admin/templates/templates/registration/password_reset_done.html:4
msgid "Password reset"
msgstr "Recuperar clave"
#: contrib/admin/templates/registration/password_reset_form.html:12
-#: contrib/admin/templates/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."
@@ -936,34 +845,27 @@ msgstr ""
"crearemos una nueva que le enviaremos por correo."
#: contrib/admin/templates/registration/password_reset_form.html:16
-#: contrib/admin/templates/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
msgstr "Direccin de correo electrnico:"
#: contrib/admin/templates/registration/password_reset_form.html:16
-#: contrib/admin/templates/templates/registration/password_reset_form.html:16
msgid "Reset my password"
msgstr "Recuperar mi clave"
#: contrib/admin/templates/registration/logged_out.html:8
-#: contrib/admin/templates/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
-#: contrib/admin/templates/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
-#: contrib/admin/templates/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/templates/registration/password_reset_done.html:10
msgid "Password reset successful"
msgstr "Recuperacin de clave exitosa"
#: contrib/admin/templates/registration/password_reset_done.html:12
-#: contrib/admin/templates/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."
@@ -972,7 +874,6 @@ msgstr ""
"recibirla en breve."
#: contrib/admin/templates/registration/password_change_form.html:12
-#: contrib/admin/templates/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."
@@ -981,80 +882,65 @@ msgstr ""
"la nueva clave dos veces para verificar que la ha escrito correctamente."
#: contrib/admin/templates/registration/password_change_form.html:17
-#: contrib/admin/templates/templates/registration/password_change_form.html:17
msgid "Old password:"
msgstr "Clave antigua:"
#: contrib/admin/templates/registration/password_change_form.html:19
-#: contrib/admin/templates/templates/registration/password_change_form.html:19
msgid "New password:"
msgstr "Clave nueva:"
#: contrib/admin/templates/registration/password_change_form.html:21
-#: contrib/admin/templates/templates/registration/password_change_form.html:21
msgid "Confirm password:"
msgstr "Confirme clave:"
#: contrib/admin/templates/registration/password_change_form.html:23
-#: contrib/admin/templates/templates/registration/password_change_form.html:23
msgid "Change my password"
msgstr "Cambiar mi clave"
#: contrib/admin/templates/registration/password_reset_email.html:2
-#: contrib/admin/templates/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
msgstr "Est recibiendo este mensaje debido a que solicit recuperar la clave"
#: contrib/admin/templates/registration/password_reset_email.html:3
-#: contrib/admin/templates/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
-#: contrib/admin/templates/templates/registration/password_reset_email.html:5
#, python-format
msgid "Your new password is: %(new_password)s"
msgstr "Su nueva clave es: %(new_password)s"
#: contrib/admin/templates/registration/password_reset_email.html:7
-#: contrib/admin/templates/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 pgina:"
#: contrib/admin/templates/registration/password_reset_email.html:11
-#: contrib/admin/templates/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
-#: contrib/admin/templates/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
-#: contrib/admin/templates/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
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Documentacin"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
msgstr "Bookmarklets"
#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:5
msgid "Documentation bookmarklets"
msgstr "Bookmarklets de documentacin"
#: contrib/admin/templates/admin_doc/bookmarklets.html:9
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:9
msgid ""
"\n"
"To install bookmarklets, drag the link to your bookmarks\n"
@@ -1075,12 +961,10 @@ msgstr ""
"p>\n"
#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:19
msgid "Documentation for this page"
msgstr "Documentacin de esta pgina"
#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:20
msgid ""
"Jumps you from any page to the documentation for the view that generates "
"that page."
@@ -1088,12 +972,10 @@ msgstr ""
"Le lleva desde cualquier pgina a la documentacin de la vista que la genera."
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:22
msgid "Show object ID"
msgstr "Mostrar ID de objeto"
#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:23
msgid ""
"Shows the content-type and unique ID for pages that represent a single "
"object."
@@ -1102,43 +984,43 @@ msgstr ""
"nico objeto."
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-#: contrib/admin/templates/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
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:26
msgid "Jumps to the admin page for pages that represent a single object."
msgstr ""
"Le lleva a la pgina de administracin de pginas que representan un nico "
"objeto."
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-#: contrib/admin/templates/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
-#: contrib/admin/templates/templates/admin_doc/bookmarklets.html:29
msgid "As above, but opens the admin page in a new window."
msgstr ""
"Como antes, pero abre la pgina de administracin en una nueva ventana."
#: contrib/admin/templates/widget/date_time.html:3
-#: contrib/admin/templates/templates/widget/date_time.html:3
msgid "Date:"
msgstr "Fecha:"
#: contrib/admin/templates/widget/date_time.html:4
-#: contrib/admin/templates/templates/widget/date_time.html:4
#, fuzzy
msgid "Time:"
msgstr "Hora"
#: contrib/admin/templates/widget/file.html:2
-msgid "Currently"
+#, fuzzy
+msgid "Currently:"
msgstr "Actualmente"
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Modificar"
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "redirigir desde"
@@ -1218,6 +1100,18 @@ msgstr "p
msgid "flat pages"
msgstr "pginas estticas"
+#: utils/translation.py:350
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:351
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:352
+msgid "TIME_FORMAT"
+msgstr ""
+
#: utils/dates.py:6
msgid "Monday"
msgstr "Lunes"
@@ -1352,18 +1246,6 @@ msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
-#: utils/translation.py:350
-msgid "DATE_FORMAT"
-msgstr ""
-
-#: utils/translation.py:351
-msgid "DATETIME_FORMAT"
-msgstr ""
-
-#: utils/translation.py:352
-msgid "TIME_FORMAT"
-msgstr ""
-
#: models/core.py:7
msgid "domain name"
msgstr "nombre de dominio"
@@ -1596,8 +1478,8 @@ msgstr "Sueco"
msgid "Simplified Chinese"
msgstr "Chino simplificado"
-#: core/formfields.py:59 core/meta/fields.py:292 core/meta/fields.py:495
-#: core/meta/fields.py:506
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
msgid "This field is required."
msgstr "Este campo es obligatorio."
@@ -1811,19 +1693,6 @@ msgstr[1] ""
"total."
#: core/validators.py:354
-#, fuzzy, python-format
-msgid ""
-"Please enter a valid decimal number with a whole part of at most %s digit."
-msgid_plural ""
-"Please enter a valid decimal number with a whole part of at most %s digits."
-msgstr[0] ""
-"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgito en "
-"total."
-msgstr[1] ""
-"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos en "
-"total."
-
-#: core/validators.py:357
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural ""
@@ -1835,30 +1704,30 @@ msgstr[1] ""
"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos "
"decimales."
-#: core/validators.py:367
+#: core/validators.py:364
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Asegrese de que el fichero que enva tiene al menos %s bytes."
-#: core/validators.py:368
+#: core/validators.py:365
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Asegrese de que el fichero que enva tiene como mximo %s bytes."
-#: core/validators.py:381
+#: core/validators.py:378
msgid "The format for this field is wrong."
msgstr "El formato de este campo es incorrecto."
-#: core/validators.py:396
+#: core/validators.py:393
msgid "This field is invalid."
msgstr "Este campo no es vlido."
-#: core/validators.py:431
+#: core/validators.py:428
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "No pude obtener nada de %s."
-#: core/validators.py:434
+#: core/validators.py:431
#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@@ -1866,7 +1735,7 @@ msgstr ""
"La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s', que no "
"es vlida."
-#: core/validators.py:467
+#: core/validators.py:464
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -1875,7 +1744,7 @@ msgstr ""
"Por favor, cierre la etiqueta %(tag)s de la lnea %(line)s. (La lnea "
"empieza por \"%(start)s\".)"
-#: core/validators.py:471
+#: core/validators.py:468
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -1884,7 +1753,7 @@ msgstr ""
"Parte del texto que comienza en la lnea %(line)s no est permitido en ese "
"contexto. (La lnea empieza por \"%(start)s\".)"
-#: core/validators.py:476
+#: core/validators.py:473
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -1893,7 +1762,7 @@ msgstr ""
"El \"%(attr)s\" de la lnea %(line)s no es un atributo vlido. (La lnea "
"empieza por \"%(start)s\".)"
-#: core/validators.py:481
+#: core/validators.py:478
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -1902,7 +1771,7 @@ msgstr ""
"La \"<%(tag)s>\" de la lnea %(line)s no es una etiqueta vlida. (La lnea "
"empieza por \"%(start)s\".)"
-#: core/validators.py:485
+#: core/validators.py:482
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -1911,7 +1780,7 @@ msgstr ""
"A una etiqueta de la lnea %(line)s le faltan uno o ms atributos "
"requeridos. (La lnea empieza por \"%(start)s\".)"
-#: core/validators.py:490
+#: core/validators.py:487
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -1920,7 +1789,7 @@ msgstr ""
"El atributo \"%(attr)s\" de la lnea %(line)s tiene un valor que no es "
"vlido. (La lnea empieza por \"%(start)s\".)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, fuzzy, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "Ya existe %(optname)s con este %(fieldname)s."
@@ -1935,20 +1804,20 @@ msgstr "Por favor, introduzca un %s v
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "Ya existe %(optname)s con este %(fieldname)s."
-#: core/meta/fields.py:136
+#: core/meta/fields.py:129
msgid " Separate multiple IDs with commas."
msgstr " Separe mltiples IDs con comas."
-#: core/meta/fields.py:139
+#: core/meta/fields.py:132
msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Pulse \"Control\" o \"Command\" en un Mac para escoger ms de uno."
-#: core/meta/fields.py:515
+#: core/meta/fields.py:508
msgid "Enter a valid filename."
msgstr "Introduzca un nombre de fichero vlido"
-#: core/meta/fields.py:789
+#: core/meta/fields.py:782
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -1963,3 +1832,22 @@ msgstr[1] ""
#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "si,no,tal vez"
+
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter a valid decimal number with a whole part of at most %s digit."
+#~ msgid_plural ""
+#~ "Please enter a valid decimal number with a whole part of at most %s "
+#~ "digits."
+#~ msgstr[0] ""
+#~ "Por favor, introduzca un nmero decimal vlido con a lo ms %s dgito en "
+#~ "total."
+#~ msgstr[1] ""
+#~ "Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos en "
+#~ "total."
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 0faaf53da0b34f4dc9edf92f7d891ceb7461493c..0a47c469ad33e1ec727c3e510b442535c4a868c0 100644
GIT binary patch
delta 23
ecmbQ-!8o~tal>hK4kI%KLnA9=)6JLF9b^DtJqLLJ
delta 23
ecmbQ-!8o~tal>hK4nuPVBO@y#v(1;)9b^DtMF)BS
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 2fbeff5f5a..a8d62787bc 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-17 22:26+0100\n"
+"POT-Creation-Date: 2005-12-26 12:35+0100\n"
"PO-Revision-Date: 2005-10-18 12:27+0200\n"
"Last-Translator: Laurent Rahuel \n"
"Language-Team: franais \n"
@@ -355,28 +355,35 @@ msgstr "entr
msgid "All dates"
msgstr ""
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "Connectez vous"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr ""
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
msgstr ""
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr ""
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
@@ -401,80 +408,80 @@ msgstr ""
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Ajouter"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Modifier"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Modifier"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Modifier votre mot de passe"
@@ -1816,6 +1823,12 @@ msgstr[1] ""
msgid "yes,no,maybe"
msgstr ""
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
#~ msgid "Traditional Chinese"
#~ msgstr "Chinois traditionnel"
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index b8755e16fb6f0c6999032f302e72f738143a1d2f..538da90cced6cca78ea3983ad47a7b8709bfc613 100644
GIT binary patch
delta 23
fcmezTit+O+#tnIH97bjehDKJ#CY#IL{^|h$e18c~
delta 23
fcmezTit+O+#tnIH9ERo!Mn+afrkl&${^|h$e1{28
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index bbd09bc387..f2e329c510 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-17 22:25+0100\n"
+"POT-Creation-Date: 2005-12-26 12:34+0100\n"
"PO-Revision-Date: 2005-12-20 10:48+0100\n"
"Last-Translator: Afonso Fernández Nogueira \n"
"Language-Team: Galego\n"
@@ -362,12 +362,19 @@ msgstr "entradas de rexistro"
msgid "All dates"
msgstr "Todas as datas"
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "Entrar"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
@@ -375,7 +382,7 @@ msgstr ""
"Ten que identicarse outra vez porque a súa sesión expirou. Non se preocupe, "
"o que enviou quedou gardado."
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -383,11 +390,11 @@ msgstr ""
"Semella que o seu navegador non está configurado para aceptar 'cookies'. "
"Por favor, habilite as 'cookies', recargue a páxina e ténteo de novo."
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr "Os nomes de usuario non poden conter o carácter '@'."
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
@@ -413,82 +420,80 @@ msgstr "Seleccione %s que modificar"
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Engadiuse correctamente o/a %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "Pode editalo embaixo."
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "Pode engadir outro/a %s embaixo."
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "Engadir %s"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "Engadido/a %s."
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "e"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "Modificado(s) %s."
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "Eliminado(s) %s."
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "Non se modificou ningún campo."
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "Modificouse correctamente o/a %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-"Engadiuse correctamente o/a %(name)s \"%(obj)s\" Pode editalo "
-"embaixo."
+msgstr "Engadiuse correctamente o/a %(name)s \"%(obj)s\" Pode editalo embaixo."
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "Un ou máis %(fieldname)s no/a %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Un ou máis %(fieldname)s no/a %(name)s:"
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Eliminouse correctamente o/a %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "Está seguro?"
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr "Histórico de cambios: %s"
@@ -1805,3 +1810,9 @@ msgstr[1] ""
#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "si,non,quizais"
+
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 3d919dee5ad718b752e024a3840a38528fb2b089..633ef011a19c8821514b3463ddfbd21e27efa4d7 100644
GIT binary patch
delta 23
ecmdnj#kjAFaYLUbhmo0rp^=rb>E>ygE2IHq_XorP
delta 23
ecmdnj#kjAFaYLUbhoQNGk&%^=`Q~YwE2IHr1qa3e
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index 5cbf502846..3186072669 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.po
+++ b/django/conf/locale/is/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-17 22:27+0100\n"
+"POT-Creation-Date: 2005-12-26 12:35+0100\n"
"PO-Revision-Date: 2005-11-13 18:08-0000\n"
"Last-Translator: Dagur Páll Ammendrup \n"
"Language-Team: \n"
@@ -358,28 +358,35 @@ msgstr "kladdafærslur"
msgid "All dates"
msgstr ""
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "Skrá inn"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr ""
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
msgstr ""
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr ""
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
@@ -404,80 +411,80 @@ msgstr ""
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Bæta við"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Breyta"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Breyta"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Breyta lykilorði"
@@ -1795,6 +1802,12 @@ msgstr[1] ""
msgid "yes,no,maybe"
msgstr ""
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "innihald"
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 869646dc2b9ba0112a37b0b1b3bedfd1fef06f0b..b0ba315a9b71dfe5bc436d42e98637e98d476aff 100644
GIT binary patch
delta 23
fcmey`!1%R+al\n"
"Language-Team: LANGUAGE \n"
@@ -356,28 +356,35 @@ msgstr "voci di log"
msgid "All dates"
msgstr ""
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "Accedi"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr ""
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
msgstr ""
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr ""
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
@@ -402,80 +409,80 @@ msgstr "Clicca per cambiare"
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Aggiungi"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Cambia"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Cambia"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Cambia la password"
@@ -1795,6 +1802,12 @@ msgstr[1] ""
msgid "yes,no,maybe"
msgstr ""
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "contenuto"
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 4429692a215d15635e0f7633665d218ad59d1e07..cb0fba27dfef3e6f43ad76ac4eeb11a0a920747c 100644
GIT binary patch
delta 23
ecmeyioAKLj#tnH^97bjehDKJ#rkl&G8k7NZq6k<3
delta 23
ecmeyioAKLj#tnH^9ERo!Mn+afW}C~b8k7NZst8#C
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index 9375b91f83..6540bbd2af 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-17 22:26+0100\n"
+"POT-Creation-Date: 2005-12-26 12:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Espen Grndhaug \n"
"Language-Team: Norwegian\n"
@@ -373,12 +373,19 @@ msgstr "logg innlegg"
msgid "All dates"
msgstr "Alle datoer"
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "Log inn"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
@@ -386,7 +393,7 @@ msgstr ""
"Du må logge inn igjen, fordi sesjonen din har gått ut på dato, men ikke ikke "
"bekjymr deg informasjonen du sendte ble lagret."
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -395,11 +402,11 @@ msgstr ""
"('cookies'). Vennligst omkonfigurer nettleseren din, last siden på ny og "
"prøv igjen."
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr "Brukernavnet kan ikke inneholde '@'"
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Epost adressen din er ikke brukernavnet ditt, prøv '%s' i stede."
@@ -424,80 +431,80 @@ msgstr "Velg %s for å endre"
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" ble lagt inn i databasen."
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "Du kan endre under"
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "Du kan legge til en ny %s under."
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "Ny %s"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "La til %s"
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "og"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "Endret %s."
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "Slettet %s."
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "Ingen felt endret."
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" ble endret."
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "Endre %s"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "En eller flere %(fieldname)s i %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "En eller flere %(fieldname)s i %(name)s:"
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" ble slettet."
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "Er du sikker?"
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Endre historien: %s"
@@ -1817,6 +1824,12 @@ msgstr[1] ""
msgid "yes,no,maybe"
msgstr ""
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
#~ msgid "Error in Template"
#~ msgstr "Feil i mal"
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index eef409d258c6748e455f0f1894325b794dca2a6d..004486007434ed44a1c59765c97e1a1d0f686e30 100644
GIT binary patch
delta 21
ccmX?Af2w}N5;YDZGX+B\n"
"Language-Team: Português do Brasil \n"
@@ -356,28 +356,35 @@ msgstr "entradas de log"
msgid "All dates"
msgstr ""
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "Acessar"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr ""
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
msgstr ""
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr ""
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
@@ -402,80 +409,80 @@ msgstr "Clique para alterar"
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Adicionar"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Modificar"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Modificar"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Alterar senha"
@@ -1801,6 +1808,12 @@ msgstr[1] ""
msgid "yes,no,maybe"
msgstr ""
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "conteúdo"
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 599955a91b0daf5b92bcc4ef11ff8d3abc750a38..06c39a2ed9d2bc4342a4156ee7085793963e4e32 100644
GIT binary patch
delta 23
ecmX@n%6Oucal;G^4kI%KLnA9=)6EMsG^7AzjR#)<
delta 23
ecmX@n%6Oucal;G^4nuPVBO@y#v&{=MG^7Azl?Pw|
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index f660f51c2e..7f9a791080 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/django/conf/locale/ro/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-17 22:26+0100\n"
+"POT-Creation-Date: 2005-12-26 12:35+0100\n"
"PO-Revision-Date: 2005-11-08 19:06+GMT+2\n"
"Last-Translator: Tiberiu Micu \n"
"Language-Team: Romanian \n"
@@ -356,28 +356,35 @@ msgstr "intrări log"
msgid "All dates"
msgstr ""
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "Login"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr ""
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
msgstr ""
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr ""
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
@@ -402,80 +409,80 @@ msgstr ""
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Adaugă"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Schimbă"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Schimbă"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Schimbă parola"
@@ -1801,6 +1808,12 @@ msgstr[1] ""
msgid "yes,no,maybe"
msgstr ""
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "conţinut"
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index ae61313c42966654736470613005680beee251cd..4317e6cb8b47eeb1302df636946ce4688c45c24e 100644
GIT binary patch
delta 23
fcmcb*gz@SU#tkLL97bjehDKJ#rkiVwZ^{7xYYzxI
delta 23
fcmcb*gz@SU#tkLL9ERo!Mn+afW}9n_Z^{7xYZnMR
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 262726be7d..5289f7fb5b 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-17 22:26+0100\n"
+"POT-Creation-Date: 2005-12-26 12:35+0100\n"
"PO-Revision-Date: 2005-11-26 00:00\n"
"Last-Translator: Dmitry Sorokin \n"
"Language-Team: LANGUAGE \n"
@@ -345,12 +345,19 @@ msgstr "
msgid "All dates"
msgstr " "
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr ""
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
@@ -358,7 +365,7 @@ msgstr ""
" , . :"
" ."
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -366,11 +373,11 @@ msgstr ""
", cookies. "
"cookie, . "
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr " '@'."
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
@@ -394,80 +401,80 @@ msgstr "
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" ."
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr " "
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr " % ."
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr " %s"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr " %s"
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr " %s."
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr " %s."
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr " %s"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr " %(fieldname)s %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr " %(fieldname)s %(name)s:"
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" ."
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr " ?"
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr " : %s"
@@ -1763,6 +1770,12 @@ msgstr[1] ""
msgid "yes,no,maybe"
msgstr ""
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
#~ msgid ""
#~ "Example: 'flatfiles/contact_page'. If this isn't provided, the system "
#~ "will use 'flatfiles/default'."
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 4a62338b5e5a33f3bc0e1d940c96e545056e0306..7ec2daa57c69d8ec5dfb1e1dc7909b5d5a7f9981 100644
GIT binary patch
delta 23
ecmezMj`7z!#tmW~97bjehDKJ#rkmwFV)OxaSqK^c
delta 23
ecmezMj`7z!#tmW~9ERo!Mn+afW}D?aV)OxaVF()l
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 6b152d15bd..a6b20d6a09 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-17 22:26+0100\n"
+"POT-Creation-Date: 2005-12-26 12:35+0100\n"
"PO-Revision-Date: 2005-11-10 23:22-0500\n"
"Last-Translator: Vladimir Labath \n"
"Language-Team: Slovak \n"
@@ -364,12 +364,19 @@ msgstr "záznamy priebehu"
msgid "All dates"
msgstr "Všetky dátumy"
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "Prihlásenie"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
@@ -377,7 +384,7 @@ msgstr ""
"Prosím prihlaste sa znovu, lebo čas vášho sedenia vypršal. Nemajte obavy: "
"Vaše údaje su uchované."
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -385,11 +392,11 @@ msgstr ""
"Vyzerá, že váš prehliadač nemá povolené cookies. Prosím povoľte cookies, "
"znovu načítajte túto stránku a skúste činnosť znovu."
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr "Meno užívateľa nemože obsahovať znak '@' ."
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Vaša e-mailova adresa nie je vaše užívateľské meno. Skúste '%s'."
@@ -413,50 +420,50 @@ msgstr "Výber %s na zmenu"
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný."
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "Môžete urobiť zmeny zase nižšie."
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "Môžete pridať ďalší %s nižšie."
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "Pridaj %s"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "Bol pridaný %s."
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "a"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "Bol zmenený %s"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "Bol vymazaný %s."
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "Polia neboli zmenené."
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "Objekt %(name)s \"%(obj)s\" boli úspešne zmenený."
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -464,31 +471,31 @@ msgstr ""
"Objekt %(name)s \"%(obj)s\" bol úspešne zmenený. Ďalšie zmeny môžete urobiť "
"zase nižšie."
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "Zmeň %s"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "Jeden alebo viac %(fieldname)s v %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Jeden alebo viac %(fieldname)s v %(name)s:"
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne vymazaný."
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "Ste si istý?"
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr "Zmena histórie:"
@@ -1806,3 +1813,9 @@ msgstr[1] "Prosím vložte platné %(self)s IDs. Hodnoty %(value)r sú neplatn
#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "ano,nie,možno"
+
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 239b719223bb6698136296387e27d57313cbaa95..3910062aa54d05efdd22f00982b10b03a179bd8f 100644
GIT binary patch
delta 23
ecmZ4cnsM!G#tq&c97bjehDKJ#CYysjqI3am2M6B(
delta 23
ecmZ4cnsM!G#tq&c9ERo!Mn+afrkjI3qI3am4+r1?
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 2f2bafbd56..fc91b0a8ea 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django Serbian (latin) translation v1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-17 22:25+0100\n"
+"POT-Creation-Date: 2005-12-26 12:34+0100\n"
"PO-Revision-Date: 2005-12-05 15:00+0100\n"
"Last-Translator: Nebojša Đorđević \n"
"Language-Team: Nesh & Petar \n"
"Language-Team: Django translators \n"
@@ -366,12 +366,19 @@ msgstr "loggposter"
msgid "All dates"
msgstr "Alla datum"
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "Logga in"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
@@ -379,7 +386,7 @@ msgstr ""
"Du måste logga in igen, eftersom din session har tagit slut. Oroa dig inte: "
"ditt bidrag har sparats."
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -387,11 +394,11 @@ msgstr ""
"Det ser ut som om din webbläsare inte är konfigurerad att acceptera kakor. "
"Aktivera kakor, ladda om den här sidan, och försök igen."
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr "Användarnamn kan inte innehålla tecknet '@'."
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället."
@@ -415,80 +422,80 @@ msgstr "Välj vilken %s du vill ändra"
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)set \"%(obj)s\" lades till."
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "Du kan ändra det igen här under."
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "Du kan lägga till en till %s här under"
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "Lägg till %s"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "Lade till %s."
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "och"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "Ändrade %s."
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "Tog bort %s."
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "Inga fält ändrade."
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)set \"%(obj)s\" ändrades."
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "%(name)set \"%(obj)s\" lades till. Du kan ändra det igen här under."
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "Ändra %s"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "Ett eller flera %(fieldname)s i %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Ett eller flera %(fieldname)s i %(name)s:"
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)set \"%(obj)s\" togs bort."
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "Är du säker?"
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr "Ändra historien: %s"
@@ -1808,6 +1815,12 @@ msgstr[1] ""
msgid "yes,no,maybe"
msgstr "ja,nej,kanske"
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "innehåll"
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 40cb2836eb196d2e918fdef364708c8e79afd1de..d0d04e1a837eec69338b1944716fd4b1a9531c4c 100644
GIT binary patch
delta 23
fcmaEIpYh3k#tr%&97bjehDKJ#CY#MY)~W*la>xiu
delta 23
fcmaEIpYh3k#tr%&9ERo!Mn+afrkl+@)~W*la?l7%
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index fd4d8f79cf..8220dc586f 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django v1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-17 22:25+0100\n"
+"POT-Creation-Date: 2005-12-26 12:34+0100\n"
"PO-Revision-Date: 2005-12-10 22:08+0800\n"
"Last-Translator: Hiweed Leng \n"
"Language-Team: Simplified Chinese \n"
@@ -358,18 +358,25 @@ msgstr "日志记录"
msgid "All dates"
msgstr "全有日期"
-#: contrib/admin/views/decorators.py:22
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
msgstr "登录"
-#: contrib/admin/views/decorators.py:56
+#: contrib/admin/views/decorators.py:57
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr "请重新登录,因为你的会话已经过期。不用担心:你的提交已经被保存。"
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:64
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -377,11 +384,11 @@ msgstr ""
"看上去你的浏览器没有配置成接受 cookie 。请允许 cookie,重新装入本页面,再试一"
"次。"
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
msgstr "用户名不能包含 '@' 字符。"
-#: contrib/admin/views/decorators.py:79
+#: contrib/admin/views/decorators.py:80
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "你的邮箱地址不是你的用户名。换 '%s' 试试。"
@@ -405,80 +412,80 @@ msgstr "选择 %s 来修改"
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" 添加成功。"
-#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "你可以在下面再次编辑它。"
-#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "你可以在下面增加另一个 %s 。"
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "增加 %s"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "%s 已增加。"
-#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "和"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "已修改 %s 。"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "%s 已删除。"
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "没有字段被修改。"
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" 修改成功。"
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。"
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "修改 %s"
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "一个或多个 %(fieldname)s 在 %(name)s 中: %(obj)s"
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "一个或多个 %(fieldname)s 在 %(name)s 中:"
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" 删除成功。"
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "你确信吗?"
-#: contrib/admin/views/main.py:665
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr "修改历史: %s"
@@ -1752,6 +1759,12 @@ msgstr[0] "请输入有效的 %(self)s ID。值 %(value)r 无效。"
msgid "yes,no,maybe"
msgstr "是、否、也许"
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "内容"
diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py
index 852057bf53..4e65f87669 100644
--- a/django/contrib/admin/views/decorators.py
+++ b/django/contrib/admin/views/decorators.py
@@ -2,10 +2,11 @@ from django.core.extensions import DjangoContext, render_to_response
from django.conf.settings import SECRET_KEY
from django.models.auth import users
from django.utils import httpwrappers
+from django.utils.translation import gettext_lazy
import base64, md5
import cPickle as pickle
-ERROR_MESSAGE = "Please enter a correct username and password. Note that both fields are case-sensitive."
+ERROR_MESSAGE = gettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.")
LOGIN_FORM_KEY = 'this_is_the_login_form'
def _display_login_form(request, error_message=''):
diff --git a/django/parts/auth/formfields.py b/django/parts/auth/formfields.py
index 7d0cea2f52..cfbad248da 100644
--- a/django/parts/auth/formfields.py
+++ b/django/parts/auth/formfields.py
@@ -24,18 +24,18 @@ class AuthenticationForm(formfields.Manipulator):
def hasCookiesEnabled(self, field_data, all_data):
if self.request and not self.request.session.test_cookie_worked():
- raise validators.ValidationError, "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
+ raise validators.ValidationError, _("Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in.")
def isValidUser(self, field_data, all_data):
try:
self.user_cache = users.get_object(username__exact=field_data)
except users.UserDoesNotExist:
- raise validators.ValidationError, "Please enter a correct username and password. Note that both fields are case-sensitive."
+ raise validators.ValidationError, _("Please enter a correct username and password. Note that both fields are case-sensitive.")
def isValidPasswordForUser(self, field_data, all_data):
if self.user_cache is not None and not self.user_cache.check_password(field_data):
self.user_cache = None
- raise validators.ValidationError, "Please enter a correct username and password. Note that both fields are case-sensitive."
+ raise validators.ValidationError, _("Please enter a correct username and password. Note that both fields are case-sensitive.")
def get_user_id(self):
if self.user_cache: