diff --git a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo
index eb5b0763f..7cf53cacb 100644
Binary files a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo and b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo differ
diff --git a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
index 079bab5e8..46be6a6a5 100644
--- a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po
@@ -9,19 +9,20 @@ msgstr ""
 "Project-Id-Version: Sphinx 0.6\n"
 "Report-Msgid-Bugs-To: zhutao.iscas@gmail.com\n"
 "POT-Creation-Date: 2011-09-21 10:06+0200\n"
-"PO-Revision-Date: 2011-09-21 10:15+0200\n"
-"Last-Translator: Tower Joo<zhutao.iscas@gmail.com>\n"
+"PO-Revision-Date: 2013-02-21 18:31+0800\n"
+"Last-Translator: yinian1992 <yinian1992@gmail.com>\n"
 "Language-Team: cn <LL@li.org>\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: sphinx/config.py:81
 #, python-format
 msgid "%s %s documentation"
-msgstr ""
+msgstr "%s %s 文档"
 
 #: sphinx/environment.py:119 sphinx/writers/latex.py:190
 #: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
@@ -32,7 +33,7 @@ msgstr "%Y 年 %m 月 %d 日"
 #: sphinx/environment.py:1625
 #, python-format
 msgid "see %s"
-msgstr ""
+msgstr "见 %s"
 
 #: sphinx/environment.py:1628
 #, python-format
@@ -79,16 +80,15 @@ msgstr ""
 
 #: sphinx/directives/other.py:136
 msgid "Section author: "
-msgstr "Section 作者："
+msgstr "节作者："
 
 #: sphinx/directives/other.py:138
 msgid "Module author: "
 msgstr "模块作者："
 
 #: sphinx/directives/other.py:140
-#, fuzzy
 msgid "Code author: "
-msgstr "模块作者："
+msgstr "代码作者："
 
 #: sphinx/directives/other.py:142
 msgid "Author: "
@@ -101,7 +101,7 @@ msgstr "也可以参考"
 #: sphinx/domains/__init__.py:244
 #, python-format
 msgid "%s %s"
-msgstr ""
+msgstr "%s %s"
 
 #: sphinx/domains/c.py:51 sphinx/domains/python.py:95
 msgid "Parameters"
@@ -152,21 +152,20 @@ msgstr "成员"
 
 #: sphinx/domains/c.py:206
 msgid "macro"
-msgstr ""
+msgstr "宏"
 
 #: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
 msgid "type"
-msgstr ""
+msgstr "类型"
 
 #: sphinx/domains/c.py:208
-#, fuzzy
 msgid "variable"
 msgstr "变量"
 
 #: sphinx/domains/cpp.py:904
-#, fuzzy, python-format
+#, python-format
 msgid "%s (C++ class)"
-msgstr "%s (C++ 內置类)"
+msgstr "%s (C++ 类)"
 
 #: sphinx/domains/cpp.py:919
 #, python-format
@@ -186,7 +185,7 @@ msgstr "%s (C++ 函数)"
 #: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
 #: sphinx/domains/python.py:561
 msgid "class"
-msgstr ""
+msgstr "类"
 
 #: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254
 #, python-format
@@ -199,9 +198,9 @@ msgid "%s() (%s method)"
 msgstr "%s() (%s 方法)"
 
 #: sphinx/domains/javascript.py:109
-#, fuzzy, python-format
+#, python-format
 msgid "%s() (class)"
-msgstr "%s() (內置类)"
+msgstr "%s() (类)"
 
 #: sphinx/domains/javascript.py:111
 #, python-format
@@ -214,24 +213,22 @@ msgid "%s (%s attribute)"
 msgstr "%s (%s 属性)"
 
 #: sphinx/domains/javascript.py:122
-#, fuzzy
 msgid "Arguments"
 msgstr "参数"
 
 #: sphinx/domains/javascript.py:125
 msgid "Throws"
-msgstr ""
+msgstr "抛出"
 
 #: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "data"
-msgstr ""
+msgstr "全局量"
 
 #: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
 msgid "attribute"
 msgstr "属性"
 
 #: sphinx/domains/python.py:100
-#, fuzzy
 msgid "Variables"
 msgstr "变量"
 
@@ -263,7 +260,7 @@ msgstr "%s (內置类)"
 #: sphinx/domains/python.py:276
 #, python-format
 msgid "%s (class in %s)"
-msgstr ""
+msgstr "%s (%s 中的类)"
 
 #: sphinx/domains/python.py:316
 #, python-format
@@ -281,14 +278,14 @@ msgid "%s() (%s static method)"
 msgstr "%s() (%s 静态方法)"
 
 #: sphinx/domains/python.py:341
-#, fuzzy, python-format
+#, python-format
 msgid "%s() (%s.%s class method)"
-msgstr "%s() (%s.%s 方法)"
+msgstr "%s() (%s.%s 类方法)"
 
 #: sphinx/domains/python.py:344
-#, fuzzy, python-format
+#, python-format
 msgid "%s() (%s class method)"
-msgstr "%s() (%s 方法)"
+msgstr "%s() (%s 类方法)"
 
 #: sphinx/domains/python.py:354
 #, python-format
@@ -301,9 +298,8 @@ msgid "%s (module)"
 msgstr "%s (模块)"
 
 #: sphinx/domains/python.py:491
-#, fuzzy
 msgid "Python Module Index"
-msgstr "模块索引"
+msgstr "Python 模块索引"
 
 #: sphinx/domains/python.py:492
 msgid "modules"
@@ -319,11 +315,11 @@ msgstr "例外"
 
 #: sphinx/domains/python.py:563
 msgid "method"
-msgstr ""
+msgstr "方法"
 
 #: sphinx/domains/python.py:564
 msgid "class method"
-msgstr ""
+msgstr "类方法"
 
 #: sphinx/domains/python.py:565
 msgid "static method"
@@ -334,7 +330,6 @@ msgid "module"
 msgstr "模块"
 
 #: sphinx/domains/python.py:695
-#, fuzzy
 msgid " (deprecated)"
 msgstr " (已移除)"
 
@@ -406,12 +401,12 @@ msgstr "搜索页面"
 #: sphinx/ext/autodoc.py:1002
 #, python-format
 msgid "   Bases: %s"
-msgstr ""
+msgstr "   基类：%s"
 
 #: sphinx/ext/autodoc.py:1038
 #, python-format
 msgid "alias of :class:`%s`"
-msgstr ""
+msgstr ":class:`%s` 的别名"
 
 #: sphinx/ext/todo.py:41
 msgid "Todo"
@@ -420,37 +415,36 @@ msgstr "待处理"
 #: sphinx/ext/todo.py:109
 #, python-format
 msgid "(The <<original entry>> is located in  %s, line %d.)"
-msgstr ""
+msgstr "(<<原始记录>> 见 %s，行 %d)"
 
 #: sphinx/ext/todo.py:117
 msgid "original entry"
-msgstr ""
+msgstr "原始记录"
 
 #: sphinx/ext/viewcode.py:70
 msgid "[source]"
-msgstr ""
+msgstr "[源代码]"
 
 #: sphinx/ext/viewcode.py:117
 msgid "[docs]"
-msgstr ""
+msgstr "[文档]"
 
 #: sphinx/ext/viewcode.py:131
-#, fuzzy
 msgid "Module code"
-msgstr "模块"
+msgstr "模块代码"
 
 #: sphinx/ext/viewcode.py:137
 #, python-format
 msgid "<h1>Source code for %s</h1>"
-msgstr ""
+msgstr "<h1>%s 源代码</h1>"
 
 #: sphinx/ext/viewcode.py:164
 msgid "Overview: module code"
-msgstr ""
+msgstr "概览：模块代码"
 
 #: sphinx/ext/viewcode.py:165
 msgid "<h1>All modules for which code is available</h1>"
-msgstr ""
+msgstr "<h1>所有代码可用的模块</h1>"
 
 #: sphinx/locale/__init__.py:155
 msgid "Attention"
@@ -636,9 +630,10 @@ msgstr "最后更新日期是 %(last_updated)s."
 #: sphinx/themes/basic/layout.html:198
 #, python-format
 msgid ""
-"Created using <a href=\"http://sphinx-doc.org/\">Sphinx</a> "
+"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
 "%(sphinx_version)s."
-msgstr "使用 <a href=\"http://sphinx-doc.org/\">Sphinx</a> %(sphinx_version)s."
+msgstr ""
+"使用 <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
 
 #: sphinx/themes/basic/opensearch.xml:4
 #, python-format
@@ -665,7 +660,7 @@ msgstr "下一章"
 msgid ""
 "Please activate JavaScript to enable the search\n"
 "    functionality."
-msgstr ""
+msgstr "请激活 JavaScript 开启搜索功能"
 
 #: sphinx/themes/basic/search.html:29
 msgid ""
@@ -673,7 +668,9 @@ msgid ""
 "    words into the box below and click \"search\". Note that the search\n"
 "    function will automatically search for all of the words. Pages\n"
 "    containing fewer words won't appear in the result list."
-msgstr "在这儿，你可以对这些文档进行搜索。向搜索框中输入你所要搜索的关键字并点击\"搜索\"。注意：搜索引擎会自动搜索所有的关键字。将不会搜索到部分关键字的页面."
+msgstr ""
+"在这儿，你可以对这些文档进行搜索。向搜索框中输入你所要搜索的关键字并点击\"搜"
+"索\"。注意：搜索引擎会自动搜索所有的关键字。将不会搜索到部分关键字的页面."
 
 #: sphinx/themes/basic/search.html:36
 msgid "search"
@@ -704,7 +701,7 @@ msgstr "更改发生在版本 %(version)s &mdash; %(docstitle)s"
 #: sphinx/themes/basic/changes/rstsource.html:5
 #, python-format
 msgid "%(filename)s &mdash; %(docstitle)s"
-msgstr ""
+msgstr "%(filename)s &mdash; %(docstitle)s"
 
 #: sphinx/themes/basic/changes/versionchanges.html:17
 #, python-format
@@ -738,16 +735,16 @@ msgstr "隐藏搜索结果"
 
 #: sphinx/themes/default/static/sidebar.js:69
 msgid "Expand sidebar"
-msgstr ""
+msgstr "展开边栏"
 
 #: sphinx/themes/default/static/sidebar.js:82
 #: sphinx/themes/default/static/sidebar.js:110
 msgid "Collapse sidebar"
-msgstr ""
+msgstr "折叠边栏"
 
 #: sphinx/themes/haiku/layout.html:26
 msgid "Contents"
-msgstr ""
+msgstr "目录"
 
 #: sphinx/writers/latex.py:177
 msgid "Release"
@@ -756,18 +753,16 @@ msgstr "发布"
 #: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
 #: sphinx/writers/texinfo.py:589
 msgid "Footnotes"
-msgstr ""
+msgstr "脚注"
 
 #: sphinx/writers/latex.py:676
 msgid "continued from previous page"
-msgstr ""
+msgstr "续上页"
 
 #: sphinx/writers/latex.py:681
-#, fuzzy
 msgid "Continued on next page"
-msgstr "一页的全部索引"
+msgstr "下页继续"
 
 #: sphinx/writers/text.py:437
 msgid "[image]"
 msgstr "[图片]"
-