diff --git a/i18n.sh.template b/i18n.sh.template
index 57971b5817..48332ff0d1 100755
--- a/i18n.sh.template
+++ b/i18n.sh.template
@@ -6,6 +6,6 @@
 django-admin.py makemessages -l zh_CN -e py,html -i "thirdpart*" -i "api*" -i "avatar*" -i "base*" -i "contacts*" -i "group*" -i "notifications*" -i "organizations*" -i "profile*" -i "share*" -i "media*"
 
 # js i18n
-django-admin.py makemessages -d djangojs -l zh_CN -i "thirdpart*" -i "api*" -i "avatar*" -i "base*" -i "contacts*" -i "group*" -i "notifications*" -i "organizations*" -i "profile*" -i "share*" -i "media*"
+# django-admin.py makemessages -d djangojs -l zh_CN -i "thirdpart*" -i "api*" -i "avatar*" -i "base*" -i "contacts*" -i "group*" -i "notifications*" -i "organizations*" -i "profile*" -i "share*" -i "media*"
 
 django-admin.py compilemessages
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 37d947f7b5..18db69b251 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 222c0b7890..1da24bad8f 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-31 11:28+0800\n"
+"POT-Creation-Date: 2012-10-31 16:13+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"
@@ -820,6 +820,42 @@ msgstr "点此下载"
 msgid "Leave a message~"
 msgstr "评论一下~"
 
+#: templates/repo_view_file.html:323
+msgid "Comment"
+msgstr "评论"
+
+#: templates/repo_view_file.html:366
+msgid "Please type a message"
+msgstr "请先输入您的评论"
+
+#: templates/repo_view_file.html:412
+msgid "Cannot find a application to open file. Seafile will open the folder."
+msgstr "找不到打开该类型文件的程序。Seafile 将为你打开该文件所在目录"
+
+#: templates/repo_view_file.html:417
+msgid "File is not Synchronized with server, please synchronize manually."
+msgstr "本地文件尚未与服务器同步。请打开本地目录的自动同步，或者手动进行同步"
+
+#: templates/repo_view_file.html:419
+msgid "File is not Synchronized with server, please retry later."
+msgstr "本地文件尚未与服务器同步，请稍后再试"
+
+#: templates/repo_view_file.html:424
+msgid "An error occur during opening local file."
+msgstr "打开本地文件时出错"
+
+#: templates/repo_view_file.html:455
+msgid ""
+"Your Seafile client is out of date, please <a href=\"http://www.seafile.com/"
+"download/\">upgrade</a> to latest."
+msgstr ""
+"Seafile 客户端程序未启动或者版本过低，请<a href=\"http://www.seafile.com/"
+"download/\">下载</a>最新版客户端"
+
+#: templates/repo_view_file.html:466
+msgid "Seafile client is not start or out of date"
+msgstr "Seafile 客户端程序未启动或者版本过低"
+
 #: templates/repo_view_file.html:489
 msgid "Unstarred successfully"
 msgstr "星标取消成功"
@@ -848,6 +884,10 @@ msgstr "生成时间"
 msgid "Detail"
 msgstr "修改内容"
 
+#: templates/repo_view_snapshot.html:84
+msgid "Really want to restore this library?"
+msgstr "确定要还原这个资料库？"
+
 #: templates/text_diff.html:6
 msgid "modification details"
 msgstr "修改详情"
@@ -879,6 +919,20 @@ msgstr "密码"
 msgid "Forgot password?"
 msgstr "忘记密码"
 
+#: templates/registration/login.html:28
+#: templates/registration/registration_form.html:28
+msgid "Email cannot be blank"
+msgstr "邮箱不能为空"
+
+#: templates/registration/login.html:32
+#: templates/registration/registration_form.html:32
+msgid "Password cannot be blank"
+msgstr "密码不能为空"
+
+#: templates/registration/login.html:37
+msgid "Incorrect email or password"
+msgstr "您输入的邮箱或密码不正确"
+
 #: templates/registration/logout.html:4
 msgid "Log Out"
 msgstr "退出"
@@ -984,6 +1038,14 @@ msgstr "欢迎回来，您已登录。"
 msgid "Confirm Password"
 msgstr "确认密码"
 
+#: templates/registration/registration_form.html:36
+msgid "Confirm password cannot be blank"
+msgstr "确认密码不能为空"
+
+#: templates/registration/registration_form.html:40
+msgid "The two password fields not match"
+msgstr "两次输入的密码不一致"
+
 #: templates/snippets/bottom_bar.html:3
 #: templates/snippets/group_recommend_form.html:4
 msgid "Recommend"
@@ -1139,6 +1201,14 @@ msgstr "图标"
 msgid "You can star important files, and they will be shown here."
 msgstr "您可以给那些重要的文件加上星标，然后它们将在这里显示。"
 
+#: templates/snippets/myhome_extra_script.html:26
+msgid "Input cannot be empty"
+msgstr "输入不能为空"
+
+#: templates/snippets/myhome_extra_script.html:33
+msgid "Really remove this shared library?"
+msgstr "确定要还原这个资料库？"
+
 #: templates/snippets/repo_create_form.html:9
 msgid "Share Permission"
 msgstr "共享权限"
@@ -1172,6 +1242,12 @@ msgstr "Tip：必须是团体内成员或群组，输入 all 共享到公共资
 msgid "Tip: type all to share to public library."
 msgstr "Tip：输入 all 共享到公共资料"
 
+#~ msgid "The two password fields did\\'t match"
+#~ msgstr "两次输入的密码不一致"
+
+#~ msgid "Confirm to remove shared library?"
+#~ msgstr "确定要取消共享？"
+
 #~ msgid "Group"
 #~ msgstr "群组"
 
diff --git a/locale/zh_CN/LC_MESSAGES/djangojs.mo b/locale/zh_CN/LC_MESSAGES/djangojs.mo
deleted file mode 100644
index dc4d7dc217..0000000000
Binary files a/locale/zh_CN/LC_MESSAGES/djangojs.mo and /dev/null differ
diff --git a/locale/zh_CN/LC_MESSAGES/djangojs.po b/locale/zh_CN/LC_MESSAGES/djangojs.po
deleted file mode 100644
index a1e52d9793..0000000000
--- a/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 19:35+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"
-
-#: templates/po.js:3 templates/po.js.py:8
-msgid "Email can't be blank"
-msgstr "邮箱不能为空"
-
-#: templates/po.js:4 templates/po.js.py:9
-msgid "Password can't be blank"
-msgstr "密码不能为空"
-
-#: templates/po.js:5
-msgid "Confirm password can't be blank"
-msgstr "确认密码不能为空"
-
-#: templates/po.js:6
-msgid "The two password fields did't match"
-msgstr "两次密码不相同"
-
-#: templates/po.js:10
-msgid "Incorrect email or password"
-msgstr "您输入的邮箱或密码不正确"
-
-#: templates/po.js:12
-msgid "Input can't be empty"
-msgstr "输入不能为空"
-
-#: templates/po.js:13
-msgid "Confirm to remove shared library?"
-msgstr "确定要取消共享？"
-
-#: templates/po.js:15
-msgid " <button id=\"comment\">Comment</button>"
-msgstr " <button id=\"comment\">评论</button>"
-
-#: templates/po.js:16
-msgid "Please type a message"
-msgstr "请先输入您的评论"
-
-#: templates/po.js:17
-msgid "Can't find a application to open file. Seafile will open the folder."
-msgstr "找不到打开该类型文件的程序。Seafile 将为你打开该文件所在目录"
-
-#: templates/po.js:18
-msgid "File is not Synchronized with server, please synchronize manually."
-msgstr "本地文件尚未与服务器同步。请打开本地目录的自动同步，或者手动进行同步"
-
-#: templates/po.js:19
-msgid "File is not Synchronized with server, please retry later."
-msgstr "本地文件尚未与服务器同步，请稍后再试"
-
-#: templates/po.js:20
-msgid "An error occur during opening local file."
-msgstr "打开本地文件时出错"
-
-#: templates/po.js:21
-msgid "Seafile client is not start or out of date"
-msgstr "Seafile 客户端程序未启动或者版本过低"
-
-#: templates/po.js:22
-msgid ""
-"Your Seafile client is out of date, please <a href=\"http://www.seafile.com/"
-"download/\">upgrade</a> to latest."
-msgstr ""
-"您的 Seafile 客户端版本太低，请<a href=\"http://www.seafile.com/download/\">"
-"升级</a>到最新版本"
-
-#: templates/po.js:24
-msgid "Confirm to restore this library?"
-msgstr "确定要还原该资料库？"
diff --git a/templates/po.js b/templates/po.js
deleted file mode 100644
index 5821671671..0000000000
--- a/templates/po.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var msg = '';
-
-// registration_form.html
-msg = gettext('Email can\'t be blank');
-msg = gettext('Password can\'t be blank');
-msg = gettext('Confirm password can\'t be blank');
-msg = gettext('The two password fields did\'t match');
-
-// login.html
-msg = gettext('Email can\'t be blank');
-msg = gettext('Password can\'t be blank');
-msg = gettext('Incorrect email or password');
-
-// myhome_extra_script.html
-msg = gettext('Input can\'t be empty');
-msg = gettext('Confirm to remove shared library?');
-
-// repo_view_file.html
-msg = gettext(' <button id="comment">Comment</button>');
-msg = gettext('Please type a message');
-msg = gettext('Can\'t find a application to open file. Seafile will open the folder.');
-msg = gettext('File is not Synchronized with server, please synchronize manually.');
-msg = gettext('File is not Synchronized with server, please retry later.');
-msg = gettext('An error occur during opening local file.');
-msg = gettext('Seafile client is not start or out of date');
-msg = gettext('Your Seafile client is out of date, please <a href="http://www.seafile.com/download/">upgrade</a> to latest.');
-
-// repo_view_snapshot.html
-msg = gettext('Confirm to restore this library?')
diff --git a/templates/registration/login.html b/templates/registration/login.html
index d808fcb8b5..c306d92f33 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -25,16 +25,16 @@
 <script type="text/javascript">
 $('input[type="submit"]').click(function(){
         if (!$.trim($('input[name="username"]').attr('value'))) {
-            $('.error').removeClass('hide').html(gettext('Email can\'t be blank'));
+            $('.error').removeClass('hide').html('{% trans "Email cannot be blank" %}');
             return false;
         }
         if (!$.trim($('input[name="password"]').attr('value'))) {
-            $('.error').removeClass('hide').html(gettext('Password can\'t be blank'));
+            $('.error').removeClass('hide').html('{% trans "Password cannot be blank" %}');
             return false;
         }
    });
     {% if form.errors %}
-    $('.error').removeClass('hide').html(gettext('Incorrect email or password'));
+    $('.error').removeClass('hide').html('{% trans "Incorrect email or password" %}');
     {% endif %}
 </script>
 {% endblock %}
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index 328c055ac7..995189b8e8 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -25,19 +25,19 @@
 <script type="text/javascript">
 $('input[type="submit"]').click(function(){
         if (!$.trim($('input[name="email"]').attr('value'))) {
-            $('.error').removeClass('hide').html(gettext('Email can\'t be blank'));
+            $('.error').removeClass('hide').html('{% trans "Email cannot be blank" %}');
             return false;
         }
         if (!$.trim($('input[name="password1"]').attr('value'))) {
-            $('.error').removeClass('hide').html(gettext('Password can\'t be blank'));
+            $('.error').removeClass('hide').html('{% trans "Password cannot be blank" %}');
             return false;
         }
         if (!$.trim($('input[name="password2"]').attr('value'))) {
-            $('.error').removeClass('hide').html(gettext('Confirm password can\'t be blank'));
+            $('.error').removeClass('hide').html('{% trans "Confirm password cannot be blank" %}');
             return false;
         }
         if ($.trim($('input[name="password1"]').attr('value')) != $.trim($('input[name="password2"]').attr('value'))) {
-            $('.error').removeClass('hide').html(gettext('The two password fields did\'t match'));
+            $('.error').removeClass('hide').html('{% trans "The two password fields not match" %}');
             return false;
         }
    });
diff --git a/templates/repo_view_file.html b/templates/repo_view_file.html
index 665050384c..0823fa32f7 100644
--- a/templates/repo_view_file.html
+++ b/templates/repo_view_file.html
@@ -320,7 +320,7 @@ $('#shared-link').click(function() {
 
 {% include "snippets/bottom_bar.html" %}
 {% if request.user.is_authenticated %}
-$('#bottom-bar').append(gettext(' <button id="comment">Comment</button>'));
+$('#bottom-bar').append(' <button id="comment">{% trans "Comment" %}</button>');
 $('#file-comment').css({'max-height':$(window).height() - parseInt($('#file-comment').css('bottom'))});
 var gids = '';
 {% for g in groups %}
@@ -363,7 +363,7 @@ $('#comment-input').css('color', '#999').click(function() {
 });
 $('#file-comment-form .submit').click(function() {
     if (!$.trim($('#comment-input').val())) {
-        $('#file-comment-form .error').html(gettext('Please type a message')).removeClass('hide');
+        $('#file-comment-form .error').html('{% trans "Please type a message" %}').removeClass('hide');
         return false;
     }
     $.ajax({
@@ -409,19 +409,19 @@ function send_open_local_file_request(path) {
                 
             } else if (data['no_assoc'] === true) {
                 // no application to open the file
-                $('#open-local-error').html(gettext('Can\'t find a application to open file. Seafile will open the folder.'));
+                $('#open-local-error').html('{% trans "Cannot find a application to open file. Seafile will open the folder." %}');
 
             } else if (data['outdated'] === true) {
                 // local repo not in sync yet
                 if (data['auto-sync'] === false) {
-                    $('#open-local-error').html(gettext('File is not Synchronized with server, please synchronize manually.'));
+                    $('#open-local-error').html('{% trans "File is not Synchronized with server, please synchronize manually." %}');
                 } else {
-                    $('#open-local-error').html(gettext('File is not Synchronized with server, please retry later.'));
+                    $('#open-local-error').html('{% trans "File is not Synchronized with server, please retry later." %}');
                 }
 
             } else if (data['error']) {
                 // other error
-                $('#open-local-error').html(gettext('An error occur during opening local file.'));
+                $('#open-local-error').html('{% trans "An error occur during opening local file." %}');
 
             } else {
                 // open file successfully
@@ -452,7 +452,7 @@ $('#open-local').click(function () {
             local_applet_running = true;
             if (version < 1) {
                 $('#open-local-handling-tip').addClass('hide');
-                $('#open-local-error').html(gettext('Your Seafile client is out of date, please <a href="http://www.seafile.com/download/">upgrade</a> to latest.'));
+                $('#open-local-error').html('{% trans 'Your Seafile client is out of date, please <a href="http://www.seafile.com/download/">upgrade</a> to latest.' %}');
             } else {
                 send_open_local_file_request(path);
             }
@@ -463,7 +463,7 @@ $('#open-local').click(function () {
     setTimeout(function() {
         if (!local_applet_running) {
             $('#open-local-handling-tip').addClass('hide');
-            $('#open-local-error').html(gettext('Seafile client is not start or out of date'));
+            $('#open-local-error').html('{% trans "Seafile client is not start or out of date" %}');
         }
     }, 2000);
 });
diff --git a/templates/repo_view_snapshot.html b/templates/repo_view_snapshot.html
index 4d367946e2..138ce3c154 100644
--- a/templates/repo_view_snapshot.html
+++ b/templates/repo_view_snapshot.html
@@ -81,6 +81,6 @@
     $('#back').click(function() {
         location.href = $(this).attr('data');
     });
-    addConfirmTo($(".repo-revert"), gettext('Really want to restore this library?'));
+    addConfirmTo($(".repo-revert"), '{% trans "Really want to restore this library?" %}');
 </script>
 {% endblock %}
diff --git a/templates/snippets/myhome_extra_script.html b/templates/snippets/myhome_extra_script.html
index 7cac6dcca9..da535fe67a 100644
--- a/templates/snippets/myhome_extra_script.html
+++ b/templates/snippets/myhome_extra_script.html
@@ -1,4 +1,4 @@
-{% load seahub_tags avatar_tags %}
+{% load seahub_tags avatar_tags i18n %}
 $('#repos-tabs').tabs({cookie:{expires:1}});
 $(function() {
     //repo-share-form share-list autocomplete
@@ -23,14 +23,14 @@ $(function() {
     //check before post
     $('#share-submit-btn').click(function() {
         if (!$.trim($('#email_or_group').attr('value'))) {
-            apply_form_error('repo-share-form', gettext('Input can\'t be empty'));
+            apply_form_error('repo-share-form', '{% trans "Input cannot be empty" %}');
             return false;
         }
     });
 
     addConfirmTo($('.repo-delete-btn'));
     
-    addConfirmTo($('.unshare-btn'), gettext('Confirm to remove shared library?'));
+    addConfirmTo($('.unshare-btn'), '{% trans "Really remove this shared library?" %}');
 
     $(".download-btn").click(function() {
             window.open('{{ SITE_ROOT }}seafile_access_check/?repo_id=' + $(this).attr('data'));