diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo
index 07d3994755..20eb7dbcd3 100644
Binary files a/django/conf/locale/ja/LC_MESSAGES/django.mo and b/django/conf/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po
index ab761254ae..56f1bf99da 100644
--- a/django/conf/locale/ja/LC_MESSAGES/django.po
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@@ -1,13 +1,12 @@
 # Translation of django.po to japanese.
 # 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.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-26 22:51+0900\n"
+"POT-Creation-Date: 2007-06-26 11:33+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"
@@ -24,150 +23,162 @@ msgid "Bengali"
 msgstr "ベンガル語"
 
 #: conf/global_settings.py:41
+msgid "Bulgarian"
+msgstr "ブルガリア語"
+
+#: conf/global_settings.py:42
 msgid "Catalan"
 msgstr "カタロニア語"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Czech"
 msgstr "チェコ語"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Welsh"
 msgstr "ウェールズ語"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "German"
 msgstr "ドイツ語"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Greek"
 msgstr "ギリシャ語"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "English"
 msgstr "英語"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Argentinean Spanish"
 msgstr "アルゼンチンスペイン語"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
+msgid "Persian"
+msgstr "ペルシア語"
+
+#: conf/global_settings.py:52
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:53
 msgid "French"
 msgstr "フランス語"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
 msgid "Galician"
 msgstr "ガリシア語"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:55
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:56
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:57
 msgid "Icelandic"
 msgstr "アイスランド語"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:58
 msgid "Italian"
 msgstr "イタリア語"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:59
 msgid "Japanese"
 msgstr "日本語"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:60
+msgid "Korean"
+msgstr "韓国語"
+
+#: conf/global_settings.py:61
 msgid "Kannada"
 msgstr "カンナダ語"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "Latvian"
 msgstr "ラトビア語"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "Macedonian"
 msgstr "マケドニア語"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Portugese"
 msgstr "ポルトガル語"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Brazilian"
 msgstr "ブラジル語"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:70
 msgid "Russian"
 msgstr "ロシア語"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:71
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:72
 msgid "Slovenian"
 msgstr "スロヴェニア語"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:73
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:74
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:75
 msgid "Tamil"
 msgstr "タミル語"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:76
 msgid "Telugu"
 msgstr "テルグ語"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:77
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:78
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:79
 msgid "Simplified Chinese"
 msgstr "簡体字中国語"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:80
 msgid "Traditional Chinese"
 msgstr "繁体字中国語"
 
@@ -205,17 +216,17 @@ msgstr "今月"
 msgid "This year"
 msgstr "今年"
 
-#: contrib/admin/filterspecs.py:143 newforms/widgets.py:170
+#: contrib/admin/filterspecs.py:143 newforms/widgets.py:181
 #: oldforms/__init__.py:577
 msgid "Yes"
 msgstr "はい"
 
-#: contrib/admin/filterspecs.py:143 newforms/widgets.py:170
+#: contrib/admin/filterspecs.py:143 newforms/widgets.py:181
 #: oldforms/__init__.py:577
 msgid "No"
 msgstr "いいえ"
 
-#: contrib/admin/filterspecs.py:150 newforms/widgets.py:170
+#: contrib/admin/filterspecs.py:150 newforms/widgets.py:181
 #: oldforms/__init__.py:577
 msgid "Unknown"
 msgstr "不明"
@@ -781,17 +792,17 @@ msgstr "現在:"
 msgid "Change:"
 msgstr "変更:"
 
-#: contrib/admin/templatetags/admin_list.py:247
+#: contrib/admin/templatetags/admin_list.py:249
 msgid "All dates"
 msgstr "いつでも"
 
-#: contrib/admin/views/auth.py:19 contrib/admin/views/main.py:257
+#: contrib/admin/views/auth.py:19 contrib/admin/views/main.py:262
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" を追加しました。"
 
-#: contrib/admin/views/auth.py:24 contrib/admin/views/main.py:261
-#: contrib/admin/views/main.py:347
+#: contrib/admin/views/auth.py:24 contrib/admin/views/main.py:266
+#: contrib/admin/views/main.py:352
 msgid "You may edit it again below."
 msgstr "続けて編集できます。"
 
@@ -895,9 +906,9 @@ msgstr "%s の数"
 msgid "Fields on %s objects"
 msgstr "%s のフィールド"
 
-#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
-#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312
+#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:302
+#: contrib/admin/views/doc.py:304 contrib/admin/views/doc.py:310
+#: contrib/admin/views/doc.py:311 contrib/admin/views/doc.py:313
 msgid "Integer"
 msgstr "整数"
 
@@ -905,7 +916,7 @@ msgstr "整数"
 msgid "Boolean (Either True or False)"
 msgstr "ブール値 (真: True または偽: False)"
 
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311
+#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:312
 #, python-format
 msgid "String (up to %(maxlength)s)"
 msgstr "文字列 ( %(maxlength)s 字まで )"
@@ -923,148 +934,152 @@ msgid "Date (with time)"
 msgstr "日時"
 
 #: contrib/admin/views/doc.py:297
-msgid "E-mail address"
-msgstr "メールアドレス"
-
-#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299
-#: contrib/admin/views/doc.py:302
-msgid "File path"
-msgstr "ファイルの場所"
-
-#: contrib/admin/views/doc.py:300
 msgid "Decimal number"
 msgstr "10 進数 (小数可)"
 
-#: contrib/admin/views/doc.py:304 contrib/comments/models.py:85
+#: contrib/admin/views/doc.py:298
+msgid "E-mail address"
+msgstr "メールアドレス"
+
+#: contrib/admin/views/doc.py:299 contrib/admin/views/doc.py:300
+#: contrib/admin/views/doc.py:303
+msgid "File path"
+msgstr "ファイルの場所"
+
+#: contrib/admin/views/doc.py:301
+msgid "Floating point number"
+msgstr "浮動小数点"
+
+#: contrib/admin/views/doc.py:305 contrib/comments/models.py:85
 msgid "IP address"
 msgstr "IP アドレス"
 
-#: contrib/admin/views/doc.py:306
+#: contrib/admin/views/doc.py:307
 msgid "Boolean (Either True, False or None)"
 msgstr "ブール値 (真: True 、偽: False または None)"
 
-#: contrib/admin/views/doc.py:307
+#: contrib/admin/views/doc.py:308
 msgid "Relation to parent model"
 msgstr "親モデルへのリレーション"
 
-#: contrib/admin/views/doc.py:308
+#: contrib/admin/views/doc.py:309
 msgid "Phone number"
 msgstr "電話番号"
 
-#: contrib/admin/views/doc.py:313
+#: contrib/admin/views/doc.py:314
 msgid "Text"
 msgstr "テキスト"
 
-#: contrib/admin/views/doc.py:314
+#: contrib/admin/views/doc.py:315
 msgid "Time"
 msgstr "時刻"
 
-#: contrib/admin/views/doc.py:315 contrib/flatpages/models.py:7
+#: contrib/admin/views/doc.py:316 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
 
-#: contrib/admin/views/doc.py:316
+#: contrib/admin/views/doc.py:317
 msgid "U.S. state (two uppercase letters)"
 msgstr "アメリカの州 (大文字二文字で)"
 
-#: contrib/admin/views/doc.py:317
+#: contrib/admin/views/doc.py:318
 msgid "XML text"
 msgstr "XMLテキスト"
 
-#: contrib/admin/views/doc.py:343
+#: contrib/admin/views/doc.py:344
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s はurlpatternオブジェクトでは無いようです"
 
-#: contrib/admin/views/main.py:223
+#: contrib/admin/views/main.py:228
 msgid "Site administration"
 msgstr "サイト管理"
 
-#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356
+#: contrib/admin/views/main.py:276 contrib/admin/views/main.py:361
 #, python-format
 msgid "You may add another %s below."
 msgstr "続けて別の %s を追加できます。"
 
-#: contrib/admin/views/main.py:289
+#: contrib/admin/views/main.py:294
 #, python-format
 msgid "Add %s"
 msgstr "%s を追加"
 
-#: contrib/admin/views/main.py:335
+#: contrib/admin/views/main.py:340
 #, python-format
 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:308
+#: contrib/admin/views/main.py:340 contrib/admin/views/main.py:342
+#: contrib/admin/views/main.py:344 db/models/manipulators.py:308
 msgid "and"
 msgstr "と"
 
-#: contrib/admin/views/main.py:337
+#: contrib/admin/views/main.py:342
 #, python-format
 msgid "Changed %s."
 msgstr "%s を変更しました。"
 
-#: contrib/admin/views/main.py:339
+#: contrib/admin/views/main.py:344
 #, python-format
 msgid "Deleted %s."
 msgstr "%s を削除しました。"
 
-#: contrib/admin/views/main.py:342
+#: contrib/admin/views/main.py:347
 msgid "No fields changed."
 msgstr "変更はありませんでした。"
 
-#: contrib/admin/views/main.py:345
+#: contrib/admin/views/main.py:350
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" を変更しました。"
 
-#: contrib/admin/views/main.py:353
+#: contrib/admin/views/main.py:358
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。"
 
-#: contrib/admin/views/main.py:391
+#: contrib/admin/views/main.py:396
 #, python-format
 msgid "Change %s"
 msgstr "%s を変更"
 
-#: contrib/admin/views/main.py:476
+#: contrib/admin/views/main.py:481
 #, 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:481
+#: contrib/admin/views/main.py:486
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
 
-#: contrib/admin/views/main.py:514
+#: contrib/admin/views/main.py:518
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" を削除しました。"
 
-#: contrib/admin/views/main.py:517
+#: contrib/admin/views/main.py:521
 msgid "Are you sure?"
 msgstr "よろしいですか？"
 
-#: contrib/admin/views/main.py:539
+#: contrib/admin/views/main.py:543
 #, python-format
 msgid "Change history: %s"
 msgstr "変更履歴: %s"
 
-#: contrib/admin/views/main.py:573
+#: contrib/admin/views/main.py:577
 #, python-format
 msgid "Select %s"
 msgstr "%s を選択"
 
-#: contrib/admin/views/main.py:573
+#: contrib/admin/views/main.py:577
 #, python-format
 msgid "Select %s to change"
 msgstr "変更する %s を選択"
 
-#: contrib/admin/views/main.py:768
+#: contrib/admin/views/main.py:772
 msgid "Database error"
 msgstr "データベースエラー"
 
@@ -1088,7 +1103,7 @@ msgstr ""
 msgid "This account is inactive."
 msgstr "アカウントが無効です。"
 
-#: contrib/auth/forms.py:85
+#: contrib/auth/forms.py:84
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -1102,35 +1117,35 @@ msgstr "新しいパスワード(確認用)が一致しません。"
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "元のパスワードが間違っています。もう一度入力してください。"
 
-#: contrib/auth/models.py:38 contrib/auth/models.py:57
+#: contrib/auth/models.py:49 contrib/auth/models.py:69
 msgid "name"
 msgstr "名前"
 
-#: contrib/auth/models.py:40
+#: contrib/auth/models.py:51
 msgid "codename"
 msgstr "コード名"
 
-#: contrib/auth/models.py:42
+#: contrib/auth/models.py:54
 msgid "permission"
 msgstr "パーミッション"
 
-#: contrib/auth/models.py:43 contrib/auth/models.py:58
+#: contrib/auth/models.py:55 contrib/auth/models.py:70
 msgid "permissions"
 msgstr "パーミッション"
 
-#: contrib/auth/models.py:60
+#: contrib/auth/models.py:73
 msgid "group"
 msgstr "グループ"
 
-#: contrib/auth/models.py:61 contrib/auth/models.py:100
+#: contrib/auth/models.py:74 contrib/auth/models.py:114
 msgid "groups"
 msgstr "グループ"
 
-#: contrib/auth/models.py:90
+#: contrib/auth/models.py:104
 msgid "username"
 msgstr "ユーザ名"
 
-#: contrib/auth/models.py:90
+#: contrib/auth/models.py:104
 msgid ""
 "Required. 30 characters or fewer. Alphanumeric characters only (letters, "
 "digits and underscores)."
@@ -1138,23 +1153,23 @@ msgstr ""
 "この項目は必須です。半角アルファベット、半角数字、半角アンダーバーで30文字以"
 "下にしてください。"
 
-#: contrib/auth/models.py:91
+#: contrib/auth/models.py:105
 msgid "first name"
 msgstr "名"
 
-#: contrib/auth/models.py:92
+#: contrib/auth/models.py:106
 msgid "last name"
 msgstr "姓"
 
-#: contrib/auth/models.py:93
+#: contrib/auth/models.py:107
 msgid "e-mail address"
 msgstr "メールアドレス"
 
-#: contrib/auth/models.py:94
+#: contrib/auth/models.py:108
 msgid "password"
 msgstr "パスワード"
 
-#: contrib/auth/models.py:94
+#: contrib/auth/models.py:108
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@@ -1162,43 +1177,43 @@ msgstr ""
 "'[algo]$[salt]$[hexdigest]'形式か、<a href=\"password/\">パスワード変更フォー"
 "ム</a>を使ってください。"
 
-#: contrib/auth/models.py:95
+#: contrib/auth/models.py:109
 msgid "staff status"
 msgstr "スタッフ権限"
 
-#: contrib/auth/models.py:95
+#: contrib/auth/models.py:109
 msgid "Designates whether the user can log into this admin site."
 msgstr "ユーザが管理サイトにログイン可能かどうかを示します。"
 
-#: contrib/auth/models.py:96
+#: contrib/auth/models.py:110
 msgid "active"
 msgstr "有効"
 
-#: contrib/auth/models.py:96
+#: contrib/auth/models.py:110
 msgid ""
 "Designates whether this user can log into the Django admin. Unselect this "
 "instead of deleting accounts."
 msgstr "ユーザが管理サイトにログイン可能かどうかを示します。"
 
-#: contrib/auth/models.py:97
+#: contrib/auth/models.py:111
 msgid "superuser status"
 msgstr "スーパーユーザ権限"
 
-#: contrib/auth/models.py:97
+#: contrib/auth/models.py:111
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "全ての権限を持っているとみなされます。"
 
-#: contrib/auth/models.py:98
+#: contrib/auth/models.py:112
 msgid "last login"
 msgstr "最終ログイン"
 
-#: contrib/auth/models.py:99
+#: contrib/auth/models.py:113
 msgid "date joined"
 msgstr "登録日"
 
-#: contrib/auth/models.py:101
+#: contrib/auth/models.py:115
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
@@ -1206,39 +1221,43 @@ msgstr ""
 "手動で付与したパーミッションに加え、所属しているグループに付与された全ての"
 "パーミッションを獲得します。"
 
-#: contrib/auth/models.py:102
+#: contrib/auth/models.py:116
 msgid "user permissions"
 msgstr "ユーザパーミッション"
 
-#: contrib/auth/models.py:105
+#: contrib/auth/models.py:120
 msgid "user"
 msgstr "ユーザ"
 
-#: contrib/auth/models.py:106
+#: contrib/auth/models.py:121
 msgid "users"
 msgstr "ユーザ"
 
-#: contrib/auth/models.py:111
+#: contrib/auth/models.py:127
 msgid "Personal info"
 msgstr "個人情報"
 
-#: contrib/auth/models.py:112
+#: contrib/auth/models.py:128
 msgid "Permissions"
 msgstr "パーミッション"
 
-#: contrib/auth/models.py:113
+#: contrib/auth/models.py:129
 msgid "Important dates"
 msgstr "重要な日程"
 
-#: contrib/auth/models.py:114
+#: contrib/auth/models.py:130
 msgid "Groups"
 msgstr "グループ"
 
-#: contrib/auth/models.py:258
+#: contrib/auth/models.py:272
 msgid "message"
 msgstr "メッセージ"
 
-#: contrib/auth/views.py:39
+#: contrib/auth/models.py:285
+msgid "AnonymousUser"
+msgstr "非認証ユーザ"
+
+#: contrib/auth/views.py:40
 msgid "Logged out"
 msgstr "ログアウト"
 
@@ -1660,11 +1679,260 @@ msgstr "8"
 msgid "nine"
 msgstr "9"
 
+#: contrib/localflavor/au/forms.py:18
+msgid "Enter a 4 digit post code."
+msgstr "4桁でポストコードを入力してください。"
+
+#: contrib/localflavor/br/forms.py:18
+msgid "Enter a zip code in the format XXXXX-XXX."
+msgstr "XXXXX-XXXの形式でZipコードを入力してください。"
+
+#: contrib/localflavor/br/forms.py:30
+msgid "Phone numbers must be in XX-XXXX-XXXX format."
+msgstr "電話番号は XX-XXXX-XXXX 形式で入力してください。"
+
+#: contrib/localflavor/br/forms.py:72
+msgid "This field requires only numbers."
+msgstr "このフィールドは必須です(数値のみ)。"
+
+#: contrib/localflavor/br/forms.py:74
+msgid "This field requires at most 11 digits or 14 characters."
+msgstr "11桁の数字か14文字で入力してください。"
+
+#: contrib/localflavor/br/forms.py:84
+msgid "Invalid CPF number."
+msgstr "ブラジル納税者番号が無効です。"
+
+#: contrib/localflavor/br/forms.py:106
+msgid "This field requires at least 14 digits"
+msgstr "14桁以上で入力して下さい。"
+
+#: contrib/localflavor/br/forms.py:116
+msgid "Invalid CNPJ number."
+msgstr "納税登録番号が正しくありません。"
+
+#: contrib/localflavor/ch/ch_states.py:5
+msgid "Aargau"
+msgstr "Aargau"
+
+#: contrib/localflavor/ch/ch_states.py:6
+msgid "Appenzell Innerrhoden"
+msgstr "Appenzell Innerrhoden"
+
+#: contrib/localflavor/ch/ch_states.py:7
+msgid "Appenzell Ausserrhoden"
+msgstr "Appenzell Ausserrhoden"
+
+#: contrib/localflavor/ch/ch_states.py:8
+msgid "Basel-Stadt"
+msgstr "Basel-Stadt"
+
+#: contrib/localflavor/ch/ch_states.py:9
+msgid "Basel-Land"
+msgstr "Basel-Land"
+
+#: contrib/localflavor/ch/ch_states.py:10
+msgid "Berne"
+msgstr "Berne"
+
+#: contrib/localflavor/ch/ch_states.py:11
+msgid "Fribourg"
+msgstr "Fribourg"
+
+#: contrib/localflavor/ch/ch_states.py:12
+msgid "Geneva"
+msgstr "Geneva"
+
+#: contrib/localflavor/ch/ch_states.py:13
+msgid "Glarus"
+msgstr "Glarus"
+
+#: contrib/localflavor/ch/ch_states.py:14
+msgid "Graubuenden"
+msgstr "Graubuenden"
+
+#: contrib/localflavor/ch/ch_states.py:15
+msgid "Jura"
+msgstr "Jura"
+
+#: contrib/localflavor/ch/ch_states.py:16
+msgid "Lucerne"
+msgstr "Lucerne"
+
+#: contrib/localflavor/ch/ch_states.py:17
+msgid "Neuchatel"
+msgstr "Neuchatel"
+
+#: contrib/localflavor/ch/ch_states.py:18
+msgid "Nidwalden"
+msgstr "Nidwalden"
+
+#: contrib/localflavor/ch/ch_states.py:19
+msgid "Obwalden"
+msgstr "Obwalden"
+
+#: contrib/localflavor/ch/ch_states.py:20
+msgid "Schaffhausen"
+msgstr "Schaffhausen"
+
+#: contrib/localflavor/ch/ch_states.py:21
+msgid "Schwyz"
+msgstr "Schwyz"
+
+#: contrib/localflavor/ch/ch_states.py:22
+msgid "Solothurn"
+msgstr "Solothurn"
+
+#: contrib/localflavor/ch/ch_states.py:23
+msgid "St. Gallen"
+msgstr "St. Gallen"
+
+#: contrib/localflavor/ch/ch_states.py:24
+msgid "Thurgau"
+msgstr "Thurgau"
+
+#: contrib/localflavor/ch/ch_states.py:25
+msgid "Ticino"
+msgstr "Ticino"
+
+#: contrib/localflavor/ch/ch_states.py:26
+msgid "Uri"
+msgstr "Uri"
+
+#: contrib/localflavor/ch/ch_states.py:27
+msgid "Valais"
+msgstr "Valais"
+
+#: contrib/localflavor/ch/ch_states.py:28
+msgid "Vaud"
+msgstr "Vaud"
+
+#: contrib/localflavor/ch/ch_states.py:29
+msgid "Zug"
+msgstr "Zug"
+
+#: contrib/localflavor/ch/ch_states.py:30
+msgid "Zurich"
+msgstr "Zurich"
+
+#: contrib/localflavor/ch/forms.py:18 contrib/localflavor/no/forms.py:15
+msgid "Enter a zip code in the format XXXX."
+msgstr "XXXXの形式でZipコードを入力してください。"
+
+#: contrib/localflavor/ch/forms.py:90
+msgid ""
+"Enter a valid Swiss identity or passport card number in X1234567<0 or "
+"1234567890 format."
+msgstr "スイス アイデンティティかパスポート番号を X1234567<0 か 1234567890 の形式で入力して下さい。"
+
+#: contrib/localflavor/cl/forms.py:21
+msgid "Enter valid a Chilean RUT. The format is XX.XXX.XXX-X."
+msgstr "XX.XXX.XXX-Xの形式でチリ納税者番号を入力してください。"
+
+#: contrib/localflavor/cl/forms.py:26
+msgid "Enter valid a Chilean RUT"
+msgstr "正しいチリ納税者番号を入力してください。"
+
+#: contrib/localflavor/de/de_states.py:5
+msgid "Baden-Wuerttemberg"
+msgstr "Baden-Wuerttemberg"
+
+#: contrib/localflavor/de/de_states.py:6
+msgid "Bavaria"
+msgstr "Bavaria"
+
+#: contrib/localflavor/de/de_states.py:7
+msgid "Berlin"
+msgstr "Berlin"
+
+#: contrib/localflavor/de/de_states.py:8
+msgid "Brandenburg"
+msgstr "Brandenburg"
+
+#: contrib/localflavor/de/de_states.py:9
+msgid "Bremen"
+msgstr "Bremen"
+
+#: contrib/localflavor/de/de_states.py:10
+msgid "Hamburg"
+msgstr "Hamburg"
+
+#: contrib/localflavor/de/de_states.py:11
+msgid "Hessen"
+msgstr "Hessen"
+
+#: contrib/localflavor/de/de_states.py:12
+msgid "Mecklenburg-Western Pomerania"
+msgstr "Mecklenburg-Western Pomerania"
+
+#: contrib/localflavor/de/de_states.py:13
+msgid "Lower Saxony"
+msgstr "Lower Saxony"
+
+#: contrib/localflavor/de/de_states.py:14
+msgid "North Rhine-Westphalia"
+msgstr "North Rhine-Westphalia"
+
+#: contrib/localflavor/de/de_states.py:15
+msgid "Rhineland-Palatinate"
+msgstr "Rhineland-Palatinate"
+
+#: contrib/localflavor/de/de_states.py:16
+msgid "Saarland"
+msgstr "Saarland"
+
+#: contrib/localflavor/de/de_states.py:17
+msgid "Saxony"
+msgstr "Saxony"
+
+#: contrib/localflavor/de/de_states.py:18
+msgid "Saxony-Anhalt"
+msgstr "Saxony-Anhalt"
+
+#: contrib/localflavor/de/de_states.py:19
+msgid "Schleswig-Holstein"
+msgstr "Schleswig-Holstein"
+
+#: contrib/localflavor/de/de_states.py:20
+msgid "Thuringia"
+msgstr "Thuringia"
+
+#: contrib/localflavor/de/forms.py:16 contrib/localflavor/fi/forms.py:14
 #: contrib/localflavor/fr/forms.py:17
-#, fuzzy
 msgid "Enter a zip code in the format XXXXX."
 msgstr "XXXXXの形式でZipコードを入力してください。"
 
+#: contrib/localflavor/de/forms.py:60
+msgid ""
+"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
+"format."
+msgstr "XXXXXXXXXXX-XXXXXXX-XXXXXXX-X の形式でドイツIDカード番号を入力して下さい。"
+
+#: contrib/localflavor/fi/forms.py:40 contrib/localflavor/fi/forms.py:45
+msgid "Enter a valid Finnish social security number."
+msgstr "フィンランド社会保証番号を正しく入力してください。"
+
+#: contrib/localflavor/is_/forms.py:16
+msgid ""
+"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
+msgstr "XXXXXか、XXXXX-XXXXの形式でアイスランド納税者番号を入力してください。"
+
+#: contrib/localflavor/is_/forms.py:30
+msgid "The Icelandic identification number is not valid."
+msgstr "アイスランド納税者番号を正しく入力して下さい。"
+
+#: contrib/localflavor/it/forms.py:16
+msgid "Enter a valid zip code."
+msgstr "Zipコードを正しく入力してください。"
+
+#: contrib/localflavor/it/forms.py:41
+msgid "Enter a valid Social Security number."
+msgstr "社会保障番号番号を正しく入力してください。"
+
+#: contrib/localflavor/it/forms.py:68
+msgid "Enter a valid VAT number."
+msgstr "VAT番号を正しく入力してください。"
+
 #: contrib/localflavor/jp/forms.py:21
 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
 msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。"
@@ -1857,14 +2125,24 @@ msgstr "鹿児島県"
 msgid "Okinawa"
 msgstr "沖縄県"
 
+#: contrib/localflavor/no/forms.py:36
+msgid "Enter a valid Norwegian social security number."
+msgstr "ノルウェー社会保障番号を正しく入力してください。"
+
 #: contrib/localflavor/uk/forms.py:18
 msgid "Enter a postcode. A space is required between the two postcode parts."
-msgstr "ポスタルコードを入力してください。コードとコードの間は半角のスペースで区切ってください。"
+msgstr ""
+"ポスタルコードを入力してください。コードとコードの間は半角のスペースで区切っ"
+"てください。"
 
-#: contrib/localflavor/usa/forms.py:17
+#: contrib/localflavor/us/forms.py:18
 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
 msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。"
 
+#: contrib/localflavor/us/forms.py:51
+msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
+msgstr "XXX-XX-XXXX の形式で、米国社会保障番号を入力して下さい。"
+
 #: contrib/redirects/models.py:7
 msgid "redirect from"
 msgstr "リダイレクト元"
@@ -1929,92 +2207,92 @@ msgstr "サイト"
 msgid "sites"
 msgstr "サイト"
 
-#: core/validators.py:64
+#: core/validators.py:65
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "半角の英数字およびアンダースコア以外は使用できません。"
 
-#: core/validators.py:68
+#: core/validators.py:69
 msgid ""
 "This value must contain only letters, numbers, underscores, dashes or "
 "slashes."
 msgstr ""
 "半角の英数字、アンダースコア、ダッシュ、スラッシュ以外は使用できません。"
 
-#: core/validators.py:72
+#: core/validators.py:73
 msgid "This value must contain only letters, numbers, underscores or hyphens."
 msgstr "半角の英数字、アンダースコア、ハイフン以外は使用できません。"
 
-#: core/validators.py:76
+#: core/validators.py:77
 msgid "Uppercase letters are not allowed here."
 msgstr "大文字はここでは使用できません。"
 
-#: core/validators.py:80
+#: core/validators.py:81
 msgid "Lowercase letters are not allowed here."
 msgstr "小文字はここでは使用できません。"
 
-#: core/validators.py:87
+#: core/validators.py:88
 msgid "Enter only digits separated by commas."
 msgstr "カンマ区切りの数字だけを入力してください。"
 
-#: core/validators.py:99
+#: core/validators.py:100
 msgid "Enter valid e-mail addresses separated by commas."
 msgstr "カンマ区切りの有効なメールアドレスを入力してください。"
 
-#: core/validators.py:103
+#: core/validators.py:104
 msgid "Please enter a valid IP address."
 msgstr "有効な IP アドレスを入力してください。"
 
-#: core/validators.py:107
+#: core/validators.py:108
 msgid "Empty values are not allowed here."
 msgstr "入力は必須です。"
 
-#: core/validators.py:111
+#: core/validators.py:112
 msgid "Non-numeric characters aren't allowed here."
 msgstr "数値以外は使用できません。"
 
-#: core/validators.py:115
+#: core/validators.py:116
 msgid "This value can't be comprised solely of digits."
 msgstr "数値だけの値にはできません。"
 
-#: core/validators.py:120 newforms/fields.py:126
+#: core/validators.py:121 newforms/fields.py:135
 msgid "Enter a whole number."
 msgstr "整数を入力してください。"
 
-#: core/validators.py:124
+#: core/validators.py:125
 msgid "Only alphabetical characters are allowed here."
 msgstr "半角アルファベット以外使用できません。"
 
-#: core/validators.py:139
+#: core/validators.py:140
 msgid "Year must be 1900 or later."
 msgstr "1900年以降を指定してください。"
 
-#: core/validators.py:143
+#: core/validators.py:144
 #, python-format
 msgid "Invalid date: %s"
 msgstr "無効な日付: %s"
 
-#: core/validators.py:148 db/models/fields/__init__.py:457
+#: core/validators.py:149 db/models/fields/__init__.py:468
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "YYYY-MM-DD形式で日付を入力してください。"
 
-#: core/validators.py:153
+#: core/validators.py:154
 msgid "Enter a valid time in HH:MM format."
 msgstr "HH:MM形式で時刻を入力してください。"
 
-#: core/validators.py:157 db/models/fields/__init__.py:526
+#: core/validators.py:158 db/models/fields/__init__.py:537
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
 msgstr "YYYY-MM-DD HH:MM形式で日時を入力してください。"
 
-#: core/validators.py:162 newforms/fields.py:269
+#: core/validators.py:163 newforms/fields.py:339
 msgid "Enter a valid e-mail address."
 msgstr "有効なメールアドレスを入力してください。"
 
-#: core/validators.py:174 core/validators.py:445 oldforms/__init__.py:672
+#: core/validators.py:175 core/validators.py:453 oldforms/__init__.py:672
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "ファイルが取得できませんでした。formのencoding typeを確認してください。"
 
-#: core/validators.py:178
+#: core/validators.py:179
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -2022,26 +2300,26 @@ msgstr ""
 "画像をアップロードしてください。アップロードした画像は画像でないか、または壊"
 "れています。"
 
-#: core/validators.py:185
+#: core/validators.py:186
 #, python-format
 msgid "The URL %s does not point to a valid image."
 msgstr "URL ( %s )  は画像ではありません。"
 
-#: core/validators.py:189
+#: core/validators.py:190
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr "電話番号は XXX-XXX-XXXX 形式で入力してください。\"%s\" は無効です。"
 
-#: core/validators.py:197
+#: core/validators.py:198
 #, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
 msgstr "URL ( %s ) は QuickTime ビデオではありません。"
 
-#: core/validators.py:201
+#: core/validators.py:202
 msgid "A valid URL is required."
 msgstr "正しい URL を入力してください。"
 
-#: core/validators.py:215
+#: core/validators.py:216
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
@@ -2050,86 +2328,86 @@ msgstr ""
 "有効な HTML を入力してください。エラー:\n"
 "%s"
 
-#: core/validators.py:222
+#: core/validators.py:223
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "不正な XML です: %s"
 
-#: core/validators.py:239
+#: core/validators.py:240
 #, python-format
 msgid "Invalid URL: %s"
 msgstr "無効なURL: %s"
 
-#: core/validators.py:244 core/validators.py:246
+#: core/validators.py:245 core/validators.py:247
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL ( %s ) はリンクが壊れています。"
 
-#: core/validators.py:252
+#: core/validators.py:253
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "正しい米州略称を入力してください。"
 
-#: core/validators.py:266
+#: core/validators.py:267
 #, 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:273
+#: core/validators.py:274
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "このフィールドは '%s' フィールドと一致せねばなりません。"
 
-#: core/validators.py:292
+#: core/validators.py:293
 msgid "Please enter something for at least one field."
 msgstr "少なくとも一つのフィールドに何か入力してください。"
 
-#: core/validators.py:301 core/validators.py:312
+#: core/validators.py:302 core/validators.py:313
 msgid "Please enter both fields or leave them both empty."
 msgstr "両方のフィールドに入力するか、両方とも未入力にしてください。"
 
-#: core/validators.py:320
+#: core/validators.py:321
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""
 "%(field)s を %(value)s にするのなら、このフィールドに必ず入力してください。"
 
-#: core/validators.py:333
+#: core/validators.py:334
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 "%(field)s を %(value)s にしないのなら、このフィールドに必ず入力してください。"
 
-#: core/validators.py:352
+#: core/validators.py:353
 msgid "Duplicate values are not allowed."
 msgstr "重複する値は認められません。"
 
-#: core/validators.py:367
+#: core/validators.py:368
 #, python-format
 msgid "This value must be between %(lower)s and %(upper)s."
 msgstr "この値は %(lower)s から %(upper)s の間でなければなりません。"
 
-#: core/validators.py:369
+#: core/validators.py:370
 #, python-format
 msgid "This value must be at least %s."
 msgstr "この値は %s 以上でなければなりません。"
 
-#: core/validators.py:371
+#: core/validators.py:372
 #, python-format
 msgid "This value must be no more than %s."
 msgstr "この値は %s より小さくなければなりません。"
 
-#: core/validators.py:407
+#: core/validators.py:408
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "この値は %s の累乗でなければなりません。"
 
-#: core/validators.py:418
+#: core/validators.py:417
 msgid "Please enter a valid decimal number."
 msgstr "有効な 10 進数を入力してください。"
 
-#: core/validators.py:422
+#: core/validators.py:423
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -2137,7 +2415,7 @@ msgid_plural ""
 msgstr[0] "全体で %s 文字以下の数字を入力してください。"
 msgstr[1] "全体で %s 文字以下の数字を入力してください。"
 
-#: core/validators.py:425
+#: core/validators.py:426
 #, python-format
 msgid ""
 "Please enter a valid decimal number with a whole part of at most %s digit."
@@ -2146,7 +2424,7 @@ msgid_plural ""
 msgstr[0] "整数部は %s 文字以下の数字を入力してください。"
 msgstr[1] "整数部は %s 文字以下の数字を入力してください。"
 
-#: core/validators.py:428
+#: core/validators.py:429
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -2154,37 +2432,41 @@ msgid_plural ""
 msgstr[0] "小数部は %s 文字以下の数字を入力してください。"
 msgstr[1] "小数部は %s 文字以下の数字を入力してください。"
 
-#: core/validators.py:438
+#: core/validators.py:437
+msgid "Please enter a valid floating point number."
+msgstr "有効な 小数 を入力してください。"
+
+#: core/validators.py:446
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "アップロードするファイルの大きさは %s バイト以上にしてください。"
 
-#: core/validators.py:439
+#: core/validators.py:447
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "アップロードするファイルの大きさは %s 最大バイトまでです。"
 
-#: core/validators.py:456
+#: core/validators.py:464
 msgid "The format for this field is wrong."
 msgstr "フィールドの形式が正しくありません。"
 
-#: core/validators.py:471
+#: core/validators.py:479
 msgid "This field is invalid."
 msgstr "このフィールドは無効です。"
 
-#: core/validators.py:507
+#: core/validators.py:515
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "%s から何も検索できませんでした。"
 
-#: core/validators.py:510
+#: core/validators.py:518
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 "URL %(url)s は無効なコンテンツタイプヘッダ '%(contenttype)s' を返しました。"
 
-#: core/validators.py:543
+#: core/validators.py:551
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -2193,7 +2475,7 @@ msgstr ""
 "%(line)s 行目から始まる %(tag)s タグを閉じてください (\"%(start)s\" で始まる"
 "行です)。"
 
-#: core/validators.py:547
+#: core/validators.py:555
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -2202,7 +2484,7 @@ msgstr ""
 "%(line)s 行目から始まるテキストはこのコンテキストでは使えません。 (\"%(start)"
 "s\" で始まる行です)。"
 
-#: core/validators.py:552
+#: core/validators.py:560
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -2211,7 +2493,7 @@ msgstr ""
 "%(line)s 行目の \"%(attr)s\" は無効なアトリビュートです (\"%(start)s\" で始ま"
 "る行です)。"
 
-#: core/validators.py:557
+#: core/validators.py:565
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -2220,7 +2502,7 @@ msgstr ""
 "%(line)s 行目の \"<%(tag)s>\" は無効なタグです( \"%(start)s\" で始まる行で"
 "す)。"
 
-#: core/validators.py:561
+#: core/validators.py:569
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -2229,7 +2511,7 @@ msgstr ""
 "%(line)s 行目のタグは必須アトリビュートが未入力です( \"%(start)s\" で始まる行"
 "です)。"
 
-#: core/validators.py:566
+#: core/validators.py:574
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -2244,55 +2526,59 @@ msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
 "%(field)s に入力されたものは、この %(type)s の %(object)s に既に存在します。"
 
-#: db/models/fields/__init__.py:42
+#: db/models/fields/__init__.py:46
 #, python-format
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr "%(fieldname)s に %(optname)s は既に存在します。"
 
-#: db/models/fields/__init__.py: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
+#: db/models/fields/__init__.py:126 db/models/fields/__init__.py:283
+#: db/models/fields/__init__.py:680 db/models/fields/__init__.py:691
+#: newforms/fields.py:87 newforms/fields.py:444 newforms/fields.py:522
+#: newforms/fields.py:533 newforms/models.py:185 oldforms/__init__.py:357
 msgid "This field is required."
 msgstr "このフィールドは必須です。"
 
-#: db/models/fields/__init__.py:367
+#: db/models/fields/__init__.py:378
 msgid "This value must be an integer."
 msgstr "値は整数でなければなりません。"
 
-#: db/models/fields/__init__.py:402
+#: db/models/fields/__init__.py:413
 msgid "This value must be either True or False."
 msgstr "値は真: True または偽: False でなければなりません。"
 
-#: db/models/fields/__init__.py:423
+#: db/models/fields/__init__.py:434
 msgid "This field cannot be null."
 msgstr "このフィールドには NULL を指定できません。"
 
-#: db/models/fields/__init__.py:630
+#: db/models/fields/__init__.py:597
+msgid "This value must be a decimal number."
+msgstr "値は整数でなければなりません。"
+
+#: db/models/fields/__init__.py:700
 msgid "Enter a valid filename."
 msgstr "正しいファイル名を入力してください。"
 
-#: db/models/fields/__init__.py:751
+#: db/models/fields/__init__.py:824
 msgid "This value must be either None, True or False."
 msgstr "値は、空: None、真: True または偽: False でなければなりません。"
 
-#: db/models/fields/related.py:53
+#: db/models/fields/related.py:54
 #, python-format
 msgid "Please enter a valid %s."
 msgstr "正しい %s を入力してください。"
 
-#: db/models/fields/related.py:642
+#: db/models/fields/related.py:640
 msgid "Separate multiple IDs with commas."
 msgstr "複数の ID はカンマで区切ってください。"
 
-#: db/models/fields/related.py:644
+#: db/models/fields/related.py:642
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "複数選択するときには Control キーを押したまま選択してください。Mac は "
 "Command キーを使ってください"
 
-#: db/models/fields/related.py:691
+#: db/models/fields/related.py:689
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -2300,59 +2586,78 @@ msgid_plural ""
 msgstr[0] "正しい %(self)s IDを入力してください。 %(value)r は無効です。"
 msgstr[1] "正しい %(self)s IDを入力してください。 %(value)r は無効です。"
 
-#: newforms/fields.py:101 newforms/fields.py:254
+#: newforms/fields.py:110 newforms/fields.py:324
 #, python-format
 msgid "Ensure this value has at most %d characters."
 msgstr "%d 字以下で入力してください。"
 
-#: newforms/fields.py:103 newforms/fields.py:256
+#: newforms/fields.py:112 newforms/fields.py:326
 #, python-format
 msgid "Ensure this value has at least %d characters."
 msgstr "%d 字以上で入力してください。"
 
-#: newforms/fields.py:128
+#: newforms/fields.py:137 newforms/fields.py:160 newforms/fields.py:192
 #, python-format
 msgid "Ensure this value is less than or equal to %s."
 msgstr "この値は %s 以下でなければなりません。"
 
-#: newforms/fields.py:130
+#: newforms/fields.py:139 newforms/fields.py:162 newforms/fields.py:194
 #, python-format
 msgid "Ensure this value is greater than or equal to %s."
 msgstr "この値は %s 以上でなければなりません。"
 
-#: newforms/fields.py:163
+#: newforms/fields.py:158 newforms/fields.py:186
+msgid "Enter a number."
+msgstr "整数を入力してください。"
+
+#: newforms/fields.py:196
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "整数部と少数部を併せて %s 桁までで入力して下さい。"
+
+#: newforms/fields.py:198
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "少数部は %s 桁までで入力して下さい。"
+
+#: newforms/fields.py:200
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "整数部は %s 桁までで入力して下さい。"
+
+#: newforms/fields.py:233 newforms/fields.py:566
 msgid "Enter a valid date."
 msgstr "日付を正しく入力してください。"
 
-#: newforms/fields.py:190
+#: newforms/fields.py:260 newforms/fields.py:568
 msgid "Enter a valid time."
 msgstr "時間を正しく入力してください。"
 
-#: newforms/fields.py:226
+#: newforms/fields.py:296
 msgid "Enter a valid date/time."
 msgstr "日付/時間を正しく入力してください。"
 
-#: newforms/fields.py:240
+#: newforms/fields.py:310
 msgid "Enter a valid value."
 msgstr "値を正しく入力してください。"
 
-#: newforms/fields.py:287 newforms/fields.py:309
+#: newforms/fields.py:357 newforms/fields.py:379
 msgid "Enter a valid URL."
 msgstr "URLを正しく入力してください。"
 
-#: newforms/fields.py:311
+#: newforms/fields.py:381
 msgid "This URL appears to be a broken link."
 msgstr "このURLはリンクが壊れています。"
 
-#: newforms/fields.py:360 newforms/models.py:164
+#: newforms/fields.py:432 newforms/models.py:172
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "正しく選択してください。選択したものは候補にありません。"
 
-#: newforms/fields.py:378 newforms/fields.py:454 newforms/models.py:181
+#: newforms/fields.py:448 newforms/fields.py:526 newforms/models.py:189
 msgid "Enter a list of values."
 msgstr "リストを入力してください。"
 
-#: newforms/fields.py:387 newforms/models.py:187
+#: newforms/fields.py:457 newforms/models.py:195
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "正しく選択してください。 %s は候補にありません。"
@@ -2393,6 +2698,28 @@ msgstr "0 から 32,767 までの整数を入力してください。"
 msgid "yes,no,maybe"
 msgstr "はい,いいえ,たぶん"
 
+#: template/defaultfilters.py:520
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
+
+#: template/defaultfilters.py:522
+#, python-format
+msgid "%.1f KB"
+msgstr "%.1f KB"
+
+#: template/defaultfilters.py:524
+#, python-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: template/defaultfilters.py:525
+#, python-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
 #: utils/dateformat.py:40
 msgid "p.m."
 msgstr "p.m."
@@ -2605,23 +2932,38 @@ msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: utils/translation/trans_real.py:362
+#: utils/timesince.py:40
+#, python-format
+msgid "%d milliseconds"
+msgstr "%d ミリ秒"
+
+#: utils/timesince.py:41
+#, python-format
+msgid "%(number)d %(type)s"
+msgstr "%(number)d %(type)s"
+
+#: utils/timesince.py:47
+#, python-format
+msgid ", %(number)d %(type)s"
+msgstr ", %(number)d %(type)s"
+
+#: utils/translation/trans_real.py:358
 msgid "DATE_FORMAT"
 msgstr "Y/m/d"
 
-#: utils/translation/trans_real.py:363
+#: utils/translation/trans_real.py:359
 msgid "DATETIME_FORMAT"
 msgstr "Y/m/d H:i"
 
-#: utils/translation/trans_real.py:364
+#: utils/translation/trans_real.py:360
 msgid "TIME_FORMAT"
 msgstr "H:i"
 
-#: utils/translation/trans_real.py:380
+#: utils/translation/trans_real.py:376
 msgid "YEAR_MONTH_FORMAT"
 msgstr "Y/m/d"
 
-#: utils/translation/trans_real.py:381
+#: utils/translation/trans_real.py:377
 msgid "MONTH_DAY_FORMAT"
 msgstr "m/d"