Ticket #8859: patchfile

File patchfile, 20.1 KB (added by Zhe Zhang, 16 years ago)

patchfile of locale/zh-CN/django.po

Line 
1Index: django/conf/locale/zh_CN/LC_MESSAGES/django.po
2===================================================================
3--- django/conf/locale/zh_CN/LC_MESSAGES/django.po (revision 8958)
4+++ django/conf/locale/zh_CN/LC_MESSAGES/django.po (working copy)
5@@ -126,7 +126,7 @@
6
7 #: conf/global_settings.py:71
8 msgid "Khmer"
9-msgstr "高棉"
10+msgstr "高棉语"
11
12 #: conf/global_settings.py:72
13 msgid "Kannada"
14@@ -210,7 +210,7 @@
15
16 #: conf/global_settings.py:92
17 msgid "Traditional Chinese"
18-msgstr "正体中文"
19+msgstr "繁体中文"
20
21 #: contrib/admin/filterspecs.py:44
22 #, python-format
23@@ -385,7 +385,7 @@
24 #: contrib/admin/views/decorators.py:16
25 #: contrib/auth/forms.py:80
26 msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
27-msgstr "请输入正确的用户名和口令。请注意两者都是大小写敏感的。"
28+msgstr "请输入正确的用户名和密码。请注意两者都是大小写敏感的。"
29
30 #: contrib/admin/sites.py:242
31 #: contrib/admin/views/decorators.py:68
32@@ -395,7 +395,7 @@
33 #: contrib/admin/sites.py:249
34 #: contrib/admin/views/decorators.py:75
35 msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
36-msgstr "似乎你的浏览器没有配置为接受 cookie 。请允许 cookie,重新装入本页面,再试一次。"
37+msgstr "似乎你的浏览器没有配置为接受 cookie 。请允许 cookie,再刷新本页面,重试一次。"
38
39 #: contrib/admin/sites.py:265
40 #: contrib/admin/sites.py:271
41@@ -502,7 +502,7 @@
42
43 #: contrib/admin/templates/admin/500.html:10
44 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."
45-msgstr "发生了一个错误。它已经通过电子邮件报告给站点管理员了,而且应该很快会得到解决。感谢您的耐心。"
46+msgstr "发生了一个错误。系统已将错误通过电子邮件报告给了站点管理员,相信问题应该会很快得到解决。感谢您的耐心。"
47
48 #: contrib/admin/templates/admin/app_index.html:10
49 #: contrib/admin/templates/admin/index.html:19
50@@ -527,7 +527,7 @@
51 #: contrib/admin/templates/registration/password_change_done.html:3
52 #: contrib/admin/templates/registration/password_change_form.html:3
53 msgid "Change password"
54-msgstr "修改口令"
55+msgstr "修改密码"
56
57 #: contrib/admin/templates/admin/base.html:25
58 #: contrib/admin/templates/registration/password_change_done.html:3
59@@ -634,7 +634,7 @@
60
61 #: contrib/admin/templates/admin/login.html:22
62 msgid "Password:"
63-msgstr "口令:"
64+msgstr "密码:"
65
66 #: contrib/admin/templates/admin/object_history.html:22
67 msgid "Date/time"
68@@ -695,7 +695,7 @@
69
70 #: contrib/admin/templates/admin/auth/user/add_form.html:6
71 msgid "First, enter a username and password. Then, you'll be able to edit more user options."
72-msgstr "首先,输入一个用户名和口令。然后,你就可以编辑更多的用户选项。"
73+msgstr "首先,输入一个用户名和密码。然后,你就可以编辑更多的用户选项。"
74
75 #: contrib/admin/templates/admin/auth/user/add_form.html:13
76 #: contrib/auth/forms.py:14
77@@ -710,23 +710,23 @@
78 #: contrib/auth/forms.py:60
79 #: contrib/auth/forms.py:184
80 msgid "Password"
81-msgstr "口令"
82+msgstr "密码"
83
84 #: contrib/admin/templates/admin/auth/user/add_form.html:26
85 #: contrib/admin/templates/admin/auth/user/change_password.html:39
86 #: contrib/auth/forms.py:185
87 msgid "Password (again)"
88-msgstr "口令(重复)"
89+msgstr "密码(重复)"
90
91 #: contrib/admin/templates/admin/auth/user/add_form.html:27
92 #: contrib/admin/templates/admin/auth/user/change_password.html:40
93 msgid "Enter the same password as above, for verification."
94-msgstr "为了校验,输入与上面相同的口令。"
95+msgstr "为了校验,输入与上面相同的密码。"
96
97 #: contrib/admin/templates/admin/auth/user/change_password.html:26
98 #, python-format
99 msgid "Enter a new password for the user <strong>%(username)s</strong>."
100-msgstr "为用户<strong>%(username)s</strong>输入一个新的口令。"
101+msgstr "为用户 <strong>%(username)s</strong> 输入一个新的密码。"
102
103 #: contrib/admin/templates/admin/edit_inline/tabular.html:15
104 msgid "Delete?"
105@@ -745,39 +745,39 @@
106 #: contrib/admin/templates/registration/password_change_form.html:6
107 #: contrib/admin/templates/registration/password_change_form.html:10
108 msgid "Password change"
109-msgstr "口令修改"
110+msgstr "密码修改"
111
112 #: contrib/admin/templates/registration/password_change_done.html:6
113 #: contrib/admin/templates/registration/password_change_done.html:10
114 msgid "Password change successful"
115-msgstr "口令修改成功"
116+msgstr "密码修改成功"
117
118 #: contrib/admin/templates/registration/password_change_done.html:12
119 msgid "Your password was changed."
120-msgstr "你的口令已修改。"
121+msgstr "你的密码已修改。"
122
123 #: contrib/admin/templates/registration/password_change_form.html:12
124 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."
125-msgstr "请输入你的旧口令,为了安全起见,接着要输入两遍新口令,以便我们校验你输入的是否正确。"
126+msgstr "请输入你的旧密码,为了安全起见,接着要输入两遍新密码,以便我们校验你输入的是否正确。"
127
128 #: contrib/admin/templates/registration/password_change_form.html:17
129 msgid "Old password:"
130-msgstr "旧口令:"
131+msgstr "旧密码:"
132
133 #: contrib/admin/templates/registration/password_change_form.html:19
134 #: contrib/admin/templates/registration/password_reset_confirm.html:18
135 msgid "New password:"
136-msgstr "新口令:"
137+msgstr "新密码:"
138
139 #: contrib/admin/templates/registration/password_change_form.html:21
140 #: contrib/admin/templates/registration/password_reset_confirm.html:20
141 msgid "Confirm password:"
142-msgstr "确认口令:"
143+msgstr "确认密码:"
144
145 #: contrib/admin/templates/registration/password_change_form.html:23
146 #: contrib/admin/templates/registration/password_reset_confirm.html:21
147 msgid "Change my password"
148-msgstr "修改我的口令"
149+msgstr "修改我的密码"
150
151 #: contrib/admin/templates/registration/password_reset_complete.html:4
152 #: contrib/admin/templates/registration/password_reset_confirm.html:6
153@@ -786,32 +786,32 @@
154 #: contrib/admin/templates/registration/password_reset_form.html:6
155 #: contrib/admin/templates/registration/password_reset_form.html:10
156 msgid "Password reset"
157-msgstr "口令重设"
158+msgstr "密码重设"
159
160 #: contrib/admin/templates/registration/password_reset_complete.html:6
161 #: contrib/admin/templates/registration/password_reset_complete.html:10
162 msgid "Password reset complete"
163-msgstr "完成口令重设"
164+msgstr "完成密码重设"
165
166 #: contrib/admin/templates/registration/password_reset_complete.html:12
167 msgid "Your password has been set. You may go ahead and log in now."
168-msgstr "你的口令尚未设置。现在你可以继续进行登录。"
169+msgstr "你的密码尚未设置。现在你可以继续进行登录。"
170
171 #: contrib/admin/templates/registration/password_reset_confirm.html:4
172 msgid "Password reset confirmation"
173-msgstr "口令重设确认"
174+msgstr "密码重设确认"
175
176 #: contrib/admin/templates/registration/password_reset_confirm.html:12
177 msgid "Enter new password"
178-msgstr "输入新口令"
179+msgstr "输入新密码"
180
181 #: contrib/admin/templates/registration/password_reset_confirm.html:14
182 msgid "Please enter your new password twice so we can verify you typed it in correctly."
183-msgstr "请输入两遍新口令,以便我们校验你输入的是否正确。"
184+msgstr "请输入两遍新密码,以便我们校验你输入的是否正确。"
185
186 #: contrib/admin/templates/registration/password_reset_confirm.html:26
187 msgid "Password reset unsuccessful"
188-msgstr "口令重设失败"
189+msgstr "密码重设失败"
190
191 #: contrib/admin/templates/registration/password_reset_confirm.html:28
192 msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
193@@ -820,15 +820,15 @@
194 #: contrib/admin/templates/registration/password_reset_done.html:6
195 #: contrib/admin/templates/registration/password_reset_done.html:10
196 msgid "Password reset successful"
197-msgstr "口令重设成功"
198+msgstr "密码重设成功"
199
200 #: contrib/admin/templates/registration/password_reset_done.html:12
201 msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly."
202-msgstr "我们已经按你所提交的邮箱地址发送了口令设置说明。你应该很快就能收到这封邮件。"
203+msgstr "我们已经按你所提交的电子邮箱地址发送了密码设置说明。你应该很快就能收到这封邮件。"
204
205 #: contrib/admin/templates/registration/password_reset_email.html:2
206 msgid "You're receiving this e-mail because you requested a password reset"
207-msgstr "之所以收到这封邮件,是因为你请求了口令重设"
208+msgstr "之所以收到这封邮件,是因为你请求了密码重设"
209
210 #: contrib/admin/templates/registration/password_reset_email.html:3
211 #, python-format
212@@ -837,7 +837,7 @@
213
214 #: contrib/admin/templates/registration/password_reset_email.html:5
215 msgid "Please go to the following page and choose a new password:"
216-msgstr "请访问该页面并选择一个新的密码:"
217+msgstr "请访问该页面并选择一个新密码:"
218
219 #: contrib/admin/templates/registration/password_reset_email.html:9
220 msgid "Your username, in case you've forgotten:"
221@@ -854,7 +854,7 @@
222
223 #: contrib/admin/templates/registration/password_reset_form.html:12
224 msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one."
225-msgstr "忘记了你的口令?请在下面输入你的 e-mail 地址,我们将把新口令设置说明通过邮件发送给你。"
226+msgstr "忘记了你的密码?请在下面输入你的 e-mail 地址,我们将把新密码设置说明通过邮件发送给你。"
227
228 #: contrib/admin/templates/registration/password_reset_form.html:16
229 msgid "E-mail address:"
230@@ -862,7 +862,7 @@
231
232 #: contrib/admin/templates/registration/password_reset_form.html:16
233 msgid "Reset my password"
234-msgstr "重设我的口令"
235+msgstr "重设我的密码"
236
237 #: contrib/admin/templatetags/admin_list.py:284
238 msgid "All dates"
239@@ -958,13 +958,13 @@
240
241 #: contrib/admindocs/views.py:318
242 msgid "Boolean (Either True or False)"
243-msgstr "布尔(True或False)"
244+msgstr "布尔值(真或假)"
245
246 #: contrib/admindocs/views.py:319
247 #: contrib/admindocs/views.py:338
248 #, python-format
249 msgid "String (up to %(max_length)s)"
250-msgstr "字符串(最长 %(max_length)s)"
251+msgstr "字符串(最长 %(max_length)s 位)"
252
253 #: contrib/admindocs/views.py:320
254 msgid "Comma-separated integers"
255@@ -972,11 +972,11 @@
256
257 #: contrib/admindocs/views.py:321
258 msgid "Date (without time)"
259-msgstr "日期(无时间)"
260+msgstr "日期(无时间)"
261
262 #: contrib/admindocs/views.py:322
263 msgid "Date (with time)"
264-msgstr "日期(带时间)"
265+msgstr "日期(带时间)"
266
267 #: contrib/admindocs/views.py:323
268 msgid "Decimal number"
269@@ -1003,7 +1003,7 @@
270
271 #: contrib/admindocs/views.py:333
272 msgid "Boolean (Either True, False or None)"
273-msgstr "布尔值(True, False或None)"
274+msgstr "布尔值(真、假或无)"
275
276 #: contrib/admindocs/views.py:334
277 msgid "Relation to parent model"
278@@ -1072,7 +1072,7 @@
279
280 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:19
281 msgid "Jumps you from any page to the documentation for the view that generates that page."
282-msgstr "从任何页面跳转到生成该页面的view文档。"
283+msgstr "从任何页面跳转到生成该页面的 view 文档。"
284
285 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:21
286 msgid "Show object ID"
287@@ -1080,7 +1080,7 @@
288
289 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:22
290 msgid "Shows the content-type and unique ID for pages that represent a single object."
291-msgstr "为那些展现单个对象的页面,显示 content-type 和唯一ID。"
292+msgstr "为那些展现单个对象的页面,显示 content-type 和唯一 ID。"
293
294 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:24
295 msgid "Edit this object (current window)"
296@@ -1120,18 +1120,18 @@
297
298 #: contrib/auth/admin.py:88
299 msgid "Password changed successfully."
300-msgstr "口令修改成功。"
301+msgstr "密码修改成功。"
302
303 #: contrib/auth/admin.py:94
304 #, python-format
305 msgid "Change password: %s"
306-msgstr "修改口令:%s"
307+msgstr "修改密码:%s"
308
309 #: contrib/auth/forms.py:15
310 #: contrib/auth/forms.py:48
311 #: contrib/auth/models.py:136
312 msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
313-msgstr "必填。不多于30个字符。只能用字母数字(字母、数字和下横线)"
314+msgstr "必填。不多于30个字符。只能用字母、数字和下划线。"
315
316 #: contrib/auth/forms.py:16
317 #: contrib/auth/forms.py:49
318@@ -1140,7 +1140,7 @@
319
320 #: contrib/auth/forms.py:18
321 msgid "Password confirmation"
322-msgstr "口令确认"
323+msgstr "密码确认"
324
325 #: contrib/auth/forms.py:30
326 msgid "A user with that username already exists."
327@@ -1150,7 +1150,7 @@
328 #: contrib/auth/forms.py:154
329 #: contrib/auth/forms.py:196
330 msgid "The two password fields didn't match."
331-msgstr "两个口令字段不一致。"
332+msgstr "两个密码字段不一致。"
333
334 #: contrib/auth/forms.py:82
335 msgid "This account is inactive."
336@@ -1158,7 +1158,7 @@
337
338 #: contrib/auth/forms.py:87
339 msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
340-msgstr "你的浏览器好象不允许使用cookie。登录需要使用cookie。"
341+msgstr "你的浏览器好象不允许使用cookie。登录需要使用启用cookie。"
342
343 #: contrib/auth/forms.py:100
344 msgid "E-mail"
345@@ -1171,23 +1171,23 @@
346 #: contrib/auth/forms.py:134
347 #, python-format
348 msgid "Password reset on %s"
349-msgstr "口令重设于 %s"
350+msgstr "密码重设于 %s"
351
352 #: contrib/auth/forms.py:142
353 msgid "New password"
354-msgstr "新口令"
355+msgstr "新密码"
356
357 #: contrib/auth/forms.py:143
358 msgid "New password confirmation"
359-msgstr "新口令确认"
360+msgstr "新密码确认"
361
362 #: contrib/auth/forms.py:168
363 msgid "Old password"
364-msgstr "旧口令"
365+msgstr "旧密码"
366
367 #: contrib/auth/forms.py:176
368 msgid "Your old password was entered incorrectly. Please enter it again."
369-msgstr "你的旧口令不正确。请重新输入。"
370+msgstr "你的旧密码不正确。请重新输入。"
371
372 #: contrib/auth/models.py:72
373 #: contrib/auth/models.py:95
374@@ -1234,7 +1234,7 @@
375
376 #: contrib/auth/models.py:140
377 msgid "password"
378-msgstr "口令"
379+msgstr "密码"
380
381 #: contrib/auth/models.py:140
382 msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
383@@ -1353,7 +1353,7 @@
384
385 #: contrib/comments/models.py:56
386 msgid "date/time submitted"
387-msgstr "日期/时间已提交"
388+msgstr "提交日期/时间"
389
390 #: contrib/comments/models.py:58
391 msgid "is public"
392@@ -1361,7 +1361,7 @@
393
394 #: contrib/comments/models.py:59
395 msgid "Uncheck this box to make the comment effectively disappear from the site."
396-msgstr "反选此框,使该评论从本站点消失。"
397+msgstr "取消选中此复选框,可隐藏该条评论。"
398
399 #: contrib/comments/models.py:61
400 msgid "is removed"
401@@ -1369,15 +1369,15 @@
402
403 #: contrib/comments/models.py:62
404 msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
405-msgstr "若评论内容不妥,则选中这个检查框。该评论将被一条\"此评论已经被删除\"的消息所替换。"
406+msgstr "若评论内容不妥,则选中这个复选框。该评论将被一条\"此评论已经被删除\"的消息所替换。"
407
408 #: contrib/comments/models.py:114
409 msgid "This comment was posted by an authenticated user and thus the name is read-only."
410-msgstr "此评论由一位验证用户张贴,而该名称是只读的。"
411+msgstr "此评论由一位验证用户发表,因此该用户名是只读的。"
412
413 #: contrib/comments/models.py:123
414 msgid "This comment was posted by an authenticated user and thus the email is read-only."
415-msgstr "此评论由一位验证用户张贴,而该 email 是只读的。"
416+msgstr "此评论由一位验证用户发表,因此该 email 是只读的。"
417
418 #: contrib/comments/models.py:148
419 #, python-format
420@@ -1408,11 +1408,11 @@
421
422 #: contrib/flatpages/admin.py:9
423 msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
424-msgstr "例如:'/about/contact/'。请确保前导和结尾的斜杠。"
425+msgstr "例如:'/about/contact/'。请确保开始和结尾的斜杠。"
426
427 #: contrib/flatpages/admin.py:11
428 msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
429-msgstr "该值只能包含字母、数字、下划线、反斜线和斜线。"
430+msgstr "该值只能包含字母、数字、下划线、斜线或反斜线。"
431
432 #: contrib/flatpages/admin.py:22
433 msgid "Advanced options"
434@@ -1456,7 +1456,7 @@
435
436 #: contrib/formtools/wizard.py:130
437 msgid "We apologize, but your form has expired. Please continue filling out the form from this page."
438-msgstr "很抱歉,但是你的表单已过期。请继续填写本页中的表单其余部分。"
439+msgstr "很抱歉,但是你的表单已过期。请继续填写本页中表单的其余部分。"
440
441 #: contrib/gis/forms/fields.py:14
442 msgid "No geometry value provided."
443@@ -1668,39 +1668,39 @@
444
445 #: contrib/localflavor/ch/ch_states.py:6
446 msgid "Appenzell Innerrhoden"
447-msgstr "Appenzell Innerrhoden"
448+msgstr "内阿彭策尔半州"
449
450 #: contrib/localflavor/ch/ch_states.py:7
451 msgid "Appenzell Ausserrhoden"
452-msgstr "Appenzell Ausserrhoden"
453+msgstr "外阿彭策尔半州"
454
455 #: contrib/localflavor/ch/ch_states.py:8
456 msgid "Basel-Stadt"
457-msgstr "Basel-Stadt"
458+msgstr "巴塞尔城半州"
459
460 #: contrib/localflavor/ch/ch_states.py:9
461 msgid "Basel-Land"
462-msgstr "Basel-Land"
463+msgstr "巴塞尔乡半州"
464
465 #: contrib/localflavor/ch/ch_states.py:10
466 msgid "Berne"
467-msgstr "伯尔尼"
468+msgstr "伯尔尼州"
469
470 #: contrib/localflavor/ch/ch_states.py:11
471 msgid "Fribourg"
472-msgstr "弗里堡"
473+msgstr "弗里堡州"
474
475 #: contrib/localflavor/ch/ch_states.py:12
476 msgid "Geneva"
477-msgstr "日内瓦"
478+msgstr "日内瓦州"
479
480 #: contrib/localflavor/ch/ch_states.py:13
481 msgid "Glarus"
482-msgstr "格拉鲁斯"
483+msgstr "格拉鲁斯州"
484
485 #: contrib/localflavor/ch/ch_states.py:14
486 msgid "Graubuenden"
487-msgstr "Graubuenden"
488+msgstr "格劳宾登州"
489
490 #: contrib/localflavor/ch/ch_states.py:15
491 msgid "Jura"
492@@ -1708,23 +1708,23 @@
493
494 #: contrib/localflavor/ch/ch_states.py:16
495 msgid "Lucerne"
496-msgstr "琉森"
497+msgstr "琉森州"
498
499 #: contrib/localflavor/ch/ch_states.py:17
500 msgid "Neuchatel"
501-msgstr "纳沙特尔"
502+msgstr "纳沙特尔州"
503
504 #: contrib/localflavor/ch/ch_states.py:18
505 msgid "Nidwalden"
506-msgstr "下瓦尔登"
507+msgstr "下瓦尔登州"
508
509 #: contrib/localflavor/ch/ch_states.py:19
510 msgid "Obwalden"
511-msgstr "上瓦尔登"
512+msgstr "上瓦尔登州"
513
514 #: contrib/localflavor/ch/ch_states.py:20
515 msgid "Schaffhausen"
516-msgstr "沙夫豪森"
517+msgstr "沙夫豪森州"
518
519 #: contrib/localflavor/ch/ch_states.py:21
520 msgid "Schwyz"
521@@ -1732,15 +1732,15 @@
522
523 #: contrib/localflavor/ch/ch_states.py:22
524 msgid "Solothurn"
525-msgstr "索洛"
526+msgstr "索洛图恩州"
527
528 #: contrib/localflavor/ch/ch_states.py:23
529 msgid "St. Gallen"
530-msgstr "圣加仑"
531+msgstr "圣加仑州"
532
533 #: contrib/localflavor/ch/ch_states.py:24
534 msgid "Thurgau"
535-msgstr "高州"
536+msgstr "图尔高州"
537
538 #: contrib/localflavor/ch/ch_states.py:25
539 msgid "Ticino"
540@@ -1748,7 +1748,7 @@
541
542 #: contrib/localflavor/ch/ch_states.py:26
543 msgid "Uri"
544-msgstr "Uri"
545+msgstr "乌里州"
546
547 #: contrib/localflavor/ch/ch_states.py:27
548 msgid "Valais"
549@@ -1760,11 +1760,11 @@
550
551 #: contrib/localflavor/ch/ch_states.py:29
552 msgid "Zug"
553-msgstr "楚格"
554+msgstr "楚格州"
555
556 #: contrib/localflavor/ch/ch_states.py:30
557 msgid "Zurich"
558-msgstr "苏黎世"
559+msgstr "苏黎世州"
560
561 #: contrib/localflavor/ch/forms.py:64
562 msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
563@@ -1922,7 +1922,7 @@
564
565 #: contrib/localflavor/es/es_provinces.py:21
566 msgid "Girona"
567-msgstr "Girona"
568+msgstr "西罗纳"
569
570 #: contrib/localflavor/es/es_provinces.py:22
571 msgid "Granada"
Back to Top