\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"
@@ -1565,39 +1447,47 @@ msgid "Italian"
msgstr "Italiano"
#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Norwegian"
msgstr "Noruego"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "Brasileo"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr "Rumano"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "Ruso"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Serbian"
msgstr "Serbio"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
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
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
+#: 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 +1701,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 +1712,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 +1743,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 +1752,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 +1761,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 +1770,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 +1779,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 +1788,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 +1797,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 +1812,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 +1840,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 0faaf53da0..7a5d2dcfcc 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 2fbeff5f5a..51047ef31e 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ 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-29 00:04+0100\n"
"PO-Revision-Date: 2005-10-18 12:27+0200\n"
-"Last-Translator: Laurent Rahuel \n"
+"Last-Translator: Mikal Barbero \n"
"Language-Team: franais \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -23,7 +23,7 @@ msgstr "id de l'objet"
#: contrib/comments/models/comments.py:9
msgid "headline"
-msgstr ""
+msgstr "titre"
#: contrib/comments/models/comments.py:10
#: contrib/comments/models/comments.py:162
@@ -33,73 +33,75 @@ msgstr "contenu"
#: contrib/comments/models/comments.py:11
msgid "rating #1"
-msgstr ""
+msgstr "vote n1"
#: contrib/comments/models/comments.py:12
msgid "rating #2"
-msgstr ""
+msgstr "vote n2"
#: contrib/comments/models/comments.py:13
msgid "rating #3"
-msgstr ""
+msgstr "vote n3"
#: contrib/comments/models/comments.py:14
msgid "rating #4"
-msgstr ""
+msgstr "vote n4"
#: contrib/comments/models/comments.py:15
msgid "rating #5"
-msgstr ""
+msgstr "vote n5"
#: contrib/comments/models/comments.py:16
msgid "rating #6"
-msgstr ""
+msgstr "vote n6"
#: contrib/comments/models/comments.py:17
msgid "rating #7"
-msgstr ""
+msgstr "vote n7"
#: contrib/comments/models/comments.py:18
msgid "rating #8"
-msgstr ""
+msgstr "vote n8"
#: contrib/comments/models/comments.py:23
msgid "is valid rating"
-msgstr ""
+msgstr "est un vote valide"
#: contrib/comments/models/comments.py:24
#: contrib/comments/models/comments.py:164
msgid "date/time submitted"
-msgstr ""
+msgstr "date et heure soumises"
#: contrib/comments/models/comments.py:25
#: contrib/comments/models/comments.py:165
msgid "is public"
-msgstr ""
+msgstr "est public"
#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
-msgstr "courriel"
+msgstr "adresse IP"
#: contrib/comments/models/comments.py:27
msgid "is removed"
-msgstr ""
+msgstr "est supprim"
#: contrib/comments/models/comments.py:27
msgid ""
"Check this box if the comment is inappropriate. A \"This comment has been "
"removed\" message will be displayed instead."
msgstr ""
+"Cochez cette case si le commentaire est inadquat. Un message type \"Ce "
+"commentaire a t supprim\" sera affich en lieu et place de celui-ci."
#: contrib/comments/models/comments.py:31
msgid "Comment"
-msgstr ""
+msgstr "Commentaire"
#: contrib/comments/models/comments.py:32
#, fuzzy
msgid "Comments"
-msgstr "autoriser les commentaires"
+msgstr "Commentaires"
#: contrib/comments/models/comments.py:85
#: contrib/comments/models/comments.py:204
@@ -116,6 +118,11 @@ msgid ""
"\n"
"http://%(domain)s%(url)s"
msgstr ""
+"Post par %(user)s %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
#: contrib/comments/models/comments.py:163
#, fuzzy
@@ -125,63 +132,63 @@ msgstr "pr
#: contrib/comments/models/comments.py:166
#, fuzzy
msgid "ip address"
-msgstr "courriel"
+msgstr "adresse IP"
#: contrib/comments/models/comments.py:168
msgid "approved by staff"
-msgstr ""
+msgstr "approuv par l'quipe"
#: contrib/comments/models/comments.py:172
#, fuzzy
msgid "Free comment"
-msgstr "autoriser les commentaires"
+msgstr "Commentaire libre"
#: contrib/comments/models/comments.py:173
#, fuzzy
msgid "Free comments"
-msgstr "autoriser les commentaires"
+msgstr "Commentaires libres"
#: contrib/comments/models/comments.py:209
msgid "score"
-msgstr ""
+msgstr "valuation"
#: contrib/comments/models/comments.py:210
#, fuzzy
msgid "score date"
-msgstr "date d'expiration"
+msgstr "Date d'valuation"
#: contrib/comments/models/comments.py:213
msgid "Karma score"
-msgstr ""
+msgstr "Point de Karma"
#: contrib/comments/models/comments.py:214
msgid "Karma scores"
-msgstr ""
+msgstr "Points de Karma"
#: contrib/comments/models/comments.py:223
#, python-format
msgid "%(score)d rating by %(user)s"
-msgstr ""
+msgstr "%(score)d valu par %(user)s"
#: contrib/comments/models/comments.py:248
#, fuzzy
msgid "flag date"
-msgstr "page plat"
+msgstr "date d'indicateur"
#: contrib/comments/models/comments.py:251
#, fuzzy
msgid "User flag"
-msgstr "Utilisateur"
+msgstr "Indicateur utilisateur"
#: contrib/comments/models/comments.py:252
#, fuzzy
msgid "User flags"
-msgstr "Utilisateurs"
+msgstr "Indicateurs utilisateur"
#: contrib/comments/models/comments.py:256
#, python-format
msgid "Flag by %r"
-msgstr ""
+msgstr "Indicateur par %r"
#: contrib/comments/models/comments.py:271
#, python-format
@@ -190,42 +197,46 @@ msgid ""
"\n"
"%(text)s"
msgstr ""
+"Ce commentaire a t marqu par %(user)s:\n"
+"\n"
+"%(text)s"
#: contrib/comments/models/comments.py:278
#, fuzzy
msgid "deletion date"
-msgstr "donne de session"
+msgstr "date de suppression"
#: contrib/comments/models/comments.py:281
msgid "Moderator deletion"
-msgstr ""
+msgstr "Suppression de modrateur"
#: contrib/comments/models/comments.py:282
msgid "Moderator deletions"
-msgstr ""
+msgstr "Suppressions de modrateur"
#: contrib/comments/models/comments.py:286
#, python-format
msgid "Moderator deletion by %r"
-msgstr ""
+msgstr "Suppression de modrateur par %r"
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Les utilisateurs anonymes ne peuvent pas voter"
#: contrib/comments/views/karma.py:22
#, fuzzy
msgid "Invalid comment ID"
-msgstr "autoriser les commentaires"
+msgstr "ID de commentaire invalide"
#: contrib/comments/views/karma.py:24
msgid "No voting for yourself"
-msgstr ""
+msgstr "Impossible de voter pour soi-mme"
#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
+"Ce votre est ncssaire parceque vous avez saisi au moins un autre vote."
#: contrib/comments/views/comments.py:109
#, python-format
@@ -240,7 +251,15 @@ msgid_plural ""
"\n"
"%(text)s"
msgstr[0] ""
+"Ce commentaire a t post par un utilisateur qui a post moins de %(count)s "
+"commentaire :\n"
+"\n"
+"%(text)s"
msgstr[1] ""
+"Ce commentaire a t post par un utilisateur qui a post moins de %(count)s "
+"commentaires :\n"
+"\n"
+"%(text)s"
#: contrib/comments/views/comments.py:114
#, python-format
@@ -249,21 +268,26 @@ msgid ""
"\n"
"%(text)s"
msgstr ""
+"Ce commentaire a t post par un utilisateur imprcis :\n"
+"\n"
+"%(text)s"
#: contrib/comments/views/comments.py:186
#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
-msgstr ""
+msgstr "Seuls les POSTs sont autoriss"
#: contrib/comments/views/comments.py:190
#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
-msgstr ""
+msgstr "Un ou plusieurs champs requis n'ont pas t remplis"
#: contrib/comments/views/comments.py:194
#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
+"Quelqu'un a trifouill le formulaire de commentaire (violation des rgles de "
+"scurit)"
#: contrib/comments/views/comments.py:204
#: contrib/comments/views/comments.py:289
@@ -271,11 +295,15 @@ msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
+"Ce formulaire de commentaire avait un paramtre cible invalide ; l'ID de "
+"l'objet tait invalide"
#: contrib/comments/views/comments.py:254
#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
+"Le formulaire de commentaire ne proposait ni les options de prvisualisation "
+"ni d'envoi"
#: contrib/admin/filterspecs.py:40
#, python-format
@@ -283,45 +311,47 @@ msgid ""
"By %s:
\n"
"\n"
msgstr ""
+"Par %s :
\n"
+"\n"
#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
#: contrib/admin/filterspecs.py:143
msgid "All"
-msgstr ""
+msgstr "Tout"
#: contrib/admin/filterspecs.py:109
msgid "Any date"
-msgstr ""
+msgstr "Toutes les dates"
#: contrib/admin/filterspecs.py:110
#, fuzzy
msgid "Today"
-msgstr "Lundi"
+msgstr "Aujourd'hui"
#: contrib/admin/filterspecs.py:113
msgid "Past 7 days"
-msgstr ""
+msgstr "Les 7 derniers jours"
#: contrib/admin/filterspecs.py:115
msgid "This month"
-msgstr ""
+msgstr "Ce mois-ci"
#: contrib/admin/filterspecs.py:117
msgid "This year"
-msgstr ""
+msgstr "Cette anne"
#: contrib/admin/filterspecs.py:143
msgid "Yes"
-msgstr ""
+msgstr "Oui"
#: contrib/admin/filterspecs.py:143
#, fuzzy
msgid "No"
-msgstr "Nov."
+msgstr "Non"
#: contrib/admin/filterspecs.py:150
msgid "Unknown"
-msgstr ""
+msgstr "Inconnu"
#: contrib/admin/models/admin.py:6
msgid "action time"
@@ -333,11 +363,11 @@ msgstr "id de l'objet"
#: contrib/admin/models/admin.py:10
msgid "object repr"
-msgstr "repr de l'objet"
+msgstr "reprsentation de l'objet"
#: contrib/admin/models/admin.py:11
msgid "action flag"
-msgstr "drapeau de l'action"
+msgstr "indicateur de l'action"
#: contrib/admin/models/admin.py:12
msgid "change message"
@@ -345,207 +375,224 @@ msgstr "message de modification"
#: contrib/admin/models/admin.py:15
msgid "log entry"
-msgstr "entre de log"
+msgstr "entre d'historique"
#: contrib/admin/models/admin.py:16
msgid "log entries"
-msgstr "entres de log"
+msgstr "entres d'historique"
#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
-msgstr ""
+msgstr "Toutes les dates"
-#: 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 ""
+"Saisissez s'il vous plaut un nom d'utilisateur et un mot de passe valide. "
+"Remarquez que chacun de ces champs est sensible la casse (diffrenciation "
+"des majuscules/minuscules)."
+
+#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
-msgstr "Connectez vous"
+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 ""
+"Votre session a expir, connectez-vous de nouveau s'il vous plat. Ne vous "
+"inquitez pas, votre travail prcdement ffectu a t sauv."
-#: 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 ""
+"Il semblerait que votre navigateur n'accepte pas les cookies. Activez-les, "
+"rechargez cette page et rssayez s'il vous plat."
-#: contrib/admin/views/decorators.py:77
+#: contrib/admin/views/decorators.py:78
msgid "Usernames cannot contain the '@' character."
-msgstr ""
+msgstr "Les noms d'utilisateur ne peuvent contenir le caractre '@'"
-#: 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 ""
+"Votre courriel n'est pas votre nom d'utilisateur. Essayez '%s' la place."
#: contrib/admin/views/main.py:52
#, fuzzy
msgid "Site administration"
-msgstr "Administration de Django"
+msgstr "Gestion du site"
#: contrib/admin/views/main.py:67
#, python-format
msgid "Select %s"
-msgstr ""
+msgstr "Slectionnez %s"
#: contrib/admin/views/main.py:68
#, python-format
msgid "Select %s to change"
-msgstr ""
+msgstr "Slectionnez %s pour changer"
#: contrib/admin/views/main.py:410
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
+msgstr "L'objet %(name)s \"%(obj)s\" a t ajout avec succs."
-#: 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 ""
+msgstr "Vous pouvez continuez de l'ditez ci-dessous."
-#: 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 ""
+msgstr "Vous pouvez ajouter un autre %s ci-dessous."
-#: contrib/admin/views/main.py:440
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
-msgstr "Ajouter"
+msgstr "Ajouter %s"
-#: contrib/admin/views/main.py:456
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
-msgstr ""
+msgstr "Ajout %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 ""
+msgstr "et"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
-msgstr "Modifier"
+msgstr "Modifi %s."
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
-msgstr ""
+msgstr "Supprim %s."
-#: contrib/admin/views/main.py:463
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
-msgstr ""
+msgstr "Aucun champs modifi."
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
+msgstr "L'objet %(name)s \"%(obj)s\" a t modifi avec succs."
-#: 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 ""
+"L'objet %(name)s \"%(obj)s\" a t ajout avec succs.Vous pouvez continuez "
+"de l'ditez ci-dessous."
-#: contrib/admin/views/main.py:535
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
-msgstr "Modifier"
+msgstr "Changement %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 ""
+msgstr "Un ou plusieurs %(fieldname)s dans %(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 ""
+msgstr "Un ou plusieurs %(fieldname)s dans %(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 ""
+msgstr "L'objet %(name)s \"%(obj)s\" a t supprim avec succs."
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
-msgstr ""
+msgstr "tes-vous sr ?"
-#: 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"
+msgstr "Historique des changements : %s"
#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
-msgstr ""
+msgstr "Entier"
#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Boolen (Vrai ou Faux)"
#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "Chane de caractre (jusqu' %(maxlength)s)"
#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
-msgstr ""
+msgstr "Des entiers spars par une virgule"
#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
-msgstr "heure de l'action"
+msgstr "Date (sans l'heure)"
#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
-msgstr "Date/Heure"
+msgstr "Date (avec l'heure)"
#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
-msgstr "Courriel:"
+msgstr "Courriel :"
#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
-msgstr ""
+msgstr "Chemin vers le fichier"
#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
-msgstr "Dcembre"
+msgstr "Nombre dcimal"
#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Boolen (Vrai, Faux ou None)"
#: contrib/admin/views/doc.py:259
msgid "Relation to parent model"
-msgstr ""
+msgstr "Relation au modle parent"
#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
-msgstr "Entrez un nombre entier."
+msgstr "Numro de tlphone"
#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
-msgstr ""
+msgstr "Chane de caractre (jusqu' 50)"
#: contrib/admin/views/doc.py:265
msgid "Text"
-msgstr ""
+msgstr "Texte"
#: contrib/admin/views/doc.py:266
msgid "Time"
-msgstr ""
+msgstr "Heure"
#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
@@ -553,11 +600,11 @@ msgstr "URL"
#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "tat U.S. (deux lettres majuscules)"
#: contrib/admin/views/doc.py:269
msgid "XML text"
-msgstr ""
+msgstr "Texte XML"
#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_list.html:4
@@ -705,7 +752,7 @@ msgstr "Aucun(e) disponible"
#: contrib/admin/templates/admin/change_list.html:10
#, fuzzy, python-format
msgid "Add %(name)s"
-msgstr "Ajouter"
+msgstr "Ajouter %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -730,9 +777,9 @@ msgid ""
"objects, but your account doesn't have permission to delete the following "
"types of objects:"
msgstr ""
-"Supprimer %(object_name)s '%(object)s' provoquerait la suppression des "
-"objets qui lui sont lis mais votre compte ne possde pas la permission de "
-"supprimer les types d'objets suivants:"
+"Supprimer l'objet %(object_name)s '%(object)s' provoquerait la suppression "
+"des objets qui lui sont lis mais votre compte ne possde pas la permission "
+"de supprimer les types d'objets suivants :"
#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
@@ -740,60 +787,60 @@ msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
"the following related items will be deleted:"
msgstr ""
-"tes vous certain de vouloir supprimer %(object_name)s \"%(object)s\"? Tous "
-"les lments lis suivants seront supprims:"
+"tes vous certain de vouloir supprimer l'objet %(object_name)s \"%(object)s"
+"\" ? Les lments suivant sont lis celui-ci et seront aussi supprims :"
#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
-msgstr "Oui, je suis certain"
+msgstr "Oui, j'en suis certain"
#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
-msgstr ""
+msgstr " Par %(title)s "
#: contrib/admin/templates/admin/search_form.html:7
msgid "Go"
-msgstr ""
+msgstr "Envoyer"
#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
-msgstr ""
+msgstr "Voir sur le site"
#: contrib/admin/templates/admin/change_form.html:28
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Veuillez corriger l'erreur ci-dessous."
+msgstr[1] "Veuillez corriger les erreurs ci-dessous."
#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
-msgstr ""
+msgstr "Tri"
#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
-msgstr ""
+msgstr "Ordre :"
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
#: contrib/admin/templates/admin/submit_line.html:4
msgid "Save as new"
-msgstr ""
+msgstr "Sauver en tant que nouveau"
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save and add another"
-msgstr ""
+msgstr "Sauver et ajouter un nouveau"
#: contrib/admin/templates/admin/submit_line.html:6
msgid "Save and continue editing"
-msgstr ""
+msgstr "Sauver et continuer les modifications"
#: contrib/admin/templates/admin/submit_line.html:7
#, fuzzy
msgid "Save"
-msgstr "actif"
+msgstr "Sauver"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -829,7 +876,7 @@ msgstr ""
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
-msgstr "Courriel:"
+msgstr "Courriel :"
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "Reset my password"
@@ -837,7 +884,7 @@ msgstr "R
#: contrib/admin/templates/registration/logged_out.html:8
msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Merci pour le temps que vous avez accord au site aujourd'hui."
+msgstr "Merci pour le temps que vous avez accord ce site aujourd'hui."
#: contrib/admin/templates/registration/logged_out.html:10
msgid "Log in again"
@@ -846,7 +893,7 @@ msgstr "Connectez vous
#: contrib/admin/templates/registration/password_reset_done.html:6
#: contrib/admin/templates/registration/password_reset_done.html:10
msgid "Password reset successful"
-msgstr "Mot de passe rinitialis avec succs"
+msgstr "Mot de passe rinitialis avec succs"
#: contrib/admin/templates/registration/password_reset_done.html:12
msgid ""
@@ -867,15 +914,15 @@ msgstr ""
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
-msgstr "Ancien mot de passe:"
+msgstr "Ancien mot de passe :"
#: contrib/admin/templates/registration/password_change_form.html:19
msgid "New password:"
-msgstr "Nouveau mot de passe:"
+msgstr "Nouveau mot de passe :"
#: contrib/admin/templates/registration/password_change_form.html:21
msgid "Confirm password:"
-msgstr "Confirmation de votre nouveau mot de passe"
+msgstr "Confirmation du nouveau mot de passe"
#: contrib/admin/templates/registration/password_change_form.html:23
msgid "Change my password"
@@ -889,24 +936,24 @@ msgstr ""
#: contrib/admin/templates/registration/password_reset_email.html:3
#, python-format
msgid "for your user account at %(site_name)s"
-msgstr "pour votre compte du site %(site_name)s"
+msgstr "pour votre compte au site %(site_name)s"
#: contrib/admin/templates/registration/password_reset_email.html:5
#, python-format
msgid "Your new password is: %(new_password)s"
-msgstr "Votre nouveau mot de passe est: %(new_password)s"
+msgstr "Votre nouveau mot de passe est : %(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 "Vous pouvez modifier ce mot de passe l'adresse suivante:"
+msgstr "Vous pouvez modifier ce mot de passe l'adresse suivante :"
#: contrib/admin/templates/registration/password_reset_email.html:11
msgid "Your username, in case you've forgotten:"
-msgstr "Votre nom d'utilisateur, en cas d'oubli:"
+msgstr "Votre nom d'utilisateur, en cas d'oubli :"
#: contrib/admin/templates/registration/password_reset_email.html:13
msgid "Thanks for using our site!"
-msgstr "Merci d'utiliser notre site!"
+msgstr "Merci d'utiliser notre site !"
#: contrib/admin/templates/registration/password_reset_email.html:15
#, python-format
@@ -915,15 +962,15 @@ msgstr "L'
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
-msgstr ""
+msgstr "Documentation"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
-msgstr ""
+msgstr "Signets"
#: contrib/admin/templates/admin_doc/bookmarklets.html:5
msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "Documentation des signets"
#: contrib/admin/templates/admin_doc/bookmarklets.html:9
msgid ""
@@ -938,57 +985,63 @@ msgstr ""
#: contrib/admin/templates/admin_doc/bookmarklets.html:19
msgid "Documentation for this page"
-msgstr ""
+msgstr "Documentation pour cette page"
#: 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 ""
+"Vous envoie de n'importe quelle page vers la documentation de la vue qui a "
+"gnr cette page."
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
#, fuzzy
msgid "Show object ID"
-msgstr "id de l'objet"
+msgstr "Montrer l'ID de l'objet"
#: contrib/admin/templates/admin_doc/bookmarklets.html:23
msgid ""
"Shows the content-type and unique ID for pages that represent a single "
"object."
msgstr ""
+"Montre le content-type et l'ID unique pour les pages qui reprsente un objet "
+"unique."
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Edit this object (current window)"
-msgstr ""
+msgstr "Editer cette objet (fentre courante)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:26
msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
+msgstr "Renvoie la page d'administration qui reprsente un objet seul."
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "Edit this object (new window)"
-msgstr ""
+msgstr "Editer cette objet (nouvelle fentre)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:29
msgid "As above, but opens the admin page in a new window."
msgstr ""
+"Comme ci-dessus, mais ouvre la page d'administration dans une nouvelle "
+"fentre."
#: contrib/admin/templates/widget/date_time.html:3
msgid "Date:"
-msgstr ""
+msgstr "Date :"
#: contrib/admin/templates/widget/date_time.html:4
msgid "Time:"
-msgstr ""
+msgstr "Heure :"
#: contrib/admin/templates/widget/file.html:2
msgid "Currently:"
-msgstr ""
+msgstr "Actuellement :"
#: contrib/admin/templates/widget/file.html:3
#, fuzzy
msgid "Change:"
-msgstr "Modifier"
+msgstr "Modification :"
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
@@ -1016,11 +1069,11 @@ msgstr ""
#: contrib/redirects/models/redirects.py:12
msgid "redirect"
-msgstr "redirection"
+msgstr "redirige"
#: contrib/redirects/models/redirects.py:13
msgid "redirects"
-msgstr "redirections"
+msgstr "redirige"
#: contrib/flatpages/models/flatpages.py:7
msgid ""
@@ -1074,15 +1127,15 @@ msgstr "pages
#: utils/translation.py:350
msgid "DATE_FORMAT"
-msgstr ""
+msgstr "j F Y"
#: utils/translation.py:351
msgid "DATETIME_FORMAT"
-msgstr ""
+msgstr "j F Y, G:i"
#: utils/translation.py:352
msgid "TIME_FORMAT"
-msgstr ""
+msgstr "G:i:s"
#: utils/dates.py:6
msgid "Monday"
@@ -1142,7 +1195,7 @@ msgstr "Juillet"
#: utils/dates.py:15
msgid "August"
-msgstr "Aut"
+msgstr "Aot"
#: utils/dates.py:15
msgid "September"
@@ -1191,35 +1244,35 @@ msgstr "D
#: utils/timesince.py:12
msgid "year"
msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "anne"
+msgstr[1] "annes"
#: utils/timesince.py:13
#, fuzzy
msgid "month"
msgid_plural "months"
-msgstr[0] "contenu"
-msgstr[1] "contenu"
+msgstr[0] "mois"
+msgstr[1] "mois"
#: utils/timesince.py:14
#, fuzzy
msgid "day"
msgid_plural "days"
-msgstr[0] "Lundi"
-msgstr[1] "Lundi"
+msgstr[0] "journe"
+msgstr[1] "jours"
#: utils/timesince.py:15
msgid "hour"
msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "heure"
+msgstr[1] "heures"
#: utils/timesince.py:16
#, fuzzy
msgid "minute"
msgid_plural "minutes"
-msgstr[0] "site"
-msgstr[1] "site"
+msgstr[0] "minute"
+msgstr[1] "minutes"
#: models/core.py:7
msgid "domain name"
@@ -1327,7 +1380,7 @@ msgstr "mot de passe"
#: models/auth.py:37
msgid "Use '[algo]$[salt]$[hexdigest]'"
-msgstr ""
+msgstr "Utilisez '[algo]$[salt]$[hexdigest]'"
#: models/auth.py:38
msgid "staff status"
@@ -1343,7 +1396,7 @@ msgstr "actif"
#: models/auth.py:40
msgid "superuser status"
-msgstr "statut superuser"
+msgstr "statut super-utilisateur"
#: models/auth.py:41
msgid "last login"
@@ -1388,12 +1441,12 @@ msgstr "Tch
#: conf/global_settings.py:39
msgid "Welsh"
-msgstr ""
+msgstr "Gallois"
#: conf/global_settings.py:40
#, fuzzy
msgid "Danish"
-msgstr "Espagnol"
+msgstr "Dannois"
#: conf/global_settings.py:41
msgid "German"
@@ -1417,7 +1470,7 @@ msgstr "Galicien"
#: conf/global_settings.py:46
msgid "Icelandic"
-msgstr ""
+msgstr "Islandais"
#: conf/global_settings.py:47
#, fuzzy
@@ -1425,50 +1478,58 @@ msgid "Italian"
msgstr "Italien"
#: conf/global_settings.py:48
-msgid "Norwegian"
+msgid "Japanese"
msgstr ""
#: conf/global_settings.py:49
+msgid "Norwegian"
+msgstr "Norvgien"
+
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "Brsilien"
-#: conf/global_settings.py:50
-msgid "Romanian"
-msgstr ""
-
#: conf/global_settings.py:51
+msgid "Romanian"
+msgstr "Roumain"
+
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "Russe"
-#: conf/global_settings.py:52
-msgid "Slovak"
-msgstr ""
-
#: conf/global_settings.py:53
+msgid "Slovak"
+msgstr "Slovaque"
+
+#: conf/global_settings.py:54
#, fuzzy
msgid "Serbian"
msgstr "Serbe"
-#: conf/global_settings.py:54
-msgid "Swedish"
-msgstr ""
-
#: conf/global_settings.py:55
+msgid "Swedish"
+msgstr "Sudois"
+
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
-msgstr ""
+msgstr "Chinois simplifi"
+
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr "Chinois traditionnel"
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
#, fuzzy
msgid "This field is required."
-msgstr "Ce champ est invalide."
+msgstr "Ce champ est obligatoire."
#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s character."
msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Assurez-vous que votre texte fais moins de %s caractre."
+msgstr[1] "Assurez-vous que votre texte fais moins de %s caractres."
#: core/formfields.py:343
#, fuzzy
@@ -1478,37 +1539,38 @@ msgstr "Les lettres minuscules ne sont pas autoris
#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr ""
+msgstr "Slectionnez un choix valide ; '%(data)s' n'est pas dans %(choices)s."
#: core/formfields.py:603
msgid "The submitted file is empty."
-msgstr ""
+msgstr "Le fichier soumis est vide."
#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Entrez un nombre entier."
+msgstr "Entrez un nombre entier entre -32 768 et 32 767."
#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
-msgstr "Entrez un nombre entier."
+msgstr "Entrez un nombre entier positif."
#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
-msgstr "Entrez un nombre entier."
+msgstr "Entrez un nombre entier entre 0 et 32 767."
#: core/validators.py:62
msgid "This value must contain only letters, numbers and underscores."
msgstr ""
-"Ce champ ne doit contenir que des lettres, des nombres et des sous-tirets."
+"Ce champ ne doit contenir que des lettres, des nombres et des tirets bas "
+"('_')."
#: core/validators.py:66
msgid "This value must contain only letters, numbers, underscores and slashes."
msgstr ""
-"Ce champ ne doit contenir que des lettres, des nombres, des sous-tirets et "
-"des '/'."
+"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas ('_') "
+"et des '/'."
#: core/validators.py:74
msgid "Uppercase letters are not allowed here."
@@ -1520,7 +1582,7 @@ msgstr "Les lettres minuscules ne sont pas autoris
#: core/validators.py:85
msgid "Enter only digits separated by commas."
-msgstr "Seulement des chiffres ([0-9]), spars par des virgules."
+msgstr "Saisissez uniquement des chiffres spars par des virgules."
#: core/validators.py:97
msgid "Enter valid e-mail addresses separated by commas."
@@ -1540,7 +1602,7 @@ msgstr "Les caract
#: core/validators.py:113
msgid "This value can't be comprised solely of digits."
-msgstr "Cette valeur ne peut contenir que des chiffres [0-9]."
+msgstr "Cette valeur ne peut pas tre compos uniquement de chiffres."
#: core/validators.py:118
msgid "Enter a whole number."
@@ -1583,7 +1645,7 @@ msgstr "L'URL %s ne pointe pas vers une image valide."
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr ""
-"Les numros de tlphone doivent tre au format XX XX XX XX XX. \"%s\" est "
+"Les numros de tlphone doivent tre au format XXX-XXX-XXXX. \"%s\" est "
"incorrect."
#: core/validators.py:169
@@ -1601,18 +1663,18 @@ msgid ""
"Valid HTML is required. Specific errors are:\n"
"%s"
msgstr ""
-"Du HTML valide est requis. Les erreurs spcifiques sont:\n"
+"Du HTML valide est requis. Les erreurs sont les suivantes :\n"
"%s"
#: core/validators.py:194
#, python-format
msgid "Badly formed XML: %s"
-msgstr "XML mal form: %s"
+msgstr "XML mal form : %s"
#: core/validators.py:204
#, python-format
msgid "Invalid URL: %s"
-msgstr "URL invalide: %s"
+msgstr "URL invalide : %s"
#: core/validators.py:208 core/validators.py:210
#, python-format
@@ -1627,8 +1689,8 @@ msgstr "Entrez une abr
#, 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] "Attention votre langage,! Le mot %s n'est pas autoris ici."
-msgstr[1] "Attention votre langage,! Les mots %s ne sont pas autoriss ici."
+msgstr[0] "Attention votre langage ! Le mot %s n'est pas autoris ici."
+msgstr[1] "Attention votre langage ! Les mots %s ne sont pas autoriss ici."
#: core/validators.py:238
#, python-format
@@ -1637,11 +1699,12 @@ msgstr "Ce champ doit correspondre au champ '%s'."
#: core/validators.py:257
msgid "Please enter something for at least one field."
-msgstr "S'il vous plat, saisissez au moins une valeur dans un des champs."
+msgstr "Saisissez au moins une valeur dans un des champs s'il vous plat."
#: core/validators.py:266 core/validators.py:277
msgid "Please enter both fields or leave them both empty."
-msgstr "S'il vous plat, renseignez chaque champ ou laissez les deux vides."
+msgstr ""
+"Renseignez chacun des champs ou laissez les deux vides s'il vous plat."
#: core/validators.py:284
#, python-format
@@ -1664,7 +1727,7 @@ msgstr "Cette valeur doit
#: core/validators.py:349
msgid "Please enter a valid decimal number."
-msgstr "S'il vous plat, saisissez un nombre dcimal valide."
+msgstr "Saisissez un nombre dcimal valide s'il vous plat."
#: core/validators.py:351
#, python-format
@@ -1672,9 +1735,9 @@ 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] ""
-"S'il vous plat, saisissez un nombre dcimal valide avec au plus %s chiffre."
+"Saisissez un nombre dcimal valide avec au plus %s chiffre s'il vous plat."
msgstr[1] ""
-"S'il vous plat, saisissez un nombre dcimal valide avec au plus %s chiffres."
+"Saisissez un nombre dcimal valide avec au plus %s chiffres s'il vous plat."
#: core/validators.py:354
#, python-format
@@ -1682,9 +1745,9 @@ msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural ""
"Please enter a valid decimal number with at most %s decimal places."
msgstr[0] ""
-"S'il vous plat, saisissez un nombre dcimal valide avec au plus %s dcimale"
+"Saisissez un nombre dcimal valide avec au plus %s dcimale s'il vous plat"
msgstr[1] ""
-"S'il vous plat, saisissez un nombre dcimal valide avec au plus %s dcimales"
+"Saisissez un nombre dcimal valide avec au plus %s dcimales s'il vous plat"
#: core/validators.py:364
#, python-format
@@ -1786,7 +1849,7 @@ msgstr "Entrez une adresse IP valide."
#: core/meta/fields.py:60
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr ""
+msgstr "%(optname)s avec le champs %(fieldname)s existe dj."
#: core/meta/fields.py:129
msgid " Separate multiple IDs with commas."
@@ -1796,28 +1859,34 @@ msgstr "S
msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-"Maintenez \"Control\", or \"Command\" sur un Mac, pour en slectionner plus "
-"d'une."
+"Maintenez \"Contrle (ctrl)\", ou \"Commande (touche pomme)\" sur un Mac, "
+"pour en slectionner plusieurs."
#: core/meta/fields.py:508
#, fuzzy
msgid "Enter a valid filename."
-msgstr "Entrez une adresse de courriel valide."
+msgstr "Entrez un nom de fichier valide."
#: core/meta/fields.py:782
#, 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] ""
+msgstr[0] "Entrez un ID %(self)s valide. La valeur %(value)r est invalide."
msgstr[1] ""
+"Entrez des ID %(self)s valides. Les valeurs %(value)r sont invalides."
#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
-msgstr ""
+msgstr "oui,non,peut-tre"
-#~ msgid "Traditional Chinese"
-#~ msgstr "Chinois traditionnel"
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Votre navigateur ne semble pas avoir activ les cookies. Les cookies sont "
+"ncessaire pour se connecter"
#~ msgid "Messages"
#~ msgstr "Messages"
diff --git a/django/conf/locale/fr/LC_MESSAGES/djangojs.mo b/django/conf/locale/fr/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..12a53b39e2
Binary files /dev/null and b/django/conf/locale/fr/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/djangojs.po b/django/conf/locale/fr/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..8cf467187e
--- /dev/null
+++ b/django/conf/locale/fr/LC_MESSAGES/djangojs.po
@@ -0,0 +1,110 @@
+# French translation for js.
+# Copyright (C) 2005 Mikal Barbero
+# This file is distributed under the same license as the PACKAGE package.
+# Mikal Barbero , 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-24 16:39+0100\n"
+"PO-Revision-Date: 2005-12-24 16:39+0100\n"
+"Last-Translator: Mikal Barbero \n"
+"Language-Team: French \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/admin/media/js/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Janvier Fvrier Mars Avril Mai Juin Juillet Aot Septembre Octobre Novembre "
+"Dcembre"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "D L M M J V S"
+
+#: contrib/admin/media/js/dateparse.js:27
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Dimanche Lundi Mardi Mercredi Jeudi Vendredi Samedi"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "Disponible %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "Tout choisir"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "Ajouter"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "Enlever"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "Choisi %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr "Slectionnez un ou plusieurs choix et cliquez "
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "Tout enlever"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+msgid "Now"
+msgstr "Maintenant"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+msgid "Clock"
+msgstr "Horloge"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+msgid "Choose a time"
+msgstr "Choisir une heure"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Midnight"
+msgstr "Minuit"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "6 a.m."
+msgstr "6:00"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "Noon"
+msgstr "Midi"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+msgid "Cancel"
+msgstr "Annuler"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+msgid "Today"
+msgstr "Aujourd'hui"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+msgid "Calendar"
+msgstr "Calendrier"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+msgid "Yesterday"
+msgstr "Hier"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+msgid "Tomorrow"
+msgstr "Demain"
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index b8755e16fb..5805a2aa81 100644
Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index bbd09bc387..c938b54c0e 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-29 00:04+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"
@@ -1429,37 +1434,45 @@ msgid "Italian"
msgstr "italiano"
#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Norwegian"
msgstr "noruegués"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "brasileiro"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr "romanés"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr "chinés simplificado"
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
msgid "This field is required."
@@ -1805,3 +1818,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 3d919dee5a..7492cc6336 100644
Binary files a/django/conf/locale/is/LC_MESSAGES/django.mo and b/django/conf/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index 5cbf502846..17fdaa69bb 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-29 00:05+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"
@@ -1417,37 +1424,45 @@ msgid "Italian"
msgstr "Ítalska"
#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Norwegian"
msgstr "Norska"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "Brasilíska"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr "Rúmenska"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "Rússneska"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr "Slóvanska"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Serbian"
msgstr "Serbíska"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr "Einfölduð Kínverska "
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
#, fuzzy
@@ -1795,6 +1810,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 869646dc2b..1174968316 100644
Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 0b240c31a4..3b6eecc1cf 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/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-29 00:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \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"
@@ -1416,38 +1423,46 @@ msgid "Italian"
msgstr "Italiano"
#: conf/global_settings.py:48
-msgid "Norwegian"
+msgid "Japanese"
msgstr ""
#: conf/global_settings.py:49
+msgid "Norwegian"
+msgstr ""
+
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "Brasiliano"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
#, fuzzy
msgid "Serbian"
msgstr "Serbo"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr ""
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
#, fuzzy
@@ -1795,6 +1810,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/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..3b6683d82e
Binary files /dev/null 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
new file mode 100644
index 0000000000..e6689e7977
--- /dev/null
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@@ -0,0 +1,1803 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-29 00:05+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+msgid "object ID"
+msgstr "オブジェクトID"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr "ヘッドライン"
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+msgid "comment"
+msgstr "コメント"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr "レーティング #1"
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr "レーティング #2"
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr "レーティング #3"
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr "レーティング #4"
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr "レーティング #5"
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr "レーティング #6"
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr "レーティング #7"
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr "レーティング #8"
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr "は有効なレーティングです"
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr "登録された日/時間"
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr "は公開中です"
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
+msgid "IP address"
+msgstr "IPアドレス"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr "は削除されました"
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"コメントが不適切な場合はチェックを入れてください。「コメントは削除されまし"
+"た」と表示されるようになります。"
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr "コメント"
+
+#: contrib/comments/models/comments.py:32
+msgid "Comments"
+msgstr "コメント"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+msgid "Content object"
+msgstr "コンテントオブジェクト"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"投稿者: %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+
+#: contrib/comments/models/comments.py:163
+msgid "person's name"
+msgstr "名前"
+
+#: contrib/comments/models/comments.py:166
+msgid "ip address"
+msgstr "IPアドレス"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr "スタッフに承認されています。"
+
+#: contrib/comments/models/comments.py:172
+msgid "Free comment"
+msgstr "自由コメント"
+
+#: contrib/comments/models/comments.py:173
+msgid "Free comments"
+msgstr "自由コメント"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr "スコア"
+
+#: contrib/comments/models/comments.py:210
+msgid "score date"
+msgstr "スコア日"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr "カルマ スコア"
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr "カルマ スコア"
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr "%(user)s のレーティング %(score)d 点"
+
+#: contrib/comments/models/comments.py:248
+msgid "flag date"
+msgstr "フラグ日"
+
+#: contrib/comments/models/comments.py:251
+msgid "User flag"
+msgstr "ユーザフラグ"
+
+#: contrib/comments/models/comments.py:252
+msgid "User flags"
+msgstr "ユーザフラグ"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr "%r によるフラグ"
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"このコメントは %(user)s がフラグ付けしました。:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/models/comments.py:278
+msgid "deletion date"
+msgstr "削除日"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr "モデレータ削除"
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr "モデレータ削除"
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr "%r によるモデレータ削除"
+
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr "非ログインユーザは投票できません。"
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr "不正なコメントID"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr "自分には投票できません。"
+
+#: contrib/comments/views/comments.py:25
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr "あなたが他のレーティングを入力したので、このレーティングが必要です。"
+
+#: contrib/comments/views/comments.py:109
+#, 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] ""
+"このコメントは %(count)s より少ないコメントをしたことのある人に投稿されまし"
+"た。"
+msgstr[1] ""
+"このコメントは %(count)s より少ないコメントをしたことのある人に投稿されまし"
+"た。"
+
+#: contrib/comments/views/comments.py:114
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"このコメントは不明なユーザに投稿されました。:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
+msgid "Only POSTs are allowed"
+msgstr "POSTメソッドのみ有効です。"
+
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
+msgid "One or more of the required fields wasn't submitted"
+msgstr "いくつかの必須項目が提出されませんでした。"
+
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "コメントフォームが改竄されています(セキュリティ侵害)"
+
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"コメントフォームの「target」パラメータが不正です。 -- オブジェクトIdが不正で"
+"す "
+
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "コメントフォームに「プレビュー」「投稿」のどちらも指示がありません。"
+
+#: contrib/admin/filterspecs.py:40
+#, python-format
+msgid ""
+"By %s:
\n"
+"\n"
+msgstr ""
+"%s で絞る
\n"
+"\n"
+
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
+msgid "All"
+msgstr "全て"
+
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr "全ての日"
+
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "今日"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr "最近7日間"
+
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "今月"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "今年"
+
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
+msgstr "はい"
+
+#: contrib/admin/filterspecs.py:143
+msgid "No"
+msgstr "いいえ"
+
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
+msgstr "不明"
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "操作時間"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "オブジェクトID"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "オブジェクトの説明"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "操作フラグ"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "メッセージ変更"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "ログ"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "ログ"
+
+#: contrib/admin/templatetags/admin_list.py:245
+msgid "All dates"
+msgstr "全ての日:"
+
+#: 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: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: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:78
+msgid "Usernames cannot contain the '@' character."
+msgstr "ユーザ名は'@'を含むことが出来ません。"
+
+#: contrib/admin/views/decorators.py:80
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "メールアドレスはユーザ名ではありません。'%s'を試してみてください。"
+
+#: contrib/admin/views/main.py:52
+msgid "Site administration"
+msgstr "サイト管理"
+
+#: contrib/admin/views/main.py:67
+#, python-format
+msgid "Select %s"
+msgstr "%sを選択"
+
+#: contrib/admin/views/main.py:68
+#, python-format
+msgid "Select %s to change"
+msgstr "変更する %s を選択"
+
+#: contrib/admin/views/main.py:410
+#, python-format
+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:492
+msgid "You may edit it again below."
+msgstr "この下で再び変更可能です。"
+
+#: 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:441
+#, python-format
+msgid "Add %s"
+msgstr "%s を追加"
+
+#: contrib/admin/views/main.py:457
+#, python-format
+msgid "Added %s."
+msgstr "%s が追加されました。"
+
+#: 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:459
+#, python-format
+msgid "Changed %s."
+msgstr "%s が変更されました。"
+
+#: contrib/admin/views/main.py:461
+#, python-format
+msgid "Deleted %s."
+msgstr "%s が削除されました。"
+
+#: contrib/admin/views/main.py:464
+msgid "No fields changed."
+msgstr "変更はありませんでした。"
+
+#: 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: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:536
+#, python-format
+msgid "Change %s"
+msgstr "%s を変更"
+
+#: contrib/admin/views/main.py:614
+#, 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:619
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "%(name)sに%(fieldname)s が一つ以上あります:"
+
+#: 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:651
+msgid "Are you sure?"
+msgstr "よろしいですか? "
+
+#: contrib/admin/views/main.py:666
+#, python-format
+msgid "Change history: %s"
+msgstr "変更履歴: %s"
+
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
+msgid "Integer"
+msgstr "数値"
+
+#: contrib/admin/views/doc.py:245
+msgid "Boolean (Either True or False)"
+msgstr "真偽値(真か偽)"
+
+#: contrib/admin/views/doc.py:246
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr "文字列 ( %(maxlength)s まで )"
+
+#: contrib/admin/views/doc.py:247
+msgid "Comma-separated integers"
+msgstr "カンマ区切りの数字"
+
+#: contrib/admin/views/doc.py:248
+msgid "Date (without time)"
+msgstr "日付"
+
+#: contrib/admin/views/doc.py:249
+msgid "Date (with time)"
+msgstr "日時"
+
+#: contrib/admin/views/doc.py:250
+msgid "E-mail address"
+msgstr "メールアドレス"
+
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
+msgid "File path"
+msgstr "ファイルの場所"
+
+#: contrib/admin/views/doc.py:252
+msgid "Decimal number"
+msgstr "数字(小数点部有)"
+
+#: contrib/admin/views/doc.py:258
+msgid "Boolean (Either True, False or None)"
+msgstr "真偽値(真か偽か無し)"
+
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr "上位モデルへの関連"
+
+#: contrib/admin/views/doc.py:260
+msgid "Phone number"
+msgstr "電話番号"
+
+#: contrib/admin/views/doc.py:263
+msgid "String (up to 50)"
+msgstr "文字列(50まで)"
+
+#: contrib/admin/views/doc.py:265
+msgid "Text"
+msgstr "テキスト"
+
+#: contrib/admin/views/doc.py:266
+msgid "Time"
+msgstr "時間"
+
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:268
+msgid "U.S. state (two uppercase letters)"
+msgstr "アメリカの州(大文字二文字で)"
+
+#: contrib/admin/views/doc.py:269
+msgid "XML text"
+msgstr "XMLテキスト"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: 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 "パスワード変更"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: 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 "ログアウト"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.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 "ホーム"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
+msgid "History"
+msgstr "履歴"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "日/時間"
+
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+msgid "User"
+msgstr "ユーザ"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "操作"
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr ""
+
+#: 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 ""
+"オブジェクトに変更履歴がありません。この管理サイト以外で追加されたものかもし"
+"れません。"
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Djangoサイト管理者"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django管理"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "サーバエラー"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "サーバエラー(500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error (500)"
+msgstr "サーバエラー(500)"
+
+#: 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 ""
+"エラーが発生しました。サイトの管理者へメールにて通知をいたしましたので、近い"
+"うちに修正されるはずです。しばらくお待ちください。"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "ページが見つかりません"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "申し訳ありませんが、お探しのページが見つかりませんでした。"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "追加"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "変更"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "変更する権限が一つもありません。"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "最近行った操作"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "操作"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "利用不可"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "%(name)s を追加"
+
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "ユーザ名"
+
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "パスワード"
+
+#: contrib/admin/templates/admin/login.html:20
+msgid "Have you forgotten your password?"
+msgstr "パスワードを忘れましたか?"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "ようこそ"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"%(object_name)s '%(object)s'を削除するさいに関連するものを削除しようとしまし"
+"たが、アカウントの権限が足りませんでした。"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:13
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"%(object_name)s \"%(object)s\"を削除しますか?関連するものが全て削除されま"
+"す。"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:17
+msgid "Yes, I'm sure"
+msgstr "はい。"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(title)s "
+msgstr "%(title)s で絞る"
+
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr "移動"
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "サイトに関する見解"
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "下記エラーを正しく入力してください。"
+msgstr[1] "下記エラーを正しく入力してください。"
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "順序"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "並び替え"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "削除"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "新規保存"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "保存してもう一つ追加"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "保存して編集を続ける"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "保存"
+
+#: 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 "パスワード変更"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "パスワードを変更しました"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "パスワードが変更されました"
+
+#: 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 "パスワードをリセット"
+
+#: 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 ""
+"パスワードを忘れましたか?メールアドレスを入力してください。パスワードをリ"
+"セットして新しいパスワードをメールでお知らせします。"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "メールアドレス"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "パスワードをリセット"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "ご利用ありがとうございました。"
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "もう一度ログイン"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "パスワードのリセットが成功しました"
+
+#: 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 ""
+"入力されたメールアドレスに新しいパスワードをメールしました。まもなく届くで"
+"しょう。"
+
+#: 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 ""
+"セキュリティ上の理由から元のパスワードの入力が必要です。新しいパスワードは、"
+"入力を正しくしたかの確認をしますので二度入力してください。"
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "元のパスワード"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "新しいパスワード"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "パスワード確認"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "パスワードの変更"
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "あなたがパスワードのリセットを指示したので、このメールを送りました。"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "%(site_name)s のアカウント"
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+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 "このページで気軽にパスワードを変更してください:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "あなたのユーザ名、忘れた場合:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "ご利用ありがとうございました!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr " %(site_name)s チーム"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "文書"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "ブックマークレット"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "文書のブックマークレット"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"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\").
\n"
+msgstr ""
+"\n"
+"ブックマークレットをインストールするには、リンクをブック"
+"マークツールバーにドラッグするか\n"
+"リンクを右クリックしてブックマークに追加してください。これで\n"
+"サイトのどのページからでもブックマークレットを選択可能になりました。\n"
+"ブックマークレットによっては、内部ネットワークにあるコンピュータからこのサイ"
+"トを\n"
+"参照していなければならないことがあります。内部ネットワークにあるかどうか不明"
+"な場合は、システム管理者に確認してください。
\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "このページのドキュメント"
+
+#: 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 "どのページからもページを生成したドキュメントにジャンプします。"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "オブジェクトIDを表示"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr "オブジェクトを一意に表すコンテントタイプとユニークIDを表示"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "同一ウィンドウでオブジェクトを編集"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "一つのオブジェクトを表す管理者用のページへジャンプ"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "別ウィンドウでオブジェクトを編集"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "上のように、しかし管理ページを新しいウィンドウに開きます。"
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "日:"
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "時間:"
+
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "現在:"
+
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "変更:"
+
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "リダイレクト from"
+
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr "ドメイン名をのぞいた絶対パス。例: '/events/search/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "リダイレクト to"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr "上記のような絶対パスか'http://'で始まる完全なURL"
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "リダイレクト"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "リダイレクト"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "例: '/about/contact/'. 先頭と最後のスラッシュを確認してください。"
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "タイトル"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "内容"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "コメントを有効にする"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "テンプレート名"
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr "例: 'flatpages/contact_page'. デフォルトは'flatpages/default'"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "登録が必要です。"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "チェックした場合、ログインしたユーザのみがそのページを参照可能です。"
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "変化のないページ"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "変化のないページ"
+
+#: 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 "月曜日"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "火曜日"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "水曜日"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "木曜日"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "金曜日"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "土曜日"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "日曜日"
+
+#: utils/dates.py:14
+msgid "January"
+msgstr "1月"
+
+#: utils/dates.py:14
+msgid "February"
+msgstr "2月"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
+msgstr "3月"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
+msgstr "4月"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
+msgstr "5月"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
+msgstr "6月"
+
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
+msgstr "7月"
+
+#: utils/dates.py:15
+msgid "August"
+msgstr "8月"
+
+#: utils/dates.py:15
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:15
+msgid "October"
+msgstr "10月"
+
+#: utils/dates.py:15
+msgid "November"
+msgstr "11月"
+
+#: utils/dates.py:16
+msgid "December"
+msgstr "12月"
+
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "1月"
+
+#: utils/dates.py:27
+msgid "Feb."
+msgstr "2月"
+
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "8月"
+
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "9月"
+
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "10月"
+
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "11月"
+
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "12月"
+
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] "年"
+msgstr[1] "年"
+
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] "月"
+msgstr[1] "月"
+
+#: utils/timesince.py:14
+msgid "day"
+msgid_plural "days"
+msgstr[0] "日"
+msgstr[1] "日"
+
+#: utils/timesince.py:15
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "時"
+msgstr[1] "時"
+
+#: utils/timesince.py:16
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "分"
+msgstr[1] "分"
+
+#: models/core.py:7
+msgid "domain name"
+msgstr "ドメイン名"
+
+#: models/core.py:8
+msgid "display name"
+msgstr "表示名"
+
+#: models/core.py:10
+msgid "site"
+msgstr "サイト"
+
+#: models/core.py:11
+msgid "sites"
+msgstr "サイト"
+
+#: models/core.py:28
+msgid "label"
+msgstr ""
+
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
+msgid "name"
+msgstr "名前"
+
+#: models/core.py:31
+msgid "package"
+msgstr "パッケージ"
+
+#: models/core.py:32
+msgid "packages"
+msgstr "パッケージ"
+
+#: models/core.py:42
+msgid "python module name"
+msgstr "pythonモジュール名"
+
+#: models/core.py:44
+msgid "content type"
+msgstr "コンテントタイプ"
+
+#: models/core.py:45
+msgid "content types"
+msgstr "コンテントタイプ"
+
+#: models/core.py:67
+msgid "session key"
+msgstr "セッションキー"
+
+#: models/core.py:68
+msgid "session data"
+msgstr "セッションデータ"
+
+#: models/core.py:69
+msgid "expire date"
+msgstr "有効期限"
+
+#: models/core.py:71
+msgid "session"
+msgstr "セッション"
+
+#: models/core.py:72
+msgid "sessions"
+msgstr "セッション"
+
+#: models/auth.py:8
+msgid "codename"
+msgstr "コードネーム"
+
+#: models/auth.py:10
+msgid "Permission"
+msgstr "権限"
+
+#: models/auth.py:11 models/auth.py:58
+msgid "Permissions"
+msgstr "権限"
+
+#: models/auth.py:22
+msgid "Group"
+msgstr "グループ"
+
+#: models/auth.py:23 models/auth.py:60
+msgid "Groups"
+msgstr "グループ"
+
+#: models/auth.py:33
+msgid "username"
+msgstr "ユーザ名"
+
+#: models/auth.py:34
+msgid "first name"
+msgstr "名前"
+
+#: models/auth.py:35
+msgid "last name"
+msgstr "名字"
+
+#: models/auth.py:36
+msgid "e-mail address"
+msgstr "メールアドレス"
+
+#: models/auth.py:37
+msgid "password"
+msgstr "パスワード"
+
+#: models/auth.py:37
+msgid "Use '[algo]$[salt]$[hexdigest]'"
+msgstr "使用 '[algo]$[salt]$[hexdigest]'"
+
+#: models/auth.py:38
+msgid "staff status"
+msgstr "スタッフ ステータス"
+
+#: models/auth.py:38
+msgid "Designates whether the user can log into this admin site."
+msgstr "ユーザが管理サイトにログイン可能かどうか指定する。"
+
+#: models/auth.py:39
+msgid "active"
+msgstr "有効"
+
+#: models/auth.py:40
+msgid "superuser status"
+msgstr "スーパーユーザ ステータス"
+
+#: models/auth.py:41
+msgid "last login"
+msgstr "最終ログイン"
+
+#: models/auth.py:42
+msgid "date joined"
+msgstr "参加した日"
+
+#: models/auth.py:44
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"手動で与えられた権限と、ユーザの属しているグループの権限が付与されます。"
+
+#: models/auth.py:48
+msgid "Users"
+msgstr "ユーザ"
+
+#: models/auth.py:57
+msgid "Personal info"
+msgstr "個人情報"
+
+#: models/auth.py:59
+msgid "Important dates"
+msgstr "重要な日"
+
+#: models/auth.py:216
+msgid "Message"
+msgstr "メッセージ"
+
+#: conf/global_settings.py:37
+msgid "Bengali"
+msgstr "ベンガル語"
+
+#: conf/global_settings.py:38
+msgid "Czech"
+msgstr "チェコ語"
+
+#: conf/global_settings.py:39
+msgid "Welsh"
+msgstr "ウェールズ語"
+
+#: conf/global_settings.py:40
+msgid "Danish"
+msgstr "デンマーク語"
+
+#: conf/global_settings.py:41
+msgid "German"
+msgstr "ドイツ語"
+
+#: conf/global_settings.py:42
+msgid "English"
+msgstr "英語"
+
+#: conf/global_settings.py:43
+msgid "Spanish"
+msgstr "スペイン語"
+
+#: conf/global_settings.py:44
+msgid "French"
+msgstr "フランス語"
+
+#: conf/global_settings.py:45
+msgid "Galician"
+msgstr "ガリシア語"
+
+#: conf/global_settings.py:46
+msgid "Icelandic"
+msgstr "アイスランド語"
+
+#: conf/global_settings.py:47
+msgid "Italian"
+msgstr "イタリア語"
+
+#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Norwegian"
+msgstr "ノルウェー語"
+
+#: conf/global_settings.py:50
+msgid "Brazilian"
+msgstr "ブラジル語"
+
+#: conf/global_settings.py:51
+msgid "Romanian"
+msgstr "ルーマニア語"
+
+#: conf/global_settings.py:52
+msgid "Russian"
+msgstr "ロシア語"
+
+#: conf/global_settings.py:53
+msgid "Slovak"
+msgstr "スロバキア語"
+
+#: conf/global_settings.py:54
+msgid "Serbian"
+msgstr "セルビア語"
+
+#: conf/global_settings.py:55
+msgid "Swedish"
+msgstr "スウェーデン語"
+
+#: conf/global_settings.py:56
+msgid "Simplified Chinese"
+msgstr "簡体字中国語"
+
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
+#: 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 "このフィールドは必須です。"
+
+#: core/formfields.py:338
+#, 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 文字以下にしてください。"
+
+#: core/formfields.py:343
+msgid "Line breaks are not allowed here."
+msgstr "ここでは改行できません。"
+
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "正しく選択してください。; '%(data)s' は %(choices)s. にありません。"
+
+#: core/formfields.py:603
+msgid "The submitted file is empty."
+msgstr "送信されたファイルは空です。"
+
+#: core/formfields.py:657
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "-32,768から32,767までの整数を入力してください。"
+
+#: core/formfields.py:666
+msgid "Enter a positive number."
+msgstr "整数を入力してください。"
+
+#: core/formfields.py:675
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "0から32,767までの整数を入力してください。"
+
+#: core/validators.py:62
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "半角英数字と半角のアンダーバー以外は使用できません。"
+
+#: core/validators.py:66
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr "半角英数字と半角のアンダーバーかスラッシュ以外は使用できません。"
+
+#: core/validators.py:74
+msgid "Uppercase letters are not allowed here."
+msgstr "大文字はここでは使用できません。"
+
+#: core/validators.py:78
+msgid "Lowercase letters are not allowed here."
+msgstr "小文字はここでは使用できません。"
+
+#: core/validators.py:85
+msgid "Enter only digits separated by commas."
+msgstr "カンマ区切りの数字を入力してください。"
+
+#: core/validators.py:97
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "カンマ区切りの有効なメールアドレスを入力してください。"
+
+#: core/validators.py:101
+msgid "Please enter a valid IP address."
+msgstr "有効なIPアドレスを入力してください。"
+
+#: core/validators.py:105
+msgid "Empty values are not allowed here."
+msgstr "入力は必須です。"
+
+#: core/validators.py:109
+msgid "Non-numeric characters aren't allowed here."
+msgstr "数値以外は使用できません。"
+
+#: core/validators.py:113
+msgid "This value can't be comprised solely of digits."
+msgstr "数値のみはあり得ません。"
+
+#: core/validators.py:118
+msgid "Enter a whole number."
+msgstr "整数を入力してください。"
+
+#: core/validators.py:122
+msgid "Only alphabetical characters are allowed here."
+msgstr ""
+
+#: core/validators.py:126
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "YYYY-MM-DDで有効な日付を入力してください。"
+
+#: core/validators.py:130
+msgid "Enter a valid time in HH:MM format."
+msgstr "HH:MMで有効な時間を入力してください。"
+
+#: core/validators.py:134
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "YYYY-MM-DD HH:MMで有効な日時を入力してください。"
+
+#: core/validators.py:138
+msgid "Enter a valid e-mail address."
+msgstr "有効なメールアドレスを入力してください。"
+
+#: core/validators.py:150
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"有効な画像をアップしてください。アップされた画像は画像でないか壊れています。"
+
+#: core/validators.py:157
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "URL ( %s ) は有効な画像ではありません。"
+
+#: core/validators.py:161
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr "電話番号は XXX-XXX-XXXX で入力してください。\"%s\" は無効です。"
+
+#: core/validators.py:169
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "URL ( %s ) は有効なQuickTimeビデオではありません。"
+
+#: core/validators.py:173
+msgid "A valid URL is required."
+msgstr "有効なURLが必須です。"
+
+#: core/validators.py:187
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"有効なHTMLが必須です。エラー:\n"
+"%s"
+
+#: core/validators.py:194
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "不正なXML"
+
+#: core/validators.py:204
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "無効なURL: %s"
+
+#: core/validators.py:208 core/validators.py:210
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "URL ( %s ) はリンクが壊れています。"
+
+#: core/validators.py:216
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "有効な米州略称を入力してください。"
+
+#: core/validators.py:231
+#, 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:238
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "このフィールドは '%s' フィールドと一致する必要があります。"
+
+#: core/validators.py:257
+msgid "Please enter something for at least one field."
+msgstr "どれか一つのフィールドには入力してください。"
+
+#: core/validators.py:266 core/validators.py:277
+msgid "Please enter both fields or leave them both empty."
+msgstr "両方のフィールドに入力するか、両方とも未入力にしてください。"
+
+#: core/validators.py:284
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "%(field)s が %(value)s であるばあいは、このフィールドは必須です。"
+
+#: core/validators.py:296
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "%(field)s が %(value)s でないばあいは、このフィールドは必須です。"
+
+#: core/validators.py:315
+msgid "Duplicate values are not allowed."
+msgstr "重複する値は認められません。"
+
+#: core/validators.py:338
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "この値は %s の累乗でなければなりません。"
+
+#: core/validators.py:349
+msgid "Please enter a valid decimal number."
+msgstr "有効な小数を入力してください。"
+
+#: core/validators.py:351
+#, 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] "全桁で %s 桁までで入力してください。"
+msgstr[1] "全桁で %s 桁までで入力してください。"
+
+#: core/validators.py:354
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "小数点以下 %s 桁までで少数を入力してください。"
+msgstr[1] "小数点以下 %s 桁までで少数を入力してください。"
+
+#: core/validators.py:364
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "アップロードファイルは %s バイト以上です。"
+
+#: core/validators.py:365
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "アップロードファイルは %s バイトまでです。"
+
+#: core/validators.py:378
+msgid "The format for this field is wrong."
+msgstr "このフィールドの形式が不正です。"
+
+#: core/validators.py:393
+msgid "This field is invalid."
+msgstr "このフィールドが不正です。"
+
+#: core/validators.py:428
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "%s から何も検索できませんでした。"
+
+#: core/validators.py:431
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "URL %(url)s が無効なコンテントタイプを返しました。 '%(contenttype)s'."
+
+#: core/validators.py:464
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"%(line)s 行目から始まる %(tag)s タグが閉じていません。( \"%(start)s\" で始ま"
+"る行 )"
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"%(line)s 行目から始まるテキストはこのコンテキストでは許されていません。( \"%"
+"(start)s\" で始まる行 )"
+
+#: core/validators.py:473
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"%(line)s 行目の \"%(attr)s\" は無効なアトリビュートです。( \"%(start)s\" で"
+"始まる行 )"
+
+#: core/validators.py:478
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"%(line)s 行目の \"<%(tag)s>\" は無効なタグです。( \"%(start)s\" で始まる"
+"行 )"
+
+#: core/validators.py:482
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"%(line)s 行目のタグは必須アトリビュートが未入力です。( \"%(start)s\" で始ま"
+"る行 )"
+
+#: core/validators.py:487
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"%(line)s 行目の \"%(attr)s\" 亜鶏ビューは無効です。( \"%(start)s\" で始まる"
+"行 )"
+
+#: core/meta/__init__.py:1947
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr ""
+"%(field)s に入力されたものは、この %(type)s の %(object)s に既に存在します。"
+
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "有効な %s を入力してください。"
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "%(fieldname)s に %(optname)s は既に存在します。"
+
+#: core/meta/fields.py:129
+msgid " Separate multiple IDs with commas."
+msgstr "複数のIDをカンマで区切る。"
+
+#: core/meta/fields.py:132
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+" Macで複数選択する場合は、\"Control\"キーか \"Command\" キーを押してくださ"
+"い。"
+
+#: core/meta/fields.py:508
+msgid "Enter a valid filename."
+msgstr "有効なファイル名を入力してください。"
+
+#: core/meta/fields.py:782
+#, 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] "有効な %(self)s IDを入力してください。 %(value)r は無効です。"
+msgstr[1] "有効な %(self)s IDを入力してください。 %(value)r は無効です。"
+
+#: core/template/defaultfilters.py:371
+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 ""
diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..80c85aeb94
Binary files /dev/null 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
new file mode 100644
index 0000000000..4733881e2e
--- /dev/null
+++ b/django/conf/locale/ja/LC_MESSAGES/djangojs.po
@@ -0,0 +1,109 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-27 23:26+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/admin/media/js/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr "一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "日 月 火 水 木 金 土"
+
+#: contrib/admin/media/js/dateparse.js:27
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "日曜 月曜 火曜 水曜 木曜 金曜 土曜"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "利用可能 %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "全て選択"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "追加"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "削除"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "選択された %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr ""
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "全てクリア"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+msgid "Now"
+msgstr "現在"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+msgid "Clock"
+msgstr "時計"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+msgid "Choose a time"
+msgstr "時間を選択"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Midnight"
+msgstr "夜中"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "6 a.m."
+msgstr "朝6時"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "Noon"
+msgstr "昼"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+msgid "Today"
+msgstr "今日"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+msgid "Calendar"
+msgstr "カレンダー"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+msgid "Yesterday"
+msgstr "昨日"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+msgid "Tomorrow"
+msgstr "明日"
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 4429692a21..711e766efd 100644
Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index 9375b91f83..aa234f99e1 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-29 00:05+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"
@@ -1439,37 +1446,45 @@ msgid "Italian"
msgstr "Italiensk"
#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "Brasiliansk"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr "Romansk"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr "Simplifisert Kinesisk"
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
msgid "This field is required."
@@ -1817,6 +1832,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 eef409d258..cef8f410f3 100644
Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index d1412d9ea4..144bebb39b 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/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-29 00:04+0100\n"
"PO-Revision-Date: 2005-10-11 09:12GMT-3\n"
"Last-Translator: João Paulo Farias \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"
@@ -1420,38 +1427,46 @@ msgid "Italian"
msgstr "Italiano"
#: conf/global_settings.py:48
-msgid "Norwegian"
+msgid "Japanese"
msgstr ""
#: conf/global_settings.py:49
+msgid "Norwegian"
+msgstr ""
+
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "Brazileiro"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
#, fuzzy
msgid "Serbian"
msgstr "Sérvio"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr ""
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
#, fuzzy
@@ -1801,6 +1816,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 599955a91b..35eea425c6 100644
Binary files a/django/conf/locale/ro/LC_MESSAGES/django.mo and b/django/conf/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index f660f51c2e..462339b2bf 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-29 00:04+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"
@@ -1417,37 +1424,45 @@ msgid "Italian"
msgstr "Italiană"
#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Norwegian"
msgstr "Norvegiană"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "Braziliană"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "Rusă"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Serbian"
msgstr "Sîrbă"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr "Chineză simplificată"
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
#, fuzzy
@@ -1801,6 +1816,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 ae61313c42..a6d883785a 100644
Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 262726be7d..bef2607074 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-29 00:04+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"
@@ -1395,37 +1402,45 @@ msgid "Italian"
msgstr ""
#: conf/global_settings.py:48
-msgid "Norwegian"
+msgid "Japanese"
msgstr ""
#: conf/global_settings.py:49
-msgid "Brazilian"
+msgid "Norwegian"
msgstr ""
#: conf/global_settings.py:50
-msgid "Romanian"
+msgid "Brazilian"
msgstr ""
#: conf/global_settings.py:51
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:52
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr ""
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
msgid "This field is required."
@@ -1763,6 +1778,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/ru/LC_MESSAGES/djangojs.mo b/django/conf/locale/ru/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..8a3ec96be1
Binary files /dev/null and b/django/conf/locale/ru/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/djangojs.po b/django/conf/locale/ru/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..b7411487c7
--- /dev/null
+++ b/django/conf/locale/ru/LC_MESSAGES/djangojs.po
@@ -0,0 +1,110 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-24 19:24+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr " %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr " "
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr ""
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr ""
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr " %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr " "
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr " ӣ"
+
+#: contrib/admin/media/js/dateparse.js:26
+#: contrib/admin/media/js/calendar.js:24
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr " "
+""
+
+#: contrib/admin/media/js/dateparse.js:27
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr " "
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr " "
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+msgid "Now"
+msgstr ""
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+msgid "Clock"
+msgstr ""
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+msgid "Choose a time"
+msgstr " "
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Midnight"
+msgstr ""
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "6 a.m."
+msgstr "6 "
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "Noon"
+msgstr ""
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+msgid "Cancel"
+msgstr ""
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+msgid "Calendar"
+msgstr ""
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+msgid "Yesterday"
+msgstr ""
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+msgid "Tomorrow"
+msgstr ""
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 4a62338b5e..87aa4142a9 100644
Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 6b152d15bd..928d7a2bc1 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-29 00:05+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:"
@@ -1431,37 +1438,45 @@ msgid "Italian"
msgstr "Taliansky"
#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Norwegian"
msgstr "Nórsky"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "Brazílsky"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr "Rumúnsky"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "Ruský"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr "Slovenský"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Serbian"
msgstr "Srbský"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr "Švédsky"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr "Zjednodušená činština "
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
msgid "This field is required."
@@ -1806,3 +1821,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 239b719223..ea3c0c3c48 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 2f2bafbd56..76d08421c4 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-29 00:04+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"
@@ -1432,37 +1439,45 @@ msgid "Italian"
msgstr "Italienska"
#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Norwegian"
msgstr "Norska"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "Brasilianska"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr "Rumänska"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "Ryska"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr "Slovakiska"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Serbian"
msgstr "Serbiska"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr "Svenska"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr "Förenklad kinesiska"
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
msgid "This field is required."
@@ -1808,6 +1823,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 40cb2836eb..d9054cfacb 100644
Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index fd4d8f79cf..290a631018 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-29 00:03+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"
@@ -1396,37 +1403,45 @@ msgid "Italian"
msgstr "意大利语"
#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Norwegian"
msgstr "挪威语"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Brazilian"
msgstr "巴西语"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Romanian"
msgstr "罗马尼亚语"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Russian"
msgstr "俄语"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Slovak"
msgstr "斯洛伐克语"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Serbian"
msgstr "塞尔维亚语"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Swedish"
msgstr "瑞典语"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Simplified Chinese"
msgstr "简体中文"
+#: conf/global_settings.py:57
+msgid "Traditional Chinese"
+msgstr ""
+
#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
msgid "This field is required."
@@ -1752,6 +1767,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/conf/locale/zh_TW/LC_MESSAGES/django.mo b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..75a5d4fba1
Binary files /dev/null and b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.po b/django/conf/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..65497b409c
--- /dev/null
+++ b/django/conf/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,1780 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: django v1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-29 00:05+0100\n"
+"PO-Revision-Date: 2005-12-28 23:30+0800\n"
+"Last-Translator: yungyuc \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+msgid "object ID"
+msgstr "物件 ID"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr "頭條"
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+msgid "comment"
+msgstr "評論"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr "等級 #1"
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr "等級 #2"
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr "等級 #3"
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr "等級 #4"
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr "等級 #5"
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr "等級 #6"
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr "等級 #7"
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr "等級 #8"
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr "是有效的等級"
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr "日期/時間已發送"
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr "是公開的"
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
+msgid "IP address"
+msgstr "IP 位址"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr "已移除"
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr "如果此評論不恰當則選取這個方塊,其將以 \"此評論已被移除\" 訊息取代。"
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr "評論"
+
+#: contrib/comments/models/comments.py:32
+msgid "Comments"
+msgstr "評論"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+msgid "Content object"
+msgstr "內容物件"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"由 %(user)s 在 %(date)s 張貼\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+
+#: contrib/comments/models/comments.py:163
+msgid "person's name"
+msgstr "人名"
+
+#: contrib/comments/models/comments.py:166
+msgid "ip address"
+msgstr "ip 位址"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr "由工作人員核准"
+
+#: contrib/comments/models/comments.py:172
+msgid "Free comment"
+msgstr "自由評論"
+
+#: contrib/comments/models/comments.py:173
+msgid "Free comments"
+msgstr "自由評論"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr "分數"
+
+#: contrib/comments/models/comments.py:210
+msgid "score date"
+msgstr "分數日期"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr "Karma 分數"
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr "Karma 分數"
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr "被 %(user)s 評定為 %(score)d 等級"
+
+#: contrib/comments/models/comments.py:248
+msgid "flag date"
+msgstr "標識日期"
+
+#: contrib/comments/models/comments.py:251
+msgid "User flag"
+msgstr "使用者旗標"
+
+#: contrib/comments/models/comments.py:252
+msgid "User flags"
+msgstr "使用者旗標"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr "被 %r 標識"
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"此評論被 %(user)s 標識:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/models/comments.py:278
+msgid "deletion date"
+msgstr "刪除日期"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr "仲裁刪除"
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr "仲裁刪除"
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr "由 %r 仲裁刪除"
+
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr "匿名使用者不可投票"
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr "無效的評論 ID"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr "不要投票給你自己"
+
+#: contrib/comments/views/comments.py:25
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr "此等級被要求是因為你至少輸入了一個其它的等級。"
+
+#: contrib/comments/views/comments.py:109
+#, 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] ""
+"張貼此評論的使用者之所有評論少於 %(count)s:\n"
+"\n"
+"%(text)s"
+msgstr[1] ""
+"張貼此評論的使用者之所有評論少於 %(count)s:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:114
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"此評論被一個隨便的使用者所張貼:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
+msgid "Only POSTs are allowed"
+msgstr "只允許 POST"
+
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
+msgid "One or more of the required fields wasn't submitted"
+msgstr "一個或多個所需的欄位沒有送出"
+
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "有人篡改了評論表單 (違反保全)"
+
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr "此評論表單有一個無效的 'target' 參數 -- 物件 ID 是無效的"
+
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "此評論表單沒有提供 'preview' 或 'post'"
+
+#: contrib/admin/filterspecs.py:40
+#, python-format
+msgid ""
+"By %s:
\n"
+"\n"
+msgstr ""
+"由 %s:
\n"
+"\n"
+
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
+msgid "All"
+msgstr "全部"
+
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr "任何日期"
+
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "本日"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr "過去 7 天"
+
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "本月"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "本年"
+
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
+msgstr "是"
+
+#: contrib/admin/filterspecs.py:143
+msgid "No"
+msgstr "否"
+
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
+msgstr "未知"
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "動作時間"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "物件 id"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "物件 repr"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "動作旗標"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "變更訊息"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "紀錄項目"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "紀錄項目"
+
+#: contrib/admin/templatetags/admin_list.py:245
+msgid "All dates"
+msgstr "所有日期"
+
+#: 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:57
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr "請再登入一次,因為你的 session 已經到期。不必擔心: 你的提交已被儲存。"
+
+#: 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 ""
+"看起來你的瀏覽器沒有組態成允許 cookie。請啟用 cookie、重新載入此頁,然後再試"
+"一次。"
+
+#: contrib/admin/views/decorators.py:78
+msgid "Usernames cannot contain the '@' character."
+msgstr "使用者名稱不能包含 '@' 字元。"
+
+#: contrib/admin/views/decorators.py:80
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "你的電子郵件地址不是你的使用者名稱。試著改用 '%s'。"
+
+#: contrib/admin/views/main.py:52
+msgid "Site administration"
+msgstr "網站管理"
+
+#: contrib/admin/views/main.py:67
+#, python-format
+msgid "Select %s"
+msgstr "選擇 %s"
+
+#: contrib/admin/views/main.py:68
+#, python-format
+msgid "Select %s to change"
+msgstr "選擇 %s 來變更"
+
+#: contrib/admin/views/main.py:410
+#, python-format
+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:492
+msgid "You may edit it again below."
+msgstr "你可以在下面再次編輯。"
+
+#: 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:441
+#, python-format
+msgid "Add %s"
+msgstr "新增 %s"
+
+#: contrib/admin/views/main.py:457
+#, python-format
+msgid "Added %s."
+msgstr "%s 已新增。"
+
+#: 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:459
+#, python-format
+msgid "Changed %s."
+msgstr "%s 已變更。"
+
+#: contrib/admin/views/main.py:461
+#, python-format
+msgid "Deleted %s."
+msgstr "%s 已刪除。"
+
+#: contrib/admin/views/main.py:464
+msgid "No fields changed."
+msgstr "沒有欄位被變更。"
+
+#: 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: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:536
+#, python-format
+msgid "Change %s"
+msgstr "變更 %s"
+
+#: contrib/admin/views/main.py:614
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "在 %(name) 裡的一個或多個 %(fieldname)s: %(obj)s"
+
+#: contrib/admin/views/main.py:619
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "在 %(name)s 裡的一個或多個 %(fieldname)s:"
+
+#: 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:651
+msgid "Are you sure?"
+msgstr "你確定?"
+
+#: contrib/admin/views/main.py:666
+#, python-format
+msgid "Change history: %s"
+msgstr "變更歷史: %s"
+
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
+msgid "Integer"
+msgstr "整數"
+
+#: contrib/admin/views/doc.py:245
+msgid "Boolean (Either True or False)"
+msgstr "布林值 (True 或 False)"
+
+#: contrib/admin/views/doc.py:246
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr "字串 (最長到 %(maxlength)s)"
+
+#: contrib/admin/views/doc.py:247
+msgid "Comma-separated integers"
+msgstr "逗號分隔的整數"
+
+#: contrib/admin/views/doc.py:248
+msgid "Date (without time)"
+msgstr "日期 (不包括時間)"
+
+#: contrib/admin/views/doc.py:249
+msgid "Date (with time)"
+msgstr "日期 (包括時間)"
+
+#: contrib/admin/views/doc.py:250
+msgid "E-mail address"
+msgstr "電子郵件地址"
+
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
+msgid "File path"
+msgstr "檔案路徑"
+
+#: contrib/admin/views/doc.py:252
+msgid "Decimal number"
+msgstr "小數"
+
+#: contrib/admin/views/doc.py:258
+msgid "Boolean (Either True, False or None)"
+msgstr "布林值 (True, False 或 None)"
+
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr "與父模型的關係"
+
+#: contrib/admin/views/doc.py:260
+msgid "Phone number"
+msgstr "電話號碼"
+
+#: contrib/admin/views/doc.py:263
+msgid "String (up to 50)"
+msgstr "字串 (最長到 50)"
+
+#: contrib/admin/views/doc.py:265
+msgid "Text"
+msgstr "文字"
+
+#: contrib/admin/views/doc.py:266
+msgid "Time"
+msgstr "時間"
+
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:268
+msgid "U.S. state (two uppercase letters)"
+msgstr "U.S. 州名 (兩個大寫字母)"
+
+#: contrib/admin/views/doc.py:269
+msgid "XML text"
+msgstr "XML 文字"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: 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 "變更密碼"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: 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 "登出"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.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 "首頁"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
+msgid "History"
+msgstr "歷史"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "日期/時間"
+
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+msgid "User"
+msgstr "使用者"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "動作"
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "DATE_WITH_TIME_FULL"
+
+#: 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 "這個物件沒有變更的歷蜜。它可能不是透過這個管理網站新增的。"
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django 網站管理"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django 管理"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "伺服器錯誤"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "伺服器錯誤 (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error (500)"
+msgstr "伺服器錯誤 (500)"
+
+#: 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 ""
+"有一個錯誤。它已經被透過電子郵件報告給了網站管理員,應該不久就會解決。感謝你"
+"的忍耐。"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "找不到頁面"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "我們很抱歉,不過被要求的頁面找不到"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "新增"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "變更"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "你沒有編輯任何東西的權限"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "最近的動作"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "我的動作"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "沒有可用的"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "新增 %(name)s"
+
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "使用者名稱:"
+
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "密碼:"
+
+#: contrib/admin/templates/admin/login.html:20
+msgid "Have you forgotten your password?"
+msgstr "你 忘記你的密碼了嗎?"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "歡迎,"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"刪除 %(object_name)s '%(object)s' 會把相關的物件也刪除,不過你的帳號並沒有刪"
+"除以下型態物件的權限:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:13
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"你確定想要刪除 %(object_name)s \"%(object)s\"?以下所有的相關項目都會被刪除:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:17
+msgid "Yes, I'm sure"
+msgstr "是的,我確定"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(title)s "
+msgstr " 根據 %(title)s "
+
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr "去"
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "在網站上檢視"
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "請更正以下的錯誤。"
+msgstr[1] "請更正以下的錯誤。"
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "排序中"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "順序:"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "刪除"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "儲存為新的"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "儲存並新增另一個"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "儲存並繼續編輯"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "儲存"
+
+#: 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 "密碼變更"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "密碼成功地變更"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "你的密碼已變更。"
+
+#: 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 "密碼重設"
+
+#: 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 ""
+"忘記你的密碼了?在下面輸入你的電子郵件地址,我們就會重設你的密碼並把新的用電"
+"子郵件寄給你。"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "電子郵件地址:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "重設我的密碼"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "感謝你今天花了重要的時間留在本網站。"
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "再次登入"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "密碼成功地重設"
+
+#: 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 "我們已經把新的密碼寄到你送出的電子郵件地址。你應該不久就能收到。"
+
+#: 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 ""
+"為了安全上的考慮,請輸入你的舊密碼,再輸入新密碼兩次,讓我們核驗你已正確地輸"
+"入。"
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "舊密碼:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "新密碼:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "確認密碼:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "變更我的密碼"
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "因為你要求重設密碼,所以收到了這封電子郵件"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "你在 %(site_name)s 裡的使用者帳號"
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+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 "放心地到此頁面變更密碼:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "你的使用者名稱,萬一你已經忘記的話:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "感謝使用本網站!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s 團隊"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "文件"
+
+#: 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"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"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\").
\n"
+msgstr ""
+"\n"
+"要安裝 bookmarklet,把連結拖進你的書籤工具列,或右擊該連結"
+"後新增到你的書籤裡。現在你可以從網站的任何頁面來選擇 bookmarklet。注意其中某"
+"些 bookmarklet 要求你必須是從被稱為 \"內部\" 的電腦來檢視網站的 (如果你不確定"
+"你的電腦是否在 \"內部\",那就和你的系統管理員談談)。
\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "本頁面的文件"
+
+#: 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 "讓你跳到用來產生該頁面之檢視的任何一頁文件。"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "顯示物件 ID"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr "顯示用來表示單一物件的頁面 content-type 與唯一 ID。"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "編輯此物件 (目前視窗)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "跳到用來表示單一物件的管理頁面。"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "編輯此物件 (新視窗)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "如上,但在新視窗裡開啟管理頁面。"
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "日期:"
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "時間:"
+
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "目前:"
+
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "變更:"
+
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "重導向自"
+
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr "此應為一絕對路徑,但不包括網域名稱。範例: '/events/search/'。"
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "重導向至"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr "此可為一絕對路徑 (如上) 或一個以 'http://' 開頭的完整 URL. "
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "重導向"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "重導向"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "範例: '/about/contact/'。開頭與結束都一定要有斜線。"
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "標題"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "內容"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "允許評論"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "模板名稱"
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"範例: 'flatpages/contact_page'。如果沒有提供它,系統會使用 'flatpages/"
+"default'。"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "需要註冊"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "如果此項被選取,則只有登入的使用者可以檢視頁面。"
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "簡平頁面"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "簡平頁面"
+
+#: utils/translation.py:350
+msgid "DATE_FORMAT"
+msgstr "DATE_FORMAT"
+
+#: utils/translation.py:351
+msgid "DATETIME_FORMAT"
+msgstr "DATETIME_FORMAT"
+
+#: utils/translation.py:352
+msgid "TIME_FORMAT"
+msgstr "TIME_FORMAT"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "星期一"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "星期二"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "星期三"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "星期四"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "星期五"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "星期六"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "星期日"
+
+#: utils/dates.py:14
+msgid "January"
+msgstr "一月"
+
+#: utils/dates.py:14
+msgid "February"
+msgstr "二月"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
+msgstr "三月"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
+msgstr "四月"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
+msgstr "五月"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
+msgstr "六月"
+
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
+msgstr "七月"
+
+#: utils/dates.py:15
+msgid "August"
+msgstr "八月"
+
+#: utils/dates.py:15
+msgid "September"
+msgstr "九月"
+
+#: utils/dates.py:15
+msgid "October"
+msgstr "十月"
+
+#: utils/dates.py:15
+msgid "November"
+msgstr "十一月"
+
+#: utils/dates.py:16
+msgid "December"
+msgstr "十二月"
+
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "一月"
+
+#: utils/dates.py:27
+msgid "Feb."
+msgstr "二月"
+
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "八月"
+
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "九月"
+
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "十月"
+
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "十一月"
+
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "十二月"
+
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] "年"
+msgstr[1] "年"
+
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] "月"
+msgstr[1] "月"
+
+#: utils/timesince.py:14
+msgid "day"
+msgid_plural "days"
+msgstr[0] "日"
+msgstr[1] "日"
+
+#: utils/timesince.py:15
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "時"
+msgstr[1] "時"
+
+#: utils/timesince.py:16
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "分"
+msgstr[1] "分"
+
+#: models/core.py:7
+msgid "domain name"
+msgstr "網域名稱"
+
+#: models/core.py:8
+msgid "display name"
+msgstr "顯示名稱"
+
+#: models/core.py:10
+msgid "site"
+msgstr "網站"
+
+#: models/core.py:11
+msgid "sites"
+msgstr "網站"
+
+#: models/core.py:28
+msgid "label"
+msgstr "標示"
+
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
+msgid "name"
+msgstr "名稱"
+
+#: models/core.py:31
+msgid "package"
+msgstr "套件"
+
+#: models/core.py:32
+msgid "packages"
+msgstr "套件"
+
+#: models/core.py:42
+msgid "python module name"
+msgstr "python 模組名稱"
+
+#: models/core.py:44
+msgid "content type"
+msgstr "內容型態"
+
+#: models/core.py:45
+msgid "content types"
+msgstr "內容型態"
+
+#: models/core.py:67
+msgid "session key"
+msgstr "session 鍵"
+
+#: models/core.py:68
+msgid "session data"
+msgstr "session 資料"
+
+#: models/core.py:69
+msgid "expire date"
+msgstr "到期日期"
+
+#: models/core.py:71
+msgid "session"
+msgstr "session"
+
+#: models/core.py:72
+msgid "sessions"
+msgstr "sessions"
+
+#: models/auth.py:8
+msgid "codename"
+msgstr "codename"
+
+#: models/auth.py:10
+msgid "Permission"
+msgstr "權限"
+
+#: models/auth.py:11 models/auth.py:58
+msgid "Permissions"
+msgstr "權限"
+
+#: models/auth.py:22
+msgid "Group"
+msgstr "群組"
+
+#: models/auth.py:23 models/auth.py:60
+msgid "Groups"
+msgstr "群組"
+
+#: models/auth.py:33
+msgid "username"
+msgstr "使用者名稱"
+
+#: models/auth.py:34
+msgid "first name"
+msgstr "名字"
+
+#: models/auth.py:35
+msgid "last name"
+msgstr "姓氏"
+
+#: models/auth.py:36
+msgid "e-mail address"
+msgstr "電子郵件地址"
+
+#: models/auth.py:37
+msgid "password"
+msgstr "密碼"
+
+#: models/auth.py:37
+msgid "Use '[algo]$[salt]$[hexdigest]'"
+msgstr "使用 '[algo]$[salt]$[hexdigest]'"
+
+#: models/auth.py:38
+msgid "staff status"
+msgstr "工作人員狀態"
+
+#: models/auth.py:38
+msgid "Designates whether the user can log into this admin site."
+msgstr "指明何使用者可以登入此管理網站。"
+
+#: models/auth.py:39
+msgid "active"
+msgstr "活動中"
+
+#: models/auth.py:40
+msgid "superuser status"
+msgstr "超級使用者狀態"
+
+#: models/auth.py:41
+msgid "last login"
+msgstr "上次登入"
+
+#: models/auth.py:42
+msgid "date joined"
+msgstr "加入日期"
+
+#: models/auth.py:44
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr "除了手動指定的權限之外,這個使用者也會得到其群組擁有的所有權限。"
+
+#: models/auth.py:48
+msgid "Users"
+msgstr "使用者"
+
+#: models/auth.py:57
+msgid "Personal info"
+msgstr "個人資訊"
+
+#: models/auth.py:59
+msgid "Important dates"
+msgstr "重要日期"
+
+#: models/auth.py:216
+msgid "Message"
+msgstr "訊息"
+
+#: conf/global_settings.py:37
+msgid "Bengali"
+msgstr "孟加拉文"
+
+#: conf/global_settings.py:38
+msgid "Czech"
+msgstr "捷克文"
+
+#: conf/global_settings.py:39
+msgid "Welsh"
+msgstr "威爾斯文"
+
+#: conf/global_settings.py:40
+msgid "Danish"
+msgstr "丹麥文"
+
+#: conf/global_settings.py:41
+msgid "German"
+msgstr "德文"
+
+#: conf/global_settings.py:42
+msgid "English"
+msgstr "英文"
+
+#: conf/global_settings.py:43
+msgid "Spanish"
+msgstr "西班牙文"
+
+#: conf/global_settings.py:44
+msgid "French"
+msgstr "法文"
+
+#: conf/global_settings.py:45
+msgid "Galician"
+msgstr "加利西亞文"
+
+#: conf/global_settings.py:46
+msgid "Icelandic"
+msgstr "冰島文"
+
+#: conf/global_settings.py:47
+msgid "Italian"
+msgstr "義大利文"
+
+#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Norwegian"
+msgstr "挪威文"
+
+#: conf/global_settings.py:50
+msgid "Brazilian"
+msgstr "巴西文"
+
+#: conf/global_settings.py:51
+msgid "Romanian"
+msgstr "羅馬尼亞文"
+
+#: conf/global_settings.py:52
+msgid "Russian"
+msgstr "俄文"
+
+#: conf/global_settings.py:53
+msgid "Slovak"
+msgstr "斯洛伐克文"
+
+#: conf/global_settings.py:54
+msgid "Serbian"
+msgstr "塞爾維亞文"
+
+#: conf/global_settings.py:55
+msgid "Swedish"
+msgstr "瑞典文"
+
+#: conf/global_settings.py:56
+msgid "Simplified Chinese"
+msgstr "簡體中文"
+
+#: conf/global_settings.py:57
+#, fuzzy
+msgid "Traditional Chinese"
+msgstr "繁體中文"
+
+#: 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 "此欄位是必需的。"
+
+#: core/formfields.py:338
+#, 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 個字元。"
+
+#: core/formfields.py:343
+msgid "Line breaks are not allowed here."
+msgstr "此處不允許斷行。"
+
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "進行有效的選擇: '%(data)s' 不在 %(choices)s 裡。"
+
+#: core/formfields.py:603
+msgid "The submitted file is empty."
+msgstr "提交的檔案是空的。"
+
+#: core/formfields.py:657
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "輸入一個介於 -32,768 與 32,767 之間的整數。"
+
+#: core/formfields.py:666
+msgid "Enter a positive number."
+msgstr "輸入一個正數。"
+
+#: core/formfields.py:675
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "輸入一個介於 0 與 32,767 之間的整數。"
+
+#: core/validators.py:62
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "此值僅能包含字母、數字與底線。"
+
+#: core/validators.py:66
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr "此值僅能包含字母、數字、底線與斜線。"
+
+#: core/validators.py:74
+msgid "Uppercase letters are not allowed here."
+msgstr "此處不允許大寫字母。"
+
+#: core/validators.py:78
+msgid "Lowercase letters are not allowed here."
+msgstr "此處不允許小寫字母。"
+
+#: core/validators.py:85
+msgid "Enter only digits separated by commas."
+msgstr "輸入以逗號分隔的數字。"
+
+#: core/validators.py:97
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "輸入以逗號分隔的有效電子郵件地址。"
+
+#: core/validators.py:101
+msgid "Please enter a valid IP address."
+msgstr "請輸入有效的 IP 位址。"
+
+#: core/validators.py:105
+msgid "Empty values are not allowed here."
+msgstr "此處不允許空值。"
+
+#: core/validators.py:109
+msgid "Non-numeric characters aren't allowed here."
+msgstr "此處不允許非數字字元。"
+
+#: core/validators.py:113
+msgid "This value can't be comprised solely of digits."
+msgstr "此值不能只以數字組成。"
+
+#: core/validators.py:118
+msgid "Enter a whole number."
+msgstr "輸入一個整數。"
+
+#: core/validators.py:122
+msgid "Only alphabetical characters are allowed here."
+msgstr "此處只允許字母。"
+
+#: core/validators.py:126
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "以 YYYY-MM-DD 格式輸入有效的日期。"
+
+#: core/validators.py:130
+msgid "Enter a valid time in HH:MM format."
+msgstr "以 HH:MM 格式輸入有效的時間。"
+
+#: core/validators.py:134
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "以 YYYY-MM-DD HH:MM 格式輸入有效的日期/時間。"
+
+#: core/validators.py:138
+msgid "Enter a valid e-mail address."
+msgstr "輸入有效的電子郵件地址。"
+
+#: core/validators.py:150
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr "上傳一個有效的影像。你上傳的檔案不是影像,否則就是壞掉了。"
+
+#: core/validators.py:157
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "URL %s 未指向有效的影像。"
+
+#: core/validators.py:161
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr "電話號碼必須是 XXX-XXX-XXXX 格式。\"%s\" 無效。"
+
+#: core/validators.py:169
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "URL %s 未指向有效的 QuickTime 視像。"
+
+#: core/validators.py:173
+msgid "A valid URL is required."
+msgstr "必須是有效的 URL。"
+
+#: core/validators.py:187
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"必須是有效的 HTML。具體的錯誤是:\n"
+"%s"
+
+#: core/validators.py:194
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "排列錯誤的 XML: %s"
+
+#: core/validators.py:204
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "無效的 URL: %s"
+
+#: core/validators.py:208 core/validators.py:210
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "URL %s 是斷掉的連結。"
+
+#: core/validators.py:216
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "輸入有效的 U.S. 州名簡稱。"
+
+#: core/validators.py:231
+#, 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 不允許出現在這裡。"
+
+#: core/validators.py:238
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "此欄位必須符合 '%s' 欄位。"
+
+#: core/validators.py:257
+msgid "Please enter something for at least one field."
+msgstr "請在至少一個欄位裡進行輸入。"
+
+#: core/validators.py:266 core/validators.py:277
+msgid "Please enter both fields or leave them both empty."
+msgstr "請輸入兩個欄位或全部留空。"
+
+#: core/validators.py:284
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "如果 %(field)s 是 %(value)s 則此欄位必須給定。"
+
+#: core/validators.py:296
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "如果 %(field)s 不是 %(value)s 則此欄位必須給定。"
+
+#: core/validators.py:315
+msgid "Duplicate values are not allowed."
+msgstr "不允許重複值。"
+
+#: core/validators.py:338
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "此值必須是 %s 的乘方。"
+
+#: core/validators.py:349
+msgid "Please enter a valid decimal number."
+msgstr "請輸入有效的小數。"
+
+#: core/validators.py:351
+#, 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] "請輸入最長 %s 位的有效小數。"
+msgstr[1] "請輸入最長 %s 位的有效小數。"
+
+#: core/validators.py:354
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "請輸入小數最長 %s 位的有效小數。"
+msgstr[1] "請輸入小數最長 %s 位的有效小數。"
+
+#: core/validators.py:364
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "確定你上傳的檔案至少有 %s 位元組。"
+
+#: core/validators.py:365
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "確定你上傳的檔案最多是 %s 位元組。"
+
+#: core/validators.py:378
+msgid "The format for this field is wrong."
+msgstr "此欄位的格式錯誤。"
+
+#: core/validators.py:393
+msgid "This field is invalid."
+msgstr "此欄位無效。"
+
+#: core/validators.py:428
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "無法從 %s 取得任何東西。"
+
+#: core/validators.py:431
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "URL %(url)s 傳回了無效的 Content-Type 標頭 '%(contenttype)s'。"
+
+#: core/validators.py:464
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"請將第 %(line)s 行開始未封閉的 %(tag)s 標籤封閉起來 (行開始於 \"%(start)s"
+"\")。"
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr "該內容不允許某些從第 %(line)s 開始的文字 (行開始於 \"%(start)s\")。"
+
+#: core/validators.py:473
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"第 \"%(line)s\" 的 \"%(attr)s\" 是無效的屬性 (行開始顧 \"%(start)s\")。"
+
+#: core/validators.py:478
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr "第 %(line)s 行的 \"<%(tag)s>\" 是無效的標籤 (行開始於 \"%(start)s\")。"
+
+#: core/validators.py:482
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"第 %(line)s 有一個標籤缺少了一個或更多必需的屬性 (行開始顧 \"%(start)s\")。"
+
+#: core/validators.py:487
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"在第 %(line)s 的 \"%(attr)s\" 屬性有一個無效值 (行開始於 \"%(start)s\")。"
+
+#: core/meta/__init__.py:1947
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr "此 %(type)s 的 %(object)s 已存在於給定的 %(field)s 裡。"
+
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "請輸入一個有效的 %s。"
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "此 %(fieldname)s 欄位的 %(optname)s 已經存在。"
+
+#: core/meta/fields.py:129
+msgid " Separate multiple IDs with commas."
+msgstr " 以逗號分隔多個 ID。"
+
+#: core/meta/fields.py:132
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr " 押下 \"Control\" 或 Mac 下的 \"Command\",以進行多重選擇。"
+
+#: core/meta/fields.py:508
+msgid "Enter a valid filename."
+msgstr "輸入有效的檔名。"
+
+#: core/meta/fields.py:782
+#, 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] "請輸入有效的 %(self)s ID。%(value)r 是無效的。"
+msgstr[1] "請輸入有效的 %(self)s ID。%(value)r 是無效的。"
+
+#: core/template/defaultfilters.py:371
+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 "你的網頁瀏覽器看來沒有啟用 cookie。若要登入則需使用 cookie。"
diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html
index 92e06c5fff..3f755783dc 100644
--- a/django/contrib/admin/templates/admin/change_list_results.html
+++ b/django/contrib/admin/templates/admin/change_list_results.html
@@ -1,3 +1,4 @@
+{% if results %}
@@ -7,7 +8,10 @@
{% if header.sortable %}{% endif %}{% endfor %}
+
{% for result in results %}
{% for item in result %}{{ item }}{% endfor %}
{% endfor %}
+
+{% endif %}
diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html
index 5e868a06b0..c2d6cf59c5 100644
--- a/django/contrib/admin/templates/admin/search_form.html
+++ b/django/contrib/admin/templates/admin/search_form.html
@@ -2,7 +2,8 @@
{% load i18n %}
{% if cl.lookup_opts.admin.search_fields %}
{% endif %}
diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py
index 6e0b8e0d97..d2253cd430 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 User, SESSION_KEY
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/middleware/sessions.py b/django/middleware/sessions.py
index d3ab583be2..914cab0cd9 100644
--- a/django/middleware/sessions.py
+++ b/django/middleware/sessions.py
@@ -11,6 +11,9 @@ class SessionWrapper(object):
self.session_key = session_key
self.modified = False
+ def __contains__(self, key):
+ return key in self._session
+
def __getitem__(self, key):
return self._session[key]
diff --git a/django/parts/auth/formfields.py b/django/parts/auth/formfields.py
index fae488ef23..9aa3a9f3d0 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 = User.objects.get_object(username__exact=field_data)
except User.DoesNotExist:
- 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:
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index f8ca973ba9..aedf709cfa 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -63,6 +63,9 @@ class MultiValueDict(dict):
def __init__(self, key_to_list_mapping=()):
dict.__init__(self, key_to_list_mapping)
+ def __repr__(self):
+ return "" % dict.__repr__(self)
+
def __getitem__(self, key):
"""
Returns the last data value for this key, or [] if it's an empty list;
diff --git a/docs/db-api.txt b/docs/db-api.txt
index a83b7dad6a..bb0011d6e2 100644
--- a/docs/db-api.txt
+++ b/docs/db-api.txt
@@ -398,7 +398,11 @@ which rows are returned. Both ``limit`` and ``offset`` should be integers which
will be directly passed to the SQL ``LIMIT``/``OFFSET`` commands.
If ``distinct`` is True, only distinct rows will be returned. This is equivalent
-to a ``SELECT DISTINCT`` SQL clause.
+to a ``SELECT DISTINCT`` SQL clause. You can use this with ``get_values()`` to
+get distinct values. For example, this returns the distinct first_names::
+
+ >>> people.get_values(fields=['first_name'], distinct=True)
+ [{'first_name': 'Adrian'}, {'first_name': 'Jacob'}, {'first_name': 'Simon'}]
Other lookup options
====================
diff --git a/docs/email.txt b/docs/email.txt
new file mode 100644
index 0000000000..b7450b8a14
--- /dev/null
+++ b/docs/email.txt
@@ -0,0 +1,116 @@
+==============
+Sending e-mail
+==============
+
+Although Python makes sending e-mail relatively easy via the `smtplib library`_,
+Django provides a couple of light wrappers over it, to make sending e-mail
+extra quick.
+
+The code lives in a single module: ``django.core.mail``.
+
+.. _smtplib library: http://www.python.org/doc/current/lib/module-smtplib.html
+
+Quick example
+=============
+
+In two lines::
+
+ from django.core.mail import send_mail
+
+ send_mail('Subject here', 'Here is the message.', 'from@example.com',
+ ['to@example.com'], fail_silently=False)
+
+The send_mail function
+======================
+
+The simplest way to send e-mail is using the function
+``django.core.mail.send_mail``. Here's its definition::
+
+ send_mail(subject, message, from_email, recipient_list, fail_silently=False)
+
+All parameters are required except for ``fail_silently``, which is ``False`` by
+default.
+
+ * ``subject``: A string.
+ * ``message``: A string.
+ * ``from_email``: A string.
+ * ``recipient_list``: A list of strings, each an e-mail address. Each
+ member of ``recipient_list`` will see the other recipients in the "To:"
+ field of the e-mail message.
+ * ``fail_silently``: A boolean. If it's ``False``, ``send_mail`` will raise
+ an ``smtplib.SMTPException``. See the `smtplib docs`_ for a list of
+ possible exceptions, all of which are subclasses of ``SMTPException``.
+
+.. _smtplib docs: http://www.python.org/doc/current/lib/module-smtplib.html
+
+The send_mass_mail function
+===========================
+
+``django.core.mail.send_mass_mail`` is intended to handle mass e-mailing.
+Here's the definition::
+
+ send_mass_mail(datatuple, fail_silently=False):
+
+``datatuple`` is a tuple in which each element is in this format::
+
+ (subject, message, from_email, recipient_list)
+
+``fail_silently`` has the same function as in ``send_mail()``.
+
+Each separate element of ``datatuple`` results in a separate e-mail message.
+As in ``send_mail()``, recipients in the same ``recipient_list`` will all see
+the other addresses in the e-mail messages's "To:" field.
+
+send_mass_mail vs. send_mail
+----------------------------
+
+The main difference between ``send_mass_mail()`` and ``send_mail()`` is that
+``send_mail()`` opens a connection to the mail server each time it's executed,
+while ``send_mass_mail()`` uses a single connection for each of its messages.
+This makes ``send_mass_mail()`` slightly more efficient.
+
+The mail_admins function
+========================
+
+``django.core.mail.mail_admins`` is a shortcut for sending an e-mail to the
+site admins, as defined in the `ADMINS setting`_. Here's the definition::
+
+ mail_admins(subject, message, fail_silently=False)
+
+``mail_admins()`` prefixes the subject with the value of the
+`EMAIL_SUBJECT_PREFIX setting`_, which is ``"[Django] "`` by default.
+
+The "From:" header of the e-mail will be the value of the `SERVER_EMAIL setting`_.
+
+.. _ADMINS setting: http://www.djangoproject.com/documentation/settings/#admins
+.. _EMAIL_SUBJECT_PREFIX setting: http://www.djangoproject.com/documentation/settings/#email-subject-prefix
+.. _SERVER_EMAIL setting: http://www.djangoproject.com/documentation/settings/#server-email
+
+The mail_managers function
+==========================
+
+``django.core.mail.mail_managers`` is just like ``mail_admins``, except it
+sends an e-mail to the site managers, as defined in the `MANAGERS setting`_.
+Here's the definition::
+
+ mail_managers(subject, message, fail_silently=False)
+
+.. _MANAGERS setting: http://www.djangoproject.com/documentation/settings/#managers
+
+Examples
+========
+
+This sends a single e-mail to john@example.com and jane@example.com, with them
+both appearing in the "To:"::
+
+ send_mail('Subject', 'Message.', 'from@example.com',
+ ['john@example.com', 'jane@example.com'])
+
+This sends a message to john@example.com and jane@example.com, with them both
+receiving a separate e-mail::
+
+ datatuple = (
+ ('Subject', 'Message.', 'from@example.com', ['john@example.com'],
+ ('Subject', 'Message.', 'from@example.com', ['jane@example.com'],
+ )
+ send_mass_mail(datatuple)
diff --git a/docs/forms.txt b/docs/forms.txt
index 2980ce80e1..0cb6ca84b8 100644
--- a/docs/forms.txt
+++ b/docs/forms.txt
@@ -424,7 +424,7 @@ your own couldn't be easier::
def isValidToAddress(self, field_data, all_data):
if not field_data.endswith("@example.com"):
- raise ValidationError("You can only send messages to example.com e-mail addresses.")
+ raise validators.ValidationError("You can only send messages to example.com e-mail addresses.")
Above, we've added a "to" field to the contact form, but required that the "to"
address end with "@example.com" by adding the ``isValidToAddress`` validator to
diff --git a/docs/sessions.txt b/docs/sessions.txt
index bea246e17d..fbb11e4198 100644
--- a/docs/sessions.txt
+++ b/docs/sessions.txt
@@ -34,6 +34,9 @@ it and write to it.
It implements the following standard dictionary methods:
+ * ``__contains__(key)``
+ **New in Django development version.** Example: ``'fav_color' in request.session``
+
* ``__getitem__(key)``
Example: ``fav_color = request.session['fav_color']``
diff --git a/docs/url_dispatch.txt b/docs/url_dispatch.txt
index 27b24dd57d..55a154396c 100644
--- a/docs/url_dispatch.txt
+++ b/docs/url_dispatch.txt
@@ -148,11 +148,6 @@ The matching/grouping algorithm
Here's the algorithm the URLconf parser follows, with respect to named groups
vs. non-named groups in a regular expression:
- * If there are any named groups, it will use those as keyword arguments,
- ignoring any non-named groups.
- * Otherwise, it will pass all non-named groups as positional arguments.
- * In both cases, it will pass any extra
-
If there are any named arguments, it will use those, ignoring non-named arguments.
Otherwise, it will pass all non-named arguments as positional arguments.