fixed #1909: updated japanese translation

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2936 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/conf/locale/ja/LC_MESSAGES/django.po

-# 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 <EMAIL@ADDRESS>, YEAR.
-# 
+# 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 <EMAIL@ADDRESS>, YEAR.
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:13+0200\n"
-"PO-Revision-Date: 2006-05-08 13:39+0900\n"
+"POT-Creation-Date: 2006-05-18 00:21+0900\n"
+"PO-Revision-Date: 2006-05-18 00:28+0900\n"
 "Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
 "Language-Team: Japanese <django-ja@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/comments/models.py:67 contrib/comments/models.py:166
-msgid "object ID"
-msgstr "オブジェクト ID"
-
-#: contrib/comments/models.py:68
-msgid "headline"
-msgstr "新着情報"
-
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:167
-msgid "comment"
-msgstr "コメント"
-
-#: contrib/comments/models.py:70
-msgid "rating #1"
-msgstr "レーティング #1"
+#: conf/global_settings.py:37
+msgid "Bengali"
+msgstr "ベンガル語"
 
-#: contrib/comments/models.py:71
-msgid "rating #2"
-msgstr "レーティング #2"
+#: conf/global_settings.py:38
+msgid "Czech"
+msgstr "チェコ語"
 
-#: contrib/comments/models.py:72
-msgid "rating #3"
-msgstr "レーティング #3"
+#: conf/global_settings.py:39
+msgid "Welsh"
+msgstr "ウェールズ語"
 
-#: contrib/comments/models.py:73
-msgid "rating #4"
-msgstr "レーティング #4"
+#: conf/global_settings.py:40
+msgid "Danish"
+msgstr "デンマーク語"
 
-#: contrib/comments/models.py:74
-msgid "rating #5"
-msgstr "レーティング #5"
+#: conf/global_settings.py:41
+msgid "German"
+msgstr "ドイツ語"
 
-#: contrib/comments/models.py:75
-msgid "rating #6"
-msgstr "レーティング #6"
+#: conf/global_settings.py:42
+msgid "Greek"
+msgstr "ギリシャ語"
 
-#: contrib/comments/models.py:76
-msgid "rating #7"
-msgstr "レーティング #7"
+#: conf/global_settings.py:43
+msgid "English"
+msgstr "英語"
 
-#: contrib/comments/models.py:77
-msgid "rating #8"
-msgstr "レーティング #8"
+#: conf/global_settings.py:44
+msgid "Spanish"
+msgstr "スペイン語"
 
-#: contrib/comments/models.py:82
-msgid "is valid rating"
-msgstr "は有効なレーティングです"
+#: conf/global_settings.py:45
+msgid "French"
+msgstr "フランス語"
 
-#: contrib/comments/models.py:83 contrib/comments/models.py:169
-msgid "date/time submitted"
-msgstr "コメント投稿日時"
+#: conf/global_settings.py:46
+msgid "Galician"
+msgstr "ガリシア語"
 
-#: contrib/comments/models.py:84 contrib/comments/models.py:170
-msgid "is public"
-msgstr "は公開中です"
+#: conf/global_settings.py:47
+msgid "Hungarian"
+msgstr "ハンガリー語"
 
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:289
-msgid "IP address"
-msgstr "IP アドレス"
+#: conf/global_settings.py:48
+msgid "Hebrew"
+msgstr "ヘブライ語"
 
-#: contrib/comments/models.py:86
-msgid "is removed"
-msgstr "は削除されました"
+#: conf/global_settings.py:49
+msgid "Icelandic"
+msgstr "アイスランド語"
 
-#: contrib/comments/models.py:86
-msgid ""
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
-msgstr ""
-"コメントが不適切な場合はチェックを入れてください。「コメントは削除されまし"
-"た」と表示されるようになります。"
+#: conf/global_settings.py:50
+msgid "Italian"
+msgstr "イタリア語"
 
-#: contrib/comments/models.py:91
-#, fuzzy
-msgid "comments"
-msgstr "コメント"
+#: conf/global_settings.py:51
+msgid "Japanese"
+msgstr "日本語"
 
-#: contrib/comments/models.py:131 contrib/comments/models.py:207
-msgid "Content object"
-msgstr "コンテンツオブジェクト"
+#: conf/global_settings.py:52
+msgid "Dutch"
+msgstr "オランダ語"
 
-#: contrib/comments/models.py:159
-#, python-format
-msgid ""
-"Posted by %(user)s at %(date)s\n"
-"\n"
-"%(comment)s\n"
-"\n"
-"http://%(domain)s%(url)s"
-msgstr ""
-"%(user)s が %(date)s に投稿\n"
-"\n"
-"%(comment)s\n"
-"\n"
-"http://%(domain)s%(url)s"
+#: conf/global_settings.py:53
+msgid "Norwegian"
+msgstr "ノルウェー語"
 
-#: contrib/comments/models.py:168
-msgid "person's name"
-msgstr "名前"
+#: conf/global_settings.py:54
+msgid "Brazilian"
+msgstr "ブラジル語"
 
-#: contrib/comments/models.py:171
-msgid "ip address"
-msgstr "IP アドレス"
+#: conf/global_settings.py:55
+msgid "Romanian"
+msgstr "ルーマニア語"
 
-#: contrib/comments/models.py:173
-msgid "approved by staff"
-msgstr "スタッフの承認済み"
+#: conf/global_settings.py:56
+msgid "Russian"
+msgstr "ロシア語"
 
-#: contrib/comments/models.py:176
-#, fuzzy
-msgid "free comment"
-msgstr "フリーコメント"
+#: conf/global_settings.py:57
+msgid "Slovak"
+msgstr "スロバキア語"
 
-#: contrib/comments/models.py:177
+#: conf/global_settings.py:58
 #, fuzzy
-msgid "free comments"
-msgstr "フリーコメント"
+msgid "Slovenian"
+msgstr "スロヴェニア語"
 
-#: contrib/comments/models.py:233
-msgid "score"
-msgstr "スコア"
+#: conf/global_settings.py:59
+msgid "Serbian"
+msgstr "セルビア語"
 
-#: contrib/comments/models.py:234
-msgid "score date"
-msgstr "スコアされた日"
+#: conf/global_settings.py:60
+msgid "Swedish"
+msgstr "スウェーデン語"
 
-#: contrib/comments/models.py:237
+#: conf/global_settings.py:61
 #, fuzzy
-msgid "karma score"
-msgstr "カルマスコア"
+msgid "Ukrainian"
+msgstr "ウクライナ語"
 
-#: contrib/comments/models.py:238
-#, fuzzy
-msgid "karma scores"
-msgstr "カルマスコア"
+#: conf/global_settings.py:62
+msgid "Simplified Chinese"
+msgstr "簡体字中国語"
 
-#: contrib/comments/models.py:242
-#, python-format
-msgid "%(score)d rating by %(user)s"
-msgstr "%(user)s により %(score)d 点のレーティング"
+#: conf/global_settings.py:63
+msgid "Traditional Chinese"
+msgstr "繁体字中国語"
 
-#: contrib/comments/models.py:258
+#: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
-"This comment was flagged by %(user)s:\n"
-"\n"
-"%(text)s"
+"<h3>By %s:</h3>\n"
+"<ul>\n"
 msgstr ""
-"このコメントは %(user)s がフラグ付けしました。:\n"
-"\n"
-"%(text)s"
+"<h3>%s で絞り込む</h3>\n"
+"<ul>\n"
 
-#: contrib/comments/models.py:265
-msgid "flag date"
-msgstr "フラグ日"
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
+msgid "All"
+msgstr "全て"
 
-#: contrib/comments/models.py:268
-#, fuzzy
-msgid "user flag"
-msgstr "ユーザフラグ"
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr "いつでも"
 
-#: contrib/comments/models.py:269
-#, fuzzy
-msgid "user flags"
-msgstr "ユーザフラグ"
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "今日"
 
-#: contrib/comments/models.py:273
-#, python-format
-msgid "Flag by %r"
-msgstr "%r によるフラグ"
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr "過去 7 日間"
 
-#: contrib/comments/models.py:278
-msgid "deletion date"
-msgstr "削除日"
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "今月"
 
-#: contrib/comments/models.py:280
-#, fuzzy
-msgid "moderator deletion"
-msgstr "モデレータ削除"
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "今年"
 
-#: contrib/comments/models.py:281
-#, fuzzy
-msgid "moderator deletions"
-msgstr "モデレータ削除"
-
-#: contrib/comments/models.py:285
-#, python-format
-msgid "Moderator deletion by %r"
-msgstr "%r によるモデレータ削除"
-
-#: contrib/comments/views/karma.py:19
-msgid "Anonymous users cannot vote"
-msgstr "非ログインユーザは投票できません。"
-
-#: contrib/comments/views/karma.py:23
-msgid "Invalid comment ID"
-msgstr "コメント ID が不正です"
-
-#: contrib/comments/views/karma.py:25
-msgid "No voting for yourself"
-msgstr "自分には投票できません。"
-
-#: contrib/comments/views/comments.py:28
-msgid ""
-"This rating is required because you've entered at least one other rating."
-msgstr ""
-"他のレーティングを入力した場合は、このレーティングは必ず入力してください。"
-
-#: contrib/comments/views/comments.py:112
-#, 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:117
-#, 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:189
-#: contrib/comments/views/comments.py:280
-msgid "Only POSTs are allowed"
-msgstr "POST メソッドのみ有効です。"
-
-#: contrib/comments/views/comments.py:193
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
-msgstr "必須項目がいくつか入力されていません。"
-
-#: contrib/comments/views/comments.py:197
-#: contrib/comments/views/comments.py:286
-msgid "Somebody tampered with the comment form (security violation)"
-msgstr "だれかがコメントフォームを改竄しています (セキュリティ侵害です)"
-
-#: contrib/comments/views/comments.py:207
-#: contrib/comments/views/comments.py:292
-msgid ""
-"The comment form had an invalid 'target' parameter -- the object ID was "
-"invalid"
-msgstr ""
-"コメントフォームの 'target' パラメータが不正です。 -- オブジェクト IDが不正な"
-"値でした"
-
-#: contrib/comments/views/comments.py:257
-#: contrib/comments/views/comments.py:321
-msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr "コメントの「プレビュー」「投稿」種別が不明です。"
-
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/login.html:17
-msgid "Username:"
-msgstr "ユーザ名:"
-
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/admin/templates/admin/login.html:20
-msgid "Password:"
-msgstr "パスワード:"
-
-#: contrib/comments/templates/comments/form.html:6
-#, fuzzy
-msgid "Forgotten your password?"
-msgstr "パスワードをお忘れですか？"
-
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Log out"
-msgstr "ログアウト"
-
-#: contrib/comments/templates/comments/form.html:12
-#, fuzzy
-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:27
-#: contrib/comments/templates/comments/freeform.html:5
-#, fuzzy
-msgid "Comment:"
-msgstr "コメント:"
-
-#: contrib/comments/templates/comments/form.html:32
-#: contrib/comments/templates/comments/freeform.html:9
-#, fuzzy
-msgid "Preview comment"
-msgstr "コメントをプレビュー"
-
-#: contrib/comments/templates/comments/freeform.html:4
-#, fuzzy
-msgid "Your name:"
-msgstr "ユーザ名:"
-
-#: contrib/admin/filterspecs.py:40
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>%s で絞り込む</h3>\n"
-"<ul>\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 "Yes"
+msgstr "はい"
 
 #: contrib/admin/filterspecs.py:143
 msgid "No"
@@ -427,282 +200,241 @@ msgstr "ログエントリ"
 msgid "log entries"
 msgstr "ログエントリ"
 
-#: contrib/admin/templatetags/admin_list.py:228
-msgid "All dates"
-msgstr "いつでも"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "ページが見つかりません"
 
-#: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36
-#: contrib/auth/forms.py:41
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "申し訳ありませんが、お探しのページは見つかりませんでした。"
 
-#: contrib/admin/views/decorators.py:23
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "ログイン"
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/change_form.html:13
+#: contrib/admin/templates/admin/change_list.html:6
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+msgid "Home"
+msgstr "ホーム"
 
-#: contrib/admin/views/decorators.py:61
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"再ログインしてください。ログインセッションが有効期間切れしてしまいました。入"
-"力データは失われておりませんのでご安心ください。"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "サーバエラー"
 
-#: contrib/admin/views/decorators.py:68
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "サーバエラー (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "サーバエラー <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
 msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
+"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/views/decorators.py:82
-msgid "Usernames cannot contain the '@' character."
-msgstr "ユーザ名には '@' を含められません。"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "ようこそ"
 
-#: contrib/admin/views/decorators.py:84
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "メールアドレスはユーザ名ではありません。 '%s' を試してみてください。"
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+msgid "Documentation"
+msgstr "ドキュメント"
 
-#: contrib/admin/views/main.py:226
-msgid "Site administration"
-msgstr "サイト管理"
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/model_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/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+msgid "Change password"
+msgstr "パスワードの変更"
 
-#: contrib/admin/views/main.py:260
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" を追加しました。"
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/model_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/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/comments/templates/comments/form.html:8
+msgid "Log out"
+msgstr "ログアウト"
 
-#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
-msgid "You may edit it again below."
-msgstr "続けて編集できます。"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django サイト管理"
 
-#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
-#, python-format
-msgid "You may add another %s below."
-msgstr "続けて別の %s を追加できます。"
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django の管理"
 
-#: contrib/admin/views/main.py:290
-#, python-format
-msgid "Add %s"
-msgstr "%s を追加"
+#: contrib/admin/templates/admin/change_form.html:15
+#: contrib/admin/templates/admin/index.html:28
+msgid "Add"
+msgstr "追加"
 
-#: contrib/admin/views/main.py:336
-#, python-format
-msgid "Added %s."
-msgstr "%s を追加しました。"
+#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/object_history.html:5
+msgid "History"
+msgstr "履歴"
 
-#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
-#: contrib/admin/views/main.py:340
-msgid "and"
-msgstr "と"
+#: contrib/admin/templates/admin/change_form.html:21
+msgid "View on site"
+msgstr "サイト上で表示"
 
-#: contrib/admin/views/main.py:338
-#, python-format
-msgid "Changed %s."
-msgstr "%s を変更しました。"
+#: contrib/admin/templates/admin/change_form.html:30
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "下記のエラーを修正してください。"
+msgstr[1] "下記のエラーを修正してください。"
 
-#: contrib/admin/views/main.py:340
-#, python-format
-msgid "Deleted %s."
-msgstr "%s を削除しました。"
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Ordering"
+msgstr "順序"
 
-#: contrib/admin/views/main.py:343
-msgid "No fields changed."
-msgstr "変更はありませんでした。"
+#: contrib/admin/templates/admin/change_form.html:51
+msgid "Order:"
+msgstr "並び変え:"
 
-#: contrib/admin/views/main.py:346
+#: contrib/admin/templates/admin/change_list.html:11
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" を変更しました。"
+msgid "Add %(name)s"
+msgstr "%(name)s を追加"
 
-#: contrib/admin/views/main.py:354
+#: contrib/admin/templates/admin/delete_confirmation.html:9
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "削除"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。"
+"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/views/main.py:392
+#: contrib/admin/templates/admin/delete_confirmation.html:21
 #, python-format
-msgid "Change %s"
-msgstr "%s を変更"
+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/views/main.py:470
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s"
+#: contrib/admin/templates/admin/delete_confirmation.html:26
+msgid "Yes, I'm sure"
+msgstr "はい。"
 
-#: contrib/admin/views/main.py:475
+#: contrib/admin/templates/admin/filter.html:2
 #, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
+msgid " By %(title)s "
+msgstr "%(title)s で絞り込む"
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/templates/admin/index.html:17
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" を削除しました。"
+msgid "Models available in the %(name)s application."
+msgstr "%(name)s アプリケーションで利用可能なモデル"
 
-#: contrib/admin/views/main.py:511
-msgid "Are you sure?"
-msgstr "よろしいですか？"
+#: contrib/admin/templates/admin/index.html:34
+msgid "Change"
+msgstr "変更"
 
-#: contrib/admin/views/main.py:533
-#, python-format
-msgid "Change history: %s"
-msgstr "変更履歴: %s"
+#: contrib/admin/templates/admin/index.html:44
+msgid "You don't have permission to edit anything."
+msgstr "変更のためのパーミッションがありません。"
 
-#: contrib/admin/views/main.py:565
-#, python-format
-msgid "Select %s"
-msgstr "%s を選択"
+#: contrib/admin/templates/admin/index.html:52
+msgid "Recent Actions"
+msgstr "最近行った操作"
 
-#: contrib/admin/views/main.py:565
-#, python-format
-msgid "Select %s to change"
-msgstr "変更する %s を選択"
+#: contrib/admin/templates/admin/index.html:53
+msgid "My Actions"
+msgstr "操作"
 
-#: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286
-#: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297
-msgid "Integer"
-msgstr "整数"
+#: contrib/admin/templates/admin/index.html:57
+msgid "None available"
+msgstr "利用不可"
 
-#: contrib/admin/views/doc.py:278
-msgid "Boolean (Either True or False)"
-msgstr "ブール値 (真: True または偽: False)"
+#: contrib/admin/templates/admin/login.html:17
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+msgid "Username:"
+msgstr "ユーザ名:"
 
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "文字列 ( %(maxlength)s 字まで )"
+#: contrib/admin/templates/admin/login.html:20
+#: contrib/comments/templates/comments/form.html:6
+msgid "Password:"
+msgstr "パスワード:"
 
-#: contrib/admin/views/doc.py:280
-msgid "Comma-separated integers"
-msgstr "カンマ区切りの整数"
+#: contrib/admin/templates/admin/login.html:22
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr "<a href=\"/password_reset/\">パスワードをお忘れですか</a>？"
 
-#: contrib/admin/views/doc.py:281
-msgid "Date (without time)"
-msgstr "日付"
+#: contrib/admin/templates/admin/login.html:25
+#: contrib/admin/views/decorators.py:23
+msgid "Log in"
+msgstr "ログイン"
 
-#: contrib/admin/views/doc.py:282
-msgid "Date (with time)"
-msgstr "日時"
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "日付/時刻"
 
-#: contrib/admin/views/doc.py:283
-msgid "E-mail address"
-msgstr "メールアドレス"
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "User"
+msgstr "ユーザ"
 
-#: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287
-msgid "File path"
-msgstr "ファイルの場所"
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "操作"
 
-#: contrib/admin/views/doc.py:285
-msgid "Decimal number"
-msgstr "10 進数 (小数可)"
-
-#: contrib/admin/views/doc.py:291
-msgid "Boolean (Either True, False or None)"
-msgstr "ブール値 (真: True 、偽: False または None)"
-
-#: contrib/admin/views/doc.py:292
-msgid "Relation to parent model"
-msgstr "親モデルへのリレーション"
-
-#: contrib/admin/views/doc.py:293
-msgid "Phone number"
-msgstr "電話番号"
-
-#: contrib/admin/views/doc.py:298
-msgid "Text"
-msgstr "テキスト"
-
-#: contrib/admin/views/doc.py:299
-msgid "Time"
-msgstr "時刻"
-
-#: contrib/admin/views/doc.py:300 contrib/flatpages/models.py:7
-msgid "URL"
-msgstr "URL"
-
-#: contrib/admin/views/doc.py:301
-msgid "U.S. state (two uppercase letters)"
-msgstr "アメリカの州 (大文字二文字で)"
-
-#: contrib/admin/views/doc.py:302
-msgid "XML text"
-msgstr "XMLテキスト"
-
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Documentation"
-msgstr "ドキュメント"
-
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Change password"
-msgstr "パスワードの変更"
-
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/base.html:28
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/change_form.html:13
-#: 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:20
-msgid "History"
-msgstr "履歴"
-
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "日付/時刻"
-
-#: contrib/admin/templates/admin/object_history.html:19
-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 "Y/m/d H:i:s"
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "Y/m/d H:i:s"
 
 #: contrib/admin/templates/admin/object_history.html:36
 msgid ""
@@ -712,142 +444,10 @@ 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 <em>(500)</em>"
-msgstr "サーバエラー <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"エラーが発生しました。エラーをサイトの管理者にメールで報告しましたので、近い"
-"うちに修正されるはずです。しばらくお待ちください。"
-
-#: 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:17
-#, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s アプリケーションで利用可能なモデル"
-
-#: contrib/admin/templates/admin/index.html:28
-#: contrib/admin/templates/admin/change_form.html:15
-msgid "Add"
-msgstr "追加"
-
-#: contrib/admin/templates/admin/index.html:34
-msgid "Change"
-msgstr "変更"
-
-#: contrib/admin/templates/admin/index.html:44
-msgid "You don't have permission to edit anything."
-msgstr "変更のためのパーミッションがありません。"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "Recent Actions"
-msgstr "最近行った操作"
-
-#: contrib/admin/templates/admin/index.html:53
-msgid "My Actions"
-msgstr "操作"
-
-#: contrib/admin/templates/admin/index.html:57
-msgid "None available"
-msgstr "利用不可"
-
-#: contrib/admin/templates/admin/change_list.html:11
-#, python-format
-msgid "Add %(name)s"
-msgstr "%(name)s を追加"
-
-#: contrib/admin/templates/admin/login.html:22
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "<a href=\"/password_reset/\">パスワードをお忘れですか</a>？"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "ようこそ"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-msgstr "削除"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, 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:21
-#, 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:26
-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:8
 msgid "Go"
 msgstr "検索"
 
-#: contrib/admin/templates/admin/change_form.html:21
-msgid "View on site"
-msgstr "サイト上で表示"
-
-#: contrib/admin/templates/admin/change_form.html:30
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "下記のエラーを修正してください。"
-msgstr[1] "下記のエラーを修正してください。"
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Ordering"
-msgstr "順序"
-
-#: contrib/admin/templates/admin/change_form.html:51
-msgid "Order:"
-msgstr "並び変え:"
-
 #: contrib/admin/templates/admin/submit_line.html:4
 msgid "Save as new"
 msgstr "新規保存"
@@ -864,44 +464,71 @@ msgstr "保存して編集を続ける"
 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/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+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/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "ドキュメントへのブックマークレット"
 
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-msgstr "あなたのパスワードは変更されました"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">ブックマークレットをインストールするには、リンクをブック"
+"マークツールバーにドラッグするか、\n"
+"リンクを右クリックしてブックマークに追加してください。これで\n"
+"サイトのどのページからでもブックマークレットを選択可能になりました。\n"
+"ブックマークレットによっては、内部ネットワークにあるコンピュータからこのサイ"
+"トを\n"
+"参照していなければならないことがあります。内部ネットワークにあるかどうか不明"
+"な場合は、システム管理者に確認してください。</p>\n"
 
-#: 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/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "このページのドキュメント"
 
-#: contrib/admin/templates/registration/password_reset_form.html:12
+# TODO
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
+"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/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "メールアドレス"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "オブジェクトを (現在のウィンドウで) 編集"
 
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-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/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
@@ -911,18 +538,21 @@ msgstr "ご利用ありがとうございました。"
 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_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_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_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_change_form.html:12
 msgid ""
@@ -948,6 +578,26 @@ msgstr "新しいパスワード (もう一度) :"
 msgid "Change my password"
 msgstr "パスワードの変更"
 
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: 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
+msgid "Password reset"
+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_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
@@ -981,161 +631,254 @@ msgstr "ご利用ありがとうございました！"
 msgid "The %(site_name)s team"
 msgstr " %(site_name)s チーム"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-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/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
-msgstr "ドキュメントへのブックマークレット"
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "メールアドレス"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+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/admin/templatetags/admin_list.py:228
+msgid "All dates"
+msgstr "いつでも"
+
+#: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36
+#: contrib/auth/forms.py:41
 msgid ""
-"\n"
-"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site.  Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").</p>\n"
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
 msgstr ""
-"\n"
-"<p class=\"help\">ブックマークレットをインストールするには、リンクをブック"
-"マークツールバーにドラッグするか、\n"
-"リンクを右クリックしてブックマークに追加してください。これで\n"
-"サイトのどのページからでもブックマークレットを選択可能になりました。\n"
-"ブックマークレットによっては、内部ネットワークにあるコンピュータからこのサイ"
-"トを\n"
-"参照していなければならないことがあります。内部ネットワークにあるかどうか不明"
-"な場合は、システム管理者に確認してください。</p>\n"
+"正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。"
+
+#: contrib/admin/views/decorators.py:61
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"再ログインしてください。ログインセッションが有効期間切れしてしまいました。入"
+"力データは失われておりませんのでご安心ください。"
+
+#: contrib/admin/views/decorators.py:68
+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:82
+msgid "Usernames cannot contain the '@' character."
+msgstr "ユーザ名には '@' を含められません。"
+
+#: contrib/admin/views/decorators.py:84
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "メールアドレスはユーザ名ではありません。 '%s' を試してみてください。"
+
+#: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294
+#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297
+msgid "Integer"
+msgstr "整数"
+
+#: contrib/admin/views/doc.py:278
+msgid "Boolean (Either True or False)"
+msgstr "ブール値 (真: True または偽: False)"
+
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr "文字列 ( %(maxlength)s 字まで )"
+
+#: contrib/admin/views/doc.py:280
+msgid "Comma-separated integers"
+msgstr "カンマ区切りの整数"
+
+#: contrib/admin/views/doc.py:281
+msgid "Date (without time)"
+msgstr "日付"
+
+#: contrib/admin/views/doc.py:282
+msgid "Date (with time)"
+msgstr "日時"
+
+#: contrib/admin/views/doc.py:283
+msgid "E-mail address"
+msgstr "メールアドレス"
+
+#: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287
+msgid "File path"
+msgstr "ファイルの場所"
+
+#: contrib/admin/views/doc.py:285
+msgid "Decimal number"
+msgstr "10 進数 (小数可)"
+
+#: contrib/admin/views/doc.py:289 contrib/comments/models.py:85
+msgid "IP address"
+msgstr "IP アドレス"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "このページのドキュメント"
+#: contrib/admin/views/doc.py:291
+msgid "Boolean (Either True, False or None)"
+msgstr "ブール値 (真: True 、偽: False または None)"
 
-# TODO
-#: 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/views/doc.py:292
+msgid "Relation to parent model"
+msgstr "親モデルへのリレーション"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-msgstr "オブジェクト ID を表示"
+#: contrib/admin/views/doc.py:293
+msgid "Phone number"
+msgstr "電話番号"
 
-#: 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/views/doc.py:298
+msgid "Text"
+msgstr "テキスト"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "オブジェクトを (現在のウィンドウで) 編集"
+#: contrib/admin/views/doc.py:299
+msgid "Time"
+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/views/doc.py:300 contrib/flatpages/models.py:7
+msgid "URL"
+msgstr "URL"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "オブジェクトを (新しいウィンドウで) 編集"
+#: contrib/admin/views/doc.py:301
+msgid "U.S. state (two uppercase letters)"
+msgstr "アメリカの州 (大文字二文字で)"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-msgstr "上と同じですが、新しいウィンドウで管理ページを開きます。"
+#: contrib/admin/views/doc.py:302
+msgid "XML text"
+msgstr "XMLテキスト"
 
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "日付:"
+#: contrib/admin/views/main.py:226
+msgid "Site administration"
+msgstr "サイト管理"
 
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "時刻:"
+#: contrib/admin/views/main.py:260
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" を追加しました。"
 
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "現在:"
+#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
+msgid "You may edit it again below."
+msgstr "続けて編集できます。"
 
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "変更:"
+#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
+#, python-format
+msgid "You may add another %s below."
+msgstr "続けて別の %s を追加できます。"
 
-#: contrib/redirects/models.py:7
-msgid "redirect from"
-msgstr "リダイレクト元"
+#: contrib/admin/views/main.py:290
+#, python-format
+msgid "Add %s"
+msgstr "%s を追加"
 
-#: contrib/redirects/models.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr "'/events/search/' のように、ドメイン名を除いた絶対パスにします。 "
+#: contrib/admin/views/main.py:336
+#, python-format
+msgid "Added %s."
+msgstr "%s を追加しました。"
 
-#: contrib/redirects/models.py:9
-msgid "redirect to"
-msgstr "リダイレクト先"
+#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
+#: contrib/admin/views/main.py:340
+msgid "and"
+msgstr "と"
 
-#: contrib/redirects/models.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr "上記のような絶対パスか、 'http://' で始まる完全な URL にします。"
+#: contrib/admin/views/main.py:338
+#, python-format
+msgid "Changed %s."
+msgstr "%s を変更しました。"
 
-#: contrib/redirects/models.py:12
-msgid "redirect"
-msgstr "リダイレクト"
+#: contrib/admin/views/main.py:340
+#, python-format
+msgid "Deleted %s."
+msgstr "%s を削除しました。"
 
-#: contrib/redirects/models.py:13
-msgid "redirects"
-msgstr "リダイレクト"
+#: contrib/admin/views/main.py:343
+msgid "No fields changed."
+msgstr "変更はありませんでした。"
 
-#: contrib/flatpages/models.py:8
+#: contrib/admin/views/main.py:346
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" を変更しました。"
+
+#: contrib/admin/views/main.py:354
+#, python-format
 msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"例: '/about/contact/'. 先頭と最後にスラッシュがあるか確認してください。"
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。"
 
-#: contrib/flatpages/models.py:9
-msgid "title"
-msgstr "タイトル"
+#: contrib/admin/views/main.py:392
+#, python-format
+msgid "Change %s"
+msgstr "%s を変更"
 
-#: contrib/flatpages/models.py:10
-msgid "content"
-msgstr "内容"
+#: contrib/admin/views/main.py:470
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s"
 
-#: contrib/flatpages/models.py:11
-msgid "enable comments"
-msgstr "コメントを有効にする"
+#: contrib/admin/views/main.py:475
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
 
-#: contrib/flatpages/models.py:12
-msgid "template name"
-msgstr "テンプレート名"
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" を削除しました。"
 
-#: contrib/flatpages/models.py:13
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"例: 'flatpages/contact_page'. 指定しなければ、デフォルト設定の'flatpages/"
-"default' を使います。"
+#: contrib/admin/views/main.py:511
+msgid "Are you sure?"
+msgstr "よろしいですか？"
 
-#: contrib/flatpages/models.py:14
-msgid "registration required"
-msgstr "登録が必要です"
+#: contrib/admin/views/main.py:533
+#, python-format
+msgid "Change history: %s"
+msgstr "変更履歴: %s"
 
-#: contrib/flatpages/models.py:14
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "チェックした場合、ログインしたユーザだけがページを参照できます。"
+#: contrib/admin/views/main.py:565
+#, python-format
+msgid "Select %s"
+msgstr "%s を選択"
 
-#: contrib/flatpages/models.py:18
-msgid "flat page"
-msgstr "フラットページ"
+#: contrib/admin/views/main.py:565
+#, python-format
+msgid "Select %s to change"
+msgstr "変更する %s を選択"
 
-#: contrib/flatpages/models.py:19
-msgid "flat pages"
-msgstr "フラットページ"
+#: contrib/auth/forms.py:30
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"お使いのブラウザはクッキーを有効にしていないようです。ログインにはクッキーが"
+"必要です。"
 
 #: contrib/auth/models.py:13 contrib/auth/models.py:26
 msgid "name"
@@ -1257,374 +1000,429 @@ msgstr "グループ"
 msgid "message"
 msgstr "メッセージ"
 
-#: contrib/auth/forms.py:30
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"お使いのブラウザはクッキーを有効にしていないようです。ログインにはクッキーが"
-"必要です。"
-
-#: contrib/contenttypes/models.py:25
-#, fuzzy
-msgid "python model class name"
-msgstr "Python モデルクラス名"
-
-#: contrib/contenttypes/models.py:28
-msgid "content type"
-msgstr "コンテンツタイプ"
-
-#: contrib/contenttypes/models.py:29
-msgid "content types"
-msgstr "コンテンツタイプ"
+#: contrib/comments/models.py:67 contrib/comments/models.py:166
+msgid "object ID"
+msgstr "オブジェクト ID"
 
-#: contrib/sessions/models.py:35
-msgid "session key"
-msgstr "セッションキー"
+#: contrib/comments/models.py:68
+msgid "headline"
+msgstr "新着情報"
 
-#: contrib/sessions/models.py:36
-msgid "session data"
-msgstr "セッションデータ"
+#: contrib/comments/models.py:69 contrib/comments/models.py:90
+#: contrib/comments/models.py:167
+msgid "comment"
+msgstr "コメント"
 
-#: contrib/sessions/models.py:37
-msgid "expire date"
-msgstr "有効期限"
+#: contrib/comments/models.py:70
+msgid "rating #1"
+msgstr "レーティング #1"
 
-#: contrib/sessions/models.py:41
-msgid "session"
-msgstr "セッション"
+#: contrib/comments/models.py:71
+msgid "rating #2"
+msgstr "レーティング #2"
 
-#: contrib/sessions/models.py:42
-msgid "sessions"
-msgstr "セッション"
+#: contrib/comments/models.py:72
+msgid "rating #3"
+msgstr "レーティング #3"
 
-#: contrib/sites/models.py:10
-msgid "domain name"
-msgstr "ドメイン名"
+#: contrib/comments/models.py:73
+msgid "rating #4"
+msgstr "レーティング #4"
 
-#: contrib/sites/models.py:11
-msgid "display name"
-msgstr "表示名"
+#: contrib/comments/models.py:74
+msgid "rating #5"
+msgstr "レーティング #5"
 
-#: contrib/sites/models.py:15
-msgid "site"
-msgstr "サイト"
+#: contrib/comments/models.py:75
+msgid "rating #6"
+msgstr "レーティング #6"
 
-#: contrib/sites/models.py:16
-msgid "sites"
-msgstr "サイト"
+#: contrib/comments/models.py:76
+msgid "rating #7"
+msgstr "レーティング #7"
 
-#: utils/translation.py:360
-msgid "DATE_FORMAT"
-msgstr "Y/m/d"
+#: contrib/comments/models.py:77
+msgid "rating #8"
+msgstr "レーティング #8"
 
-#: utils/translation.py:361
-msgid "DATETIME_FORMAT"
-msgstr "Y/m/d H:i"
+#: contrib/comments/models.py:82
+msgid "is valid rating"
+msgstr "は有効なレーティングです"
 
-#: utils/translation.py:362
-msgid "TIME_FORMAT"
-msgstr "H:i"
+#: contrib/comments/models.py:83 contrib/comments/models.py:169
+msgid "date/time submitted"
+msgstr "コメント投稿日時"
 
-#: utils/dates.py:6
-msgid "Monday"
-msgstr "月曜日"
+#: contrib/comments/models.py:84 contrib/comments/models.py:170
+msgid "is public"
+msgstr "は公開中です"
 
-#: utils/dates.py:6
-msgid "Tuesday"
-msgstr "火曜日"
+#: contrib/comments/models.py:86
+msgid "is removed"
+msgstr "は削除されました"
 
-#: utils/dates.py:6
-msgid "Wednesday"
-msgstr "水曜日"
+#: contrib/comments/models.py:86
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"コメントが不適切な場合はチェックを入れてください。「コメントは削除されまし"
+"た」と表示されるようになります。"
 
-#: utils/dates.py:6
-msgid "Thursday"
-msgstr "木曜日"
+#: contrib/comments/models.py:91
+#, fuzzy
+msgid "comments"
+msgstr "コメント"
 
-#: utils/dates.py:6
-msgid "Friday"
-msgstr "金曜日"
+#: contrib/comments/models.py:131 contrib/comments/models.py:207
+msgid "Content object"
+msgstr "コンテンツオブジェクト"
 
-#: utils/dates.py:7
-msgid "Saturday"
-msgstr "土曜日"
+#: contrib/comments/models.py:159
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"%(user)s が %(date)s に投稿\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
-#: utils/dates.py:7
-msgid "Sunday"
-msgstr "日曜日"
+#: contrib/comments/models.py:168
+msgid "person's name"
+msgstr "名前"
 
-#: utils/dates.py:14
-msgid "January"
-msgstr "1月"
+#: contrib/comments/models.py:171
+msgid "ip address"
+msgstr "IP アドレス"
 
-#: utils/dates.py:14
-msgid "February"
-msgstr "2月"
+#: contrib/comments/models.py:173
+msgid "approved by staff"
+msgstr "スタッフの承認済み"
 
-#: utils/dates.py:14 utils/dates.py:27
-msgid "March"
-msgstr "3月"
+#: contrib/comments/models.py:176
+#, fuzzy
+msgid "free comment"
+msgstr "フリーコメント"
 
-#: utils/dates.py:14 utils/dates.py:27
-msgid "April"
-msgstr "4月"
+#: contrib/comments/models.py:177
+#, fuzzy
+msgid "free comments"
+msgstr "フリーコメント"
 
-#: utils/dates.py:14 utils/dates.py:27
-msgid "May"
-msgstr "5月"
+#: contrib/comments/models.py:233
+msgid "score"
+msgstr "スコア"
 
-#: utils/dates.py:14 utils/dates.py:27
-msgid "June"
-msgstr "6月"
+#: contrib/comments/models.py:234
+msgid "score date"
+msgstr "スコアされた日"
 
-#: utils/dates.py:15 utils/dates.py:27
-msgid "July"
-msgstr "7月"
+#: contrib/comments/models.py:237
+#, fuzzy
+msgid "karma score"
+msgstr "カルマスコア"
 
-#: utils/dates.py:15
-msgid "August"
-msgstr "8月"
+#: contrib/comments/models.py:238
+#, fuzzy
+msgid "karma scores"
+msgstr "カルマスコア"
 
-#: utils/dates.py:15
-msgid "September"
-msgstr "9月"
+#: contrib/comments/models.py:242
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr "%(user)s により %(score)d 点のレーティング"
 
-#: utils/dates.py:15
-msgid "October"
-msgstr "10月"
+#: contrib/comments/models.py:258
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"このコメントは %(user)s がフラグ付けしました。:\n"
+"\n"
+"%(text)s"
 
-#: utils/dates.py:15
-msgid "November"
-msgstr "11月"
+#: contrib/comments/models.py:265
+msgid "flag date"
+msgstr "フラグ日"
 
-#: utils/dates.py:16
-msgid "December"
-msgstr "12月"
+#: contrib/comments/models.py:268
+#, fuzzy
+msgid "user flag"
+msgstr "ユーザフラグ"
 
-#: utils/dates.py:19
+#: contrib/comments/models.py:269
 #, fuzzy
-msgid "jan"
-msgstr "と"
+msgid "user flags"
+msgstr "ユーザフラグ"
 
-#: utils/dates.py:19
-msgid "feb"
-msgstr ""
+#: contrib/comments/models.py:273
+#, python-format
+msgid "Flag by %r"
+msgstr "%r によるフラグ"
 
-#: utils/dates.py:19
-msgid "mar"
-msgstr ""
+#: contrib/comments/models.py:278
+msgid "deletion date"
+msgstr "削除日"
 
-#: utils/dates.py:19
-msgid "apr"
-msgstr ""
+#: contrib/comments/models.py:280
+#, fuzzy
+msgid "moderator deletion"
+msgstr "モデレータ削除"
 
-#: utils/dates.py:19
+#: contrib/comments/models.py:281
 #, fuzzy
-msgid "may"
-msgstr "日"
+msgid "moderator deletions"
+msgstr "モデレータ削除"
 
-#: utils/dates.py:19
-msgid "jun"
-msgstr ""
+#: contrib/comments/models.py:285
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr "%r によるモデレータ削除"
 
-#: utils/dates.py:20
-msgid "jul"
-msgstr ""
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "パスワードをお忘れですか？"
 
-#: utils/dates.py:20
-msgid "aug"
-msgstr ""
+#: contrib/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "レーティング"
 
-#: utils/dates.py:20
-msgid "sep"
-msgstr ""
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "必須"
 
-#: utils/dates.py:20
-msgid "oct"
-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 "写真を登録"
 
-#: utils/dates.py:20
-msgid "nov"
-msgstr ""
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "コメント:"
 
-#: utils/dates.py:20
-msgid "dec"
-msgstr ""
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "コメントをプレビュー"
 
-#: utils/dates.py:27
-msgid "Jan."
-msgstr "1月"
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "ユーザ名:"
 
-#: utils/dates.py:27
-msgid "Feb."
-msgstr "2月"
+#: contrib/comments/views/comments.py:28
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+"他のレーティングを入力した場合は、このレーティングは必ず入力してください。"
 
-#: utils/dates.py:28
-msgid "Aug."
-msgstr "8月"
+#: contrib/comments/views/comments.py:112
+#, 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 未満です。"
 
-#: utils/dates.py:28
-msgid "Sept."
-msgstr "9月"
+#: contrib/comments/views/comments.py:117
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"このコメントを投稿したユーザの詳細は不明です:\n"
+"\n"
+"%(text)s"
 
-#: utils/dates.py:28
-msgid "Oct."
-msgstr "10月"
+#: contrib/comments/views/comments.py:189
+#: contrib/comments/views/comments.py:280
+msgid "Only POSTs are allowed"
+msgstr "POST メソッドのみ有効です。"
 
-#: utils/dates.py:28
-msgid "Nov."
-msgstr "11月"
+#: contrib/comments/views/comments.py:193
+#: contrib/comments/views/comments.py:284
+msgid "One or more of the required fields wasn't submitted"
+msgstr "必須項目がいくつか入力されていません。"
 
-#: utils/dates.py:28
-msgid "Dec."
-msgstr "12月"
+#: contrib/comments/views/comments.py:197
+#: contrib/comments/views/comments.py:286
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "だれかがコメントフォームを改竄しています (セキュリティ侵害です)"
 
-#: utils/timesince.py:12
-msgid "year"
-msgid_plural "years"
-msgstr[0] "年"
-msgstr[1] "年"
+#: contrib/comments/views/comments.py:207
+#: contrib/comments/views/comments.py:292
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"コメントフォームの 'target' パラメータが不正です。 -- オブジェクト IDが不正な"
+"値でした"
 
-#: utils/timesince.py:13
-msgid "month"
-msgid_plural "months"
-msgstr[0] "月"
-msgstr[1] "月"
+#: contrib/comments/views/comments.py:257
+#: contrib/comments/views/comments.py:321
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "コメントの「プレビュー」「投稿」種別が不明です。"
 
-#: utils/timesince.py:14
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "週"
-msgstr[1] "週"
+#: contrib/comments/views/karma.py:19
+msgid "Anonymous users cannot vote"
+msgstr "非ログインユーザは投票できません。"
 
-#: utils/timesince.py:15
-msgid "day"
-msgid_plural "days"
-msgstr[0] "日"
-msgstr[1] "日"
+#: contrib/comments/views/karma.py:23
+msgid "Invalid comment ID"
+msgstr "コメント ID が不正です"
 
-#: utils/timesince.py:16
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "時"
-msgstr[1] "時"
+#: contrib/comments/views/karma.py:25
+msgid "No voting for yourself"
+msgstr "自分には投票できません。"
 
-#: utils/timesince.py:17
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "分"
-msgstr[1] "分"
+#: contrib/contenttypes/models.py:25
+#, fuzzy
+msgid "python model class name"
+msgstr "Python モデルクラス名"
 
-#: conf/global_settings.py:37
-msgid "Bengali"
-msgstr "ベンガル語"
+#: contrib/contenttypes/models.py:28
+msgid "content type"
+msgstr "コンテンツタイプ"
 
-#: conf/global_settings.py:38
-msgid "Czech"
-msgstr "チェコ語"
+#: contrib/contenttypes/models.py:29
+msgid "content types"
+msgstr "コンテンツタイプ"
 
-#: conf/global_settings.py:39
-msgid "Welsh"
-msgstr "ウェールズ語"
+#: contrib/flatpages/models.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"例: '/about/contact/'. 先頭と最後にスラッシュがあるか確認してください。"
 
-#: conf/global_settings.py:40
-msgid "Danish"
-msgstr "デンマーク語"
+#: contrib/flatpages/models.py:9
+msgid "title"
+msgstr "タイトル"
 
-#: conf/global_settings.py:41
-msgid "German"
-msgstr "ドイツ語"
+#: contrib/flatpages/models.py:10
+msgid "content"
+msgstr "内容"
 
-#: conf/global_settings.py:42
-msgid "Greek"
-msgstr "ギリシャ語"
+#: contrib/flatpages/models.py:11
+msgid "enable comments"
+msgstr "コメントを有効にする"
 
-#: conf/global_settings.py:43
-msgid "English"
-msgstr "英語"
+#: contrib/flatpages/models.py:12
+msgid "template name"
+msgstr "テンプレート名"
 
-#: conf/global_settings.py:44
-msgid "Spanish"
-msgstr "スペイン語"
+#: contrib/flatpages/models.py:13
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"例: 'flatpages/contact_page'. 指定しなければ、デフォルト設定の'flatpages/"
+"default' を使います。"
 
-#: conf/global_settings.py:45
-msgid "French"
-msgstr "フランス語"
+#: contrib/flatpages/models.py:14
+msgid "registration required"
+msgstr "登録が必要です"
 
-#: conf/global_settings.py:46
-msgid "Galician"
-msgstr "ガリシア語"
+#: contrib/flatpages/models.py:14
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "チェックした場合、ログインしたユーザだけがページを参照できます。"
 
-#: conf/global_settings.py:47
-msgid "Hungarian"
-msgstr ""
+#: contrib/flatpages/models.py:18
+msgid "flat page"
+msgstr "フラットページ"
 
-#: conf/global_settings.py:48
-msgid "Hebrew"
-msgstr "ヘブライ語"
+#: contrib/flatpages/models.py:19
+msgid "flat pages"
+msgstr "フラットページ"
 
-#: conf/global_settings.py:49
-msgid "Icelandic"
-msgstr "アイスランド語"
+#: contrib/redirects/models.py:7
+msgid "redirect from"
+msgstr "リダイレクト元"
 
-#: conf/global_settings.py:50
-msgid "Italian"
-msgstr "イタリア語"
+#: contrib/redirects/models.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr "'/events/search/' のように、ドメイン名を除いた絶対パスにします。 "
 
-#: conf/global_settings.py:51
-msgid "Japanese"
-msgstr "日本語"
+#: contrib/redirects/models.py:9
+msgid "redirect to"
+msgstr "リダイレクト先"
 
-#: conf/global_settings.py:52
-msgid "Dutch"
-msgstr "オランダ語"
+#: contrib/redirects/models.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr "上記のような絶対パスか、 'http://' で始まる完全な URL にします。"
 
-#: conf/global_settings.py:53
-msgid "Norwegian"
-msgstr "ノルウェー語"
+#: contrib/redirects/models.py:12
+msgid "redirect"
+msgstr "リダイレクト"
 
-#: conf/global_settings.py:54
-msgid "Brazilian"
-msgstr "ブラジル語"
+#: contrib/redirects/models.py:13
+msgid "redirects"
+msgstr "リダイレクト"
 
-#: conf/global_settings.py:55
-msgid "Romanian"
-msgstr "ルーマニア語"
+#: contrib/sessions/models.py:35
+msgid "session key"
+msgstr "セッションキー"
 
-#: conf/global_settings.py:56
-msgid "Russian"
-msgstr "ロシア語"
+#: contrib/sessions/models.py:36
+msgid "session data"
+msgstr "セッションデータ"
 
-#: conf/global_settings.py:57
-msgid "Slovak"
-msgstr "スロバキア語"
+#: contrib/sessions/models.py:37
+msgid "expire date"
+msgstr "有効期限"
 
-#: conf/global_settings.py:58
-#, fuzzy
-msgid "Slovenian"
-msgstr "スロヴェニア語"
+#: contrib/sessions/models.py:41
+msgid "session"
+msgstr "セッション"
 
-#: conf/global_settings.py:59
-msgid "Serbian"
-msgstr "セルビア語"
+#: contrib/sessions/models.py:42
+msgid "sessions"
+msgstr "セッション"
 
-#: conf/global_settings.py:60
-msgid "Swedish"
-msgstr "スウェーデン語"
+#: contrib/sites/models.py:10
+msgid "domain name"
+msgstr "ドメイン名"
 
-#: conf/global_settings.py:61
-#, fuzzy
-msgid "Ukrainian"
-msgstr "ウクライナ語"
+#: contrib/sites/models.py:11
+msgid "display name"
+msgstr "表示名"
 
-#: conf/global_settings.py:62
-msgid "Simplified Chinese"
-msgstr "簡体字中国語"
+#: contrib/sites/models.py:15
+msgid "site"
+msgstr "サイト"
 
-#: conf/global_settings.py:63
-msgid "Traditional Chinese"
-msgstr "繁体字中国語"
+#: contrib/sites/models.py:16
+msgid "sites"
+msgstr "サイト"
 
 #: core/validators.py:60
 msgid "This value must contain only letters, numbers and underscores."
@@ -1987,10 +1785,212 @@ msgstr "正の数を入力してください。"
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "0 から 32,767 までの整数を入力してください。"
 
-#: template/defaultfilters.py:379
+#: template/defaultfilters.py:383
 msgid "yes,no,maybe"
 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 "9月"
+
+#: 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:19
+#, fuzzy
+msgid "jan"
+msgstr "1月"
+
+#: utils/dates.py:19
+msgid "feb"
+msgstr "2月"
+
+#: utils/dates.py:19
+msgid "mar"
+msgstr "3月"
+
+#: utils/dates.py:19
+msgid "apr"
+msgstr "4月"
+
+#: utils/dates.py:19
+#, fuzzy
+msgid "may"
+msgstr "5月"
+
+#: utils/dates.py:19
+msgid "jun"
+msgstr "6月"
+
+#: utils/dates.py:20
+msgid "jul"
+msgstr "7月"
+
+#: utils/dates.py:20
+msgid "aug"
+msgstr "8月"
+
+#: utils/dates.py:20
+msgid "sep"
+msgstr "9月"
+
+#: utils/dates.py:20
+msgid "oct"
+msgstr "10月"
+
+#: utils/dates.py:20
+msgid "nov"
+msgstr "11月"
+
+#: utils/dates.py:20
+msgid "dec"
+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 "week"
+msgid_plural "weeks"
+msgstr[0] "週"
+msgstr[1] "週"
+
+#: utils/timesince.py:15
+msgid "day"
+msgid_plural "days"
+msgstr[0] "日"
+msgstr[1] "日"
+
+#: utils/timesince.py:16
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "時"
+msgstr[1] "時"
+
+#: utils/timesince.py:17
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "分"
+msgstr[1] "分"
+
+#: utils/translation.py:363
+msgid "DATE_FORMAT"
+msgstr "Y/m/d"
+
+#: utils/translation.py:364
+msgid "DATETIME_FORMAT"
+msgstr "Y/m/d H:i"
+
+#: utils/translation.py:365
+msgid "TIME_FORMAT"
+msgstr "H:i"
+
 #~ msgid "String (up to 50)"
 #~ msgstr "文字列 (50 字まで)"