diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html
index 35b727f5ba..5f3bc3f9c2 100644
--- a/group/templates/group/group_info.html
+++ b/group/templates/group/group_info.html
@@ -19,7 +19,7 @@
 </div>
 <div class="info-item">
     <div class="info-item-top">
-        <h3 class="inbl">{% trans "Staffs" %}</h3>
+        <h3>{% trans "Staffs" %}</h3>
     </div>
     <ul class="info-item-bottom">
         {% for member in managers %}
@@ -29,10 +29,10 @@
 </div>
 
 <div class="info-item">
-    <div class="info-item-top">
-        <h3 class="inbl">{% trans "Members" %}</h3>
+    <div class="info-item-top ovhd">
+        <h3 class="fleft">{% trans "Members" %}</h3>
         {% if is_staff %}
-        <a href="#" class="grp-member-add op">{% trans "Add" %}</a>
+        <a href="#" id="grp-member-add" class="op fright">{% trans "Add" %}</a>
         {% endif %}
     </div>
     <div class="info-item-bottom">
@@ -74,10 +74,10 @@
     <tr>
         <th width="4%"><!--icon--></th>
         <th width="20%">{% trans "Name" %}</th>
-        <th width="36%">{% trans "Description" %}</th>
-        <th width="14%">{% trans "Last Update" %}</th>
-        <th width="16%">{% trans "Share From" %}</th>
-        <th width="10%">{% trans "Operations" %}</th>
+        <th width="34%">{% trans "Description" %}</th>
+        <th width="16%">{% trans "Last Update" %}</th>
+        <th width="14%">{% trans "Share From" %}</th>
+        <th width="12%">{% trans "Operations" %}</th>
     </tr>
 
     {% for repo in repos %}
@@ -266,7 +266,7 @@ $('.grp-admin-add').click(function() {
     addAutocomplete('#added-admin-name', '#admin-add-form', contact_list);
 });
 
-$('.grp-member-add').click(function() {
+$('#grp-member-add').click(function() {
     $("#member-add-form").modal({appendTo: "#main"});
     addAutocomplete('#added-member-name', '#member-add-form', contact_list);
     return false;
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index dc5e34bb00..f2bc3b3d65 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 20f18eae26..4a0642f005 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -3,12 +3,11 @@
 # 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-29 10:38+0800\n"
+"POT-Creation-Date: 2012-10-29 20:24+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"
@@ -51,7 +50,6 @@ msgid "Password should be less than 15 characters"
 msgstr "密码太长"
 
 #: forms.py:89
-#, python-format
 msgid "Name %s is not valid"
 msgstr "名称 %s 含有无效字符"
 
@@ -63,11 +61,35 @@ msgstr ""
 msgid "简体中文"
 msgstr ""
 
+#: templates/base.html:9
+msgid "File Collaboration Team Organization"
+msgstr "文件 合作 团队 团体"
+
+#: templates/base.html:34 templates/base.html.py:37
+msgid "Personal Account"
+msgstr "个人帐号"
+
+#: templates/base.html:41
+msgid "New Organization"
+msgstr "新建团体"
+
+#: templates/base.html:47
+msgid "System Admin"
+msgstr "系统管理"
+
+#: templates/base.html:48 templates/base.html.py:53
+msgid "My Workspace"
+msgstr "个人工作台"
+
+#: templates/base.html:52
+msgid "Admin"
+msgstr "管理员工作台"
+
 #: templates/base.html:59
 msgid "Welcome,"
 msgstr "欢迎，"
 
-#: templates/base.html:60
+#: templates/base.html:60 templates/myhome.html:9
 msgid "Profile"
 msgstr "设置"
 
@@ -117,7 +139,7 @@ msgid "Contact Us"
 msgstr "联系我们"
 
 #: templates/base.html:143
-msgid "Confirm to delete?"
+msgid "Really want to delete?"
 msgstr "确定要删除？"
 
 #: templates/base.html:144
@@ -128,12 +150,8 @@ msgstr "确定"
 msgid "No"
 msgstr "取消"
 
-#: templates/myhome.html:9
-msgid "Account"
-msgstr "我的基本信息"
-
 #: templates/myhome.html:15
-msgid "Nickname is empty"
+msgid "No Nickname"
 msgstr "暂无昵称"
 
 #: templates/myhome.html:15 templates/repo_view_file.html:116
@@ -243,12 +261,10 @@ msgid "Description"
 msgstr "描述"
 
 #: templates/public_home.html:23 templates/repo_history.html:16
-#: templates/snippets/my_owned_repos.html:20
-#: templates/snippets/my_owned_repos.html:52
 msgid "Last Update"
 msgstr "更新时间"
 
-#: templates/public_home.html:24 templates/snippets/my_owned_repos.html:53
+#: templates/public_home.html:24
 msgid "Share From"
 msgstr "共享来源"
 
@@ -286,8 +302,8 @@ msgstr "您可以新建一个公开的资料库，网站内的其他人都可以
 
 #: templates/repo.html:11
 msgid ""
-"Current page will be gone shortly, welcome joining <a href=\"http://seafile."
-"com/\" target=\"_blank\">Seafile</a> to experience more features."
+"This page will be invalid shortly, you can join <a href=\"http://seafile.com/"
+"\" target=\"_blank\">Seafile</a> to experience more."
 msgstr ""
 "当前链接会在短期内失效，欢迎您 <a href=\"http://seafile.com/\" target="
 "\"_blank\">加入Seafile </a>体验更多功能。"
@@ -297,20 +313,24 @@ msgid "Trash"
 msgstr "文件回收站"
 
 #: templates/repo.html:27
-msgid "This library is read only, you can only view files."
+msgid "This library is read-only, and you can only view the files."
 msgstr "这个资料库设置了只读共享，您只能在线浏览文件。"
 
+#: templates/repo.html:33
+msgid "Size:"
+msgstr "大小："
+
 #: templates/repo.html:42 templates/repo_history.html:39
 #: templates/repo_view_file.html:91 templates/repo_view_snapshot.html:39
 msgid "More"
 msgstr "详情"
 
-#: templates/repo.html:45
-msgid "Histories"
-msgstr "更多历史"
+#: templates/repo.html:45 templates/repo.html.py:149
+msgid "History"
+msgstr "历史"
 
 #: templates/repo.html:55
-msgid "System automatically generate"
+msgid "Generated by system"
 msgstr "系统自动生成"
 
 #: templates/repo.html:58 templates/repo_history.html:33
@@ -318,8 +338,8 @@ msgstr "系统自动生成"
 msgid "Unknown"
 msgstr "未知"
 
-#: templates/repo.html:71 templates/repo_history_view.html:31
-msgid "Can't view this library"
+#: templates/repo.html:71
+msgid "You can't access this library."
 msgstr "无法在线查看该资料库。"
 
 #: templates/repo.html:76 templates/repo_history_view.html:36
@@ -331,8 +351,8 @@ msgid "Upload"
 msgstr "上传"
 
 #: templates/repo.html:88
-msgid "New Folder"
-msgstr "新建目录"
+msgid "New Directory"
+msgstr "目录"
 
 #: templates/repo.html:89
 msgid "New File"
@@ -343,15 +363,19 @@ msgid "Size"
 msgstr "大小"
 
 #: templates/repo.html:104
-msgid "Folder"
-msgstr "目录"
+msgid "Directory icon"
+msgstr "目录图标"
+
+#: templates/repo.html:113
+msgid "More operations"
+msgstr "更多操作"
 
 #: templates/repo.html:115 templates/repo.html.py:145
 #: templates/repo_view_file.html:74 templates/snippets/my_owned_repos.html:36
 msgid "Delete"
 msgstr "删除"
 
-#: templates/repo.html:116 templates/repo.html.py:146
+#: templates/repo.html:116 templates/repo.html.py:146 templates/repo.html:286
 msgid "Rename"
 msgstr "重命名"
 
@@ -375,25 +399,25 @@ msgstr "更新"
 msgid "More Operations"
 msgstr "更多操作"
 
-#: templates/repo.html:149
-msgid "History"
-msgstr "历史"
-
 #: templates/repo.html:163
-msgid "Folder Name"
-msgstr "目录名称"
+msgid "Directory Name"
+msgstr "目录名"
 
 #: templates/repo.html:168 templates/repo.html.py:178 templates/repo.html:198
-#: templates/repo.html.py:209 templates/repo_view_file.html:141
+#: 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/registration_form.html:18
+#: templates/snippets/events.html:72
 #: templates/snippets/group_recommend_form.html:23
+#: templates/snippets/repo_create_form.html:23
 #: templates/snippets/repo_share_form.html:18
 msgid "Submit"
 msgstr "提交"
 
 #: templates/repo.html:169 templates/repo.html.py:179 templates/repo.html:199
-#: templates/repo.html.py:210
+#: templates/repo.html.py:210 templates/repo_update_file.html:27
+#: templates/repo_upload_file.html:23 templates/snippets/events.html:73
 msgid "Cancel"
 msgstr "取消"
 
@@ -410,9 +434,37 @@ msgid "Other Libraries"
 msgstr "其他资料库"
 
 #: templates/repo.html:197
-msgid "Please choose derection folder"
+msgid "Please click and choose a directory."
 msgstr "请点击选择目标目录。"
 
+#: templates/repo.html:283
+msgid "file"
+msgstr "文件"
+
+#: templates/repo.html:283
+msgid "directory"
+msgstr "目录"
+
+#: templates/repo.html:286 templates/repo.html.py:348
+msgid "to:"
+msgstr "到："
+
+#: templates/repo.html:333
+msgid "Copy "
+msgstr "复制"
+
+#: templates/repo.html:336
+msgid "Move "
+msgstr "移动"
+
+#: templates/repo.html:340
+msgid "file "
+msgstr "文件"
+
+#: templates/repo.html:343
+msgid "directory "
+msgstr "目录"
+
 #: templates/repo_history.html:7
 msgid "modification history"
 msgstr "修改历史"
@@ -459,29 +511,69 @@ msgstr "镜像"
 msgid "Back to snapshots"
 msgstr "返回镜像列表"
 
+#: templates/repo_history_view.html:31
+msgid "Can't view this library"
+msgstr "无法在线查看该资料库。"
+
 #: templates/repo_history_view.html:56
 msgid "Directory"
 msgstr "目录"
 
-#: templates/repo_view_file.html:15 templates/repo_view_snapshot.html:7
-msgid "snapshot viewing"
-msgstr "镜像浏览"
+#: templates/repo_update_file.html:7
+msgid "Update file"
+msgstr "更新文件"
+
+#: templates/repo_update_file.html:19 templates/repo_upload_file.html:15
+msgid "Smaller than"
+msgstr "文件大小小于"
+
+#: templates/repo_update_file.html:25 templates/repo_upload_file.html:21
+msgid "Uploading rate:"
+msgstr "上传速度："
+
+#: templates/repo_update_file.html:25
+msgid "Fetching..."
+msgstr "获取中...请稍侯"
+
+#: templates/repo_update_file.html:33
+msgid "The owner of this library has ran out of space. Update failed."
+msgstr "该资料库拥有者的空间已用完， 文件更新失败。"
+
+#: templates/repo_upload_file.html:7
+msgid "Upload file to"
+msgstr "上传文件到"
+
+#: templates/repo_upload_file.html:21
+msgid "Fetching ..."
+msgstr "获取中...请稍侯"
+
+#: templates/repo_upload_file.html:29
+msgid "The owner of this library has ran out of space. Upload failed."
+msgstr "该资料库拥有者的空间已用完， 文件上传失败。"
+
+#: templates/repo_view_file.html:15
+msgid "snapshots"
+msgstr "镜像"
 
 #: templates/repo_view_file.html:22
-msgid "history viewing"
-msgstr "历史浏览"
+msgid "history"
+msgstr "历史"
 
 #: templates/repo_view_file.html:25
 msgid "Back to file versions"
 msgstr "返回文件版本列表"
 
+#: templates/repo_view_file.html:30 templates/repo_view_file.html.py:40
+msgid "'s trash"
+msgstr "文件回收站"
+
 #: templates/repo_view_file.html:37
 msgid "Current Path: "
 msgstr "当前路径："
 
 #: templates/repo_view_file.html:72
-msgid "Get sharing link"
-msgstr "获取分享地址"
+msgid "Share link"
+msgstr "获取共享链接"
 
 #: templates/repo_view_file.html:73
 msgid "Send"
@@ -489,18 +581,18 @@ msgstr "发送"
 
 #: templates/repo_view_file.html:76
 msgid "Unstar"
-msgstr "取消新标"
+msgstr "取消星标"
 
-#: templates/repo_view_file.html:78
+#: templates/repo_view_file.html:78 templates/repo_view_file.html.py:490
 msgid "Star"
 msgstr "添加星标"
 
 #: templates/repo_view_file.html:88
-msgid "update this library"
-msgstr "做了最新修改"
+msgid "updated this library"
+msgstr "更新了该资料库"
 
 #: templates/repo_view_file.html:95
-msgid "More Histories"
+msgid "more history"
 msgstr "更多历史"
 
 #: templates/repo_view_file.html:98
@@ -516,8 +608,8 @@ msgid "Raw"
 msgstr "原始文件"
 
 #: templates/repo_view_file.html:131
-msgid "File is loading..."
-msgstr "文件内容读取中..."
+msgid "Loading..."
+msgstr "加载中..."
 
 #: templates/repo_view_file.html:138
 msgid "Emails(seperated with ,)"
@@ -528,11 +620,10 @@ msgid "Sending..."
 msgstr "发送中..."
 
 #: templates/repo_view_file.html:147
-msgid "Under processing, please wait..."
-msgstr "处理中，请稍侯..."
+msgid "Processing..."
+msgstr "处理中..."
 
 #: templates/repo_view_file.html:150
-#, python-format
 msgid "You have not downloaded %(repo.name)s"
 msgstr "您还没有将资料库 %(repo.name)s 下载到本地"
 
@@ -544,9 +635,29 @@ msgstr "点此下载"
 msgid "Leave a message~"
 msgstr "评论一下~"
 
+#: templates/repo_view_file.html:489
+msgid "Unstarred successfully"
+msgstr "星标取消成功"
+
+#: templates/repo_view_file.html:492
+msgid "Starred successfully"
+msgstr "星标添加成功"
+
+#: templates/repo_view_file.html:496
+msgid "Failed:"
+msgstr "操作失败："
+
+#: templates/repo_view_file.html:500
+msgid ", failed"
+msgstr "，操作失败"
+
+#: templates/repo_view_snapshot.html:7
+msgid "snapshot viewing"
+msgstr "镜像浏览"
+
 #: templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
-msgstr "回到修改历史"
+msgstr "返回修改历史"
 
 #: templates/repo_view_snapshot.html:15
 msgid "Create Time"
@@ -568,6 +679,26 @@ msgstr "查看"
 msgid "Restore"
 msgstr "还原"
 
+#: templates/text_diff.html:6
+msgid "modification details"
+msgstr "修改详情"
+
+#: templates/text_diff.html:8
+msgid "Current Path:"
+msgstr "当前路径："
+
+#: templates/text_diff.html:19
+msgid "It's a newly-created blank file."
+msgstr "该文件为新建空白文件。"
+
+#: templates/text_diff.html:26
+msgid "before modification"
+msgstr "修改前"
+
+#: templates/text_diff.html:28
+msgid "after modification"
+msgstr "修改历史"
+
 #: templates/registration/login.html:8
 #: templates/registration/registration_form.html:11
 msgid "Email"
@@ -597,10 +728,9 @@ msgstr "重新登录"
 
 #: templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
-msgstr ""
+msgstr "您收到这封邮件是因为您请求了密码重置。"
 
 #: templates/registration/password_reset_email.html:3
-#, python-format
 msgid "for your user account at %(site_name)s"
 msgstr ""
 
@@ -610,11 +740,11 @@ msgstr ""
 
 #: templates/registration/password_reset_email.html:9
 msgid "Your username, in case you've forgotten:"
-msgstr ""
+msgstr "您的用户名:"
 
 #: templates/registration/password_reset_email.html:11
 msgid "Thanks for using our site!"
-msgstr ""
+msgstr "感谢使用！"
 
 #: templates/registration/password_reset_email.html:13
 #, python-format
@@ -630,14 +760,63 @@ msgid "Welcome back, you are already signed in."
 msgstr "欢迎回来，您已登录。"
 
 #: templates/registration/registration_form.html:15
-#: templates/snippets/repo_create_form.html:19
 msgid "Confirm Password"
 msgstr "确认密码"
 
+#: templates/snippets/bottom_bar.html:3
 #: templates/snippets/group_recommend_form.html:4
 msgid "Recommend"
 msgstr "推荐"
 
+#: templates/snippets/bottom_bar.html:3
+msgid "Back to group"
+msgstr "到所在群组"
+
+#: templates/snippets/bottom_bar.html:31
+msgid "Please input recommend message."
+msgstr "请输入推荐语。"
+
+#: templates/snippets/events.html:3
+msgid "Latest Events"
+msgstr "最近事件"
+
+#: templates/snippets/events.html:17
+msgid "Updated library"
+msgstr "更新了资料库"
+
+#: templates/snippets/events.html:21 templates/snippets/events.html.py:23
+#: templates/snippets/events.html:26
+msgid "Details"
+msgstr "详情"
+
+#: templates/snippets/events.html:43
+msgid "Created library"
+msgstr "创建了资料库"
+
+#: templates/snippets/events.html:58
+msgid "Deleted library"
+msgstr "删除了资料库"
+
+#: templates/snippets/events.html:66 templates/snippets/my_owned_repos.html:93
+msgid "Library"
+msgstr "资料库"
+
+#: templates/snippets/events.html:66
+msgid "is encrypted"
+msgstr "已加密"
+
+#: templates/snippets/events.html:68
+msgid "Password："
+msgstr "密码："
+
+#: templates/snippets/events.html:70
+msgid "The password will be kept in the server for only 1 hour."
+msgstr "密码将在服务器上保存一小时。"
+
+#: templates/snippets/file_upload_progress_js.html:51
+msgid "Please choose a file at first."
+msgstr "请先选择一个文件。"
+
 #: templates/snippets/group_recommend_form.html:10
 msgid "to group:"
 msgstr "到群组："
@@ -646,6 +825,38 @@ msgstr "到群组："
 msgid "Recommend Message"
 msgstr "推荐语"
 
+#: templates/snippets/list_commit_detail.html:19
+msgid "New files"
+msgstr "新文件"
+
+#: templates/snippets/list_commit_detail.html:23
+msgid "Deleted files"
+msgstr "删除的文件"
+
+#: templates/snippets/list_commit_detail.html:27
+msgid "Renamed or Moved files"
+msgstr "重命名或移动的文件"
+
+#: templates/snippets/list_commit_detail.html:31
+msgid "Modified files"
+msgstr "修改了的文件"
+
+#: templates/snippets/list_commit_detail.html:35
+msgid "New directories"
+msgstr "新目录"
+
+#: templates/snippets/list_commit_detail.html:39
+msgid "Deleted directories"
+msgstr "删除的目录"
+
+#: templates/snippets/list_commit_detail.html:43
+msgid "No conflict in the merge."
+msgstr "合并没有冲突。"
+
+#: templates/snippets/list_commit_detail.html:54
+msgid "Modification Details"
+msgstr "修改详情"
+
 #: templates/snippets/my_groups.html:3
 msgid "My Groups"
 msgstr "我的群组"
@@ -666,6 +877,12 @@ msgstr "共享给我的"
 msgid "Starred"
 msgstr "星标文件"
 
+#: templates/snippets/my_owned_repos.html:20
+#: templates/snippets/my_owned_repos.html:52
+#: templates/snippets/my_owned_repos.html:94
+msgid "UpdateTime"
+msgstr "更新时间"
+
 #: templates/snippets/my_owned_repos.html:25
 #: templates/snippets/my_owned_repos.html:61
 #: templates/snippets/my_owned_repos.html:63
@@ -676,34 +893,29 @@ msgstr "目录图标"
 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 "
-"respectively."
+"separately."
 msgstr ""
 "您可以新建一个资料库来组织您的文件资料，比如为每个项目创建一个资料库，每个资"
 "料库可以单独地同步和共享。"
 
+#: templates/snippets/my_owned_repos.html:53
+msgid "Shared By"
+msgstr "共享来源"
+
 #: templates/snippets/my_owned_repos.html:78
 msgid "Remove Share"
 msgstr "取消共享"
 
 #: templates/snippets/my_owned_repos.html:84
-msgid ""
-"Libraries shared to you (for example, by your friends) will be shown here."
-msgstr "您的朋友可以将他的资料库共享给您，这些资料库会显示在这里。"
-
-#: templates/snippets/my_owned_repos.html:93
-msgid "Library"
-msgstr "所属资料库"
-
-#: templates/snippets/my_owned_repos.html:94
-msgid "UpdateTime"
-msgstr "更新时间"
+msgid "Libraries shared to you will be shown here."
+msgstr "共享给您的资料库将显示在这里。"
 
 #: templates/snippets/my_owned_repos.html:98
 msgid "icon"
 msgstr "图标"
 
 #: templates/snippets/my_owned_repos.html:108
-msgid "You can star the important files, and they will be shown here."
+msgid "You can star important files, and they will be shown here."
 msgstr "您可以给那些重要的文件加上星标，然后它们将在这里显示。"
 
 #: templates/snippets/repo_create_form.html:9
@@ -718,6 +930,10 @@ msgstr "加密"
 msgid "(3-15 characters)"
 msgstr "(3到15个字符)"
 
+#: templates/snippets/repo_create_form.html:19
+msgid "Password again"
+msgstr "请再次输入密码"
+
 #: templates/snippets/repo_share_form.html:3
 msgid "Share to"
 msgstr "共享给"
@@ -735,6 +951,36 @@ msgstr "Tip：必须是团体内成员或群组，输入 all 共享到公共资
 msgid "Tip: type all to share to public library."
 msgstr "Tip：输入 all 共享到公共资料"
 
+#~ msgid "Folder"
+#~ msgstr "目录"
+
+#~ msgid "history viewing"
+#~ msgstr "历史浏览"
+
+#~ msgid "Get sharing link"
+#~ msgstr "获取分享地址"
+
+#~ msgid "File is loading..."
+#~ msgstr "文件内容读取中..."
+
+#~ msgid "Under processing, please wait..."
+#~ msgstr "处理中，请稍侯..."
+
+#~ msgid "Nickname is empty"
+#~ msgstr "暂无昵称"
+
+#~ msgid "Histories"
+#~ msgstr "更多历史"
+
+#~ msgid "System automatically generate"
+#~ msgstr "系统自动生成"
+
+#~ msgid "New Folder"
+#~ msgstr "新建目录"
+
+#~ msgid "Folder Name"
+#~ msgstr "目录名称"
+
 #~ msgid "My Basic Infos"
 #~ msgstr "我的基本信息"
 
diff --git a/locale/zh_CN/LC_MESSAGES/djangojs.mo b/locale/zh_CN/LC_MESSAGES/djangojs.mo
index df49410642..6a0d4e5c36 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 9e3f261c1d..c46305abe1 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-27 20:11+0800\n"
+"POT-Creation-Date: 2012-10-29 20:24+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,63 +18,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/po.js:4 templates/po.js.c:10
+#: templates/po.js:3 templates/po.js.py:8
 msgid "Email can't be blank"
 msgstr "邮箱不能为空"
 
-#: templates/po.js:5 templates/po.js.c:11
+#: templates/po.js:4 templates/po.js.py:9
 msgid "Password can't be blank"
 msgstr "密码不能为空"
 
-#: templates/po.js:6
+#: templates/po.js:5
 msgid "Confirm password can't be blank"
 msgstr "确认密码不能为空"
 
-#: templates/po.js:7
+#: templates/po.js:6
 msgid "The two password fields did't match"
 msgstr "两次密码不相同"
 
-#: templates/po.js:12
+#: templates/po.js:10
 msgid "Incorrect email or password"
 msgstr "您输入的邮箱或密码不正确"
 
-#: templates/po.js:15
+#: templates/po.js:12
 msgid "Input can't be empty"
 msgstr "输入不能为空"
 
-#: templates/po.js:16
+#: templates/po.js:13
 msgid "Confirm to remove shared library?"
 msgstr "确定要取消共享？"
 
-#: templates/po.js:19
+#: templates/po.js:15
 msgid " <button id=\"comment\">Comment</button>"
 msgstr " <button id=\"comment\">评论</button>"
 
-#: templates/po.js:20
+#: templates/po.js:16
 msgid "Please type a message"
 msgstr "请先输入您的评论"
 
-#: templates/po.js:21
+#: templates/po.js:17
 msgid "Can't find a application to open file. Seafile will open the folder."
 msgstr "找不到打开该类型文件的程序。Seafile 将为你打开该文件所在目录"
 
-#: templates/po.js:22
+#: templates/po.js:18
 msgid "File is not Synchronized with server, please synchronize manually."
 msgstr "本地文件尚未与服务器同步。请打开本地目录的自动同步，或者手动进行同步"
 
-#: templates/po.js:23
+#: templates/po.js:19
 msgid "File is not Synchronized with server, please retry later."
 msgstr "本地文件尚未与服务器同步，请稍后再试"
 
-#: templates/po.js:24
+#: templates/po.js:20
 msgid "An error occur during opening local file."
 msgstr "打开本地文件时出错"
 
-#: templates/po.js:25
+#: templates/po.js:21
 msgid "Seafile client is not start or out of date"
 msgstr "Seafile 客户端程序未启动或者版本过低"
 
-#: templates/po.js:26
+#: templates/po.js:22
 msgid ""
 "Your Seafile client is out of date, please <a href=\"http://www.seafile.com/"
 "download/\">upgrade</a> to latest."
@@ -82,6 +82,6 @@ msgstr ""
 "您的 Seafile 客户端版本太低，请<a href=\"http://www.seafile.com/download/\">"
 "升级</a>到最新版本"
 
-#: templates/po.js:29
+#: templates/po.js:24
 msgid "Confirm to restore this library?"
 msgstr "确定要还原该资料库？"
diff --git a/media/css/seahub.css b/media/css/seahub.css
index c2f3c34150..db7f4e041b 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -253,10 +253,6 @@ textarea:-moz-placeholder {
     border-top-left-radius: 1px;
     border-top-right-radius: 1px;
 }
-.info-item-top a {
-    font-size: 0.9em;
-    float: right;
-}
 .info-item-bottom {
     padding: 8px 10px;
 }
@@ -488,7 +484,7 @@ textarea:-moz-placeholder {
     margin:0 0 0.6em;
 }
 .narrow-panel input.submit {
-    width:3em;
+    width:4em;
     margin:8px 0 0;
 }
 .narrow-panel .note {
@@ -962,6 +958,10 @@ textarea:-moz-placeholder {
     color:#666;
     margin-left:5px;
 }
+#file-commit-info .time {
+    margin:0 8px;
+    color:#666;
+}
 .lsch,
 .lsch-encrypted,
 .file-diff {
@@ -1042,7 +1042,6 @@ textarea:-moz-placeholder {
 .group-list .group {
     width:315px;
     margin:0 17px 30px 0;
-    padding-bottom:10px;
 }
 .group .txt {
     color:#333;
@@ -1090,6 +1089,9 @@ textarea:-moz-placeholder {
     width:145px;
     word-wrap:break-word;
 }
+#grp-member-add {
+    margin-top:2px;
+}
 
 /* notification admin */
 .cur-note { color: red; font-size: 75%; }
diff --git a/profile/templates/profile/profile_base.html b/profile/templates/profile/profile_base.html
index a6bdda9cf7..1d246be9f1 100644
--- a/profile/templates/profile/profile_base.html
+++ b/profile/templates/profile/profile_base.html
@@ -1,6 +1,7 @@
 {% extends "myhome_base.html" %}
+{% load i18n %}
 
-{% block title %}帐号设置{% endblock %}
+{% block title %}{% tran 'Profile Setting' %}{% endblock %}
 
 {% block subnav %}
 
diff --git a/profile/templates/profile/set_profile.html b/profile/templates/profile/set_profile.html
index d4e7d2db58..d3eec3c076 100644
--- a/profile/templates/profile/set_profile.html
+++ b/profile/templates/profile/set_profile.html
@@ -1,27 +1,24 @@
 {% extends "profile/profile_base.html" %}
 {% load avatar_tags i18n %}
 
-{% block left_panel %}
-{% endblock %}
-
 {% block right_panel %}
 <div id="user-basic-info">
-<h2>{% trans "Modify Personal Infos" %}</h2>
-<form action="" method="post">
-    <label>{% trans "Avatar: " %}</label>{% avatar request.user.username 60 %}
-    <a href="{{ SITE_ROOT }}avatar/add/">{% trans "Change" %}</a><br />
-    <label>{% trans "Password: " %}</label><a href="{{ SITE_ROOT }}accounts/password/change/">{% trans "Change" %}</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 "Introduction: " %}</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" />
-</form>
+    <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" />
+        {% 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>
+        {% for error in form.intro.errors %}
+        <span class="error">{{ error|escape }}</span>
+        {% endfor %}
+        <br/>
+        <input type="submit" value="{% trans 'Submit' %}" class="submit" />
+    </form>
 </div>
 {% endblock %}
diff --git a/templates/base.html b/templates/base.html
index e4ce62f6d4..8687fc389b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -6,7 +6,7 @@
 <head>
 <title>{% if org %}{{ org.org_name }} - {% endif %}{{ seahub_title }}</title>
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="文件 协作 团队 团体" />
+<meta name="keywords" content="{% trans "File Collaboration Team Organization" %}" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.16.custom.css" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=4884491531237" />
 <link rel="icon" type="image/png" href="{{ MEDIA_URL }}img/favicon.jpg" />
@@ -31,26 +31,26 @@
                 {% if request.user.is_authenticated %}
                     {% if cloud_mode %}
                     <a href="#" id="account-context" data="no-popup">
-                    {% if org %} {{ org.org_name }} {% else %} 个人帐号 {% endif %}
+                        {% if org %} {{ org.org_name }} {% else %} {% trans "Personal Account" %} {% endif %}
                     <span class="tri-bg tri-down-bg"></span></a>
                     <ul class="hide" id="account-context-selector">
-                        <li><a href="{% url 'myhome' %}">个人帐号</a></li>
+                        <li><a href="{% url 'myhome' %}">{% trans "Personal Account" %}</a></li>
                         {% for org in request.user.orgs %}
                         <li><a href="{% url 'org_personal' org.url_prefix %}">{{ org.org_name }}</a></li>
                         {% endfor %}
-                        <li><a href="{% url 'create_org' %}">新建团体</a></li>
+                        <li><a href="{% url 'create_org' %}">{% trans "New Organization" %}</a></li>
                     </ul>
                     {% endif %}
                 {% endif %}
 
                 {% if request.user.is_staff %}
-                <a href="{{ SITE_ROOT }}sys/useradmin/"{% block top_bar_sys_manager_class %}{% endblock %}>系统管理</a>
-                <a href="{{ SITE_ROOT }}home/my/"{% block top_bar_myaccount_class %}{% endblock %}>个人工作台</a>
+                <a href="{{ SITE_ROOT }}sys/useradmin/"{% block top_bar_sys_manager_class %}{% endblock %}>{% trans "System Admin" %}</a>
+                <a href="{{ SITE_ROOT }}home/my/"{% block top_bar_myaccount_class %}{% endblock %}>{% trans "My Workspace" %}</a>
                 {% endif %}
                 
                 {% if org.is_staff %}
-                <a href="{% url 'org_admin' org.url_prefix %}"{% block top_bar_org_manager_class %}{% endblock %}>管理员工作台</a>
-                <a href="{% url 'org_personal' org.url_prefix %}"{% block top_bar_org_myaccount_class %}{% endblock %}>个人工作台</a>
+                <a href="{% url 'org_admin' org.url_prefix %}"{% block top_bar_org_manager_class %}{% endblock %}>{% trans "Admin" %}</a>
+                <a href="{% url 'org_personal' org.url_prefix %}"{% block top_bar_org_myaccount_class %}{% endblock %}>{% trans "My Workspace" %}</a>
                 {% endif %}
                 </div>
 
@@ -140,7 +140,7 @@
     </div>
 
     <div id="dialog-confirm" class="hide">
-      <p id="confirm-con">{% trans "Confirm to delete?"%}</p>
+      <p id="confirm-con">{% trans "Really want to delete?" %}</p>
       <button id="yes-btn">{% trans "Yes"%}</button>
       <button class="simplemodal-close">{% trans "No"%}</button>
     </div>
@@ -154,12 +154,8 @@
 <script type="text/javascript" src="{{ MEDIA_URL }}js/utils.js?t=4884491531236"></script>
 <script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
 <script type="text/javascript">
-$(function() {
  $('input, textarea').placeholder();
-});
-
-    $('.top-bar-con .manage').css('width', $('.top-bar-con').width() - $('.top-bar-con .account').width() - 30);
-
+ $('.top-bar-con .manage').css('width', $('.top-bar-con').width() - $('.top-bar-con .account').width() - 30);
 $('#lang-context').click(function() {
         if ($(this).attr('data') == 'no-popup') {
             $(this).parent().css('position', 'relative');
@@ -228,7 +224,6 @@ $(document).click(function(e) {
 });
 {% endif %}
 
-
 {% endif %}
 </script>
 {% block extra_script %}{% endblock %}
diff --git a/templates/myhome.html b/templates/myhome.html
index bf073b7241..6f037c1c0c 100644
--- a/templates/myhome.html
+++ b/templates/myhome.html
@@ -6,15 +6,15 @@
 
 {% block left_panel %}
 <div class="info-item">
-<h3 class="info-item-top">{% trans "Account" %}</h3>
-<div class="info-item-bottom home-profile ovhd">
-    <a href="{{ SITE_ROOT }}profile/" class="no-deco">{% avatar request.user 48 %}</a>
-{% if nickname %}
-<p class="fleft">{{ nickname }}</p>
-{% else %}
-<p class="fleft">{% trans "Nickname is empty" %} <a href="{{ SITE_ROOT }}profile/"><img src="{{ MEDIA_URL }}img/edit_12.png" alt="{% trans "Edit" %}" title="{% trans "Edit" %}" /></a></p>
-{% endif %}
-</div>
+    <h3 class="info-item-top">{% trans "Profile" %}</h3>
+    <div class="info-item-bottom home-profile ovhd">
+        <a href="{{ SITE_ROOT }}profile/" class="no-deco">{% avatar request.user 48 %}</a>
+        {% if nickname %}
+        <p class="fleft">{{ nickname }}</p>
+        {% else %}
+        <p class="fleft">{% trans "No Nickname" %} <a href="{{ SITE_ROOT }}profile/"><img src="{{ MEDIA_URL }}img/edit_12.png" alt="{% trans "Edit" %}" title="{% trans "Edit" %}" /></a></p>
+        {% endif %}
+    </div>
 </div>
 
 {% if grpmsg_list or grpmsg_reply_list or orgmsg_list %}
diff --git a/templates/repo.html b/templates/repo.html
index 40facd0963..023a911a63 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -8,7 +8,7 @@
   {{ block.super }}
 {% else %}
   <div id="sharelink-infobar">
-    <p>{% blocktrans %}Current page will be gone shortly, welcome joining <a href="http://seafile.com/" target="_blank">Seafile</a> to experience more features.{% endblocktrans %}</p>
+    <p>{% blocktrans %}This page will be invalid shortly, you can join <a href="http://seafile.com/" target="_blank">Seafile</a> to experience more.{% endblocktrans %}</p>
   </div>
 {% endif %}
 {% endblock %}
@@ -24,13 +24,13 @@
         {% endif %}
     </div>
     {% if user_perm == 'r' %}
-    <p>{% trans "This library is read only, you can only view files."%}</p>
+    <p>{% trans "This library is read-only, and you can only view the files."%}</p>
     {% endif %}
 
     {% if user_perm %}
     <div id="repo-basic-info">
       <p class="desc">{{repo.props.desc}}</p>
-      <p class="size">大小：{{ repo_size|filesizeformat }}</p>
+      <p class="size">{% trans 'Size:' %}{{ repo_size|filesizeformat }}</p>
     </div>
     {% endif %}
 
@@ -42,18 +42,18 @@
             <a class="lsch" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ current_commit.id }}" data="{{ current_commit.props.ctime|tsstr_sec }}">{% trans "More"%}</a>
         </span>
         {% if user_perm == 'rw' %}
-        <a href="{% url 'seahub.views.repo_history' repo.id %}" class="more fright">{% trans "Histories"%}</a>
+        <a href="{% url 'seahub.views.repo_history' repo.id %}" class="more fright">{% trans "History"%}</a>
         {% endif %}
         </p>
         <p class="meta-info">
         <span class="author">
             {% if current_commit.props.creator_name %}
-	        {% if not current_commit.second_parent_id %}
-                    {% avatar current_commit.props.creator_name 20 %}
-                    <a class="name" href="{% url 'profile.views.user_profile' current_commit.props.creator_name %}">{{ current_commit.props.creator_name|short_email }}</a>
-		{% else %}
-		    <span class="name">{% trans "System automatically generate"%}</span>
-		{% endif %}
+            {% if not current_commit.second_parent_id %}
+            {% avatar current_commit.props.creator_name 20 %}
+            <a class="name" href="{% url 'profile.views.user_profile' current_commit.props.creator_name %}">{{ current_commit.props.creator_name|short_email }}</a>
+            {% else %}
+            <span class="name">{% trans "Generated by system"%}</span>
+            {% endif %}
             {% else %}
             {% trans "Unknown"%}
             {% endif %}
@@ -68,7 +68,7 @@
         <div class="repo-file-list-inner-container">
             {% if not user_perm %}
             <div class="repo-file-list-not-show">
-                <p class="access-notice">{% trans "Can't view this library"%}</p>
+                <p class="access-notice">{% trans "You can't access this library."%}</p>
             </div>
             {% else %}
             <div class="repo-file-list-topbar ovhd">
@@ -85,7 +85,7 @@
                 {% if user_perm == 'rw' %}
                 <div class="repo-op fright">
                     <button data="{{ SITE_ROOT }}repo/upload_file/{{repo.id}}/?p={{ path|urlencode }}" id="upload-file" class="op-btn">{% trans "Upload"%}</button>
-                    <button id="add-new-dir" class="op-btn">{% trans "New Folder"%}</button>
+                    <button id="add-new-dir" class="op-btn">{% trans "New Directory"%}</button>
                     <button id="add-new-file" class="op-btn">{% trans "New File"%}</button>
                 </div>
                 {% endif %}
@@ -101,7 +101,7 @@
 
                 {% for dirent in dir_list %}
                 <tr>
-                    <td class="icon-container"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Folder"%}" /></td>
+                    <td class="icon-container"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
                     <td>
                         <a href="{{ SITE_ROOT }}repo/{{ repo.id }}/?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{{ dirent.obj_name }}</a>
                     </td>
@@ -110,7 +110,7 @@
                     <td>
                       {% if user_perm == 'rw' %}
                         <div class="repo-file-op vh">
-                            <img src="{{ MEDIA_URL }}img/dropdown-arrow.png" title="更多操作" alt="更多操作" class="more-op-icon" data="no-popup" />
+                            <img src="{{ MEDIA_URL }}img/dropdown-arrow.png" title="{% trans 'More operations'%}" alt="{% trans 'More operations'%}" class="more-op-icon" data="no-popup" />
                             <ul class="hidden-op hide">
                                 <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">{% trans "Delete"%}</a></li>
                                 <li><a class="op dir-rename" href="#" data="{{ dirent.obj_name }}">{% trans "Rename"%}</a></li>
@@ -142,11 +142,11 @@
                             {% if user_perm == 'rw' %}
                             <img src="{{ MEDIA_URL }}img/dropdown-arrow.png" title="{% trans "More Operations"%}" alt="{% trans "More Operations"%}" class="more-op-icon" data="no-popup" />
                             <ul class="hidden-op hide">
-                                <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">{% trans "Delete"%}</a></li>
-                                <li><a class="op file-rename" href="#" data="{{ dirent.obj_name }}">{% trans "Rename"%}</a></li>
-                                <li><a class="op file-mv" href="#" data="{{ dirent.obj_name }}">{% trans "Move"%}</a></li>
-                                <li><a class="op file-cp" href="#" data="{{ dirent.obj_name }}">{% trans "Copy"%}</a></li>
-                                <li><a class="op" href="{% url 'file_revisions' repo.props.id %}?p={{ path }}{{ dirent.obj_name }}">{% trans "History"%}</a></li>
+                                <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">{% trans "Delete" %}</a></li>
+                                <li><a class="op file-rename" href="#" data="{{ dirent.obj_name }}">{% trans "Rename" %}</a></li>
+                                <li><a class="op file-mv" href="#" data="{{ dirent.obj_name }}">{% trans "Move" %}</a></li>
+                                <li><a class="op file-cp" href="#" data="{{ dirent.obj_name }}">{% trans "Copy" %}</a></li>
+                                <li><a class="op" href="{% url 'file_revisions' repo.props.id %}?p={{ path }}{{ dirent.obj_name }}">{% trans "History" %}</a></li>
                             </ul>
                             {% endif %}
                         </div>
@@ -160,13 +160,13 @@
     </div>
 
     <form id="add-new-dir-form" action="" method="post" class="hide">{% csrf_token %}
-        <h4>{% trans "Folder Name"%}</h4>
+        <h4>{% trans "Directory Name"%}</h4>
         <input type="hidden" name="repo_id" value="{{ repo.id }}" />
         <input type="hidden" name="parent_dir" value="{{ path }}" />
         <input type="text" name="new_dir_name" value="" /><br />
         <p class="error hide"></p>
-        <input type="submit" value="{% trans "Submit"%}" class="submit" />
-        <button class="simplemodal-close">{% trans "Cancel"%}</button>
+        <input type="submit" value="{% trans "Submit" %}" class="submit" />
+        <button class="simplemodal-close">{% trans "Cancel" %}</button>
     </form>
 
     <form id="add-new-file-form" action="" method="post" class="hide">{% csrf_token %}
@@ -194,7 +194,7 @@
         <input type="hidden" name="obj_type" value="" />
         <input type="hidden" name="dst_repo" value="" />
         <input type="hidden" name="dst_path" value="" />
-        <p class="error hide">{% trans "Please choose derection folder"%}</p>
+        <p class="error hide">{% trans "Please click and choose a directory."%}</p>
         <input type="submit" value="{% trans "Submit"%}" class="submit" />
         <button class="simplemodal-close">{% trans "Cancel"%}</button>
     </form>
@@ -280,10 +280,10 @@ $('.hidden-op li').hover(
 );
 
 $('.file-rename, .dir-rename').click(function () {
-    var type = $(this).hasClass('file-rename') ? '文件 ' : '目录 ',
+        var type = $(this).hasClass('file-rename') ? '{% trans "file" %} ' : '{% trans "directory" %} ',
         name = $(this).attr('data');
         newname = $('#rename-form input[name="newname"]');
-        $('#rename-hd').html( '将' + type + ' <span class="op-target">' + name + '</span> 重命名为：');
+        $('#rename-hd').html( '{% trans "Rename" %}' + type + ' <span class="op-target">' + name + '</span> {% trans "to:" %}');
     $('#rename-form input[name="oldname"]').val(name);
     $('#rename-form').modal({appendTo:'#main'});
     newname.before('<p class="hide">' + name + '</p>');
@@ -330,22 +330,22 @@ $('.file-cp, .file-mv, .dir-cp, .dir-mv').click(function () {
         file_type = '';
     if ($(this).hasClass('file-cp') || $(this).hasClass('dir-cp')) {
         $('#operation').val('cp');
-        mv_type = '复制';
+        mv_type = '{% trans "Copy " %}';
     } else {
         $('#operation').val('mv');
-        mv_type = '移动';
+        mv_type = '{% trans "Move " %}';
     }
 
     if ($(this).hasClass('file-cp') || $(this).hasClass('file-mv')) {
-        file_type = '文件';
+    file_type = '{% trans "file " %}';
         $('input[name="obj_type"]').val('file');
     } else {
-        file_type = '目录';
-        $('input[name="obj_type"]').val('dir');
+    file_type = '{% trans "directory " %}';
+        $('input[name="obj_type "]').val('dir');
     }
 
     $('input[name="obj_name"]').val(obj_name);
-    $('#mv-hd').html('将' + file_type + ' <span class="op-target">' + obj_name + '</span> ' + mv_type + '到：');
+    $('#mv-hd').html(mv_type + file_type + ' <span class="op-target">' + obj_name + '</span> {% trans "to:" %}');
     $('#mv-form').modal({appendTo:'#main', autoResize:true});
     renderDirTree($('#current-repo-dirs'), current_repo);
     return false;
diff --git a/templates/repo_update_file.html b/templates/repo_update_file.html
index a6a5e7256e..9f08075c67 100644
--- a/templates/repo_update_file.html
+++ b/templates/repo_update_file.html
@@ -1,10 +1,10 @@
 {% extends base_template %}
-{% load seahub_tags %}
+{% load seahub_tags i18n %}
 
 {% block main_panel %}
 {% if not cloud_mode or not no_quota %}
 <div class="narrow-panel">
-    <h3>更新文件
+    <h3>{% trans "Update file" %}
             {% for name, link in zipped %}
               {% if not forloop.last %}
                 <a href="{{ SITE_ROOT }}repo/{{ repo.id }}/?p={{ link|urlencode }}">{{ name }}</a> / 
@@ -16,21 +16,21 @@
     <form id="upload-file-form" enctype="multipart/form-data" method="post" action="{{ update_url }}">
         <input type="hidden" name="target_file" value="{{ target_file }}" />
         <input type="file" name="file" id="file" />
-        <p>(文件应小于 {{ max_upload_file_size|filesizeformat }})</p>
+        <p>({% trans "Smaller than" %} {{ max_upload_file_size|filesizeformat }})</p>
         <p id="error-msg" class="error">{{ error_msg }}</p>
-        <input id="upload-submit" type="submit" value="提交" class="submit" />
+        <input id="upload-submit" type="submit" value="{% trans "Submit" %}" class="submit" />
     </form>
     
     <div id="upload-progress" class="hide">
-        <p>上传进度: <span id="upload-progress-text">获取中，请稍侯...</span></p>
+        <p>{% trans "Uploading rate:" %} <span id="upload-progress-text">{% trans "Fetching..." %}</span></p>
         <div id="task-progress-bar" class="hide"></div>
-        <button id="upload-cancel">取消</button>
+        <button id="upload-cancel">{% trans "Cancel" %}</button>
     </div>
     <iframe id="request-progress" class="hide"><!--for chrome--></iframe>
 </div>
 {% else %}
 <div class="text-panel">
-    <p class="error">该资料库所有者的空间已用完，无法更新</p>
+    <p class="error">{% trans "The owner of this library has ran out of space. Update failed." %}</p>
 </div>
 {% endif %}
 {% endblock %}
diff --git a/templates/repo_upload_file.html b/templates/repo_upload_file.html
index fb9c2cb332..803eb3bade 100644
--- a/templates/repo_upload_file.html
+++ b/templates/repo_upload_file.html
@@ -1,10 +1,10 @@
 {% extends base_template %}
-{% load seahub_tags %}
+{% load seahub_tags i18n %}
 
 {% block main_panel %}
 {% if not cloud_mode or not no_quota %}
 <div class="narrow-panel">
-    <h3>上传文件到
+    <h3>{% trans "Upload file to" %}
             {% for name, link in zipped %}
             <a href="{{ SITE_ROOT }}repo/{{ repo.id }}/?p={{ link|urlencode }}">{{ name }}</a> / 
             {% endfor %}
@@ -12,21 +12,21 @@
     <form id="upload-file-form" enctype="multipart/form-data" method="post" action="{{ upload_url }}">
         <input type="hidden" name="parent_dir" id="parent_dir" value="{{ parent_dir }}" />
         <input type="file" name="file" id="file" />
-        <p>(文件应小于 {{ max_upload_file_size|filesizeformat }})</p>
+        <p>({% trans "Smaller than" %} {{ max_upload_file_size|filesizeformat }})</p>
         <p id="error-msg" class="error">{{ error_msg }}</p>
-        <input id="upload-submit" type="submit" value="提交" class="submit" />
+        <input id="upload-submit" type="submit" value="{% trans "Submit" %}" class="submit" />
     </form>
     
     <div id="upload-progress" class="hide">
-        <p>上传进度: <span id="upload-progress-text">获取中，请稍侯...</span></p>
+        <p>{% trans "Uploading rate:" %} <span id="upload-progress-text">{% trans "Fetching ..." %}</span></p>
         <div id="task-progress-bar" class="hide"></div>
-        <button id="upload-cancel">取消</button>
+        <button id="upload-cancel">{% trans "Cancel" %}</button>
     </div>
     <iframe id="request-progress" class="hide"><!--for chrome--></iframe>
 </div>
 {% else %}
 <div class="text-panel">
-    <p class="error">该资料库所有者的空间已用完，无法上传</p>
+    <p class="error">{% trans "The owner of this library has ran out of space. Upload failed." %}</p>
 </div>
 {% endif %}
 {% endblock %}
diff --git a/templates/repo_view_file.html b/templates/repo_view_file.html
index a2a3bfcdcf..490dfd4312 100644
--- a/templates/repo_view_file.html
+++ b/templates/repo_view_file.html
@@ -12,14 +12,14 @@
     {% else %}
         {% if page_from == 'snapshot' %}
         <h2>
-            {{repo.props.name}} {% trans "snapshot viewing" %}
+            {{repo.props.name}} {% trans "snapshots" %}
             <span class="commit-time">({{ current_commit.props.ctime|tsstr_sec }})</span>
         </h2>
         {% endif %}
         {% if page_from == 'file_history' %}
         <div class="w100 ovhd">
             <h2 class="fleft">
-                {{repo.props.name}} {% trans "history viewing"%}
+                {{repo.props.name}} {% trans "history"%}
                 <span class="commit-time">({{ current_commit.props.ctime|tsstr_sec }})</span>
             </h2>
             <button class="fright" data="{% url 'file_revisions' repo.id %}?p={{ path|urlencode }}" id="back">{% trans "Back to file versions"%}</button>
@@ -27,7 +27,7 @@
         {% endif %}
         {% if page_from == 'recycle' %}
             <div class="w100 ovhd">
-                <h2 class="fleft">{{repo.props.name}} 的文件回收站</h2>
+                <h2 class="fleft">{{repo.props.name}} {% trans "'s trash" %}</h2>
                 <button class="fright" data="{% url 'repo' repo.id %}" id="back">{% trans "Back to Library"%}</button>
             </div>
         {% endif %}
@@ -37,7 +37,7 @@
         {% trans "Current Path: "%}
 	{% if page_from == 'recycle' %}
 
-	<a href="{% url 'repo_recycle_view' repo.id %}">{{repo.props.name}} 的文件回收站</a>
+    <a href="{% url 'repo_recycle_view' repo.id %}">{{repo.props.name}} {% trans "'s trash" %}</a>
         {% for name, link in zipped %}
             {% if not forloop.last %}
             / <a href="{% url 'repo_recycle_view' repo.id %}?commit_id={{ current_commit.id }}&base={{ basedir|urlencode }}&p={{ link|urlencode }}">{{ name }}</a>
@@ -69,7 +69,7 @@
         {% if not view_history %}
         <div class="file-op fright">
             <input id="shared-link" class="hide" type="text" readonly="readonly" value="{{ file_shared_link }}" />
-            <button data="{{ SITE_ROOT }}sharedlink/get/?repo_id={{ repo.id }}&p={{ path|urlencode }}&file_name={{ file_name }}" id="get-shared-link">{% trans "Get sharing link"%}</button>
+            <button data="{{ SITE_ROOT }}sharedlink/get/?repo_id={{ repo.id }}&p={{ path|urlencode }}&file_name={{ file_name }}" id="get-shared-link">{% trans "Share link"%}</button>
             <button id="send-shared-link" class="hide">{% trans "Send"%}</button>
             <button data="{{ SITE_ROOT }}sharedlink/remove/?t={{ fileshare.token }}" id="rm-shared-link" class="hide">{% trans "Delete"%}</button>
             {% if is_starred %}
@@ -85,14 +85,14 @@
     <div id="file-commit-info">
         <div class="latest-commit ovhd">
             <p class="latest-commit-info fleft">
-                {% avatar latest_contributor 20 %} <a href="{% url 'user_profile' latest_contributor %}" class="name">{{ latest_contributor|email2nickname }}</a> <span class="time">{{ last_modified|translate_commit_time}}</span><span> {% trans "update this library"%}</span>
+                {% avatar latest_contributor 20 %} <a href="{% url 'user_profile' latest_contributor %}" class="name">{{ latest_contributor|email2nickname }}</a><span class="time">{{ last_modified|translate_commit_time}}</span><span>{% trans "updated this library"%}</span>
                 {% if filetype == 'Text' or filetype == 'Markdown' %}
                 {% if last_commit_id %}
                 <span><a class="file-diff" href="{% url 'text_diff' repo.id %}?p={{path|urlencode}}&commit={{last_commit_id}}">{% trans "More"%}</a></span>
                 {% endif %}
                 {% endif %}
             </p>
-            <a href="{% url 'file_revisions' repo.id %}?p={{ path }}" class="more fright">{% trans "More Histories"%}</a>
+            <a href="{% url 'file_revisions' repo.id %}?p={{ path }}" class="more fright">{% trans "more history"%}</a>
         </div> 
         <p class="contributors">
         <span>{{ contributors|length }} {% trans "contributors"%}</span>
@@ -128,7 +128,7 @@
                 <textarea id="docu-view" class="vh">{{ file_content|escape }}</textarea>
                 {% endifnotequal %}
             {% else %}
-            <p>{% trans "File is loading..."%}</p>
+            <p>{% trans "Loading..."%}</p>
             {% endif %}
         </div>
     </div>
@@ -144,7 +144,7 @@
     </form>
 
     <div id="open-local-feedback" class="hide">
-        <p id="open-local-handling-tip">{% trans "Under processing, please wait..."%}</p>
+        <p id="open-local-handling-tip">{% trans "Processing..."%}</p>
         <p id="open-local-error" class="error"></p>
         <div id="redirect-download" class="hide">
             <p class="error">{% blocktrans %}You have not downloaded {{repo.name}}{% endblocktrans %}</p>
@@ -486,18 +486,18 @@ $('#star').click(function() {
         success:function(data) {
             if (data['success']) {
                 if (state == 'starred') {
-                    feedback('星标取消成功', 'success');
-                    star_btn.attr('data', 'unstarred').text('添加星标');
+                    feedback('{% trans "Unstarred successfully" %}', 'success');
+                    star_btn.attr('data', 'unstarred').text('{% trans "Star" %}');
                 } else {
-                    feedback('星标添加成功', 'success');
-                    star_btn.attr('data', 'starred').text('取消星标');
+                feedback('{% trans "Starred successfully" %}', 'success');
+                    star_btn.attr('data', 'starred').text('Unstar');
                 }
             } else {
-                feedback('操作失败：' + data['err_msg'], 'error');
+                feedback('{% trans "Failed:" %}' + data['err_msg'], 'error');
             }
         },
         error:function(jqXHR, textStatus, errorThrown) {
-            feedback(textStatus + '，操作失败', 'error');
+                  feedback(textStatus + '{% trans ", failed" %}', 'error');
         }
    });
 })
@@ -513,11 +513,11 @@ $('#star').click(function() {
 {% endif %}
 
 {% if view_history %}
-    {% if page_from == 'file_history' or page_from == 'recycle' %}
+{% if page_from == 'file_history' or page_from == 'recycle' %}
 $('#back').click(function() {
-    location.href = $(this).attr('data');
+        location.href = $(this).attr('data');
 });
-    {% endif %}
+{% endif %}
 {% endif %}
 </script>
 {% endblock %}
diff --git a/templates/snippets/bottom_bar.html b/templates/snippets/bottom_bar.html
index 7ea59f7f27..9439ee69bb 100644
--- a/templates/snippets/bottom_bar.html
+++ b/templates/snippets/bottom_bar.html
@@ -1,5 +1,6 @@
+{% load i18n %}
 {% load url from future %}
-var Bottom_bar = '<div id="bottom-bar">{% if groups %}<button id="recommend">推荐到群组</button> <button id="click-into-group">到所在群组</button>{% endif %}</div>';
+var Bottom_bar = '<div id="bottom-bar">{% if groups %}<button id="recommend">{% trans "Recommend" %}</button> <button id="click-into-group">{% trans "Back to group" %}</button>{% endif %}</div>';
 $('#wrapper').append(Bottom_bar);
 $('#bottom-bar').css({'position':'fixed', 'bottom':0, 'right':'10px'});
 $('#main-panel').css('margin-bottom', '28px');
@@ -27,7 +28,7 @@ $(document).click(function(e) {
 
 $('#recommend-submit').click(function() {
     if (!$.trim($('#recommend-to-group-form [name="message"]').val())) {
-        apply_form_error('recommend-form', '推荐语不能为空。');
+    apply_form_error('recommend-form', '{% trans "Please input recommend message." %}');
         return false;   
     }
 });
diff --git a/templates/snippets/events.html b/templates/snippets/events.html
index e8d34d4639..b5db8d987a 100644
--- a/templates/snippets/events.html
+++ b/templates/snippets/events.html
@@ -1,6 +1,6 @@
-{% load seahub_tags avatar_tags group_avatar_tags %}
+{% load seahub_tags avatar_tags group_avatar_tags i18n %}
 {% load url from future %}
-<h3>最近事件</h3>
+<h3>{% trans 'Latest Events' %}</h3>
 <ul id="events" class="hide">
 {% for ev in events %}
     <li class="event-item w100 ovhd">
@@ -14,16 +14,16 @@
                 <span class="time">{{ commit.ctime|translate_commit_time }}</span>
                 <a href="{% url 'user_profile' author %}" title="{{ author|email2nickname}}">{{ author|email2nickname }}</a>
             </div>
-            <p>更新了资料库 <a href="{{SITE_ROOT}}repo/{{repo.id}}">{{ repo.name }}</a></p>
+            <p>{% trans 'Updated library' %} <a href="{{SITE_ROOT}}repo/{{repo.id}}">{{ repo.name }}</a></p>
             <p class="commit-msg ovhd">{{ commit.desc|translate_commit_desc }}
             {% if repo.encrypted %}
                 {% if repo.password_set %}
-                <a class="lsch-encrypted" password_set="true" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ commit.id }}" repo_id="{{repo.id}}" repo_name="{{repo.name}}" data="{{ commit.props.ctime|tsstr_sec }}">详情</a>
+                <a class="lsch-encrypted" password_set="true" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ commit.id }}" repo_id="{{repo.id}}" repo_name="{{repo.name}}" data="{{ commit.props.ctime|tsstr_sec }}">{% trans 'Details' %}</a>
                 {% else %}
-                <a class="lsch-encrypted" password_set="false" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ commit.id }}" repo_id="{{repo.id}}" repo_name="{{repo.name}}" data="{{ commit.props.ctime|tsstr_sec }}">详情</a>
+                <a class="lsch-encrypted" password_set="false" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ commit.id }}" repo_id="{{repo.id}}" repo_name="{{repo.name}}" data="{{ commit.props.ctime|tsstr_sec }}">{% trans 'Details' %}</a>
                 {% endif %}
             {% else %}
-                <a class="lsch" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ commit.id }}" data="{{ commit.props.ctime|tsstr_sec }}">详情</a>
+                <a class="lsch" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ commit.id }}" data="{{ commit.props.ctime|tsstr_sec }}">{% trans 'Details' %}</a>
                 {% endif %}
             </p>
         </div>
@@ -40,7 +40,7 @@
                 <span class="time">{{ ev.timestamp|translate_commit_time }}</span>
                 <a href="{% url 'user_profile' author %}" title="{{ author|email2nickname}}">{{ author|email2nickname }}</a>
             </div>
-            <p>创建了资料库 <a href="{{SITE_ROOT}}repo/{{repo_id}}">{{ repo_name }}</a></p>
+            <p>{% trans 'Created library' %} <a href="{{SITE_ROOT}}repo/{{repo_id}}">{{ repo_name }}</a></p>
         </div>
         {% endwith %}
     {% endif %}
@@ -55,7 +55,7 @@
                 <span class="time">{{ ev.timestamp|translate_commit_time }}</span>
                 <a href="{% url 'user_profile' author %}" title="{{ author|email2nickname}}">{{ author|email2nickname }}</a>
             </div>
-            <p>删除了资料库 {{ repo_name }}</p>
+            <p>{% trans 'Deleted library' %} {{ repo_name }}</p>
         </div>
         {% endwith %}
     {% endif %}
@@ -63,13 +63,13 @@
 {% endfor %}
 </ul>
 <form id="repo-set-password-form" class="hide">
-    <h3>资料库 <span class="repo-name"></span> 已加密</h3>
+    <h3>{% trans 'Library' %} <span class="repo-name"></span> {% trans 'is encrypted' %}</h3>
     <input type="hidden" name="repo_id" value="" />
-    <label>密码：</label>
+    <label>{% trans 'Password：' %}</label>
     <input type="password" name="password" maxlength="64" />
-    <p class="tip">密码只会在服务器上暂存1小时</p>
+    <p class="tip">{% trans 'The password will be kept in the server for only 1 hour.' %}</p>
     <p class="error"></p>
-    <input type="submit" class="submit" value="提交" />
-    <button class="simplemodal-close">取消</button>
+    <input type="submit" class="submit" value="{% trans 'Submit' %}" />
+    <button class="simplemodal-close">{% trans 'Cancel' %}</button>
 </form>
 <div id="ls-ch" class="hide"></div><!--list modification details of a commit-->
diff --git a/templates/snippets/file_upload_progress_js.html b/templates/snippets/file_upload_progress_js.html
index ff97145dbc..0cc1e1008e 100644
--- a/templates/snippets/file_upload_progress_js.html
+++ b/templates/snippets/file_upload_progress_js.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% if not cloud_mode or not no_quota %}
 <script type="text/javascript">
 function gen_uuid() {
@@ -47,7 +48,7 @@ function submit_and_real_time_show () {
 
 $('#upload-submit').click(function () {
     if (!$.trim($('#file').val())) {
-        $('#error-msg').html('请先选择一个文件');
+    $('#error-msg').html('{% trans "Please choose a file at first." %}');
         return false;
     }
     $('#error-msg').addClass('hide');
diff --git a/templates/snippets/group_recommend_form.html b/templates/snippets/group_recommend_form.html
index 8cc4904ec4..b5e8a1b9b8 100644
--- a/templates/snippets/group_recommend_form.html
+++ b/templates/snippets/group_recommend_form.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load url from future %}
     <form action="{% url 'group_recommend' %}" method="post" id="recommend-to-group-form" class="hide">{% csrf_token %}
-        <h3>{% trans "Recommend"%}
+        <h3>{% trans "Recommend" %}
         {% for name, link in zipped %}
             {% if forloop.last %}
             <span class="op-target">{{ name }}</span>
diff --git a/templates/snippets/list_commit_detail.html b/templates/snippets/list_commit_detail.html
index 2af8903552..9fedbebea3 100644
--- a/templates/snippets/list_commit_detail.html
+++ b/templates/snippets/list_commit_detail.html
@@ -1,5 +1,5 @@
 <!-- <script type="text/javascript"> -->
-
+{% load i18n %}
 function get_commit_diff(url, callback) {
     $.ajax({
         url: url,
@@ -16,31 +16,31 @@ function get_commit_diff(url, callback) {
                 con += '</ul>';
             };
             if (data['new'].length > 0) {
-                con += '<h3 id="ls-ch-new">新文件</h3>';
+            con += '<h3 id="ls-ch-new">{% trans "New files" %}</h3>';
                 show(data['new']);
             }
             if (data['removed'].length > 0) {
-                con += '<h3 id="ls-ch-rm">删除的文件</h3>';
+                con += '<h3 id="ls-ch-rm">{% trans "Deleted files" %}</h3>';
                 show(data['removed']);
             }
             if (data['renamed'].length > 0) {
-                con += '<h3 id="ls-ch-rn">重命名或移动的文件</h3>';
+            con += '<h3 id="ls-ch-rn">{% trans "Renamed or Moved files" %}</h3>';
                 show(data['renamed']);
             }
             if (data['modified'].length > 0) {
-                con += '<h3 id="ls-ch-modi">修改的文件</h3>';
+            con += '<h3 id="ls-ch-modi">{% trans "Modified files" %}</h3>';
                 show(data['modified']);
             }
             if (data['newdir'].length > 0) {
-                con += '<h3 id="ls-ch-newdir">新目录</h3>';
+            con += '<h3 id="ls-ch-newdir">{% trans "New directories" %}</h3>';
                 show(data['newdir']);
             }
             if (data['deldir'].length > 0) {
-                con += '<h3 id="ls-ch-deldir">删除的目录</h3>';
+            con += '<h3 id="ls-ch-deldir">{% trans "Deleted directories" %}</h3>';
                 show(data['deldir']);
             }
             if (!con) {
-                con = '<p>合并没有产生冲突文件</p>';
+            con = '<p>{% trans "No conflict in the merge." %}</p>';
             }
             callback(con);
         }
@@ -51,7 +51,7 @@ function list_commit_change(obj) {
     var url = obj.attr('href');
     get_commit_diff(url, function(content) {
         var time = '<p><span class="commit-time">' + obj.attr('data') + '</span></p>';
-        var title = '<h2>修改详情</h2>' + time;
+        var title = '<h2>{% trans "Modification Details" %}</h2>' + time;
         $('#ls-ch').html(title + content).modal({
             appendTo:'#main',
             maxHeight: window.innerHeight - 57,
diff --git a/templates/snippets/my_owned_repos.html b/templates/snippets/my_owned_repos.html
index 8a844580ac..5ba1b6f7d3 100644
--- a/templates/snippets/my_owned_repos.html
+++ b/templates/snippets/my_owned_repos.html
@@ -17,7 +17,7 @@
         <th width="4%"><!--icon--></th>
         <th width="24%">{% trans "Name" %}</th>
         <th width="43%">{% trans "Description" %}</th>
-        <th width="15%">{% trans "Last Update" %}</th>
+        <th width="15%">{% trans "UpdateTime" %}</th>
         <th width="14%">{% trans "Operations" %}</th>
     </tr>
     {% for repo in owned_repos %}
@@ -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 respectively." %}</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. Every library can be synchronized and shared separately." %}</p>
 {% endif %}
 </div>
 <div id="repos-shared-to-me">
@@ -49,8 +49,8 @@
         <th width="4%"><!--icon--></th>
         <th width="20%">{% trans "Name" %}</th>
         <th width="36%">{% trans "Description" %}</th>
-        <th width="15%">{% trans "Last Update" %}</th>
-        <th width="15%">{% trans "Share From" %}</th>
+        <th width="15%">{% trans "UpdateTime" %}</th>
+        <th width="15%">{% trans "Shared By" %}</th>
         <th width="10%">{% trans "Operations" %}</th>
     </tr>
 
@@ -81,7 +81,7 @@
     {% endfor %}
 </table>
 {% else %}
-<p class="empty-repo-tips">{% trans "Libraries shared to you (for example, by your friends) will be shown here." %}</p>
+<p class="empty-repo-tips">{% trans "Libraries shared to you will be shown here." %}</p>
 {% endif %}
 </div>
 <div id="starred-files">
@@ -105,7 +105,7 @@
     {% endfor %}
 </table>
 {% else %}
-<p class="no-starred-file-tips">{% trans "You can star the important files, and they will be shown here." %}</p>
+<p class="no-starred-file-tips">{% trans "You can star important files, and they will be shown here." %}</p>
 {% endif %}
 </div>
 </div>
diff --git a/templates/snippets/repo_create_form.html b/templates/snippets/repo_create_form.html
index 8a6b542595..f4a1d141d6 100644
--- a/templates/snippets/repo_create_form.html
+++ b/templates/snippets/repo_create_form.html
@@ -16,7 +16,7 @@
         <input type="checkbox" name="encryption" id="encrypt-switch" /><label>{% trans "Encrypt"%}</label><br />
         <label>{% trans "Password"%}</label><span class="tip">{% trans "(3-15 characters)"%}</span><br />
         <input type="password" name="passwd" disabled="disabled" class="passwd input-disabled" /><br />
-        <label>{% trans "Confirm Password"%}</label><br />
+        <label>{% trans "Password again"%}</label><br />
         <input type="password" name="passwd_again" disabled="disabled" class="passwd input-disabled" />
     </div>
     <p class="error hide"></p>
diff --git a/templates/text_diff.html b/templates/text_diff.html
index a842d55053..221ec6c019 100644
--- a/templates/text_diff.html
+++ b/templates/text_diff.html
@@ -1,11 +1,11 @@
 {% extends base_template %}
-{% load seahub_tags avatar_tags%}
+{% load seahub_tags avatar_tags i18n %}
 {% load url from future %}
 
 {% block main_panel %}
-<h2 class="file-modification-hd"><span class="op-target">{{ u_filename }}</span> 修改详情 <a href="{% url 'user_profile' current_commit.creator_name %}">{% avatar current_commit.creator_name 16 %}</a><span class="modifier">{{ current_commit.creator_name|email2nickname }}</span><span class="time">{{ current_commit.ctime|translate_commit_time }}</span></h2>
+<h2 class="file-modification-hd"><span class="op-target">{{ u_filename }}</span> {% trans "modification details" %} <a href="{% url 'user_profile' current_commit.creator_name %}">{% avatar current_commit.creator_name 16 %}</a><span class="modifier">{{ current_commit.creator_name|email2nickname }}</span><span class="time">{{ current_commit.ctime|translate_commit_time }}</span></h2>
     <p class="path">
-        当前路径：
+        {% trans "Current Path:" %}
         {% for name, link in zipped %}
         {% if not forloop.last %}
         <a href="{% url 'repo' repo.id %}?p={{ link|urlencode }}">{{ name }}</a> /                
@@ -16,16 +16,16 @@
     </p>
 {% if is_new_file %}
 <div id="text-diff-output">
-<p class="blank-file">该文件为新建空白文件。</p>
+    <p class="blank-file">{% trans "It's a newly-created blank file." %}</p>
 </div>
 {% else %}
 <div id="text-diff-output">
 <table class="diff-con">
     <tr>
         <th width="3%"></th>
-        <th width="47%">修改前</th>
+        <th width="47%">{% trans "before modification" %}</th>
         <th width="3%"></th>
-        <th width="47%">修改后</th>
+        <th width="47%">{% trans "after modification" %}</th>
     </tr>
     {{ diff_result_table|safe }}
 </table>