Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.0.X] Fixed #9569, #9636: Updated Simplified Chinese translation.

Backport of r9721 and r9722 from trunk (with makemessages re-run to ensure the
line numbers match on the branch).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 195a6ea7913fe436f30558ea0913a5ebe147b394 1 parent 2842f59
Malcolm Tredinnick authored January 08, 2009
BIN  django/conf/locale/zh_CN/LC_MESSAGES/django.mo
Binary file not shown
856  django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -4,8 +4,8 @@ msgid ""
4 4
 msgstr ""
5 5
 "Project-Id-Version: Django\n"
6 6
 "Report-Msgid-Bugs-To: \n"
7  
-"POT-Creation-Date: 2008-08-29 11:06-0700\n"
8  
-"PO-Revision-Date: 2008-09-01 15:13+0200\n"
  7
+"POT-Creation-Date: 2009-01-08 21:35+1100\n"
  8
+"PO-Revision-Date: 2008-11-19 17:38+0800\n"
9 9
 "Last-Translator: Liang Feng <hutuworm@gmail.com>\n"
10 10
 "Language-Team: Simplified Chinese <hutuworm@gmail.com>\n"
11 11
 "MIME-Version: 1.0\n"
@@ -101,114 +101,122 @@ msgid "Hebrew"
101 101
 msgstr "希伯来语"
102 102
 
103 103
 #: conf/global_settings.py:65
  104
+msgid "Hindi"
  105
+msgstr "北印度语"
  106
+
  107
+#: conf/global_settings.py:66
104 108
 msgid "Croatian"
105 109
 msgstr "克罗地亚语"
106 110
 
107  
-#: conf/global_settings.py:66
  111
+#: conf/global_settings.py:67
108 112
 msgid "Icelandic"
109 113
 msgstr "冰岛语"
110 114
 
111  
-#: conf/global_settings.py:67
  115
+#: conf/global_settings.py:68
112 116
 msgid "Italian"
113 117
 msgstr "意大利语"
114 118
 
115  
-#: conf/global_settings.py:68
  119
+#: conf/global_settings.py:69
116 120
 msgid "Japanese"
117 121
 msgstr "日语"
118 122
 
119  
-#: conf/global_settings.py:69
  123
+#: conf/global_settings.py:70
120 124
 msgid "Georgian"
121 125
 msgstr "格鲁吉亚语"
122 126
 
123  
-#: conf/global_settings.py:70
  127
+#: conf/global_settings.py:71
124 128
 msgid "Korean"
125 129
 msgstr "韩语"
126 130
 
127  
-#: conf/global_settings.py:71
  131
+#: conf/global_settings.py:72
128 132
 msgid "Khmer"
129 133
 msgstr "高棉语"
130 134
 
131  
-#: conf/global_settings.py:72
  135
+#: conf/global_settings.py:73
132 136
 msgid "Kannada"
133 137
 msgstr "埃纳德语"
134 138
 
135  
-#: conf/global_settings.py:73
  139
+#: conf/global_settings.py:74
136 140
 msgid "Latvian"
137 141
 msgstr "拉脱维亚语"
138 142
 
139  
-#: conf/global_settings.py:74
  143
+#: conf/global_settings.py:75
140 144
 msgid "Lithuanian"
141 145
 msgstr "立陶宛语"
142 146
 
143  
-#: conf/global_settings.py:75
  147
+#: conf/global_settings.py:76
144 148
 msgid "Macedonian"
145 149
 msgstr "马其顿语"
146 150
 
147  
-#: conf/global_settings.py:76
  151
+#: conf/global_settings.py:77
148 152
 msgid "Dutch"
149 153
 msgstr "荷兰语"
150 154
 
151  
-#: conf/global_settings.py:77
  155
+#: conf/global_settings.py:78
152 156
 msgid "Norwegian"
153 157
 msgstr "挪威语"
154 158
 
155  
-#: conf/global_settings.py:78
  159
+#: conf/global_settings.py:79
156 160
 msgid "Polish"
157 161
 msgstr "波兰语"
158 162
 
159  
-#: conf/global_settings.py:79
160  
-msgid "Portugese"
  163
+#: conf/global_settings.py:80
  164
+msgid "Portuguese"
161 165
 msgstr "葡萄牙语"
162 166
 
163  
-#: conf/global_settings.py:80
  167
+#: conf/global_settings.py:81
164 168
 msgid "Brazilian Portuguese"
165 169
 msgstr "巴西葡萄牙语"
166 170
 
167  
-#: conf/global_settings.py:81
  171
+#: conf/global_settings.py:82
168 172
 msgid "Romanian"
169 173
 msgstr "罗马尼亚语"
170 174
 
171  
-#: conf/global_settings.py:82
  175
+#: conf/global_settings.py:83
172 176
 msgid "Russian"
173 177
 msgstr "俄语"
174 178
 
175  
-#: conf/global_settings.py:83
  179
+#: conf/global_settings.py:84
176 180
 msgid "Slovak"
177 181
 msgstr "斯洛伐克语"
178 182
 
179  
-#: conf/global_settings.py:84
  183
+#: conf/global_settings.py:85
180 184
 msgid "Slovenian"
181 185
 msgstr "斯洛文尼亚语"
182 186
 
183  
-#: conf/global_settings.py:85
  187
+#: conf/global_settings.py:86
184 188
 msgid "Serbian"
185 189
 msgstr "塞尔维亚语"
186 190
 
187  
-#: conf/global_settings.py:86
  191
+#: conf/global_settings.py:87
188 192
 msgid "Swedish"
189 193
 msgstr "瑞典语"
190 194
 
191  
-#: conf/global_settings.py:87
  195
+#: conf/global_settings.py:88
192 196
 msgid "Tamil"
193 197
 msgstr "泰米尔语"
194 198
 
195  
-#: conf/global_settings.py:88
  199
+#: conf/global_settings.py:89
196 200
 msgid "Telugu"
197 201
 msgstr "泰卢固语"
198 202
 
199  
-#: conf/global_settings.py:89
  203
+#: conf/global_settings.py:90
  204
+msgid "Thai"
  205
+msgstr "泰语"
  206
+
  207
+#: conf/global_settings.py:91
200 208
 msgid "Turkish"
201 209
 msgstr "土耳其语"
202 210
 
203  
-#: conf/global_settings.py:90
  211
+#: conf/global_settings.py:92
204 212
 msgid "Ukrainian"
205 213
 msgstr "乌克兰语"
206 214
 
207  
-#: conf/global_settings.py:91
  215
+#: conf/global_settings.py:93
208 216
 msgid "Simplified Chinese"
209 217
 msgstr "简体中文"
210 218
 
211  
-#: conf/global_settings.py:92
  219
+#: conf/global_settings.py:94
212 220
 msgid "Traditional Chinese"
213 221
 msgstr "繁体中文"
214 222
 
@@ -221,45 +229,40 @@ msgstr ""
221 229
 "<h3>以 %s:</h3>\n"
222 230
 "<ul>\n"
223 231
 
224  
-#: contrib/admin/filterspecs.py:74
225  
-#: contrib/admin/filterspecs.py:92
226  
-#: contrib/admin/filterspecs.py:147
227  
-#: contrib/admin/filterspecs.py:173
  232
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
  233
+#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
228 234
 msgid "All"
229 235
 msgstr "全部"
230 236
 
231  
-#: contrib/admin/filterspecs.py:113
  237
+#: contrib/admin/filterspecs.py:112
232 238
 msgid "Any date"
233 239
 msgstr "任意日期"
234 240
 
235  
-#: contrib/admin/filterspecs.py:114
  241
+#: contrib/admin/filterspecs.py:113
236 242
 msgid "Today"
237 243
 msgstr "今天"
238 244
 
239  
-#: contrib/admin/filterspecs.py:117
  245
+#: contrib/admin/filterspecs.py:116
240 246
 msgid "Past 7 days"
241 247
 msgstr "前7天"
242 248
 
243  
-#: contrib/admin/filterspecs.py:119
  249
+#: contrib/admin/filterspecs.py:118
244 250
 msgid "This month"
245 251
 msgstr "本月"
246 252
 
247  
-#: contrib/admin/filterspecs.py:121
  253
+#: contrib/admin/filterspecs.py:120
248 254
 msgid "This year"
249 255
 msgstr "今年"
250 256
 
251  
-#: contrib/admin/filterspecs.py:147
252  
-#: forms/widgets.py:390
  257
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
253 258
 msgid "Yes"
254 259
 msgstr "是"
255 260
 
256  
-#: contrib/admin/filterspecs.py:147
257  
-#: forms/widgets.py:390
  261
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
258 262
 msgid "No"
259 263
 msgstr "否"
260 264
 
261  
-#: contrib/admin/filterspecs.py:154
262  
-#: forms/widgets.py:390
  265
+#: contrib/admin/filterspecs.py:153 forms/widgets.py:391
263 266
 msgid "Unknown"
264 267
 msgstr "未知"
265 268
 
@@ -291,171 +294,172 @@ msgstr "日志记录"
291 294
 msgid "log entries"
292 295
 msgstr "日志记录"
293 296
 
294  
-#: contrib/admin/options.py:56
295  
-#: contrib/admin/options.py:120
  297
+#: contrib/admin/options.py:60 contrib/admin/options.py:121
296 298
 msgid "None"
297 299
 msgstr "无"
298 300
 
299  
-#: contrib/admin/options.py:334
  301
+#: contrib/admin/options.py:338
300 302
 #, python-format
301 303
 msgid "Changed %s."
302 304
 msgstr "已修改 %s 。"
303 305
 
304  
-#: contrib/admin/options.py:334
305  
-#: contrib/admin/options.py:344
  306
+#: contrib/admin/options.py:338 contrib/admin/options.py:348
  307
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:288
306 308
 msgid "and"
307 309
 msgstr "和"
308 310
 
309  
-#: contrib/admin/options.py:339
  311
+#: contrib/admin/options.py:343
310 312
 #, python-format
311 313
 msgid "Added %(name)s \"%(object)s\"."
312 314
 msgstr "已添加 %(name)s \"%(object)s\"."
313 315
 
314  
-#: contrib/admin/options.py:343
  316
+#: contrib/admin/options.py:347
315 317
 #, python-format
316 318
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
317 319
 msgstr "已变更 %(list)s for %(name)s \"%(object)s\"."
318 320
 
319  
-#: contrib/admin/options.py:348
  321
+#: contrib/admin/options.py:352
320 322
 #, python-format
321 323
 msgid "Deleted %(name)s \"%(object)s\"."
322 324
 msgstr "已删除 %(name)s \"%(object)s\"."
323 325
 
324  
-#: contrib/admin/options.py:352
  326
+#: contrib/admin/options.py:356
325 327
 msgid "No fields changed."
326 328
 msgstr "没有字段被修改。"
327 329
 
328  
-#: contrib/admin/options.py:413
329  
-#: contrib/auth/admin.py:51
  330
+#: contrib/admin/options.py:417 contrib/auth/admin.py:61
330 331
 #, python-format
331 332
 msgid "The %(name)s \"%(obj)s\" was added successfully."
332 333
 msgstr "%(name)s \"%(obj)s\" 添加成功。"
333 334
 
334  
-#: contrib/admin/options.py:417
335  
-#: contrib/admin/options.py:450
336  
-#: contrib/auth/admin.py:57
  335
+#: contrib/admin/options.py:421 contrib/admin/options.py:454
  336
+#: contrib/auth/admin.py:69
337 337
 msgid "You may edit it again below."
338 338
 msgstr "你可以在下面再次编辑它。"
339 339
 
340  
-#: contrib/admin/options.py:427
341  
-#: contrib/admin/options.py:460
  340
+#: contrib/admin/options.py:431 contrib/admin/options.py:464
342 341
 #, python-format
343 342
 msgid "You may add another %s below."
344 343
 msgstr "你可以在下面增加另一个 %s 。"
345 344
 
346  
-#: contrib/admin/options.py:448
  345
+#: contrib/admin/options.py:452
347 346
 #, python-format
348 347
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
349 348
 msgstr "%(name)s \"%(obj)s\" 修改成功。"
350 349
 
351  
-#: contrib/admin/options.py:456
  350
+#: contrib/admin/options.py:460
352 351
 #, python-format
353  
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
  352
+msgid ""
  353
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
354 354
 msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。"
355 355
 
356  
-#: contrib/admin/options.py:532
  356
+#: contrib/admin/options.py:528
357 357
 #, python-format
358 358
 msgid "Add %s"
359 359
 msgstr "增加 %s"
360 360
 
361  
-#: contrib/admin/options.py:610
  361
+#: contrib/admin/options.py:559 contrib/admin/options.py:673
  362
+#, python-format
  363
+msgid "%(name)s object with primary key %(key)r does not exist."
  364
+msgstr "具有主键 %(key)r 的对象 %(name)s 不存在。"
  365
+
  366
+#: contrib/admin/options.py:606
362 367
 #, python-format
363 368
 msgid "Change %s"
364 369
 msgstr "修改 %s"
365 370
 
366  
-#: contrib/admin/options.py:642
  371
+#: contrib/admin/options.py:638
367 372
 msgid "Database error"
368 373
 msgstr "数据库错误"
369 374
 
370  
-#: contrib/admin/options.py:692
  375
+#: contrib/admin/options.py:688
371 376
 #, python-format
372 377
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
373 378
 msgstr "%(name)s \"%(obj)s\" 删除成功。"
374 379
 
375  
-#: contrib/admin/options.py:699
  380
+#: contrib/admin/options.py:695
376 381
 msgid "Are you sure?"
377 382
 msgstr "你确认吗?"
378 383
 
379  
-#: contrib/admin/options.py:728
  384
+#: contrib/admin/options.py:724
380 385
 #, python-format
381 386
 msgid "Change history: %s"
382 387
 msgstr "变更历史: %s"
383 388
 
384  
-#: contrib/admin/sites.py:18
385  
-#: contrib/admin/views/decorators.py:16
  389
+#: contrib/admin/sites.py:16 contrib/admin/views/decorators.py:14
386 390
 #: contrib/auth/forms.py:80
387  
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
  391
+msgid ""
  392
+"Please enter a correct username and password. Note that both fields are case-"
  393
+"sensitive."
388 394
 msgstr "请输入正确的用户名和密码。请注意两者都是大小写敏感的。"
389 395
 
390  
-#: contrib/admin/sites.py:242
391  
-#: contrib/admin/views/decorators.py:68
392  
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
393  
-msgstr "请重新登录,因为你的会话已经过期。不用担心:你的提交已保存。"
  396
+#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
  397
+msgid "Please log in again, because your session has expired."
  398
+msgstr "请重新登录,因为你的会话已经过期。"
394 399
 
395  
-#: contrib/admin/sites.py:249
396  
-#: contrib/admin/views/decorators.py:75
397  
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
398  
-msgstr "似乎你的浏览器没有配置为接受 cookie 。请允许 cookie,再刷新本页面,重试一次。"
  400
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
  401
+msgid ""
  402
+"Looks like your browser isn't configured to accept cookies. Please enable "
  403
+"cookies, reload this page, and try again."
  404
+msgstr ""
  405
+"似乎你的浏览器没有配置为接受 cookie 。请允许 cookie,再刷新本页面,重试一次。"
399 406
 
400  
-#: contrib/admin/sites.py:265
401  
-#: contrib/admin/sites.py:271
402  
-#: contrib/admin/views/decorators.py:94
  407
+#: contrib/admin/sites.py:249 contrib/admin/sites.py:255
  408
+#: contrib/admin/views/decorators.py:66
403 409
 msgid "Usernames cannot contain the '@' character."
404 410
 msgstr "用户名不能包含 '@' 字符。"
405 411
 
406  
-#: contrib/admin/sites.py:268
407  
-#: contrib/admin/views/decorators.py:90
  412
+#: contrib/admin/sites.py:252 contrib/admin/views/decorators.py:62
408 413
 #, python-format
409 414
 msgid "Your e-mail address is not your username. Try '%s' instead."
410 415
 msgstr "你的 e-mail 地址不是你的用户名。换 '%s' 试试。"
411 416
 
412  
-#: contrib/admin/sites.py:336
  417
+#: contrib/admin/sites.py:312
413 418
 msgid "Site administration"
414 419
 msgstr "站点管理"
415 420
 
416  
-#: contrib/admin/sites.py:358
417  
-#: contrib/admin/templates/admin/login.html:27
  421
+#: contrib/admin/sites.py:325 contrib/admin/templates/admin/login.html:26
418 422
 #: contrib/admin/templates/registration/password_reset_complete.html:14
419  
-#: contrib/admin/views/decorators.py:30
  423
+#: contrib/admin/views/decorators.py:20
420 424
 msgid "Log in"
421 425
 msgstr "登录"
422 426
 
423  
-#: contrib/admin/sites.py:406
  427
+#: contrib/admin/sites.py:372
424 428
 #, python-format
425 429
 msgid "%s administration"
426 430
 msgstr "%s 管理"
427 431
 
428  
-#: contrib/admin/util.py:138
  432
+#: contrib/admin/util.py:145
429 433
 #, python-format
430 434
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
431 435
 msgstr "一个或多个 %(fieldname)s 在 %(name)s 中: %(obj)s"
432 436
 
433  
-#: contrib/admin/util.py:143
  437
+#: contrib/admin/util.py:150
434 438
 #, python-format
435 439
 msgid "One or more %(fieldname)s in %(name)s:"
436 440
 msgstr "一个或多个 %(fieldname)s 在 %(name)s 中:"
437 441
 
438  
-#: contrib/admin/widgets.py:65
  442
+#: contrib/admin/widgets.py:70
439 443
 msgid "Date:"
440 444
 msgstr "日期:"
441 445
 
442  
-#: contrib/admin/widgets.py:65
  446
+#: contrib/admin/widgets.py:70
443 447
 msgid "Time:"
444 448
 msgstr "时间:"
445 449
 
446  
-#: contrib/admin/widgets.py:89
  450
+#: contrib/admin/widgets.py:94
447 451
 msgid "Currently:"
448 452
 msgstr "当前:"
449 453
 
450  
-#: contrib/admin/widgets.py:89
  454
+#: contrib/admin/widgets.py:94
451 455
 msgid "Change:"
452 456
 msgstr "改动:"
453 457
 
454  
-#: contrib/admin/widgets.py:115
  458
+#: contrib/admin/widgets.py:123
455 459
 msgid "Lookup"
456 460
 msgstr "查询"
457 461
 
458  
-#: contrib/admin/widgets.py:195
  462
+#: contrib/admin/widgets.py:230
459 463
 msgid "Add Another"
460 464
 msgstr "添加另一个"
461 465
 
@@ -501,8 +505,12 @@ msgid "Server Error <em>(500)</em>"
501 505
 msgstr "服务器错误 <em>(500)</em>"
502 506
 
503 507
 #: contrib/admin/templates/admin/500.html:10
504  
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
505  
-msgstr "发生了一个错误。系统已将错误通过电子邮件报告给了站点管理员,相信问题应该会很快得到解决。感谢您的耐心。"
  508
+msgid ""
  509
+"There's been an error. It's been reported to the site administrators via e-"
  510
+"mail and should be fixed shortly. Thanks for your patience."
  511
+msgstr ""
  512
+"发生了一个错误。系统已将错误通过电子邮件报告给了站点管理员,相信问题应该会很"
  513
+"快得到解决。感谢您的耐心。"
506 514
 
507 515
 #: contrib/admin/templates/admin/app_index.html:10
508 516
 #: contrib/admin/templates/admin/index.html:19
@@ -555,7 +563,7 @@ msgstr "历史"
555 563
 
556 564
 #: contrib/admin/templates/admin/change_form.html:28
557 565
 #: contrib/admin/templates/admin/edit_inline/stacked.html:13
558  
-#: contrib/admin/templates/admin/edit_inline/tabular.html:25
  566
+#: contrib/admin/templates/admin/edit_inline/tabular.html:27
559 567
 msgid "View on site"
560 568
 msgstr "在站点上查看"
561 569
 
@@ -575,20 +583,28 @@ msgid "Filter"
575 583
 msgstr "过滤器"
576 584
 
577 585
 #: contrib/admin/templates/admin/delete_confirmation.html:10
578  
-#: contrib/admin/templates/admin/submit_line.html:4
579  
-#: forms/formsets.py:246
  586
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246
580 587
 msgid "Delete"
581 588
 msgstr "删除"
582 589
 
583 590
 #: contrib/admin/templates/admin/delete_confirmation.html:16
584 591
 #, python-format
585  
-msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
586  
-msgstr "删除 %(object_name)s  '%(escaped_object)s' 会导致删除相关的对象,但你的帐号无权删除下列类型的对象:"
  592
+msgid ""
  593
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
  594
+"related objects, but your account doesn't have permission to delete the "
  595
+"following types of objects:"
  596
+msgstr ""
  597
+"删除 %(object_name)s  '%(escaped_object)s' 会导致删除相关的对象,但你的帐号无"
  598
+"权删除下列类型的对象:"
587 599
 
588 600
 #: contrib/admin/templates/admin/delete_confirmation.html:23
589 601
 #, python-format
590  
-msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
591  
-msgstr "你确认想要删除 %(object_name)s \"%(escaped_object)s\"? 下列所有相关的项目都将被删除:"
  602
+msgid ""
  603
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
  604
+"All of the following related items will be deleted:"
  605
+msgstr ""
  606
+"你确认想要删除 %(object_name)s \"%(escaped_object)s\"? 下列所有相关的项目都"
  607
+"将被删除:"
592 608
 
593 609
 #: contrib/admin/templates/admin/delete_confirmation.html:28
594 610
 msgid "Yes, I'm sure"
@@ -625,8 +641,13 @@ msgid "None available"
625 641
 msgstr "无可用的"
626 642
 
627 643
 #: contrib/admin/templates/admin/invalid_setup.html:7
628  
-msgid "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user."
629  
-msgstr "你的数据库安装有误。确保已经创建了相应的数据库表,并确保数据库可被相关的用户读取。"
  644
+msgid ""
  645
+"Something's wrong with your database installation. Make sure the appropriate "
  646
+"database tables have been created, and make sure the database is readable by "
  647
+"the appropriate user."
  648
+msgstr ""
  649
+"你的数据库安装有误。确保已经创建了相应的数据库表,并确保数据库可被相关的用户"
  650
+"读取。"
630 651
 
631 652
 #: contrib/admin/templates/admin/login.html:19
632 653
 msgid "Username:"
@@ -645,6 +666,7 @@ msgid "User"
645 666
 msgstr "用户"
646 667
 
647 668
 #: contrib/admin/templates/admin/object_history.html:24
  669
+#: contrib/comments/templates/comments/moderation_queue.html:33
648 670
 msgid "Action"
649 671
 msgstr "动作"
650 672
 
@@ -654,7 +676,9 @@ msgid "DATETIME_FORMAT"
654 676
 msgstr "Y-m-d H:i:s"
655 677
 
656 678
 #: contrib/admin/templates/admin/object_history.html:38
657  
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
  679
+msgid ""
  680
+"This object doesn't have a change history. It probably wasn't added via this "
  681
+"admin site."
658 682
 msgstr "该对象没有变更历史记录。可能从未通过这个管理站点添加。"
659 683
 
660 684
 #: contrib/admin/templates/admin/pagination.html:10
@@ -694,21 +718,19 @@ msgid "Save and continue editing"
694 718
 msgstr "保存并继续编辑"
695 719
 
696 720
 #: contrib/admin/templates/admin/auth/user/add_form.html:6
697  
-msgid "First, enter a username and password. Then, you'll be able to edit more user options."
  721
+msgid ""
  722
+"First, enter a username and password. Then, you'll be able to edit more user "
  723
+"options."
698 724
 msgstr "首先,输入一个用户名和密码。然后,你就可以编辑更多的用户选项。"
699 725
 
700 726
 #: contrib/admin/templates/admin/auth/user/add_form.html:13
701  
-#: contrib/auth/forms.py:14
702  
-#: contrib/auth/forms.py:47
703  
-#: contrib/auth/forms.py:59
  727
+#: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59
704 728
 msgid "Username"
705 729
 msgstr "用户名"
706 730
 
707 731
 #: contrib/admin/templates/admin/auth/user/add_form.html:20
708 732
 #: contrib/admin/templates/admin/auth/user/change_password.html:33
709  
-#: contrib/auth/forms.py:17
710  
-#: contrib/auth/forms.py:60
711  
-#: contrib/auth/forms.py:184
  733
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184
712 734
 msgid "Password"
713 735
 msgstr "密码"
714 736
 
@@ -757,8 +779,12 @@ msgid "Your password was changed."
757 779
 msgstr "你的密码已修改。"
758 780
 
759 781
 #: contrib/admin/templates/registration/password_change_form.html:12
760  
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
761  
-msgstr "请输入你的旧密码,为了安全起见,接着要输入两遍新密码,以便我们校验你输入的是否正确。"
  782
+msgid ""
  783
+"Please enter your old password, for security's sake, and then enter your new "
  784
+"password twice so we can verify you typed it in correctly."
  785
+msgstr ""
  786
+"请输入你的旧密码,为了安全起见,接着要输入两遍新密码,以便我们校验你输入的是"
  787
+"否正确。"
762 788
 
763 789
 #: contrib/admin/templates/registration/password_change_form.html:17
764 790
 msgid "Old password:"
@@ -795,7 +821,7 @@ msgstr "完成密码重设"
795 821
 
796 822
 #: contrib/admin/templates/registration/password_reset_complete.html:12
797 823
 msgid "Your password has been set.  You may go ahead and log in now."
798  
-msgstr "你的密码尚未设置。现在你可以继续进行登录。"
  824
+msgstr "你的口令己经设置。现在你可以继续进行登录。"
799 825
 
800 826
 #: contrib/admin/templates/registration/password_reset_confirm.html:4
801 827
 msgid "Password reset confirmation"
@@ -806,7 +832,9 @@ msgid "Enter new password"
806 832
 msgstr "输入新密码"
807 833
 
808 834
 #: contrib/admin/templates/registration/password_reset_confirm.html:14
809  
-msgid "Please enter your new password twice so we can verify you typed it in correctly."
  835
+msgid ""
  836
+"Please enter your new password twice so we can verify you typed it in "
  837
+"correctly."
810 838
 msgstr "请输入两遍新密码,以便我们校验你输入的是否正确。"
811 839
 
812 840
 #: contrib/admin/templates/registration/password_reset_confirm.html:26
@@ -814,7 +842,9 @@ msgid "Password reset unsuccessful"
814 842
 msgstr "密码重设失败"
815 843
 
816 844
 #: contrib/admin/templates/registration/password_reset_confirm.html:28
817  
-msgid "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset."
  845
+msgid ""
  846
+"The password reset link was invalid, possibly because it has already been "
  847
+"used.  Please request a new password reset."
818 848
 msgstr "密码重置链接无效,可能是因为它已使用。可以请求一次新的密码重置。"
819 849
 
820 850
 #: contrib/admin/templates/registration/password_reset_done.html:6
@@ -823,8 +853,12 @@ msgid "Password reset successful"
823 853
 msgstr "密码重设成功"
824 854
 
825 855
 #: contrib/admin/templates/registration/password_reset_done.html:12
826  
-msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly."
827  
-msgstr "我们已经按你所提交的电子邮箱地址发送了密码设置说明。你应该很快就能收到这封邮件。"
  856
+msgid ""
  857
+"We've e-mailed you instructions for setting your password to the e-mail "
  858
+"address you submitted. You should be receiving it shortly."
  859
+msgstr ""
  860
+"我们已经按你所提交的电子邮箱地址发送了密码设置说明。你应该很快就能收到这封邮"
  861
+"件。"
828 862
 
829 863
 #: contrib/admin/templates/registration/password_reset_email.html:2
830 864
 msgid "You're receiving this e-mail because you requested a password reset"
@@ -853,8 +887,12 @@ msgid "The %(site_name)s team"
853 887
 msgstr "%(site_name)s 团队"
854 888
 
855 889
 #: contrib/admin/templates/registration/password_reset_form.html:12
856  
-msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one."
857  
-msgstr "忘记了你的密码?请在下面输入你的 e-mail 地址,我们将把新密码设置说明通过邮件发送给你。"
  890
+msgid ""
  891
+"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
  892
+"instructions for setting a new one."
  893
+msgstr ""
  894
+"忘记了你的密码?请在下面输入你的 e-mail 地址,我们将把新密码设置说明通过邮件"
  895
+"发送给你。"
858 896
 
859 897
 #: contrib/admin/templates/registration/password_reset_form.html:16
860 898
 msgid "E-mail address:"
@@ -864,22 +902,21 @@ msgstr "E-mail 地址:"
864 902
 msgid "Reset my password"
865 903
 msgstr "重设我的密码"
866 904
 
867  
-#: contrib/admin/templatetags/admin_list.py:284
  905
+#: contrib/admin/templatetags/admin_list.py:285
868 906
 msgid "All dates"
869 907
 msgstr "所有日期"
870 908
 
871  
-#: contrib/admin/views/main.py:65
  909
+#: contrib/admin/views/main.py:69
872 910
 #, python-format
873 911
 msgid "Select %s"
874 912
 msgstr "选择 %s"
875 913
 
876  
-#: contrib/admin/views/main.py:65
  914
+#: contrib/admin/views/main.py:69
877 915
 #, python-format
878 916
 msgid "Select %s to change"
879 917
 msgstr "选择 %s 来修改"
880 918
 
881  
-#: contrib/admin/views/template.py:36
882  
-#: contrib/sites/models.py:38
  919
+#: contrib/admin/views/template.py:36 contrib/sites/models.py:38
883 920
 msgid "site"
884 921
 msgstr "站点"
885 922
 
@@ -887,156 +924,144 @@ msgstr "站点"
887 924
 msgid "template"
888 925
 msgstr "模板"
889 926
 
890  
-#: contrib/admindocs/views.py:53
891  
-#: contrib/admindocs/views.py:55
892  
-#: contrib/admindocs/views.py:57
  927
+#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59
  928
+#: contrib/admindocs/views.py:61
893 929
 msgid "tag:"
894 930
 msgstr "标签:"
895 931
 
896  
-#: contrib/admindocs/views.py:87
897  
-#: contrib/admindocs/views.py:89
898  
-#: contrib/admindocs/views.py:91
  932
+#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92
  933
+#: contrib/admindocs/views.py:94
899 934
 msgid "filter:"
900 935
 msgstr "过滤器:"
901 936
 
902  
-#: contrib/admindocs/views.py:153
903  
-#: contrib/admindocs/views.py:155
904  
-#: contrib/admindocs/views.py:157
  937
+#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156
  938
+#: contrib/admindocs/views.py:158
905 939
 msgid "view:"
906 940
 msgstr "视图:"
907 941
 
908  
-#: contrib/admindocs/views.py:187
  942
+#: contrib/admindocs/views.py:186
909 943
 #, python-format
910 944
 msgid "App %r not found"
911 945
 msgstr "应用 %r 没有找到"
912 946
 
913  
-#: contrib/admindocs/views.py:194
  947
+#: contrib/admindocs/views.py:193
914 948
 #, python-format
915 949
 msgid "Model %(model_name)r not found in app %(app_label)r"
916 950
 msgstr "在应用 %(app_label)r 里找不到模型 %(model_name)r"
917 951
 
918  
-#: contrib/admindocs/views.py:206
  952
+#: contrib/admindocs/views.py:205
919 953
 #, python-format
920 954
 msgid "the related `%(app_label)s.%(data_type)s` object"
921 955
 msgstr "相关的 `%(app_label)s.%(data_type)s` 对象"
922 956
 
923  
-#: contrib/admindocs/views.py:206
924  
-#: contrib/admindocs/views.py:228
925  
-#: contrib/admindocs/views.py:242
926  
-#: contrib/admindocs/views.py:247
  957
+#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227
  958
+#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246
927 959
 msgid "model:"
928 960
 msgstr "模型:"
929 961
 
930  
-#: contrib/admindocs/views.py:237
  962
+#: contrib/admindocs/views.py:236
931 963
 #, python-format
932 964
 msgid "related `%(app_label)s.%(object_name)s` objects"
933 965
 msgstr "相关的 `%(app_label)s.%(object_name)s` 对象"
934 966
 
935  
-#: contrib/admindocs/views.py:242
  967
+#: contrib/admindocs/views.py:241
936 968
 #, python-format
937 969
 msgid "all %s"
938 970
 msgstr "所有 %s"
939 971
 
940  
-#: contrib/admindocs/views.py:247
  972
+#: contrib/admindocs/views.py:246
941 973
 #, python-format
942 974
 msgid "number of %s"
943 975
 msgstr "%s 的数量"
944 976
 
945  
-#: contrib/admindocs/views.py:253
  977
+#: contrib/admindocs/views.py:251
946 978
 #, python-format
947 979
 msgid "Fields on %s objects"
948 980
 msgstr "%s 对象的字段"
949 981
 
950  
-#: contrib/admindocs/views.py:317
951  
-#: contrib/admindocs/views.py:328
952  
-#: contrib/admindocs/views.py:330
953  
-#: contrib/admindocs/views.py:336
954  
-#: contrib/admindocs/views.py:337
955  
-#: contrib/admindocs/views.py:339
  982
+#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325
  983
+#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333
  984
+#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336
956 985
 msgid "Integer"
957 986
 msgstr "整数"
958 987
 
959  
-#: contrib/admindocs/views.py:318
  988
+#: contrib/admindocs/views.py:315
960 989
 msgid "Boolean (Either True or False)"
961 990
 msgstr "布尔值(真或假)"
962 991
 
963  
-#: contrib/admindocs/views.py:319
964  
-#: contrib/admindocs/views.py:338
  992
+#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335
965 993
 #, python-format
966 994
 msgid "String (up to %(max_length)s)"
967 995
 msgstr "字符串(最长 %(max_length)s 位)"
968 996
 
969  
-#: contrib/admindocs/views.py:320
  997
+#: contrib/admindocs/views.py:317
970 998
 msgid "Comma-separated integers"
971 999
 msgstr "逗号分隔的整数"
972 1000
 
973  
-#: contrib/admindocs/views.py:321
  1001
+#: contrib/admindocs/views.py:318
974 1002
 msgid "Date (without time)"
975 1003
 msgstr "日期(无时间)"
976 1004
 
977  
-#: contrib/admindocs/views.py:322
  1005
+#: contrib/admindocs/views.py:319
978 1006
 msgid "Date (with time)"
979 1007
 msgstr "日期(带时间)"
980 1008
 
981  
-#: contrib/admindocs/views.py:323
  1009
+#: contrib/admindocs/views.py:320
982 1010
 msgid "Decimal number"
983 1011
 msgstr "小数"
984 1012
 
985  
-#: contrib/admindocs/views.py:324
  1013
+#: contrib/admindocs/views.py:321
986 1014
 msgid "E-mail address"
987 1015
 msgstr "E-mail 地址"
988 1016
 
989  
-#: contrib/admindocs/views.py:325
  1017
+#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323
990 1018
 #: contrib/admindocs/views.py:326
991  
-#: contrib/admindocs/views.py:329
992 1019
 msgid "File path"
993 1020
 msgstr "文件路径"
994 1021
 
995  
-#: contrib/admindocs/views.py:327
  1022
+#: contrib/admindocs/views.py:324
996 1023
 msgid "Floating point number"
997 1024
 msgstr "浮点数"
998 1025
 
999  
-#: contrib/admindocs/views.py:331
1000  
-#: contrib/comments/models.py:57
  1026
+#: contrib/admindocs/views.py:328 contrib/comments/models.py:58
1001 1027
 msgid "IP address"
1002 1028
 msgstr "IP 地址"
1003 1029
 
1004  
-#: contrib/admindocs/views.py:333
  1030
+#: contrib/admindocs/views.py:330
1005 1031
 msgid "Boolean (Either True, False or None)"
1006 1032
 msgstr "布尔值(真、假或无)"
1007 1033
 
1008  
-#: contrib/admindocs/views.py:334
  1034
+#: contrib/admindocs/views.py:331
1009 1035
 msgid "Relation to parent model"
1010 1036
 msgstr "与父模型的关系"
1011 1037
 
1012  
-#: contrib/admindocs/views.py:335
  1038
+#: contrib/admindocs/views.py:332
1013 1039
 msgid "Phone number"
1014 1040
 msgstr "电话号码"
1015 1041
 
1016  
-#: contrib/admindocs/views.py:340
  1042
+#: contrib/admindocs/views.py:337
1017 1043
 msgid "Text"
1018 1044
 msgstr "文本"
1019 1045
 
1020  
-#: contrib/admindocs/views.py:341
  1046
+#: contrib/admindocs/views.py:338
1021 1047
 msgid "Time"
1022 1048
 msgstr "时间"
1023 1049
 
1024  
-#: contrib/admindocs/views.py:342
1025  
-#: contrib/comments/forms.py:20
1026  
-#: contrib/flatpages/admin.py:8
1027  
-#: contrib/flatpages/models.py:7
  1050
+#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21
  1051
+#: contrib/comments/templates/comments/moderation_queue.html:37
  1052
+#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
1028 1053
 msgid "URL"
1029 1054
 msgstr "URL"
1030 1055
 
1031  
-#: contrib/admindocs/views.py:343
  1056
+#: contrib/admindocs/views.py:340
1032 1057
 msgid "U.S. state (two uppercase letters)"
1033 1058
 msgstr "美国州名(两个大写字母)"
1034 1059
 
1035  
-#: contrib/admindocs/views.py:344
  1060
+#: contrib/admindocs/views.py:341
1036 1061
 msgid "XML text"
1037 1062
 msgstr "XML 文本"
1038 1063
 
1039  
-#: contrib/admindocs/views.py:370
  1064
+#: contrib/admindocs/views.py:367
1040 1065
 #, python-format
1041 1066
 msgid "%s does not appear to be a urlpattern object"
1042 1067
 msgstr "%s 似乎不是一个 urlpattern 对象"
@@ -1071,7 +1096,9 @@ msgid "Documentation for this page"
1071 1096
 msgstr "关于本页面的文档"
1072 1097
 
1073 1098
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:19
1074  
-msgid "Jumps you from any page to the documentation for the view that generates that page."
  1099
+msgid ""
  1100
+"Jumps you from any page to the documentation for the view that generates "
  1101
+"that page."
1075 1102
 msgstr "从任何页面跳转到生成该页面的 view 文档。"
1076 1103
 
1077 1104
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:21
@@ -1079,7 +1106,9 @@ msgid "Show object ID"
1079 1106
 msgstr "显示对象 ID"
1080 1107
 
1081 1108
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:22
1082  
-msgid "Shows the content-type and unique ID for pages that represent a single object."
  1109
+msgid ""
  1110
+"Shows the content-type and unique ID for pages that represent a single "
  1111
+"object."
1083 1112
 msgstr "为那些展现单个对象的页面,显示 content-type 和唯一 ID。"
1084 1113
 
1085 1114
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:24
@@ -1114,27 +1143,27 @@ msgstr "重要日期"
1114 1143
 msgid "Groups"
1115 1144
 msgstr "组"
1116 1145
 
1117  
-#: contrib/auth/admin.py:62
  1146
+#: contrib/auth/admin.py:74
1118 1147
 msgid "Add user"
1119 1148
 msgstr "新增用户"
1120 1149
 
1121  
-#: contrib/auth/admin.py:88
  1150
+#: contrib/auth/admin.py:100
1122 1151
 msgid "Password changed successfully."
1123 1152
 msgstr "密码修改成功。"
1124 1153
 
1125  
-#: contrib/auth/admin.py:94
  1154
+#: contrib/auth/admin.py:106
1126 1155
 #, python-format
1127 1156
 msgid "Change password: %s"
1128 1157
 msgstr "修改密码:%s"
1129 1158
 
1130  
-#: contrib/auth/forms.py:15
1131  
-#: contrib/auth/forms.py:48
  1159
+#: contrib/auth/forms.py:15 contrib/auth/forms.py:48
1132 1160
 #: contrib/auth/models.py:136
1133  
-msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
  1161
+msgid ""
  1162
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
  1163
+"digits and underscores)."
1134 1164
 msgstr "必填。不多于30个字符。只能用字母、数字和下划线。"
1135 1165
 
1136  
-#: contrib/auth/forms.py:16
1137  
-#: contrib/auth/forms.py:49
  1166
+#: contrib/auth/forms.py:16 contrib/auth/forms.py:49
1138 1167
 msgid "This value must contain only letters, numbers and underscores."
1139 1168
 msgstr "该值只能包含字母、数字和下划线。"
1140 1169
 
@@ -1146,8 +1175,7 @@ msgstr "密码确认"
1146 1175
 msgid "A user with that username already exists."
1147 1176
 msgstr "已存在一位使用该名字的用户。"
1148 1177
 
1149  
-#: contrib/auth/forms.py:36
1150  
-#: contrib/auth/forms.py:154
  1178
+#: contrib/auth/forms.py:36 contrib/auth/forms.py:154
1151 1179
 #: contrib/auth/forms.py:196
1152 1180
 msgid "The two password fields didn't match."
1153 1181
 msgstr "两个密码字段不一致。"
@@ -1157,7 +1185,9 @@ msgid "This account is inactive."
1157 1185
 msgstr "该帐号未激活。"
1158 1186
 
1159 1187
 #: contrib/auth/forms.py:87
1160  
-msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
  1188
+msgid ""
  1189
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
  1190
+"required for logging in."
1161 1191
 msgstr "你的浏览器好象不允许使用cookie。登录需要使用启用cookie。"
1162 1192
 
1163 1193
 #: contrib/auth/forms.py:100
@@ -1165,7 +1195,9 @@ msgid "E-mail"
1165 1195
 msgstr "E-mail"
1166 1196
 
1167 1197
 #: contrib/auth/forms.py:109
1168  
-msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
  1198
+msgid ""
  1199
+"That e-mail address doesn't have an associated user account. Are you sure "
  1200
+"you've registered?"
1169 1201
 msgstr "该电子邮件地址没有关联任何用户帐号。你确定已经注册过了?"
1170 1202
 
1171 1203
 #: contrib/auth/forms.py:134
@@ -1189,8 +1221,7 @@ msgstr "旧密码"
1189 1221
 msgid "Your old password was entered incorrectly. Please enter it again."
1190 1222
 msgstr "你的旧密码不正确。请重新输入。"
1191 1223
 
1192  
-#: contrib/auth/models.py:72
1193  
-#: contrib/auth/models.py:95
  1224
+#: contrib/auth/models.py:72 contrib/auth/models.py:95
1194 1225
 msgid "name"
1195 1226
 msgstr "名称"
1196 1227
 
@@ -1202,8 +1233,7 @@ msgstr "代码名称"
1202 1233
 msgid "permission"
1203 1234
 msgstr "权限"
1204 1235
 
1205  
-#: contrib/auth/models.py:78
1206  
-#: contrib/auth/models.py:96
  1236
+#: contrib/auth/models.py:78 contrib/auth/models.py:96
1207 1237
 msgid "permissions"
1208 1238
 msgstr "权限"
1209 1239
 
@@ -1211,8 +1241,7 @@ msgstr "权限"
1211 1241
 msgid "group"
1212 1242
 msgstr "组"
1213 1243
 
1214  
-#: contrib/auth/models.py:100
1215  
-#: contrib/auth/models.py:146
  1244
+#: contrib/auth/models.py:100 contrib/auth/models.py:146
1216 1245
 msgid "groups"
1217 1246
 msgstr "组"
1218 1247
 
@@ -1237,8 +1266,12 @@ msgid "password"
1237 1266
 msgstr "密码"
1238 1267
 
1239 1268
 #: contrib/auth/models.py:140
1240  
-msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
1241  
-msgstr "使用 '[algo]$[salt]$[hexdigest]' 或使用 <a href=\"password/\">修改密码表单</a>"
  1269
+msgid ""
  1270
+"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
  1271
+"password form</a>."
  1272
+msgstr ""
  1273
+"使用 '[algo]$[salt]$[hexdigest]' 或使用 <a href=\"password/\">修改密码表单</"
  1274
+"a>"
1242 1275
 
1243 1276
 #: contrib/auth/models.py:141
1244 1277
 msgid "staff status"
@@ -1253,7 +1286,9 @@ msgid "active"
1253 1286
 msgstr "有效"
1254 1287
 
1255 1288
 #: contrib/auth/models.py:142
1256  
-msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
  1289
+msgid ""
  1290
+"Designates whether this user should be treated as active. Unselect this "
  1291
+"instead of deleting accounts."
1257 1292
 msgstr "指明用户是否被认为活跃的。以反选代替删除帐号。"
1258 1293
 
1259 1294
 #: contrib/auth/models.py:143
@@ -1261,7 +1296,9 @@ msgid "superuser status"
1261 1296
 msgstr "超级用户状态"
1262 1297