diff --git a/fabfile/locale.py b/fabfile/locale.py
index 35a232ff35..576a9adfcf 100644
--- a/fabfile/locale.py
+++ b/fabfile/locale.py
@@ -15,7 +15,7 @@ def make(default=True):
     _inplace_change('locale/en/LC_MESSAGES/django.po', '%%s', '%s')
     _inplace_change('locale/en/LC_MESSAGES/django.po', '%%(', '%(')
 
-    local('django-admin.py makemessages -l en -d djangojs -i "thirdpart" -i "node_modules" -i "media" -i "static/scripts/dist" -i "static/scripts/lib" -i "tests" ')
+    local('django-admin.py makemessages -l en -d djangojs  -i "thirdpart" -i "node_modules" -i "media" -i "static/scripts/dist" -i "static/scripts/lib" -i "tests" -i "tools" -i "tagging" -i "static/scripts/i18n" --verbosity 2')
 
 @task
 def push():
diff --git a/locale/zh_CN/LC_MESSAGES/djangojs.po b/locale/zh_CN/LC_MESSAGES/djangojs.po
index feec4c19e9..53bb1d3f6b 100644
--- a/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ b/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-14 17:14+0800\n"
+"POT-Creation-Date: 2015-05-09 11:42+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: zheng xie <xiez1989@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -19,82 +19,98 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/scripts/common.js:155 static/scripts/common.js.c:245
-#: static/scripts/app/views/dir.js:782 static/scripts/app/views/dir.js.c:839
-#: static/scripts/app/views/dirent.js:392
-#: static/scripts/app/views/dirent.js:418
+#: static/scripts/app/views/dir.js:795 static/scripts/app/views/dir.js.c:852
+#: static/scripts/app/views/dirent.js:396
+#: static/scripts/app/views/dirent.js:422
+#: static/scripts/app/views/folder-perm-item.js:82
+#: static/scripts/app/views/folder-perm-item.js:124
+#: static/scripts/app/views/folder-perm.js:156
+#: static/scripts/app/views/folder-perm.js:208
+#: static/scripts/app/views/group-repo.js:58
 #: static/scripts/app/views/myhome-sub-repos.js:101
 #: static/scripts/app/views/myhome-sub-repos.js:142
-#: static/scripts/app/views/repo.js:81 static/scripts/app/views/share.js:298
+#: static/scripts/app/views/repo.js:81 static/scripts/app/views/share.js:296
+#: static/scripts/app/views/starred-file-item.js:53
 #: static/scripts/app/views/sub-lib.js:79
 msgid "Failed. Please check the network."
 msgstr "操作失败。请检查网络是否已连接。"
 
-#: static/scripts/app/models/repo.js:30
-msgid "Name is required."
-msgstr "名称为必填项。"
+#: static/scripts/common.js:508
+msgid "Enter emails or select contacts"
+msgstr "输入邮箱或选择联系人"
 
-#: static/scripts/app/models/repo.js:33 static/scripts/app/views/share.js:150
+#: static/scripts/app/models/repo.js:30
+msgid "Name is required"
+msgstr "名称为必填项"
+
+#: static/scripts/app/models/repo.js:33 static/scripts/app/views/share.js:148
 msgid "Please enter password"
 msgstr "请输入密码"
 
-#: static/scripts/app/models/repo.js:34 static/scripts/app/views/share.js:158
+#: static/scripts/app/models/repo.js:34 static/scripts/app/views/share.js:156
 msgid "Please enter the password again"
-msgstr ""
+msgstr "请再次输入密码"
 
-#: static/scripts/app/models/repo.js:36 static/scripts/app/views/share.js:154
+#: static/scripts/app/models/repo.js:36 static/scripts/app/views/share.js:152
 msgid "Password is too short"
-msgstr ""
+msgstr "密码太短"
 
-#: static/scripts/app/models/repo.js:38 static/scripts/app/views/share.js:162
+#: static/scripts/app/models/repo.js:38 static/scripts/app/views/share.js:160
 msgid "Passwords don't match"
-msgstr ""
+msgstr "两次输入的密码不一致"
 
 #: static/scripts/app/views/dir.js:43
+#: static/scripts/app/views/starred-file.js:29
 msgid "Close (Esc)"
-msgstr ""
+msgstr "关闭 (Esc)"
 
 #: static/scripts/app/views/dir.js:44
-#: static/scripts/app/views/group-repo.js:50
+#: static/scripts/app/views/starred-file.js:30
 msgid "Loading..."
-msgstr ""
+msgstr "加载中..."
 
 #: static/scripts/app/views/dir.js:47
+#: static/scripts/app/views/starred-file.js:33
 msgid "Previous (Left arrow key)"
-msgstr ""
+msgstr "上一张（左方向键）"
 
 #: static/scripts/app/views/dir.js:48
+#: static/scripts/app/views/starred-file.js:34
 msgid "Next (Right arrow key)"
-msgstr ""
+msgstr "下一张（右方向键）"
 
 #: static/scripts/app/views/dir.js:49
+#: static/scripts/app/views/starred-file.js:35
 msgid "%curr% of %total%"
-msgstr ""
+msgstr "%curr% / %total%"
 
 #: static/scripts/app/views/dir.js:55
+#: static/scripts/app/views/starred-file.js:41
 msgid "Open in New Tab"
-msgstr ""
+msgstr "在新标签页打开"
 
 #: static/scripts/app/views/dir.js:58
+#: static/scripts/app/views/starred-file.js:44
 msgid "<a href=\"%url%\" target=\"_blank\">The image</a> could not be loaded."
-msgstr ""
+msgstr "<a href=\"%url%\" target=\"_blank\">图片</a> 无法被加载。"
 
-#: static/scripts/app/views/dir.js:133
-#: static/scripts/app/views/group-side-nav.js:42
+#: static/scripts/app/views/dir.js:125
+#: static/scripts/app/views/group-side-nav.js:39
 msgid "Please check the network."
-msgstr ""
-
-#: static/scripts/app/views/dir.js:146
-msgid "Password is required."
 msgstr "请检查网络是否已连接。"
 
-#: static/scripts/app/views/dir.js:301 static/scripts/app/views/dir.js.c:357
-#: static/scripts/app/views/dirent.js:221
-#: static/scripts/app/views/share.js:441
+#: static/scripts/app/views/dir.js:150
+msgid "Password is required."
+msgstr "密码为必填项。"
+
+#: static/scripts/app/views/dir.js:308 static/scripts/app/views/dir.js.c:364
+#: static/scripts/app/views/dirent.js:225
+#: static/scripts/app/views/share.js:423
 msgid "It is required."
 msgstr "必填项。"
 
-#: static/scripts/app/views/dir.js:315 static/scripts/app/views/dir.js.c:381
-#: static/scripts/app/views/dirent.js:240
+#: static/scripts/app/views/dir.js:322 static/scripts/app/views/dir.js.c:388
+#: static/scripts/app/views/dirent.js:244
 #: static/scripts/app/views/fileupload.js:297
 #: static/scripts/app/views/fileupload.js:310
 #: static/scripts/app/views/fileupload.js:322
@@ -103,249 +119,248 @@ msgstr "必填项。"
 msgid "Just now"
 msgstr "刚才"
 
-#: static/scripts/app/views/dir.js:363
+#: static/scripts/app/views/dir.js:370
 msgid "Only an extension there, please input a name."
 msgstr "请输入完整的文件名。"
 
-#: static/scripts/app/views/dir.js:504 static/scripts/app/views/dir.js.c:633
+#: static/scripts/app/views/dir.js:517 static/scripts/app/views/dir.js.c:646
 msgid "Processing..."
 msgstr "处理中..."
 
-#: static/scripts/app/views/dir.js:540
-msgid "Successfully deleted %(name)s."
-msgstr ""
-
-#: static/scripts/app/views/dir.js:542
-msgid "Successfully deleted %(name)s and 1 other item."
-msgstr ""
-
-#: static/scripts/app/views/dir.js:544
-msgid "Successfully deleted %(name)s and %(amount)s other items."
-msgstr ""
-
-#: static/scripts/app/views/dir.js:551
-msgid "Internal error. Failed to delete %(name)s."
-msgstr ""
-
 #: static/scripts/app/views/dir.js:553
-msgid "Internal error. Failed to delete %(name)s and 1 other item."
-msgstr ""
+msgid "Successfully deleted %(name)s."
+msgstr "成功删除 %(name)s。"
 
 #: static/scripts/app/views/dir.js:555
-msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
-msgstr ""
+msgid "Successfully deleted %(name)s and 1 other item."
+msgstr "成功删除 %(name)s 和其他一项内容。"
+
+#: static/scripts/app/views/dir.js:557
+msgid "Successfully deleted %(name)s and %(amount)s other items."
+msgstr "成功删除 %(name)s 和其他 %(amount)s 项内容。"
+
+#: static/scripts/app/views/dir.js:564
+msgid "Internal error. Failed to delete %(name)s."
+msgstr "内部错误。删除 %(name)s 失败。"
+
+#: static/scripts/app/views/dir.js:566
+msgid "Internal error. Failed to delete %(name)s and 1 other item."
+msgstr "内部错误。删除 %(name)s 和其他一项内容失败。"
 
 #: static/scripts/app/views/dir.js:568
+msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
+msgstr "内部错误。删除 %(name)s 和其他 %(amount)s 项内容失败。"
+
+#: static/scripts/app/views/dir.js:581
 msgid "Delete Items"
-msgstr ""
+msgstr "删除条目"
 
-#: static/scripts/app/views/dir.js:569
+#: static/scripts/app/views/dir.js:582
 msgid "Are you sure you want to delete these selected items?"
-msgstr ""
+msgstr "确定要删除选中的条目吗？"
 
-#: static/scripts/app/views/dir.js:628 static/scripts/app/views/dirent.js:317
+#: static/scripts/app/views/dir.js:641 static/scripts/app/views/dirent.js:321
 msgid "Invalid destination path"
-msgstr ""
+msgstr "目标路径无效"
 
-#: static/scripts/app/views/dir.js:676
+#: static/scripts/app/views/dir.js:689
 msgid "Successfully moved %(name)s."
-msgstr ""
+msgstr "成功移动 %(name)s。"
 
-#: static/scripts/app/views/dir.js:678
+#: static/scripts/app/views/dir.js:691
 msgid "Successfully moved %(name)s and 1 other item."
-msgstr ""
+msgstr "成功移动 %(name)s 和另1项条目。"
 
-#: static/scripts/app/views/dir.js:680
+#: static/scripts/app/views/dir.js:693
 msgid "Successfully moved %(name)s and %(amount)s other items."
-msgstr ""
+msgstr "成功移动 %(name)s 和其他 %(amount)s 项条目。"
 
-#: static/scripts/app/views/dir.js:684
+#: static/scripts/app/views/dir.js:697
 msgid "Successfully copied %(name)s."
-msgstr ""
+msgstr "成功复制 %(name)s。"
 
-#: static/scripts/app/views/dir.js:686
+#: static/scripts/app/views/dir.js:699
 msgid "Successfully copied %(name)s and 1 other item."
-msgstr ""
+msgstr "成功复制 %(name)s 和另1项条目。"
 
-#: static/scripts/app/views/dir.js:688
+#: static/scripts/app/views/dir.js:701
 msgid "Successfully copied %(name)s and %(amount)s other items."
-msgstr ""
+msgstr "成功复制 %(name)s 和其他 %(amount)s 项条目。"
 
-#: static/scripts/app/views/dir.js:700
+#: static/scripts/app/views/dir.js:713
 msgid "Internal error. Failed to move %(name)s and %(amount)s other item(s)."
-msgstr ""
+msgstr "内部错误。移动 %(name)s 和其他 %(amount)s 项内容失败。"
 
-#: static/scripts/app/views/dir.js:702
+#: static/scripts/app/views/dir.js:715
 msgid "Internal error. Failed to move %(name)s."
-msgstr ""
+msgstr "内部错误。移动 %(name)s 失败。"
 
-#: static/scripts/app/views/dir.js:706
+#: static/scripts/app/views/dir.js:719
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other item(s)."
-msgstr ""
+msgstr "内部错误。复制 %(name)s 和其他 %(amount)s 项内容失败。"
 
-#: static/scripts/app/views/dir.js:708
+#: static/scripts/app/views/dir.js:721
 msgid "Internal error. Failed to copy %(name)s."
-msgstr ""
+msgstr "内部错误。复制 %(name)s 失败。"
 
-#: static/scripts/app/views/dir.js:748
+#: static/scripts/app/views/dir.js:761
 msgid "Moving file %(index)s of %(total)s"
-msgstr ""
+msgstr "正在移动文件 %(index)s / %(total)s"
 
-#: static/scripts/app/views/dir.js:748
+#: static/scripts/app/views/dir.js:761
 msgid "Copying file %(index)s of %(total)s"
-msgstr ""
+msgstr "正在复制文件  %(index)s / %(total)s"
 
-#: static/scripts/app/views/dir.js:770
+#: static/scripts/app/views/dir.js:783
 msgid "Failed to move %(name)s"
-msgstr ""
+msgstr "移动 %(name)s 失败"
 
-#: static/scripts/app/views/dir.js:770
+#: static/scripts/app/views/dir.js:783
 msgid "Failed to copy %(name)s"
-msgstr ""
+msgstr "复制 %(name)s 失败"
 
-#: static/scripts/app/views/dir.js:830 static/scripts/app/views/dirent.js:381
-#: static/scripts/app/views/dirent.js:409
+#: static/scripts/app/views/dir.js:843 static/scripts/app/views/dirent.js:385
+#: static/scripts/app/views/dirent.js:413
 msgid "Canceled."
-msgstr ""
+msgstr "已取消。"
 
-#: static/scripts/app/views/dirent.js:191
+#: static/scripts/app/views/dirent.js:195
 msgid "Successfully deleted %(name)s"
-msgstr ""
+msgstr "删除 %(name)s 成功"
 
-#: static/scripts/app/views/dirent.js:202
+#: static/scripts/app/views/dirent.js:206
 msgid "Rename Directory"
-msgstr ""
+msgstr "重命名目录"
 
-#: static/scripts/app/views/dirent.js:202
+#: static/scripts/app/views/dirent.js:206
 msgid "Rename File"
-msgstr ""
+msgstr "重命名文件"
 
-#: static/scripts/app/views/dirent.js:225
+#: static/scripts/app/views/dirent.js:229
 msgid "You have not renamed it."
-msgstr ""
+msgstr "你还没重命名。"
 
-#: static/scripts/app/views/dirent.js:277
+#: static/scripts/app/views/dirent.js:281
 msgid "Move {placeholder} to:"
-msgstr ""
+msgstr "移动 {placeholder} 到"
 
-#: static/scripts/app/views/dirent.js:277
+#: static/scripts/app/views/dirent.js:281
 msgid "Copy {placeholder} to:"
-msgstr ""
+msgstr "复制 {placeholder} 到"
 
-#: static/scripts/app/views/dirent.js:351
+#: static/scripts/app/views/dirent.js:355
 msgid "Moving %(name)s"
-msgstr ""
+msgstr "正在移动 %(name)s"
 
-#: static/scripts/app/views/dirent.js:351
+#: static/scripts/app/views/dirent.js:355
 msgid "Copying %(name)s"
-msgstr ""
+msgstr "正在复制 %(name)s"
 
-#: static/scripts/app/views/dirent.js:367
+#: static/scripts/app/views/dirent.js:371
 msgid "Saving..."
-msgstr ""
+msgstr "保存中..."
 
-#: static/scripts/app/views/dirent.js:381
+#: static/scripts/app/views/dirent.js:385
 msgid "Failed."
-msgstr ""
+msgstr "失败。"
 
 #: static/scripts/app/views/fileupload.js:10
 msgid "File is too big"
-msgstr ""
+msgstr "文件太大"
 
 #: static/scripts/app/views/fileupload.js:11
 msgid "File is too small"
-msgstr ""
+msgstr "文件太小"
 
 #: static/scripts/app/views/fileupload.js:12
 msgid "Filetype not allowed"
-msgstr ""
+msgstr "不支持的文件类型"
 
 #: static/scripts/app/views/fileupload.js:13
 msgid "Max number of files exceeded"
-msgstr ""
+msgstr "文件太多"
 
 #: static/scripts/app/views/fileupload.js:14
 msgid "Uploaded bytes exceed file size"
-msgstr ""
+msgstr "上传大小超过了文件大小"
 
 #: static/scripts/app/views/fileupload.js:15
 msgid "Empty file upload result"
-msgstr ""
+msgstr "空文件"
 
 #: static/scripts/app/views/fileupload.js:17
-#: static/scripts/app/views/group-repo.js:58
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #: static/scripts/app/views/fileupload.js:18
 msgid "uploaded"
-msgstr ""
+msgstr "已上传"
 
 #: static/scripts/app/views/fileupload.js:19
 msgid "canceled"
-msgstr ""
+msgstr "已取消"
 
 #: static/scripts/app/views/fileupload.js:20
 msgid "Start"
-msgstr ""
+msgstr "上传"
 
 #: static/scripts/app/views/fileupload.js:21
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #: static/scripts/app/views/fileupload.js:22
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #: static/scripts/app/views/fileupload.js:46
 msgid "File Uploading..."
-msgstr ""
+msgstr "文件上传中..."
 
 #: static/scripts/app/views/fileupload.js:47
 msgid "File Upload complete"
-msgstr ""
+msgstr "文件上传已完成"
 
 #: static/scripts/app/views/fileupload.js:48
 msgid "File Upload canceled"
-msgstr ""
+msgstr "文件上传已取消"
 
 #: static/scripts/app/views/fileupload.js:49
 msgid "File Upload failed"
-msgstr ""
+msgstr "文件上传失败"
 
 #: static/scripts/app/views/fileupload.js:153
 msgid "Failed to get upload url"
-msgstr ""
+msgstr "无法获得上传链接"
 
 #: static/scripts/app/views/fileupload.js:186
 msgid "Failed to get update url"
-msgstr ""
+msgstr "无法获得更新链接"
 
 #: static/scripts/app/views/fileupload.js:197
 msgid "Replace file {filename}?"
-msgstr ""
+msgstr "覆盖文件 {filename} ？"
 
-#: static/scripts/app/views/group-repo.js:55
-#: static/scripts/app/views/organization-repo.js:26
-#: static/scripts/app/views/shared-repo.js:26
-msgid "Success"
-msgstr ""
+#: static/scripts/app/views/folder-perm.js:49
+msgid "Set {placeholder}'s permission"
+msgstr "设置 {placeholder} 权限"
 
-#: static/scripts/app/views/group-repo.js:64
-msgid "Unshare Library"
-msgstr ""
+#: static/scripts/app/views/folder-perm.js:101
+#: static/scripts/app/views/share.js:469
+msgid "Select groups"
+msgstr "选择群组"
 
-#: static/scripts/app/views/group-repo.js:65
-msgid "Are you sure you want to unshare {placeholder} ?"
-msgstr ""
+#: static/scripts/app/views/group-repo.js:50
+#: static/scripts/app/views/organization-repo.js:49
+msgid "Successfully unshared {placeholder}"
+msgstr "成功取消共享 {placeholder}"
 
 #: static/scripts/app/views/myhome-sub-repos.js:93
 msgid "You don't have any library at present."
-msgstr ""
+msgstr "你目前还没有资料库"
 
 #: static/scripts/app/views/myhome-sub-repos.js:112
 msgid "Please choose a directory"
-msgstr ""
+msgstr "请选择一个目录"
 
 #: static/scripts/app/views/repo.js:48 static/scripts/app/views/sub-lib.js:46
 msgid "Really want to delete {lib_name}?"
@@ -353,48 +368,48 @@ msgstr "确定要删除 {lib_name} ?"
 
 #: static/scripts/app/views/repo.js:71 static/scripts/app/views/sub-lib.js:69
 msgid "Delete succeeded."
-msgstr ""
+msgstr "删除成功。"
 
 #: static/scripts/app/views/share.js:52
 msgid "Share {placeholder}"
-msgstr ""
+msgstr "共享 {placeholder}"
 
-#: static/scripts/app/views/share.js:175
+#: static/scripts/app/views/share.js:173
 msgid "Please enter days."
-msgstr ""
+msgstr "请输入天数。"
 
-#: static/scripts/app/views/share.js:179
+#: static/scripts/app/views/share.js:177
 msgid "Please enter valid days"
-msgstr ""
+msgstr "请输入有效的天数"
 
-#: static/scripts/app/views/share.js:265
+#: static/scripts/app/views/share.js:263
 msgid "Please input at least an email."
-msgstr ""
+msgstr "请输入至少一个邮箱。"
 
-#: static/scripts/app/views/share.js:282
+#: static/scripts/app/views/share.js:280
 msgid "Successfully sent to {placeholder}"
-msgstr ""
+msgstr "成功发送给 {placeholder}"
 
-#: static/scripts/app/views/share.js:286
+#: static/scripts/app/views/share.js:284
 msgid "Failed to send to {placeholder}"
-msgstr ""
+msgstr "发送给 {placeholder} 失败"
 
-#: static/scripts/app/views/share.js:416 static/scripts/app/views/share.js:481
-msgid "Select contacts or input"
-msgstr ""
-
-#: static/scripts/app/views/share.js:453 static/scripts/app/views/share.js:535
+#: static/scripts/app/views/share.js:435 static/scripts/app/views/share.js:503
 msgid "Successfully shared to {placeholder}"
-msgstr ""
+msgstr "成功共享给 {placeholder}"
 
-#: static/scripts/app/views/share.js:457 static/scripts/app/views/share.js:539
+#: static/scripts/app/views/share.js:439 static/scripts/app/views/share.js:507
 msgid "Failed to share to {placeholder}"
-msgstr ""
+msgstr "共享给 {placeholder} 失败"
 
-#: static/scripts/app/views/share.js:500
-msgid "Select groups"
-msgstr ""
-
-#: static/scripts/app/views/share.js:517
+#: static/scripts/app/views/share.js:485
 msgid "Please select a contact or a group."
-msgstr ""
+msgstr "请选择联系人或群组"
+
+#: static/scripts/app/views/shared-repo.js:26
+msgid "Success"
+msgstr "成功"
+
+#: static/scripts/app/views/starred-file-item.js:46
+msgid "Successfully unstared {placeholder}"
+msgstr "成功取消星标 {placeholder}"