diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo index 3b04920654..df3bf3f6a0 100644 Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index 1f30a08b15..e9f296a1bf 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: django v1.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:10+0200\n" -"PO-Revision-Date: 2006-09-01 22:05+0800\n" +"PO-Revision-Date: 2007-07-05 12:44+0800\n" "Last-Translator: limodou \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -19,1231 +19,270 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: contrib/comments/models.py:67 -#: contrib/comments/models.py:166 -msgid "object ID" -msgstr "对象ID" - -#: contrib/comments/models.py:68 -msgid "headline" -msgstr "大字标题" - -#: contrib/comments/models.py:69 -#: contrib/comments/models.py:90 -#: contrib/comments/models.py:167 -msgid "comment" -msgstr "评论" - -#: contrib/comments/models.py:70 -msgid "rating #1" -msgstr "等级 #1" - -#: contrib/comments/models.py:71 -msgid "rating #2" -msgstr "等级 #2" - -#: contrib/comments/models.py:72 -msgid "rating #3" -msgstr "等级 #3" - -#: contrib/comments/models.py:73 -msgid "rating #4" -msgstr "等级 #4" - -#: contrib/comments/models.py:74 -msgid "rating #5" -msgstr "等级 #5" - -#: contrib/comments/models.py:75 -msgid "rating #6" -msgstr "等级 #6" - -#: contrib/comments/models.py:76 -msgid "rating #7" -msgstr "等级 #7" - -#: contrib/comments/models.py:77 -msgid "rating #8" -msgstr "等级 #8" - -#: contrib/comments/models.py:82 -msgid "is valid rating" -msgstr "是无效等级" - -#: contrib/comments/models.py:83 -#: contrib/comments/models.py:169 -msgid "date/time submitted" -msgstr "日期/时间已提交" - -#: contrib/comments/models.py:84 -#: contrib/comments/models.py:170 -msgid "is public" -msgstr "公开" - -#: contrib/comments/models.py:85 -#: contrib/admin/views/doc.py:289 -msgid "IP address" -msgstr "IP地址" - -#: contrib/comments/models.py:86 -msgid "is removed" -msgstr "被删除" - -#: contrib/comments/models.py:86 -msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead." -msgstr "如果评论不适合选中这个检查框。评论将被一条\"此评论已经被删除\"的消息所替换。" - -#: contrib/comments/models.py:91 -msgid "comments" -msgstr "评论" - -#: contrib/comments/models.py:131 -#: contrib/comments/models.py:207 -msgid "Content object" -msgstr "内容对象" - -#: contrib/comments/models.py:159 +#: db/models/manipulators.py:307 #, python-format -msgid "" -"Posted by %(user)s at %(date)s\n" -"\n" -"%(comment)s\n" -"\n" -"http://%(domain)s%(url)s" -msgstr "" -"由 %(user)s 在 %(date)s 张贴\n" -"\n" -"%(comment)s\n" -"\n" -"http://%(domain)s%(url)s" +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "带有这个 %(type)s 的 %(object)s 对于给定的 %(field)s 已经存在了。" -#: contrib/comments/models.py:168 -msgid "person's name" -msgstr "人名" - -#: contrib/comments/models.py:171 -msgid "ip address" -msgstr "IP地址" - -#: contrib/comments/models.py:173 -msgid "approved by staff" -msgstr "由团队批准" - -#: contrib/comments/models.py:176 -msgid "free comment" -msgstr "自由评论" - -#: contrib/comments/models.py:177 -msgid "free comments" -msgstr "自由评论" - -#: contrib/comments/models.py:233 -msgid "score" -msgstr "得分" - -#: contrib/comments/models.py:234 -msgid "score date" -msgstr "得分日期" - -#: contrib/comments/models.py:237 -msgid "karma score" -msgstr "Karma得分" - -#: contrib/comments/models.py:238 -msgid "karma scores" -msgstr "Karma得分" - -#: contrib/comments/models.py:242 -#, python-format -msgid "%(score)d rating by %(user)s" -msgstr "被 %(user)s 定级为 %(score)d" - -#: contrib/comments/models.py:258 -#, python-format -msgid "" -"This comment was flagged by %(user)s:\n" -"\n" -"%(text)s" -msgstr "" -"此评论由 %(user)s 标记:\n" -"\n" -"%(text)s" - -#: contrib/comments/models.py:265 -msgid "flag date" -msgstr "标记日期" - -#: contrib/comments/models.py:268 -msgid "user flag" -msgstr "用户标志" - -#: contrib/comments/models.py:269 -msgid "user flags" -msgstr "用户标志" - -#: contrib/comments/models.py:273 -#, python-format -msgid "Flag by %r" -msgstr "由 %r 标记" - -#: contrib/comments/models.py:278 -msgid "deletion date" -msgstr "删除日期" - -#: contrib/comments/models.py:280 -msgid "moderator deletion" -msgstr "删除仲裁" - -#: contrib/comments/models.py:281 -msgid "moderator deletions" -msgstr "删除仲裁" - -#: contrib/comments/models.py:285 -#, python-format -msgid "Moderator deletion by %r" -msgstr "被 %r 仲裁删除" - -#: contrib/comments/views/karma.py:19 -msgid "Anonymous users cannot vote" -msgstr "匿名用户不能投票" - -#: contrib/comments/views/karma.py:23 -msgid "Invalid comment ID" -msgstr "无效评论ID" - -#: contrib/comments/views/karma.py:25 -msgid "No voting for yourself" -msgstr "不能给自已投票" - -#: contrib/comments/views/comments.py:28 -msgid "This rating is required because you've entered at least one other rating." -msgstr "要求此等级,因为你已经输入了至少一个等级。" - -#: contrib/comments/views/comments.py:112 -#, python-format -msgid "" -"This comment was posted by a user who has posted fewer than %(count)s comment:\n" -"\n" -"%(text)s" -msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s comments:\n" -"\n" -"%(text)s" -msgstr[0] "" -"此评论由一个发表过少于 %(count)s 条评论的用户张贴:\n" -"\n" -"%(text)s" - -#: contrib/comments/views/comments.py:117 -#, python-format -msgid "" -"This comment was posted by a sketchy user:\n" -"\n" -"%(text)s" -msgstr "" -"此评论由一个肤浅的用户张贴:\n" -"\n" -"%(text)s" - -#: contrib/comments/views/comments.py:189 -#: contrib/comments/views/comments.py:280 -msgid "Only POSTs are allowed" -msgstr "只允许张贴" - -#: contrib/comments/views/comments.py:193 -#: contrib/comments/views/comments.py:284 -msgid "One or more of the required fields wasn't submitted" -msgstr "一个或多个必输字段没有被提交" - -#: contrib/comments/views/comments.py:197 -#: contrib/comments/views/comments.py:286 -msgid "Somebody tampered with the comment form (security violation)" -msgstr "有人篡改了评论表格(安全侵害)" - -#: contrib/comments/views/comments.py:207 -#: contrib/comments/views/comments.py:292 -msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid" -msgstr "评论表格有一个无效的 'target' 参数 -- 对象 ID 无效" - -#: contrib/comments/views/comments.py:257 -#: contrib/comments/views/comments.py:321 -msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "评论表格无法提供 '预览' 或 '张贴' 功能" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/login.html:17 -msgid "Username:" -msgstr "用户名:" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/admin/templates/admin/login.html:20 -msgid "Password:" -msgstr "口令:" - -#: contrib/comments/templates/comments/form.html:6 -msgid "Forgotten your password?" -msgstr "忘记你的口令?" - -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "注销" - -#: contrib/comments/templates/comments/form.html:12 -msgid "Ratings" -msgstr "等级" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Required" -msgstr "必须的" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Optional" -msgstr "可选的" - -#: contrib/comments/templates/comments/form.html:23 -msgid "Post a photo" -msgstr "上传一张照片" - -#: contrib/comments/templates/comments/form.html:27 -#: contrib/comments/templates/comments/freeform.html:5 -msgid "Comment:" -msgstr "评论:" - -#: contrib/comments/templates/comments/form.html:32 -#: contrib/comments/templates/comments/freeform.html:9 -msgid "Preview comment" -msgstr "预览评论" - -#: contrib/comments/templates/comments/freeform.html:4 -msgid "Your name:" -msgstr "你的名字:" - -#: contrib/admin/filterspecs.py:40 -#, python-format -msgid "" -"

By %s:

\n" -"