diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index f2bc3b3d65..9b252cf61a 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 4a0642f005..9abdb17f84 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-29 20:24+0800\n"
+"POT-Creation-Date: 2012-10-29 23:01+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"
@@ -50,6 +50,7 @@ msgid "Password should be less than 15 characters"
 msgstr "密码太长"
 
 #: forms.py:89
+#, python-format
 msgid "Name %s is not valid"
 msgstr "名称 %s 含有无效字符"
 
@@ -186,15 +187,17 @@ msgstr "已用空间"
 msgid "My Home"
 msgstr "我的页面"
 
-#: templates/myhome_base.html:12
+#: templates/myhome_base.html:12 templates/org_base.html:12
 msgid "Public Library"
 msgstr "公共资料"
 
-#: templates/myhome_base.html:16 templates/pubinfo.html:22
+#: templates/myhome_base.html:16 templates/org_base.html:15
+#: templates/pubinfo.html:22
 msgid "Groups"
 msgstr "群组"
 
-#: templates/myhome_base.html:19 templates/snippets/my_owned_repos.html:35
+#: templates/myhome_base.html:19 templates/org_base.html:18
+#: templates/snippets/my_owned_repos.html:35
 msgid "Share"
 msgstr "共享"
 
@@ -202,10 +205,26 @@ msgstr "共享"
 msgid "Contacts"
 msgstr "通讯录"
 
-#: templates/myhome_base.html:26
+#: templates/myhome_base.html:26 templates/org_base.html:21
 msgid "Public Info"
 msgstr "公共信息"
 
+#: templates/org_admin_base.html:7
+msgid "Org Info"
+msgstr "团体概况"
+
+#: templates/org_admin_base.html:10
+msgid "Library Management"
+msgstr "资料库管理"
+
+#: templates/org_admin_base.html:13
+msgid "Group Management"
+msgstr "群组管理"
+
+#: templates/org_base.html:9
+msgid "Personal"
+msgstr "个人页面"
+
 #: templates/pubinfo.html:8
 msgid "Users"
 msgstr "成员列表"
@@ -499,7 +518,7 @@ msgstr "前一页"
 msgid "Next"
 msgstr "下一页"
 
-#: templates/repo_history.html:52 templates/repo_view_snapshot.html:56
+#: templates/repo_history.html:55 templates/repo_view_snapshot.html:56
 msgid "Per page: "
 msgstr "每页："
 
@@ -624,6 +643,7 @@ msgid "Processing..."
 msgstr "处理中..."
 
 #: templates/repo_view_file.html:150
+#, python-format
 msgid "You have not downloaded %(repo.name)s"
 msgstr "您还没有将资料库 %(repo.name)s 下载到本地"
 
@@ -731,6 +751,7 @@ 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 ""
 
diff --git a/profile/locale/zh_CN/LC_MESSAGES/django.mo b/profile/locale/zh_CN/LC_MESSAGES/django.mo
index ecfd8683e6..0bb6cd2b17 100644
Binary files a/profile/locale/zh_CN/LC_MESSAGES/django.mo and b/profile/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/profile/locale/zh_CN/LC_MESSAGES/django.po b/profile/locale/zh_CN/LC_MESSAGES/django.po
index 84981804b8..0b252d9ecf 100644
--- a/profile/locale/zh_CN/LC_MESSAGES/django.po
+++ b/profile/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-29 14:20+0800\n"
+"POT-Creation-Date: 2012-10-29 23:08+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"
@@ -30,31 +30,35 @@ msgstr "修改失败"
 msgid "Has not accepted invitation yet"
 msgstr "他还未接受邀请。"
 
-#: templates/profile/set_profile.html:9
-msgid "Modify Personal Infos"
+#: templates/profile/profile_base.html:4
+msgid "Profile Setting"
+msgstr "账号设置"
+
+#: templates/profile/set_profile.html:6
+msgid "Profile"
 msgstr "个人基本信息修改"
 
-#: templates/profile/set_profile.html:11
-msgid "Avatar: "
+#: templates/profile/set_profile.html:8
+msgid "Avatar:"
 msgstr "头像: "
 
-#: templates/profile/set_profile.html:12 templates/profile/set_profile.html:13
-msgid "Change"
+#: templates/profile/set_profile.html:9 templates/profile/set_profile.html:10
+msgid "Update"
 msgstr "更改"
 
-#: templates/profile/set_profile.html:13
-msgid "Password: "
+#: templates/profile/set_profile.html:10
+msgid "Password:"
 msgstr "密码:"
 
-#: templates/profile/set_profile.html:14
-msgid "Nickname: "
+#: templates/profile/set_profile.html:11
+msgid "Nickname:"
 msgstr "昵称: "
 
-#: templates/profile/set_profile.html:19
-msgid "Introduction: "
-msgstr "一句话介绍: "
+#: templates/profile/set_profile.html:16
+msgid "About me:"
+msgstr "介绍："
 
-#: templates/profile/set_profile.html:24
+#: templates/profile/set_profile.html:21
 #: templates/profile/user_profile.html:36
 msgid "Submit"
 msgstr "提交"
@@ -74,3 +78,12 @@ msgstr "名字(可选)："
 #: templates/profile/user_profile.html:34
 msgid "Note(optional): "
 msgstr "备注(可选)："
+
+#~ msgid "Modify Personal Infos"
+#~ msgstr "个人基本信息修改"
+
+#~ msgid "Change"
+#~ msgstr "更改"
+
+#~ msgid "Introduction: "
+#~ msgstr "一句话介绍: "
diff --git a/profile/templates/profile/profile_base.html b/profile/templates/profile/profile_base.html
index 1d246be9f1..b97e5dfa27 100644
--- a/profile/templates/profile/profile_base.html
+++ b/profile/templates/profile/profile_base.html
@@ -1,7 +1,7 @@
 {% extends "myhome_base.html" %}
 {% load i18n %}
 
-{% block title %}{% tran 'Profile Setting' %}{% endblock %}
+{% block title %}{% trans "Profile Setting" %}{% endblock %}
 
 {% block subnav %}
 
diff --git a/profile/templates/profile/set_profile.html b/profile/templates/profile/set_profile.html
index d3eec3c076..002727472b 100644
--- a/profile/templates/profile/set_profile.html
+++ b/profile/templates/profile/set_profile.html
@@ -3,22 +3,22 @@
 
 {% block right_panel %}
 <div id="user-basic-info">
-    <h2>{% trans 'Profile' %}</h2>
+    <h2>{% trans "Profile" %}</h2>
     <form action="" method="post">
-        <label>{% trans 'Avatar:' %}</label>{% avatar request.user.username 60 %}
-        <a href="{{ SITE_ROOT }}avatar/add/">{% trans 'Update' %}</a><br />
-        <label>{% trans 'Password:' %}</label><a href="{{ SITE_ROOT }}accounts/password/change/">{% trans 'Update' %}</a><br/>
-        <label>{% trans 'Nickname:' %}</label><input type="text" name="nickname" value="{{ form.data.nickname }}" class="text-input" />
+        <label>{% trans "Avatar:" %}</label>{% avatar request.user.username 60 %}
+        <a href="{{ SITE_ROOT }}avatar/add/">{% trans "Update" %}</a><br />
+        <label>{% trans "Password:" %}</label><a href="{{ SITE_ROOT }}accounts/password/change/">{% trans "Update" %}</a><br/>
+        <label>{% trans "Nickname:" %}</label><input type="text" name="nickname" value="{{ form.data.nickname }}" class="text-input" />
         {% for error in form.nickname.errors %}
         <span class="error">{{ error|escape }}</span>
         {% endfor %}
         <br/>
-        <label>{% trans 'About me:' %}></label><textarea name="intro">{{ form.data.intro }}</textarea>
+        <label>{% trans "About me:" %}</label><textarea name="intro">{{ form.data.intro }}</textarea>
         {% for error in form.intro.errors %}
         <span class="error">{{ error|escape }}</span>
         {% endfor %}
         <br/>
-        <input type="submit" value="{% trans 'Submit' %}" class="submit" />
+        <input type="submit" value="{% trans "Submit" %}" class="submit" />
     </form>
 </div>
 {% endblock %}
diff --git a/templates/org_admin_base.html b/templates/org_admin_base.html
index 6d42ee2d14..08332836ff 100644
--- a/templates/org_admin_base.html
+++ b/templates/org_admin_base.html
@@ -1,16 +1,17 @@
 {% extends "base.html" %}
+{% load i18n %}
 {% block top_bar_org_manager_class %} class="cur"{% endblock %}
 {% block nav %}
 <ul class="nav">
     {% if request.user.org.is_staff %}
     <li>
-        <a href="{% url org_admin request.user.org.url_prefix %}" {% block nav_useradmin_class %}{% endblock %}>团体概况</a>
+        <a href="{% url org_admin request.user.org.url_prefix %}" {% block nav_useradmin_class %}{% endblock %}>{% trans "Org Info" %}</a>
     </li>
     <li>
-        <a href="{% url org_seafadmin request.user.org.url_prefix %}" {% block nav_seafadmin_class %}{% endblock %}>资料库管理</a>
+        <a href="{% url org_seafadmin request.user.org.url_prefix %}" {% block nav_seafadmin_class %}{% endblock %}>{% trans "Library Management" %}</a>
     </li>
     <li>
-        <a href="{% url org_groupadmin request.user.org.url_prefix %}" {% block nav_groupadmin_class %}{% endblock %}>群组管理</a>
+        <a href="{% url org_groupadmin request.user.org.url_prefix %}" {% block nav_groupadmin_class %}{% endblock %}>{% trans "Group Management" %}</a>
     </li>
     {% endif %}
 
diff --git a/templates/org_base.html b/templates/org_base.html
index e9981b1392..688712e17e 100644
--- a/templates/org_base.html
+++ b/templates/org_base.html
@@ -1,23 +1,24 @@
 {% extends "base.html" %}
 {% load url from future %}
+{% load i18n %}
 
 {% block top_bar_org_myaccount_class %} class="cur"{% endblock %}
 {% block nav %}
 <ul class="nav">
     <li>
-        <a href="{% url 'organizations.views.org_personal' org.url_prefix %}" {% block nav_org_personal_class %}{% endblock %}>个人页面</a>
+        <a href="{% url 'organizations.views.org_personal' org.url_prefix %}" {% block nav_org_personal_class %}{% endblock %}>{% trans "Personal" %}</a>
     </li>
     <li>
-        <a href="{% url 'organizations.views.org_public' org.url_prefix %}" {% block nav_org_class %}{% endblock %}>公共资料</a>
+        <a href="{% url 'organizations.views.org_public' org.url_prefix %}" {% block nav_org_class %}{% endblock %}>{% trans "Public Library" %}</a>
     </li>
     <li>
-        <a href="{% url 'organizations.views.org_groups' org.url_prefix %}" {% block nav_group_class %}{% endblock %}>群组</a>
+        <a href="{% url 'organizations.views.org_groups' org.url_prefix %}" {% block nav_group_class %}{% endblock %}>{% trans "Groups" %}</a>
     </li>
     <li>
-        <a href="{% url 'organizations.views.org_shareadmin' org.url_prefix %}" {% block nav_shareadmin_class %}{% endblock %}>共享管理</a>
+        <a href="{% url 'organizations.views.org_shareadmin' org.url_prefix %}" {% block nav_shareadmin_class %}{% endblock %}>{% trans "Share" %}</a>
     </li>
     <li>
-        <a href="{% url 'organizations.views.org_pubinfo' org.url_prefix %}" {% block nav_pubinfo_class %}{% endblock %}>公共信息</a>
+        <a href="{% url 'organizations.views.org_pubinfo' org.url_prefix %}" {% block nav_pubinfo_class %}{% endblock %}>{% trans "Public Info" %}</a>
     </li>
 </ul>
 {% endblock %}