Changeset 5583

Timestamp:

07/01/07 14:40:39 (1 year ago)

Author:

jdunck

Message:

gis: Merged revisions 5540-5582 via svnmerge from
http://code.djangoproject.com/svn/django/trunk

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/AUTHORS (modified) (1 diff)
• django/branches/gis/django/conf/locale/bn/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/bn/LC_MESSAGES/djangojs.mo)
• django/branches/gis/django/conf/locale/bn/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/bn/LC_MESSAGES/djangojs.po)
• django/branches/gis/django/conf/locale/da/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/da/LC_MESSAGES/djangojs.mo)
• django/branches/gis/django/conf/locale/da/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/da/LC_MESSAGES/djangojs.po)
• django/branches/gis/django/conf/locale/ja/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/gis/django/conf/locale/ja/LC_MESSAGES/django.po (modified) (38 diffs)
• django/branches/gis/django/conf/locale/ro/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/ro/LC_MESSAGES/djangojs.mo)
• django/branches/gis/django/conf/locale/ro/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/ro/LC_MESSAGES/djangojs.po)
• django/branches/gis/django/conf/locale/ro/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/gis/django/conf/locale/ro/LC_MESSAGES/django.po (modified) (42 diffs)
• django/branches/gis/django/conf/locale/uk/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/uk/LC_MESSAGES/djangojs.mo)
• django/branches/gis/django/conf/locale/uk/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/uk/LC_MESSAGES/djangojs.po)
• django/branches/gis/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo)
• django/branches/gis/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.po)
• django/branches/gis/django/conf/project_template/settings.py (modified) (1 diff)
• django/branches/gis/django/core/mail.py (modified) (8 diffs)
• django/branches/gis/django/db/backends/dummy/base.py (modified) (2 diffs)
• django/branches/gis/django/db/backends/mysql/base.py (modified) (1 diff)
• django/branches/gis/django/db/backends/mysql_old/base.py (modified) (1 diff)
• django/branches/gis/django/db/backends/postgresql/base.py (modified) (1 diff)
• django/branches/gis/django/db/backends/postgresql_psycopg2/base.py (modified) (1 diff)
• django/branches/gis/django/db/backends/sqlite3/base.py (modified) (3 diffs)
• django/branches/gis/django/db/models/fields/__init__.py (modified) (2 diffs)
• django/branches/gis/django/db/models/query.py (modified) (3 diffs)
• django/branches/gis/django/http/__init__.py (modified) (2 diffs)
• django/branches/gis/django/newforms/fields.py (modified) (2 diffs)
• django/branches/gis/django/newforms/widgets.py (modified) (2 diffs)
• django/branches/gis/docs/authentication.txt (modified) (1 diff)
• django/branches/gis/docs/contributing.txt (modified) (1 diff)
• django/branches/gis/docs/db-api.txt (modified) (2 diffs)
• django/branches/gis/docs/django-admin.txt (modified) (1 diff)
• django/branches/gis/docs/email.txt (modified) (4 diffs)
• django/branches/gis/docs/install.txt (modified) (2 diffs)
• django/branches/gis/docs/legacy_databases.txt (modified) (1 diff)
• django/branches/gis/docs/model-api.txt (modified) (3 diffs)
• django/branches/gis/docs/release_notes_0.96.txt (modified) (1 diff)
• django/branches/gis/docs/serialization.txt (modified) (1 diff)
• django/branches/gis/docs/testing.txt (modified) (2 diffs)
• django/branches/gis/docs/tutorial01.txt (modified) (1 diff)
• django/branches/gis/tests/modeltests/lookup/models.py (modified) (2 diffs)
• django/branches/gis/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/branches/gis/AUTHORS

@@ -231 +231 @@
-    thebjorn <bp@datakortet.no>
-    Zach Thompson <zthompson47@gmail.com>
+    tibimicu@gmax.net
-    Tom Tobin
-    Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>

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

@@ -2 +2 @@
-# Copyright (C) 2005,2006,2007 makoto tsuyuki
-# This file is distributed under the same license as the PACKAGE package.
-
-
+
-msgid ""
-msgstr ""
-"Project-Id-Version: Django 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-3-26 22:51
+6-26 11:33
-"PO-Revision-Date: 2006-05-18 00:28+0900\n"
-"Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
@@ -25 +24 @@
-
-#: conf/global_settings.py:41
+msgid "Bulgarian"
+msgstr "ブルガリア語"
+
+#: conf/global_settings.py:42
-msgid "Catalan"
-msgstr "カタロニア語"
-
-2
+3
-msgid "Czech"
-msgstr "チェコ語"
-
-3
+4
-msgid "Welsh"
-msgstr "ウェールズ語"
-
-4
+5
-msgid "Danish"
-msgstr "デンマーク語"
-
-5
+6
-msgid "German"
-msgstr "ドイツ語"
-
-6
+7
-msgid "Greek"
-msgstr "ギリシャ語"
-
-7
+8
-msgid "English"
-msgstr "英語"
-
-8
+9
-msgid "Spanish"
-msgstr "スペイン語"
-
-49
+50
-msgid "Argentinean Spanish"
-msgstr "アルゼンチンスペイン語"
-
-
+
+
+
+
+
-msgid "Finnish"
-msgstr "フィンランド語"
-
-1
+3
-msgid "French"
-msgstr "フランス語"
-
-2
+4
-msgid "Galician"
-msgstr "ガリシア語"
-
-3
+5
-msgid "Hungarian"
-msgstr "ハンガリー語"
-
-4
+6
-msgid "Hebrew"
-msgstr "ヘブライ語"
-
-5
+7
-msgid "Icelandic"
-msgstr "アイスランド語"
-
-6
+8
-msgid "Italian"
-msgstr "イタリア語"
-
-7
+9
-msgid "Japanese"
-msgstr "日本語"
-
-
+
+
+
+
+
-msgid "Kannada"
-msgstr "カンナダ語"
-
-59
+62
-msgid "Latvian"
-msgstr "ラトビア語"
-
-0
+3
-msgid "Macedonian"
-msgstr "マケドニア語"
-
-1
+4
-msgid "Dutch"
-msgstr "オランダ語"
-
-2
+5
-msgid "Norwegian"
-msgstr "ノルウェー語"
-
-3
+6
-msgid "Polish"
-msgstr "ポーランド語"
-
-4
+7
-msgid "Portugese"
-msgstr "ポルトガル語"
-
-5
+8
-msgid "Brazilian"
-msgstr "ブラジル語"
-
-6
+9
-msgid "Romanian"
-msgstr "ルーマニア語"
-
-67
+70
-msgid "Russian"
-msgstr "ロシア語"
-
-68
+71
-msgid "Slovak"
-msgstr "スロバキア語"
-
-69
+72
-msgid "Slovenian"
-msgstr "スロヴェニア語"
-
-0
+3
-msgid "Serbian"
-msgstr "セルビア語"
-
-1
+4
-msgid "Swedish"
-msgstr "スウェーデン語"
-
-2
+5
-msgid "Tamil"
-msgstr "タミル語"
-
-3
+6
-msgid "Telugu"
-msgstr "テルグ語"
-
-4
+7
-msgid "Turkish"
-msgstr "トルコ語"
-
-5
+8
-msgid "Ukrainian"
-msgstr "ウクライナ語"
-
-6
+9
-msgid "Simplified Chinese"
-msgstr "簡体字中国語"
-
-77
+80
-msgid "Traditional Chinese"
-msgstr "繁体字中国語"
@@ -206 +217 @@
-msgstr "今年"
-
-70
+81
-#: oldforms/__init__.py:577
-msgid "Yes"
-msgstr "はい"
-
-70
+81
-#: oldforms/__init__.py:577
-msgid "No"
-msgstr "いいえ"
-
-70
+81
-#: oldforms/__init__.py:577
-msgid "Unknown"
@@ -782 +793 @@
-msgstr "変更:"
-
-7
+9
-msgid "All dates"
-msgstr "いつでも"
-
-57
+62
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" を追加しました。"
-
-1
-47
+6
+52
-msgid "You may edit it again below."
-msgstr "続けて編集できます。"
@@ -896 +907 @@
-msgstr "%s のフィールド"
-
-1
-3 contrib/admin/views/doc.py:309
-0 contrib/admin/views/doc.py:312
+2
+4 contrib/admin/views/doc.py:310
+1 contrib/admin/views/doc.py:313
-msgid "Integer"
-msgstr "整数"
@@ -906 +917 @@
-msgstr "ブール値 (真: True または偽: False)"
-
-1
+2
-#, python-format
-msgid "String (up to %(maxlength)s)"
@@ -924 +935 @@
-
-#: contrib/admin/views/doc.py:297
+msgid "Decimal number"
+msgstr "10 進数 (小数可)"
+
+#: contrib/admin/views/doc.py:298
-msgid "E-mail address"
-msgstr "メールアドレス"
-
-8 contrib/admin/views/doc.py:299
-2
+9 contrib/admin/views/doc.py:300
+3
-msgid "File path"
-msgstr "ファイルの場所"
-
-0
-Decimal
-10 進数 (小数可)
-
-4
+1
+Floating point
+浮動小数点
+
+5
-msgid "IP address"
-msgstr "IP アドレス"
-
-6
+7
-msgid "Boolean (Either True, False or None)"
-msgstr "ブール値 (真: True 、偽: False または None)"
-
-7
+8
-msgid "Relation to parent model"
-msgstr "親モデルへのリレーション"
-
-8
+9
-msgid "Phone number"
-msgstr "電話番号"
-
-3
+4
-msgid "Text"
-msgstr "テキスト"
-
-4
+5
-msgid "Time"
-msgstr "時刻"
-
-5
+6
-msgid "URL"
-msgstr "URL"
-
-6
+7
-msgid "U.S. state (two uppercase letters)"
-msgstr "アメリカの州 (大文字二文字で)"
-
-7
+8
-msgid "XML text"
-msgstr "XMLテキスト"
-
-3
+4
-#, python-format
-msgid "%s does not appear to be a urlpattern object"
-msgstr "%s はurlpatternオブジェクトでは無いようです"
-
-3
+8
-msgid "Site administration"
-msgstr "サイト管理"
-
-1 contrib/admin/views/main.py:356
+6 contrib/admin/views/main.py:361
-#, python-format
-msgid "You may add another %s below."
-msgstr "続けて別の %s を追加できます。"
-
-89
+94
-#, python-format
-msgid "Add %s"
-msgstr "%s を追加"
-
-35
+40
-#, python-format
-msgid "Added %s."
-msgstr "%s を追加しました。"
-
-35 contrib/admin/views/main.py:337
-39
+40 contrib/admin/views/main.py:342
+44
-msgid "and"
-msgstr "と"
-
-37
+42
-#, python-format
-msgid "Changed %s."
-msgstr "%s を変更しました。"
-
-39
+44
-#, python-format
-msgid "Deleted %s."
-msgstr "%s を削除しました。"
-
-2
+7
-msgid "No fields changed."
-msgstr "変更はありませんでした。"
-
-45
+50
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" を変更しました。"
-
-3
+8
-#, python-format
-msgid ""
@@ -1026 +1041 @@
-msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。"
-
-1
+6
-#, python-format
-msgid "Change %s"
-msgstr "%s を変更"
-
-76
+81
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s"
-
-1
+6
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
-
-4
+8
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" を削除しました。"
-
-17
+21
-msgid "Are you sure?"
-msgstr "よろしいですか？"
-
-39
+43
-#, python-format
-msgid "Change history: %s"
-msgstr "変更履歴: %s"
-
-3
+7
-#, python-format
-msgid "Select %s"
-msgstr "%s を選択"
-
-3
+7
-#, python-format
-msgid "Select %s to change"
-msgstr "変更する %s を選択"
-
-68
+72
-msgid "Database error"
-msgstr "データベースエラー"
@@ -1089 +1104 @@
-msgstr "アカウントが無効です。"
-
-5
+4
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
@@ -1103 +1118 @@
-msgstr "元のパスワードが間違っています。もう一度入力してください。"
-
-38 contrib/auth/models.py:57
+49 contrib/auth/models.py:69
-msgid "name"
-msgstr "名前"
-
-40
+51
-msgid "codename"
-msgstr "コード名"
-
-42
+54
-msgid "permission"
-msgstr "パーミッション"
-
-43 contrib/auth/models.py:58
+55 contrib/auth/models.py:70
-msgid "permissions"
-msgstr "パーミッション"
-
-60
+73
-msgid "group"
-msgstr "グループ"
-
-61 contrib/auth/models.py:100
+74 contrib/auth/models.py:114
-msgid "groups"
-msgstr "グループ"
-
-90
+104
-msgid "username"
-msgstr "ユーザ名"
-
-90
+104
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
@@ -1139 +1154 @@
-"下にしてください。"
-
-91
+105
-msgid "first name"
-msgstr "名"
-
-92
+106
-msgid "last name"
-msgstr "姓"
-
-93
+107
-msgid "e-mail address"
-msgstr "メールアドレス"
-
-94
+108
-msgid "password"
-msgstr "パスワード"
-
-94
+108
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
@@ -1163 +1178 @@
-"ム</a>を使ってください。"
-
-95
+109
-msgid "staff status"
-msgstr "スタッフ権限"
-
-95
+109
-msgid "Designates whether the user can log into this admin site."
-msgstr "ユーザが管理サイトにログイン可能かどうかを示します。"
-
-96
+110
-msgid "active"
-msgstr "有効"
-
-96
+110
-msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
@@ -1181 +1196 @@
-msgstr "ユーザが管理サイトにログイン可能かどうかを示します。"
-
-97
+111
-msgid "superuser status"
-msgstr "スーパーユーザ権限"
-
-97
+111
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
@@ -1191 +1206 @@
-msgstr "全ての権限を持っているとみなされます。"
-
-98
+112
-msgid "last login"
-msgstr "最終ログイン"
-
-99
+113
-msgid "date joined"
-msgstr "登録日"
-
-01
+15
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
@@ -1207 +1222 @@
-"パーミッションを獲得します。"
-
-02
+16
-msgid "user permissions"
-msgstr "ユーザパーミッション"
-
-05
+20
-msgid "user"
-msgstr "ユーザ"
-
-06
+21
-msgid "users"
-msgstr "ユーザ"
-
-11
+27
-msgid "Personal info"
-msgstr "個人情報"
-
-12
+28
-msgid "Permissions"
-msgstr "パーミッション"
-
-13
+29
-msgid "Important dates"
-msgstr "重要な日程"
-
-14
+30
-msgid "Groups"
-msgstr "グループ"
-
-58
+72
-msgid "message"
-msgstr "メッセージ"
-
-
+
+
+
+
+
-msgid "Logged out"
-msgstr "ログアウト"
@@ -1661 +1680 @@
-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
@@ -1858 +2126 @@
-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."
-
-
-
+
+
+
+
+
-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
@@ -1930 +2208 @@
-msgstr "サイト"
-
-4
+5
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "半角の英数字およびアンダースコア以外は使用できません。"
-
-8
+9
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
@@ -1941 +2219 @@
-"半角の英数字、アンダースコア、ダッシュ、スラッシュ以外は使用できません。"
-
-2
+3
-msgid "This value must contain only letters, numbers, underscores or hyphens."
-msgstr "半角の英数字、アンダースコア、ハイフン以外は使用できません。"
-
-6
+7
-msgid "Uppercase letters are not allowed here."
-msgstr "大文字はここでは使用できません。"
-
-0
+1
-msgid "Lowercase letters are not allowed here."
-msgstr "小文字はここでは使用できません。"
-
-7
+8
-msgid "Enter only digits separated by commas."