Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fixes #990 - updated 'zh_CN' translation

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4040b99b5c1330fc80990f11edb3a23815b64304 1 parent 4ed3d57
authored December 04, 2005
BIN  django/conf/locale/zh_CN/LC_MESSAGES/django.mo
Binary file not shown
267  django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
8 8
 "Project-Id-Version: django v1.0\n"
9 9
 "Report-Msgid-Bugs-To: \n"
10 10
 "POT-Creation-Date: 2005-12-04 14:55+0100\n"
11  
-"PO-Revision-Date: 2005-11-26 23:02+0800\n"
  11
+"PO-Revision-Date: 2005-12-04 22:08+0800\n"
12 12
 "Last-Translator: limodou <limodou@gmail.com>\n"
13 13
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
14 14
 "MIME-Version: 1.0\n"
@@ -79,7 +79,8 @@ msgstr "日期/时间已提交"
79 79
 msgid "is public"
80 80
 msgstr "公开"
81 81
 
82  
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
  82
+#: contrib/comments/models/comments.py:26
  83
+#: contrib/admin/views/doc.py:256
83 84
 msgid "IP address"
84 85
 msgstr "IP地址"
85 86
 
@@ -88,11 +89,8 @@ msgid "is removed"
88 89
 msgstr "被删除"
89 90
 
90 91
 #: contrib/comments/models/comments.py:27
91  
-msgid ""
92  
-"Check this box if the comment is inappropriate. A \"This comment has been "
93  
-"removed\" message will be displayed instead."
94  
-msgstr ""
95  
-"如果评论不适合选中这个检查框。评论将被一条\"此评论已经被删除\"的消息所替换。"
  92
+msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
  93
+msgstr "如果评论不适合选中这个检查框。评论将被一条\"此评论已经被删除\"的消息所替换。"
96 94
 
97 95
 #: contrib/comments/models/comments.py:31
98 96
 msgid "Comment"
@@ -221,20 +219,17 @@ msgid "No voting for yourself"
221 219
 msgstr "不能给自已投票"
222 220
 
223 221
 #: contrib/comments/views/comments.py:25
224  
-msgid ""
225  
-"This rating is required because you've entered at least one other rating."
  222
+msgid "This rating is required because you've entered at least one other rating."
226 223
 msgstr "要求此等级,因为你已经输入了至少一个等级。"
227 224
 
228 225
 #: contrib/comments/views/comments.py:109
229 226
 #, python-format
230 227
 msgid ""
231  
-"This comment was posted by a user who has posted fewer than %(count)s "
232  
-"comment:\n"
  228
+"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
233 229
 "\n"
234 230
 "%(text)s"
235 231
 msgid_plural ""
236  
-"This comment was posted by a user who has posted fewer than %(count)s "
237  
-"comments:\n"
  232
+"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
238 233
 "\n"
239 234
 "%(text)s"
240 235
 msgstr[0] ""
@@ -270,9 +265,7 @@ msgstr "有人篡改了评论表格(安全侵害)"
270 265
 
271 266
 #: contrib/comments/views/comments.py:204
272 267
 #: contrib/comments/views/comments.py:289
273  
-msgid ""
274  
-"The comment form had an invalid 'target' parameter -- the object ID was "
275  
-"invalid"
  268
+msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
276 269
 msgstr "评论表格有一个无效的 'target' 参数 -- 对象 ID 无效"
277 270
 
278 271
 #: contrib/comments/views/comments.py:254
@@ -289,7 +282,8 @@ msgstr ""
289 282
 "<h3>由 %s:</h3>\n"
290 283
 "<ul>\n"
291 284
 
292  
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
  285
+#: contrib/admin/filterspecs.py:70
  286
+#: contrib/admin/filterspecs.py:88
293 287
 #: contrib/admin/filterspecs.py:143
294 288
 msgid "All"
295 289
 msgstr "全部"
@@ -364,18 +358,12 @@ msgid "Log in"
364 358
 msgstr "登录"
365 359
 
366 360
 #: contrib/admin/views/decorators.py:56
367  
-msgid ""
368  
-"Please log in again, because your session has expired. Don't worry: Your "
369  
-"submission has been saved."
  361
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
370 362
 msgstr "请重新登录,因为你的会话已经过期。不用担心:你的提交已经被保存。"
371 363
 
372 364
 #: contrib/admin/views/decorators.py:63
373  
-msgid ""
374  
-"Looks like your browser isn't configured to accept cookies. Please enable "
375  
-"cookies, reload this page, and try again."
376  
-msgstr ""
377  
-"看上去你的浏览器没有配置成接受 cookie 。请允许 cookie,重新装入本页面,再试一"
378  
-"次。"
  365
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
  366
+msgstr "看上去你的浏览器没有配置成接受 cookie 。请允许 cookie,重新装入本页面,再试一次。"
379 367
 
380 368
 #: contrib/admin/views/decorators.py:77
381 369
 msgid "Usernames cannot contain the '@' character."
@@ -405,11 +393,13 @@ msgstr "选择 %s 来修改"
405 393
 msgid "The %(name)s \"%(obj)s\" was added successfully."
406 394
 msgstr "%(name)s \"%(obj)s\" 添加成功。"
407 395
 
408  
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
  396
+#: contrib/admin/views/main.py:412
  397
+#: contrib/admin/views/main.py:488
409 398
 msgid "You may edit it again below."
410 399
 msgstr "你可以在下面再次编辑它。"
411 400
 
412  
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
  401
+#: contrib/admin/views/main.py:420
  402
+#: contrib/admin/views/main.py:497
413 403
 #, python-format
414 404
 msgid "You may add another %s below."
415 405
 msgstr "你可以在下面增加另一个 %s 。"
@@ -424,7 +414,8 @@ msgstr "增加 %s"
424 414
 msgid "Added %s."
425 415
 msgstr "%s 已增加。"
426 416
 
427  
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
  417
+#: contrib/admin/views/main.py:453
  418
+#: contrib/admin/views/main.py:455
428 419
 #: contrib/admin/views/main.py:457
429 420
 msgid "and"
430 421
 msgstr "和"
@@ -450,8 +441,7 @@ msgstr "%(name)s \"%(obj)s\" 修改成功。"
450 441
 
451 442
 #: contrib/admin/views/main.py:494
452 443
 #, python-format
453  
-msgid ""
454  
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
  444
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
455 445
 msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。"
456 446
 
457 447
 #: contrib/admin/views/main.py:532
@@ -483,9 +473,12 @@ msgstr "你确信吗?"
483 473
 msgid "Change history: %s"
484 474
 msgstr "修改历史: %s"
485 475
 
486  
-#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
487  
-#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
488  
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
  476
+#: contrib/admin/views/doc.py:244
  477
+#: contrib/admin/views/doc.py:253
  478
+#: contrib/admin/views/doc.py:255
  479
+#: contrib/admin/views/doc.py:261
  480
+#: contrib/admin/views/doc.py:262
  481
+#: contrib/admin/views/doc.py:264
489 482
 msgid "Integer"
490 483
 msgstr "整数"
491 484
 
@@ -514,7 +507,8 @@ msgstr "日期(带时间)"
514 507
 msgid "E-mail address"
515 508
 msgstr "邮箱地址"
516 509
 
517  
-#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
  510
+#: contrib/admin/views/doc.py:251
  511
+#: contrib/admin/views/doc.py:254
518 512
 msgid "File path"
519 513
 msgstr "文件路径"
520 514
 
@@ -528,7 +522,7 @@ msgstr "布尔(True, False或None)"
528 522
 
529 523
 #: contrib/admin/views/doc.py:259
530 524
 msgid "Relation to parent model"
531  
-msgstr ""
  525
+msgstr "与父模型的关系"
532 526
 
533 527
 #: contrib/admin/views/doc.py:260
534 528
 msgid "Phone number"
@@ -546,7 +540,8 @@ msgstr "文本"
546 540
 msgid "Time"
547 541
 msgstr "时间"
548 542
 
549  
-#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
  543
+#: contrib/admin/views/doc.py:267
  544
+#: contrib/flatpages/models/flatpages.py:6
550 545
 msgid "URL"
551 546
 msgstr "URL"
552 547
 
@@ -617,7 +612,8 @@ msgstr "历史"
617 612
 msgid "Date/time"
618 613
 msgstr "日期/时间"
619 614
 
620  
-#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
  615
+#: contrib/admin/templates/admin/object_history.html:19
  616
+#: models/auth.py:47
621 617
 msgid "User"
622 618
 msgstr "用户"
623 619
 
@@ -630,9 +626,7 @@ msgid "DATE_WITH_TIME_FULL"
630 626
 msgstr "N j, Y, P"
631 627
 
632 628
 #: contrib/admin/templates/admin/object_history.html:36
633  
-msgid ""
634  
-"This object doesn't have a change history. It probably wasn't added via this "
635  
-"admin site."
  629
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
636 630
 msgstr "此对象没有修改历史。可能不能通过这个管理站点来增加。"
637 631
 
638 632
 #: contrib/admin/templates/admin/base_site.html:4
@@ -656,12 +650,8 @@ msgid "Server Error <em>(500)</em>"
656 650
 msgstr "服务器错误 <em>(500)</em>"
657 651
 
658 652
 #: contrib/admin/templates/admin/500.html:10
659  
-msgid ""
660  
-"There's been an error. It's been reported to the site administrators via e-"
661  
-"mail and should be fixed shortly. Thanks for your patience."
662  
-msgstr ""
663  
-"存在一个错误。它已经通过电子邮件被报告给站点管理员了,并且应该很快被改正。谢"
664  
-"谢你的关心。"
  653
+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."
  654
+msgstr "存在一个错误。它已经通过电子邮件被报告给站点管理员了,并且应该很快被改正。谢谢你的关心。"
665 655
 
666 656
 #: contrib/admin/templates/admin/404.html:4
667 657
 #: contrib/admin/templates/admin/404.html:8
@@ -720,21 +710,13 @@ msgstr "欢迎,"
720 710
 
721 711
 #: contrib/admin/templates/admin/delete_confirmation.html:6
722 712
 #, python-format
723  
-msgid ""
724  
-"Deleting the %(object_name)s '%(object)s' would result in deleting related "
725  
-"objects, but your account doesn't have permission to delete the following "
726  
-"types of objects:"
727  
-msgstr ""
728  
-"删除 %(object_name)s  '%(object)s' 会导致删除相关的对象,但你的帐号无权删除下"
729  
-"列类型的对象:"
  713
+msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
  714
+msgstr "删除 %(object_name)s  '%(object)s' 会导致删除相关的对象,但你的帐号无权删除下列类型的对象:"
730 715
 
731 716
 #: contrib/admin/templates/admin/delete_confirmation.html:13
732 717
 #, python-format
733  
-msgid ""
734  
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
735  
-"the following related items will be deleted:"
736  
-msgstr ""
737  
-"你确信相要删除 %(object_name)s \"%(object)s\"?所有相关的项目都将被删除:"
  718
+msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
  719
+msgstr "你确信相要删除 %(object_name)s \"%(object)s\"?所有相关的项目都将被删除:"
738 720
 
739 721
 #: contrib/admin/templates/admin/delete_confirmation.html:17
740 722
 msgid "Yes, I'm sure"
@@ -747,7 +729,7 @@ msgstr " 由 %(title)s"
747 729
 
748 730
 #: contrib/admin/templates/admin/search_form.html:7
749 731
 msgid "Go"
750  
-msgstr ""
  732
+msgstr ""
751 733
 
752 734
 #: contrib/admin/templates/admin/change_form.html:20
753 735
 msgid "View on site"
@@ -810,12 +792,8 @@ msgid "Password reset"
810 792
 msgstr "口令重设"
811 793
 
812 794
 #: contrib/admin/templates/registration/password_reset_form.html:12
813  
-msgid ""
814  
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
815  
-"your password and e-mail the new one to you."
816  
-msgstr ""
817  
-"忘记你的口令?在下面输入你的邮箱地址,我们将重设你的口令并且将新的口令通过邮"
818  
-"件发送给你。"
  795
+msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
  796
+msgstr "忘记你的口令?在下面输入你的邮箱地址,我们将重设你的口令并且将新的口令通过邮件发送给你。"
819 797
 
820 798
 #: contrib/admin/templates/registration/password_reset_form.html:16
821 799
 msgid "E-mail address:"
@@ -839,19 +817,12 @@ msgid "Password reset successful"
839 817
 msgstr "口令重设成功"
840 818
 
841 819
 #: contrib/admin/templates/registration/password_reset_done.html:12
842  
-msgid ""
843  
-"We've e-mailed a new password to the e-mail address you submitted. You "
844  
-"should be receiving it shortly."
845  
-msgstr ""
846  
-"我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
  820
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
  821
+msgstr "我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
847 822
 
848 823
 #: contrib/admin/templates/registration/password_change_form.html:12
849  
-msgid ""
850  
-"Please enter your old password, for security's sake, and then enter your new "
851  
-"password twice so we can verify you typed it in correctly."
852  
-msgstr ""
853  
-"请输入你的旧口令,为了安全起见,接着要输入你的新口令两遍,这样我们可以校验你"
854  
-"输入的是否正确。"
  824
+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."
  825
+msgstr "请输入你的旧口令,为了安全起见,接着要输入你的新口令两遍,这样我们可以校验你输入的是否正确。"
855 826
 
856 827
 #: contrib/admin/templates/registration/password_change_form.html:17
857 828
 msgid "Old password:"
@@ -935,9 +906,7 @@ msgid "Documentation for this page"
935 906
 msgstr "本页面的文档"
936 907
 
937 908
 #: contrib/admin/templates/admin_doc/bookmarklets.html:20
938  
-msgid ""
939  
-"Jumps you from any page to the documentation for the view that generates "
940  
-"that page."
  909
+msgid "Jumps you from any page to the documentation for the view that generates that page."
941 910
 msgstr "对于任何页面跳转到生成这个页面的view所在的文件。"
942 911
 
943 912
 #: contrib/admin/templates/admin_doc/bookmarklets.html:22
@@ -945,9 +914,7 @@ msgid "Show object ID"
945 914
 msgstr "显示对象ID"
946 915
 
947 916
 #: contrib/admin/templates/admin_doc/bookmarklets.html:23
948  
-msgid ""
949  
-"Shows the content-type and unique ID for pages that represent a single "
950  
-"object."
  917
+msgid "Shows the content-type and unique ID for pages that represent a single object."
951 918
 msgstr "用于那些表现单个对象的页面显示 content-type 和唯一ID。"
952 919
 
953 920
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
@@ -968,21 +935,18 @@ msgstr "同上,但在新窗口中打开管理页面。"
968 935
 
969 936
 #: contrib/admin/templates/widget/date_time.html:3
970 937
 msgid "Date:"
971  
-msgstr ""
  938
+msgstr "日期:"
972 939
 
973 940
 #: contrib/admin/templates/widget/date_time.html:4
974  
-#, fuzzy
975 941
 msgid "Time:"
976  
-msgstr "时间"
  942
+msgstr "时间"
977 943
 
978 944
 #: contrib/redirects/models/redirects.py:7
979 945
 msgid "redirect from"
980 946
 msgstr "重定向自"
981 947
 
982 948
 #: contrib/redirects/models/redirects.py:8
983  
-msgid ""
984  
-"This should be an absolute path, excluding the domain name. Example: '/"
985  
-"events/search/'."
  949
+msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
986 950
 msgstr "应该是一个绝对路径,不包括域名。例如:'/events/search/'。"
987 951
 
988 952
 #: contrib/redirects/models/redirects.py:9
@@ -990,9 +954,7 @@ msgid "redirect to"
990 954
 msgstr "重定向到"
991 955
 
992 956
 #: contrib/redirects/models/redirects.py:10
993  
-msgid ""
994  
-"This can be either an absolute path (as above) or a full URL starting with "
995  
-"'http://'."
  957
+msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
996 958
 msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。"
997 959
 
998 960
 #: contrib/redirects/models/redirects.py:12
@@ -1004,8 +966,7 @@ msgid "redirects"
1004 966
 msgstr "重定向"
1005 967
 
1006 968
 #: contrib/flatpages/models/flatpages.py:7
1007  
-msgid ""
1008  
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
  969
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
1009 970
 msgstr "例如:'/about/contact/'。请确保前导和结尾的除号。"
1010 971
 
1011 972
 #: contrib/flatpages/models/flatpages.py:8
@@ -1025,11 +986,8 @@ msgid "template name"
1025 986
 msgstr "模板名称"
1026 987
 
1027 988
 #: contrib/flatpages/models/flatpages.py:12
1028  
-msgid ""
1029  
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
1030  
-"use 'flatpages/default'."
1031  
-msgstr ""
1032  
-"例如:'flatfiles/contact_page'。如果未提供,系统将使用'flatfiles/default'。"
  989
+msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
  990
+msgstr "例如:'flatfiles/contact_page'。如果未提供,系统将使用'flatfiles/default'。"
1033 991
 
1034 992
 #: contrib/flatpages/models/flatpages.py:13
1035 993
 msgid "registration required"
@@ -1095,23 +1053,28 @@ msgstr "一月"
1095 1053
 msgid "February"
1096 1054
 msgstr "二月"
1097 1055
 
1098  
-#: utils/dates.py:14 utils/dates.py:27
  1056
+#: utils/dates.py:14
  1057
+#: utils/dates.py:27
1099 1058
 msgid "March"
1100 1059
 msgstr "三月"
1101 1060
 
1102  
-#: utils/dates.py:14 utils/dates.py:27
  1061
+#: utils/dates.py:14
  1062
+#: utils/dates.py:27
1103 1063
 msgid "April"
1104 1064
 msgstr "四月"
1105 1065
 
1106  
-#: utils/dates.py:14 utils/dates.py:27
  1066
+#: utils/dates.py:14
  1067
+#: utils/dates.py:27
1107 1068
 msgid "May"
1108 1069
 msgstr "五月"
1109 1070
 
1110  
-#: utils/dates.py:14 utils/dates.py:27
  1071
+#: utils/dates.py:14
  1072
+#: utils/dates.py:27
1111 1073
 msgid "June"
1112 1074
 msgstr "六月"
1113 1075
 
1114  
-#: utils/dates.py:15 utils/dates.py:27
  1076
+#: utils/dates.py:15
  1077
+#: utils/dates.py:27
1115 1078
 msgid "July"
1116 1079
 msgstr "七月"
1117 1080
 
@@ -1208,7 +1171,10 @@ msgstr "站点"
1208 1171
 msgid "label"
1209 1172
 msgstr "标签"
1210 1173
 
1211  
-#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
  1174
+#: models/core.py:29
  1175
+#: models/core.py:40
  1176
+#: models/auth.py:6
  1177
+#: models/auth.py:19
1212 1178
 msgid "name"
1213 1179
 msgstr "名称"
1214 1180
 
@@ -1260,7 +1226,8 @@ msgstr "代码名称"
1260 1226
 msgid "Permission"
1261 1227
 msgstr "许可"
1262 1228
 
1263  
-#: models/auth.py:11 models/auth.py:58
  1229
+#: models/auth.py:11
  1230
+#: models/auth.py:58
1264 1231
 msgid "Permissions"
1265 1232
 msgstr "许可"
1266 1233
 
@@ -1268,7 +1235,8 @@ msgstr "许可"
1268 1235
 msgid "Group"
1269 1236
 msgstr "组"
1270 1237
 
1271  
-#: models/auth.py:23 models/auth.py:60
  1238
+#: models/auth.py:23
  1239
+#: models/auth.py:60
1272 1240
 msgid "Groups"
1273 1241
 msgstr "组"
1274 1242
 
@@ -1321,11 +1289,8 @@ msgid "date joined"
1321 1289
 msgstr "加入日期"
1322 1290
 
1323 1291
 #: models/auth.py:44
1324  
-msgid ""
1325  
-"In addition to the permissions manually assigned, this user will also get "
1326  
-"all permissions granted to each group he/she is in."
1327  
-msgstr ""
1328  
-"除了手动设置权限以外,用户也会从他(她)所在的小组获得所赋组小组的所有权限。"
  1292
+msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
  1293
+msgstr "除了手动设置权限以外,用户也会从他(她)所在的小组获得所赋组小组的所有权限。"
1329 1294
 
1330 1295
 #: models/auth.py:48
1331 1296
 msgid "Users"
@@ -1419,7 +1384,9 @@ msgstr "瑞典语"
1419 1384
 msgid "Simplified Chinese"
1420 1385
 msgstr "简体中文"
1421 1386
 
1422  
-#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
  1387
+#: core/formfields.py:59
  1388
+#: core/meta/fields.py:285
  1389
+#: core/meta/fields.py:488
1423 1390
 #: core/meta/fields.py:499
1424 1391
 msgid "This field is required."
1425 1392
 msgstr "这个字段是必输项。"
@@ -1434,7 +1401,9 @@ msgstr[0] "确定你输入的文本少于 %s 个字符。"
1434 1401
 msgid "Line breaks are not allowed here."
1435 1402
 msgstr "这里不允许换行符。"
1436 1403
 
1437  
-#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
  1404
+#: core/formfields.py:436
  1405
+#: core/formfields.py:507
  1406
+#: core/formfields.py:545
1438 1407
 #, python-format
1439 1408
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
1440 1409
 msgstr "选择一个有效的选项: '%(data)s' 不在 %(choices)s 中。"
@@ -1520,9 +1489,7 @@ msgid "Enter a valid e-mail address."
1520 1489
 msgstr "输入一个有效的邮件地址。"
1521 1490
 
1522 1491
 #: core/validators.py:150
1523  
-msgid ""
1524  
-"Upload a valid image. The file you uploaded was either not an image or a "
1525  
-"corrupted image."
  1492
+msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
1526 1493
 msgstr "上传一个有效的图片。您所上传的文件或者不是图片或是一个破坏的图片。"
1527 1494
 
1528 1495
 #: core/validators.py:157
@@ -1563,7 +1530,8 @@ msgstr "格式错误的 XML: %s"
1563 1530
 msgid "Invalid URL: %s"
1564 1531
 msgstr "无效 URL: %s"
1565 1532
 
1566  
-#: core/validators.py:208 core/validators.py:210
  1533
+#: core/validators.py:208
  1534
+#: core/validators.py:210
1567 1535
 #, python-format
1568 1536
 msgid "The URL %s is a broken link."
1569 1537
 msgstr "URL %s 是一个断开的链接。"
@@ -1587,7 +1555,8 @@ msgstr "这个字段必须与 '%s' 字段相匹配。"
1587 1555
 msgid "Please enter something for at least one field."
1588 1556
 msgstr "请至少在一个字段上输入些什么。"
1589 1557
 
1590  
-#: core/validators.py:266 core/validators.py:277
  1558
+#: core/validators.py:266
  1559
+#: core/validators.py:277
1591 1560
 msgid "Please enter both fields or leave them both empty."
1592 1561
 msgstr "请要么两个字段都输入或者两个字段都空着。"
1593 1562
 
@@ -1617,15 +1586,13 @@ msgstr "请输入一个有效的小数。"
1617 1586
 #: core/validators.py:351
1618 1587
 #, python-format
1619 1588
 msgid "Please enter a valid decimal number with at most %s total digit."
1620  
-msgid_plural ""
1621  
-"Please enter a valid decimal number with at most %s total digits."
  1589
+msgid_plural "Please enter a valid decimal number with at most %s total digits."
1622 1590
 msgstr[0] "请输入一个有效的小数,最多 %s 个数字。 "
1623 1591
 
1624 1592
 #: core/validators.py:354
1625 1593
 #, python-format
1626 1594
 msgid "Please enter a valid decimal number with at most %s decimal place."
1627  
-msgid_plural ""
1628  
-"Please enter a valid decimal number with at most %s decimal places."
  1595
+msgid_plural "Please enter a valid decimal number with at most %s decimal places."
1629 1596
 msgstr[0] "请输入一个有效的小数,最多 %s 个小数位。 "
1630 1597
 
1631 1598
 #: core/validators.py:364
@@ -1653,57 +1620,38 @@ msgstr "不能从 %s 得到任何东西。"
1653 1620
 
1654 1621
 #: core/validators.py:431
1655 1622
 #, python-format
1656  
-msgid ""
1657  
-"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
  1623
+msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
1658 1624
 msgstr "URL %(url)s 返回了无效的 Content-Type 头 '%(contenttype)s'。"
1659 1625
 
1660 1626
 #: core/validators.py:464
1661 1627
 #, python-format
1662  
-msgid ""
1663  
-"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
1664  
-"\"%(start)s\".)"
1665  
-msgstr ""
1666  
-"请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)"
  1628
+msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
  1629
+msgstr "请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)"
1667 1630
 
1668 1631
 #: core/validators.py:468
1669 1632
 #, python-format
1670  
-msgid ""
1671  
-"Some text starting on line %(line)s is not allowed in that context. (Line "
1672  
-"starts with \"%(start)s\".)"
1673  
-msgstr ""
1674  
-"在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)"
  1633
+msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
  1634
+msgstr "在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)"
1675 1635
 
1676 1636
 #: core/validators.py:473
1677 1637
 #, python-format
1678  
-msgid ""
1679  
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
1680  
-"(start)s\".)"
1681  
-msgstr ""
1682  
-"在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)"
  1638
+msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
  1639
+msgstr "在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)"
1683 1640
 
1684 1641
 #: core/validators.py:478
1685 1642
 #, python-format
1686  
-msgid ""
1687  
-"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
1688  
-"(start)s\".)"
1689  
-msgstr ""
1690  
-"在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)"
  1643
+msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
  1644
+msgstr "在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)"
1691 1645
 
1692 1646
 #: core/validators.py:482
1693 1647
 #, python-format
1694  
-msgid ""
1695  
-"A tag on line %(line)s is missing one or more required attributes. (Line "
1696  
-"starts with \"%(start)s\".)"
1697  
-msgstr ""
1698  
-"在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)"
  1648
+msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
  1649
+msgstr "在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)"
1699 1650
 
1700 1651
 #: core/validators.py:487
1701 1652
 #, python-format
1702  
-msgid ""
1703  
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
1704  
-"starts with \"%(start)s\".)"
1705  
-msgstr ""
1706  
-"在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
  1653
+msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
  1654
+msgstr "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
1707 1655
 
1708 1656
 #: core/meta/fields.py:46
1709 1657
 #, python-format
@@ -1720,8 +1668,7 @@ msgid " Separate multiple IDs with commas."
1720 1668
 msgstr " 用逗号分隔多个ID。"
1721 1669
 
1722 1670
 #: core/meta/fields.py:132
1723  
-msgid ""
1724  
-" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
  1671
+msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
1725 1672
 msgstr " 按下 \"Control\",或者在Mac上按 \"Command\" 来选择一个或多个值。"
1726 1673
 
1727 1674
 #: core/meta/fields.py:508
@@ -1731,14 +1678,14 @@ msgstr "输入一个有效的文件名。"
1731 1678
 #: core/meta/fields.py:777
1732 1679
 #, python-format
1733 1680
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
1734  
-msgid_plural ""
1735  
-"Please enter valid %(self)s IDs. The values %(value)r are invalid."
  1681
+msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
1736 1682
 msgstr[0] "请输入有效的 %(self)s ID。值 %(value)r 无效。"
1737 1683
 
1738 1684
 #: core/template/defaultfilters.py:354
1739 1685
 msgid "yes,no,maybe"
1740  
-msgstr ""
  1686
+msgstr "是、否、也许"
1741 1687
 
1742 1688
 #, fuzzy
1743 1689
 #~ msgid "count"
1744 1690
 #~ msgstr "内容"
  1691
+

0 notes on commit 4040b99

Please sign in to comment.
Something went wrong with that request. Please try again.