diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index b8192bc929..0bb80dbc77 100644
Binary files a/locale/zh_CN/LC_MESSAGES/django.mo and b/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index ffe1364efd..3b147aa9f2 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-30 11:46+0800\n"
+"POT-Creation-Date: 2012-10-30 14:40+0800\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"
@@ -233,7 +233,9 @@ msgstr "取消"
 msgid ""
 "This library is encrypt, please input password. The password will live on "
 "server for 1 hour."
-msgstr "该资料库已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂存1小时。"
+msgstr ""
+"该资料库已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂"
+"存1小时。"
 
 #: templates/decrypt_repo_form.html:11
 msgid "Password: "
@@ -244,6 +246,9 @@ msgstr "密码："
 #: templates/repo.html.py:209 templates/repo_update_file.html:21
 #: templates/repo_upload_file.html:17 templates/repo_view_file.html:141
 #: templates/repo_view_file.html.py:167 templates/registration/login.html:13
+#: templates/registration/password_change_form.html:18
+#: templates/registration/password_reset_confirm.html:19
+#: templates/registration/password_reset_form.html:13
 #: templates/registration/registration_form.html:18
 #: templates/snippets/events.html:72
 #: templates/snippets/group_recommend_form.html:23
@@ -584,7 +589,7 @@ msgstr "返回资料库"
 #: templates/repo_history.html:11
 msgid ""
 "Tip: A snapshot will be generated after modification, which records the "
-"state of previous directory."
+"library state before this modification."
 msgstr "Tip：在每次修改后会生成一个镜像，记录修改之前的目录状态。"
 
 #: templates/repo_history.html:11
@@ -835,31 +840,86 @@ msgstr "感谢参与！"
 msgid "Log in again"
 msgstr "重新登录"
 
+#: templates/registration/password_change_done.html:4
+msgid "Password Change Successfully"
+msgstr "密码修改成功"
+
+#: templates/registration/password_change_done.html:9
+msgid "Your password has been changed successfully."
+msgstr "密码修改成功"
+
+#: templates/registration/password_change_form.html:3
+#: templates/registration/password_change_form.html:7
+msgid "Password Modification"
+msgstr "密码修改"
+
+#: templates/registration/password_change_form.html:9
+msgid "Current Password: "
+msgstr "当前密码："
+
+#: templates/registration/password_change_form.html:11
+#: templates/registration/password_reset_confirm.html:13
+msgid "New Password: "
+msgstr "新密码："
+
+#: templates/registration/password_change_form.html:13
+#: templates/registration/password_reset_confirm.html:16
+msgid "Confirm Password: "
+msgstr "确认密码"
+
+#: templates/registration/password_reset_confirm.html:4
+#: templates/registration/password_reset_form.html:4
+#: templates/registration/password_reset_form.html:7
+msgid "Password Reset"
+msgstr "密码重置"
+
+#: templates/registration/password_reset_confirm.html:11
+msgid "Input new password"
+msgstr "输入新密码"
+
+#: templates/registration/password_reset_confirm.html:26
+msgid "Failed to reset password: this link is no longer available."
+msgstr "密码重置失败：重置链接失效。请重新重置。"
+
+#: templates/registration/password_reset_done.html:4
+msgid "Password Reset Successfully"
+msgstr "密码重置成功"
+
+#: templates/registration/password_reset_done.html:8
+msgid "We've send a password reset email to your email."
+msgstr "我们已经把密码重置说明发往您提交的邮箱里，请查收。"
+
 #: templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "您收到这封邮件是因为您请求了密码重置。"
-
-#: templates/registration/password_reset_email.html:3
 #, python-format
-msgid "for your user account at %(site_name)s"
-msgstr ""
+msgid ""
+"You're receiving this e-mail because you requested a password reset for your "
+"user account at %(site_name)s. "
+msgstr "您收到这封邮件是因为您请求给您在 %(site_name)s 的账号重置密码。"
 
-#: templates/registration/password_reset_email.html:5
+#: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
-msgstr ""
+msgstr "请点击以下链接更新密码："
 
-#: templates/registration/password_reset_email.html:9
+#: templates/registration/password_reset_email.html:8
 msgid "Your username, in case you've forgotten:"
 msgstr "您的用户名:"
 
-#: templates/registration/password_reset_email.html:11
+#: templates/registration/password_reset_email.html:10
 msgid "Thanks for using our site!"
 msgstr "感谢使用！"
 
-#: templates/registration/password_reset_email.html:13
+#: templates/registration/password_reset_email.html:12
 #, python-format
 msgid "The %(site_name)s team"
-msgstr ""
+msgstr "%(site_name)s 团队"
+
+#: templates/registration/password_reset_form.html:9
+msgid "Your email used in login: "
+msgstr "您注册的邮箱账号："
+
+#: templates/registration/password_reset_form.html:12
+msgid "We will send you an email to set new password"
+msgstr "我们会把新密码设置说明通过邮件发送给您"
 
 #: templates/registration/registration_form.html:3
 msgid "Register"
@@ -1002,7 +1062,7 @@ msgstr "目录图标"
 #: templates/snippets/my_owned_repos.html:42
 msgid ""
 "You can create a library to organize your files. For example, you can create "
-"one for each of your projects. Every library can be synchronized and shared "
+"one for each of your projects. Each library can be synchronized and shared "
 "separately."
 msgstr ""
 "您可以新建一个资料库来组织您的文件资料，比如为每个项目创建一个资料库，每个资"
diff --git a/settings.py b/settings.py
index cfdadb5f76..bce57f307e 100644
--- a/settings.py
+++ b/settings.py
@@ -96,6 +96,7 @@ LANGUAGES = (
 )
 LOCALE_PATHS = (
     os.path.join(os.path.dirname(__file__), 'locale'),
+    os.path.join(os.path.dirname(__file__), 'thirdpart/auth/locale'),
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html
index 19f5fadcb2..c2e9e918db 100644
--- a/templates/registration/password_change_done.html
+++ b/templates/registration/password_change_done.html
@@ -1,11 +1,12 @@
 {% extends "accounts.html" %}
+{% load i18n %}
 
-{% block title %}密码修改成功{% endblock %}
+{% block title %}{% trans "Password Change Successfully" %}{% endblock %}
 
 {% block main_panel %}
 
 <div class="text-panel">
-    <p>您的密码已成功修改。</p>
+    <p>{% trans "Your password has been changed successfully." %}</p>
 </div>
 
 {% endblock %}
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
index 08be389beb..9d88d44e27 100644
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -1,46 +1,26 @@
 {% extends "accounts.html" %}
-{% block title %}密码修改{% endblock %}
+{% load i18n %}
+{% block title %}{% trans "Password Modification" %}{% endblock %}
 
 {% block main_panel %}
 <div class="narrow-panel">
-  <h2>密码修改</h2>
+  <h2>{% trans "Password Modification" %}</h2>
   <form action="" method="post">
-    <label for="id_old_password">当前密码：</label>
-    {{ form.old_password }}
-    <label for="id_new_password1">新密码：</label>
-    {{ form.new_password1 }}
-    <label for="id_new_password2">新密码确认：</label>
-    {{ form.new_password2 }}
+    <label for="id_old_password">{% trans "Current Password: " %}</label>
+    {{ form.old_password }}    {{ form.old_password.errors }}
+    <label for="id_new_password1">{% trans "New Password: " %}</label>
+    {{ form.new_password1 }}     {{ form.new_password1.errors }}
+    <label for="id_new_password2">{% trans "Confirm Password: " %}</label>
+    {{ form.new_password2 }}    {{ form.new_password2.errors }}
 
-    {{ form.old_password.errors }}
-    {{ form.new_password1.errors }}
-    {{ form.new_password2.errors }}
     <p class="error hide"></p>
 
-    <input type="submit" value="提交" class="submit" />
+    <input type="submit" value="{% trans "Submit" %}" class="submit" />
   </form>
 </div>
 {% endblock %}
 
 {% block extra_script %}
 <script type="text/javascript">
-$('input[type="submit"]').click(function(){
-        if (!$.trim($('input[name="old_password"]').attr('value'))) {
-            $('.error').removeClass('hide').html('请输入当前密码。');
-            return false;
-        }
-        if (!$.trim($('input[name="new_password1"]').attr('value'))) {
-            $('.error').removeClass('hide').html('请输入新密码。');
-            return false;
-        }
-        if (!$.trim($('input[name="new_password2"]').attr('value'))) {
-            $('.error').removeClass('hide').html('请确认新密码。');
-            return false;
-        }
-        if ($.trim($('input[name="new_password1"]').attr('value')) != $.trim($('input[name="new_password2"]').attr('value'))) {
-            $('.error').removeClass('hide').html('两次输入的新密码不一致。');
-            return false;
-        }
-   });
 </script>
 {% endblock %}
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
index 31e4c7516b..181a994bc5 100644
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -1,28 +1,29 @@
 {% extends "myhome_base.html" %}
+{% load i18n %}
 
-{% block title %}密码重置{% endblock %}
+{% block title %}{% trans "Password Reset" %}{% endblock %}
 
 {% block main_panel %}
 
 {% if validlink %}
 
 <div class="narrow-panel">
-    <h2>请输入新密码</h2>
+    <h2>{% trans "Input new password" %}</h2>
     <form action="" method="post">
-        <label for="id_new_password1">新密码：</label>
+        <label for="id_new_password1">{% trans "New Password: " %}</label>
         {{ form.new_password1 }}
         {{ form.new_password1.errors }}
-        <label for="id_new_password2">新密码确认：</label>
+        <label for="id_new_password2">{% trans "Confirm Password: " %}</label>
         {{ form.new_password2 }}
         {{ form.new_password2.errors }}
-        <input type="submit" value="提交" class="submit" />
+        <input type="submit" value="{% trans "Submit" %}" class="submit" />
     </form>
 </div>
 
 {% else %}
 
 <div class="text-panel">
-    <p>密码重置失败：重置链接失效。请重新重置。</p>
+    <p>{% trans "Failed to reset password: this link is no longer available." %}</p>
 </div>
 
 {% endif %}
diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html
index 4006605559..95a3152518 100644
--- a/templates/registration/password_reset_done.html
+++ b/templates/registration/password_reset_done.html
@@ -1,9 +1,10 @@
 {% extends "myhome_base.html" %}
+{% load i18n %}
 
-{% block title %}密码重置成功{% endblock %}
+{% block title %}{% trans "Password Reset Successfully" %}{% endblock %}
 
 {% block main_panel %}
 <div class="text-panel">
-    <p>我们已经把密码重置说明发往您提交的邮箱里，请查收。</p>
+    <p>{% trans "We've send a password reset email to your email." %}</p>
 </div>
 {% endblock %}
diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html
index 1c9df0a2f4..a6cab04296 100644
--- a/templates/registration/password_reset_email.html
+++ b/templates/registration/password_reset_email.html
@@ -1,6 +1,5 @@
 {% load i18n %}{% autoescape off %}
-{% trans "You're receiving this e-mail because you requested a password reset" %}
-{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}.
+{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}. {% endblocktrans %}
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
index 9179112704..8f2cc6436d 100644
--- a/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@@ -1,15 +1,16 @@
 {% extends "myhome_base.html" %}
+{% load i18n %}
 
-{% block title %}密码重置{% endblock %}
+{% block title %}{% trans "Password Reset" %}{% endblock %}
 {% block main_panel %}
 <div class="narrow-panel">
-    <h2>密码重置</h2>
+    <h2>{% trans "Password Reset" %}</h2>
     <form action="" method="post">
-        <label for="id_email">您注册的邮箱账号：</label>
+        <label for="id_email">{% trans "Your email used in login: " %}</label>
         {{ form.email }}
         {{ form.email.errors }}
-        <p class="note">我们会把新密码设置说明通过邮件发送给您</p>
-        <input type="submit" value="提交" class="submit" />
+        <p class="note">{% trans "We will send you an email to set new password" %}</p>
+        <input type="submit" value="{% trans "Submit" %}" class="submit" />
     </form>
 </div>
 {% endblock %}
diff --git a/templates/repo_history.html b/templates/repo_history.html
index ff1331385b..0514c45b97 100644
--- a/templates/repo_history.html
+++ b/templates/repo_history.html
@@ -8,7 +8,7 @@
     <button data="{{ SITE_ROOT }}repo/{{ repo.props.id }}/" class="fright" id="back">{% trans "Back to Library"%}</button>
 </div>
 
-<p class="tip">{% trans "Tip: A snapshot will be generated after modification, which records the state of previous directory."%}<a href="{% url 'repo_view_snapshot' repo.props.id %}">{% trans "View Snapshot"%}</a></p>
+<p class="tip">{% trans "Tip: A snapshot will be generated after modification, which records the library state before this modification."%}<a href="{% url 'repo_view_snapshot' repo.props.id %}">{% trans "View Snapshot"%}</a></p>
 <div class="commit-list-outer-container">
     <div class="commit-list-inner-container">
         <table class="commit-list">
diff --git a/templates/snippets/my_owned_repos.html b/templates/snippets/my_owned_repos.html
index 5ba1b6f7d3..d3869aac0d 100644
--- a/templates/snippets/my_owned_repos.html
+++ b/templates/snippets/my_owned_repos.html
@@ -39,7 +39,7 @@
     {% endfor %}
 </table>
 {% else %}
-<p class="empty-repo-tips">{% trans "You can create a library to organize your files. For example, you can create one for each of your projects. Every library can be synchronized and shared separately." %}</p>
+<p class="empty-repo-tips">{% trans "You can create a library to organize your files. For example, you can create one for each of your projects. Each library can be synchronized and shared separately." %}</p>
 {% endif %}
 </div>
 <div id="repos-shared-to-me">
diff --git a/thirdpart/auth/i18n.sh.template b/thirdpart/auth/i18n.sh.template
new file mode 100755
index 0000000000..9dcbe0d14a
--- /dev/null
+++ b/thirdpart/auth/i18n.sh.template
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+django-admin.py makemessages -l zh_CN -e py,html
+
+django-admin.py makemessages -d djangojs -l zh_CN
+
+django-admin.py compilemessages
diff --git a/thirdpart/auth/locale/zh_CN/LC_MESSAGES/django.mo b/thirdpart/auth/locale/zh_CN/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..c56bbe2b3c
Binary files /dev/null and b/thirdpart/auth/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/thirdpart/auth/locale/zh_CN/LC_MESSAGES/django.po b/thirdpart/auth/locale/zh_CN/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..c49101aa1c
--- /dev/null
+++ b/thirdpart/auth/locale/zh_CN/LC_MESSAGES/django.po
@@ -0,0 +1,115 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-30 14:17+0800\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: admin.py:29
+msgid "Personal info"
+msgstr ""
+
+#: admin.py:30
+msgid "Permissions"
+msgstr ""
+
+#: admin.py:31
+msgid "Important dates"
+msgstr ""
+
+#: admin.py:32
+msgid "Groups"
+msgstr ""
+
+#: admin.py:114
+msgid "Password changed successfully."
+msgstr ""
+
+#: admin.py:124
+#, python-format
+msgid "Change password: %s"
+msgstr ""
+
+#: forms.py:17
+msgid "Username"
+msgstr ""
+
+#: forms.py:18 forms.py:151
+msgid "Password"
+msgstr ""
+
+#: forms.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: forms.py:40
+msgid "This account is inactive."
+msgstr ""
+
+#: forms.py:45
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
+#: forms.py:58
+msgid "E-mail"
+msgstr ""
+
+#: forms.py:70
+msgid ""
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+
+#: forms.py:100
+#, python-format
+msgid "Password reset on %s"
+msgstr ""
+
+#: forms.py:108
+msgid "New password"
+msgstr ""
+
+#: forms.py:109
+msgid "New password confirmation"
+msgstr ""
+
+#: forms.py:121 forms.py:163
+msgid "The two password fields didn't match."
+msgstr ""
+
+#: forms.py:135
+msgid "Old password"
+msgstr ""
+
+#: forms.py:143
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "当前密码错误，请重新输入。"
+
+#: forms.py:152
+msgid "Password (again)"
+msgstr ""
+
+#: views.py:85
+msgid "Logged out"
+msgstr ""
+
+#: management/commands/createsuperuser.py:24
+msgid "Enter a valid e-mail address."
+msgstr ""