Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #8176 -- Updated Japanese translation from Takashi Matsuo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 400a6b23cf07b83b97f515cf23ee9ab5853f38bc 1 parent 342f9f0
Malcolm Tredinnick authored August 09, 2008
1  AUTHORS
@@ -266,6 +266,7 @@ answer newbie questions, and generally made Django that much better:
266 266
     Marijn Vriens <marijn@metronomo.cl>
267 267
     mark@junklight.com
268 268
     Orestis Markou <orestis@orestis.gr>
  269
+    Takashi Matsuo <matsuo.takashi@gmail.com>
269 270
     Yasushi Masuda <whosaysni@gmail.com>
270 271
     mattycakes@gmail.com
271 272
     Jason McBrayer <http://www.carcosa.net/jason/>
BIN  django/conf/locale/ja/LC_MESSAGES/django.mo
Binary file not shown
1,508  django/conf/locale/ja/LC_MESSAGES/django.po
... ...
@@ -1,196 +1,210 @@
1 1
 # Translation of django.po to japanese.
2  
-# Copyright (C) 2005,2006,2007 makoto tsuyuki
3  
-# This file is distributed under the same license as the PACKAGE package.
4 2
 #
5 3
 msgid ""
6 4
 msgstr ""
7 5
 "Project-Id-Version: Django\n"
8 6
 "Report-Msgid-Bugs-To: \n"
9  
-"POT-Creation-Date: 2007-12-31 21:26+0900\n"
10  
-"PO-Revision-Date: 2006-05-18 00:28+0900\n"
11  
-"Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
  7
+"POT-Creation-Date: 2008-08-09 09:58+0900\n"
  8
+"PO-Revision-Date: 2008-08-09 09:59+0900\n"
  9
+"Last-Translator: Takashi Matsuo <matsuo.takashi@gmail.com>\n"
12 10
 "Language-Team: Japanese <django-ja@googlegroups.com>\n"
13 11
 "MIME-Version: 1.0\n"
14 12
 "Content-Type: text/plain; charset=UTF-8\n"
15 13
 "Content-Transfer-Encoding: 8bit\n"
16 14
 
17  
-#: conf/global_settings.py:39
  15
+#: conf/global_settings.py:44
18 16
 msgid "Arabic"
19 17
 msgstr "アラビア語"
20 18
 
21  
-#: conf/global_settings.py:40
  19
+#: conf/global_settings.py:45
22 20
 msgid "Bengali"
23 21
 msgstr "ベンガル語"
24 22
 
25  
-#: conf/global_settings.py:41
  23
+#: conf/global_settings.py:46
26 24
 msgid "Bulgarian"
27 25
 msgstr "ブルガリア語"
28 26
 
29  
-#: conf/global_settings.py:42
  27
+#: conf/global_settings.py:47
30 28
 msgid "Catalan"
31 29
 msgstr "カタロニア語"
32 30
 
33  
-#: conf/global_settings.py:43
  31
+#: conf/global_settings.py:48
34 32
 msgid "Czech"
35 33
 msgstr "チェコ語"
36 34
 
37  
-#: conf/global_settings.py:44
  35
+#: conf/global_settings.py:49
38 36
 msgid "Welsh"
39 37
 msgstr "ウェールズ語"
40 38
 
41  
-#: conf/global_settings.py:45
  39
+#: conf/global_settings.py:50
42 40
 msgid "Danish"
43 41
 msgstr "デンマーク語"
44 42
 
45  
-#: conf/global_settings.py:46
  43
+#: conf/global_settings.py:51
46 44
 msgid "German"
47 45
 msgstr "ドイツ語"
48 46
 
49  
-#: conf/global_settings.py:47
  47
+#: conf/global_settings.py:52
50 48
 msgid "Greek"
51 49
 msgstr "ギリシャ語"
52 50
 
53  
-#: conf/global_settings.py:48
  51
+#: conf/global_settings.py:53
54 52
 msgid "English"
55 53
 msgstr "英語"
56 54
 
57  
-#: conf/global_settings.py:49
  55
+#: conf/global_settings.py:54
58 56
 msgid "Spanish"
59 57
 msgstr "スペイン語"
60 58
 
61  
-#: conf/global_settings.py:50
  59
+#: conf/global_settings.py:55
  60
+msgid "Estonian"
  61
+msgstr "エストニア語"
  62
+
  63
+#: conf/global_settings.py:56
62 64
 msgid "Argentinean Spanish"
63 65
 msgstr "アルゼンチンスペイン語"
64 66
 
65  
-#: conf/global_settings.py:51
  67
+#: conf/global_settings.py:57
  68
+msgid "Basque"
  69
+msgstr "バスク語"
  70
+
  71
+#: conf/global_settings.py:58
66 72
 msgid "Persian"
67 73
 msgstr "ペルシア語"
68 74
 
69  
-#: conf/global_settings.py:52
  75
+#: conf/global_settings.py:59
70 76
 msgid "Finnish"
71 77
 msgstr "フィンランド語"
72 78
 
73  
-#: conf/global_settings.py:53
  79
+#: conf/global_settings.py:60
74 80
 msgid "French"
75 81
 msgstr "フランス語"
76 82
 
77  
-#: conf/global_settings.py:54
78  
-msgid "Gaeilge"
  83
+#: conf/global_settings.py:61
  84
+msgid "Irish"
79 85
 msgstr "アイルランド語"
80 86
 
81  
-#: conf/global_settings.py:55
  87
+#: conf/global_settings.py:62
82 88
 msgid "Galician"
83 89
 msgstr "ガリシア語"
84 90
 
85  
-#: conf/global_settings.py:56
  91
+#: conf/global_settings.py:63
86 92
 msgid "Hungarian"
87 93
 msgstr "ハンガリー語"
88 94
 
89  
-#: conf/global_settings.py:57
  95
+#: conf/global_settings.py:64
90 96
 msgid "Hebrew"
91 97
 msgstr "ヘブライ語"
92 98
 
93  
-#: conf/global_settings.py:58
  99
+#: conf/global_settings.py:65
94 100
 msgid "Croatian"
95 101
 msgstr "クロアチア語"
96 102
 
97  
-#: conf/global_settings.py:59
  103
+#: conf/global_settings.py:66
98 104
 msgid "Icelandic"
99 105
 msgstr "アイスランド語"
100 106
 
101  
-#: conf/global_settings.py:60
  107
+#: conf/global_settings.py:67
102 108
 msgid "Italian"
103 109
 msgstr "イタリア語"
104 110
 
105  
-#: conf/global_settings.py:61
  111
+#: conf/global_settings.py:68
106 112
 msgid "Japanese"
107 113
 msgstr "日本語"
108 114
 
109  
-#: conf/global_settings.py:62
  115
+#: conf/global_settings.py:69
  116
+msgid "Georgian"
  117
+msgstr "グルジア語"
  118
+
  119
+#: conf/global_settings.py:70
110 120
 msgid "Korean"
111 121
 msgstr "韓国語"
112 122
 
113  
-#: conf/global_settings.py:63
  123
+#: conf/global_settings.py:71
114 124
 msgid "Khmer"
115 125
 msgstr "クメール語"
116 126
 
117  
-#: conf/global_settings.py:64
  127
+#: conf/global_settings.py:72
118 128
 msgid "Kannada"
119 129
 msgstr "カンナダ語"
120 130
 
121  
-#: conf/global_settings.py:65
  131
+#: conf/global_settings.py:73
122 132
 msgid "Latvian"
123 133
 msgstr "ラトビア語"
124 134
 
125  
-#: conf/global_settings.py:66
  135
+#: conf/global_settings.py:74
  136
+msgid "Lithuanian"
  137
+msgstr "リトアニア語"
  138
+
  139
+#: conf/global_settings.py:75
126 140
 msgid "Macedonian"
127 141
 msgstr "マケドニア語"
128 142
 
129  
-#: conf/global_settings.py:67
  143
+#: conf/global_settings.py:76
130 144
 msgid "Dutch"
131 145
 msgstr "オランダ語"
132 146
 
133  
-#: conf/global_settings.py:68
  147
+#: conf/global_settings.py:77
134 148
 msgid "Norwegian"
135 149
 msgstr "ノルウェー語"
136 150
 
137  
-#: conf/global_settings.py:69
  151
+#: conf/global_settings.py:78
138 152
 msgid "Polish"
139 153
 msgstr "ポーランド語"
140 154
 
141  
-#: conf/global_settings.py:70
  155
+#: conf/global_settings.py:79
142 156
 msgid "Portugese"
143 157
 msgstr "ポルトガル語"
144 158
 
145  
-#: conf/global_settings.py:71
146  
-msgid "Brazilian"
147  
-msgstr "ブラジル語"
  159
+#: conf/global_settings.py:80
  160
+msgid "Brazilian Portuguese"
  161
+msgstr "ブラジルポルトガル語"
148 162
 
149  
-#: conf/global_settings.py:72
  163
+#: conf/global_settings.py:81
150 164
 msgid "Romanian"
151 165
 msgstr "ルーマニア語"
152 166
 
153  
-#: conf/global_settings.py:73
  167
+#: conf/global_settings.py:82
154 168
 msgid "Russian"
155 169
 msgstr "ロシア語"
156 170
 
157  
-#: conf/global_settings.py:74
  171
+#: conf/global_settings.py:83
158 172
 msgid "Slovak"
159 173
 msgstr "スロバキア語"
160 174
 
161  
-#: conf/global_settings.py:75
  175
+#: conf/global_settings.py:84
162 176
 msgid "Slovenian"
163 177
 msgstr "スロヴェニア語"
164 178
 
165  
-#: conf/global_settings.py:76
  179
+#: conf/global_settings.py:85
166 180
 msgid "Serbian"
167 181
 msgstr "セルビア語"
168 182
 
169  
-#: conf/global_settings.py:77
  183
+#: conf/global_settings.py:86
170 184
 msgid "Swedish"
171 185
 msgstr "スウェーデン語"
172 186
 
173  
-#: conf/global_settings.py:78
  187
+#: conf/global_settings.py:87
174 188
 msgid "Tamil"
175 189
 msgstr "タミル語"
176 190
 
177  
-#: conf/global_settings.py:79
  191
+#: conf/global_settings.py:88
178 192
 msgid "Telugu"
179 193
 msgstr "テルグ語"
180 194
 
181  
-#: conf/global_settings.py:80
  195
+#: conf/global_settings.py:89
182 196
 msgid "Turkish"
183 197
 msgstr "トルコ語"
184 198
 
185  
-#: conf/global_settings.py:81
  199
+#: conf/global_settings.py:90
186 200
 msgid "Ukrainian"
187 201
 msgstr "ウクライナ語"
188 202
 
189  
-#: conf/global_settings.py:82
  203
+#: conf/global_settings.py:91
190 204
 msgid "Simplified Chinese"
191 205
 msgstr "簡体字中国語"
192 206
 
193  
-#: conf/global_settings.py:83
  207
+#: conf/global_settings.py:92
194 208
 msgid "Traditional Chinese"
195 209
 msgstr "繁体字中国語"
196 210
 
@@ -228,49 +242,206 @@ msgstr "今月"
228 242
 msgid "This year"
229 243
 msgstr "今年"
230 244
 
231  
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
232  
-#: oldforms/__init__.py:592
  245
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
  246
+#: oldforms/__init__.py:588
233 247
 msgid "Yes"
234 248
 msgstr "はい"
235 249
 
236  
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
237  
-#: oldforms/__init__.py:592
  250
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
  251
+#: oldforms/__init__.py:588
238 252
 msgid "No"
239 253
 msgstr "いいえ"
240 254
 
241  
-#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
242  
-#: oldforms/__init__.py:592
  255
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:379
  256
+#: oldforms/__init__.py:588
243 257
 msgid "Unknown"
244 258
 msgstr "不明"
245 259
 
246  
-#: contrib/admin/models.py:18
  260
+#: contrib/admin/models.py:19
247 261
 msgid "action time"
248 262
 msgstr "操作時刻"
249 263
 
250  
-#: contrib/admin/models.py:21
  264
+#: contrib/admin/models.py:22
251 265
 msgid "object id"
252 266
 msgstr "オブジェクト ID"
253 267
 
254  
-#: contrib/admin/models.py:22
  268
+#: contrib/admin/models.py:23
255 269
 msgid "object repr"
256 270
 msgstr "オブジェクトの文字列表現"
257 271
 
258  
-#: contrib/admin/models.py:23
  272
+#: contrib/admin/models.py:24
259 273
 msgid "action flag"
260 274
 msgstr "操作種別"
261 275
 
262  
-#: contrib/admin/models.py:24
  276
+#: contrib/admin/models.py:25
263 277
 msgid "change message"
264 278
 msgstr "変更メッセージ"
265 279
 
266  
-#: contrib/admin/models.py:27
  280
+#: contrib/admin/models.py:28
267 281
 msgid "log entry"
268 282
 msgstr "ログエントリ"
269 283
 
270  
-#: contrib/admin/models.py:28
  284
+#: contrib/admin/models.py:29
271 285
 msgid "log entries"
272 286
 msgstr "ログエントリ"
273 287
 
  288
+#: contrib/admin/options.py:143 contrib/admin/options.py:202
  289
+msgid "None"
  290
+msgstr "None"
  291
+
  292
+#: contrib/admin/options.py:382 contrib/auth/admin.py:37
  293
+#, python-format
  294
+msgid "The %(name)s \"%(obj)s\" was added successfully."
  295
+msgstr "%(name)s \"%(obj)s\" を追加しました。"
  296
+
  297
+#: contrib/admin/options.py:386 contrib/admin/options.py:454
  298
+#: contrib/auth/admin.py:42
  299
+msgid "You may edit it again below."
  300
+msgstr "続けて編集できます。"
  301
+
  302
+#: contrib/admin/options.py:396 contrib/admin/options.py:463
  303
+#, python-format
  304
+msgid "You may add another %s below."
  305
+msgstr "続けて別の %s を追加できます。"
  306
+
  307
+#: contrib/admin/options.py:430
  308
+#, python-format
  309
+msgid "Changed %s."
  310
+msgstr "%s を変更しました。"
  311
+
  312
+#: contrib/admin/options.py:430 contrib/admin/options.py:440
  313
+#: core/validators.py:279 db/models/manipulators.py:305
  314
+msgid "and"
  315
+msgstr "と"
  316
+
  317
+#: contrib/admin/options.py:435
  318
+#, python-format
  319
+msgid "Added %(name)s \"%(object)s\"."
  320
+msgstr "%(name)s \"%(object)s\"を追加しました。"
  321
+
  322
+#: contrib/admin/options.py:439
  323
+#, python-format
  324
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
  325
+msgstr "%(name)s \"%(object)s\" の %(list)s を変更しました。"
  326
+
  327
+#: contrib/admin/options.py:444
  328
+#, python-format
  329
+msgid "Deleted %(name)s \"%(object)s\"."
  330
+msgstr "%(name)s \"%(object)s\" を削除しました。"
  331
+
  332
+#: contrib/admin/options.py:449
  333
+msgid "No fields changed."
  334
+msgstr "変更はありませんでした。"
  335
+
  336
+#: contrib/admin/options.py:452
  337
+#, python-format
  338
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
  339
+msgstr "%(name)s \"%(obj)s\" を変更しました。"
  340
+
  341
+#: contrib/admin/options.py:460
  342
+#, python-format
  343
+msgid ""
  344
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
  345
+msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。"
  346
+
  347
+#: contrib/admin/options.py:541
  348
+#, python-format
  349
+msgid "Add %s"
  350
+msgstr "%s を追加"
  351
+
  352
+#: contrib/admin/options.py:603
  353
+#, python-format
  354
+msgid "Change %s"
  355
+msgstr "%s を変更"
  356
+
  357
+#: contrib/admin/options.py:633
  358
+msgid "Database error"
  359
+msgstr "データベースエラー"
  360
+
  361
+#: contrib/admin/options.py:682
  362
+#, python-format
  363
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
  364
+msgstr "%(name)s \"%(obj)s\" を削除しました。"
  365
+
  366
+#: contrib/admin/options.py:688
  367
+msgid "Are you sure?"
  368
+msgstr "よろしいですか?"
  369
+
  370
+#: contrib/admin/options.py:715
  371
+#, python-format
  372
+msgid "Change history: %s"
  373
+msgstr "変更履歴: %s"
  374
+
  375
+#: contrib/admin/sites.py:17 contrib/admin/views/decorators.py:16
  376
+#: contrib/auth/forms.py:72 contrib/comments/views/comments.py:56
  377
+msgid ""
  378
+"Please enter a correct username and password. Note that both fields are case-"
  379
+"sensitive."
  380
+msgstr ""
  381
+"正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。"
  382
+
  383
+#: contrib/admin/sites.py:229 contrib/admin/views/decorators.py:68
  384
+msgid ""
  385
+"Please log in again, because your session has expired. Don't worry: Your "
  386
+"submission has been saved."
  387
+msgstr ""
  388
+"再ログインしてください。ログインセッションが有効期間切れしてしまいました。入"
  389
+"力データは失われておりませんのでご安心ください。"
  390
+
  391
+#: contrib/admin/sites.py:236 contrib/admin/views/decorators.py:75
  392
+msgid ""
  393
+"Looks like your browser isn't configured to accept cookies. Please enable "
  394
+"cookies, reload this page, and try again."
  395
+msgstr ""
  396
+"ブラウザがクッキーの使用を許可していないようです。クッキーの使用を許可して、"
  397
+"もう一度このページを表示してください。"
  398
+
  399
+#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
  400
+#: contrib/admin/views/decorators.py:92
  401
+msgid "Usernames cannot contain the '@' character."
  402
+msgstr "ユーザ名には '@' を含められません。"
  403
+
  404
+#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:88
  405
+#, python-format
  406
+msgid "Your e-mail address is not your username. Try '%s' instead."
  407
+msgstr "メールアドレスはユーザ名ではありません。 '%s' を試してみてください。"
  408
+
  409
+#: contrib/admin/sites.py:321
  410
+msgid "Site administration"
  411
+msgstr "サイト管理"
  412
+
  413
+#: contrib/admin/sites.py:343 contrib/admin/templates/admin/login.html:27
  414
+#: contrib/admin/templates/registration/password_reset_complete.html:14
  415
+#: contrib/admin/views/decorators.py:30
  416
+msgid "Log in"
  417
+msgstr "ログイン"
  418
+
  419
+#: contrib/admin/util.py:126
  420
+#, python-format
  421
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
  422
+msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s"
  423
+
  424
+#: contrib/admin/util.py:131
  425
+#, python-format
  426
+msgid "One or more %(fieldname)s in %(name)s:"
  427
+msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
  428
+
  429
+#: contrib/admin/widgets.py:65
  430
+msgid "Date:"
  431
+msgstr "日付:"
  432
+
  433
+#: contrib/admin/widgets.py:65
  434
+msgid "Time:"
  435
+msgstr "時刻:"
  436
+
  437
+#: contrib/admin/widgets.py:89
  438
+msgid "Currently:"
  439
+msgstr "現在:"
  440
+
  441
+#: contrib/admin/widgets.py:89
  442
+msgid "Change:"
  443
+msgstr "変更:"
  444
+
274 445
 #: contrib/admin/templates/admin/404.html:4
275 446
 #: contrib/admin/templates/admin/404.html:8
276 447
 msgid "Page not found"
@@ -281,17 +452,19 @@ msgid "We're sorry, but the requested page could not be found."
281 452
 msgstr "申し訳ありませんが、お探しのページは見つかりませんでした。"
282 453
 
283 454
 #: contrib/admin/templates/admin/500.html:4
284  
-#: contrib/admin/templates/admin/base.html:37
285  
-#: contrib/admin/templates/admin/change_form.html:12
286  
-#: contrib/admin/templates/admin/change_list.html:5
287  
-#: contrib/admin/templates/admin/delete_confirmation.html:5
  455
+#: contrib/admin/templates/admin/base.html:30
  456
+#: contrib/admin/templates/admin/change_form.html:17
  457
+#: contrib/admin/templates/admin/change_list.html:8
  458
+#: contrib/admin/templates/admin/delete_confirmation.html:6
288 459
 #: contrib/admin/templates/admin/invalid_setup.html:4
289  
-#: contrib/admin/templates/admin/object_history.html:4
290  
-#: contrib/admin/templates/admin/auth/user/change_password.html:11
  460
+#: contrib/admin/templates/admin/object_history.html:5
  461
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
291 462
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
292 463
 #: contrib/admin/templates/registration/logged_out.html:4
293  
-#: contrib/admin/templates/registration/password_change_done.html:3
294  
-#: contrib/admin/templates/registration/password_change_form.html:3
  464
+#: contrib/admin/templates/registration/password_change_done.html:4
  465
+#: contrib/admin/templates/registration/password_change_form.html:4
  466
+#: contrib/admin/templates/registration/password_reset_complete.html:4
  467
+#: contrib/admin/templates/registration/password_reset_confirm.html:4
295 468
 #: contrib/admin/templates/registration/password_reset_done.html:4
296 469
 #: contrib/admin/templates/registration/password_reset_form.html:4
297 470
 msgid "Home"
@@ -317,22 +490,28 @@ msgstr ""
317 490
 "エラーが発生しました。エラーをサイトの管理者にメールで報告しましたので、近い"
318 491
 "うちに修正されるはずです。しばらくお待ちください。"
319 492
 
320  
-#: contrib/admin/templates/admin/base.html:26
  493
+#: contrib/admin/templates/admin/base.html:25
321 494
 msgid "Welcome,"
322 495
 msgstr "ようこそ"
323 496
 
324  
-#: contrib/admin/templates/admin/base.html:28
  497
+#: contrib/admin/templates/admin/base.html:25
325 498
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
  499
+#: contrib/admin/templates/registration/password_change_done.html:3
  500
+#: contrib/admin/templates/registration/password_change_form.html:3
326 501
 msgid "Documentation"
327 502
 msgstr "ドキュメント"
328 503
 
329  
-#: contrib/admin/templates/admin/base.html:29
330  
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
331  
-#: contrib/admin/templates/admin/auth/user/change_password.html:45
  504
+#: contrib/admin/templates/admin/base.html:25
  505
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
  506
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
  507
+#: contrib/admin/templates/registration/password_change_done.html:3
  508
+#: contrib/admin/templates/registration/password_change_form.html:3
332 509
 msgid "Change password"
333 510
 msgstr "パスワードの変更"
334 511
 
335  
-#: contrib/admin/templates/admin/base.html:30
  512
+#: contrib/admin/templates/admin/base.html:25
  513
+#: contrib/admin/templates/registration/password_change_done.html:3
  514
+#: contrib/admin/templates/registration/password_change_form.html:3
336 515
 #: contrib/comments/templates/comments/form.html:6
337 516
 msgid "Log out"
338 517
 msgstr "ログアウト"
@@ -345,46 +524,42 @@ msgstr "Django サイト管理"
345 524
 msgid "Django administration"
346 525
 msgstr "Django 管理サイト"
347 526
 
348  
-#: contrib/admin/templates/admin/change_form.html:14
349  
-#: contrib/admin/templates/admin/index.html:28
  527
+#: contrib/admin/templates/admin/change_form.html:19
  528
+#: contrib/admin/templates/admin/index.html:29
350 529
 msgid "Add"
351 530
 msgstr "追加"
352 531
 
353  
-#: contrib/admin/templates/admin/change_form.html:20
354  
-#: contrib/admin/templates/admin/object_history.html:4
  532
+#: contrib/admin/templates/admin/change_form.html:26
  533
+#: contrib/admin/templates/admin/object_history.html:5
355 534
 msgid "History"
356 535
 msgstr "履歴"
357 536
 
358  
-#: contrib/admin/templates/admin/change_form.html:21
  537
+#: contrib/admin/templates/admin/change_form.html:27
359 538
 msgid "View on site"
360 539
 msgstr "サイト上で表示"
361 540
 
362  
-#: contrib/admin/templates/admin/change_form.html:31
363  
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
  541
+#: contrib/admin/templates/admin/change_form.html:37
  542
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
364 543
 msgid "Please correct the error below."
365 544
 msgid_plural "Please correct the errors below."
366 545
 msgstr[0] "下記のエラーを修正してください。"
367  
-msgstr[1] "下記のエラーを修正してください。"
368  
-
369  
-#: contrib/admin/templates/admin/change_form.html:49
370  
-msgid "Ordering"
371  
-msgstr "順序"
372 546
 
373  
-#: contrib/admin/templates/admin/change_form.html:52
374  
-msgid "Order:"
375  
-msgstr "並び変え:"
376  
-
377  
-#: contrib/admin/templates/admin/change_list.html:11
  547
+#: contrib/admin/templates/admin/change_list.html:16
378 548
 #, python-format
379 549
 msgid "Add %(name)s"
380 550
 msgstr "%(name)s を追加"
381 551
 
382  
-#: contrib/admin/templates/admin/delete_confirmation.html:8
  552
+#: contrib/admin/templates/admin/change_list.html:26
  553
+msgid "Filter"
  554
+msgstr "フィルタ"
  555
+
  556
+#: contrib/admin/templates/admin/delete_confirmation.html:9
383 557
 #: contrib/admin/templates/admin/submit_line.html:3
  558
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
384 559
 msgid "Delete"
385 560
 msgstr "削除"
386 561
 
387  
-#: contrib/admin/templates/admin/delete_confirmation.html:13
  562
+#: contrib/admin/templates/admin/delete_confirmation.html:15
388 563
 #, python-format
389 564
 msgid ""
390 565
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -395,7 +570,7 @@ msgstr ""
395 570
 "除しようとしましたが、あなたのアカウントには以下のタイプのオブジェクトを削除"
396 571
 "するパーミッションがありません:"
397 572
 
398  
-#: contrib/admin/templates/admin/delete_confirmation.html:20
  573
+#: contrib/admin/templates/admin/delete_confirmation.html:22
399 574
 #, python-format
400 575
 msgid ""
401 576
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -404,7 +579,7 @@ msgstr ""
404 579
 "%(object_name)s \"%(escaped_object)s\"を削除しますか? 関連づけられている以下"
405 580
 "のオブジェクトも全て削除されます:"
406 581
 
407  
-#: contrib/admin/templates/admin/delete_confirmation.html:25
  582
+#: contrib/admin/templates/admin/delete_confirmation.html:27
408 583
 msgid "Yes, I'm sure"
409 584
 msgstr "はい。"
410 585
 
@@ -413,41 +588,37 @@ msgstr "はい。"
413 588
 msgid " By %(filter_title)s "
414 589
 msgstr "%(filter_title)s で絞り込む"
415 590
 
416  
-#: contrib/admin/templates/admin/filters.html:4
417  
-msgid "Filter"
418  
-msgstr "フィルタ"
419  
-
420  
-#: contrib/admin/templates/admin/index.html:17
  591
+#: contrib/admin/templates/admin/index.html:18
421 592
 #, python-format
422 593
 msgid "Models available in the %(name)s application."
423 594
 msgstr "%(name)s アプリケーションで利用可能なモデル"
424 595
 
425  
-#: contrib/admin/templates/admin/index.html:18
  596
+#: contrib/admin/templates/admin/index.html:19
426 597
 #, python-format
427 598
 msgid "%(name)s"
428 599
 msgstr "%(name)s"
429 600
 
430  
-#: contrib/admin/templates/admin/index.html:34
  601
+#: contrib/admin/templates/admin/index.html:35
431 602
 msgid "Change"
432 603
 msgstr "変更"
433 604
 
434  
-#: contrib/admin/templates/admin/index.html:44
  605
+#: contrib/admin/templates/admin/index.html:45
435 606
 msgid "You don't have permission to edit anything."
436 607
 msgstr "変更のためのパーミッションがありません。"
437 608
 
438  
-#: contrib/admin/templates/admin/index.html:52
  609
+#: contrib/admin/templates/admin/index.html:53
439 610
 msgid "Recent Actions"
440 611
 msgstr "最近行った操作"
441 612
 
442  
-#: contrib/admin/templates/admin/index.html:53
  613
+#: contrib/admin/templates/admin/index.html:54
443 614
 msgid "My Actions"
444 615
 msgstr "操作"
445 616
 
446  
-#: contrib/admin/templates/admin/index.html:57
  617
+#: contrib/admin/templates/admin/index.html:58
447 618
 msgid "None available"
448 619
 msgstr "利用不可"
449 620
 
450  
-#: contrib/admin/templates/admin/invalid_setup.html:8
  621
+#: contrib/admin/templates/admin/invalid_setup.html:7
451 622
 msgid ""
452 623
 "Something's wrong with your database installation. Make sure the appropriate "
453 624
 "database tables have been created, and make sure the database is readable by "
@@ -456,39 +627,34 @@ msgstr ""
456 627
 "データベースの設定に問題があるようです。適切なテーブルが作られていること、適"
457 628
 "切なユーザでデータベースのデータを読み込めることを確認してください。"
458 629
 
459  
-#: contrib/admin/templates/admin/login.html:17
  630
+#: contrib/admin/templates/admin/login.html:19
460 631
 #: contrib/comments/templates/comments/form.html:6
461 632
 #: contrib/comments/templates/comments/form.html:8
462 633
 msgid "Username:"
463 634
 msgstr "ユーザ名:"
464 635
 
465  
-#: contrib/admin/templates/admin/login.html:20
  636
+#: contrib/admin/templates/admin/login.html:22
466 637
 #: contrib/comments/templates/comments/form.html:8
467 638
 msgid "Password:"
468 639
 msgstr "パスワード:"
469 640
 
470  
-#: contrib/admin/templates/admin/login.html:25
471  
-#: contrib/admin/views/decorators.py:25
472  
-msgid "Log in"
473  
-msgstr "ログイン"
474  
-
475  
-#: contrib/admin/templates/admin/object_history.html:17
  641
+#: contrib/admin/templates/admin/object_history.html:16
476 642
 msgid "Date/time"
477 643
 msgstr "日付/時刻"
478 644
 
479  
-#: contrib/admin/templates/admin/object_history.html:18
  645
+#: contrib/admin/templates/admin/object_history.html:17
480 646
 msgid "User"
481 647
 msgstr "ユーザ"
482 648
 
483  
-#: contrib/admin/templates/admin/object_history.html:19
  649
+#: contrib/admin/templates/admin/object_history.html:18
484 650
 msgid "Action"
485 651
 msgstr "操作"
486 652
 
487  
-#: contrib/admin/templates/admin/object_history.html:25
  653
+#: contrib/admin/templates/admin/object_history.html:24
488 654
 msgid "DATE_WITH_TIME_FULL"
489 655
 msgstr "Y/m/d H:i:s"
490 656
 
491  
-#: contrib/admin/templates/admin/object_history.html:35
  657
+#: contrib/admin/templates/admin/object_history.html:32
492 658
 msgid ""
493 659
 "This object doesn't have a change history. It probably wasn't added via this "
494 660
 "admin site."
@@ -508,8 +674,7 @@ msgstr "検索"
508 674
 #, python-format
509 675
 msgid "1 result"
510 676
 msgid_plural "%(counter)s results"
511  
-msgstr[0] "1 件"
512  
-msgstr[1] "%(counter)s 件"
  677
+msgstr[0] "%(counter)s 件"
513 678
 
514 679
 #: contrib/admin/templates/admin/search_form.html:10
515 680
 #, python-format
@@ -540,26 +705,29 @@ msgstr ""
540 705
 "まずユーザ名とパスワードを登録してください。その後詳細情報が編集可能になりま"
541 706
 "す。"
542 707
 
543  
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
  708
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
  709
+#: contrib/auth/forms.py:14 contrib/auth/forms.py:51
544 710
 msgid "Username"
545 711
 msgstr "ユーザ名"
546 712
 
547  
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
  713
+#: contrib/admin/templates/admin/auth/user/add_form.html:20
548 714
 #: contrib/admin/templates/admin/auth/user/change_password.html:33
  715
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:52 contrib/auth/forms.py:176
549 716
 msgid "Password"
550 717
 msgstr "パスワード"
551 718
 
552  
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
553  
-#: contrib/admin/templates/admin/auth/user/change_password.html:38
  719
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
  720
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
  721
+#: contrib/auth/forms.py:177
554 722
 msgid "Password (again)"
555 723
 msgstr "パスワード(確認用)"
556 724
 
557  
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
558  
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
  725
+#: contrib/admin/templates/admin/auth/user/add_form.html:27
  726
+#: contrib/admin/templates/admin/auth/user/change_password.html:40
559 727
 msgid "Enter the same password as above, for verification."
560 728
 msgstr "確認のため、再度パスワードを入力してください。"
561 729
 
562  
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
  730
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
563 731
 #, python-format
564 732
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
565 733
 msgstr ""
@@ -638,23 +806,23 @@ msgstr "ご利用ありがとうございました。"
638 806
 msgid "Log in again"
639 807
 msgstr "もう一度ログイン"
640 808
 
641  
-#: contrib/admin/templates/registration/password_change_done.html:3
642  
-#: contrib/admin/templates/registration/password_change_form.html:3
643  
-#: contrib/admin/templates/registration/password_change_form.html:5
644  
-#: contrib/admin/templates/registration/password_change_form.html:9
  809
+#: contrib/admin/templates/registration/password_change_done.html:4
  810
+#: contrib/admin/templates/registration/password_change_form.html:4
  811
+#: contrib/admin/templates/registration/password_change_form.html:6
  812
+#: contrib/admin/templates/registration/password_change_form.html:10
645 813
 msgid "Password change"
646 814
 msgstr "パスワードの変更"
647 815
 
648  
-#: contrib/admin/templates/registration/password_change_done.html:5
649  
-#: contrib/admin/templates/registration/password_change_done.html:9
  816
+#: contrib/admin/templates/registration/password_change_done.html:6
  817
+#: contrib/admin/templates/registration/password_change_done.html:10
650 818
 msgid "Password change successful"
651 819
 msgstr "パスワードを変更しました"
652 820
 
653  
-#: contrib/admin/templates/registration/password_change_done.html:11
  821
+#: contrib/admin/templates/registration/password_change_done.html:12
654 822
 msgid "Your password was changed."
655 823
 msgstr "あなたのパスワードは変更されました"
656 824
 
657  
-#: contrib/admin/templates/registration/password_change_form.html:11
  825
+#: contrib/admin/templates/registration/password_change_form.html:12
658 826
 msgid ""
659 827
 "Please enter your old password, for security's sake, and then enter your new "
660 828
 "password twice so we can verify you typed it in correctly."
@@ -662,22 +830,27 @@ msgstr ""
662 830
 "セキュリティ上の理由から元のパスワードの入力が必要です。新しいパスワードは正"
663 831
 "しく入力したか確認できるように二度入力してください。"
664 832
 
665  
-#: contrib/admin/templates/registration/password_change_form.html:16
  833
+#: contrib/admin/templates/registration/password_change_form.html:17
666 834
 msgid "Old password:"
667 835
 msgstr "元のパスワード:"
668 836
 
669  
-#: contrib/admin/templates/registration/password_change_form.html:18
  837
+#: contrib/admin/templates/registration/password_change_form.html:19
  838
+#: contrib/admin/templates/registration/password_reset_confirm.html:18
670 839
 msgid "New password:"
671 840
 msgstr "新しいパスワード:"
672 841
 
673  
-#: contrib/admin/templates/registration/password_change_form.html:20
  842
+#: contrib/admin/templates/registration/password_change_form.html:21
  843
+#: contrib/admin/templates/registration/password_reset_confirm.html:20
674 844
 msgid "Confirm password:"
675 845
 msgstr "新しいパスワード (確認用) :"
676 846
 
677  
-#: contrib/admin/templates/registration/password_change_form.html:22
  847
+#: contrib/admin/templates/registration/password_change_form.html:23
  848
+#: contrib/admin/templates/registration/password_reset_confirm.html:21
678 849
 msgid "Change my password"
679 850
 msgstr "パスワードの変更"
680 851
 
  852
+#: contrib/admin/templates/registration/password_reset_complete.html:4
  853
+#: contrib/admin/templates/registration/password_reset_confirm.html:6
681 854
 #: contrib/admin/templates/registration/password_reset_done.html:4
682 855
 #: contrib/admin/templates/registration/password_reset_form.html:4
683 856
 #: contrib/admin/templates/registration/password_reset_form.html:6
@@ -685,6 +858,41 @@ msgstr "パスワードの変更"
685 858
 msgid "Password reset"
686 859
 msgstr "パスワードをリセット"
687 860
 
  861
+#: contrib/admin/templates/registration/password_reset_complete.html:6
  862
+#: contrib/admin/templates/registration/password_reset_complete.html:10
  863
+msgid "Password reset complete"
  864
+msgstr "パスワードがリセットされました"
  865
+
  866
+#: contrib/admin/templates/registration/password_reset_complete.html:12
  867
+msgid "Your password has been set.  You may go ahead and log in now."
  868
+msgstr "パスワードがセットされました。ログインしてください。"
  869
+
  870
+#: contrib/admin/templates/registration/password_reset_confirm.html:4
  871
+msgid "Password reset confirmation"
  872
+msgstr "パスワードリセットの確認"
  873
+
  874
+#: contrib/admin/templates/registration/password_reset_confirm.html:12
  875
+msgid "Enter new password"
  876
+msgstr "新しいパスワードを入力してください"
  877
+
  878
+#: contrib/admin/templates/registration/password_reset_confirm.html:14
  879
+msgid ""
  880
+"Please enter your new password twice so we can verify you typed it in "
  881
+"correctly."
  882
+msgstr "確認のために、新しいパスワードを二回入力してください。"
  883
+
  884
+#: contrib/admin/templates/registration/password_reset_confirm.html:26
  885
+msgid "Password reset unsuccessful"
  886
+msgstr "パスワードのリセットに失敗しました"
  887
+
  888
+#: contrib/admin/templates/registration/password_reset_confirm.html:28
  889
+msgid ""
  890
+"The password reset link was invalid, possibly because it has already been "
  891
+"used.  Please request a new password reset."
  892
+msgstr ""
  893
+"パスワードリセットのリンクが不正です。おそらくこのリンクは既に使われていま"
  894
+"す。もう一度パスワードリセットしてください。"
  895
+
688 896
 #: contrib/admin/templates/registration/password_reset_done.html:6
689 897
 #: contrib/admin/templates/registration/password_reset_done.html:10
690 898
 msgid "Password reset successful"
@@ -692,11 +900,11 @@ msgstr "パスワードをリセットしました"
692 900
 
693 901
 #: contrib/admin/templates/registration/password_reset_done.html:12
694 902
 msgid ""
695  
-"We've e-mailed a new password to the e-mail address you submitted. You "
696  
-"should be receiving it shortly."
  903
+"We've e-mailed you instructions for setting your password to the e-mail "
  904
+"address you submitted. You should be receiving it shortly."
697 905
 msgstr ""
698  
-"登録されているメールアドレスに新しいパスワードを送信しました。まもなく届くで"
699  
-"しょう。"
  906
+"登録されているメールアドレスにパスワードリセットの方法を送信しました。まもな"
  907
+"く届くでしょう。"
700 908
 
701 909
 #: contrib/admin/templates/registration/password_reset_email.html:2
702 910
 msgid "You're receiving this e-mail because you requested a password reset"
@@ -710,34 +918,29 @@ msgid "for your user account at %(site_name)s"
710 918
 msgstr "リセットされたのは %(site_name)s のアカウントです。"
711 919
 
712 920
 #: contrib/admin/templates/registration/password_reset_email.html:5
713  
-#, python-format
714  
-msgid "Your new password is: %(new_password)s"
715  
-msgstr "新しいパスワード: %(new_password)s"
716  
-
717  
-#: contrib/admin/templates/registration/password_reset_email.html:7
718  
-msgid "Feel free to change this password by going to this page:"
719  
-msgstr "パスワードは下記のページで自由に変更していただけます:"
  921
+msgid "Please go to the following page and choose a new password:"
  922
+msgstr "次のページで新しいパスワードを選んでください:"
720 923
 
721  
-#: contrib/admin/templates/registration/password_reset_email.html:11
  924
+#: contrib/admin/templates/registration/password_reset_email.html:9
722 925
 msgid "Your username, in case you've forgotten:"
723 926
 msgstr "あなたのユーザ名 (念のため):"
724 927
 
725  
-#: contrib/admin/templates/registration/password_reset_email.html:13
  928
+#: contrib/admin/templates/registration/password_reset_email.html:11
726 929
 msgid "Thanks for using our site!"
727 930
 msgstr "ご利用ありがとうございました!"
728 931
 
729  
-#: contrib/admin/templates/registration/password_reset_email.html:15
  932
+#: contrib/admin/templates/registration/password_reset_email.html:13
730 933
 #, python-format
731 934
 msgid "The %(site_name)s team"
732 935
 msgstr " %(site_name)s チーム"
733 936
 
734 937
 #: contrib/admin/templates/registration/password_reset_form.html:12
735 938
 msgid ""
736  
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
737  
-"your password and e-mail the new one to you."
  939
+"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
  940
+"instructions for setting a new one."
738 941
 msgstr ""
739  
-"パスワードをお忘れですか?メールアドレスを入力してください。パスワードをリ"
740  
-"セットして、新しいパスワードをメールでお知らせします。"
  942
+"パスワードをお忘れですか?メールアドレスを入力してください。パスワードのリ"
  943
+"セット方法をメールでお知らせします。"
741 944
 
742 945
 #: contrib/admin/templates/registration/password_reset_form.html:16
743 946
 msgid "E-mail address:"
@@ -747,323 +950,211 @@ msgstr "メールアドレス"
747 950
 msgid "Reset my password"
748 951
 msgstr "パスワードをリセット"
749 952
 
750  
-#: contrib/admin/templates/widget/date_time.html:3
751  
-msgid "Date:"
752  
-msgstr "日付:"
753  
-
754  
-#: contrib/admin/templates/widget/date_time.html:4
755  
-msgid "Time:"
756  
-msgstr "時刻:"
757  
-
758  
-#: contrib/admin/templates/widget/file.html:2
759  
-msgid "Currently:"
760  
-msgstr "現在:"
761  
-
762  
-#: contrib/admin/templates/widget/file.html:3
763  
-msgid "Change:"
764  
-msgstr "変更:"
765  
-
766 953
 #: contrib/admin/templatetags/admin_list.py:257
767 954
 msgid "All dates"
768 955
 msgstr "いつでも"
769 956
 
770  
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
  957
+#: contrib/admin/views/main.py:65
771 958
 #, python-format
772  
-msgid "The %(name)s \"%(obj)s\" was added successfully."
773  
-msgstr "%(name)s \"%(obj)s\" を追加しました。"
774  
-
775  
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
776  
-#: contrib/admin/views/main.py:356
777  
-msgid "You may edit it again below."
778  
-msgstr "続けて編集できます。"
779  
-
780  
-#: contrib/admin/views/auth.py:31
781  
-msgid "Add user"
782  
-msgstr "ユーザを追加"
783  
-
784  
-#: contrib/admin/views/auth.py:58
785  
-msgid "Password changed successfully."
786  
-msgstr "パスワードを変更しました"
787  
-
788  
-#: contrib/admin/views/auth.py:65
789  
-#, python-format
790  
-msgid "Change password: %s"
791  
-msgstr "パスワードの変更: %s"
792  
-
793  
-#: contrib/admin/views/decorators.py:11 contrib/auth/forms.py:60
794  
-msgid ""
795  
-"Please enter a correct username and password. Note that both fields are case-"
796  
-"sensitive."
797  
-msgstr ""
798  
-"正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。"
799  
-
800  
-#: contrib/admin/views/decorators.py:63
801  
-msgid ""
802  
-"Please log in again, because your session has expired. Don't worry: Your "
803  
-"submission has been saved."
804  
-msgstr ""
805  
-"再ログインしてください。ログインセッションが有効期間切れしてしまいました。入"
806  
-"力データは失われておりませんのでご安心ください。"
807  
-
808  
-#: contrib/admin/views/decorators.py:70
809  
-msgid ""
810  
-"Looks like your browser isn't configured to accept cookies. Please enable "
811  
-"cookies, reload this page, and try again."
812  
-msgstr ""
813  
-"ブラウザがクッキーの使用を許可していないようです。クッキーの使用を許可して、"
814  
-"もう一度このページを表示してください。"
815  
-
816  
-#: contrib/admin/views/decorators.py:84
817  
-msgid "Usernames cannot contain the '@' character."
818  
-msgstr "ユーザ名には '@' を含められません。"
  959
+msgid "Select %s"
  960
+msgstr "%s を選択"
819 961
 
820  
-#: contrib/admin/views/decorators.py:86
821  
-#, python-format
822  
-msgid "Your e-mail address is not your username. Try '%s' instead."
823  
-msgstr "メールアドレスはユーザ名ではありません。 '%s' を試してみてください。"
  962
+#: contrib/admin/views/main.py:65
  963
+#, python-format
  964
+msgid "Select %s to change"
  965
+msgstr "変更する %s を選択"
824 966
 
825  
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
826  
-#: contrib/admin/views/doc.py:52
  967
+#: contrib/admindocs/views.py:53 contrib/admindocs/views.py:55
  968
+#: contrib/admindocs/views.py:57
827 969
 msgid "tag:"
828 970
 msgstr "タグ"
829 971
 
830  
-#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
831  
-#: contrib/admin/views/doc.py:83
  972
+#: contrib/admindocs/views.py:87 contrib/admindocs/views.py:89
  973
+#: contrib/admindocs/views.py:91
832 974
 msgid "filter:"
833 975
 msgstr "フィルタ"
834 976
 
835  
-#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
836  
-#: contrib/admin/views/doc.py:141
  977
+#: contrib/admindocs/views.py:153 contrib/admindocs/views.py:155
  978
+#: contrib/admindocs/views.py:157
837 979
 msgid "view:"
838 980
 msgstr "ビュー"
839 981
 
840  
-#: contrib/admin/views/doc.py:166
  982
+#: contrib/admindocs/views.py:187
841 983
 #, python-format
842 984
 msgid "App %r not found"
843 985
 msgstr "アプリケーション %r が見つかりません"
844 986
 
845  
-#: contrib/admin/views/doc.py:173
  987
+#: contrib/admindocs/views.py:194
846 988
 #, python-format
847  
-msgid "Model %(name)r not found in app %(label)r"
848  
-msgstr "モデル %(name)r が %(label)r アプリケーションに見つかりません"
  989
+msgid "Model %(model_name)r not found in app %(app_label)r"
  990
+msgstr ""
  991
+"モデル %(model_name)r が %(app_label)r アプリケーションに見つかりません"
849 992
 
850  
-#: contrib/admin/views/doc.py:185
  993
+#: contrib/admindocs/views.py:206
851 994
 #, python-format
852  
-msgid "the related `%(label)s.%(type)s` object"
853  
-msgstr "`%(label)s.%(type)s` (関連オブジェクト)"
  995
+msgid "the related `%(app_label)s.%(data_type)s` object"
  996
+msgstr "`%(app_label)s.%(data_type)s` (関連オブジェクト)"