diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo
index 907d7df672..447b0c82ef 100644
Binary files a/django/conf/locale/ja/LC_MESSAGES/django.mo and b/django/conf/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po
index 675d41aba5..4b5b27a6dd 100644
--- a/django/conf/locale/ja/LC_MESSAGES/django.po
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@@ -1,11 +1,10 @@
 # Translation of django.po to japanese.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-17 10:54+0900\n"
-"PO-Revision-Date: 2008-08-17 11:05+0900\n"
+"POT-Creation-Date: 2008-08-29 11:58+0900\n"
+"PO-Revision-Date: 2008-08-29 11:52+0900\n"
 "Last-Translator: Takashi Matsuo <matsuo.takashi@gmail.com>\n"
 "Language-Team: Japanese <django-ja@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -243,18 +242,15 @@ msgstr "今月"
 msgid "This year"
 msgstr "今年"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
-#: oldforms/__init__.py:588
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:390
 msgid "Yes"
 msgstr "はい"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
-#: oldforms/__init__.py:588
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:390
 msgid "No"
 msgstr "いいえ"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:379
-#: oldforms/__init__.py:588
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:390
 msgid "Unknown"
 msgstr "不明"
 
@@ -286,102 +282,101 @@ msgstr "ログエントリ"
 msgid "log entries"
 msgstr "ログエントリ"
 
-#: contrib/admin/options.py:143 contrib/admin/options.py:202
+#: contrib/admin/options.py:56 contrib/admin/options.py:120
 msgid "None"
 msgstr "None"
 
-#: contrib/admin/options.py:413
+#: contrib/admin/options.py:334
 #, python-format
 msgid "Changed %s."
 msgstr "%s を変更しました。"
 
-#: contrib/admin/options.py:413 contrib/admin/options.py:423
-#: core/validators.py:279 db/models/manipulators.py:305
+#: contrib/admin/options.py:334 contrib/admin/options.py:344
 msgid "and"
 msgstr "と"
 
-#: contrib/admin/options.py:418
+#: contrib/admin/options.py:339
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\"を追加しました。"
 
-#: contrib/admin/options.py:422
+#: contrib/admin/options.py:343
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" の %(list)s を変更しました。"
 
-#: contrib/admin/options.py:427
+#: contrib/admin/options.py:348
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" を削除しました。"
 
-#: contrib/admin/options.py:431
+#: contrib/admin/options.py:352
 msgid "No fields changed."
 msgstr "変更はありませんでした。"
 
-#: contrib/admin/options.py:492 contrib/auth/admin.py:50
+#: contrib/admin/options.py:413 contrib/auth/admin.py:51
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" を追加しました。"
 
-#: contrib/admin/options.py:496 contrib/admin/options.py:529
-#: contrib/auth/admin.py:55
+#: contrib/admin/options.py:417 contrib/admin/options.py:450
+#: contrib/auth/admin.py:57
 msgid "You may edit it again below."
 msgstr "続けて編集できます。"
 
-#: contrib/admin/options.py:506 contrib/admin/options.py:539
+#: contrib/admin/options.py:427 contrib/admin/options.py:460
 #, python-format
 msgid "You may add another %s below."
 msgstr "続けて別の %s を追加できます。"
 
-#: contrib/admin/options.py:527
+#: contrib/admin/options.py:448
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" を変更しました。"
 
-#: contrib/admin/options.py:535
+#: contrib/admin/options.py:456
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。"
 
-#: contrib/admin/options.py:601
+#: contrib/admin/options.py:522
 #, python-format
 msgid "Add %s"
 msgstr "%s を追加"
 
-#: contrib/admin/options.py:678
+#: contrib/admin/options.py:600
 #, python-format
 msgid "Change %s"
 msgstr "%s を変更"
 
-#: contrib/admin/options.py:709
+#: contrib/admin/options.py:632
 msgid "Database error"
 msgstr "データベースエラー"
 
-#: contrib/admin/options.py:758
+#: contrib/admin/options.py:682
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" を削除しました。"
 
-#: contrib/admin/options.py:765
+#: contrib/admin/options.py:689
 msgid "Are you sure?"
 msgstr "よろしいですか？"
 
-#: contrib/admin/options.py:792
+#: contrib/admin/options.py:718
 #, python-format
 msgid "Change history: %s"
 msgstr "変更履歴: %s"
 
 #: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:16
-#: contrib/auth/forms.py:72 contrib/comments/views/comments.py:56
+#: contrib/auth/forms.py:80
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
 "正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。"
 
-#: contrib/admin/sites.py:238 contrib/admin/views/decorators.py:68
+#: contrib/admin/sites.py:242 contrib/admin/views/decorators.py:68
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -389,7 +384,7 @@ msgstr ""
 "再ログインしてください。ログインセッションが有効期間切れしてしまいました。入"
 "力データは失われておりませんのでご安心ください。"
 
-#: contrib/admin/sites.py:245 contrib/admin/views/decorators.py:75
+#: contrib/admin/sites.py:249 contrib/admin/views/decorators.py:75
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -397,32 +392,37 @@ msgstr ""
 "ブラウザがクッキーの使用を許可していないようです。クッキーの使用を許可して、"
 "もう一度このページを表示してください。"
 
-#: contrib/admin/sites.py:259 contrib/admin/sites.py:265
-#: contrib/admin/views/decorators.py:92
+#: contrib/admin/sites.py:265 contrib/admin/sites.py:271
+#: contrib/admin/views/decorators.py:94
 msgid "Usernames cannot contain the '@' character."
 msgstr "ユーザ名には '@' を含められません。"
 
-#: contrib/admin/sites.py:262 contrib/admin/views/decorators.py:88
+#: contrib/admin/sites.py:268 contrib/admin/views/decorators.py:90
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "メールアドレスはユーザ名ではありません。 '%s' を試してみてください。"
 
-#: contrib/admin/sites.py:330
+#: contrib/admin/sites.py:336
 msgid "Site administration"
 msgstr "サイト管理"
 
-#: contrib/admin/sites.py:352 contrib/admin/templates/admin/login.html:27
+#: contrib/admin/sites.py:358 contrib/admin/templates/admin/login.html:27
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:30
 msgid "Log in"
 msgstr "ログイン"
 
-#: contrib/admin/util.py:126
+#: contrib/admin/sites.py:406
+#, python-format
+msgid "%s administration"
+msgstr "%s サイト管理"
+
+#: contrib/admin/util.py:138
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s"
 
-#: contrib/admin/util.py:131
+#: contrib/admin/util.py:143
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
@@ -443,6 +443,14 @@ msgstr "現在:"
 msgid "Change:"
 msgstr "変更:"
 
+#: contrib/admin/widgets.py:115
+msgid "Lookup"
+msgstr "検索"
+
+#: contrib/admin/widgets.py:195
+msgid "Add Another"
+msgstr "追加"
+
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
 msgid "Page not found"
@@ -453,12 +461,13 @@ msgid "We're sorry, but the requested page could not be found."
 msgstr "申し訳ありませんが、お探しのページは見つかりませんでした。"
 
 #: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/app_index.html:8
 #: contrib/admin/templates/admin/base.html:30
 #: contrib/admin/templates/admin/change_form.html:17
 #: contrib/admin/templates/admin/change_list.html:8
 #: contrib/admin/templates/admin/delete_confirmation.html:6
 #: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/object_history.html:6
 #: contrib/admin/templates/admin/auth/user/change_password.html:10
 #: contrib/admin/templates/registration/logged_out.html:4
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -491,6 +500,12 @@ msgstr ""
 "エラーが発生しました。エラーをサイトの管理者にメールで報告しましたので、近い"
 "うちに修正されるはずです。しばらくお待ちください。"
 
+#: contrib/admin/templates/admin/app_index.html:10
+#: contrib/admin/templates/admin/index.html:19
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
+
 #: contrib/admin/templates/admin/base.html:25
 msgid "Welcome,"
 msgstr "ようこそ"
@@ -513,7 +528,6 @@ msgstr "パスワードの変更"
 #: contrib/admin/templates/admin/base.html:25
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/comments/templates/comments/form.html:6
 msgid "Log out"
 msgstr "ログアウト"
 
@@ -525,21 +539,23 @@ msgstr "Django サイト管理"
 msgid "Django administration"
 msgstr "Django 管理サイト"
 
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:20
 #: contrib/admin/templates/admin/index.html:29
 msgid "Add"
 msgstr "追加"
 
-#: contrib/admin/templates/admin/change_form.html:26
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:27
+#: contrib/admin/templates/admin/object_history.html:10
 msgid "History"
 msgstr "履歴"
 
-#: contrib/admin/templates/admin/change_form.html:27
+#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/edit_inline/stacked.html:13
+#: contrib/admin/templates/admin/edit_inline/tabular.html:25
 msgid "View on site"
 msgstr "サイト上で表示"
 
-#: contrib/admin/templates/admin/change_form.html:37
+#: contrib/admin/templates/admin/change_form.html:38
 #: contrib/admin/templates/admin/auth/user/change_password.html:22
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
@@ -554,13 +570,12 @@ msgstr "%(name)s を追加"
 msgid "Filter"
 msgstr "フィルタ"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-#: contrib/admin/templates/admin/submit_line.html:3
-#: contrib/admin/templates/admin/edit_inline/tabular.html:15
+#: contrib/admin/templates/admin/delete_confirmation.html:10
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246
 msgid "Delete"
 msgstr "削除"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:15
+#: contrib/admin/templates/admin/delete_confirmation.html:16
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -571,7 +586,7 @@ msgstr ""
 "除しようとしましたが、あなたのアカウントには以下のタイプのオブジェクトを削除"
 "するパーミッションがありません:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:22
+#: contrib/admin/templates/admin/delete_confirmation.html:23
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -580,7 +595,7 @@ msgstr ""
 "%(object_name)s \"%(escaped_object)s\"を削除しますか？ 関連づけられている以下"
 "のオブジェクトも全て削除されます:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:27
+#: contrib/admin/templates/admin/delete_confirmation.html:28
 msgid "Yes, I'm sure"
 msgstr "はい。"
 
@@ -594,11 +609,6 @@ msgstr "%(filter_title)s で絞り込む"
 msgid "Models available in the %(name)s application."
 msgstr "%(name)s アプリケーションで利用可能なモデル"
 
-#: contrib/admin/templates/admin/index.html:19
-#, python-format
-msgid "%(name)s"
-msgstr "%(name)s"
-
 #: contrib/admin/templates/admin/index.html:35
 msgid "Change"
 msgstr "変更"
@@ -629,33 +639,31 @@ msgstr ""
 "切なユーザでデータベースのデータを読み込めることを確認してください。"
 
 #: contrib/admin/templates/admin/login.html:19
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
 msgid "Username:"
 msgstr "ユーザ名:"
 
 #: contrib/admin/templates/admin/login.html:22
-#: contrib/comments/templates/comments/form.html:8
 msgid "Password:"
 msgstr "パスワード:"
 
-#: contrib/admin/templates/admin/object_history.html:16
+#: contrib/admin/templates/admin/object_history.html:22
 msgid "Date/time"
 msgstr "日付/時刻"
 
-#: contrib/admin/templates/admin/object_history.html:17
+#: contrib/admin/templates/admin/object_history.html:23
 msgid "User"
 msgstr "ユーザ"
 
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:24
 msgid "Action"
 msgstr "操作"
 
-#: contrib/admin/templates/admin/object_history.html:24
-msgid "DATE_WITH_TIME_FULL"
-msgstr "Y/m/d H:i:s"
+#: contrib/admin/templates/admin/object_history.html:30
+#: utils/translation/trans_real.py:404
+msgid "DATETIME_FORMAT"
+msgstr "Y/m/d H:i"
 
-#: contrib/admin/templates/admin/object_history.html:32
+#: contrib/admin/templates/admin/object_history.html:38
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -682,22 +690,22 @@ msgstr[0] "%(counter)s 件"
 msgid "%(full_result_count)s total"
 msgstr "全 %(full_result_count)s 件"
 
-#: contrib/admin/templates/admin/submit_line.html:4
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "保存"
+
+#: contrib/admin/templates/admin/submit_line.html:5
 msgid "Save as new"
 msgstr "新規保存"
 
-#: contrib/admin/templates/admin/submit_line.html:5
+#: contrib/admin/templates/admin/submit_line.html:6
 msgid "Save and add another"
 msgstr "保存してもう一つ追加"
 
-#: contrib/admin/templates/admin/submit_line.html:6
+#: contrib/admin/templates/admin/submit_line.html:7
 msgid "Save and continue editing"
 msgstr "保存して編集を続ける"
 
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "保存"
-
 #: contrib/admin/templates/admin/auth/user/add_form.html:6
 msgid ""
 "First, enter a username and password. Then, you'll be able to edit more user "
@@ -707,19 +715,19 @@ msgstr ""
 "す。"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:13
-#: contrib/auth/forms.py:14 contrib/auth/forms.py:51
+#: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59
 msgid "Username"
 msgstr "ユーザ名"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:20
 #: contrib/admin/templates/admin/auth/user/change_password.html:33
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:52 contrib/auth/forms.py:176
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184
 msgid "Password"
 msgstr "パスワード"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:26
 #: contrib/admin/templates/admin/auth/user/change_password.html:39
-#: contrib/auth/forms.py:177
+#: contrib/auth/forms.py:185
 msgid "Password (again)"
 msgstr "パスワード(確認用)"
 
@@ -734,6 +742,10 @@ msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "<strong>%(username)s</strong>さんの新しいパスワードを入力してください。"
 
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
+msgid "Delete?"
+msgstr "削除しますか?"
+
 #: contrib/admin/templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "ご利用ありがとうございました。"
@@ -1008,7 +1020,7 @@ msgstr "ファイルの場所"
 msgid "Floating point number"
 msgstr "浮動小数点"
 
-#: contrib/admindocs/views.py:331 contrib/comments/models.py:89
+#: contrib/admindocs/views.py:331 contrib/comments/models.py:57
 msgid "IP address"
 msgstr "IP アドレス"
 
@@ -1032,8 +1044,8 @@ msgstr "テキスト"
 msgid "Time"
 msgstr "時刻"
 
-#: contrib/admindocs/views.py:342 contrib/flatpages/admin.py:8
-#: contrib/flatpages/models.py:8
+#: contrib/admindocs/views.py:342 contrib/comments/forms.py:20
+#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
 
@@ -1131,20 +1143,21 @@ msgstr "重要な日程"
 msgid "Groups"
 msgstr "グループ"
 
-#: contrib/auth/admin.py:60
+#: contrib/auth/admin.py:62
 msgid "Add user"
 msgstr "ユーザを追加"
 
-#: contrib/auth/admin.py:85
+#: contrib/auth/admin.py:88
 msgid "Password changed successfully."
 msgstr "パスワードを変更しました"
 
-#: contrib/auth/admin.py:91
+#: contrib/auth/admin.py:94
 #, python-format
 msgid "Change password: %s"
 msgstr "パスワードの変更: %s"
 
-#: contrib/auth/forms.py:15 contrib/auth/models.py:137
+#: contrib/auth/forms.py:15 contrib/auth/forms.py:48
+#: contrib/auth/models.py:136
 msgid ""
 "Required. 30 characters or fewer. Alphanumeric characters only (letters, "
 "digits and underscores)."
@@ -1152,7 +1165,7 @@ msgstr ""
 "この項目は必須です。半角アルファベット、半角数字、半角アンダーバーで30文字以"
 "下にしてください。"
 
-#: contrib/auth/forms.py:16 core/validators.py:72
+#: contrib/auth/forms.py:16 contrib/auth/forms.py:49
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "半角の英数字およびアンダースコア以外は使用できません。"
 
@@ -1164,16 +1177,16 @@ msgstr "パスワードの確認"
 msgid "A user with that username already exists."
 msgstr "同じユーザ名が既に登録済みです。"
 
-#: contrib/auth/forms.py:36 contrib/auth/forms.py:146
-#: contrib/auth/forms.py:188
+#: contrib/auth/forms.py:36 contrib/auth/forms.py:154
+#: contrib/auth/forms.py:196
 msgid "The two password fields didn't match."
 msgstr "確認用パスワードが一致しません。"
 
-#: contrib/auth/forms.py:74 contrib/comments/views/comments.py:58
+#: contrib/auth/forms.py:82
 msgid "This account is inactive."
 msgstr "アカウントが無効です。"
 
-#: contrib/auth/forms.py:79 contrib/comments/views/comments.py:49
+#: contrib/auth/forms.py:87
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -1181,82 +1194,82 @@ msgstr ""
 "お使いのブラウザはクッキーを有効にしていないようです。ログインにはクッキーが"
 "必要です。"
 
-#: contrib/auth/forms.py:92
+#: contrib/auth/forms.py:100
 msgid "E-mail"
 msgstr "メールアドレス"
 
-#: contrib/auth/forms.py:101
+#: contrib/auth/forms.py:109
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "メールアドレスの一致するユーザはいません。本当に登録しましたか？"
 
-#: contrib/auth/forms.py:126
+#: contrib/auth/forms.py:134
 #, python-format
 msgid "Password reset on %s"
 msgstr "%s にパスワードをリセット"
 
-#: contrib/auth/forms.py:134
+#: contrib/auth/forms.py:142
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: contrib/auth/forms.py:135
+#: contrib/auth/forms.py:143
 msgid "New password confirmation"
 msgstr "新しいパスワード(確認用)"
 
-#: contrib/auth/forms.py:160
+#: contrib/auth/forms.py:168
 msgid "Old password"
 msgstr "元のパスワード"
 
-#: contrib/auth/forms.py:168
+#: contrib/auth/forms.py:176
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "元のパスワードが間違っています。もう一度入力してください。"
 
-#: contrib/auth/models.py:73 contrib/auth/models.py:96
+#: contrib/auth/models.py:72 contrib/auth/models.py:95
 msgid "name"
 msgstr "名前"
 
-#: contrib/auth/models.py:75
+#: contrib/auth/models.py:74
 msgid "codename"
 msgstr "コード名"
 
-#: contrib/auth/models.py:78
+#: contrib/auth/models.py:77
 msgid "permission"
 msgstr "パーミッション"
 
-#: contrib/auth/models.py:79 contrib/auth/models.py:97
+#: contrib/auth/models.py:78 contrib/auth/models.py:96
 msgid "permissions"
 msgstr "パーミッション"
 
-#: contrib/auth/models.py:100
+#: contrib/auth/models.py:99
 msgid "group"
 msgstr "グループ"
 
-#: contrib/auth/models.py:101 contrib/auth/models.py:147
+#: contrib/auth/models.py:100 contrib/auth/models.py:146
 msgid "groups"
 msgstr "グループ"
 
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:136
 msgid "username"
 msgstr "ユーザ名"
 
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:137
 msgid "first name"
 msgstr "名"
 
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:138
 msgid "last name"
 msgstr "姓"
 
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:139
 msgid "e-mail address"
 msgstr "メールアドレス"
 
-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:140
 msgid "password"
 msgstr "パスワード"
 
-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:140
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@@ -1264,19 +1277,19 @@ msgstr ""
 "'[algo]$[salt]$[hexdigest]'形式か、<a href=\"password/\">パスワード変更フォー"
 "ム</a>を使ってください。"
 
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:141
 msgid "staff status"
 msgstr "スタッフ権限"
 
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:141
 msgid "Designates whether the user can log into this admin site."
 msgstr "ユーザが管理サイトにログイン可能かどうかを示します。"
 
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:142
 msgid "active"
 msgstr "有効"
 
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:142
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -1284,25 +1297,25 @@ msgstr ""
 "ユーザがアクティブかどうかを示します。アカウントを消す代わりに選択を解除して"
 "ください。"
 
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:143
 msgid "superuser status"
 msgstr "スーパーユーザ権限"
 
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:143
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "全ての権限を持っているとみなされます。"
 
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:144
 msgid "last login"
 msgstr "最終ログイン"
 
-#: contrib/auth/models.py:146
+#: contrib/auth/models.py:145
 msgid "date joined"
 msgstr "登録日"
 
-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:147
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
@@ -1310,19 +1323,19 @@ msgstr ""
 "手動で付与したパーミッションに加え、所属しているグループに付与された全ての"
 "パーミッションを獲得します。"
 
-#: contrib/auth/models.py:149
+#: contrib/auth/models.py:148
 msgid "user permissions"
 msgstr "ユーザパーミッション"
 
-#: contrib/auth/models.py:153
+#: contrib/auth/models.py:152
 msgid "user"
 msgstr "ユーザ"
 
-#: contrib/auth/models.py:154
+#: contrib/auth/models.py:153
 msgid "users"
 msgstr "ユーザ"
 
-#: contrib/auth/models.py:309
+#: contrib/auth/models.py:308
 msgid "message"
 msgstr "メッセージ"
 
@@ -1330,68 +1343,80 @@ msgstr "メッセージ"
 msgid "Logged out"
 msgstr "ログアウト"
 
-#: contrib/comments/models.py:71 contrib/comments/models.py:164
+#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:423
+msgid "Enter a valid e-mail address."
+msgstr "有効なメールアドレスを入力してください。"
+
+#: contrib/comments/admin.py:11
+msgid "Content"
+msgstr "内容"
+
+#: contrib/comments/admin.py:14
+msgid "Metadata"
+msgstr "メタデータ"
+
+#: contrib/comments/forms.py:18
+msgid "Name"
+msgstr "名前"
+
+#: contrib/comments/forms.py:19
+msgid "Email address"
+msgstr "メールアドレス"
+
+#: contrib/comments/forms.py:21
+msgid "Comment"
+msgstr "コメント"
+
+#: contrib/comments/forms.py:24
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr "このフィールドに入力するとコメントはスパム扱いされます"
+
+#: contrib/comments/forms.py:124
+#, 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 という言葉は使えません。"
+
+#: contrib/comments/models.py:22
 msgid "object ID"
 msgstr "オブジェクト ID"
 
-#: contrib/comments/models.py:72
-msgid "headline"
-msgstr "新着情報"
+#: contrib/comments/models.py:49
+msgid "user's name"
+msgstr "名前"
 
-#: contrib/comments/models.py:73 contrib/comments/models.py:95
-#: contrib/comments/models.py:165
+#: contrib/comments/models.py:50
+msgid "user's email address"
+msgstr "メールアドレス"
+
+#: contrib/comments/models.py:51
+msgid "user's URL"
+msgstr "URL"
+
+#: contrib/comments/models.py:53
 msgid "comment"
 msgstr "コメント"
 
-#: contrib/comments/models.py:74
-msgid "rating #1"
-msgstr "レーティング #1"
-
-#: contrib/comments/models.py:75
-msgid "rating #2"
-msgstr "レーティング #2"
-
-#: contrib/comments/models.py:76
-msgid "rating #3"
-msgstr "レーティング #3"
-
-#: contrib/comments/models.py:77
-msgid "rating #4"
-msgstr "レーティング #4"
-
-#: contrib/comments/models.py:78
-msgid "rating #5"
-msgstr "レーティング #5"
-
-#: contrib/comments/models.py:79
-msgid "rating #6"
-msgstr "レーティング #6"
-
-#: contrib/comments/models.py:80
-msgid "rating #7"
-msgstr "レーティング #7"
-
-#: contrib/comments/models.py:81
-msgid "rating #8"
-msgstr "レーティング #8"
-
-#: contrib/comments/models.py:86
-msgid "is valid rating"
-msgstr "は有効なレーティングです"
-
-#: contrib/comments/models.py:87 contrib/comments/models.py:167
+#: contrib/comments/models.py:56
 msgid "date/time submitted"
 msgstr "コメント投稿日時"
 
-#: contrib/comments/models.py:88 contrib/comments/models.py:168
+#: contrib/comments/models.py:58
 msgid "is public"
 msgstr "は公開中です"
 
-#: contrib/comments/models.py:90
+#: contrib/comments/models.py:59
+msgid ""
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr ""
+"手っ取り早くコメントをサイトから消すにはここのチェックを外してください。"
+
+#: contrib/comments/models.py:61
 msgid "is removed"
 msgstr "は削除されました"
 
-#: contrib/comments/models.py:90
+#: contrib/comments/models.py:62
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -1399,15 +1424,23 @@ msgstr ""
 "コメントが不適切な場合はチェックを入れてください。「コメントは削除されまし"
 "た」と表示されるようになります。"
 
-#: contrib/comments/models.py:96
-msgid "comments"
-msgstr "コメント"
+#: contrib/comments/models.py:114
+msgid ""
+"This comment was posted by an authenticated user and thus the name is read-"
+"only."
+msgstr ""
+"このコメントは認証済みユーザーによって投稿されたため、名前は読み取り専用で"
+"す。"
 
-#: contrib/comments/models.py:128 contrib/comments/models.py:199
-msgid "Content object"
-msgstr "コンテンツオブジェクト"
+#: contrib/comments/models.py:123
+msgid ""
+"This comment was posted by an authenticated user and thus the email is read-"
+"only."
+msgstr ""
+"このコメントは認証済みユーザーによって投稿されたため、メールアドレスは読み取"
+"り専用です。"
 
-#: contrib/comments/models.py:156
+#: contrib/comments/models.py:148
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -1422,203 +1455,6 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: contrib/comments/models.py:166
-msgid "person's name"
-msgstr "名前"
-
-#: contrib/comments/models.py:169
-msgid "ip address"
-msgstr "IP アドレス"
-
-#: contrib/comments/models.py:171
-msgid "approved by staff"
-msgstr "スタッフの承認済み"
-
-#: contrib/comments/models.py:175
-msgid "free comment"
-msgstr "フリーコメント"
-
-#: contrib/comments/models.py:176
-msgid "free comments"
-msgstr "フリーコメント"
-
-#: contrib/comments/models.py:227
-msgid "score"
-msgstr "スコア"
-
-#: contrib/comments/models.py:228
-msgid "score date"
-msgstr "スコアされた日"
-
-#: contrib/comments/models.py:232
-msgid "karma score"
-msgstr "カルマスコア"
-
-#: contrib/comments/models.py:233
-msgid "karma scores"
-msgstr "カルマスコア"
-
-#: contrib/comments/models.py:237
-#, python-format
-msgid "%(score)d rating by %(user)s"
-msgstr "%(user)s により %(score)d 点のレーティング"
-
-#: contrib/comments/models.py:254
-#, python-format
-msgid ""
-"This comment was flagged by %(user)s:\n"
-"\n"
-"%(text)s"
-msgstr ""
-"このコメントは %(user)s がフラグ付けしました。:\n"
-"\n"
-"%(text)s"
-
-#: contrib/comments/models.py:262
-msgid "flag date"
-msgstr "フラグ日"
-
-#: contrib/comments/models.py:266
-msgid "user flag"
-msgstr "ユーザフラグ"
-
-#: contrib/comments/models.py:267
-msgid "user flags"
-msgstr "ユーザフラグ"
-
-#: contrib/comments/models.py:271
-#, python-format
-msgid "Flag by %r"
-msgstr "%r によるフラグ"
-
-#: contrib/comments/models.py:277
-msgid "deletion date"
-msgstr "削除日"
-
-#: contrib/comments/models.py:280
-msgid "moderator deletion"
-msgstr "モデレータ削除"
-
-#: contrib/comments/models.py:281
-msgid "moderator deletions"
-msgstr "モデレータ削除"
-
-#: contrib/comments/models.py:285
-#, python-format
-msgid "Moderator deletion by %r"
-msgstr "%r によるモデレータ削除"
-
-#: contrib/comments/templates/comments/form.html:8
-msgid "Forgotten your password?"
-msgstr "パスワードをお忘れですか？"
-
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-msgstr "レーティング"
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-msgstr "必須"
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-msgstr "オプション"
-
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-msgstr "写真を登録"
-
-#: contrib/comments/templates/comments/form.html:28
-#: contrib/comments/templates/comments/freeform.html:5
-msgid "Comment:"
-msgstr "コメント:"
-
-#: contrib/comments/templates/comments/form.html:35
-#: contrib/comments/templates/comments/freeform.html:10
-msgid "Preview comment"
-msgstr "コメントをプレビュー"
-
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
-msgstr "ユーザ名:"
-
-#: contrib/comments/views/comments.py:76
-msgid ""
-"This rating is required because you've entered at least one other rating."
-msgstr ""
-"他のレーティングを入力した場合は、このレーティングは必ず入力してください。"
-
-#: contrib/comments/views/comments.py:160
-#, 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"
-
-#: contrib/comments/views/comments.py:165
-#, 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:238
-#: contrib/comments/views/comments.py:331
-msgid "Only POSTs are allowed"
-msgstr "POST メソッドのみ有効です。"
-
-#: contrib/comments/views/comments.py:242
-#: contrib/comments/views/comments.py:335
-msgid "One or more of the required fields wasn't submitted"
-msgstr "必須項目がいくつか入力されていません。"
-
-#: contrib/comments/views/comments.py:246
-#: contrib/comments/views/comments.py:337
-msgid "Somebody tampered with the comment form (security violation)"
-msgstr "だれかがコメントフォームを改竄しています (セキュリティ侵害です)"
-
-#: contrib/comments/views/comments.py:256
-#: contrib/comments/views/comments.py:343
-msgid ""
-"The comment form had an invalid 'target' parameter -- the object ID was "
-"invalid"
-msgstr ""
-"コメントフォームの 'target' パラメータが不正です。 -- オブジェクト IDが不正な"
-"値でした"
-
-#: contrib/comments/views/comments.py:307
-#: contrib/comments/views/comments.py:372
-msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr "コメントの「プレビュー」「投稿」種別が不明です。"
-
-#: contrib/comments/views/karma.py:21
-msgid "Anonymous users cannot vote"
-msgstr "非ログインユーザは投票できません。"
-
-#: contrib/comments/views/karma.py:25
-msgid "Invalid comment ID"
-msgstr "コメント ID が不正です"
-
-#: contrib/comments/views/karma.py:27
-msgid "No voting for yourself"
-msgstr "自分には投票できません。"
-
 #: contrib/contenttypes/models.py:67
 msgid "python model class name"
 msgstr "Python モデルクラス名"
@@ -1637,7 +1473,7 @@ msgid ""
 msgstr ""
 "例: '/about/contact/'. 先頭と最後にスラッシュがあるか確認してください。"
 
-#: contrib/flatpages/admin.py:11 core/validators.py:76
+#: contrib/flatpages/admin.py:11
 msgid ""
 "This value must contain only letters, numbers, underscores, dashes or "
 "slashes."
@@ -1648,23 +1484,23 @@ msgstr ""
 msgid "Advanced options"
 msgstr "詳細設定"
 
-#: contrib/flatpages/models.py:9
+#: contrib/flatpages/models.py:8
 msgid "title"
 msgstr "タイトル"
 
-#: contrib/flatpages/models.py:10
+#: contrib/flatpages/models.py:9
 msgid "content"
 msgstr "内容"
 
-#: contrib/flatpages/models.py:11
+#: contrib/flatpages/models.py:10
 msgid "enable comments"
 msgstr "コメントを有効にする"
 
-#: contrib/flatpages/models.py:12
+#: contrib/flatpages/models.py:11
 msgid "template name"
 msgstr "テンプレート名"
 
-#: contrib/flatpages/models.py:13
+#: contrib/flatpages/models.py:12
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -1672,33 +1508,41 @@ msgstr ""
 "例: 'flatpages/contact_page.html'. 指定しなければ、デフォルト設定"
 "の'flatpages/default.html' を使います。"
 
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:13
 msgid "registration required"
 msgstr "登録が必要です"
 
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:13
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "チェックした場合、ログインしたユーザだけがページを参照できます。"
 
-#: contrib/flatpages/models.py:19
+#: contrib/flatpages/models.py:18
 msgid "flat page"
 msgstr "フラットページ"
 
-#: contrib/flatpages/models.py:20
+#: contrib/flatpages/models.py:19
 msgid "flat pages"
 msgstr "フラットページ"
 
-#: contrib/gis/forms/fields.py:10
+#: contrib/formtools/wizard.py:130
+msgid ""
+"We apologize, but your form has expired. Please continue filling out the "
+"form from this page."
+msgstr ""
+"申し訳ありませんが、あなたのフォームへの入力は時間切れになりました。このペー"
+"ジで再度入力してください。"
+
+#: contrib/gis/forms/fields.py:14
 msgid "No geometry value provided."
-msgstr "Geo値がありません。"
+msgstr "geometry値がありません。"
 
-#: contrib/gis/forms/fields.py:11
-msgid "Invalid Geometry value."
-msgstr "Geo値が不正です"
+#: contrib/gis/forms/fields.py:15
+msgid "Invalid geometry value."
+msgstr "geometry値が不正です"
 
-#: contrib/gis/forms/fields.py:12
-msgid "Invalid Geometry type."
-msgstr "Geometry タイプが不正です。"
+#: contrib/gis/forms/fields.py:16
+msgid "Invalid geometry type."
+msgstr "geometryタイプが不正です。"
 
 #: contrib/humanize/templatetags/humanize.py:19
 msgid "th"
@@ -2432,7 +2276,7 @@ msgstr "社会保障番号番号を正しく入力してください。"
 msgid "Enter a valid VAT number."
 msgstr "VAT番号を正しく入力してください。"
 
-#: contrib/localflavor/jp/forms.py:17
+#: contrib/localflavor/jp/forms.py:16
 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
 msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。"
 
@@ -2765,8 +2609,8 @@ msgid "Enter a valid SoFi number"
 msgstr "社会税務番号(SoFi)を正しく入力してください。"
 
 #: contrib/localflavor/nl/nl_provinces.py:4
-msgid "Drente"
-msgstr "Drente"
+msgid "Drenthe"
+msgstr "Drenthe"
 
 #: contrib/localflavor/nl/nl_provinces.py:5
 msgid "Flevoland"
@@ -3685,365 +3529,65 @@ msgstr "表示名"
 msgid "sites"
 msgstr "サイト"
 
-#: core/validators.py:80
-msgid "This value must contain only letters, numbers, underscores or hyphens."
-msgstr "半角の英数字、アンダースコア、ハイフン以外は使用できません。"
+#: db/models/fields/__init__.py:332 db/models/fields/__init__.py:667
+msgid "This value must be an integer."
+msgstr "値は整数でなければなりません。"
 
-#: core/validators.py:84
-msgid "Uppercase letters are not allowed here."
-msgstr "大文字はここでは使用できません。"
+#: db/models/fields/__init__.py:363
+msgid "This value must be either True or False."
+msgstr "値は真: True または偽: False でなければなりません。"
 
-#: core/validators.py:88
-msgid "Lowercase letters are not allowed here."
-msgstr "小文字はここでは使用できません。"
+#: db/models/fields/__init__.py:396
+msgid "This field cannot be null."
+msgstr "このフィールドには NULL を指定できません。"
 
-#: core/validators.py:95
+#: db/models/fields/__init__.py:412
 msgid "Enter only digits separated by commas."
 msgstr "カンマ区切りの数字だけを入力してください。"
 
-#: core/validators.py:107
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "カンマ区切りの有効なメールアドレスを入力してください。"
+#: db/models/fields/__init__.py:443
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "YYYY-MM-DD形式で日付を入力してください。"
 
-#: core/validators.py:111
-msgid "Please enter a valid IP address."
-msgstr "有効な IP アドレスを入力してください。"
-
-#: core/validators.py:115
-msgid "Empty values are not allowed here."
-msgstr "入力は必須です。"
-
-#: core/validators.py:119
-msgid "Non-numeric characters aren't allowed here."
-msgstr "数値以外は使用できません。"
-
-#: core/validators.py:123
-msgid "This value can't be comprised solely of digits."
-msgstr "数値だけの値にはできません。"
-
-#: core/validators.py:128 forms/fields.py:161
-msgid "Enter a whole number."
-msgstr "整数を入力してください。"
-
-#: core/validators.py:132
-msgid "Only alphabetical characters are allowed here."
-msgstr "半角アルファベット以外使用できません。"
-
-#: core/validators.py:147
+#: db/models/fields/__init__.py:452
 #, python-format
 msgid "Invalid date: %s"
 msgstr "無効な日付: %s"
 
-#: core/validators.py:152 db/models/fields/__init__.py:546
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "YYYY-MM-DD形式で日付を入力してください。"
-
-#: core/validators.py:157
-msgid "Enter a valid time in HH:MM format."
-msgstr "HH:MM形式で時刻を入力してください。"
-
-#: core/validators.py:161
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "YYYY-MM-DD HH:MM形式で日時を入力してください。"
-
-#: core/validators.py:166 forms/fields.py:422
-msgid "Enter a valid e-mail address."
-msgstr "有効なメールアドレスを入力してください。"
-
-#: core/validators.py:178 core/validators.py:470 forms/fields.py:440
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-"ファイルが取得できませんでした。formのencoding typeを確認してください。"
-
-#: core/validators.py:189 forms/fields.py:471
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr "画像をアップロードしてください。アップロードしたファイルは画像でないか、または壊れています。"
-
-#: core/validators.py:196
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "URL ( %s )  は画像ではありません。"
-
-#: core/validators.py:200
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "電話番号は XXX-XXX-XXXX 形式で入力してください。\"%s\" は無効です。"
-
-#: core/validators.py:208
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "URL ( %s ) は QuickTime ビデオではありません。"
-
-#: core/validators.py:212
-msgid "A valid URL is required."
-msgstr "正しい URL を入力してください。"
-
-#: core/validators.py:226
-#, python-format
-msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
-msgstr ""
-"有効な HTML を入力してください。エラー:\n"
-"%s"
-
-#: core/validators.py:233
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "不正な XML です: %s"
-
-#: core/validators.py:250
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "無効なURL: %s"
-
-#: core/validators.py:255 core/validators.py:257
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "URL ( %s ) はリンクが壊れています。"
-
-#: core/validators.py:263
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "正しい米州略称を入力してください。"
-
-#: core/validators.py:277
-#, 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:284
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "このフィールドは '%s' フィールドと一致せねばなりません。"
-
-#: core/validators.py:303
-msgid "Please enter something for at least one field."
-msgstr "少なくとも一つのフィールドに何か入力してください。"
-
-#: core/validators.py:312 core/validators.py:323
-msgid "Please enter both fields or leave them both empty."
-msgstr "両方のフィールドに入力するか、両方とも未入力にしてください。"
-
-#: core/validators.py:331
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr ""
-"%(field)s を %(value)s にするのなら、このフィールドに必ず入力してください。"
-
-#: core/validators.py:344
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr ""
-"%(field)s を %(value)s にしないのなら、このフィールドに必ず入力してください。"
-
-#: core/validators.py:363
-msgid "Duplicate values are not allowed."
-msgstr "重複する値は認められません。"
-
-#: core/validators.py:378
-#, python-format
-msgid "This value must be between %(lower)s and %(upper)s."
-msgstr "この値は %(lower)s から %(upper)s の間でなければなりません。"
-
-#: core/validators.py:380
-#, python-format
-msgid "This value must be at least %s."
-msgstr "この値は %s 以上でなければなりません。"
-
-#: core/validators.py:382
-#, python-format
-msgid "This value must be no more than %s."
-msgstr "この値は %s より小さくなければなりません。"
-
-#: core/validators.py:423
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "この値は %s の累乗でなければなりません。"
-
-#: core/validators.py:433
-msgid "Please enter a valid decimal number."
-msgstr "有効な 10 進数を入力してください。"
-
-#: core/validators.py:440
-#, 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 文字以下の数字を入力してください。"
-
-#: core/validators.py:443
-#, 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] "整数部は %s 文字以下の数字を入力してください。"
-
-#: core/validators.py:446
-#, 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 文字以下の数字を入力してください。"
-
-#: core/validators.py:454
-msgid "Please enter a valid floating point number."
-msgstr "有効な 小数 を入力してください。"
-
-#: core/validators.py:463
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "アップロードするファイルの大きさは %s バイト以上にしてください。"
-
-#: core/validators.py:464
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "アップロードするファイルの大きさは %s 最大バイトまでです。"
-
-#: core/validators.py:481
-msgid "The format for this field is wrong."
-msgstr "フィールドの形式が正しくありません。"
-
-#: core/validators.py:496
-msgid "This field is invalid."
-msgstr "このフィールドは無効です。"
-
-#: core/validators.py:532
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "%s から何も検索できませんでした。"
-
-#: core/validators.py:535
-#, python-format
-msgid ""
-"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr ""
-"URL %(url)s は無効なコンテンツタイプヘッダ '%(contenttype)s' を返しました。"
-
-#: core/validators.py:568
-#, 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:572
-#, 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:577
-#, 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:582
-#, 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:586
-#, 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:591
-#, 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\" で始まる行です) 。"
-
-#: db/models/manipulators.py:304
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
-msgstr ""
-"%(field)s に入力されたものは、この %(type)s の %(object)s に既に存在します。"
-
-#: db/models/fields/__init__.py:46
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "%(fieldname)s に %(optname)s は既に存在します。"
-
-#: db/models/fields/__init__.py:320 db/models/fields/files.py:168
-#: db/models/fields/files.py:179 forms/fields.py:52 oldforms/__init__.py:370
-msgid "This field is required."
-msgstr "このフィールドは必須です。"
-
-#: db/models/fields/__init__.py:434
-msgid "This value must be an integer."
-msgstr "値は整数でなければなりません。"
-
-#: db/models/fields/__init__.py:480
-msgid "This value must be either True or False."
-msgstr "値は真: True または偽: False でなければなりません。"
-
-#: db/models/fields/__init__.py:509
-msgid "This field cannot be null."
-msgstr "このフィールドには NULL を指定できません。"
-
-#: db/models/fields/__init__.py:611 db/models/fields/__init__.py:628
+#: db/models/fields/__init__.py:516 db/models/fields/__init__.py:534
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
 msgstr "YYYY-MM-DD HH:MM[:ss[.uuuuuu]]形式で日時を入力してください。"
 
-#: db/models/fields/__init__.py:684
+#: db/models/fields/__init__.py:570
 msgid "This value must be a decimal number."
 msgstr "値は整数でなければなりません。"
 
-#: db/models/fields/__init__.py:825
+#: db/models/fields/__init__.py:703
 msgid "This value must be either None, True or False."
 msgstr "値は、空: None、真: True または偽: False でなければなりません。"
 
-#: db/models/fields/__init__.py:937 db/models/fields/__init__.py:950
+#: db/models/fields/__init__.py:811 db/models/fields/__init__.py:825
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "HH:MM[:ss[.uuuuuu]]形式で時刻を入力してください。"
 
-#: db/models/fields/files.py:188
-msgid "Enter a valid filename."
-msgstr "正しいファイル名を入力してください。"
-
-#: db/models/fields/related.py:92
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "正しい %s を入力してください。"
-
-#: db/models/fields/related.py:776
+#: db/models/fields/related.py:748
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "複数選択するときには Control キーを押したまま選択してください。Mac は "
 "Command キーを使ってください"
 
-#: db/models/fields/related.py:856
+#: db/models/fields/related.py:825
 #, 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 は無効です。"
 
+#: forms/fields.py:52
+msgid "This field is required."
+msgstr "このフィールドは必須です。"
+
 #: forms/fields.py:53
 msgid "Enter a valid value."
 msgstr "値を正しく入力してください。"
@@ -4058,6 +3602,10 @@ msgstr "%(max)d 字以下で入力してください( %(length)d 文字入力さ
 msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
 msgstr "%(min)d 字以上で入力してください。( %(length)d 文字入力されました)。"
 
+#: forms/fields.py:161
+msgid "Enter a whole number."
+msgstr "整数を入力してください。"
+
 #: forms/fields.py:162 forms/fields.py:191 forms/fields.py:220
 #, python-format
 msgid "Ensure this value is less than or equal to %s."
@@ -4087,104 +3635,99 @@ msgstr "少数部は %s 桁までで入力して下さい。"
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "整数部は %s 桁までで入力して下さい。"
 
-#: forms/fields.py:282 forms/fields.py:803
+#: forms/fields.py:282 forms/fields.py:815
 msgid "Enter a valid date."
 msgstr "日付を正しく入力してください。"
 
-#: forms/fields.py:315 forms/fields.py:804
+#: forms/fields.py:316 forms/fields.py:816
 msgid "Enter a valid time."
 msgstr "時間を正しく入力してください。"
 
-#: forms/fields.py:354
+#: forms/fields.py:355
 msgid "Enter a valid date/time."
 msgstr "日付/時間を正しく入力してください。"
 
 #: forms/fields.py:441
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+"ファイルが取得できませんでした。formのencoding typeを確認してください。"
+
+#: forms/fields.py:442
 msgid "No file was submitted."
 msgstr "ファイルが送信されていません。"
 
-#: forms/fields.py:442 oldforms/__init__.py:689
+#: forms/fields.py:443
 msgid "The submitted file is empty."
 msgstr "入力されたファイルは空です。"
 
-#: forms/fields.py:532
+#: forms/fields.py:472
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"画像をアップロードしてください。アップロードしたファイルは画像でないか、また"
+"は壊れています。"
+
+#: forms/fields.py:533
 msgid "Enter a valid URL."
 msgstr "URLを正しく入力してください。"
 
-#: forms/fields.py:533
+#: forms/fields.py:534
 msgid "This URL appears to be a broken link."
 msgstr "このURLはリンクが壊れています。"
 
-#: forms/fields.py:601 forms/fields.py:652
+#: forms/fields.py:613 forms/fields.py:664
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "正しく選択してください。 %(value)s は候補にありません。"
 
-#: forms/fields.py:653 forms/fields.py:714 forms/models.py:528
+#: forms/fields.py:665 forms/fields.py:726 forms/models.py:531
 msgid "Enter a list of values."
 msgstr "リストを入力してください。"
 
-#: forms/fields.py:832
+#: forms/fields.py:844
 msgid "Enter a valid IPv4 address."
 msgstr "有効なIPアドレス (IPv4) を入力してください。"
 
-#: forms/models.py:461
+#: forms/fields.py:854
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr "slug には半角の英数字、アンダースコア、ハイフン以外は使用できません。"
+
+#: forms/formsets.py:242 forms/formsets.py:244
+msgid "Order"
+msgstr "並び変え"
+
+#: forms/models.py:463
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "正しく選択してください。選択したものは候補にありません。"
 
-#: forms/models.py:529
+#: forms/models.py:532
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "正しく選択してください。 %s は候補にありません。"
 
-#: oldforms/__init__.py:405
-#, python-format
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] "%s 字以下で入力してください。"
-
-#: oldforms/__init__.py:410
-msgid "Line breaks are not allowed here."
-msgstr "改行はできません。"
-
-#: oldforms/__init__.py:508 oldforms/__init__.py:582 oldforms/__init__.py:621
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr "正しく選択してください。; '%(data)s' は %(choices)s にありません。"
-
-#: oldforms/__init__.py:750
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "-32,768 から 32,767 までの整数を入力してください。"
-
-#: oldforms/__init__.py:760
-msgid "Enter a positive number."
-msgstr "正の数を入力してください。"
-
-#: oldforms/__init__.py:770
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "0 から 32,767 までの整数を入力してください。"
-
-#: template/defaultfilters.py:698
+#: template/defaultfilters.py:706
 msgid "yes,no,maybe"
 msgstr "はい,いいえ,たぶん"
 
-#: template/defaultfilters.py:729
+#: template/defaultfilters.py:737
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d バイト"
 
-#: template/defaultfilters.py:731
+#: template/defaultfilters.py:739
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:733
+#: template/defaultfilters.py:741
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:734
+#: template/defaultfilters.py:742
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
@@ -4427,37 +3970,33 @@ msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "分"
 
-#: utils/timesince.py:51
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:57
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/translation/trans_real.py:401
+#: utils/translation/trans_real.py:403
 msgid "DATE_FORMAT"
 msgstr "Y/m/d"
 
-#: utils/translation/trans_real.py:402
-msgid "DATETIME_FORMAT"
-msgstr "Y/m/d H:i"
-
-#: utils/translation/trans_real.py:403
+#: utils/translation/trans_real.py:405
 msgid "TIME_FORMAT"
 msgstr "H:i"
 
-#: utils/translation/trans_real.py:419
+#: utils/translation/trans_real.py:421
 msgid "YEAR_MONTH_FORMAT"
 msgstr "Y/m/d"
 
-#: utils/translation/trans_real.py:420
+#: utils/translation/trans_real.py:422
 msgid "MONTH_DAY_FORMAT"
 msgstr "m/d"
 
@@ -4475,36 +4014,3 @@ msgstr "%(verbose_name)s を更新しました。"
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr " %(verbose_name)s を削除しました。"
-
-#~ msgid "Your new password is: %(new_password)s"
-#~ msgstr "新しいパスワード: %(new_password)s"
-
-#~ msgid "Feel free to change this password by going to this page:"
-#~ msgstr "パスワードは下記のページで自由に変更していただけます:"
-
-#~ msgid "Gaeilge"
-#~ msgstr "アイルランド語"
-
-#~ msgid "Brazilian"
-#~ msgstr "ブラジル語"
-
-#~ msgid "Ordering"
-#~ msgstr "順序"
-
-#~ msgid "Order:"
-#~ msgstr "並び変え:"
-
-#~ msgid "Added %s."
-#~ msgstr "%s を追加しました。"
-
-#~ msgid "Deleted %s."
-#~ msgstr "%s を削除しました。"
-
-#~ msgid "The two 'new password' fields didn't match."
-#~ msgstr "新しいパスワード(確認用)が一致しません。"
-
-#~ msgid "Year must be 1900 or later."
-#~ msgstr "1900年以降を指定してください。"
-
-#~ msgid "Separate multiple IDs with commas."
-#~ msgstr "複数の ID はカンマで区切ってください。"