X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/4039f19c75ff7c857ccca7c942f67e650c710f34..bd65d9583dbb436bbc1a790e7649531742b8386a:/locale/zh_CN/LC_MESSAGES/django.po diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 0e3426a..db9388c 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-10 18:29+0300\n" +"POT-Creation-Date: 2011-07-07 02:39+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -10,18 +10,18 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" # user_info.html -#: forum/feed.py:70 forum/models/page.py:5 forum/utils/pagination.py:162 -#: forum/views/readers.py:183 forum/views/readers.py:300 +#: forum/feed.py:70 forum/models/page.py:24 forum/utils/pagination.py:167 +#: forum/views/readers.py:164 forum/views/readers.py:312 #, fuzzy msgid "page" msgstr "年龄" -#: forum/feed.py:70 forum/utils/pagination.py:158 forum/views/readers.py:183 +#: forum/feed.py:70 forum/utils/pagination.py:163 forum/views/readers.py:164 #, fuzzy msgid "pagesize" msgstr "【页数】" -#: forum/feed.py:70 forum/utils/pagination.py:166 forum/views/readers.py:183 +#: forum/feed.py:70 forum/utils/pagination.py:171 forum/views/readers.py:164 #, fuzzy msgid "sort" msgstr "或者" @@ -45,7 +45,7 @@ msgstr "" #: forum/skins/default/templates/osqaadmin/dashboard.html:24 #: forum/skins/default/templates/osqaadmin/index.html:26 #: forum/skins/default/templates/question_list/item.html:15 -#: forum/views/writers.py:253 forum_modules/akismet/startup.py:76 +#: forum/views/writers.py:260 forum_modules/akismet/startup.py:76 msgid "answer" msgstr "回答" @@ -56,93 +56,93 @@ msgstr "回答" msgid "question" msgstr "提问" -#: forum/registry.py:22 forum/registry.py:57 +#: forum/registry.py:23 forum/registry.py:58 #: forum/skins/default/templates/index.html:15 #: forum/skins/default/templates/question_edit_tips.html:9 msgid "faq" msgstr "常见问题" # footer.html -#: forum/registry.py:23 forum/registry.py:58 +#: forum/registry.py:24 forum/registry.py:59 #: forum/skins/default/templates/index.html:14 msgid "about" msgstr "关于本站" -#: forum/registry.py:26 +#: forum/registry.py:27 msgid "logout" msgstr "退出登录" -#: forum/registry.py:26 +#: forum/registry.py:27 msgid "login" msgstr "登录" -#: forum/registry.py:39 +#: forum/registry.py:40 msgid "administration" msgstr "" -#: forum/registry.py:52 +#: forum/registry.py:53 #, fuzzy msgid "contact" msgstr "联系我们" -#: forum/registry.py:55 +#: forum/registry.py:56 #, fuzzy msgid "support" msgstr "投赞成票" -#: forum/registry.py:56 +#: forum/registry.py:57 #, fuzzy msgid "privacy" msgstr "隐私政策" -#: forum/registry.py:71 forum/skins/default/templates/users/edit.html:33 +#: forum/registry.py:72 forum/skins/default/templates/users/edit.html:33 msgid "edit profile" msgstr "修改资料" -#: forum/registry.py:78 +#: forum/registry.py:79 #, fuzzy msgid "authentication settings" msgstr "用户参数的设置" -#: forum/registry.py:85 +#: forum/registry.py:86 msgid "email notification settings" msgstr "" -#: forum/registry.py:92 +#: forum/registry.py:93 #, fuzzy msgid "other preferences" msgstr "设置" -#: forum/registry.py:97 +#: forum/registry.py:98 msgid "Moderation tools" msgstr "" -#: forum/registry.py:99 +#: forum/registry.py:100 #, fuzzy msgid "withdraw suspension" msgstr "修改问题" -#: forum/registry.py:99 +#: forum/registry.py:100 msgid "suspend this user" msgstr "" -#: forum/registry.py:106 +#: forum/registry.py:107 msgid "give/take karma" msgstr "" -#: forum/registry.py:114 +#: forum/registry.py:115 msgid "remove moderator status" msgstr "" -#: forum/registry.py:114 +#: forum/registry.py:115 msgid "grant moderator status" msgstr "" -#: forum/registry.py:121 +#: forum/registry.py:122 msgid "remove super user status" msgstr "" -#: forum/registry.py:121 +#: forum/registry.py:122 msgid "grant super user status" msgstr "" @@ -150,401 +150,402 @@ msgstr "" msgid "nimda/" msgstr "" -#: forum/urls.py:36 +#: forum/urls.py:37 #, fuzzy msgid "upfiles/" msgstr "个人资料" -#: forum/urls.py:38 +#: forum/urls.py:39 #, fuzzy msgid "faq/" msgstr "常见问题" -#: forum/urls.py:38 +#: forum/urls.py:39 msgid "FAQ" msgstr "" # footer.html -#: forum/urls.py:39 +#: forum/urls.py:40 #, fuzzy msgid "about/" msgstr "关于本站" # footer.html -#: forum/urls.py:39 +#: forum/urls.py:40 #, fuzzy msgid "About" msgstr "关于本站" -#: forum/urls.py:40 +#: forum/urls.py:41 msgid "markdown_help/" msgstr "" -#: forum/urls.py:42 +#: forum/urls.py:43 #, fuzzy msgid "privacy/" msgstr "隐私政策" -#: forum/urls.py:43 +#: forum/urls.py:44 #, fuzzy msgid "logout/" msgstr "退出登录" -#: forum/urls.py:44 +#: forum/urls.py:45 #, fuzzy msgid "answers/" msgstr "回答" -#: forum/urls.py:44 forum/urls.py:54 forum/urls.py:96 forum/urls.py:143 +#: forum/urls.py:45 forum/urls.py:56 forum/urls.py:98 forum/urls.py:145 #, fuzzy msgid "edit/" msgstr "编辑" -#: forum/urls.py:45 +#: forum/urls.py:46 #, fuzzy msgid "revisions/" msgstr "版本" -#: forum/urls.py:46 forum/urls.py:47 forum/urls.py:48 forum/urls.py:50 -#: forum/urls.py:51 forum/urls.py:54 forum/urls.py:55 forum/urls.py:56 -#: forum/urls.py:57 forum/urls.py:82 forum/urls.py:83 forum/urls.py:84 +#: forum/urls.py:47 forum/urls.py:48 forum/urls.py:50 forum/urls.py:52 +#: forum/urls.py:53 forum/urls.py:56 forum/urls.py:57 forum/urls.py:58 +#: forum/urls.py:59 forum/urls.py:84 forum/urls.py:85 forum/urls.py:86 #, fuzzy msgid "questions/" msgstr "问题" -#: forum/urls.py:47 +#: forum/urls.py:48 #, fuzzy msgid "ask/" msgstr "提问于" -#: forum/urls.py:48 +#: forum/urls.py:50 #, fuzzy msgid "related_questions/" msgstr "相似的问题" -#: forum/urls.py:50 +#: forum/urls.py:52 #, fuzzy msgid "unanswered/" msgstr "回答" -#: forum/urls.py:55 +#: forum/urls.py:57 #, fuzzy msgid "close/" msgstr "关闭" -#: forum/urls.py:56 +#: forum/urls.py:58 #, fuzzy msgid "reopen/" msgstr "打开" -#: forum/urls.py:57 forum/urls.py:68 +#: forum/urls.py:59 forum/urls.py:70 #, fuzzy msgid "answer/" msgstr "回答" -#: forum/urls.py:58 +#: forum/urls.py:60 msgid "pending-data/" msgstr "" -#: forum/urls.py:60 +#: forum/urls.py:62 #, fuzzy msgid "vote/" msgstr "票" -#: forum/urls.py:61 +#: forum/urls.py:63 #, fuzzy msgid "like_comment/" msgstr "评论" -#: forum/urls.py:62 +#: forum/urls.py:64 #, fuzzy msgid "comment/" msgstr "评论" -#: forum/urls.py:63 +#: forum/urls.py:65 #, fuzzy msgid "delete_comment/" msgstr "删除任何一个评论" -#: forum/urls.py:64 +#: forum/urls.py:66 #, fuzzy msgid "convert_comment/" msgstr "删除任何一个评论" -#: forum/urls.py:65 +#: forum/urls.py:67 #, fuzzy msgid "accept_answer/" msgstr "回答" -#: forum/urls.py:66 +#: forum/urls.py:68 #, fuzzy msgid "answer_link/" msgstr "回答" -#: forum/urls.py:67 +#: forum/urls.py:69 #, fuzzy msgid "mark_favorite/" msgstr "收藏" -#: forum/urls.py:68 +#: forum/urls.py:70 msgid "award_points/" msgstr "" -#: forum/urls.py:68 +#: forum/urls.py:70 #, fuzzy msgid "user/" msgstr "用户" -#: forum/urls.py:70 +#: forum/urls.py:72 msgid "flag/" msgstr "" -#: forum/urls.py:71 +#: forum/urls.py:73 forum/urls.py:146 msgid "delete/" msgstr "删除" -#: forum/urls.py:72 forum/urls.py:73 +#: forum/urls.py:74 forum/urls.py:75 msgid "subscribe/" msgstr "" -#: forum/urls.py:74 +#: forum/urls.py:76 msgid "matching_tags/" msgstr "" -#: forum/urls.py:75 +#: forum/urls.py:77 #, fuzzy msgid "matching_users/" msgstr "回答" -#: forum/urls.py:76 +#: forum/urls.py:78 msgid "node_markdown/" msgstr "" -#: forum/urls.py:77 +#: forum/urls.py:79 #, fuzzy msgid "convert/" msgstr "内容" -#: forum/urls.py:78 +#: forum/urls.py:80 #, fuzzy msgid "convert_to_question/" msgstr "评论问题" -#: forum/urls.py:79 +#: forum/urls.py:81 msgid "wikify/" msgstr "" -#: forum/urls.py:81 +#: forum/urls.py:83 #, fuzzy msgid "question/" msgstr "提问" -#: forum/urls.py:87 forum/urls.py:88 +#: forum/urls.py:89 forum/urls.py:90 #, fuzzy msgid "tags/" msgstr "标签" -#: forum/urls.py:89 forum/urls.py:90 +#: forum/urls.py:91 forum/urls.py:92 msgid "mark-tag/" msgstr "" -#: forum/urls.py:89 +#: forum/urls.py:91 msgid "interesting/" msgstr "" -#: forum/urls.py:90 +#: forum/urls.py:92 msgid "ignored/" msgstr "" -#: forum/urls.py:91 +#: forum/urls.py:93 msgid "unmark-tag/" msgstr "" -#: forum/urls.py:93 forum/urls.py:96 forum/urls.py:97 forum/urls.py:98 -#: forum/urls.py:99 forum/urls.py:100 forum/urls.py:101 forum/urls.py:102 -#: forum/urls.py:103 forum/urls.py:104 forum/urls.py:105 forum/urls.py:106 +#: forum/urls.py:95 forum/urls.py:98 forum/urls.py:99 forum/urls.py:100 +#: forum/urls.py:101 forum/urls.py:102 forum/urls.py:103 forum/urls.py:104 +#: forum/urls.py:105 forum/urls.py:106 forum/urls.py:107 forum/urls.py:108 #, fuzzy msgid "users/" msgstr "用户" -#: forum/urls.py:97 +#: forum/urls.py:99 #, fuzzy msgid "award/" msgstr "所有奖牌" -#: forum/urls.py:98 +#: forum/urls.py:100 #, fuzzy msgid "suspend/" msgstr "用同一个帐号可登录互联网所有激活OpenID的网站" -#: forum/urls.py:99 +#: forum/urls.py:101 #, fuzzy msgid "powers/" msgstr "回答" -#: forum/urls.py:100 +#: forum/urls.py:102 #, fuzzy msgid "subscriptions/" msgstr "问题" -#: forum/urls.py:101 +#: forum/urls.py:103 #, fuzzy msgid "preferences/" msgstr "设置" -#: forum/urls.py:102 +#: forum/urls.py:104 #, fuzzy msgid "favorites/" msgstr "收藏" -#: forum/urls.py:103 +#: forum/urls.py:105 #, fuzzy msgid "reputation/" msgstr "积分" -#: forum/urls.py:104 +#: forum/urls.py:106 #, fuzzy msgid "votes/" msgstr "票" -#: forum/urls.py:105 +#: forum/urls.py:107 #, fuzzy msgid "recent/" msgstr "最新加入" -#: forum/urls.py:107 forum/urls.py:108 +#: forum/urls.py:109 forum/urls.py:110 #, fuzzy msgid "badges/" msgstr "奖牌榜" -#: forum/urls.py:111 +#: forum/urls.py:113 msgid "upload/" msgstr "" -#: forum/urls.py:112 +#: forum/urls.py:114 #, fuzzy msgid "search/" msgstr "搜索" -#: forum/urls.py:113 +#: forum/urls.py:115 #, fuzzy msgid "contact/" msgstr "联系我们" -#: forum/urls.py:117 forum/urls.py:118 forum/urls.py:119 forum/urls.py:120 -#: forum/urls.py:121 forum/urls.py:122 forum/urls.py:123 forum/urls.py:124 -#: forum/urls.py:125 forum/urls.py:126 forum/urls.py:127 forum/urls.py:128 +#: forum/urls.py:119 forum/urls.py:120 forum/urls.py:121 forum/urls.py:122 +#: forum/urls.py:123 forum/urls.py:124 forum/urls.py:125 forum/urls.py:126 +#: forum/urls.py:127 forum/urls.py:128 forum/urls.py:129 forum/urls.py:130 #: forum_modules/localauth/urls.py:7 #, fuzzy msgid "account/" msgstr "新帐号" -#: forum/urls.py:117 forum/urls.py:119 +#: forum/urls.py:119 forum/urls.py:121 msgid "signin/" msgstr "" -#: forum/urls.py:118 +#: forum/urls.py:120 msgid "signout/" msgstr "" -#: forum/urls.py:120 +#: forum/urls.py:122 #, fuzzy msgid "done/" msgstr "投反对票" -#: forum/urls.py:121 forum_modules/localauth/urls.py:7 +#: forum/urls.py:123 forum_modules/localauth/urls.py:7 #, fuzzy msgid "register/" msgstr "确认" -#: forum/urls.py:122 +#: forum/urls.py:124 msgid "validate/" msgstr "" -#: forum/urls.py:123 forum/urls.py:124 +#: forum/urls.py:125 forum/urls.py:126 msgid "tempsignin/" msgstr "" -#: forum/urls.py:125 +#: forum/urls.py:127 #, fuzzy msgid "authsettings/" msgstr "设置" -#: forum/urls.py:126 forum/urls.py:127 +#: forum/urls.py:128 forum/urls.py:129 msgid "providers/" msgstr "" -#: forum/urls.py:126 +#: forum/urls.py:128 #, fuzzy msgid "remove/" msgstr "打开" -#: forum/urls.py:127 +#: forum/urls.py:129 msgid "add/" msgstr "" -#: forum/urls.py:128 +#: forum/urls.py:130 msgid "send-validation/" msgstr "" -#: forum/urls.py:131 forum/urls.py:132 forum/urls.py:133 forum/urls.py:134 -#: forum/urls.py:135 forum/urls.py:136 forum/urls.py:137 forum/urls.py:138 -#: forum/urls.py:139 forum/urls.py:140 forum/urls.py:142 forum/urls.py:143 -#: forum/urls.py:145 forum/urls.py:147 forum/urls.py:149 +#: forum/urls.py:133 forum/urls.py:134 forum/urls.py:135 forum/urls.py:136 +#: forum/urls.py:137 forum/urls.py:138 forum/urls.py:139 forum/urls.py:140 +#: forum/urls.py:141 forum/urls.py:142 forum/urls.py:144 forum/urls.py:145 +#: forum/urls.py:146 forum/urls.py:148 forum/urls.py:150 forum/urls.py:152 #: forum_modules/exporter/urls.py:8 forum_modules/exporter/urls.py:9 #: forum_modules/exporter/urls.py:10 forum_modules/sximporter/urls.py:8 +#: forum_modules/updater/urls.py:8 msgid "admin/" msgstr "" -#: forum/urls.py:132 +#: forum/urls.py:134 msgid "switch_interface/" msgstr "" -#: forum/urls.py:133 +#: forum/urls.py:135 #, fuzzy msgid "statistics/" msgstr "网站访问者" -#: forum/urls.py:134 +#: forum/urls.py:136 msgid "denormalize/" msgstr "" -#: forum/urls.py:135 +#: forum/urls.py:137 msgid "go_bootstrap/" msgstr "" -#: forum/urls.py:136 +#: forum/urls.py:138 msgid "go_defaults/" msgstr "" -#: forum/urls.py:137 forum/urls.py:147 +#: forum/urls.py:139 forum/urls.py:150 #, fuzzy msgid "settings/" msgstr "设置" -#: forum/urls.py:138 +#: forum/urls.py:140 msgid "maintenance/" msgstr "" -#: forum/urls.py:139 +#: forum/urls.py:141 msgid "flagged_posts/" msgstr "" -#: forum/urls.py:140 forum/urls.py:142 forum/urls.py:143 +#: forum/urls.py:142 forum/urls.py:144 forum/urls.py:145 forum/urls.py:146 msgid "static_pages/" msgstr "" -#: forum/urls.py:142 +#: forum/urls.py:144 #, fuzzy msgid "new/" msgstr "投反对票" -#: forum/urls.py:145 +#: forum/urls.py:148 #, fuzzy msgid "tools/" msgstr "读书" -#: forum/urls.py:149 +#: forum/urls.py:152 #, fuzzy msgid "test_email_settings/" msgstr "设置" @@ -612,7 +613,7 @@ msgstr "" msgid "Initial revision" msgstr "初始版本" -#: forum/actions/node.py:20 forum/templatetags/node_tags.py:220 +#: forum/actions/node.py:20 forum/templatetags/node_tags.py:222 msgid "asked" msgstr "提问于" @@ -621,7 +622,7 @@ msgstr "提问于" msgid "%(user)s asked %(question)s" msgstr "用户收藏的问题" -#: forum/actions/node.py:38 forum/templatetags/node_tags.py:221 +#: forum/actions/node.py:38 forum/templatetags/node_tags.py:223 #, fuzzy msgid "answered" msgstr "回答" @@ -690,6 +691,7 @@ msgid "%(user)s closed %(post_desc)s: %(reason)s" msgstr "" #: forum/actions/node.py:160 forum/actions/node.py:184 +#: forum/actions/node.py:201 #, fuzzy msgid "converted" msgstr "投反对票" @@ -704,21 +706,28 @@ msgstr "" msgid "%(user)s converted comment on %(question)s into an answer" msgstr "" -#: forum/actions/node.py:202 +#: forum/actions/node.py:220 +#, fuzzy, python-format +msgid "%(user)s converted comment on %(question)s to a new question" +msgstr "" +"您正在浏览所有
%(num_q)s
个

问题按 " +"问题创建时间 排序。最新加入的问题将显示在最前面。

" + +#: forum/actions/node.py:226 #, fuzzy msgid "converted to question" msgstr "评论问题" -#: forum/actions/node.py:227 +#: forum/actions/node.py:251 #, python-format msgid "%(user)s converted an answer to %(question)s into a separate question" msgstr "" -#: forum/actions/node.py:233 +#: forum/actions/node.py:257 msgid "wikified" msgstr "" -#: forum/actions/node.py:245 +#: forum/actions/node.py:269 #, python-format msgid "%(user)s marked %(node)s as community wiki." msgstr "" @@ -809,7 +818,7 @@ msgid "You have been penalized in %s reputation points." msgstr "" #: forum/actions/user.py:74 forum/actions/user.py:112 -#: forum/templatetags/extra_tags.py:131 forum/views/auth.py:221 +#: forum/templatetags/extra_tags.py:135 forum/views/auth.py:227 #: forum_modules/exporter/templates/running.html:158 msgid "unknown" msgstr "" @@ -907,7 +916,7 @@ msgstr "取消" msgid "%(user)s suspended %(users)s %(suspension)s: %(msg)s" msgstr "" -#: forum/actions/user.py:214 forum/views/users.py:241 +#: forum/actions/user.py:214 forum/views/users.py:242 msgid "Bad behaviour" msgstr "" @@ -970,7 +979,7 @@ msgid "Escaped" msgstr "" #: forum/forms/admin.py:75 -#: forum/skins/default/templates/osqaadmin/nodeman.html:284 +#: forum/skins/default/templates/osqaadmin/nodeman.html:285 #, fuzzy msgid "Title" msgstr "标题" @@ -1083,7 +1092,8 @@ msgid "sorry, we have a serious error - user name is taken by several users" msgstr "" #: forum/forms/general.py:52 -msgid "user name can only consist of letters, empty space and underscore" +msgid "" +"user name can only consist of letters, empty space, hyphens and underscore" msgstr "" #: forum/forms/general.py:53 @@ -1127,66 +1137,66 @@ msgstr "确认密码" msgid "sorry, entered passwords did not match, please try again" msgstr "" -#: forum/forms/qanda.py:22 +#: forum/forms/qanda.py:24 #: forum/skins/default/templates/sidebar/markdown_help.html:12 #: forum/skins/default/templates/sidebar/markdown_help.html:17 msgid "title" msgstr "标题" -#: forum/forms/qanda.py:23 +#: forum/forms/qanda.py:25 msgid "please enter a descriptive title for your question" msgstr "" "请输入对问题具有描述性质的标题 - “帮忙！紧急求助！”不是建议的提问方式。" -#: forum/forms/qanda.py:28 +#: forum/forms/qanda.py:30 #, fuzzy, python-format msgid "title must be must be at least %s characters" msgstr "标题的长度必须大于10" -#: forum/forms/qanda.py:36 +#: forum/forms/qanda.py:38 msgid "content" msgstr "内容" -#: forum/forms/qanda.py:49 +#: forum/forms/qanda.py:51 #, fuzzy, python-format msgid "question content must be at least %s characters" msgstr "内容至少要10个字符" -#: forum/forms/qanda.py:60 +#: forum/forms/qanda.py:62 #, fuzzy, python-format msgid "answer content must be at least %s characters" msgstr "内容至少要10个字符" -#: forum/forms/qanda.py:71 forum/skins/default/templates/header.html:35 -#: forum/skins/default/templates/search.html:20 forum/views/readers.py:238 +#: forum/forms/qanda.py:73 forum/skins/default/templates/header.html:36 +#: forum/skins/default/templates/search.html:21 forum/views/readers.py:250 msgid "tags" msgstr "标签" -#: forum/forms/qanda.py:73 +#: forum/forms/qanda.py:75 #, python-format msgid "" "Tags are short keywords, with no spaces within. At least %(min)s and up to %" "(max)s tags can be used." msgstr "" -#: forum/forms/qanda.py:89 +#: forum/forms/qanda.py:91 #, python-format msgid "please use between %(min)s and %(max)s tags" msgstr "" -#: forum/forms/qanda.py:95 +#: forum/forms/qanda.py:97 #, python-format msgid "please use between %(min)s and %(max)s characters in you tags" msgstr "" -#: forum/forms/qanda.py:97 +#: forum/forms/qanda.py:99 #, fuzzy msgid "" "please use following characters in tags: letters , numbers, and characters " "'.-_'" msgstr "标签请使用英文字母，中文或者数字字符串（. - _ # 也可以）" -#: forum/forms/qanda.py:107 +#: forum/forms/qanda.py:109 #, python-format msgid "" "You don't have enough reputation to create new tags. The following tags do " @@ -1194,23 +1204,23 @@ msgid "" msgstr "" # index.html -#: forum/forms/qanda.py:117 +#: forum/forms/qanda.py:119 #: forum/skins/default/templates/question_summary_list_roll.html:26 #: forum/skins/default/templates/question_summary_list_roll.html:38 msgid "community wiki" msgstr "社区Wiki" -#: forum/forms/qanda.py:118 +#: forum/forms/qanda.py:120 msgid "" "if you choose community wiki option, the question and answer do not generate " "points and name of author will not be shown" msgstr "选择社区wiki模式，问答不计算积分，签名也不显示作者信息" -#: forum/forms/qanda.py:136 +#: forum/forms/qanda.py:138 msgid "update summary:" msgstr "更新概要：" -#: forum/forms/qanda.py:137 +#: forum/forms/qanda.py:139 msgid "" "enter a brief summary of your revision (e.g. fixed spelling, grammar, " "improved style, this field is optional)" @@ -1218,65 +1228,65 @@ msgstr "" "输入本次修改的简单概述（如：修改了别字，修正了语法，改进了样式等。非必填" "项。）" -#: forum/forms/qanda.py:141 +#: forum/forms/qanda.py:143 #, fuzzy msgid "Your message:" msgstr "Copyright(c)2009.CNPROG.COM" -#: forum/forms/qanda.py:147 +#: forum/forms/qanda.py:149 #, fuzzy msgid "Your name:" msgstr "用户名" -#: forum/forms/qanda.py:148 +#: forum/forms/qanda.py:150 #, fuzzy msgid "Email (not shared with anyone):" msgstr "电子邮件（用于头像显示服务）" -#: forum/forms/qanda.py:279 +#: forum/forms/qanda.py:281 msgid "this email does not have to be linked to gravatar" msgstr "不会公开，用于头像显示服务" -#: forum/forms/qanda.py:280 +#: forum/forms/qanda.py:282 msgid "Real name" msgstr "真实姓名" -#: forum/forms/qanda.py:281 +#: forum/forms/qanda.py:283 msgid "Website" msgstr "个人网站" -#: forum/forms/qanda.py:282 +#: forum/forms/qanda.py:284 msgid "Location" msgstr "城市" -#: forum/forms/qanda.py:283 +#: forum/forms/qanda.py:285 msgid "Date of birth" msgstr "生日" -#: forum/forms/qanda.py:283 +#: forum/forms/qanda.py:285 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD" msgstr "不会公开，只会显示您的年龄，格式为：YYYY-MM-DD" -#: forum/forms/qanda.py:284 +#: forum/forms/qanda.py:286 #: forum/skins/default/templates/account_settings.html:21 -#: forum/skins/default/templates/osqaadmin/moderation.html:68 +#: forum/skins/default/templates/osqaadmin/moderation.html:69 msgid "Profile" msgstr "个人简介" -#: forum/forms/qanda.py:289 +#: forum/forms/qanda.py:291 #, fuzzy msgid "Screen name" msgstr "姓名" -#: forum/forms/qanda.py:316 +#: forum/forms/qanda.py:317 msgid "this email has already been registered, please use another one" msgstr "该电子邮件已被注册，请选择另一个再试。" -#: forum/forms/qanda.py:321 +#: forum/forms/qanda.py:322 msgid "Instantly" msgstr "" -#: forum/forms/qanda.py:324 +#: forum/forms/qanda.py:325 msgid "No notifications" msgstr "" @@ -1299,7 +1309,7 @@ msgid "" " " msgstr "" -#: forum/middleware/anon_user.py:34 +#: forum/middleware/anon_user.py:35 #, python-format msgid "First time here? Check out the FAQ!" msgstr "" @@ -1318,8 +1328,8 @@ msgstr "链接" msgid "%(user)s %(node_name)s %(node_desc)s" msgstr "" -#: forum/models/comment.py:6 forum/views/commands.py:229 -#: forum/views/commands.py:255 forum_modules/akismet/startup.py:77 +#: forum/models/comment.py:6 forum/views/commands.py:234 +#: forum/views/commands.py:260 forum_modules/akismet/startup.py:77 #, fuzzy msgid "comment" msgstr "评论" @@ -1332,12 +1342,12 @@ msgstr "" msgid "No description available" msgstr "" -#: forum/models/node.py:247 +#: forum/models/node.py:252 #, fuzzy msgid "post" msgstr "投赞成票" -#: forum/models/page.py:35 +#: forum/models/page.py:54 #, fuzzy, python-format msgid "[Unpublished] %s" msgstr "【出版社】" @@ -1352,35 +1362,35 @@ msgstr "[已删除]" msgid "[closed] " msgstr "[已关闭]" -#: forum/models/tag.py:60 +#: forum/models/tag.py:61 #, fuzzy msgid "interesting" msgstr "修改问题" -#: forum/models/tag.py:60 +#: forum/models/tag.py:61 msgid "ignored" msgstr "" -#: forum/models/user.py:206 forum/views/readers.py:132 +#: forum/models/user.py:209 forum/views/readers.py:133 #, fuzzy msgid "asked-by" msgstr "提问于" -#: forum/models/user.py:210 forum/views/readers.py:135 +#: forum/models/user.py:217 forum/views/readers.py:136 #, fuzzy msgid "answered-by" msgstr "回答" -#: forum/models/user.py:214 forum/views/readers.py:138 +#: forum/models/user.py:223 forum/views/readers.py:139 msgid "subscribed-by" msgstr "" -#: forum/settings/__init__.py:45 +#: forum/settings/__init__.py:51 #, fuzzy msgid "Badges config" msgstr "枚奖牌" -#: forum/settings/__init__.py:45 +#: forum/settings/__init__.py:51 msgid "Configure badges on your OSQA site." msgstr "" @@ -1601,7 +1611,7 @@ msgstr "" msgid "" "Every email sent through your website will have the subject prefixed by this " "string. It's usually a good idea to have such a prefix so your users can " -"easily set up a filter on theyr email clients." +"easily set up a filter on their email clients." msgstr "" #: forum/settings/email.py:52 @@ -1907,141 +1917,172 @@ msgid "" msgstr "" #: forum/settings/minrep.py:43 -msgid "Minimum reputation to reopen own question" +msgid "Unify close and reopen permissions" msgstr "" #: forum/settings/minrep.py:44 msgid "" +"If checked the same permissions as the ones to close question will be " +"required to reopen it." +msgstr "" + +#: forum/settings/minrep.py:48 +msgid "Minimum reputation to reopen own question" +msgstr "" + +#: forum/settings/minrep.py:49 +msgid "" "The minimum reputation an user must have to be allowed to reopen his own " "question." msgstr "" -#: forum/settings/minrep.py:47 +#: forum/settings/minrep.py:52 #, fuzzy msgid "Minimum reputation to retag others questions" msgstr "其他用户的回复和评论" -#: forum/settings/minrep.py:48 +#: forum/settings/minrep.py:53 msgid "" "The minimum reputation an user must have to be allowed to retag others " "questions." msgstr "" -#: forum/settings/minrep.py:51 +#: forum/settings/minrep.py:56 msgid "Minimum reputation to edit wiki posts" msgstr "" -#: forum/settings/minrep.py:52 +#: forum/settings/minrep.py:57 msgid "" "The minimum reputation an user must have to be allowed to edit community " "wiki posts." msgstr "" -#: forum/settings/minrep.py:55 +#: forum/settings/minrep.py:60 #, fuzzy msgid "Minimum reputation to mark post as community wiki" msgstr "用户社区积分" -#: forum/settings/minrep.py:56 +#: forum/settings/minrep.py:61 msgid "" "The minimum reputation an user must have to be allowed to mark a post as " "community wiki." msgstr "" -#: forum/settings/minrep.py:59 +#: forum/settings/minrep.py:64 msgid "Minimum reputation to edit others posts" msgstr "" -#: forum/settings/minrep.py:60 +#: forum/settings/minrep.py:65 msgid "" "The minimum reputation an user must have to be allowed to edit others posts." msgstr "" -#: forum/settings/minrep.py:63 +#: forum/settings/minrep.py:68 msgid "Minimum reputation to close others posts" msgstr "" -#: forum/settings/minrep.py:64 +#: forum/settings/minrep.py:69 msgid "" "The minimum reputation an user must have to be allowed to close others posts." msgstr "" -#: forum/settings/minrep.py:67 +#: forum/settings/minrep.py:72 #, fuzzy msgid "Minimum reputation to delete comments" msgstr "用户社区积分" -#: forum/settings/minrep.py:68 +#: forum/settings/minrep.py:73 msgid "" "The minimum reputation an user must have to be allowed to delete comments." msgstr "" -#: forum/settings/minrep.py:71 +#: forum/settings/minrep.py:76 #, fuzzy msgid "Minimum reputation to convert answers to comment" msgstr "用户社区积分" -#: forum/settings/minrep.py:72 +#: forum/settings/minrep.py:77 msgid "" "The minimum reputation an user must have to be allowed to convert an answer " "into a comment." msgstr "" -#: forum/settings/minrep.py:75 +#: forum/settings/minrep.py:80 #, fuzzy msgid "Minimum reputation to convert comments to answers" msgstr "用户社区积分" -#: forum/settings/minrep.py:76 +#: forum/settings/minrep.py:81 msgid "" "The minimum reputation an user must have to be allowed to convert comments " "into an answer." msgstr "" -#: forum/settings/minrep.py:79 +#: forum/settings/minrep.py:84 #, fuzzy msgid "Minimum reputation to convert answers to questions" msgstr "其他用户的回复和评论" -#: forum/settings/minrep.py:80 +#: forum/settings/minrep.py:85 msgid "" "The minimum reputation an user must have to be allowed to convert an answer " "into a question." msgstr "" -#: forum/settings/minrep.py:83 +#: forum/settings/minrep.py:88 msgid "Minimum reputation to view offensive flags" msgstr "" -#: forum/settings/minrep.py:84 +#: forum/settings/minrep.py:89 msgid "The minimum reputation an user must have to view offensive flags." msgstr "" -#: forum/settings/moderation.py:7 +#: forum/settings/moderation.py:8 #, fuzzy msgid "Moderation settings" msgstr "用户参数的设置" -#: forum/settings/moderation.py:7 +#: forum/settings/moderation.py:8 msgid "Define the moderation workflow of your site" msgstr "" -#: forum/settings/moderation.py:13 +# todo - check if it's indeed plural +#: forum/settings/moderation.py:11 +#, fuzzy +msgid "Use canned comments" +msgstr "添加评论" + +#: forum/settings/moderation.py:12 +msgid "" +"If you check, the canned comments feature will be activated, allowing " +"moderators to use canned patterns for their comments." +msgstr "" + +#: forum/settings/moderation.py:20 +#, fuzzy +msgid "Canned comments" +msgstr "评论" + +#: forum/settings/moderation.py:21 +msgid "Create some canned comments to be used for easier moderation." +msgstr "" + +#: forum/settings/moderation.py:28 #, fuzzy msgid "Flag Reasons" msgstr "原因" -#: forum/settings/moderation.py:14 +#: forum/settings/moderation.py:29 msgid "Create some flag reasons to use in the flag post popup." msgstr "" # close.html -#: forum/settings/moderation.py:22 +#: forum/settings/moderation.py:37 #, fuzzy msgid "Close Reasons" msgstr "关闭问题" -#: forum/settings/moderation.py:23 +#: forum/settings/moderation.py:38 msgid "Create some close reasons to use in the close question popup." msgstr "" @@ -2155,31 +2196,68 @@ msgid "Do you want to show the welcome box when a user first visits your site." msgstr "" #: forum/settings/sidebar.py:15 +msgid "Show interesting tags in the sidebar" +msgstr "" + +#: forum/settings/sidebar.py:16 +msgid "" +"Check this if you want to see the interesting tags container in the sidebar." +msgstr "" + +#: forum/settings/sidebar.py:20 #, fuzzy msgid "Application intro" msgstr "【出版日期】" -#: forum/settings/sidebar.py:16 +#: forum/settings/sidebar.py:21 msgid "" "The introductory page that is visible in the sidebar for anonymous users." msgstr "" -#: forum/settings/sidebar.py:71 +#: forum/settings/sidebar.py:76 msgid "Upper block rendering mode" msgstr "" -#: forum/settings/sidebar.py:72 +#: forum/settings/sidebar.py:77 msgid "How to render your upper block code." msgstr "" -#: forum/settings/sidebar.py:100 +#: forum/settings/sidebar.py:105 msgid "Lower block rendering mode" msgstr "" -#: forum/settings/sidebar.py:101 +#: forum/settings/sidebar.py:106 msgid "How to render your lower block code." msgstr "" +#: forum/settings/sitemaps.py:5 +#, fuzzy +msgid "Sitemap settings" +msgstr "设置" + +#: forum/settings/sitemaps.py:5 +msgid "Some settings connected with the Sitemaps." +msgstr "" + +#: forum/settings/sitemaps.py:8 +#, fuzzy +msgid "Questions Sitemap Limit" +msgstr "问题列表" + +#: forum/settings/sitemaps.py:9 +msgid "The questions limit per page for the Questions Sitemap." +msgstr "" + +#: forum/settings/sitemaps.py:12 +msgid "Questions Sitemap Change Fraquence" +msgstr "" + +#: forum/settings/sitemaps.py:13 +msgid "" +"Used in the Questions Sitemap tag and specifies the content " +"change frequency." +msgstr "" + #: forum/settings/static.py:17 msgid "Use custom CSS" msgstr "" @@ -2381,238 +2459,258 @@ msgstr "" #: forum/settings/users.py:10 #, fuzzy +msgid "Allow negative reputation" +msgstr "积分" + +#: forum/settings/users.py:11 +#, fuzzy +msgid "Check if you want to allow negative user reputations in the community." +msgstr "用户社区积分" + +#: forum/settings/users.py:15 +msgid "Store greeting in cookie" +msgstr "" + +#: forum/settings/users.py:16 +msgid "" +"If you check this the greeting will be stored in a cookie and the users " +"won't be notified on logout." +msgstr "" + +#: forum/settings/users.py:20 +#, fuzzy msgid "Editable screen name" msgstr "姓名" -#: forum/settings/users.py:11 +#: forum/settings/users.py:21 msgid "Allow users to alter their screen name." msgstr "" # translation and user name validation are language-specific -#: forum/settings/users.py:15 +#: forum/settings/users.py:25 #, fuzzy msgid "Minimum username length" msgstr "用户名只能包含英文字母、数字和下划线" -#: forum/settings/users.py:16 +#: forum/settings/users.py:26 msgid "The minimum length (in character) of a username." msgstr "" -#: forum/settings/users.py:19 +#: forum/settings/users.py:29 msgid "fuck" msgstr "" -#: forum/settings/users.py:19 +#: forum/settings/users.py:29 msgid "shit" msgstr "" -#: forum/settings/users.py:19 +#: forum/settings/users.py:29 #, fuzzy msgid "ass" msgstr "回答" -#: forum/settings/users.py:19 +#: forum/settings/users.py:29 #, fuzzy msgid "sex" msgstr "查看" -#: forum/settings/users.py:19 +#: forum/settings/users.py:29 msgid "add" msgstr "" -#: forum/settings/users.py:19 forum/templatetags/node_tags.py:104 +#: forum/settings/users.py:29 forum/templatetags/node_tags.py:106 msgid "edit" msgstr "编辑" -#: forum/settings/users.py:19 forum/views/auth.py:392 forum/views/auth.py:397 +#: forum/settings/users.py:29 forum/views/auth.py:398 forum/views/auth.py:403 #, fuzzy msgid "save" msgstr "保存" -#: forum/settings/users.py:19 forum/templatetags/node_tags.py:130 +#: forum/settings/users.py:29 forum/templatetags/node_tags.py:132 msgid "delete" msgstr "删除" -#: forum/settings/users.py:19 +#: forum/settings/users.py:29 #, fuzzy msgid "manage" msgstr "图片" -#: forum/settings/users.py:19 +#: forum/settings/users.py:29 #, fuzzy msgid "update" msgstr "更新于" -#: forum/settings/users.py:19 +#: forum/settings/users.py:29 #: forum/skins/default/templates/auth/auth_settings.html:12 #, fuzzy msgid "remove" msgstr "打开" -#: forum/settings/users.py:19 +#: forum/settings/users.py:29 #, fuzzy msgid "new" msgstr "最新问题" # translation and user name validation are language-specific -#: forum/settings/users.py:21 +#: forum/settings/users.py:31 #, fuzzy msgid "Disabled usernames" msgstr "用户名只能包含英文字母、数字和下划线" -#: forum/settings/users.py:22 +#: forum/settings/users.py:32 msgid "" "A comma separated list of disabled usernames (usernames not allowed during a " "new user registration)." msgstr "" -#: forum/settings/users.py:26 +#: forum/settings/users.py:36 #, fuzzy msgid "Truncate long usernames" msgstr "选择一个用户名" -#: forum/settings/users.py:27 +#: forum/settings/users.py:37 msgid "The long usernames will be truncated.." msgstr "" -#: forum/settings/users.py:32 +#: forum/settings/users.py:42 msgid "Truncate usernames longer than" msgstr "" -#: forum/settings/users.py:33 +#: forum/settings/users.py:43 msgid "" "The usernames that are longer than this will be truncated and ... will be " "appended." msgstr "" -#: forum/settings/users.py:36 +#: forum/settings/users.py:46 msgid "Show status diamonds" msgstr "" -#: forum/settings/users.py:37 +#: forum/settings/users.py:47 msgid "Show status \"diamonds\" next to moderators or superusers usernames." msgstr "" -#: forum/settings/users.py:42 +#: forum/settings/users.py:52 #, fuzzy msgid "Force unique email" msgstr "修改电子邮件" -#: forum/settings/users.py:43 +#: forum/settings/users.py:53 msgid "Should each user have an unique email." msgstr "" -#: forum/settings/users.py:47 +#: forum/settings/users.py:57 msgid "Require email validation to..." msgstr "" -#: forum/settings/users.py:48 +#: forum/settings/users.py:58 msgid "" "Which actions in this site, users without a valid email will be prevented " "from doing." msgstr "" -#: forum/settings/users.py:50 +#: forum/settings/users.py:60 #, fuzzy msgid "ask questions" msgstr "我要提问" -#: forum/settings/users.py:50 +#: forum/settings/users.py:60 #, fuzzy msgid "provide answers" msgstr "最先回答" -#: forum/settings/users.py:50 +#: forum/settings/users.py:60 #, fuzzy msgid "make comments" msgstr "评论" -#: forum/settings/users.py:50 +#: forum/settings/users.py:60 #, fuzzy msgid "report posts" msgstr "删除" -#: forum/settings/users.py:55 +#: forum/settings/users.py:65 msgid "Don't notify to invalid emails" msgstr "" -#: forum/settings/users.py:56 +#: forum/settings/users.py:66 msgid "Do not notify users with unvalidated emails." msgstr "" -#: forum/settings/users.py:60 +#: forum/settings/users.py:70 msgid "Hold pending posts for X minutes" msgstr "" -#: forum/settings/users.py:61 +#: forum/settings/users.py:71 msgid "" "How much time in minutes a post should be kept in session until the user " "logs in or validates the email." msgstr "" -#: forum/settings/users.py:65 +#: forum/settings/users.py:75 msgid "Warn about pending posts afer X minutes" msgstr "" -#: forum/settings/users.py:66 +#: forum/settings/users.py:76 msgid "" "How much time in minutes a user that just logged in or validated his email " "should be warned about a pending post instead of publishing it automatically." msgstr "" -#: forum/settings/users.py:70 +#: forum/settings/users.py:80 msgid "suitable for display on all websites with any audience type." msgstr "" -#: forum/settings/users.py:71 +#: forum/settings/users.py:81 msgid "" "may contain rude gestures, provocatively dressed individuals, the lesser " "swear words, or mild violence." msgstr "" -#: forum/settings/users.py:72 +#: forum/settings/users.py:82 msgid "" "may contain such things as harsh profanity, intense violence, nudity, or " "hard drug use." msgstr "" -#: forum/settings/users.py:73 +#: forum/settings/users.py:83 msgid "may contain hardcore sexual imagery or extremely disturbing violence." msgstr "" -#: forum/settings/users.py:77 +#: forum/settings/users.py:87 msgid "Gravatar rating" msgstr "" -#: forum/settings/users.py:78 +#: forum/settings/users.py:88 msgid "" "Gravatar allows users to self-rate their images so that they can indicate if " "an image is appropriate for a certain audience." msgstr "" -#: forum/settings/users.py:84 +#: forum/settings/users.py:94 msgid "" "(mystery-man) a simple, cartoon-style silhouetted outline of a person (does " "not vary by email hash)" msgstr "" -#: forum/settings/users.py:85 +#: forum/settings/users.py:95 msgid "a geometric pattern based on an email hash" msgstr "" -#: forum/settings/users.py:86 +#: forum/settings/users.py:96 msgid "a generated \"monster\" with different colors, faces, etc" msgstr "" -#: forum/settings/users.py:87 +#: forum/settings/users.py:97 msgid "generated faces with differing features and backgrounds" msgstr "" -#: forum/settings/users.py:91 +#: forum/settings/users.py:101 msgid "Gravatar default" msgstr "" -#: forum/settings/users.py:92 +#: forum/settings/users.py:102 msgid "" "Gravatar has a number of built in options which you can also use as defaults." msgstr "" @@ -2627,41 +2725,90 @@ msgid "Set up how certain parts of the site are displayed." msgstr "" #: forum/settings/view.py:8 -msgid "Summary Length" +msgid "Embed YouTube Videos" msgstr "" #: forum/settings/view.py:9 +msgid "If you check this YouTube videos will be embedded" +msgstr "" + +#: forum/settings/view.py:13 +msgid "Summary Length" +msgstr "" + +#: forum/settings/view.py:14 msgid "" "The number of characters that are going to be displayed in order to get the " "content summary." msgstr "" -#: forum/settings/view.py:12 +#: forum/settings/view.py:18 #, fuzzy msgid "Recent tags block size" msgstr "最新标签" -#: forum/settings/view.py:13 +#: forum/settings/view.py:19 msgid "" "The number of tags to display in the recent tags block in the front page." msgstr "" -#: forum/settings/view.py:16 +#: forum/settings/view.py:22 +msgid "Show tags in a cloud" +msgstr "" + +#: forum/settings/view.py:23 +msgid "" +"If selected the tags in the recent tags widget will be displayed in a cloud." +msgstr "" + +#: forum/settings/view.py:27 +msgid "Tags cloud min occurs" +msgstr "" + +#: forum/settings/view.py:28 forum/settings/view.py:32 +#: forum/settings/view.py:36 forum/settings/view.py:40 +msgid "Used to calculate the font size of the tags in the cloud widget." +msgstr "" + +#: forum/settings/view.py:31 +msgid "Tags cloud max occurs" +msgstr "" + +#: forum/settings/view.py:35 +msgid "Tags cloud min font size" +msgstr "" + +#: forum/settings/view.py:39 +msgid "Tags cloud max font size" +msgstr "" + +#: forum/settings/view.py:43 #, fuzzy msgid "Recent awards block size" msgstr "最新奖牌" -#: forum/settings/view.py:17 +#: forum/settings/view.py:44 msgid "" "The number of awards to display in the recent awards block in the front page." msgstr "" -#: forum/settings/view.py:20 +#: forum/settings/view.py:47 +#, fuzzy +msgid "Update latest activity on tag edit" +msgstr "最近活动" + +#: forum/settings/view.py:48 +msgid "" +"If you check this the latest activity will be updated when editing only the " +"tags of a question." +msgstr "" + +#: forum/settings/view.py:51 #, fuzzy msgid "Limit related tags block" msgstr "相关标签" -#: forum/settings/view.py:21 +#: forum/settings/view.py:52 msgid "" "Limit related tags block size in questions list pages. Set to 0 to display " "all all tags." @@ -2760,7 +2907,7 @@ msgid "If you're not automatically redirected in 5 seconds, please click" msgstr "" #: forum/skins/default/templates/401.html:40 -#: forum/skins/default/templates/auth/signin.html:102 +#: forum/skins/default/templates/auth/signin.html:106 #: forum/skins/default/templates/notifications/base.html:27 msgid "here" msgstr "" @@ -2877,7 +3024,7 @@ msgid "Account functions" msgstr "" #: forum/skins/default/templates/account_settings.html:29 -#: forum/skins/default/templates/auth/auth_settings.html:33 +#: forum/skins/default/templates/auth/auth_settings.html:34 msgid "Change password" msgstr "修改密码" @@ -2918,8 +3065,8 @@ msgstr "修改回答" #: forum/skins/default/templates/answer_edit.html:22 #: forum/skins/default/templates/ask.html:26 #: forum/skins/default/templates/ask.html:29 -#: forum/skins/default/templates/question.html:39 -#: forum/skins/default/templates/question.html:42 +#: forum/skins/default/templates/question.html:45 +#: forum/skins/default/templates/question.html:48 #: forum/skins/default/templates/question_edit.html:19 #: forum/skins/default/templates/question_edit.html:22 msgid "hide preview" @@ -2927,58 +3074,58 @@ msgstr "禁用预览" #: forum/skins/default/templates/answer_edit.html:22 #: forum/skins/default/templates/ask.html:29 -#: forum/skins/default/templates/question.html:42 +#: forum/skins/default/templates/question.html:48 #: forum/skins/default/templates/question_edit.html:22 msgid "show preview" msgstr "启用预览" #: forum/skins/default/templates/answer_edit.html:62 #: forum/skins/default/templates/question_edit.html:91 -#: forum/skins/default/templates/question_retag.html:58 +#: forum/skins/default/templates/question_retag.html:40 #: forum/skins/default/templates/revisions.html:38 msgid "back" msgstr "返回" -#: forum/skins/default/templates/answer_edit.html:67 -#: forum/skins/default/templates/question_edit.html:96 +#: forum/skins/default/templates/answer_edit.html:68 +#: forum/skins/default/templates/question_edit.html:97 #: forum/skins/default/templates/revisions.html:54 msgid "revision" msgstr "版本" -#: forum/skins/default/templates/answer_edit.html:70 -#: forum/skins/default/templates/question_edit.html:100 +#: forum/skins/default/templates/answer_edit.html:71 +#: forum/skins/default/templates/question_edit.html:101 msgid "select revision" msgstr "选择版本" -#: forum/skins/default/templates/answer_edit.html:77 -#: forum/skins/default/templates/ask.html:129 -#: forum/skins/default/templates/question.html:223 -#: forum/skins/default/templates/question_edit.html:117 +#: forum/skins/default/templates/answer_edit.html:78 +#: forum/skins/default/templates/ask.html:130 +#: forum/skins/default/templates/question.html:230 +#: forum/skins/default/templates/question_edit.html:118 msgid "Toggle the real time Markdown editor preview" msgstr "打开或者关闭Markdown编辑器的实时预览" -#: forum/skins/default/templates/answer_edit.html:77 -#: forum/skins/default/templates/ask.html:129 -#: forum/skins/default/templates/question.html:224 -#: forum/skins/default/templates/question_edit.html:117 +#: forum/skins/default/templates/answer_edit.html:78 +#: forum/skins/default/templates/ask.html:130 +#: forum/skins/default/templates/question.html:231 +#: forum/skins/default/templates/question_edit.html:118 msgid "toggle preview" msgstr "预览开关" # synonym of above in Edit question -#: forum/skins/default/templates/answer_edit.html:101 -#: forum/skins/default/templates/question_edit.html:153 -#: forum/skins/default/templates/question_retag.html:79 +#: forum/skins/default/templates/answer_edit.html:102 +#: forum/skins/default/templates/question_edit.html:154 +#: forum/skins/default/templates/question_retag.html:62 msgid "Save edit" msgstr "现在修改" -#: forum/skins/default/templates/answer_edit.html:102 +#: forum/skins/default/templates/answer_edit.html:103 #: forum/skins/default/templates/base_content.html:43 -#: forum/skins/default/templates/close.html:29 -#: forum/skins/default/templates/feedback.html:50 -#: forum/skins/default/templates/question_edit.html:154 -#: forum/skins/default/templates/question_retag.html:80 +#: forum/skins/default/templates/close.html:30 +#: forum/skins/default/templates/feedback.html:51 +#: forum/skins/default/templates/question_edit.html:155 +#: forum/skins/default/templates/question_retag.html:63 #: forum/skins/default/templates/reopen.html:30 -#: forum/skins/default/templates/users/edit.html:99 +#: forum/skins/default/templates/users/edit.html:100 msgid "Cancel" msgstr "取消" @@ -3013,11 +3160,11 @@ msgstr "查看常见问题" msgid "Ask a question" msgstr "我要提问" -#: forum/skins/default/templates/ask.html:99 +#: forum/skins/default/templates/ask.html:100 msgid "You are welcome to start submitting your question anonymously." msgstr "" -#: forum/skins/default/templates/ask.html:100 +#: forum/skins/default/templates/ask.html:101 msgid "" "\n" " After submiting your question, you will be redirected to " @@ -3027,30 +3174,30 @@ msgid "" " or signup for a new account" msgstr "" -#: forum/skins/default/templates/ask.html:104 +#: forum/skins/default/templates/ask.html:105 msgid "and validate your email." msgstr "" -#: forum/skins/default/templates/ask.html:109 +#: forum/skins/default/templates/ask.html:110 msgid "" "Remember, your question will not be published until you validate your email." msgstr "" -#: forum/skins/default/templates/ask.html:110 -#: forum/skins/default/templates/question.html:209 +#: forum/skins/default/templates/ask.html:111 +#: forum/skins/default/templates/question.html:216 #: forum/skins/default/templates/users/info.html:86 msgid "Send me a validation link." msgstr "" -#: forum/skins/default/templates/ask.html:145 +#: forum/skins/default/templates/ask.html:146 msgid "(required)" msgstr "" -#: forum/skins/default/templates/ask.html:161 +#: forum/skins/default/templates/ask.html:162 msgid "Login/signup to post your question" msgstr "" -#: forum/skins/default/templates/ask.html:163 +#: forum/skins/default/templates/ask.html:164 msgid "Ask your question" msgstr "现在提问" @@ -3155,7 +3302,7 @@ msgid "Ok" msgstr "" #: forum/skins/default/templates/base_content.html:47 -#: forum/templatetags/node_tags.py:167 +#: forum/templatetags/node_tags.py:169 #, fuzzy msgid "word" msgstr "密码" @@ -3166,7 +3313,7 @@ msgid "words" msgstr "密码" #: forum/skins/default/templates/base_content.html:49 -#: forum/templatetags/node_tags.py:166 +#: forum/templatetags/node_tags.py:168 #, fuzzy msgid "character" msgstr "" @@ -3187,11 +3334,11 @@ msgstr "关闭问题" msgid "Close the question" msgstr "由于以下原因，你要关闭这个问题" -#: forum/skins/default/templates/close.html:25 +#: forum/skins/default/templates/close.html:26 msgid "Reasons" msgstr "原因" -#: forum/skins/default/templates/close.html:28 +#: forum/skins/default/templates/close.html:29 msgid "OK to close" msgstr "确定关闭" @@ -3209,7 +3356,7 @@ msgstr "问题反馈" msgid "Give us your feedback!" msgstr "" -#: forum/skins/default/templates/feedback.html:17 +#: forum/skins/default/templates/feedback.html:18 #, python-format msgid "" "\n" @@ -3219,7 +3366,7 @@ msgid "" " " msgstr "" -#: forum/skins/default/templates/feedback.html:24 +#: forum/skins/default/templates/feedback.html:25 msgid "" "\n" " Dear visitor, we look forward to " @@ -3228,12 +3375,12 @@ msgid "" " " msgstr "" -#: forum/skins/default/templates/feedback.html:41 +#: forum/skins/default/templates/feedback.html:42 #, fuzzy msgid "(this field is required)" msgstr " 标签不能为空。" -#: forum/skins/default/templates/feedback.html:49 +#: forum/skins/default/templates/feedback.html:50 #, fuzzy msgid "Send Feedback" msgstr "问题反馈" @@ -3246,21 +3393,21 @@ msgstr "回到首页" msgid "ask a question" msgstr "我要提问" -#: forum/skins/default/templates/header.html:30 +#: forum/skins/default/templates/header.html:31 #: forum/skins/default/templates/opensearch.html:7 -#: forum/skins/default/templates/search.html:15 +#: forum/skins/default/templates/search.html:16 msgid "search" msgstr "搜索" -#: forum/skins/default/templates/header.html:34 -#: forum/skins/default/templates/search.html:19 forum/views/readers.py:98 -#: forum/views/readers.py:100 forum/views/readers.py:156 -#: forum/views/users.py:317 +#: forum/skins/default/templates/header.html:35 +#: forum/skins/default/templates/search.html:20 forum/views/readers.py:99 +#: forum/views/readers.py:101 forum/views/readers.py:157 +#: forum/views/users.py:318 msgid "questions" msgstr "问题" -#: forum/skins/default/templates/header.html:36 -#: forum/skins/default/templates/search.html:21 forum/views/users.py:59 +#: forum/skins/default/templates/header.html:37 +#: forum/skins/default/templates/search.html:22 forum/views/users.py:60 msgid "users" msgstr "用户" @@ -3541,13 +3688,13 @@ msgstr "" msgid "Please prove that you are a Human Being" msgstr "" -#: forum/skins/default/templates/notarobot.html:10 +#: forum/skins/default/templates/notarobot.html:11 msgid "I am a Human Being" msgstr "" #: forum/skins/default/templates/opensearch.html:4 #: forum/skins/default/templates/opensearch.html:5 -#: forum/skins/default/templates/osqaadmin/nodeman.html:275 +#: forum/skins/default/templates/osqaadmin/nodeman.html:276 #, fuzzy msgid "Search" msgstr "搜索" @@ -3655,71 +3802,71 @@ msgstr "" "意了CNProg以上的所有条款。" # this is how above two are supposed to be -#: forum/skins/default/templates/question.html:111 -#: forum/skins/default/templates/sidebar/recent_tags.html:8 +#: forum/skins/default/templates/question.html:117 +#: forum/skins/default/templates/sidebar/recent_tags.html:11 #, fuzzy, python-format msgid "see questions tagged '%(tagname)s'" msgstr "查看有关'%(tagname)s'的问题" -#: forum/skins/default/templates/question.html:130 +#: forum/skins/default/templates/question.html:136 #, fuzzy, python-format msgid "" "The question has been closed for the following reason \"%(close_reason)s\" by" msgstr "问题以“%s”的原因已被" -#: forum/skins/default/templates/question.html:141 +#: forum/skins/default/templates/question.html:147 #, fuzzy, python-format msgid "One Answer:" msgid_plural "%(counter)s Answers:" msgstr[0] "个回答" msgstr[1] "个回答" -#: forum/skins/default/templates/question.html:190 +#: forum/skins/default/templates/question.html:197 msgid "Your answer" msgstr "您的回答" -#: forum/skins/default/templates/question.html:192 +#: forum/skins/default/templates/question.html:199 #, fuzzy msgid "Be the first one to answer this question!" msgstr "不是一个可以回答的“问题”" -#: forum/skins/default/templates/question.html:199 +#: forum/skins/default/templates/question.html:206 msgid "You can answer anonymously and then login." msgstr "" -#: forum/skins/default/templates/question.html:203 +#: forum/skins/default/templates/question.html:210 msgid "Answer your own question only to give an answer." msgstr "" -#: forum/skins/default/templates/question.html:205 +#: forum/skins/default/templates/question.html:212 #, fuzzy msgid "Please only give an answer, no discussions." msgstr "建议您提的问题是可以被答复的，而不仅仅是可以讨论。" -#: forum/skins/default/templates/question.html:208 +#: forum/skins/default/templates/question.html:215 msgid "" "Remember, your answer will not be published until you validate your email." msgstr "" -#: forum/skins/default/templates/question.html:256 +#: forum/skins/default/templates/question.html:263 msgid "Login/Signup to Post Your Answer" msgstr "" -#: forum/skins/default/templates/question.html:259 +#: forum/skins/default/templates/question.html:266 #, fuzzy msgid "Answer Your Own Question" msgstr "回答该问题" -#: forum/skins/default/templates/question.html:261 +#: forum/skins/default/templates/question.html:268 msgid "Answer the question" msgstr "回答该问题" -#: forum/skins/default/templates/question.html:283 +#: forum/skins/default/templates/question.html:290 msgid "Question tags" msgstr "您正在浏览的问题含有以下标签" # must have extra space after in english -#: forum/skins/default/templates/question.html:289 +#: forum/skins/default/templates/question.html:296 #: forum/skins/default/templates/question_summary_list_roll.html:52 #: forum/skins/default/templates/tags.html:45 #: forum/skins/default/templates/question_list/item.html:31 @@ -3727,30 +3874,30 @@ msgid "see questions tagged" msgstr "查看有关" # book.html line 123 must be empty in english -#: forum/skins/default/templates/question.html:289 +#: forum/skins/default/templates/question.html:296 #: forum/skins/default/templates/question_summary_list_roll.html:52 #: forum/skins/default/templates/tags.html:45 msgid "using tags" msgstr "的问题" -#: forum/skins/default/templates/question.html:294 +#: forum/skins/default/templates/question.html:301 #, fuzzy msgid "question asked" msgstr "提问时间" -#: forum/skins/default/templates/question.html:297 +#: forum/skins/default/templates/question.html:304 msgid "question was seen" msgstr "目前浏览数量" -#: forum/skins/default/templates/question.html:297 +#: forum/skins/default/templates/question.html:304 msgid "times" msgstr "次" -#: forum/skins/default/templates/question.html:300 +#: forum/skins/default/templates/question.html:307 msgid "last updated" msgstr "最后更新时间" -#: forum/skins/default/templates/question.html:306 +#: forum/skins/default/templates/question.html:313 #, fuzzy msgid "Related questions" msgstr "相似的问题" @@ -3770,48 +3917,35 @@ msgid "What Are Tags" msgstr "" #: forum/skins/default/templates/question_retag.html:5 -#: forum/skins/default/templates/question_retag.html:58 +#: forum/skins/default/templates/question_retag.html:40 msgid "Change tags" msgstr "修改问题标签" -#: forum/skins/default/templates/question_retag.html:43 -msgid "tags are required" -msgstr " 标签不能为空。" - -#: forum/skins/default/templates/question_retag.html:44 -#, python-format -msgid "" -"\n" -" maxlength: \"up to %(max_number_of_tags)s tags, less " -"than %(max_length_of_tags)s characters each\"\n" -" " -msgstr "" - -#: forum/skins/default/templates/question_retag.html:88 +#: forum/skins/default/templates/question_retag.html:71 msgid "Why use and modify tags?" msgstr "为什么我只能修改问题标签？" -#: forum/skins/default/templates/question_retag.html:91 +#: forum/skins/default/templates/question_retag.html:74 #, fuzzy msgid "tags help us keep Questions organized" msgstr "CNProg用标签来分类系统的信息" -#: forum/skins/default/templates/question_retag.html:94 +#: forum/skins/default/templates/question_retag.html:77 msgid "tag editors receive special awards from the community" msgstr "修改标签的用户将授予特殊的社区奖牌" #: forum/skins/default/templates/question_summary_list_roll.html:13 #: forum/skins/default/templates/question_list/count.html:15 #: forum/skins/default/templates/question_list/item.html:15 -#: forum/views/users.py:55 +#: forum/views/users.py:56 msgid "answers" msgstr "回答" #: forum/skins/default/templates/question_summary_list_roll.html:14 #: forum/skins/default/templates/question_list/item.html:11 -#: forum/views/commands.py:78 forum/views/readers.py:62 -#: forum/views/readers.py:63 forum/views/readers.py:283 -#: forum/views/users.py:54 forum/views/users.py:55 forum/views/users.py:356 +#: forum/views/commands.py:83 forum/views/readers.py:63 +#: forum/views/readers.py:64 forum/views/readers.py:295 +#: forum/views/users.py:55 forum/views/users.py:56 forum/views/users.py:357 msgid "votes" msgstr "票" @@ -3900,99 +4034,51 @@ msgid "You are not subscribed to this question." msgstr "订阅最>新问题" #: forum/skins/default/templates/subscription_status.html:19 -#: forum/views/commands.py:484 +#: forum/views/commands.py:491 msgid "unsubscribe me" msgstr "" #: forum/skins/default/templates/subscription_status.html:21 -#: forum/views/commands.py:484 +#: forum/views/commands.py:491 msgid "subscribe me" msgstr "" -#: forum/skins/default/templates/subscription_status.html:26 +#: forum/skins/default/templates/subscription_status.html:25 #, python-format msgid "" "\n" " (you can adjust your notification settings on your profile)\n" -" " -msgstr "" - -#: forum/skins/default/templates/subscription_status.html:31 -msgid "Once you sign in you will be able to subscribe for any updates here" -msgstr "" - -#: forum/skins/default/templates/subscription_status.html:33 -msgid "By RSS" -msgstr "" - -#: forum/skins/default/templates/subscription_status.html:36 -#, fuzzy -msgid "subscribe to answers" -msgstr "问题" - -#: forum/skins/default/templates/subscription_status.html:37 -msgid "Answers" -msgstr "个回答" - -#: forum/skins/default/templates/subscription_status.html:41 -#, fuzzy -msgid "subscribe to comments and answers" -msgstr "修改回答" - -# todo - check if it's indeed plural -#: forum/skins/default/templates/subscription_status.html:42 -#, fuzzy -msgid "Answers and Comments" -msgstr "添加评论" - -# book.html line 123 must be empty in english -#: forum/skins/default/templates/tag_selector.html:4 -#: forum/skins/default/templates/question_list/tag_selector.html:6 -#, fuzzy -msgid "Interesting tags" -msgstr "的问题" - -# this is how above two are supposed to be -#: forum/skins/default/templates/tag_selector.html:10 -#: forum/skins/default/templates/tag_selector.html:27 -#: forum/skins/default/templates/question_list/related_tags.html:9 -#: forum/skins/default/templates/question_list/tag_selector.html:13 -#: forum/skins/default/templates/question_list/tag_selector.html:31 -#, fuzzy, python-format -msgid "see questions tagged '%(tag_name)s'" -msgstr "查看有关'%(tagname)s'的问题" +" " +msgstr "" -#: forum/skins/default/templates/tag_selector.html:14 -#: forum/skins/default/templates/question_list/tag_selector.html:17 -#, python-format -msgid "remove '%(tag_name)s' from the list of interesting tags" +#: forum/skins/default/templates/subscription_status.html:30 +msgid "Once you sign in you will be able to subscribe for any updates here" msgstr "" -#: forum/skins/default/templates/tag_selector.html:20 -#: forum/skins/default/templates/tag_selector.html:37 -#: forum/skins/default/templates/question_list/tag_selector.html:23 -#: forum/skins/default/templates/question_list/tag_selector.html:41 -msgid "Add" +#: forum/skins/default/templates/subscription_status.html:32 +msgid "By RSS" msgstr "" -#: forum/skins/default/templates/tag_selector.html:21 -#: forum/skins/default/templates/question_list/tag_selector.html:24 +#: forum/skins/default/templates/subscription_status.html:35 #, fuzzy -msgid "Ignored tags" -msgstr "修改问题标签" +msgid "subscribe to answers" +msgstr "问题" -#: forum/skins/default/templates/tag_selector.html:31 -#: forum/skins/default/templates/question_list/tag_selector.html:35 -#, python-format -msgid "remove '%(tag_name)s' from the list of ignored tags" -msgstr "" +#: forum/skins/default/templates/subscription_status.html:36 +msgid "Answers" +msgstr "个回答" -#: forum/skins/default/templates/tag_selector.html:40 -#: forum/skins/default/templates/question_list/tag_selector.html:45 +#: forum/skins/default/templates/subscription_status.html:40 #, fuzzy -msgid "keep ignored questions hidden" -msgstr "打开关闭任何人的问题" +msgid "subscribe to comments and answers" +msgstr "修改回答" + +# todo - check if it's indeed plural +#: forum/skins/default/templates/subscription_status.html:41 +#, fuzzy +msgid "Answers and Comments" +msgstr "添加评论" #: forum/skins/default/templates/tags.html:6 #: forum/skins/default/templates/tags.html:29 @@ -4039,7 +4125,7 @@ msgid "" "username and password!" msgstr "" -#: forum/skins/default/templates/auth/auth_settings.html:33 +#: forum/skins/default/templates/auth/auth_settings.html:34 #, fuzzy msgid "Create password" msgstr "确认密码" @@ -4069,27 +4155,27 @@ msgstr "" msgid "This account already exists, please use another." msgstr "输入您的新帐号或者指定已经存在的帐号。" -#: forum/skins/default/templates/auth/complete.html:77 +#: forum/skins/default/templates/auth/complete.html:78 msgid "create account" msgstr "创建帐号" -#: forum/skins/default/templates/auth/complete.html:86 +#: forum/skins/default/templates/auth/complete.html:88 msgid "Existing account" msgstr "已经存在的用户" -#: forum/skins/default/templates/auth/complete.html:87 +#: forum/skins/default/templates/auth/complete.html:89 msgid "user name" msgstr "用户名" -#: forum/skins/default/templates/auth/complete.html:88 +#: forum/skins/default/templates/auth/complete.html:90 msgid "password" msgstr "密码" -#: forum/skins/default/templates/auth/complete.html:92 +#: forum/skins/default/templates/auth/complete.html:94 msgid "Register" msgstr "确认" -#: forum/skins/default/templates/auth/complete.html:93 +#: forum/skins/default/templates/auth/complete.html:95 #: forum_modules/localauth/templates/loginform.html:27 msgid "Forgot your password?" msgstr "忘记密码？" @@ -4144,13 +4230,13 @@ msgstr "登录" msgid "User login" msgstr "用户登录" -#: forum/skins/default/templates/auth/signin.html:36 -#: forum/skins/default/templates/auth/signin.html:93 -#: forum/skins/default/templates/auth/signin.html:99 +#: forum/skins/default/templates/auth/signin.html:37 +#: forum/skins/default/templates/auth/signin.html:95 +#: forum/skins/default/templates/auth/signin.html:102 msgid "Or..." msgstr "" -#: forum/skins/default/templates/auth/signin.html:39 +#: forum/skins/default/templates/auth/signin.html:40 msgid "" "\n" " External login services use @username notation" @@ -5973,570 +6128,562 @@ msgid "Users" msgstr "用户列表" #: forum/skins/default/templates/users/votes.html:15 -#: forum/views/commands.py:73 +#: forum/views/commands.py:77 msgid "upvote" msgstr "投赞成票" #: forum/skins/default/templates/users/votes.html:17 -#: forum/views/commands.py:73 +#: forum/views/commands.py:77 msgid "downvote" msgstr "投反对票" -#: forum/templatetags/extra_tags.py:78 +#: forum/templatetags/extra_tags.py:79 #, fuzzy msgid "reputation points" msgstr "积分" -#: forum/templatetags/extra_tags.py:96 +#: forum/templatetags/extra_tags.py:100 #, fuzzy, python-format msgid "%(user)s has %(count)d accepted answers" msgstr "这个问题被" -#: forum/templatetags/extra_tags.py:102 +#: forum/templatetags/extra_tags.py:106 #, fuzzy, python-format msgid "%s has one accepted answer" msgstr "这个问题被" -#: forum/templatetags/extra_tags.py:105 +#: forum/templatetags/extra_tags.py:109 #, fuzzy, python-format msgid "%s has no accepted answers" msgstr "这个问题被" -#: forum/templatetags/extra_tags.py:111 +#: forum/templatetags/extra_tags.py:115 #, fuzzy msgid "accept rate" msgstr "最先回答" -#: forum/templatetags/extra_tags.py:112 +#: forum/templatetags/extra_tags.py:116 #, fuzzy msgid "Rate of the user's accepted answers" msgstr "有答案已被接受为正确答案" -#: forum/templatetags/extra_tags.py:141 -msgid "%b %d at %H:%M" -msgstr "" - -#: forum/templatetags/extra_tags.py:143 -msgid "%b %d '%y at %H:%M" -msgstr "" - -#: forum/templatetags/extra_tags.py:145 +#: forum/templatetags/extra_tags.py:149 #, fuzzy msgid "2 days ago" msgstr "于%s关闭" -#: forum/templatetags/extra_tags.py:147 +#: forum/templatetags/extra_tags.py:151 msgid "yesterday" msgstr "" -#: forum/templatetags/extra_tags.py:149 +#: forum/templatetags/extra_tags.py:153 #, fuzzy msgid "hour ago" msgstr "前" -#: forum/templatetags/extra_tags.py:149 +#: forum/templatetags/extra_tags.py:153 #, fuzzy msgid "hours ago" msgstr "前" -#: forum/templatetags/extra_tags.py:149 +#: forum/templatetags/extra_tags.py:153 #, python-format msgid "%(hr)d " msgid_plural "%(hr)d " msgstr[0] "" msgstr[1] "" -#: forum/templatetags/extra_tags.py:151 +#: forum/templatetags/extra_tags.py:155 #, fuzzy msgid "min ago" msgstr "前" -#: forum/templatetags/extra_tags.py:151 +#: forum/templatetags/extra_tags.py:155 #, fuzzy msgid "mins ago" msgstr "前" -#: forum/templatetags/extra_tags.py:151 +#: forum/templatetags/extra_tags.py:155 #, python-format msgid "%(min)d " msgid_plural "%(min)d " msgstr[0] "" msgstr[1] "" -#: forum/templatetags/extra_tags.py:153 +#: forum/templatetags/extra_tags.py:157 #, fuzzy msgid "sec ago" msgstr "前" -#: forum/templatetags/extra_tags.py:153 +#: forum/templatetags/extra_tags.py:157 #, fuzzy msgid "secs ago" msgstr "前" -#: forum/templatetags/extra_tags.py:153 +#: forum/templatetags/extra_tags.py:157 #, python-format msgid "%(sec)d " msgid_plural "%(sec)d " msgstr[0] "" msgstr[1] "" -#: forum/templatetags/node_tags.py:90 +#: forum/templatetags/node_tags.py:92 msgid "permanent link" msgstr "永久链接" -#: forum/templatetags/node_tags.py:91 +#: forum/templatetags/node_tags.py:93 msgid "answer permanent link" msgstr "该回答的链接地址" -#: forum/templatetags/node_tags.py:95 +#: forum/templatetags/node_tags.py:97 msgid "award points" msgstr "" -#: forum/templatetags/node_tags.py:96 +#: forum/templatetags/node_tags.py:98 #, python-format msgid "award points to %s" msgstr "" -#: forum/templatetags/node_tags.py:106 +#: forum/templatetags/node_tags.py:108 #, fuzzy msgid "retag" msgstr "更新了标签" -#: forum/templatetags/node_tags.py:112 +#: forum/templatetags/node_tags.py:114 msgid "reopen" msgstr "打开" -#: forum/templatetags/node_tags.py:114 +#: forum/templatetags/node_tags.py:116 msgid "close" msgstr "关闭" -#: forum/templatetags/node_tags.py:117 +#: forum/templatetags/node_tags.py:119 msgid "report" msgstr "" -#: forum/templatetags/node_tags.py:123 +#: forum/templatetags/node_tags.py:125 msgid "" "report as offensive (i.e containing spam, advertising, malicious text, etc.)" msgstr "检举该帖为垃“水帖”（含广告、人身攻击、恶意言论等）" # todo please check this in chinese -#: forum/templatetags/node_tags.py:127 +#: forum/templatetags/node_tags.py:129 msgid "undelete" msgstr "取消" -#: forum/templatetags/node_tags.py:134 +#: forum/templatetags/node_tags.py:136 #, fuzzy msgid "see revisions" msgstr "选择版本" # index.html -#: forum/templatetags/node_tags.py:141 +#: forum/templatetags/node_tags.py:143 #, fuzzy msgid "mark as community wiki" msgstr "社区Wiki" # index.html -#: forum/templatetags/node_tags.py:145 +#: forum/templatetags/node_tags.py:147 #, fuzzy msgid "cancel community wiki" msgstr "社区Wiki" -#: forum/templatetags/node_tags.py:149 +#: forum/templatetags/node_tags.py:151 #, fuzzy msgid "convert to comment" msgstr "评论" -#: forum/templatetags/node_tags.py:153 +#: forum/templatetags/node_tags.py:155 #, fuzzy msgid "convert to question" msgstr "回答该问题" -#: forum/templatetags/node_tags.py:221 +#: forum/templatetags/node_tags.py:223 #, fuzzy msgid "posted" msgstr "投赞成票" -#: forum/views/admin.py:117 +#: forum/views/admin.py:136 #, fuzzy msgid "Questions Graph" msgstr "问题列表" -#: forum/views/admin.py:121 +#: forum/views/admin.py:140 #, fuzzy msgid "Users Graph" msgstr "用户列表" -#: forum/views/admin.py:160 +#: forum/views/admin.py:179 #, python-format msgid "'%s' settings saved succesfully" msgstr "" -#: forum/views/admin.py:267 +#: forum/views/admin.py:286 msgid "Bootstrap mode enabled" msgstr "" -#: forum/views/admin.py:281 +#: forum/views/admin.py:300 msgid "All values reverted to defaults" msgstr "" -#: forum/views/admin.py:297 +#: forum/views/admin.py:316 msgid "All values recalculated" msgstr "" -#: forum/views/admin.py:312 +#: forum/views/admin.py:331 msgid "Maintenance mode enabled" msgstr "" -#: forum/views/admin.py:314 +#: forum/views/admin.py:333 msgid "Settings adjusted" msgstr "" -#: forum/views/admin.py:321 +#: forum/views/admin.py:340 msgid "Your site is now running normally" msgstr "" -#: forum/views/admin.py:325 +#: forum/views/admin.py:344 msgid "Currently down for maintenance. We'll be back soon" msgstr "" -#: forum/views/admin.py:385 +#: forum/views/admin.py:410 msgid "createuser" msgstr "" -#: forum/views/admin.py:385 +#: forum/views/admin.py:410 #, fuzzy msgid "Create new user" msgstr "注册新帐号" -#: forum/views/admin.py:400 +#: forum/views/admin.py:425 #, python-format msgid "New user created sucessfully. %s." msgstr "" -#: forum/views/admin.py:401 +#: forum/views/admin.py:426 #, fuzzy, python-format msgid "See %s profile" msgstr "修改资料" -#: forum/views/admin.py:414 +#: forum/views/admin.py:439 msgid "added_at" msgstr "" -#: forum/views/admin.py:415 +#: forum/views/admin.py:440 msgid "added_at_asc" msgstr "" -#: forum/views/admin.py:416 +#: forum/views/admin.py:441 #, fuzzy msgid "author" msgstr "【作者】" -#: forum/views/admin.py:417 +#: forum/views/admin.py:442 #, fuzzy msgid "author_asc" msgstr "【作者】" -#: forum/views/admin.py:418 +#: forum/views/admin.py:443 #, fuzzy msgid "score" msgstr "关闭" -#: forum/views/admin.py:419 +#: forum/views/admin.py:444 msgid "score_asc" msgstr "" -#: forum/views/admin.py:420 +#: forum/views/admin.py:445 msgid "act_at" msgstr "" -#: forum/views/admin.py:421 +#: forum/views/admin.py:446 msgid "act_at_asc" msgstr "" -#: forum/views/admin.py:422 +#: forum/views/admin.py:447 msgid "act_by" msgstr "" -#: forum/views/admin.py:423 +#: forum/views/admin.py:448 msgid "act_by_asc" msgstr "" -#: forum/views/admin.py:426 +#: forum/views/admin.py:451 msgid "nodeman" msgstr "" -#: forum/views/admin.py:426 +#: forum/views/admin.py:451 msgid "Bulk management" msgstr "" -#: forum/views/admin.py:432 +#: forum/views/admin.py:457 #, fuzzy msgid "filter" msgstr "银牌" -#: forum/views/admin.py:445 +#: forum/views/admin.py:470 msgid "No action performed" msgstr "" -#: forum/views/admin.py:452 +#: forum/views/admin.py:477 msgid "All selected nodes marked as deleted" msgstr "" -#: forum/views/admin.py:459 +#: forum/views/admin.py:484 msgid "All selected nodes undeleted" msgstr "" -#: forum/views/admin.py:464 +#: forum/views/admin.py:489 #, fuzzy msgid "bulk close" msgstr "关闭" -#: forum/views/admin.py:466 +#: forum/views/admin.py:491 #, fuzzy msgid "Selected questions were closed" msgstr "删除问题" -#: forum/views/admin.py:478 +#: forum/views/admin.py:503 msgid "All selected nodes deleted" msgstr "" -#: forum/views/auth.py:119 forum/views/auth.py:131 +#: forum/views/auth.py:120 forum/views/auth.py:132 msgid "" "Sorry, these login credentials belong to anoother user. Plese terminate your " "current session and try again." msgstr "" -#: forum/views/auth.py:122 +#: forum/views/auth.py:123 msgid "You are already logged in with that user." msgstr "" -#: forum/views/auth.py:128 +#: forum/views/auth.py:129 msgid "These login credentials are already associated with your account." msgstr "" -#: forum/views/auth.py:137 +#: forum/views/auth.py:138 msgid "The new credentials are now associated with your account" msgstr "" -#: forum/views/auth.py:177 +#: forum/views/auth.py:178 msgid "" "Oops, something went wrong in the middle of this process. Please try again. " "Note that you need to have cookies enabled for the authentication to work." msgstr "" -#: forum/views/auth.py:189 forum_modules/localauth/views.py:29 +#: forum/views/auth.py:190 forum_modules/localauth/views.py:29 #, fuzzy msgid "A welcome email has been sent to your email address. " msgstr "和您的邮件地址是绑定的" -#: forum/views/auth.py:194 +#: forum/views/auth.py:195 msgid "" "Oops, something went wrong in the middle of this process. Please try again." msgstr "" -#: forum/views/auth.py:248 +#: forum/views/auth.py:254 #, fuzzy msgid "An email has been sent with your temporary login key" msgstr "和您的邮件地址是绑定的" -#: forum/views/auth.py:269 +#: forum/views/auth.py:275 msgid "" "You are logged in with a temporary access key, please take the time to fix " "your issue with authentication." msgstr "" -#: forum/views/auth.py:289 +#: forum/views/auth.py:295 #, fuzzy msgid "A message with an email validation link was just sent to your address." msgstr "和您的邮件地址是绑定的" -#: forum/views/auth.py:300 +#: forum/views/auth.py:306 msgid "Thank you, your email is now validated." msgstr "" -#: forum/views/auth.py:325 +#: forum/views/auth.py:331 #, fuzzy msgid "New password set" msgstr "密码" -#: forum/views/auth.py:329 +#: forum/views/auth.py:335 #, fuzzy msgid "Your password was changed" msgstr "密码" -#: forum/views/auth.py:365 +#: forum/views/auth.py:371 #, python-format msgid "You removed the association with %s" msgstr "" -#: forum/views/auth.py:377 +#: forum/views/auth.py:383 #, python-format msgid "Welcome back %s, you are now logged in" msgstr "" -#: forum/views/auth.py:391 +#: forum/views/auth.py:397 #, python-format msgid "You have a %s pending submission." msgstr "" # synonym of above in Edit question -#: forum/views/auth.py:392 +#: forum/views/auth.py:398 #, fuzzy msgid "save it" msgstr "现在修改" -#: forum/views/auth.py:393 forum/views/writers.py:279 +#: forum/views/auth.py:399 forum/views/writers.py:286 #, fuzzy msgid "review" msgstr "浏览" -#: forum/views/auth.py:394 forum/views/writers.py:276 +#: forum/views/auth.py:400 forum/views/writers.py:283 #, fuzzy msgid "cancel" msgstr "取消" -#: forum/views/auth.py:402 +#: forum/views/auth.py:408 msgid "Sorry, but this account is suspended" msgstr "" -#: forum/views/commands.py:24 +#: forum/views/commands.py:28 #, python-format msgid "" "Sorry, but you don't have enough reputation points to %(action)s.
Please check the faq" msgstr "" -#: forum/views/commands.py:32 +#: forum/views/commands.py:36 #, python-format msgid "" "Sorry but you cannot %(action)s your own post.
Please check the faq" msgstr "" -#: forum/views/commands.py:40 +#: forum/views/commands.py:44 #, python-format msgid "" "Sorry but anonymous users cannot %(action)s.
Please login or create an " "account here." msgstr "" -#: forum/views/commands.py:48 +#: forum/views/commands.py:52 #, python-format msgid "" "Sorry, but you don't have enough %(action)s left for today..
The limit " "is %(limit)s per day..
Please check the faq" msgstr "" -#: forum/views/commands.py:56 +#: forum/views/commands.py:60 #, python-format msgid "" "Sorry, but you cannot %(action)s twice the same post.
Please check the " "faq" msgstr "" -#: forum/views/commands.py:88 +#: forum/views/commands.py:93 #, python-format msgid "" "Sorry but you cannot cancel a vote after %(ndays)d %(tdays)s from the " "original vote" msgstr "" -#: forum/views/commands.py:90 +#: forum/views/commands.py:95 msgid "day" msgid_plural "days" msgstr[0] "" msgstr[1] "" -#: forum/views/commands.py:110 +#: forum/views/commands.py:115 #, python-format msgid "You have %(nvotes)s %(tvotes)s left today." msgstr "" -#: forum/views/commands.py:124 forum/views/commands.py:130 +#: forum/views/commands.py:129 forum/views/commands.py:135 msgid "flag posts" msgstr "" -#: forum/views/commands.py:127 +#: forum/views/commands.py:132 msgid "flag" msgstr "" -#: forum/views/commands.py:135 +#: forum/views/commands.py:140 #, fuzzy msgid "flags" msgstr "标签" -#: forum/views/commands.py:140 +#: forum/views/commands.py:145 #, python-format msgid "You already flagged this post with the following reason: %(reason)s" msgstr "" # revisions_answer.html -#: forum/views/commands.py:145 forum/views/commands.py:374 +#: forum/views/commands.py:150 forum/views/commands.py:380 #, fuzzy msgid "Reason is empty" msgstr "版本历史" -#: forum/views/commands.py:149 +#: forum/views/commands.py:154 msgid "" "Thank you for your report. A moderator will review your submission shortly." msgstr "" -#: forum/views/commands.py:157 forum/views/commands.py:163 +#: forum/views/commands.py:162 forum/views/commands.py:168 #, fuzzy msgid "like comments" msgstr "评论" -#: forum/views/commands.py:160 +#: forum/views/commands.py:165 #, fuzzy msgid "like" msgstr "链接" -#: forum/views/commands.py:187 forum/views/commands.py:190 +#: forum/views/commands.py:192 forum/views/commands.py:195 #, fuzzy msgid "delete comments" msgstr "删除任何一个评论" -#: forum/views/commands.py:206 +#: forum/views/commands.py:211 #, fuzzy msgid "mark a question as favorite" msgstr "这个问题被" -#: forum/views/commands.py:232 forum/views/commands.py:512 -#: forum/views/commands.py:523 +#: forum/views/commands.py:237 forum/views/commands.py:544 +#: forum/views/commands.py:555 msgid "Invalid request" msgstr "" -#: forum/views/commands.py:237 +#: forum/views/commands.py:242 msgid "Comment is empty" msgstr "" -#: forum/views/commands.py:240 +#: forum/views/commands.py:245 #, python-format msgid "At least %d characters required on comment body." msgstr "" -#: forum/views/commands.py:243 +#: forum/views/commands.py:248 #, python-format msgid "No more than %d characters on comment body." msgstr "" # todo - check if it's indeed plural -#: forum/views/commands.py:249 +#: forum/views/commands.py:254 #, fuzzy msgid "edit comments" msgstr "添加评论" -#: forum/views/commands.py:283 forum/views/commands.py:297 +#: forum/views/commands.py:289 forum/views/commands.py:303 #, fuzzy msgid "accept answers" msgstr "最先回答" -#: forum/views/commands.py:303 +#: forum/views/commands.py:309 #, fuzzy msgid "Sorry but you cannot accept the answer" msgstr "您正在浏览的问题含有以下标签" -#: forum/views/commands.py:312 +#: forum/views/commands.py:318 #, fuzzy msgid "This question already has an accepted answer." msgid_plural "" @@ -6544,7 +6691,7 @@ msgid_plural "" msgstr[0] "这个问题被" msgstr[1] "这个问题被" -#: forum/views/commands.py:319 +#: forum/views/commands.py:325 #, fuzzy msgid "" "The author of this answer already has an accepted answer in this question." @@ -6554,73 +6701,81 @@ msgid_plural "" msgstr[0] "有答案已被接受为正确答案" msgstr[1] "有答案已被接受为正确答案" -#: forum/views/commands.py:334 forum/views/commands.py:337 +#: forum/views/commands.py:340 forum/views/commands.py:343 #, fuzzy msgid "delete posts" msgstr "删除" # close.html -#: forum/views/commands.py:360 forum/views/commands.py:369 +#: forum/views/commands.py:366 forum/views/commands.py:375 #, fuzzy msgid "close questions" msgstr "关闭问题" -#: forum/views/commands.py:364 +#: forum/views/commands.py:370 #, fuzzy msgid "reopen questions" msgstr "重设问题" # index.html -#: forum/views/commands.py:386 forum/views/commands.py:398 +#: forum/views/commands.py:392 forum/views/commands.py:404 #, fuzzy msgid "mark posts as community wiki" msgstr "社区Wiki" # index.html -#: forum/views/commands.py:390 +#: forum/views/commands.py:396 #, fuzzy msgid "cancel a community wiki post" msgstr "社区Wiki" -#: forum/views/commands.py:411 +#: forum/views/commands.py:418 forum/views/commands.py:421 +#, fuzzy +msgid "convert answers to comments" +msgstr "当前总票数" + +#: forum/views/commands.py:424 #, python-format msgid "Answer by %(uname)s: %(snippet)s..." msgstr "" -#: forum/views/commands.py:413 +#: forum/views/commands.py:426 #, fuzzy msgid "Question" msgstr "问题列表" -#: forum/views/commands.py:420 forum/views/commands.py:423 -#, fuzzy -msgid "convert answers to comments" -msgstr "当前总票数" - -#: forum/views/commands.py:428 forum/views/commands.py:431 +#: forum/views/commands.py:435 forum/views/commands.py:438 msgid "That is an invalid post to put the comment under" msgstr "" -#: forum/views/commands.py:449 forum/views/commands.py:452 +#: forum/views/commands.py:456 forum/views/commands.py:459 #, fuzzy msgid "convert comments to answers" msgstr "修改回答" -#: forum/views/commands.py:467 +#: forum/views/commands.py:474 msgid "You do not have the correct credentials to preform this action." msgstr "" -#: forum/views/commands.py:558 +#: forum/views/commands.py:502 +msgid "You cannot use the canned comments tool." +msgstr "" + +#: forum/views/commands.py:594 msgid "The permanent URL to the answer has been copied to your clipboard." msgstr "" -#: forum/views/commands.py:569 forum/views/commands.py:573 -#: forum/views/commands.py:582 +#: forum/views/commands.py:605 forum/views/commands.py:609 +#: forum/views/commands.py:621 #, fuzzy msgid "award" msgstr "所有奖牌" -#: forum/views/commands.py:589 +#: forum/views/commands.py:618 +msgid "The number of points to award needs to be a positive value." +msgstr "" + +#: forum/views/commands.py:628 #, python-format msgid "You have awarded %(awarded_user)s with %(points)d points" msgstr "" @@ -6630,303 +6785,303 @@ msgid "" "We're sorry, but an unknown error ocurred.
Please try again in a while." msgstr "" -#: forum/views/meta.py:70 +#: forum/views/meta.py:71 msgid "Thanks for the feedback!" msgstr "" -#: forum/views/meta.py:78 +#: forum/views/meta.py:79 msgid "We look forward to hearing your feedback! Please, give it next time :)" msgstr "" -#: forum/views/readers.py:44 +#: forum/views/readers.py:45 #, fuzzy msgid "Most recently updated questions" msgstr "最近被更新的问题" -#: forum/views/readers.py:45 +#: forum/views/readers.py:46 #, fuzzy msgid "most recently asked questions" msgstr "最新加入系统的问题" -#: forum/views/readers.py:46 +#: forum/views/readers.py:47 #, fuzzy msgid "most active questions in the last 24 hours" msgstr "回复最多的问题将显示在最前面。" # "最有价值问题" # "最新问题" -#: forum/views/readers.py:47 +#: forum/views/readers.py:48 #, fuzzy msgid "mostvoted" msgstr "最有价值的问题" -#: forum/views/readers.py:47 +#: forum/views/readers.py:48 #, fuzzy msgid "most voted questions" msgstr "个 没有回答的 问题。" -#: forum/views/readers.py:60 forum/views/readers.py:279 -#: forum/views/users.py:41 forum/views/users.py:52 +#: forum/views/readers.py:61 forum/views/readers.py:291 +#: forum/views/users.py:42 forum/views/users.py:53 msgid "oldest" msgstr "最先加入" -#: forum/views/readers.py:60 forum/views/users.py:52 +#: forum/views/readers.py:61 forum/views/users.py:53 msgid "oldest answers" msgstr "最先回答" -#: forum/views/readers.py:60 forum/views/users.py:52 +#: forum/views/readers.py:61 forum/views/users.py:53 msgid "oldest answers will be shown first" msgstr "最先回答显示在最前面" -#: forum/views/readers.py:61 forum/views/users.py:53 +#: forum/views/readers.py:62 forum/views/users.py:54 msgid "newest answers" msgstr "最近回答" -#: forum/views/readers.py:61 forum/views/users.py:53 +#: forum/views/readers.py:62 forum/views/users.py:54 msgid "newest answers will be shown first" msgstr "最晚回答显示在最前面" -#: forum/views/readers.py:62 forum/views/users.py:54 +#: forum/views/readers.py:63 forum/views/users.py:55 msgid "popular answers" msgstr "投票最多" -#: forum/views/readers.py:62 forum/views/users.py:54 +#: forum/views/readers.py:63 forum/views/users.py:55 msgid "most voted answers will be shown first" msgstr "投票次数最多的显示在最前面" -#: forum/views/readers.py:68 forum/views/users.py:42 +#: forum/views/readers.py:69 forum/views/users.py:43 #, fuzzy msgid "name" msgstr "按名称排序" -#: forum/views/readers.py:68 +#: forum/views/readers.py:69 msgid "by name" msgstr "按名称排序" -#: forum/views/readers.py:68 +#: forum/views/readers.py:69 msgid "sorted alphabetically" msgstr "按名称的字母先后顺序排序" -#: forum/views/readers.py:69 forum/views/readers.py:70 +#: forum/views/readers.py:70 forum/views/readers.py:71 #, fuzzy msgid "used" msgstr "用户" -#: forum/views/readers.py:69 +#: forum/views/readers.py:70 #, fuzzy msgid "by popularity" msgstr "按流行程度排序" -#: forum/views/readers.py:69 +#: forum/views/readers.py:70 msgid "sorted by frequency of tag use" msgstr "按标签被使用的次数排序" -#: forum/views/readers.py:77 +#: forum/views/readers.py:78 msgid " - " msgstr "-" -#: forum/views/readers.py:77 +#: forum/views/readers.py:78 msgid "latest questions" msgstr "最新问题" -#: forum/views/readers.py:90 +#: forum/views/readers.py:91 #, fuzzy msgid "unanswered" msgstr "回答" -#: forum/views/readers.py:94 +#: forum/views/readers.py:95 #, fuzzy msgid "open questions without an accepted answer" msgstr "您正在浏览的问题含有以下标签" -#: forum/views/readers.py:96 +#: forum/views/readers.py:97 #, fuzzy msgid "Unanswered Questions" msgstr "没有回答的问题" -#: forum/views/readers.py:123 +#: forum/views/readers.py:124 #, python-format msgid "questions tagged %(tag)s" msgstr "" # this is how above two are supposed to be -#: forum/views/readers.py:125 +#: forum/views/readers.py:126 #, fuzzy, python-format msgid "Questions Tagged With %(tag)s" msgstr "查看有关'%(tagname)s'的问题" -#: forum/views/readers.py:134 +#: forum/views/readers.py:135 #, fuzzy, python-format msgid "Questions asked by %s" msgstr "提问时间" -#: forum/views/readers.py:137 +#: forum/views/readers.py:138 #, fuzzy, python-format msgid "Questions answered by %s" msgstr "您正在浏览的问题含有以下标签" -#: forum/views/readers.py:144 +#: forum/views/readers.py:145 #, fuzzy, python-format msgid "Questions you subscribed %s" msgstr "问题列表" -#: forum/views/readers.py:146 +#: forum/views/readers.py:147 #, fuzzy, python-format msgid "Questions subscribed by %s" msgstr "您正在浏览的问题含有以下标签" -#: forum/views/readers.py:169 +#: forum/views/readers.py:172 msgid "Questions" msgstr "问题列表" -#: forum/views/readers.py:223 forum/views/readers.py:224 +#: forum/views/readers.py:235 forum/views/readers.py:236 msgid "ranking" msgstr "" -#: forum/views/readers.py:223 +#: forum/views/readers.py:235 #, fuzzy msgid "relevance" msgstr "设置" -#: forum/views/readers.py:223 +#: forum/views/readers.py:235 #, fuzzy msgid "most relevant questions" msgstr "投票次数最多的问题" -#: forum/views/readers.py:231 forum/views/readers.py:233 +#: forum/views/readers.py:243 forum/views/readers.py:245 #, python-format msgid "questions matching '%(keywords)s'" msgstr "" -#: forum/views/readers.py:380 +#: forum/views/readers.py:393 #, python-format msgid "Revision n. %(rev_number)d" msgstr "" -#: forum/views/users.py:39 +#: forum/views/users.py:40 #, fuzzy msgid "sorted by reputation" msgstr "积分" -#: forum/views/users.py:40 +#: forum/views/users.py:41 msgid "recent" msgstr "最新加入" -#: forum/views/users.py:40 +#: forum/views/users.py:41 #, fuzzy msgid "newest members" msgstr "最近回答" -#: forum/views/users.py:41 +#: forum/views/users.py:42 #, fuzzy msgid "last" msgstr "标签" -#: forum/views/users.py:41 +#: forum/views/users.py:42 #, fuzzy msgid "oldest members" msgstr "最先回答" -#: forum/views/users.py:42 +#: forum/views/users.py:43 msgid "by username" msgstr "用户名" -#: forum/views/users.py:42 +#: forum/views/users.py:43 #, fuzzy msgid "sorted by username" msgstr "用户名" -#: forum/views/users.py:73 +#: forum/views/users.py:74 msgid "Online Users" msgstr "" -#: forum/views/users.py:167 +#: forum/views/users.py:168 #, fuzzy msgid "Profile updated." msgstr "最后更新时间" -#: forum/views/users.py:181 +#: forum/views/users.py:182 msgid "Only superusers are allowed to alter other users permissions." msgstr "" -#: forum/views/users.py:184 +#: forum/views/users.py:185 msgid "Only the site owner can remove the super user status from other user." msgstr "" -#: forum/views/users.py:206 +#: forum/views/users.py:207 msgid "Only superusers are allowed to award reputation points" msgstr "" -#: forum/views/users.py:211 +#: forum/views/users.py:212 msgid "Invalid number of points to award." msgstr "" -#: forum/views/users.py:229 +#: forum/views/users.py:230 msgid "Only superusers can suspend other users" msgstr "" -#: forum/views/users.py:250 +#: forum/views/users.py:251 msgid "Invalid numeric argument for the number of days." msgstr "" -#: forum/views/users.py:300 +#: forum/views/users.py:301 msgid "overview" msgstr "概览" -#: forum/views/users.py:300 +#: forum/views/users.py:301 #, fuzzy msgid "user overview" msgstr "用户概览" -#: forum/views/users.py:332 +#: forum/views/users.py:333 msgid "recent activity" msgstr "最近活动" -#: forum/views/users.py:332 +#: forum/views/users.py:333 #, fuzzy msgid "recent user activity" msgstr "最近活动" -#: forum/views/users.py:341 +#: forum/views/users.py:342 msgid "reputation history" msgstr "积分" -#: forum/views/users.py:341 +#: forum/views/users.py:342 #, fuzzy msgid "graph of user karma" msgstr "用户的社区积分历史" -#: forum/views/users.py:356 +#: forum/views/users.py:357 msgid "user vote record" msgstr "用户所有投票" -#: forum/views/users.py:363 +#: forum/views/users.py:364 msgid "favorites" msgstr "收藏" -#: forum/views/users.py:363 +#: forum/views/users.py:364 msgid "questions that user selected as his/her favorite" msgstr "用户收藏的问题" -#: forum/views/users.py:369 +#: forum/views/users.py:370 #, fuzzy msgid "subscription" msgstr "问题" -#: forum/views/users.py:369 +#: forum/views/users.py:370 #, fuzzy msgid "subscriptions" msgstr "问题" -#: forum/views/users.py:383 +#: forum/views/users.py:384 msgid "New subscription settings are now saved" msgstr "" -#: forum/views/users.py:427 +#: forum/views/users.py:428 msgid "preferences" msgstr "设置" -#: forum/views/users.py:434 +#: forum/views/users.py:435 #, fuzzy msgid "New preferences saved" msgstr "设置" @@ -6956,16 +7111,16 @@ msgstr "在文件上传过程中产生了错误，请联系管理员，谢谢^_^ msgid "Your question is pending until you %s." msgstr "" -#: forum/views/writers.py:99 forum/views/writers.py:261 +#: forum/views/writers.py:99 forum/views/writers.py:268 msgid "validate your email" msgstr "" -#: forum/views/writers.py:122 +#: forum/views/writers.py:129 #, fuzzy msgid "Converted to question" msgstr "修改问题" -#: forum/views/writers.py:260 +#: forum/views/writers.py:267 #, python-format msgid "Your answer is pending until you %s." msgstr "" @@ -7013,7 +7168,7 @@ msgid "" "If you believe this is an error, please contact the forum administrator.\n" msgstr "" -#: forum_modules/akismet/templates/foundspam.html:29 +#: forum_modules/akismet/templates/foundspam.html:30 msgid "Submit" msgstr "" @@ -7720,7 +7875,7 @@ msgstr "" msgid "Start new backup" msgstr "" -#: forum_modules/exporter/templates/exporter.html:31 +#: forum_modules/exporter/templates/exporter.html:32 msgid "Start" msgstr "" @@ -7788,16 +7943,11 @@ msgstr "" msgid " of " msgstr "" -#: forum_modules/facebookauth/authentication.py:31 +#: forum_modules/facebookauth/authentication.py:36 msgid "Sorry, your Facebook session has expired, please try again" msgstr "" -#: forum_modules/facebookauth/authentication.py:33 -msgid "" -"The authentication with Facebook connect failed due to an invalid signature" -msgstr "" - -#: forum_modules/facebookauth/authentication.py:35 +#: forum_modules/facebookauth/authentication.py:38 msgid "" "The authentication with Facebook connect failed, cannot find authentication " "tokens" @@ -7860,14 +8010,49 @@ msgstr "密码" msgid "Create account" msgstr "创建帐号" -#: forum_modules/oauthauth/consumer.py:33 +#: forum_modules/oauthauth/consumer.py:36 msgid "Error, the oauth token is not on the server" msgstr "" -#: forum_modules/oauthauth/consumer.py:38 +#: forum_modules/oauthauth/consumer.py:41 msgid "Something went wrong! Auth tokens do not match" msgstr "" +#: forum_modules/oauthauth/settings.py:6 +#, fuzzy +msgid "Twitter consumer key" +msgstr "账号:" + +#: forum_modules/oauthauth/settings.py:7 +msgid "" +"\n" +"Get this key at the Twitter apps to " +"enable\n" +"authentication in your site through Twitter.\n" +msgstr "" + +#: forum_modules/oauthauth/settings.py:14 +msgid "Twitter consumer secret" +msgstr "" + +#: forum_modules/oauthauth/settings.py:15 +msgid "" +"\n" +"This your Twitter consumer secret that you'll get in the same place as the " +"consumer key.\n" +msgstr "" + +#: forum_modules/oauthauth/settings.py:21 +msgid "Twitter auto-callback redirect" +msgstr "" + +#: forum_modules/oauthauth/settings.py:22 +msgid "" +"\n" +"Automatically redirect to the Twitter authentication done page, pass the " +"oauth_callback parameter.\n" +msgstr "" + #: forum_modules/openidauth/consumer.py:58 msgid "Sorry, but your input is not a valid OpenId" msgstr "" @@ -7933,14 +8118,75 @@ msgstr "" msgid "Welcome to Stack Exchange dump importer." msgstr "" -#: forum_modules/sximporter/templates/page.html:16 +#: forum_modules/sximporter/templates/page.html:17 msgid "Your user id in stack exchange" msgstr "" -#: forum_modules/sximporter/templates/page.html:20 +#: forum_modules/sximporter/templates/page.html:21 msgid "Merge users with same user name and email" msgstr "" +#: forum_modules/updater/base.py:144 +msgid "Wasn't able to check to the update server." +msgstr "" + +#: forum_modules/updater/base.py:153 +msgid "Wasn't able to retreive the update messages." +msgstr "" + +#: forum_modules/updater/base.py:165 +#, python-format +msgid "%d update messages have been downloaded." +msgstr "" + +#: forum_modules/updater/settings.py:8 +#, fuzzy +msgid "Updater Settings" +msgstr "个问题" + +#: forum_modules/updater/settings.py:8 +#, fuzzy +msgid "OSQA Update Checker Settings." +msgstr "设置" + +#: forum_modules/updater/settings.py:12 +msgid "" +"\n" +"Use the OSQA update server recieve notifications about the latest updates.\n" +msgstr "" + +#: forum_modules/updater/urls.py:8 +#, fuzzy +msgid "updater/" +msgstr "更新于" + +#: forum_modules/updater/urls.py:8 +msgid "check/" +msgstr "" + +#: forum_modules/updater/views.py:8 +#, fuzzy +msgid "updater" +msgstr "更新于" + +#: forum_modules/updater/views.py:8 +#: forum_modules/updater/templates/index.html:38 +#, fuzzy +msgid "Update Checker" +msgstr "更新" + +#: forum_modules/updater/templates/index.html:22 +msgid "Checking for updates" +msgstr "" + +#: forum_modules/updater/templates/index.html:41 +msgid "Use the OSQA update server to check for updates" +msgstr "" + +#: forum_modules/updater/templates/index.html:46 +msgid "Check for Updates" +msgstr "" + #: locale/phrases.py:1 msgid "Test Phrase 1" msgstr "" @@ -7957,6 +8203,9 @@ msgstr "" msgid "Test Phrase n" msgstr "" +#~ msgid "tags are required" +#~ msgstr " 标签不能为空。" + #~ msgid "duplicate question" #~ msgstr "完全重复的问题" @@ -8281,10 +8530,6 @@ msgstr "" #~ msgid "Create Account" #~ msgstr "创建帐号" -#, fuzzy -#~ msgid " add comment" -#~ msgstr "添加评论" - #, fuzzy #~ msgid "On question " #~ msgstr "提问" @@ -8334,9 +8579,6 @@ msgstr "" #~ msgid "profile - votes" #~ msgstr "投票 - 用户资料" -#~ msgid "user reputation in the community" -#~ msgstr "用户社区积分" - #~ msgid "profile - user reputation" #~ msgstr "积分 - 用户资料" @@ -8421,9 +8663,6 @@ msgstr "" #~ msgid "Connect with Twitter" #~ msgstr "同步Twitter消息" -#~ msgid "Twitter account name:" -#~ msgstr "账号:" - #~ msgid "Twitter password:" #~ msgstr "密码:"