Merge pull request #1 from udacity/add_requirements_file

[osqa.git] / 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 f8e953090df8ef5dd9b57350d0b5f2620f633233..1c55a5340b290890d92f23636105fed51929d073 100644 (file)
--- 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: 2012-02-15 09:24+0200\n"
+"POT-Creation-Date: 2012-04-02 14:17-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1401,17 +1401,17 @@ msgstr "修改问题"
 msgid "ignored"
 msgstr ""
 
-#: forum/models/user.py:217 forum/views/readers.py:144
+#: forum/models/user.py:233 forum/views/readers.py:144
 #, fuzzy
 msgid "asked-by"
 msgstr "提问于"
 
-#: forum/models/user.py:232 forum/views/readers.py:147
+#: forum/models/user.py:248 forum/views/readers.py:147
 #, fuzzy
 msgid "answered-by"
 msgstr "回答"
 
-#: forum/models/user.py:238 forum/views/readers.py:150
+#: forum/models/user.py:254 forum/views/readers.py:150
 msgid "subscribed-by"
 msgstr ""
 
@@ -3196,20 +3196,20 @@ msgid "Give your  account a new password."
 msgstr ""
 
 #: forum/skins/default/templates/answer_edit.html:5
-#: forum/skins/default/templates/answer_edit.html:62
+#: forum/skins/default/templates/answer_edit.html:63
 #: forum/skins/nuxeo/templates/answer_edit.html:5
 #: forum/skins/nuxeo/templates/answer_edit.html:62
 msgid "Edit answer"
 msgstr "修改回答"
 
-#: forum/skins/default/templates/answer_edit.html:19
-#: 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:46
-#: forum/skins/default/templates/question.html:49
-#: forum/skins/default/templates/question_edit.html:19
-#: forum/skins/default/templates/question_edit.html:22
+#: forum/skins/default/templates/answer_edit.html:20
+#: forum/skins/default/templates/answer_edit.html:23
+#: forum/skins/default/templates/ask.html:27
+#: forum/skins/default/templates/ask.html:30
+#: forum/skins/default/templates/question.html:47
+#: forum/skins/default/templates/question.html:50
+#: forum/skins/default/templates/question_edit.html:20
+#: forum/skins/default/templates/question_edit.html:23
 #: forum/skins/nuxeo/templates/answer_edit.html:19
 #: forum/skins/nuxeo/templates/answer_edit.html:22
 #: forum/skins/nuxeo/templates/ask.html:45
@@ -3221,10 +3221,10 @@ msgstr "修改回答"
 msgid "hide preview"
 msgstr "禁用预览"
 
-#: forum/skins/default/templates/answer_edit.html:22
-#: forum/skins/default/templates/ask.html:29
-#: forum/skins/default/templates/question.html:49
-#: forum/skins/default/templates/question_edit.html:22
+#: forum/skins/default/templates/answer_edit.html:23
+#: forum/skins/default/templates/ask.html:30
+#: forum/skins/default/templates/question.html:50
+#: forum/skins/default/templates/question_edit.html:23
 #: forum/skins/nuxeo/templates/answer_edit.html:22
 #: forum/skins/nuxeo/templates/ask.html:48
 #: forum/skins/nuxeo/templates/question.html:42
@@ -3232,8 +3232,8 @@ msgstr "禁用预览"
 msgid "show preview"
 msgstr "启用预览"
 
-#: forum/skins/default/templates/answer_edit.html:62
-#: forum/skins/default/templates/question_edit.html:91
+#: forum/skins/default/templates/answer_edit.html:63
+#: forum/skins/default/templates/question_edit.html:92
 #: forum/skins/default/templates/question_retag.html:40
 #: forum/skins/default/templates/revisions.html:38
 #: forum/skins/nuxeo/templates/answer_edit.html:62
@@ -3243,8 +3243,8 @@ msgstr "启用预览"
 msgid "back"
 msgstr "返回"
 
-#: forum/skins/default/templates/answer_edit.html:68
-#: forum/skins/default/templates/question_edit.html:97
+#: forum/skins/default/templates/answer_edit.html:69
+#: forum/skins/default/templates/question_edit.html:98
 #: forum/skins/default/templates/revisions.html:54
 #: forum/skins/nuxeo/templates/answer_edit.html:67
 #: forum/skins/nuxeo/templates/question_edit.html:96
@@ -3252,17 +3252,17 @@ msgstr "返回"
 msgid "revision"
 msgstr "版本"
 
-#: forum/skins/default/templates/answer_edit.html:71
-#: forum/skins/default/templates/question_edit.html:101
+#: forum/skins/default/templates/answer_edit.html:72
+#: forum/skins/default/templates/question_edit.html:102
 #: forum/skins/nuxeo/templates/answer_edit.html:70
 #: forum/skins/nuxeo/templates/question_edit.html:100
 msgid "select revision"
 msgstr "选择版本"
 
-#: forum/skins/default/templates/answer_edit.html:78
-#: forum/skins/default/templates/ask.html:130
-#: forum/skins/default/templates/question.html:232
-#: forum/skins/default/templates/question_edit.html:118
+#: forum/skins/default/templates/answer_edit.html:79
+#: forum/skins/default/templates/ask.html:131
+#: forum/skins/default/templates/question.html:233
+#: forum/skins/default/templates/question_edit.html:119
 #: forum/skins/nuxeo/templates/answer_edit.html:77
 #: forum/skins/nuxeo/templates/ask.html:132
 #: forum/skins/nuxeo/templates/question.html:234
@@ -3270,10 +3270,10 @@ msgstr "选择版本"
 msgid "Toggle the real time Markdown editor preview"
 msgstr "打开或者关闭Markdown编辑器的实时预览"
 
-#: forum/skins/default/templates/answer_edit.html:78
-#: forum/skins/default/templates/ask.html:130
-#: forum/skins/default/templates/question.html:233
-#: forum/skins/default/templates/question_edit.html:118
+#: forum/skins/default/templates/answer_edit.html:79
+#: forum/skins/default/templates/ask.html:131
+#: forum/skins/default/templates/question.html:234
+#: forum/skins/default/templates/question_edit.html:119
 #: forum/skins/nuxeo/templates/answer_edit.html:77
 #: forum/skins/nuxeo/templates/ask.html:132
 #: forum/skins/nuxeo/templates/question.html:235
@@ -3282,8 +3282,8 @@ msgid "toggle preview"
 msgstr "预览开关"
 
 # synonym of above in Edit question
-#: forum/skins/default/templates/answer_edit.html:102
-#: forum/skins/default/templates/question_edit.html:154
+#: forum/skins/default/templates/answer_edit.html:103
+#: forum/skins/default/templates/question_edit.html:155
 #: forum/skins/default/templates/question_retag.html:62
 #: forum/skins/nuxeo/templates/answer_edit.html:101
 #: forum/skins/nuxeo/templates/question_edit.html:153
@@ -3291,11 +3291,11 @@ msgstr "预览开关"
 msgid "Save edit"
 msgstr "现在修改"
 
-#: forum/skins/default/templates/answer_edit.html:103
+#: forum/skins/default/templates/answer_edit.html:104
 #: forum/skins/default/templates/base_content.html:44
 #: forum/skins/default/templates/close.html:30
 #: forum/skins/default/templates/feedback.html:67
-#: forum/skins/default/templates/question_edit.html:155
+#: forum/skins/default/templates/question_edit.html:156
 #: forum/skins/default/templates/question_retag.html:63
 #: forum/skins/default/templates/reopen.html:30
 #: forum/skins/default/templates/users/edit.html:100
@@ -3344,18 +3344,18 @@ msgid "see frequently asked questions"
 msgstr "查看常见问题"
 
 #: forum/skins/default/templates/ask.html:4
-#: forum/skins/default/templates/ask.html:92
+#: forum/skins/default/templates/ask.html:93
 #: forum/skins/nuxeo/templates/ask.html:4
 #: forum/skins/nuxeo/templates/ask.html:112
 msgid "Ask a question"
 msgstr "我要提问"
 
-#: forum/skins/default/templates/ask.html:100
+#: forum/skins/default/templates/ask.html:101
 #: forum/skins/nuxeo/templates/ask.html:165
 msgid "You are welcome to start submitting your question anonymously."
 msgstr ""
 
-#: forum/skins/default/templates/ask.html:101
+#: forum/skins/default/templates/ask.html:102
 #: forum/skins/nuxeo/templates/ask.html:166
 msgid ""
 "\n"
@@ -3366,35 +3366,35 @@ msgid ""
 "                    or signup for a new account"
 msgstr ""
 
-#: forum/skins/default/templates/ask.html:105
+#: forum/skins/default/templates/ask.html:106
 #: forum/skins/nuxeo/templates/ask.html:170
 msgid "and validate your email."
 msgstr ""
 
-#: forum/skins/default/templates/ask.html:110
+#: forum/skins/default/templates/ask.html:111
 #: forum/skins/nuxeo/templates/ask.html:175
 msgid ""
 "Remember, your question will not be published until you validate your email."
 msgstr ""
 
-#: forum/skins/default/templates/ask.html:111
+#: forum/skins/default/templates/ask.html:112
 #: forum/skins/default/templates/users/info.html:98
 #: forum/skins/nuxeo/templates/ask.html:176
 #: forum/skins/nuxeo/templates/users/info.html:55
 msgid "Send me a validation link."
 msgstr ""
 
-#: forum/skins/default/templates/ask.html:146
+#: forum/skins/default/templates/ask.html:147
 #: forum/skins/nuxeo/templates/ask.html:148
 msgid "(required)"
 msgstr ""
 
-#: forum/skins/default/templates/ask.html:162
+#: forum/skins/default/templates/ask.html:163
 #: forum/skins/nuxeo/templates/ask.html:182
 msgid "Login/signup to post your question"
 msgstr ""
 
-#: forum/skins/default/templates/ask.html:164
+#: forum/skins/default/templates/ask.html:165
 #: forum/skins/nuxeo/templates/ask.html:184
 msgid "Ask your question"
 msgstr "现在提问"
@@ -4158,7 +4158,7 @@ msgstr ""
 "意了CNProg以上的所有条款。"
 
 # this is how above two are supposed to be
-#: forum/skins/default/templates/question.html:118
+#: forum/skins/default/templates/question.html:119
 #: forum/skins/default/templates/sidebar/recent_tags.html:11
 #: forum/skins/nuxeo/templates/question.html:117
 #: forum/skins/nuxeo/templates/sidebar/recent_tags.html:8
@@ -4166,54 +4166,54 @@ msgstr ""
 msgid "see questions tagged '%(tagname)s'"
 msgstr "查看有关'%(tagname)s'的问题"
 
-#: forum/skins/default/templates/question.html:137
+#: forum/skins/default/templates/question.html:138
 #: forum/skins/nuxeo/templates/question.html:135
 #, 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:148
+#: forum/skins/default/templates/question.html:149
 #, fuzzy, python-format
 msgid "One Answer:"
 msgid_plural "%(counter)s Answers:"
 msgstr[0] "个回答"
 msgstr[1] "个回答"
 
-#: forum/skins/default/templates/question.html:198
+#: forum/skins/default/templates/question.html:199
 #: forum/skins/nuxeo/templates/question.html:200
 msgid "Your answer"
 msgstr "您的回答"
 
-#: forum/skins/default/templates/question.html:200
+#: forum/skins/default/templates/question.html:201
 #: forum/skins/nuxeo/templates/question.html:202
 #, fuzzy
 msgid "Be the first one to answer this question!"
 msgstr "不是一个可以回答的“问题”"
 
-#: forum/skins/default/templates/question.html:265
+#: forum/skins/default/templates/question.html:266
 #: forum/skins/nuxeo/templates/question.html:267
 msgid "Login/Signup to Post Your Answer"
 msgstr ""
 
-#: forum/skins/default/templates/question.html:268
+#: forum/skins/default/templates/question.html:269
 #: forum/skins/nuxeo/templates/question.html:270
 #, fuzzy
 msgid "Answer Your Own Question"
 msgstr "回答该问题"
 
-#: forum/skins/default/templates/question.html:270
+#: forum/skins/default/templates/question.html:271
 #: forum/skins/nuxeo/templates/question.html:272
 msgid "Answer the question"
 msgstr "回答该问题"
 
-#: forum/skins/default/templates/question.html:292
+#: forum/skins/default/templates/question.html:293
 #: forum/skins/nuxeo/templates/question.html:294
 msgid "Question tags"
 msgstr "您正在浏览的问题含有以下标签"
 
 # must have extra space after in english
-#: forum/skins/default/templates/question.html:298
+#: forum/skins/default/templates/question.html:299
 #: forum/skins/default/templates/question_summary_list_roll.html:54
 #: forum/skins/default/templates/tags.html:45
 #: forum/skins/default/templates/question_list/item.html:31
@@ -4225,7 +4225,7 @@ msgid "see questions tagged"
 msgstr "查看有关"
 
 # book.html line 123 must be empty in english
-#: forum/skins/default/templates/question.html:298
+#: forum/skins/default/templates/question.html:299
 #: forum/skins/default/templates/question_summary_list_roll.html:54
 #: forum/skins/default/templates/tags.html:45
 #: forum/skins/nuxeo/templates/question.html:300
@@ -4234,28 +4234,28 @@ msgstr "查看有关"
 msgid "using tags"
 msgstr "的问题"
 
-#: forum/skins/default/templates/question.html:303
+#: forum/skins/default/templates/question.html:304
 #: forum/skins/nuxeo/templates/question.html:305
 #, fuzzy
 msgid "question asked"
 msgstr "提问时间"
 
-#: forum/skins/default/templates/question.html:306
+#: forum/skins/default/templates/question.html:307
 #: forum/skins/nuxeo/templates/question.html:308
 msgid "question was seen"
 msgstr "目前浏览数量"
 
-#: forum/skins/default/templates/question.html:306
+#: forum/skins/default/templates/question.html:307
 #: forum/skins/nuxeo/templates/question.html:308
 msgid "times"
 msgstr "次"
 
-#: forum/skins/default/templates/question.html:309
+#: forum/skins/default/templates/question.html:310
 #: forum/skins/nuxeo/templates/question.html:311
 msgid "last updated"
 msgstr "最后更新时间"
 
-#: forum/skins/default/templates/question.html:315
+#: forum/skins/default/templates/question.html:316
 #: forum/skins/nuxeo/templates/question.html:317
 #, fuzzy
 msgid "Related questions"
@@ -4263,7 +4263,7 @@ msgstr "相似的问题"
 
 # page title
 #: forum/skins/default/templates/question_edit.html:5
-#: forum/skins/default/templates/question_edit.html:91
+#: forum/skins/default/templates/question_edit.html:92
 #: forum/skins/nuxeo/templates/question_edit.html:5
 #: forum/skins/nuxeo/templates/question_edit.html:91
 msgid "Edit question"
@@ -6666,7 +6666,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/skins/default/templates/users/stats.html:35
+#: forum/skins/default/templates/users/stats.html:37
 #: forum/skins/nuxeo/templates/users/stats.html:35
 #, python-format
 msgid ""
@@ -6680,18 +6680,18 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/skins/default/templates/users/stats.html:49
+#: forum/skins/default/templates/users/stats.html:51
 #: forum/skins/nuxeo/templates/users/stats.html:49
 #, fuzzy, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr "该回答总共有%d个投票"
 
-#: forum/skins/default/templates/users/stats.html:49
+#: forum/skins/default/templates/users/stats.html:51
 #: forum/skins/nuxeo/templates/users/stats.html:49
 msgid "this answer has been selected as correct"
 msgstr "该回答已被设为最佳答案"
 
-#: forum/skins/default/templates/users/stats.html:67
+#: forum/skins/default/templates/users/stats.html:72
 #: forum/skins/nuxeo/templates/users/stats.html:67
 #, python-format
 msgid ""
@@ -6705,28 +6705,28 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/skins/default/templates/users/stats.html:78
+#: forum/skins/default/templates/users/stats.html:83
 #: forum/skins/nuxeo/templates/users/stats.html:78
 msgid "thumb up"
 msgstr ""
 
-#: forum/skins/default/templates/users/stats.html:79
+#: forum/skins/default/templates/users/stats.html:84
 #: forum/skins/nuxeo/templates/users/stats.html:79
 msgid "user has voted up this many times"
 msgstr "该用户投的赞成票总数"
 
-#: forum/skins/default/templates/users/stats.html:83
+#: forum/skins/default/templates/users/stats.html:88
 #: forum/skins/nuxeo/templates/users/stats.html:83
 msgid "thumb down"
 msgstr ""
 
-#: forum/skins/default/templates/users/stats.html:84
+#: forum/skins/default/templates/users/stats.html:89
 #: forum/skins/nuxeo/templates/users/stats.html:84
 #, fuzzy
 msgid "user voted down this many times"
 msgstr "用户投的反对票总数"
 
-#: forum/skins/default/templates/users/stats.html:93
+#: forum/skins/default/templates/users/stats.html:98
 #: forum/skins/nuxeo/templates/users/stats.html:93
 #, python-format
 msgid ""
@@ -6740,14 +6740,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/skins/default/templates/users/stats.html:107
+#: forum/skins/default/templates/users/stats.html:112
 #: forum/skins/nuxeo/templates/users/stats.html:107
 #, fuzzy, python-format
 msgid ""
 "see other questions with %(view_user)s's contributions tagged '%(tag_name)s' "
 msgstr "查看有关'%s'的问题"
 
-#: forum/skins/default/templates/users/stats.html:122
+#: forum/skins/default/templates/users/stats.html:127
 #: forum/skins/nuxeo/templates/users/stats.html:122
 #, python-format
 msgid ""