Changeset 9059

Timestamp:

09/17/08 01:59:24 (4 months ago)

Author:

mtredinnick

Message:

Fixed #8859 -- Some improvements to the Mandarin Chinese translation. Thanks, zhe.

Files:

• django/trunk/django/conf/locale/zh_CN/LC_MESSAGES/django.mo (modified) (previous)
• django/trunk/django/conf/locale/zh_CN/LC_MESSAGES/django.po (modified) (40 diffs)

django/trunk/django/conf/locale/zh_CN/LC_MESSAGES/django.po

@@ -127 +127 @@
-#: conf/global_settings.py:71
-msgid "Khmer"
-
+语
-
-#: conf/global_settings.py:72
@@ -211 +211 @@
-#: conf/global_settings.py:92
-msgid "Traditional Chinese"
-正
+繁
-
-#: contrib/admin/filterspecs.py:44
@@ -386 +386 @@
-#: contrib/auth/forms.py:80
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
-口令
+密码
-
-#: contrib/admin/sites.py:242
@@ -396 +396 @@
-#: contrib/admin/views/decorators.py:75
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-重新装入本页面，再
+再刷新本页面，重
-
-#: contrib/admin/sites.py:265
@@ -503 +503 @@
-#: contrib/admin/templates/admin/500.html:10
-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."
-它已经通过电子邮件报告给站点管理员了，而且应该很快会
+系统已将错误通过电子邮件报告给了站点管理员，相信问题应该会很快
-
-#: contrib/admin/templates/admin/app_index.html:10
@@ -528 +528 @@
-#: contrib/admin/templates/registration/password_change_form.html:3
-msgid "Change password"
-口令
+密码
-
-#: contrib/admin/templates/admin/base.html:25
@@ -635 +635 @@
-#: contrib/admin/templates/admin/login.html:22
-msgid "Password:"
-口令
+密码
-
-#: contrib/admin/templates/admin/object_history.html:22
@@ -696 +696 @@
-#: contrib/admin/templates/admin/auth/user/add_form.html:6
-msgid "First, enter a username and password. Then, you'll be able to edit more user options."
-口令
+密码
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:13
@@ -711 +711 @@
-#: contrib/auth/forms.py:184
-msgid "Password"
-口令
+密码
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:26
@@ -717 +717 @@
-#: contrib/auth/forms.py:185
-msgid "Password (again)"
-口令
+密码
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:27
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
-msgid "Enter the same password as above, for verification."
-口令
+密码
-
-#: contrib/admin/templates/admin/auth/user/change_password.html:26
-#, python-format
-msgid "Enter a new password for the user <strong>%(username)s</strong>."
-<strong>%(username)s</strong>输入一个新的口令
+ <strong>%(username)s</strong> 输入一个新的密码
-
-#: contrib/admin/templates/admin/edit_inline/tabular.html:15
@@ -746 +746 @@
-#: contrib/admin/templates/registration/password_change_form.html:10
-msgid "Password change"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-口令
+密码
-
-#: contrib/admin/templates/registration/password_change_form.html:12
-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."
-口令，为了安全起见，接着要输入两遍新口令
+密码，为了安全起见，接着要输入两遍新密码
-
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_change_form.html:19
-#: contrib/admin/templates/registration/password_reset_confirm.html:18
-msgid "New password:"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_change_form.html:21
-#: contrib/admin/templates/registration/password_reset_confirm.html:20
-msgid "Confirm password:"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_change_form.html:23
-#: contrib/admin/templates/registration/password_reset_confirm.html:21
-msgid "Change my password"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_complete.html:4
@@ -787 +787 @@
-#: contrib/admin/templates/registration/password_reset_form.html:10
-msgid "Password reset"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_complete.html:6
-#: contrib/admin/templates/registration/password_reset_complete.html:10
-msgid "Password reset complete"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_complete.html:12
-msgid "Your password has been set.  You may go ahead and log in now."
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_confirm.html:4
-msgid "Password reset confirmation"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_confirm.html:12
-msgid "Enter new password"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_confirm.html:14
-msgid "Please enter your new password twice so we can verify you typed it in correctly."
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_confirm.html:26
-msgid "Password reset unsuccessful"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_confirm.html:28
@@ -821 +821 @@
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly."
-邮箱地址发送了口令
+电子邮箱地址发送了密码
-
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-口令
+密码
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
@@ -838 +838 @@
-#: contrib/admin/templates/registration/password_reset_email.html:5
-msgid "Please go to the following page and choose a new password:"
-的
+
-
-#: contrib/admin/templates/registration/password_reset_email.html:9
@@ -855 +855 @@
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one."
-口令？请在下面输入你的 e-mail 地址，我们将把新口令
+密码？请在下面输入你的 e-mail 地址，我们将把新密码
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
@@ -863 +863 @@
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-口令
+密码
-
-#: contrib/admin/templatetags/admin_list.py:284
@@ -959 +959 @@
-#: contrib/admindocs/views.py:318
-msgid "Boolean (Either True or False)"
-(True或False)
+值（真或假）
-
-#: contrib/admindocs/views.py:319
@@ -965 +965 @@
-#, python-format
-msgid "String (up to %(max_length)s)"
-(最长 %(max_length)s)
+（最长 %(max_length)s 位）
-
-#: contrib/admindocs/views.py:320
@@ -973 +973 @@
-#: contrib/admindocs/views.py:321
-msgid "Date (without time)"
-(无时间)
+（无时间）
-
-#: contrib/admindocs/views.py:322
-msgid "Date (with time)"
-(带时间)
+（带时间）
-
-#: contrib/admindocs/views.py:323
@@ -1004 +1004 @@
-#: contrib/admindocs/views.py:333
-msgid "Boolean (Either True, False or None)"
-(True, False或None
+（真、假或无
-
-#: contrib/admindocs/views.py:334
@@ -1073 +1073 @@
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:19
-msgid "Jumps you from any page to the documentation for the view that generates that page."
-view
+ view 
-
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:21
@@ -1081 +1081 @@
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:22
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-
+ 
-
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:24
@@ -1121 +1121 @@
-#: contrib/auth/admin.py:88
-msgid "Password changed successfully."
-口令
+密码
-
-#: contrib/auth/admin.py:94
-#, python-format
-msgid "Change password: %s"
-口令
+密码
-
-#: contrib/auth/forms.py:15
@@ -1132 +1132 @@
-#: contrib/auth/models.py:136
-msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
-数字（字母、数字和下横线）
+、数字和下划线。
-
-#: contrib/auth/forms.py:16
@@ -1141 +1141 @@
-#: contrib/auth/forms.py:18
-msgid "Password confirmation"
-口令
+密码
-
-#: contrib/auth/forms.py:30
@@ -1151 +1151 @@
-#: contrib/auth/forms.py:196
-msgid "The two password fields didn't match."
-口令
+密码
-
-#: contrib/auth/forms.py:82
@@ -1159 +1159 @@
-#: contrib/auth/forms.py:87
-msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
-
+启用
-
-#: contrib/auth/forms.py:100
@@ -1172 +1172 @@
-#, python-format
-msgid "Password reset on %s"
-口令
+密码
-
-#: contrib/auth/forms.py:142
-msgid "New password"
-口令
+密码
-
-#: contrib/auth/forms.py:143
-msgid "New password confirmation"
-口令
+密码
-
-#: contrib/auth/forms.py:168
-msgid "Old password"
-口令
+密码
-
-#: contrib/auth/forms.py:176
-msgid "Your old password was entered incorrectly. Please enter it again."
-口令
+密码
-
-#: contrib/auth/models.py:72
@@ -1235 +1235 @@
-#: contrib/auth/models.py:140
-msgid "password"
-口令
+密码
-
-#: contrib/auth/models.py:140
@@ -1354 +1354 @@
-#: contrib/comments/models.py:56
-msgid "date/time submitted"
-日期/时间已提交
+提交日期/时间
-
-#: contrib/comments/models.py:58
@@ -1362 +1362 @@
-#: contrib/comments/models.py:59
-msgid "Uncheck this box to make the comment effectively disappear from the site."
-反选此框，使该评论从本站点消失
+取消选中此复选框，可隐藏该条评论
-
-#: contrib/comments/models.py:61
@@ -1370 +1370 @@
-#: contrib/comments/models.py:62
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-检查
+复选
-
-#: contrib/comments/models.py:114
-msgid "This comment was posted by an authenticated user and thus the name is read-only."
-张贴，而该名称
+发表，因此该用户名
-
-#: contrib/comments/models.py:123
-msgid "This comment was posted by an authenticated user and thus the email is read-only."
-张贴，而
+发表，因此
-
-#: contrib/comments/models.py:148
@@ -1409 +1409 @@
-#: contrib/flatpages/admin.py:9
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-前导
+开始
-
-#: contrib/flatpages/admin.py:11
-msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
-反斜线和
+斜线或反
-
-#: contrib/flatpages/admin.py:22
@@ -1457 +1457 @@
-#: contrib/formtools/wizard.py:130
-msgid "We apologize, but your form has expired. Please continue filling out the form from this page."
-的表单
+表单的
-
-#: contrib/gis/forms/fields.py:14
@@ -1669 +1669 @@
-#: contrib/localflavor/ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-Appenzell Innerrhoden
+内阿彭策尔半州
-
-#: contrib/localflavor/ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-Appenzell Ausserrhoden
+外阿彭策尔半州
-
-#: contrib/localflavor/ch/ch_states.py:8
-msgid "Basel-Stadt"
-Basel-Stadt
+巴塞尔城半州
-
-#: contrib/localflavor/ch/ch_states.py:9
-msgid "Basel-Land"
-Basel-Land
+巴塞尔乡半州
-
-#: contrib/localflavor/ch/ch_states.py:10
-msgid "Berne"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:11
-msgid "Fribourg"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:12
-msgid "Geneva"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:13
-msgid "Glarus"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:14
-msgid "Graubuenden"
-Graubuenden
+格劳宾登州
-
-#: contrib/localflavor/ch/ch_states.py:15
@@ -1709 +1709 @@
-#: contrib/localflavor/ch/ch_states.py:16
-msgid "Lucerne"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:17
-msgid "Neuchatel"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:18
-msgid "Nidwalden"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:19
-msgid "Obwalden"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:20
-msgid "Schaffhausen"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:21
@@ -1733 +1733 @@
-#: contrib/localflavor/ch/ch_states.py:22
-msgid "Solothurn"
-
+图恩州
-
-#: contrib/localflavor/ch/ch_states.py:23
-msgid "St. Gallen"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:24
-msgid "Thurgau"
-
+图尔
-
-#: contrib/localflavor/ch/ch_states.py:25
@@ -1749 +1749 @@
-#: contrib/localflavor/ch/ch_states.py:26
-msgid "Uri"
-Uri
+乌里州
-
-#: contrib/localflavor/ch/ch_states.py:27
@@ -1761 +1761 @@
-#: contrib/localflavor/ch/ch_states.py:29
-msgid "Zug"
-
+州
-
-#: contrib/localflavor/ch/ch_states.py:30
-msgid "Zurich"
-
+州
-
-#: contrib/localflavor/ch/forms.py:64
@@ -1923 +1923 @@
-#: contrib/localflavor/es/es_provinces.py:21
-msgid "Girona"
-Girona
+西罗纳
-
-#: contrib/localflavor/es/es_provinces.py:22