diff --git a/AUTHORS b/AUTHORS
index 998893163af37..294ad187c98fa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -136,6 +136,7 @@ answer newbie questions, and generally made Django that much better:
     Szilveszter Farkas <szilveszter.farkas@gmail.com>
     favo@exoweb.net
     Dmitri Fedortchenko <zeraien@gmail.com>
+    Liang Feng <hutuworm@gmail.com>
     Bill Fenner <fenner@gmail.com>
     Stefane Fermgier <sf@fermigier.com>
     Afonso Fernández Nogueira <fonzzo.django@gmail.com>
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index df9d286ec61cb..053a51287a91c 100644
Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index c468330cc8dbb..240d0bba86432 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-16 10:10+0200\n"
-"PO-Revision-Date: 2007-07-05 12:44+0800\n"
-"Last-Translator: limodou <limodou@gmail.com>\n"
+"PO-Revision-Date: 2008-04-02 11:43+0800\n"
+"Last-Translator: hutuworm <hutuworm@gmail.com>\n"
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -66,7 +66,7 @@ msgstr "%(optname)s 带有 %(fieldname)s 已经存在。"
 #: newforms/fields.py:463
 #: newforms/models.py:178
 msgid "This field is required."
-msgstr "这个字段是必输项。"
+msgstr "这个字段是必填项。"
 
 #: db/models/fields/__init__.py:367
 msgid "This value must be an integer."
@@ -443,19 +443,19 @@ msgstr "十二月"
 
 #: utils/dateformat.py:40
 msgid "p.m."
-msgstr ""
+msgstr "p.m."
 
 #: utils/dateformat.py:41
 msgid "a.m."
-msgstr ""
+msgstr "a.m."
 
 #: utils/dateformat.py:46
 msgid "PM"
-msgstr ""
+msgstr "PM"
 
 #: utils/dateformat.py:47
 msgid "AM"
-msgstr ""
+msgstr "AM"
 
 #: utils/dateformat.py:95
 msgid "midnight"
@@ -667,7 +667,7 @@ msgstr "京都"
 
 #: contrib/localflavor/jp/jp_prefectures.py:30
 msgid "Osaka"
-msgstr "	 大坂"
+msgstr "大坂"
 
 #: contrib/localflavor/jp/jp_prefectures.py:31
 msgid "Hyogo"
@@ -800,7 +800,7 @@ msgstr "黑森州"
 
 #: contrib/localflavor/de/de_states.py:12
 msgid "Mecklenburg-Western Pomerania"
-msgstr ""
+msgstr "梅克伦堡-西部米拉尼亚"
 
 #: contrib/localflavor/de/de_states.py:13
 msgid "Lower Saxony"
@@ -812,7 +812,7 @@ msgstr "北莱茵-威斯特法伦州"
 
 #: contrib/localflavor/de/de_states.py:15
 msgid "Rhineland-Palatinate"
-msgstr ""
+msgstr "莱茵河法耳茨地区"
 
 #: contrib/localflavor/de/de_states.py:16
 msgid "Saarland"
@@ -824,7 +824,7 @@ msgstr "萨克森"
 
 #: contrib/localflavor/de/de_states.py:18
 msgid "Saxony-Anhalt"
-msgstr ""
+msgstr "萨克森-安哈尔特"
 
 #: contrib/localflavor/de/de_states.py:19
 msgid "Schleswig-Holstein"
@@ -1025,19 +1025,19 @@ msgstr "消息"
 
 #: contrib/humanize/templatetags/humanize.py:17
 msgid "th"
-msgstr ""
+msgstr "th"
 
 #: contrib/humanize/templatetags/humanize.py:17
 msgid "st"
-msgstr ""
+msgstr "st"
 
 #: contrib/humanize/templatetags/humanize.py:17
 msgid "nd"
-msgstr ""
+msgstr "nd"
 
 #: contrib/humanize/templatetags/humanize.py:17
 msgid "rd"
-msgstr ""
+msgstr "rd"
 
 #: contrib/humanize/templatetags/humanize.py:47
 #, python-format
@@ -1465,7 +1465,7 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
-"此评论由一个肤浅的用户张贴：\n"
+"此评论由一个粗率的用户张贴：\n"
 "\n"
 "%(text)s"
 
@@ -1477,7 +1477,7 @@ msgstr "只允许张贴"
 #: contrib/comments/views/comments.py:192
 #: contrib/comments/views/comments.py:284
 msgid "One or more of the required fields wasn't submitted"
-msgstr "一个或多个必输字段没有被提交"
+msgstr "一个或多个必填字段没有被提交"
 
 #: contrib/comments/views/comments.py:196
 #: contrib/comments/views/comments.py:286