From e824bcb1bd7c83bd2bd20cb0251af9f0bc6db894 Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Fri, 30 Mar 2007 05:51:42 +0000
Subject: [PATCH] Fixed #3824 -- Updated Japanese translations. Thanks, Makoto
Tsuyuki.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
django/conf/locale/ja/LC_MESSAGES/django.mo | Bin 43571 -> 47042 bytes
django/conf/locale/ja/LC_MESSAGES/django.po | 544 ++++++++++++++----
django/conf/locale/ja/LC_MESSAGES/djangojs.mo | Bin 1604 -> 1601 bytes
django/conf/locale/ja/LC_MESSAGES/djangojs.po | 14 +-
4 files changed, 435 insertions(+), 123 deletions(-)
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo
index 97b8f4145bcb7fc15caa8b79e9b3e6861ad7cf01..07d39947554d7039d4b12c55c3c3b40b73711adb 100644
GIT binary patch
delta 14186
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
X*i*A?OKv-DcfdwkE&MO++4%ne)xh<#
delta 10902
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πipK(Y
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
N>#~pu_*(9N>c6EM4YdFO
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po
index 46700505ba..ab761254ae 100644
--- a/django/conf/locale/ja/LC_MESSAGES/django.po
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@@ -1,5 +1,5 @@
# Translation of django.po to japanese.
-# Copyright (C) 2005,2006 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2005,2006,2007 makoto tsuyuki
# This file is distributed under the same license as the PACKAGE package.
# makoto tsuyuki <mtsuyuki@gmail.com>, 2005,2006,2007.
#
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 23:43+0900\n"
+"POT-Creation-Date: 2007-03-26 22:51+0900\n"
"PO-Revision-Date: 2006-05-18 00:28+0900\n"
"Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
"Language-Team: Japanese <django-ja@googlegroups.com>\n"
@@ -92,70 +92,82 @@ msgid "Japanese"
msgstr "日本語"
#: conf/global_settings.py:58
+msgid "Kannada"
+msgstr "カンナダ語"
+
+#: conf/global_settings.py:59
msgid "Latvian"
msgstr "ラトビア語"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Macedonian"
msgstr "マケドニア語"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Dutch"
msgstr "オランダ語"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Norwegian"
msgstr "ノルウェー語"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "Polish"
msgstr "ポーランド語"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
+msgid "Portugese"
+msgstr "ポルトガル語"
+
+#: conf/global_settings.py:65
msgid "Brazilian"
msgstr "ブラジル語"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:66
msgid "Romanian"
msgstr "ルーマニア語"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:67
msgid "Russian"
msgstr "ロシア語"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:68
msgid "Slovak"
msgstr "スロバキア語"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:69
msgid "Slovenian"
msgstr "スロヴェニア語"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:70
msgid "Serbian"
msgstr "セルビア語"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:71
msgid "Swedish"
msgstr "スウェーデン語"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
msgid "Tamil"
msgstr "タミル語"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
+msgid "Telugu"
+msgstr "テルグ語"
+
+#: conf/global_settings.py:74
msgid "Turkish"
msgstr "トルコ語"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:75
msgid "Ukrainian"
msgstr "ウクライナ語"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:76
msgid "Simplified Chinese"
msgstr "簡体字中国語"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:77
msgid "Traditional Chinese"
msgstr "繁体字中国語"
@@ -194,17 +206,17 @@ msgid "This year"
msgstr "今年"
#: contrib/admin/filterspecs.py:143 newforms/widgets.py:170
-#: oldforms/__init__.py:572
+#: oldforms/__init__.py:577
msgid "Yes"
msgstr "はい"
#: contrib/admin/filterspecs.py:143 newforms/widgets.py:170
-#: oldforms/__init__.py:572
+#: oldforms/__init__.py:577
msgid "No"
msgstr "いいえ"
#: contrib/admin/filterspecs.py:150 newforms/widgets.py:170
-#: oldforms/__init__.py:572
+#: oldforms/__init__.py:577
msgid "Unknown"
msgstr "不明"
@@ -568,7 +580,8 @@ msgstr "確認のため、再度パスワードを入力してください。"
#: contrib/admin/templates/admin/auth/user/change_password.html:28
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr "<strong>%(username)s</strong>さんの新しいパスワードを入力してください。"
+msgstr ""
+"<strong>%(username)s</strong>さんの新しいパスワードを入力してください。"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
@@ -602,7 +615,6 @@ msgstr ""
msgid "Documentation for this page"
msgstr "このページのドキュメント"
-# TODO
#: contrib/admin/templates/admin_doc/bookmarklets.html:20
msgid ""
"Jumps you from any page to the documentation for the view that generates "
@@ -769,7 +781,7 @@ msgstr "現在:"
msgid "Change:"
msgstr "変更:"
-#: contrib/admin/templatetags/admin_list.py:238
+#: contrib/admin/templatetags/admin_list.py:247
msgid "All dates"
msgstr "いつでも"
@@ -850,13 +862,13 @@ msgstr "アプリケーション %r が見つかりません"
#: contrib/admin/views/doc.py:171
#, python-format
-msgid "Model %r not found in app %r"
-msgstr "モデル %r が %r アプリケーションに見つかりません"
+msgid "Model %(name)r not found in app %(label)r"
+msgstr "モデル %(name)r が %(label)r アプリケーションに見つかりません"
#: contrib/admin/views/doc.py:183
#, python-format
-msgid "the related `%s.%s` object"
-msgstr "`%s.%s` (関連オブジェクト)"
+msgid "the related `%(label)s.%(type)s` object"
+msgstr "`%(label)s.%(type)s` (関連オブジェクト)"
#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205
#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224
@@ -865,8 +877,8 @@ msgstr "モデル :"
#: contrib/admin/views/doc.py:214
#, python-format
-msgid "related `%s.%s` objects"
-msgstr "`%s.%s` (関連オブジェクト)"
+msgid "related `%(label)s.%(name)s` objects"
+msgstr "`%(label)s.%(name)s` (関連オブジェクト)"
#: contrib/admin/views/doc.py:219
#, python-format
@@ -984,7 +996,7 @@ msgid "Added %s."
msgstr "%s を追加しました。"
#: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337
-#: contrib/admin/views/main.py:339 db/models/manipulators.py:306
+#: contrib/admin/views/main.py:339 db/models/manipulators.py:308
msgid "and"
msgstr "と"
@@ -1018,41 +1030,41 @@ msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます
msgid "Change %s"
msgstr "%s を変更"
-#: contrib/admin/views/main.py:473
+#: contrib/admin/views/main.py:476
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s"
-#: contrib/admin/views/main.py:478
+#: contrib/admin/views/main.py:481
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
-#: contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:514
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" を削除しました。"
-#: contrib/admin/views/main.py:514
+#: contrib/admin/views/main.py:517
msgid "Are you sure?"
msgstr "よろしいですか？"
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:539
#, python-format
msgid "Change history: %s"
msgstr "変更履歴: %s"
-#: contrib/admin/views/main.py:570
+#: contrib/admin/views/main.py:573
#, python-format
msgid "Select %s"
msgstr "%s を選択"
-#: contrib/admin/views/main.py:570
+#: contrib/admin/views/main.py:573
#, python-format
msgid "Select %s to change"
msgstr "変更する %s を選択"
-#: contrib/admin/views/main.py:758
+#: contrib/admin/views/main.py:768
msgid "Database error"
msgstr "データベースエラー"
@@ -1147,8 +1159,8 @@ msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
"password form</a>."
msgstr ""
-"'[algo]$[salt]$[hexdigest]'形式か、"
-"<a href=\"password/\">パスワード変更フォーム</a>を使ってください。"
+"'[algo]$[salt]$[hexdigest]'形式か、<a href=\"password/\">パスワード変更フォー"
+"ム</a>を使ってください。"
#: contrib/auth/models.py:95
msgid "staff status"
@@ -1517,15 +1529,15 @@ msgstr "コメント ID が不正です"
msgid "No voting for yourself"
msgstr "自分には投票できません。"
-#: contrib/contenttypes/models.py:26
+#: contrib/contenttypes/models.py:36
msgid "python model class name"
msgstr "Python モデルクラス名"
-#: contrib/contenttypes/models.py:29
+#: contrib/contenttypes/models.py:39
msgid "content type"
msgstr "コンテンツタイプ"
-#: contrib/contenttypes/models.py:30
+#: contrib/contenttypes/models.py:40
msgid "content types"
msgstr "コンテンツタイプ"
@@ -1575,7 +1587,281 @@ msgstr "フラットページ"
msgid "flat pages"
msgstr "フラットページ"
-#: contrib/localflavor/usa/forms.py:13
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "th"
+msgstr "番目"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "st"
+msgstr "番目"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "nd"
+msgstr "番目"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "rd"
+msgstr "番目"
+
+#: contrib/humanize/templatetags/humanize.py:47
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f 百万"
+msgstr[1] "%(value).1f 百万"
+
+#: contrib/humanize/templatetags/humanize.py:50
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f 十億"
+msgstr[1] "%(value).1f 十億"
+
+#: contrib/humanize/templatetags/humanize.py:53
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f 兆"
+msgstr[1] "%(value).1f 兆"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "one"
+msgstr "1"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "two"
+msgstr "2"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "three"
+msgstr "3"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "four"
+msgstr "4"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "five"
+msgstr "5"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "six"
+msgstr "6"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "seven"
+msgstr "7"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "eight"
+msgstr "8"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "nine"
+msgstr "9"
+
+#: contrib/localflavor/fr/forms.py:17
+#, fuzzy
+msgid "Enter a zip code in the format XXXXX."
+msgstr "XXXXXの形式でZipコードを入力してください。"
+
+#: contrib/localflavor/jp/forms.py:21
+msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
+msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。"
+
+#: contrib/localflavor/jp/jp_prefectures.py:4
+msgid "Hokkaido"
+msgstr "北海道"
+
+#: contrib/localflavor/jp/jp_prefectures.py:5
+msgid "Aomori"
+msgstr "青森県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:6
+msgid "Iwate"
+msgstr "岩手県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:7
+msgid "Miyagi"
+msgstr "宮城県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:8
+msgid "Akita"
+msgstr "秋田県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:9
+msgid "Yamagata"
+msgstr "山形県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:10
+msgid "Fukushima"
+msgstr "福島県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:11
+msgid "Ibaraki"
+msgstr "茨城県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:12
+msgid "Tochigi"
+msgstr "栃木県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:13
+msgid "Gunma"
+msgstr "群馬県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:14
+msgid "Saitama"
+msgstr "埼玉県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:15
+msgid "Chiba"
+msgstr "千葉県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:16
+msgid "Tokyo"
+msgstr "東京都"
+
+#: contrib/localflavor/jp/jp_prefectures.py:17
+msgid "Kanagawa"
+msgstr "神奈川県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:18
+msgid "Yamanashi"
+msgstr "山梨県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:19
+msgid "Nagano"
+msgstr "長野県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:20
+msgid "Niigata"
+msgstr "新潟県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:21
+msgid "Toyama"
+msgstr "富山県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:22
+msgid "Ishikawa"
+msgstr "石川県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:23
+msgid "Fukui"
+msgstr "福井県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:24
+msgid "Gifu"
+msgstr "岐阜県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:25
+msgid "Shizuoka"
+msgstr "静岡県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:26
+msgid "Aichi"
+msgstr "愛知県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:27
+msgid "Mie"
+msgstr "三重県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:28
+msgid "Shiga"
+msgstr "滋賀県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:29
+msgid "Kyoto"
+msgstr "京都府"
+
+#: contrib/localflavor/jp/jp_prefectures.py:30
+msgid "Osaka"
+msgstr "大阪府"
+
+#: contrib/localflavor/jp/jp_prefectures.py:31
+msgid "Hyogo"
+msgstr "兵庫県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:32
+msgid "Nara"
+msgstr "奈良県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:33
+msgid "Wakayama"
+msgstr "和歌山県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:34
+msgid "Tottori"
+msgstr "鳥取県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:35
+msgid "Shimane"
+msgstr "島根県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:36
+msgid "Okayama"
+msgstr "岡山県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:37
+msgid "Hiroshima"
+msgstr "広島県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:38
+msgid "Yamaguchi"
+msgstr "山口県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:39
+msgid "Tokushima"
+msgstr "徳島県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:40
+msgid "Kagawa"
+msgstr "香川県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:41
+msgid "Ehime"
+msgstr "愛媛県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:42
+msgid "Kochi"
+msgstr "高知県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:43
+msgid "Fukuoka"
+msgstr "福岡県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:44
+msgid "Saga"
+msgstr "佐賀県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:45
+msgid "Nagasaki"
+msgstr "長崎県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:46
+msgid "Kumamoto"
+msgstr "熊本県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:47
+msgid "Oita"
+msgstr "大分県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:48
+msgid "Miyazaki"
+msgstr "宮崎県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:49
+msgid "Kagoshima"
+msgstr "鹿児島県"
+
+#: contrib/localflavor/jp/jp_prefectures.py:50
+msgid "Okinawa"
+msgstr "沖縄県"
+
+#: contrib/localflavor/uk/forms.py:18
+msgid "Enter a postcode. A space is required between the two postcode parts."
+msgstr "ポスタルコードを入力してください。コードとコードの間は半角のスペースで区切ってください。"
+
+#: contrib/localflavor/usa/forms.py:17
msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。"
@@ -1607,23 +1893,23 @@ msgstr "リダイレクト"
msgid "redirects"
msgstr "リダイレクト"
-#: contrib/sessions/models.py:51
+#: contrib/sessions/models.py:68
msgid "session key"
msgstr "セッションキー"
-#: contrib/sessions/models.py:52
+#: contrib/sessions/models.py:69
msgid "session data"
msgstr "セッションデータ"
-#: contrib/sessions/models.py:53
+#: contrib/sessions/models.py:70
msgid "expire date"
msgstr "有効期限"
-#: contrib/sessions/models.py:57
+#: contrib/sessions/models.py:74
msgid "session"
msgstr "セッション"
-#: contrib/sessions/models.py:58
+#: contrib/sessions/models.py:75
msgid "sessions"
msgstr "セッション"
@@ -1704,31 +1990,31 @@ msgstr "1900年以降を指定してください。"
#: core/validators.py:143
#, python-format
-msgid "Invalid date: %s."
+msgid "Invalid date: %s"
msgstr "無効な日付: %s"
-#: core/validators.py:147 db/models/fields/__init__.py:454
+#: core/validators.py:148 db/models/fields/__init__.py:457
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "YYYY-MM-DD形式で日付を入力してください。"
-#: core/validators.py:152
+#: core/validators.py:153
msgid "Enter a valid time in HH:MM format."
msgstr "HH:MM形式で時刻を入力してください。"
-#: core/validators.py:156 db/models/fields/__init__.py:521
+#: core/validators.py:157 db/models/fields/__init__.py:526
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "YYYY-MM-DD HH:MM形式で日時を入力してください。"
-#: core/validators.py:161 newforms/fields.py:269
+#: core/validators.py:162 newforms/fields.py:269
msgid "Enter a valid e-mail address."
msgstr "有効なメールアドレスを入力してください。"
-#: core/validators.py:173 core/validators.py:442 oldforms/__init__.py:667
+#: core/validators.py:174 core/validators.py:445 oldforms/__init__.py:672
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"ファイルが取得できませんでした。formのencoding typeを確認してください。"
-#: core/validators.py:177
+#: core/validators.py:178
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -1736,26 +2022,26 @@ msgstr ""
"画像をアップロードしてください。アップロードした画像は画像でないか、または壊"
"れています。"
-#: core/validators.py:184
+#: core/validators.py:185
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "URL ( %s ) は画像ではありません。"
-#: core/validators.py:188
+#: core/validators.py:189
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr "電話番号は XXX-XXX-XXXX 形式で入力してください。\"%s\" は無効です。"
-#: core/validators.py:196
+#: core/validators.py:197
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "URL ( %s ) は QuickTime ビデオではありません。"
-#: core/validators.py:200
+#: core/validators.py:201
msgid "A valid URL is required."
msgstr "正しい URL を入力してください。"
-#: core/validators.py:214
+#: core/validators.py:215
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -1764,86 +2050,86 @@ msgstr ""
"有効な HTML を入力してください。エラー:\n"
"%s"
-#: core/validators.py:221
+#: core/validators.py:222
#, python-format
msgid "Badly formed XML: %s"
msgstr "不正な XML です: %s"
-#: core/validators.py:238
+#: core/validators.py:239
#, python-format
msgid "Invalid URL: %s"
msgstr "無効なURL: %s"
-#: core/validators.py:243 core/validators.py:245
+#: core/validators.py:244 core/validators.py:246
#, python-format
msgid "The URL %s is a broken link."
msgstr "URL ( %s ) はリンクが壊れています。"
-#: core/validators.py:251
+#: core/validators.py:252
msgid "Enter a valid U.S. state abbreviation."
msgstr "正しい米州略称を入力してください。"
-#: core/validators.py:265
+#: core/validators.py:266
#, python-format
msgid "Watch your mouth! The word %s is not allowed here."
msgid_plural "Watch your mouth! The words %s are not allowed here."
msgstr[0] "言葉使いに気を付けて！ %s という言葉は使えません。"
msgstr[1] "言葉使いに気を付けて！ %s という言葉は使えません。"
-#: core/validators.py:272
+#: core/validators.py:273
#, python-format
msgid "This field must match the '%s' field."
msgstr "このフィールドは '%s' フィールドと一致せねばなりません。"
-#: core/validators.py:291
+#: core/validators.py:292
msgid "Please enter something for at least one field."
msgstr "少なくとも一つのフィールドに何か入力してください。"
-#: core/validators.py:300 core/validators.py:311
+#: core/validators.py:301 core/validators.py:312
msgid "Please enter both fields or leave them both empty."
msgstr "両方のフィールドに入力するか、両方とも未入力にしてください。"
-#: core/validators.py:318
+#: core/validators.py:320
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr ""
"%(field)s を %(value)s にするのなら、このフィールドに必ず入力してください。"
-#: core/validators.py:330
+#: core/validators.py:333
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr ""
"%(field)s を %(value)s にしないのなら、このフィールドに必ず入力してください。"
-#: core/validators.py:349
+#: core/validators.py:352
msgid "Duplicate values are not allowed."
msgstr "重複する値は認められません。"
-#: core/validators.py:364
+#: core/validators.py:367
#, python-format
-msgid "This value must be between %s and %s."
-msgstr "この値は %s から %s の間でなければなりません。"
+msgid "This value must be between %(lower)s and %(upper)s."
+msgstr "この値は %(lower)s から %(upper)s の間でなければなりません。"
-#: core/validators.py:366
+#: core/validators.py:369
#, python-format
msgid "This value must be at least %s."
msgstr "この値は %s 以上でなければなりません。"
-#: core/validators.py:368
+#: core/validators.py:371
#, python-format
msgid "This value must be no more than %s."
msgstr "この値は %s より小さくなければなりません。"
-#: core/validators.py:404
+#: core/validators.py:407
#, python-format
msgid "This value must be a power of %s."
msgstr "この値は %s の累乗でなければなりません。"
-#: core/validators.py:415
+#: core/validators.py:418
msgid "Please enter a valid decimal number."
msgstr "有効な 10 進数を入力してください。"
-#: core/validators.py:419
+#: core/validators.py:422
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural ""
@@ -1851,7 +2137,7 @@ msgid_plural ""
msgstr[0] "全体で %s 文字以下の数字を入力してください。"
msgstr[1] "全体で %s 文字以下の数字を入力してください。"
-#: core/validators.py:422
+#: core/validators.py:425
#, python-format
msgid ""
"Please enter a valid decimal number with a whole part of at most %s digit."
@@ -1860,7 +2146,7 @@ msgid_plural ""
msgstr[0] "整数部は %s 文字以下の数字を入力してください。"
msgstr[1] "整数部は %s 文字以下の数字を入力してください。"
-#: core/validators.py:425
+#: core/validators.py:428
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural ""
@@ -1868,37 +2154,37 @@ msgid_plural ""
msgstr[0] "小数部は %s 文字以下の数字を入力してください。"
msgstr[1] "小数部は %s 文字以下の数字を入力してください。"
-#: core/validators.py:435
+#: core/validators.py:438
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "アップロードするファイルの大きさは %s バイト以上にしてください。"
-#: core/validators.py:436
+#: core/validators.py:439
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "アップロードするファイルの大きさは %s 最大バイトまでです。"
-#: core/validators.py:453
+#: core/validators.py:456
msgid "The format for this field is wrong."
msgstr "フィールドの形式が正しくありません。"
-#: core/validators.py:468
+#: core/validators.py:471
msgid "This field is invalid."
msgstr "このフィールドは無効です。"
-#: core/validators.py:504
+#: core/validators.py:507
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "%s から何も検索できませんでした。"
-#: core/validators.py:507
+#: core/validators.py:510
#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
msgstr ""
"URL %(url)s は無効なコンテンツタイプヘッダ '%(contenttype)s' を返しました。"
-#: core/validators.py:540
+#: core/validators.py:543
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -1907,7 +2193,7 @@ msgstr ""
"%(line)s 行目から始まる %(tag)s タグを閉じてください (\"%(start)s\" で始まる"
"行です)。"
-#: core/validators.py:544
+#: core/validators.py:547
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -1916,7 +2202,7 @@ msgstr ""
"%(line)s 行目から始まるテキストはこのコンテキストでは使えません。 (\"%(start)"
"s\" で始まる行です)。"
-#: core/validators.py:549
+#: core/validators.py:552
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -1925,7 +2211,7 @@ msgstr ""
"%(line)s 行目の \"%(attr)s\" は無効なアトリビュートです (\"%(start)s\" で始ま"
"る行です)。"
-#: core/validators.py:554
+#: core/validators.py:557
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -1934,7 +2220,7 @@ msgstr ""
"%(line)s 行目の \"<%(tag)s>\" は無効なタグです( \"%(start)s\" で始まる行で"
"す)。"
-#: core/validators.py:558
+#: core/validators.py:561
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -1943,7 +2229,7 @@ msgstr ""
"%(line)s 行目のタグは必須アトリビュートが未入力です( \"%(start)s\" で始まる行"
"です)。"
-#: core/validators.py:563
+#: core/validators.py:566
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -1952,7 +2238,7 @@ msgstr ""
"%(line)s 行目の \"%(attr)s\" アトリビュートの値が正しくありません (\"%(start)"
"s\" で始まる行です) 。"
-#: db/models/manipulators.py:305
+#: db/models/manipulators.py:307
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1963,29 +2249,33 @@ msgstr ""
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "%(fieldname)s に %(optname)s は既に存在します。"
-#: db/models/fields/__init__.py:116 db/models/fields/__init__.py:273
-#: db/models/fields/__init__.py:605 db/models/fields/__init__.py:616
-#: newforms/fields.py:78 newforms/fields.py:373 newforms/fields.py:449
-#: newforms/fields.py:460 oldforms/__init__.py:352
+#: db/models/fields/__init__.py:117 db/models/fields/__init__.py:274
+#: db/models/fields/__init__.py:610 db/models/fields/__init__.py:621
+#: newforms/fields.py:78 newforms/fields.py:374 newforms/fields.py:450
+#: newforms/fields.py:461 newforms/models.py:177 oldforms/__init__.py:357
msgid "This field is required."
msgstr "このフィールドは必須です。"
-#: db/models/fields/__init__.py:366
+#: db/models/fields/__init__.py:367
msgid "This value must be an integer."
msgstr "値は整数でなければなりません。"
-#: db/models/fields/__init__.py:401
+#: db/models/fields/__init__.py:402
msgid "This value must be either True or False."
msgstr "値は真: True または偽: False でなければなりません。"
-#: db/models/fields/__init__.py:422
+#: db/models/fields/__init__.py:423
msgid "This field cannot be null."
msgstr "このフィールドには NULL を指定できません。"
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:630
msgid "Enter a valid filename."
msgstr "正しいファイル名を入力してください。"
+#: db/models/fields/__init__.py:751
+msgid "This value must be either None, True or False."
+msgstr "値は、空: None、真: True または偽: False でなければなりません。"
+
#: db/models/fields/related.py:53
#, python-format
msgid "Please enter a valid %s."
@@ -2054,55 +2344,79 @@ msgstr "URLを正しく入力してください。"
msgid "This URL appears to be a broken link."
msgstr "このURLはリンクが壊れています。"
-#: newforms/fields.py:359
+#: newforms/fields.py:360 newforms/models.py:164
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "正しく選択してください。選択したものは候補にありません。"
-#: newforms/fields.py:377 newforms/fields.py:453
+#: newforms/fields.py:378 newforms/fields.py:454 newforms/models.py:181
msgid "Enter a list of values."
msgstr "リストを入力してください。"
-#: newforms/fields.py:386
+#: newforms/fields.py:387 newforms/models.py:187
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "正しく選択してください。 %s は候補にありません。"
-#: oldforms/__init__.py:387
+#: oldforms/__init__.py:392
#, python-format
msgid "Ensure your text is less than %s character."
msgid_plural "Ensure your text is less than %s characters."
msgstr[0] "%s 字以下で入力してください。"
msgstr[1] "%s 字以下で入力してください。"
-#: oldforms/__init__.py:392
+#: oldforms/__init__.py:397
msgid "Line breaks are not allowed here."
msgstr "改行はできません。"
-#: oldforms/__init__.py:493 oldforms/__init__.py:566 oldforms/__init__.py:605
+#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "正しく選択してください。; '%(data)s' は %(choices)s にありません。"
-#: oldforms/__init__.py:669
+#: oldforms/__init__.py:674
msgid "The submitted file is empty."
msgstr "入力されたファイルは空です。"
-#: oldforms/__init__.py:725
+#: oldforms/__init__.py:730
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "-32,768 から 32,767 までの整数を入力してください。"
-#: oldforms/__init__.py:735
+#: oldforms/__init__.py:740
msgid "Enter a positive number."
msgstr "正の数を入力してください。"
-#: oldforms/__init__.py:745
+#: oldforms/__init__.py:750
msgid "Enter a whole number between 0 and 32,767."
msgstr "0 から 32,767 までの整数を入力してください。"
-#: template/defaultfilters.py:436
+#: template/defaultfilters.py:491
msgid "yes,no,maybe"
msgstr "はい,いいえ,たぶん"
+#: utils/dateformat.py:40
+msgid "p.m."
+msgstr "p.m."
+
+#: utils/dateformat.py:41
+msgid "a.m."
+msgstr "a.m."
+
+#: utils/dateformat.py:46
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:47
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:95
+msgid "midnight"
+msgstr "0時"
+
+#: utils/dateformat.py:97
+msgid "noon"
+msgstr "12時"
+
#: utils/dates.py:6
msgid "Monday"
msgstr "月曜日"
diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo
index bddecacb108c1580bc2d408c658ad30deadb7451..45a4ff9f67b56a15720d178ff2b181720754aff9 100644
GIT binary patch
delta 132
zcmX@YbC73)3u7n?0|Ub{Rt5$jVpt6%*nsp#D7^znO9T1)fwTmWz6}-s0;COq{NGT%
z4p0+FpD~oS+B}odl8M(`*T7iU$V|b=*viCk^L^&yj9doKW;QVx8Ue}4n^`9U0Nhm<
AbpQYW
delta 135
zcmX@ebA)Gu3u7o70|Ub{Rt5$Ty%tJufzrEyv@}rs5RjGt()Xa^-+{CNkpB<L*9U3_
z={JMYwwq@%S~BsP=^7g78ki{<7+4t_Y`)KYoRRnGk~vRytYvt%cJb5Rj>#KXCjtOY
Cq8pL`
diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.po b/django/conf/locale/ja/LC_MESSAGES/djangojs.po
index 0ec1cadcf5..d35b88aa73 100644
--- a/django/conf/locale/ja/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/ja/LC_MESSAGES/djangojs.po
@@ -1,14 +1,12 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Japanese translation for js.
+# Copyright (C) 2005 makoto tsuyuki
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# makoto tsuyuki <mtsuyuki@gmail.com>, 2005.
msgid ""
msgstr ""
"Project-Id-Version: Django 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-06 00:30+0900\n"
+"POT-Creation-Date: 2007-03-26 23:41+0900\n"
"PO-Revision-Date: 2006-05-08 13:39+0900\n"
"Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
"Language-Team: Japanese <django-ja@googlegroups.com>\n"
@@ -85,7 +83,7 @@ msgstr "時間を選択"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
msgid "Midnight"
-msgstr "夜中"
+msgstr "0時"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "6 a.m."
@@ -93,7 +91,7 @@ msgstr "午前 6 時"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Noon"
-msgstr "正午"
+msgstr "12時"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183