diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html
index e28547f0ab..81ad71adb9 100644
--- a/group/templates/group/group_info.html
+++ b/group/templates/group/group_info.html
@@ -192,7 +192,7 @@
 {% include 'snippets/user_profile_js.html' %}
 <script type="text/javascript">
 addConfirmTo($('#quit-group'), gettext('Confirm to quit group?'));
-addConfirmTo($('.cancel-share'), 'Confirm to unshare this repo?');
+addConfirmTo($('.cancel-share'), gettext('Confirm to unshare this repo?'));
 
 addAtAutocomplete('#message', '#group-message-form', {{ group.id }}, "{% url 'group_attention' %}", {'border':'1px solid #ddd', 'width':'600px', 'height': '80px', 'word-wrap':'break-word', 'overflow-y':'auto', 'line-height': '1.5em'}); // remember to add unit (px or em) to line-height, as js in ie will take 1.5 as 1.5, not 1.5em
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 8ccc12caa2..7d30acf1f3 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-26 18:02+0800\n"
+"POT-Creation-Date: 2012-10-26 19:51+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"
@@ -129,7 +129,7 @@ msgid "My Home"
 msgstr "我的页面"
 
 #: templates/myhome_base.html:12
-msgid "Public Repo"
+msgid "Public Library"
 msgstr "公共资料"
 
 #: templates/myhome_base.html:16
@@ -218,7 +218,7 @@ msgid "Empty"
 msgstr "暂无"
 
 #: templates/snippets/my_owned_repos.html:2
-msgid "Repos"
+msgid "Libraries"
 msgstr "资料库"
 
 #: templates/snippets/my_owned_repos.html:6
@@ -230,7 +230,7 @@ msgid "Share to me"
 msgstr "共享给我的"
 
 #: templates/snippets/my_owned_repos.html:9
-msgid "New Repo"
+msgid "New Library"
 msgstr "新建资料库"
 
 #: templates/snippets/my_owned_repos.html:16
@@ -283,6 +283,15 @@ msgstr "只读"
 msgid "Remove Share"
 msgstr "取消共享"
 
+#~ msgid "Public Repo"
+#~ msgstr "公共资料"
+
+#~ msgid "Repos"
+#~ msgstr "资料库"
+
+#~ msgid "New Repo"
+#~ msgstr "新建资料库"
+
 #~ msgid "Sign out"
 #~ msgstr "退出"
 
diff --git a/locale/zh_CN/LC_MESSAGES/djangojs.mo b/locale/zh_CN/LC_MESSAGES/djangojs.mo
index 2837f43351..bd5b16d4af 100644
Binary files a/locale/zh_CN/LC_MESSAGES/djangojs.mo and b/locale/zh_CN/LC_MESSAGES/djangojs.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/djangojs.po b/locale/zh_CN/LC_MESSAGES/djangojs.po
index 23ecb0ce5e..d366c736b1 100644
--- a/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ b/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-26 17:21+0800\n"
+"POT-Creation-Date: 2012-10-26 19:43+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"
@@ -18,6 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: po.js:3
-msgid "hello"
-msgstr "你好"
+#: po.js:4 po.js.c:10
+msgid "Email can't be blank"
+msgstr "邮箱不能为空"
+
+#: po.js:5 po.js.c:11
+msgid "Password can't be blank"
+msgstr "密码不能为空"
+
+#: po.js:6
+msgid "Confirm password can't be blank"
+msgstr "确认密码不能为空"
+
+#: po.js:7
+msgid "The two password fields did't match"
+msgstr "两次密码不相同"
+
+#: po.js:12
+msgid "Incorrect email or password"
+msgstr "您输入的邮箱或密码不正确"
diff --git a/po.js b/po.js
index d4b6048517..6c39a5e64d 100644
--- a/po.js
+++ b/po.js
@@ -1,4 +1,16 @@
 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');
+
+
 
 
diff --git a/templates/myhome_base.html b/templates/myhome_base.html
index 8878e1f07d..148122dedb 100644
--- a/templates/myhome_base.html
+++ b/templates/myhome_base.html
@@ -9,7 +9,7 @@
     </li>
     {% if not cloud_mode %}
     <li>
-        <a href="{% url 'public_home' %}" {% block nav_publichome_class %}{% endblock %}>{% trans "Public Repo" %}</a>
+        <a href="{% url 'public_home' %}" {% block nav_publichome_class %}{% endblock %}>{% trans "Public Library" %}</a>
     </li>
     {% endif %}
     <li>
diff --git a/templates/registration/login.html b/templates/registration/login.html
index bc7ff2cea1..d808fcb8b5 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('请输入邮箱。');
+            $('.error').removeClass('hide').html(gettext('Email can\'t be blank'));
             return false;
         }
         if (!$.trim($('input[name="password"]').attr('value'))) {
-            $('.error').removeClass('hide').html('请输入密码。');
+            $('.error').removeClass('hide').html(gettext('Password can\'t be blank'));
             return false;
         }
    });
     {% if form.errors %}
-    $('.error').removeClass('hide').html('您输入的邮箱或密码不正确');
+    $('.error').removeClass('hide').html(gettext('Incorrect email or password'));
     {% endif %}
 </script>
 {% endblock %}
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index d3e995c7b0..adcb0bcb17 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -29,15 +29,15 @@ $('input[type="submit"]').click(function(){
             return false;
         }
         if (!$.trim($('input[name="password1"]').attr('value'))) {
-            $('.error').removeClass('hide').html('Password can\'t be blank');
+            $('.error').removeClass('hide').html(gettext('Password can\'t be blank'));
             return false;
         }
         if (!$.trim($('input[name="password2"]').attr('value'))) {
-            $('.error').removeClass('hide').html('Confirm password can\'t be blank');
+            $('.error').removeClass('hide').html(gettext('Confirm password can\'t be blank'));
             return false;
         }
         if ($.trim($('input[name="password1"]').attr('value')) != $.trim($('input[name="password2"]').attr('value'))) {
-            $('.error').removeClass('hide').html('The two password fields did\'t match');
+            $('.error').removeClass('hide').html(gettext('The two password fields did\'t match'));
             return false;
         }
    });
diff --git a/templates/snippets/my_owned_repos.html b/templates/snippets/my_owned_repos.html
index 417822c637..a12cd9ca52 100644
--- a/templates/snippets/my_owned_repos.html
+++ b/templates/snippets/my_owned_repos.html
@@ -1,12 +1,12 @@
 {% load seahub_tags i18n %}
-<h3>{% trans "Repos" %}</h3>
+<h3>{% trans "Libraries" %}</h3>
 <div id="repos-tabs">
 <div class="ovhd">
     <ul class="fleft">
         <li><a href="#my-own-repos" onfocus="this.blur()">{% trans "I owned" %}</a></li>
         <li><a href="#repos-shared-to-me" onfocus="this.blur()">{% trans "Share to me" %}</a></li>
     </ul>
-    <button id="repo-create" class="fright">{% trans "New Repo" %}</button>
+    <button id="repo-create" class="fright">{% trans "New Library" %}</button>
 </div>
 <div id="my-own-repos">
 {% if owned_repos %}