diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 61ba1f3004..f688483a43 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: 2013-06-05 14:01+0800\n"
+"POT-Creation-Date: 2013-08-01 10:17+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"
@@ -65,111 +65,82 @@ msgstr "名称 %s 含有无效字符"
 msgid "Passwords don't match"
 msgstr "两次输入的密码不一致"
 
-#: seahub/forms.py:106 seahub/forms.py:129 seahub/forms.py:153
-#: seahub/forms.py:176 seahub/forms.py:213
-msgid "Repo id is required"
-msgstr "repo id 为必填项"
-
-#: seahub/forms.py:107 seahub/forms.py:130 seahub/forms.py:154
-msgid "Parent dir is required"
-msgstr "parent dir 为必填项"
-
-#: seahub/forms.py:110 seahub/forms.py:134
-msgid "File name is too long"
-msgstr "文件名过长"
-
-#: seahub/forms.py:111 seahub/forms.py:135
-msgid "File name can't be empty"
-msgstr "文件名不能为空"
-
-#: seahub/forms.py:118 seahub/forms.py:142
-#, python-format
-msgid "File name \"%s\" is not valid"
-msgstr "文件名 %s 含有无效字符"
-
-#: seahub/forms.py:131
+#: seahub/forms.py:106
 msgid "Oldname is required"
 msgstr "需要 oldname"
 
-#: seahub/forms.py:157
-msgid "Directory name is too long"
-msgstr "目录名过长"
+#: seahub/forms.py:109 seahub/forms.py:130
+msgid "It's too long."
+msgstr ""
 
-#: seahub/forms.py:158
-msgid "Directory name can't be empty"
-msgstr "目录名不能为空"
+#: seahub/forms.py:110 seahub/forms.py:131
+#, fuzzy
+msgid "It's required."
+msgstr "邮箱为必填项。"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:117 seahub/forms.py:138
 #, python-format
-msgid "Directory name \"%s\" is not valid"
-msgstr "目录名 %s 含有无效字符"
+msgid "Name \"%s\" is not valid"
+msgstr "名称 \"%s\" 含有无效字符"
 
-#: seahub/forms.py:177
+#: seahub/forms.py:149 seahub/forms.py:186
+msgid "Repo id is required"
+msgstr "repo id 为必填项"
+
+#: seahub/forms.py:150
 msgid "Username is required"
 msgstr "用户名为必填项"
 
-#: seahub/forms.py:178
+#: seahub/forms.py:151
 msgid "Password can't be empty"
 msgstr "密码不能为空"
 
-#: seahub/forms.py:189
+#: seahub/forms.py:162
 msgid "Bad url format"
 msgstr "错误的 url 格式"
 
-#: seahub/forms.py:194
+#: seahub/forms.py:167
 msgid "Wrong password"
 msgstr "密码错误"
 
-#: seahub/forms.py:196
+#: seahub/forms.py:169
 msgid "Inernal server error"
 msgstr "服务器内部错误"
 
-#: seahub/forms.py:198
+#: seahub/forms.py:171
 msgid "Decrypt library error"
 msgstr "解密资料库出错"
 
-#: seahub/forms.py:204 seahub/share/forms.py:19
+#: seahub/forms.py:177 seahub/share/forms.py:19
 msgid "Email is required"
 msgstr "请输入邮箱"
 
-#: seahub/forms.py:206
+#: seahub/forms.py:179
 msgid "Quota can't be empty"
 msgstr "容量不能为空"
 
-#: seahub/forms.py:207
+#: seahub/forms.py:180
 msgid "Quota is too low (minimum value is 0)"
 msgstr "容量太小（最小为0）"
 
-#: seahub/forms.py:214
+#: seahub/forms.py:187
 msgid "Library name is required"
 msgstr "资料库名称为必填项"
 
-#: seahub/forms.py:215
+#: seahub/forms.py:188
 msgid "Library description is required"
 msgstr "资料库描述为必填项"
 
-#: seahub/forms.py:216
-msgid "Days can't be empty"
-msgstr "天数不能为空"
-
-#: seahub/forms.py:217
+#: seahub/forms.py:190
 msgid "Please enter a number"
 msgstr "请输入数字"
 
-#: seahub/settings.py:130
-msgid "English"
-msgstr ""
-
-#: seahub/settings.py:131
-msgid "简体中文"
-msgstr ""
-
 #: seahub/settings.py:132
-msgid "Русский"
+msgid "Deutsch"
 msgstr ""
 
 #: seahub/settings.py:133
-msgid "Deutsch"
+msgid "English"
 msgstr ""
 
 #: seahub/settings.py:134
@@ -177,17 +148,212 @@ msgid "Español"
 msgstr ""
 
 #: seahub/settings.py:135
-msgid "Italiano"
+msgid "Français"
 msgstr ""
 
 #: seahub/settings.py:136
-msgid "Français"
+msgid "Italiano"
 msgstr ""
 
 #: seahub/settings.py:137
 msgid "Magyar"
 msgstr ""
 
+#: seahub/settings.py:138
+msgid "Русский"
+msgstr ""
+
+#: seahub/settings.py:139
+msgid "简体中文"
+msgstr ""
+
+#: seahub/settings.py:140
+msgid "正體中文"
+msgstr ""
+
+#: seahub/api2/views.py:1315 seahub/api2/views.py:1371
+#: seahub/group/views.py:1137 seahub/views/__init__.py:447
+#: seahub/views/file.py:302 seahub/views/file.py:592 seahub/views/file.py:675
+msgid "File does not exist"
+msgstr "文件不存在"
+
+#: seahub/api2/views.py:1360
+msgid "the libray does not exist"
+msgstr "资料库不存在"
+
+#: seahub/api2/views.py:1422 seahub/views/ajax.py:130 seahub/views/ajax.py:233
+#: seahub/views/ajax.py:319 seahub/views/ajax.py:419 seahub/views/ajax.py:443
+#: seahub/views/file.py:740
+msgid "Permission denied"
+msgstr "共享权限"
+
+#: seahub/api2/views.py:1426 seahub/views/__init__.py:644
+#: seahub/views/__init__.py:737 seahub/views/__init__.py:1354
+#: seahub/views/__init__.py:1689
+msgid "Library does not exist"
+msgstr "资料库不存在"
+
+#: seahub/api2/views.py:1429
+msgid "Library is encrypted"
+msgstr "该资料库已加密"
+
+#: seahub/api2/views.py:1433
+msgid "Invalid argument"
+msgstr "非法参数"
+
+#: seahub/api2/views.py:1444 seahub/base/templatetags/seahub_tags.py:115
+#: seahub/views/__init__.py:715
+msgid "Changed library name or description"
+msgstr "修改了资料库名称或描述"
+
+#: seahub/api2/views.py:1447 seahub/views/__init__.py:718
+msgid "No conflict in the merge."
+msgstr "合并没有冲突。"
+
+#: seahub/api2/templates/api2/base.html:8 seahub/templates/base.html:9
+msgid "File Collaboration Team Organization"
+msgstr "文件 合作 团队 团体"
+
+#: seahub/api2/templates/api2/discussion.html:6
+#: seahub/group/templates/group/group_discuss.html:16
+#: seahub/group/templates/group/group_info.html:17
+#: seahub/group/templates/group/group_info_for_pub.html:17
+#: seahub/group/templates/group/group_manage.html:15
+#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_wiki.html:17
+#: seahub/group/templates/group/group_wiki_pages.html:16
+msgid "Discussion"
+msgstr "讨论"
+
+#: seahub/api2/templates/api2/discussion.html:26
+#: seahub/api2/templates/api2/discussion.html:42
+#: seahub/api2/templates/api2/discussion_posted.html:19
+#: seahub/api2/templates/api2/discussion_posted.html:35
+#: seahub/api2/templates/api2/discussions_body.html:21
+#: seahub/api2/templates/api2/discussions_body.html:37
+#: seahub/api2/templates/api2/new_msg_reply.html:27
+#: seahub/api2/templates/api2/new_msg_reply.html:43
+#: seahub/group/templates/group/group_discuss.html:95
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/new_msg_reply.html:26
+#: seahub/group/templates/group/new_msg_reply.html:35
+#: seahub/message/templates/message/user_msg_list.html:70
+#: seahub/share/templates/repo/priv_shared_files.html:38
+#: seahub/share/templates/repo/priv_shared_files.html:66
+#: seahub/share/templates/repo/shared_links.html:31
+#: seahub/templates/repo_history_view.html:66
+#: seahub/templates/repo_recycle_view.html:78
+#: seahub/templates/view_shared_dir.html:57
+#: seahub/templates/snippets/group_recommend_form.html:28
+#: seahub/templates/snippets/repo_dir_data.html:86
+msgid "File"
+msgstr "文件"
+
+#: seahub/api2/templates/api2/discussion.html:36
+#: seahub/api2/templates/api2/discussion_posted.html:29
+#: seahub/api2/templates/api2/discussions_body.html:31
+#: seahub/api2/templates/api2/new_msg_reply.html:37
+#: seahub/group/templates/group/group_discuss.html:105
+#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/share/templates/repo/priv_shared_files.html:41
+#: seahub/share/templates/repo/priv_shared_files.html:69
+#: seahub/share/templates/repo/shared_links.html:34
+#: seahub/templates/pubrepo.html:34 seahub/templates/pubrepo.html.py:36
+#: seahub/templates/view_shared_dir.html:39
+#: seahub/templates/snippets/group_recommend_form.html:22
+#: seahub/templates/snippets/repo_dir_data.html:40
+msgid "Directory icon"
+msgstr "目录图标"
+
+#: seahub/api2/templates/api2/discussion_posted.html:46
+#: seahub/api2/templates/api2/discussions_body.html:48
+#: seahub/group/templates/group/discussion_list.html:17
+#: seahub/group/templates/group/group_discuss.html:121
+#: seahub/group/templates/group/new_msg_reply.html:45
+#, python-format
+msgid "%(amount)s replies"
+msgstr "%(amount)s 个回复"
+
+#: seahub/api2/templates/api2/discussions.html:24
+#, fuzzy
+msgid "No discussions."
+msgstr "讨论"
+
+#: seahub/api2/templates/api2/discussions.html:29
+#: seahub/api2/templates/api2/events.html:13 seahub/templates/repo.html:368
+#: seahub/templates/snippets/events.html:7
+#: seahub/templates/snippets/list_commit_detail.html:3
+msgid "Loading..."
+msgstr "加载中..."
+
+#: seahub/api2/templates/api2/discussions.html:75
+#: seahub/api2/templates/api2/events_js.html:34
+#: seahub/contacts/templates/contacts/contact_list.html:108
+#: seahub/contacts/templates/contacts/contact_list.html:160
+#: seahub/group/templates/group/msg_js.html:155 seahub/templates/base.html:338
+#: seahub/templates/file_edit.html:515 seahub/templates/repo.html:264
+#: seahub/templates/repo.html.py:412 seahub/templates/repo.html:553
+#: seahub/templates/repo.html.py:665 seahub/templates/repo.html:722
+#: seahub/templates/repo.html.py:871 seahub/templates/view_file_base.html:166
+#: seahub/templates/snippets/bottom_bar.html:109
+#: seahub/templates/snippets/events_js.html:55
+#: seahub/templates/snippets/office_convert_js.html:172
+#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/repo_decrypt_js.html:35
+#: seahub/templates/snippets/shared_link_js.html:119
+#: seahub/templates/snippets/shared_link_js.html:154
+#: seahub/templates/snippets/shared_link_js.html:178
+#: seahub/templates/sysadmin/sys_useradmin.html:159
+msgid "Failed. Please check the network."
+msgstr "操作失败。请检查网络是否已连接。"
+
+#: seahub/api2/templates/api2/event_details.html:8
+#: seahub/api2/templates/api2/event_details.html:40
+#, fuzzy, python-format
+msgid "Added %(file)s"
+msgstr "添加文件"
+
+#: seahub/api2/templates/api2/event_details.html:16
+#: seahub/api2/templates/api2/event_details.html:48
+#, fuzzy, python-format
+msgid "Deleted %(file)s"
+msgstr "删除的文件"
+
+#: seahub/api2/templates/api2/event_details.html:24
+#, fuzzy, python-format
+msgid "Renamed or Moved %(file)s"
+msgstr "重命名或移动的文件"
+
+#: seahub/api2/templates/api2/event_details.html:32
+#, fuzzy, python-format
+msgid "Modified %(file)s"
+msgstr "修改了的文件"
+
+#: seahub/api2/templates/api2/events.html:19
+msgid "No activity now or the function is not supported."
+msgstr ""
+
+#: seahub/api2/templates/api2/events_body.html:17
+#: seahub/templates/snippets/events_body.html:29
+msgid "Created library"
+msgstr "创建了资料库"
+
+#: seahub/api2/templates/api2/events_body.html:21
+#: seahub/templates/snippets/events_body.html:33
+#, python-format
+msgid "Deleted library %(library_name)s"
+msgstr "删除了资料库 %(library_name)s"
+
+#: seahub/api2/templates/api2/events_js.html:83
+#, fuzzy
+msgid "Please check the network."
+msgstr "操作失败。请检查网络是否已连接。"
+
+#: seahub/api2/templates/api2/new_msg_reply.html:6
+#, fuzzy
+msgid "New Replies"
+msgstr "新文件"
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "个人信息"
@@ -205,7 +371,7 @@ msgstr ""
 #: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
 #: seahub/templates/pubgrp.html:15 seahub/templates/pubrepo.html:16
 #: seahub/templates/pubuser.html:15
-#: seahub/templates/snippets/repo_share_form.html:8
+#: seahub/templates/snippets/repo_share_form.html:7
 msgid "Groups"
 msgstr "群组"
 
@@ -404,13 +570,12 @@ msgstr "当前头像："
 #: seahub/notifications/templates/notifications/add_notification_form.html:11
 #: seahub/profile/templates/profile/set_profile.html:29
 #: seahub/profile/templates/profile/user_profile.html:38
-#: seahub/templates/base.html:69 seahub/templates/base.html.py:142
-#: seahub/templates/decrypt_repo_form.html:15
+#: seahub/templates/base.html:76 seahub/templates/base.html.py:149
+#: seahub/templates/decrypt_repo_form.html:14
 #: seahub/templates/file_edit.html:97 seahub/templates/file_edit.html:263
-#: seahub/templates/repo.html:273 seahub/templates/repo.html.py:285
-#: seahub/templates/repo.html:311 seahub/templates/repo.html.py:332
-#: seahub/templates/repo.html:344 seahub/templates/repo.html.py:356
-#: seahub/templates/view_file_base.html:100
+#: seahub/templates/repo.html:126 seahub/templates/repo.html.py:136
+#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:177
+#: seahub/templates/repo.html:186 seahub/templates/shared_file_view.html:48
 #: seahub/templates/registration/login.html:18
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
@@ -418,6 +583,8 @@ msgstr "当前头像："
 #: seahub/templates/registration/registration_form.html:18
 #: seahub/templates/snippets/add_to_contacts_form.html:9
 #: seahub/templates/snippets/events.html:19
+#: seahub/templates/snippets/file_share_popup.html:17
+#: seahub/templates/snippets/file_share_popup.html:32
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
 #: seahub/templates/snippets/repo_share_form.html:52
@@ -511,52 +678,50 @@ msgstr "文件\"%(file)s\"还原到%(time)s."
 msgid "Recovered deleted directory"
 msgstr "还原已删除的目录"
 
-#: seahub/base/templatetags/seahub_tags.py:115 seahub/views/__init__.py:698
-msgid "Changed library name or description"
-msgstr "修改了资料库名称或描述"
-
 #: seahub/base/templatetags/seahub_tags.py:117
 msgid "Auto merge by seafile system"
 msgstr "系统自动合并修改"
 
-#: seahub/base/templatetags/seahub_tags.py:173
-#: seahub/base/templatetags/seahub_tags.py:207
+#: seahub/base/templatetags/seahub_tags.py:174
+#: seahub/base/templatetags/seahub_tags.py:208
 msgid "Just now"
 msgstr "刚才"
 
-#: seahub/base/templatetags/seahub_tags.py:182
+#: seahub/base/templatetags/seahub_tags.py:183
 #, python-format
 msgid "%(days)d day ago"
 msgid_plural "%(days)d days ago"
 msgstr[0] "%(days)d 天前"
 
-#: seahub/base/templatetags/seahub_tags.py:189
+#: seahub/base/templatetags/seahub_tags.py:190
 #, python-format
 msgid "%(hours)d hour ago"
 msgid_plural "%(hours)d hours ago"
 msgstr[0] "%(hours)d 小时前"
 
-#: seahub/base/templatetags/seahub_tags.py:196
+#: seahub/base/templatetags/seahub_tags.py:197
 #, python-format
 msgid "%(minutes)d minute ago"
 msgid_plural "%(minutes)d minutes ago"
 msgstr[0] "%(minutes)d 分钟前"
 
-#: seahub/base/templatetags/seahub_tags.py:202
+#: seahub/base/templatetags/seahub_tags.py:203
 #, python-format
 msgid "%(seconds)d second ago"
 msgid_plural "%(seconds)d seconds ago"
 msgstr[0] "%(seconds)d 秒前"
 
-#: seahub/base/templatetags/seahub_tags.py:298
+#: seahub/base/templatetags/seahub_tags.py:299
 #: seahub/group/templates/group/group_info.html:89
 #: seahub/group/templates/group/group_info_for_pub.html:56
-#: seahub/share/views.py:292 seahub/share/templates/repo/share_admin.html:37
-#: seahub/share/templates/repo/share_admin.html:50
+#: seahub/share/views.py:349
+#: seahub/share/templates/repo/share_out_repos.html:31
+#: seahub/share/templates/repo/share_out_repos.html:44
 #: seahub/share/templates/repo/user_share_list.html:42
 #: seahub/templates/pubrepo.html:34
-#: seahub/templates/snippets/my_owned_repos.html:24
-#: seahub/templates/snippets/my_owned_repos.html:66
+#: seahub/templates/snippets/my_owned_repos.html:28
+#: seahub/templates/snippets/my_owned_repos.html:71
+#: seahub/templates/snippets/my_owned_repos.html:118
 #: seahub/templates/snippets/repo_create_form.html:11
 #: seahub/templates/snippets/repo_share_form.html:47
 #: seahub/templates/sysadmin/userinfo.html:51
@@ -564,13 +729,15 @@ msgstr[0] "%(seconds)d 秒前"
 msgid "Read-Write"
 msgstr "可读写"
 
-#: seahub/base/templatetags/seahub_tags.py:300
+#: seahub/base/templatetags/seahub_tags.py:301
 #: seahub/group/templates/group/group_info.html:91
 #: seahub/group/templates/group/group_info_for_pub.html:58
-#: seahub/share/views.py:294 seahub/share/templates/repo/share_admin.html:48
+#: seahub/share/views.py:351
+#: seahub/share/templates/repo/share_out_repos.html:42
 #: seahub/share/templates/repo/user_share_list.html:44
 #: seahub/templates/pubrepo.html:36
-#: seahub/templates/snippets/my_owned_repos.html:68
+#: seahub/templates/snippets/my_owned_repos.html:73
+#: seahub/templates/snippets/my_owned_repos.html:120
 #: seahub/templates/snippets/repo_create_form.html:12
 #: seahub/templates/snippets/repo_share_form.html:48
 msgid "Read-Only"
@@ -613,13 +780,12 @@ msgstr "成功删除 %s "
 #: seahub/contacts/templates/contacts/contact_list.html:4
 #: seahub/contacts/templates/contacts/contact_list.html:16
 #: seahub/templates/myhome_base.html:17
-#: seahub/templates/snippets/repo_share_form.html:9
+#: seahub/templates/snippets/repo_share_form.html:8
 msgid "Contacts"
 msgstr "通讯录"
 
 #: seahub/contacts/templates/contacts/contact_list.html:9
 #: seahub/group/templates/group/groups_left_panel.html:3
-#: seahub/share/templates/repo/share_admin.html:16
 msgid "Tips"
 msgstr "小提示"
 
@@ -645,18 +811,23 @@ msgstr "邮箱"
 #: seahub/group/templates/group/group_wiki.html:45
 #: seahub/group/templates/group/group_wiki.html:79
 #: seahub/group/templates/group/group_wiki_pages.html:51
-#: seahub/share/templates/repo/share_admin.html:29
+#: seahub/share/templates/repo/priv_shared_files.html:29
+#: seahub/share/templates/repo/priv_shared_files.html:57
+#: seahub/share/templates/repo/share_out_repos.html:23
+#: seahub/share/templates/repo/shared_links.html:23
 #: seahub/share/templates/repo/user_share_list.html:33
-#: seahub/templates/pubrepo.html:24 seahub/templates/repo.html:113
-#: seahub/templates/repo.html.py:262
+#: seahub/templates/pubrepo.html:24 seahub/templates/repo.html:114
 #: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
 #: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/snippets/my_owned_repos.html:17
-#: seahub/templates/snippets/my_owned_repos.html:55
+#: seahub/templates/snippets/my_owned_repos.html:20
+#: seahub/templates/snippets/my_owned_repos.html:62
+#: seahub/templates/snippets/my_owned_repos.html:107
 #: seahub/templates/snippets/repo_create_form.html:4
+#: seahub/templates/snippets/repo_dir_data.html:32
 #: seahub/templates/sysadmin/sys_group_admin.html:12
 #: seahub/templates/sysadmin/sys_org_admin.html:11
+#: seahub/templates/sysadmin/sys_publink_admin.html:10
 #: seahub/templates/sysadmin/sys_repo_admin.html:10
 #: seahub/templates/sysadmin/userinfo.html:44
 #: seahub/templates/sysadmin/userinfo.html:69
@@ -678,18 +849,23 @@ msgstr "备注"
 #: seahub/group/templates/group/group_manage.html:83
 #: seahub/notifications/templates/notifications/notification_list.html:7
 #: seahub/notifications/templates/notifications/notification_list.html:20
-#: seahub/share/templates/repo/share_admin.html:33
-#: seahub/share/templates/repo/share_admin.html:87
+#: seahub/share/templates/repo/priv_shared_files.html:32
+#: seahub/share/templates/repo/priv_shared_files.html:60
+#: seahub/share/templates/repo/share_out_repos.html:27
+#: seahub/share/templates/repo/shared_links.html:26
 #: seahub/share/templates/repo/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:30
 #: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:28
-#: seahub/templates/repo.html:116 seahub/templates/repo_recycle_view.html:56
+#: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
 #: seahub/templates/view_shared_dir.html:34
-#: seahub/templates/snippets/my_owned_repos.html:20
-#: seahub/templates/snippets/my_owned_repos.html:59
+#: seahub/templates/snippets/my_owned_repos.html:23
+#: seahub/templates/snippets/my_owned_repos.html:65
+#: seahub/templates/snippets/my_owned_repos.html:111
+#: seahub/templates/snippets/repo_dir_data.html:35
 #: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:15
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 #: seahub/templates/sysadmin/sys_repo_admin.html:14
 #: seahub/templates/sysadmin/sys_useradmin.html:28
 #: seahub/templates/sysadmin/userinfo.html:46
@@ -697,7 +873,7 @@ msgid "Operations"
 msgstr "操作"
 
 #: seahub/contacts/templates/contacts/contact_list.html:34
-#: seahub/share/templates/repo/share_admin.html:43
+#: seahub/share/templates/repo/share_out_repos.html:37
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:8
@@ -710,9 +886,11 @@ msgstr "编辑"
 #: seahub/group/templates/group/group_manage.html:68
 #: seahub/group/templates/group/group_manage.html:92
 #: seahub/notifications/templates/notifications/notification_list.html:32
-#: seahub/templates/repo.html:37 seahub/templates/repo.html.py:147
-#: seahub/templates/repo.html:195 seahub/templates/view_file_base.html:36
-#: seahub/templates/snippets/my_owned_repos.html:35
+#: seahub/templates/snippets/file_share_popup.html:25
+#: seahub/templates/snippets/my_owned_repos.html:39
+#: seahub/templates/snippets/my_owned_repos.html:88
+#: seahub/templates/snippets/repo_dir_data.html:67
+#: seahub/templates/snippets/repo_dir_data.html:113
 #: seahub/templates/sysadmin/sys_group_admin.html:22
 #: seahub/templates/sysadmin/sys_org_admin.html:23
 #: seahub/templates/sysadmin/sys_repo_admin.html:22
@@ -763,24 +941,6 @@ msgstr "备注(可选)"
 msgid "Edit Contact"
 msgstr "编辑联系人"
 
-#: seahub/contacts/templates/contacts/contact_list.html:108
-#: seahub/contacts/templates/contacts/contact_list.html:160
-#: seahub/group/templates/group/msg_js.html:155
-#: seahub/templates/file_edit.html:515 seahub/templates/repo.html:429
-#: seahub/templates/repo.html.py:666 seahub/templates/repo.html:702
-#: seahub/templates/repo.html.py:845 seahub/templates/view_file_base.html:167
-#: seahub/templates/snippets/bottom_bar.html:99
-#: seahub/templates/snippets/events_js.html:55
-#: seahub/templates/snippets/office_convert_js.html:117
-#: seahub/templates/snippets/office_convert_js.html:142
-#: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:40
-#: seahub/templates/snippets/shared_link_js.html:58
-#: seahub/templates/snippets/shared_link_js.html:120
-#: seahub/templates/sysadmin/sys_useradmin.html:159
-msgid "Failed. Please check the network."
-msgstr "操作失败。请检查网络是否已连接。"
-
 #: seahub/contacts/templates/contacts/contact_list.html:116
 msgid "Delete Contact"
 msgstr "删除联系人"
@@ -793,8 +953,8 @@ msgstr "删除联系人"
 #: seahub/templates/sysadmin/sys_repo_admin.html:63
 #: seahub/templates/sysadmin/sys_useradmin.html:96
 #: seahub/templates/sysadmin/userinfo.html:141
-#, python-format
-msgid "Are you sure you want to delete %s ?"
+#, fuzzy, python-format
+msgid "Are you sure you want to delete %%s ?"
 msgstr "确定要删除 %s 吗？"
 
 #: seahub/group/error_msg.py:7
@@ -1000,18 +1160,12 @@ msgstr "发送成功，请等候管理员处理。"
 msgid "Failed to send. You can try it again later."
 msgstr "发送失败, 请稍侯再试。"
 
-#: seahub/group/views.py:1137 seahub/views/__init__.py:366
-#: seahub/views/__init__.py:1709 seahub/views/__init__.py:1838
-#: seahub/views/file.py:263
-msgid "File does not exist"
-msgstr "文件不存在"
-
 #: seahub/group/views.py:1177 seahub/group/views.py:1300
 #: seahub/views/wiki.py:53 seahub/views/wiki.py:158
 msgid "Failed to create wiki page. Please retry later."
 msgstr "创建维基页面失败，请稍后再试"
 
-#: seahub/group/views.py:1213 seahub/views/__init__.py:360
+#: seahub/group/views.py:1213 seahub/views/__init__.py:441
 #: seahub/views/wiki.py:87
 msgid "Internal Server Error"
 msgstr "服务器内部错误"
@@ -1061,13 +1215,6 @@ msgstr "感谢使用！"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s 团队"
 
-#: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:121
-#: seahub/group/templates/group/new_msg_reply.html:45
-#, python-format
-msgid "%(amount)s replies"
-msgstr "%(amount)s 个回复"
-
 #: seahub/group/templates/group/discussion_list.html:18
 #: seahub/group/templates/group/group_discuss.html:122
 #: seahub/group/templates/group/new_msg_reply.html:46
@@ -1099,12 +1246,14 @@ msgstr "输入不能为空且应少于150个字符。"
 #: seahub/group/templates/group/group_info.html:178
 #: seahub/group/templates/group/new_msg_reply.html:66
 #: seahub/message/templates/message/user_msg_list.html:44
-#: seahub/templates/base.html:70 seahub/templates/file_edit.html:98
-#: seahub/templates/file_edit.html:264 seahub/templates/repo.html:231
-#: seahub/templates/repo.html.py:253 seahub/templates/repo.html:274
-#: seahub/templates/repo.html.py:286 seahub/templates/repo.html:312
-#: seahub/templates/repo.html.py:333 seahub/templates/repo.html:345
+#: seahub/templates/base.html:77 seahub/templates/file_edit.html:98
+#: seahub/templates/file_edit.html:264 seahub/templates/repo.html:83
+#: seahub/templates/repo.html.py:105 seahub/templates/repo.html:127
+#: seahub/templates/repo.html.py:137 seahub/templates/repo.html:161
+#: seahub/templates/repo.html.py:178 seahub/templates/repo.html:187
+#: seahub/templates/shared_file_view.html:49
 #: seahub/templates/snippets/events.html:20
+#: seahub/templates/snippets/file_share_popup.html:33
 msgid "Cancel"
 msgstr "取消"
 
@@ -1116,6 +1265,9 @@ msgstr "取消"
 #: seahub/group/templates/group/group_members.html:16
 #: seahub/group/templates/group/group_wiki.html:16
 #: seahub/group/templates/group/group_wiki_pages.html:15
+#: seahub/share/templates/repo/priv_shared_files.html:11
+#: seahub/share/templates/repo/share_out_repos.html:11
+#: seahub/share/templates/repo/shared_links.html:11
 #: seahub/templates/admin_base.html:8 seahub/templates/client_mgmt.html:13
 #: seahub/templates/myhome.html:13 seahub/templates/org_admin_base.html:11
 #: seahub/templates/pubgrp.html:14 seahub/templates/pubrepo.html:15
@@ -1125,16 +1277,6 @@ msgstr "取消"
 msgid "Libraries"
 msgstr "资料库"
 
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_info.html:17
-#: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:15
-#: seahub/group/templates/group/group_members.html:17
-#: seahub/group/templates/group/group_wiki.html:17
-#: seahub/group/templates/group/group_wiki_pages.html:16
-msgid "Discussion"
-msgstr "讨论"
-
 #: seahub/group/templates/group/group_discuss.html:17
 #: seahub/group/templates/group/group_info.html:18
 #: seahub/group/templates/group/group_info_for_pub.html:18
@@ -1185,56 +1327,38 @@ msgid "Add a discussion..."
 msgstr "添加一个讨论..."
 
 #: seahub/group/templates/group/group_discuss.html:71
-#: seahub/message/templates/message/user_msg_list.html:110
+#: seahub/message/templates/message/user_msg_list.html:108
 msgid "After login, you can post discussions and add replies."
 msgstr "登录之后，你就可以发起讨论和回复。"
 
-#: seahub/group/templates/group/group_discuss.html:95
-#: seahub/group/templates/group/group_discuss.html:111
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:591
-#: seahub/templates/repo.html:615 seahub/templates/repo_history_view.html:66
-#: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:57
-#: seahub/templates/snippets/group_recommend_form.html:28
-msgid "File"
-msgstr "文件"
-
-#: seahub/group/templates/group/group_discuss.html:105
-#: seahub/group/templates/group/new_msg_reply.html:29
-#: seahub/templates/pubrepo.html:34 seahub/templates/pubrepo.html.py:36
-#: seahub/templates/repo.html:122 seahub/templates/view_shared_dir.html:39
-#: seahub/templates/snippets/group_recommend_form.html:22
-msgid "Directory icon"
-msgstr "目录图标"
-
 #: seahub/group/templates/group/group_discuss.html:162
-#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/message/templates/message/user_msg_list.html:88
 #: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:52
 #: seahub/templates/repo_view_snapshot.html:50
 #: seahub/templates/view_file_pdf.html:30
 #: seahub/templates/snippets/file_content_js.html:62
 #: seahub/templates/sysadmin/sys_group_admin.html:29
+#: seahub/templates/sysadmin/sys_publink_admin.html:30
 #: seahub/templates/sysadmin/sys_repo_admin.html:29
 #: seahub/templates/sysadmin/sys_useradmin.html:64
 msgid "Previous"
 msgstr "前一页"
 
 #: seahub/group/templates/group/group_discuss.html:172
-#: seahub/message/templates/message/user_msg_list.html:100
+#: seahub/message/templates/message/user_msg_list.html:98
 #: seahub/templates/pubuser.html:48 seahub/templates/repo_history.html:55
 #: seahub/templates/repo_view_snapshot.html:53
 #: seahub/templates/view_file_pdf.html:30
 #: seahub/templates/snippets/file_content_js.html:62
 #: seahub/templates/sysadmin/sys_group_admin.html:32
+#: seahub/templates/sysadmin/sys_publink_admin.html:33
 #: seahub/templates/sysadmin/sys_repo_admin.html:32
 #: seahub/templates/sysadmin/sys_useradmin.html:67
 msgid "Next"
 msgstr "下一页"
 
 #: seahub/group/templates/group/group_discuss.html:178
-#: seahub/message/templates/message/user_msg_list.html:106
+#: seahub/message/templates/message/user_msg_list.html:104
 msgid "↑Top"
 msgstr ""
 
@@ -1243,12 +1367,12 @@ msgid "Really want to delete this discussion?"
 msgstr "确定要删除这条讨论？"
 
 #: seahub/group/templates/group/group_discuss.html:229
-#: seahub/templates/base.html:173
+#: seahub/templates/base.html:180
 msgid "Yes"
 msgstr "确定"
 
 #: seahub/group/templates/group/group_discuss.html:229
-#: seahub/templates/base.html:174
+#: seahub/templates/base.html:181
 msgid "No"
 msgstr "取消"
 
@@ -1293,7 +1417,7 @@ msgstr "最近修改"
 
 #: seahub/group/templates/group/group_info.html:71
 #: seahub/templates/pubrepo.html:13
-#: seahub/templates/snippets/my_owned_repos.html:10
+#: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
 msgstr "新建资料库"
@@ -1302,12 +1426,12 @@ msgstr "新建资料库"
 #: seahub/group/templates/group/group_info.html:128
 #: seahub/group/templates/group/group_info_for_pub.html:46
 #: seahub/group/templates/group/group_wiki.html:47
-#: seahub/share/templates/repo/share_admin.html:32
+#: seahub/share/templates/repo/share_out_repos.html:26
 #: seahub/share/templates/repo/user_share_list.html:34
-#: seahub/templates/pubrepo.html:25 seahub/templates/repo.html:264
+#: seahub/templates/pubrepo.html:25 seahub/templates/repo.html:116
 #: seahub/templates/repo_history.html:23
-#: seahub/templates/snippets/my_owned_repos.html:18
-#: seahub/templates/snippets/my_owned_repos.html:56
+#: seahub/templates/snippets/my_owned_repos.html:21
+#: seahub/templates/snippets/my_owned_repos.html:108
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/sys_repo_admin.html:13
 #: seahub/templates/sysadmin/userinfo.html:45
@@ -1319,16 +1443,18 @@ msgstr "描述"
 #: seahub/group/templates/group/group_info.html:80
 #: seahub/group/templates/group/group_info_for_pub.html:47
 #: seahub/share/templates/repo/user_share_list.html:35
-#: seahub/templates/pubrepo.html:26 seahub/templates/repo.html:115
-#: seahub/templates/snippets/my_owned_repos.html:19
-#: seahub/templates/snippets/my_owned_repos.html:57
-#: seahub/templates/snippets/my_owned_repos.html:102
+#: seahub/templates/pubrepo.html:26
+#: seahub/templates/snippets/my_owned_repos.html:22
+#: seahub/templates/snippets/my_owned_repos.html:64
+#: seahub/templates/snippets/my_owned_repos.html:109
+#: seahub/templates/snippets/my_owned_repos.html:155
+#: seahub/templates/snippets/repo_dir_data.html:34
 msgid "Last Update"
 msgstr "更新时间"
 
 #: seahub/group/templates/group/group_info.html:81
 #: seahub/group/templates/group/group_info_for_pub.html:48
-#: seahub/templates/snippets/my_owned_repos.html:58
+#: seahub/templates/snippets/my_owned_repos.html:110
 msgid "Shared By"
 msgstr "共享来源"
 
@@ -1336,12 +1462,14 @@ msgstr "共享来源"
 #: seahub/group/templates/group/group_info.html:91
 #: seahub/group/templates/group/group_info_for_pub.html:56
 #: seahub/group/templates/group/group_info_for_pub.html:58
-#: seahub/share/templates/repo/share_admin.html:37
+#: seahub/share/templates/repo/share_out_repos.html:31
 #: seahub/share/templates/repo/user_share_list.html:42
 #: seahub/share/templates/repo/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:24
-#: seahub/templates/snippets/my_owned_repos.html:66
-#: seahub/templates/snippets/my_owned_repos.html:68
+#: seahub/templates/snippets/my_owned_repos.html:28
+#: seahub/templates/snippets/my_owned_repos.html:71
+#: seahub/templates/snippets/my_owned_repos.html:73
+#: seahub/templates/snippets/my_owned_repos.html:118
+#: seahub/templates/snippets/my_owned_repos.html:120
 #: seahub/templates/sysadmin/userinfo.html:51
 msgid "directory icon"
 msgstr "目录图标"
@@ -1349,16 +1477,18 @@ msgstr "目录图标"
 #: seahub/group/templates/group/group_info.html:105
 #: seahub/share/templates/repo/user_share_list.html:55
 #: seahub/templates/pubrepo.html:44
-#: seahub/templates/snippets/my_owned_repos.html:33
-#: seahub/templates/snippets/my_owned_repos.html:80
+#: seahub/templates/snippets/my_owned_repos.html:37
+#: seahub/templates/snippets/my_owned_repos.html:84
+#: seahub/templates/snippets/my_owned_repos.html:132
 msgid "Download and Sync"
 msgstr "下载和同步"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/share/templates/repo/share_admin.html:57
-#: seahub/share/templates/repo/share_admin.html:60
-#: seahub/share/templates/repo/share_admin.html:64
-#: seahub/share/templates/repo/share_admin.html:66
+#: seahub/share/templates/repo/share_out_repos.html:51
+#: seahub/share/templates/repo/share_out_repos.html:54
+#: seahub/share/templates/repo/share_out_repos.html:58
+#: seahub/share/templates/repo/share_out_repos.html:60
+#: seahub/share/templates/repo/user_share_list.html:59
 msgid "Unshare"
 msgstr "取消共享"
 
@@ -1384,10 +1514,12 @@ msgstr ""
 
 #: seahub/group/templates/group/group_info.html:127
 #: seahub/group/templates/group/group_info.html:171
-#: seahub/share/templates/repo/share_admin.html:85
+#: seahub/share/templates/repo/priv_shared_files.html:30
+#: seahub/share/templates/repo/priv_shared_files.html:58
+#: seahub/share/templates/repo/shared_links.html:24
 #: seahub/templates/client_mgmt.html:26 seahub/templates/file_edit.html:258
 #: seahub/templates/snippets/events.html:13
-#: seahub/templates/snippets/my_owned_repos.html:101
+#: seahub/templates/snippets/my_owned_repos.html:154
 msgid "Library"
 msgstr "资料库"
 
@@ -1402,9 +1534,9 @@ msgstr "修改者"
 
 #: seahub/group/templates/group/group_info.html:150
 #: seahub/group/templates/group/group_info.html:152
-#: seahub/templates/repo.html:56 seahub/templates/repo.html.py:295
-#: seahub/templates/repo.html:297 seahub/templates/repo.html.py:301
-#: seahub/templates/repo.html:303 seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:40 seahub/templates/repo.html.py:146
+#: seahub/templates/repo.html:148 seahub/templates/repo.html.py:152
+#: seahub/templates/repo.html:154 seahub/templates/repo_history.html:44
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/events_body.html:18
 #: seahub/templates/snippets/events_body.html:20
@@ -1421,7 +1553,7 @@ msgstr "无"
 #: seahub/group/templates/group/group_info.html:164
 #: seahub/templates/client_mgmt.html:39 seahub/templates/client_mgmt.html:46
 #: seahub/templates/client_mgmt.html:53 seahub/templates/client_mgmt.html:56
-#: seahub/templates/file_revisions.html:45 seahub/templates/repo.html:72
+#: seahub/templates/file_revisions.html:45 seahub/templates/repo.html:51
 #: seahub/templates/repo_history.html:38
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
@@ -1455,8 +1587,8 @@ msgid "Unshare Library"
 msgstr "取消共享资料库"
 
 #: seahub/group/templates/group/group_info.html:196
-#, python-format
-msgid "Are you sure you want to unshare %s ?"
+#, fuzzy, python-format
+msgid "Are you sure you want to unshare %%s ?"
 msgstr "确定要取消共享 %s 吗？"
 
 #: seahub/group/templates/group/group_info_for_pub.html:78
@@ -1520,8 +1652,8 @@ msgid "Delete Member"
 msgstr "删除成员"
 
 #: seahub/group/templates/group/group_manage.html:114
-#, python-format
-msgid "Really want to delete %s ?"
+#, fuzzy, python-format
+msgid "Really want to delete %%s ?"
 msgstr "确定要删除 %s 吗？"
 
 #: seahub/group/templates/group/group_members.html:44
@@ -1715,31 +1847,38 @@ msgstr "输入邮箱，多个以,分隔"
 msgid "Group: "
 msgstr "所在群组："
 
-#: seahub/message/models.py:73
+#: seahub/message/models.py:103
 #, python-format
 msgid ""
 "(System) %(user)s have shared a library <a href='%(href)s'>%(repo_name)s</a> "
 "to you."
 msgstr "（系统）%(user)s 共享了资料库<a href='%(href)s'>%(repo_name)s</a>给你"
 
-#: seahub/message/views.py:107 seahub/templates/base.html:309
+#: seahub/message/models.py:117
+#, python-format
+msgid ""
+"(System) %(user)s have shared a file <a href='%(href)s'>%(file_name)s</a> to "
+"you."
+msgstr "（系统）%(user)s 共享了文件<a href='%(href)s'>%(file_name)s</a>给你"
+
+#: seahub/message/views.py:127 seahub/templates/base.html:356
 msgid "message is required"
 msgstr "消息是必填项"
 
-#: seahub/message/views.py:110 seahub/templates/base.html:313
+#: seahub/message/views.py:130 seahub/templates/base.html:360
 msgid "contact is required"
 msgstr "联系人是必填项"
 
-#: seahub/message/views.py:120
+#: seahub/message/views.py:150
 msgid "You can not send message to yourself."
 msgstr "你不能发消息给自己。"
 
-#: seahub/message/views.py:124
+#: seahub/message/views.py:154
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "发送消息失败，%s 未找到。"
 
-#: seahub/message/views.py:131
+#: seahub/message/views.py:169
 msgid "Message sent successfully."
 msgstr "消息发送成功。"
 
@@ -1814,6 +1953,7 @@ msgstr "设为当前通知"
 #: seahub/notifications/templates/notifications/notification_list.html:64
 #: seahub/templates/sysadmin/sys_group_admin.html:55
 #: seahub/templates/sysadmin/sys_org_admin.html:55
+#: seahub/templates/sysadmin/sys_publink_admin.html:56
 #: seahub/templates/sysadmin/sys_repo_admin.html:55
 #: seahub/templates/sysadmin/userinfo.html:61
 #: seahub/templates/sysadmin/userinfo.html:84
@@ -1852,7 +1992,8 @@ msgid "Password:"
 msgstr "密码："
 
 #: seahub/profile/templates/profile/set_profile.html:18
-#: seahub/templates/repo.html:186 seahub/templates/repo.html.py:247
+#: seahub/templates/repo.html:99
+#: seahub/templates/snippets/repo_dir_data.html:104
 msgid "Update"
 msgstr "更新"
 
@@ -1953,82 +2094,123 @@ msgstr "无效的group id"
 msgid "Successfully removed share"
 msgstr "取消共享成功"
 
-#: seahub/share/views.py:286
+#: seahub/share/views.py:343
 msgid "all members"
 msgstr "所有成员"
 
-#: seahub/share/views.py:464 seahub/views/__init__.py:625
-#: seahub/views/__init__.py:1586 seahub/views/__init__.py:1621
-#: seahub/views/__init__.py:2120 seahub/views/file.py:565
+#: seahub/share/views.py:544 seahub/views/__init__.py:642
+#: seahub/views/__init__.py:1414 seahub/views/__init__.py:1449
+#: seahub/views/ajax.py:566 seahub/views/ajax.py:583 seahub/views/file.py:755
 msgid "Invalid arguments"
 msgstr "非法参数"
 
-#: seahub/share/views.py:473
+#: seahub/share/views.py:553
 msgid "You cannot share the library in this way."
 msgstr "不能以这种方式共享一个资料库。"
 
-#: seahub/share/views.py:498
+#: seahub/share/views.py:578
 msgid "Failed to get the link, please retry later."
 msgstr "获取分享链接失败，请稍后重试。"
 
-#: seahub/share/views.py:520
+#: seahub/share/views.py:600
 msgid "Removed successfully"
 msgstr "删除成功"
 
-#: seahub/share/views.py:528
-msgid "Deleted successfully"
-msgstr "删除成功"
+#: seahub/share/views.py:608 seahub/views/ajax.py:249 seahub/views/ajax.py:340
+#: seahub/views/ajax.py:431
+msgid "Argument missing"
+msgstr ""
 
-#: seahub/share/views.py:544
+#: seahub/share/views.py:617
+msgid "The link doesn't exist"
+msgstr "链接不存在"
+
+#: seahub/share/views.py:632
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please "
 "contact administrator."
 msgstr "由于邮箱服务未正确配置，发送共享链接失败，请联系管理员。"
 
-#: seahub/share/views.py:569
+#: seahub/share/views.py:657
 msgid "Your friend shared a file to you on Seafile"
 msgstr "你的朋友在 Seafile 上共享了一个文件给你"
 
-#: seahub/share/views.py:574
+#: seahub/share/views.py:662
 msgid "Internal server error. Send failed."
 msgstr "服务器内部错误，发送失败。"
 
-#: seahub/share/views.py:577
+#: seahub/share/views.py:665
 msgid "Successfully sent."
 msgstr "发送成功"
 
-#: seahub/share/templates/repo/share_admin.html:5
-#: seahub/templates/org_base.html:18 seahub/templates/repo.html:141
-#: seahub/templates/repo.html.py:188 seahub/templates/repo.html:349
-#: seahub/templates/snippets/my_owned_repos.html:34
+#: seahub/share/views.py:695 seahub/views/file.py:1127
+msgid "Successfully saved."
+msgstr "保存成功。"
+
+#: seahub/share/templates/repo/priv_shared_files.html:5
+#: seahub/share/templates/repo/share_out_repos.html:5
+#: seahub/share/templates/repo/shared_links.html:5
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/snippets/my_owned_repos.html:38
+#: seahub/templates/snippets/my_owned_repos.html:86
+#: seahub/templates/snippets/repo_dir_data.html:22
+#: seahub/templates/snippets/repo_dir_data.html:58
+#: seahub/templates/snippets/repo_dir_data.html:106
 msgid "Share"
 msgstr "共享"
 
-#: seahub/share/templates/repo/share_admin.html:18
-msgid ""
-"If you don't want others to change the contents of your shared libraries, "
-"you can set the share permission to \"read-only\" when sharing them."
+#: seahub/share/templates/repo/priv_shared_files.html:12
+#: seahub/share/templates/repo/share_out_repos.html:12
+#: seahub/share/templates/repo/shared_links.html:12
+#: seahub/templates/admin_base.html:20
+msgid "Links"
+msgstr "链接"
+
+#: seahub/share/templates/repo/priv_shared_files.html:13
+#: seahub/share/templates/repo/share_out_repos.html:13
+#: seahub/share/templates/repo/shared_links.html:13
+msgid "Private Shares"
+msgstr "私人共享"
+
+#: seahub/share/templates/repo/priv_shared_files.html:22
+msgid "From Others"
 msgstr ""
-"如果你不希望别人修改你共享给他们的资料库，你可以在共享的时候把权限设置成“只"
-"读”。"
 
-#: seahub/share/templates/repo/share_admin.html:24
-msgid "Shared Libraries"
-msgstr "我共享的资料库"
+#: seahub/share/templates/repo/priv_shared_files.html:23
+msgid "To Others"
+msgstr ""
 
-#: seahub/share/templates/repo/share_admin.html:30
+#: seahub/share/templates/repo/priv_shared_files.html:31
+msgid "From"
+msgstr ""
+
+#: seahub/share/templates/repo/priv_shared_files.html:59
+msgid "To"
+msgstr ""
+
+#: seahub/share/templates/repo/priv_shared_files.html:83
+msgid "You don't have any private shared files"
+msgstr "你还没有私人共享的文件"
+
+#: seahub/share/templates/repo/priv_shared_files.html:84
+msgid ""
+"You can share a single file with a registered user if you don't want to "
+"share a whole library."
+msgstr "如果你不想共享整个资料库，你可以共享单个文件给已注册的用户。"
+
+#: seahub/share/templates/repo/share_out_repos.html:24
 msgid "Share To"
 msgstr "共享给"
 
-#: seahub/share/templates/repo/share_admin.html:31
+#: seahub/share/templates/repo/share_out_repos.html:25
 msgid "Permission"
 msgstr "读写权限"
 
-#: seahub/share/templates/repo/share_admin.html:75
+#: seahub/share/templates/repo/share_out_repos.html:69
 msgid "You have not shared any library"
 msgstr "你还没有共享任何资料库"
 
-#: seahub/share/templates/repo/share_admin.html:76
+#: seahub/share/templates/repo/share_out_repos.html:70
 msgid ""
 "You can share libraries to your friends and colleagues by clicking the share "
 "icon of your own libraries in your home page or creating a new library in "
@@ -2037,53 +2219,46 @@ msgstr ""
 "你可以通过在你的个人页面点击你自己的资料库的共享图标, 或是在你所在的小组里创"
 "建一个新的资料库来将你的资料库共享给你的朋友和同事。"
 
-#: seahub/share/templates/repo/share_admin.html:80
-msgid "Shared Links"
-msgstr "我的共享外链"
+#: seahub/share/templates/repo/share_out_repos.html:114
+msgid "Edit succeeded"
+msgstr "权限修改成功"
 
-#: seahub/share/templates/repo/share_admin.html:84
-msgid "File or Folder"
-msgstr "文件或文件夹"
+#: seahub/share/templates/repo/share_out_repos.html:121
+msgid "Edit failed."
+msgstr "权限修改失败"
 
-#: seahub/share/templates/repo/share_admin.html:86
+#: seahub/share/templates/repo/shared_links.html:25
 msgid "Visits"
 msgstr "访问次数"
 
-#: seahub/share/templates/repo/share_admin.html:99
+#: seahub/share/templates/repo/shared_links.html:40
 #: seahub/templates/file_revisions.html:53
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "查看"
 
-#: seahub/share/templates/repo/share_admin.html:100
+#: seahub/share/templates/repo/shared_links.html:41
+#: seahub/templates/sysadmin/sys_publink_admin.html:22
 msgid "Remove"
 msgstr "删除"
 
-#: seahub/share/templates/repo/share_admin.html:108
+#: seahub/share/templates/repo/shared_links.html:49
 msgid "You don't have any shared link"
 msgstr "你还没有外链"
 
-#: seahub/share/templates/repo/share_admin.html:109
+#: seahub/share/templates/repo/shared_links.html:50
 msgid ""
 "You can share a folder or a file when you view a library, or share a file "
 "when you view it."
 msgstr ""
 "你可以在查看一个资料库时共享里面的文件和目录，或者查看文件时共享这个文件。"
 
-#: seahub/share/templates/repo/share_admin.html:152
-msgid "Edit succeeded"
-msgstr "权限修改成功"
-
-#: seahub/share/templates/repo/share_admin.html:159
-msgid "Edit failed."
-msgstr "权限修改失败"
-
-#: seahub/share/templates/repo/user_share_list.html:56
-#: seahub/templates/snippets/my_owned_repos.html:82
+#: seahub/share/templates/repo/user_share_list.html:57
+#: seahub/templates/snippets/my_owned_repos.html:134
 msgid "Leave Share"
 msgstr "退出共享"
 
-#: seahub/share/templates/repo/user_share_list.html:63
+#: seahub/share/templates/repo/user_share_list.html:67
 #, python-format
 msgid "You have no library sharing with %(to_email)s."
 msgstr "你和 %(to_email)s 之间没有共享的资料库。"
@@ -2101,10 +2276,6 @@ msgstr "成员"
 msgid "Notifications"
 msgstr "通知"
 
-#: seahub/templates/base.html:9
-msgid "File Collaboration Team Organization"
-msgstr "文件 合作 团队 团体"
-
 #: seahub/templates/base.html:38
 msgid "System Admin"
 msgstr "系统管理"
@@ -2121,155 +2292,163 @@ msgstr "发送消息"
 msgid "unread messages"
 msgstr "未读消息"
 
-#: seahub/templates/base.html:48
-msgid "Log out"
-msgstr "退出"
-
-#: seahub/templates/base.html:50 seahub/templates/registration/login.html:3
+#: seahub/templates/base.html:49 seahub/templates/registration/login.html:3
 #: seahub/templates/registration/login.html:6
 #: seahub/templates/registration/password_reset_complete.html:8
 msgid "Log In"
 msgstr "登录"
 
-#: seahub/templates/base.html:52
+#: seahub/templates/base.html:51
 #: seahub/templates/registration/registration_form.html:9
 msgid "Signup"
 msgstr "注册"
 
-#: seahub/templates/base.html:66
+#: seahub/templates/base.html:61
+msgid "Log out"
+msgstr "退出"
+
+#: seahub/templates/base.html:68
 msgid "message..."
 msgstr "消息..."
 
-#: seahub/templates/base.html:89
+#: seahub/templates/base.html:71 seahub/templates/repo.html:72
+msgid "Add files"
+msgstr "添加文件"
+
+#: seahub/templates/base.html:96
 msgid "Search files in this wiki"
 msgstr "在当前维基搜索文件"
 
-#: seahub/templates/base.html:89
+#: seahub/templates/base.html:96
 msgid "Search files in this library"
 msgstr "在当前资料库搜索文件"
 
-#: seahub/templates/base.html:92 seahub/templates/base.html.py:98
+#: seahub/templates/base.html:99 seahub/templates/base.html.py:105
 msgid "Search Files"
 msgstr "搜索文件"
 
-#: seahub/templates/base.html:94
+#: seahub/templates/base.html:101
 msgid "advanced"
 msgstr "高级"
 
-#: seahub/templates/base.html:102 seahub/templates/base.html.py:106
-#: seahub/templates/base.html:109
+#: seahub/templates/base.html:109 seahub/templates/base.html.py:113
+#: seahub/templates/base.html:116
 msgid "In all libraries"
 msgstr "在所有资料库"
 
-#: seahub/templates/base.html:103
+#: seahub/templates/base.html:110
 msgid "In this wiki"
 msgstr "在当前维基"
 
-#: seahub/templates/base.html:103
+#: seahub/templates/base.html:110
 msgid "In this library"
 msgstr "在当前资料库"
 
-#: seahub/templates/base.html:107
+#: seahub/templates/base.html:114
 #, python-format
 msgid "in %(name)s"
 msgstr "在 %(name)s"
 
-#: seahub/templates/base.html:115 seahub/templates/base.html.py:118
+#: seahub/templates/base.html:122 seahub/templates/base.html.py:125
 msgid "All file types"
 msgstr "所有文件类型"
 
-#: seahub/templates/base.html:116 seahub/templates/base.html.py:119
+#: seahub/templates/base.html:123 seahub/templates/base.html.py:126
 msgid "Custom file types"
 msgstr "自定义文件类型"
 
-#: seahub/templates/base.html:128
+#: seahub/templates/base.html:135
 msgid "Text files"
 msgstr "文本文件"
 
-#: seahub/templates/base.html:129 seahub/templates/base.html.py:195
+#: seahub/templates/base.html:136 seahub/templates/base.html.py:202
 msgid "Documents"
 msgstr "文档"
 
-#: seahub/templates/base.html:130
+#: seahub/templates/base.html:137
 msgid "Images"
 msgstr "图片"
 
-#: seahub/templates/base.html:131
+#: seahub/templates/base.html:138
 msgid "Video"
 msgstr "视频"
 
-#: seahub/templates/base.html:132
+#: seahub/templates/base.html:139
 msgid "Audio"
 msgstr "音频"
 
-#: seahub/templates/base.html:133
+#: seahub/templates/base.html:140
 msgid "svg"
 msgstr ""
 
-#: seahub/templates/base.html:134
+#: seahub/templates/base.html:141
 msgid "pdf"
 msgstr ""
 
-#: seahub/templates/base.html:135
+#: seahub/templates/base.html:142
 msgid "seaf"
 msgstr ""
 
-#: seahub/templates/base.html:136
+#: seahub/templates/base.html:143
 msgid "markdown"
 msgstr ""
 
-#: seahub/templates/base.html:138
+#: seahub/templates/base.html:145
 msgid "Input file extensions here, separate with ','"
 msgstr "输入文件后缀，以','分隔"
 
-#: seahub/templates/base.html:139
+#: seahub/templates/base.html:146
 msgid "Please select at least 1 file type or input at least 1 file extension"
 msgstr "请至少选择一种文件类型或一种文件后缀"
 
-#: seahub/templates/base.html:183
+#: seahub/templates/base.html:190
 msgid "Introduction"
 msgstr "介绍"
 
-#: seahub/templates/base.html:185
+#: seahub/templates/base.html:192
 msgid "Forum"
 msgstr "论坛"
 
-#: seahub/templates/base.html:189
+#: seahub/templates/base.html:196
 msgid "Client"
 msgstr "客户端"
 
-#: seahub/templates/base.html:191
+#: seahub/templates/base.html:198
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Windows, Mac and Linux"
 
-#: seahub/templates/base.html:197
+#: seahub/templates/base.html:204
 msgid "Help"
 msgstr "使用帮助"
 
-#: seahub/templates/base.html:202
+#: seahub/templates/base.html:209
 msgid "Server Version: "
 msgstr "服务器版本："
 
-#: seahub/templates/base.html:203
+#: seahub/templates/base.html:210
 msgid "Seafile"
 msgstr "海文互知"
 
-#: seahub/templates/base.html:204
+#: seahub/templates/base.html:211
 msgid "Contact Us"
 msgstr "联系我们"
 
-#: seahub/templates/base.html:278
+#: seahub/templates/base.html:291
 msgid "send to: click to select contacts"
 msgstr "发送给：点击选择联系人"
 
-#: seahub/templates/base.html:281
+#: seahub/templates/base.html:297
 msgid "please add contacts at first"
 msgstr "请先添加联系人"
 
-#: seahub/templates/base.html:285
+#: seahub/templates/base.html:301
 msgid "Failed to get your contacts for sending a message."
 msgstr "获取联系人失败，无法发送消息。"
 
+#: seahub/templates/base.html:333
+msgid "You don't have any library at present"
+msgstr "你目前还没有资料库"
+
 #: seahub/templates/client_mgmt.html:6 seahub/templates/client_mgmt.html:15
 #: seahub/templates/myhome.html:15 seahub/templates/wiki/personal_wiki.html:15
 msgid "Clients"
@@ -2308,18 +2487,20 @@ msgid ""
 "The libraries synced to desktop clients are listed in this page. You can see "
 "the client's name and its IP address. You may unsync a client from a library "
 "if you no longer want to sync it."
-msgstr "这里会列出所有通过桌面客户端同步的资料库。你可以查看客户端的名称和IP地址。你也可以断开一个资料库所连接的客户端。"
+msgstr ""
+"这里会列出所有通过桌面客户端同步的资料库。你可以查看客户端的名称和IP地址。你"
+"也可以断开一个资料库所连接的客户端。"
 
 #: seahub/templates/client_mgmt.html:72
 msgid "Unsync Client"
 msgstr "取消同步"
 
 #: seahub/templates/client_mgmt.html:73
-#, python-format
-msgid "Are you sure to unsync client %s ?"
+#, fuzzy, python-format
+msgid "Are you sure to unsync client %%s ?"
 msgstr "确定要取消同步 %s 吗？"
 
-#: seahub/templates/decrypt_repo_form.html:9
+#: seahub/templates/decrypt_repo_form.html:8
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept on the server for only 1 hour."
@@ -2327,15 +2508,16 @@ msgstr ""
 "该资料库已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂"
 "存1小时。"
 
-#: seahub/templates/decrypt_repo_form.html:11
+#: seahub/templates/decrypt_repo_form.html:10
 msgid "Password: "
 msgstr "密码："
 
-#: seahub/templates/file_edit.html:83 seahub/templates/repo.html:89
+#: seahub/templates/file_edit.html:83
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
-#: seahub/templates/shared_file_view.html:18
+#: seahub/templates/shared_file_view.html:17
 #: seahub/templates/view_shared_dir.html:16
+#: seahub/templates/snippets/repo_dir_data.html:4
 msgid "Current path: "
 msgstr "当前路径："
 
@@ -2637,10 +2819,10 @@ msgstr "密码为必填项"
 msgid "Password should be 3 to 30 characters."
 msgstr "密码为3到30个字符"
 
-#: seahub/templates/file_revisions.html:5 seahub/templates/repo.html:59
-#: seahub/templates/repo.html.py:199 seahub/templates/repo.html:266
-#: seahub/templates/repo_history.html:5
-#: seahub/templates/view_file_base.html:69
+#: seahub/templates/file_revisions.html:5 seahub/templates/repo.html:55
+#: seahub/templates/repo.html.py:120 seahub/templates/repo_history.html:5
+#: seahub/templates/view_file_base.html:66
+#: seahub/templates/snippets/repo_dir_data.html:117
 msgid "History"
 msgstr "历史"
 
@@ -2664,10 +2846,11 @@ msgstr "当前路径："
 msgid "Last Modifier"
 msgstr "最后修改者"
 
-#: seahub/templates/file_revisions.html:27 seahub/templates/repo.html:114
+#: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
 #: seahub/templates/view_shared_dir.html:33
+#: seahub/templates/snippets/repo_dir_data.html:33
 msgid "Size"
 msgstr "大小"
 
@@ -2683,13 +2866,14 @@ msgid "Restore"
 msgstr "还原"
 
 #: seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:24
-#: seahub/templates/repo.html.py:139 seahub/templates/repo.html:184
-#: seahub/templates/shared_file_view.html:31
-#: seahub/templates/view_file_base.html:81
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:18
+#: seahub/templates/shared_file_view.html:33
+#: seahub/templates/view_file_base.html:78
 #: seahub/templates/view_history_file.html:34
 #: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/view_shared_dir.html:66
+#: seahub/templates/snippets/repo_dir_data.html:56
+#: seahub/templates/snippets/repo_dir_data.html:102
 msgid "Download"
 msgstr "下载"
 
@@ -2855,248 +3039,246 @@ msgstr ""
 "你可以点击“新建资料库”按钮创建一个公开的资料库，网站内的其他人都可以查看下载"
 "这个资料库。"
 
-#: seahub/templates/repo.html:13
-msgid ""
-"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>体验更多功能。"
-
-#: seahub/templates/repo.html:27
+#: seahub/templates/repo.html:20
 msgid "Settings"
 msgstr "设置"
 
-#: seahub/templates/repo.html:30
+#: seahub/templates/repo.html:23
 msgid "Trash"
 msgstr "回收站"
 
-#: seahub/templates/repo.html:35 seahub/templates/view_file_base.html:34
-msgid "Share link"
-msgstr "获取共享链接"
-
-#: seahub/templates/repo.html:36 seahub/templates/repo.html.py:351
-#: seahub/templates/view_file_base.html:35
-msgid "Send"
-msgstr "发送"
-
-#: seahub/templates/repo.html:43
+#: seahub/templates/repo.html:29
 msgid ""
 "This library is read-only, you can not modify the contents of this library."
 msgstr "这个资料库设置了只读共享，你无法修改此资料库的内容。"
 
-#: seahub/templates/repo.html:49
+#: seahub/templates/repo.html:34
 msgid "Size: "
 msgstr "大小："
 
-#: seahub/templates/repo.html:69
+#: seahub/templates/repo.html:48
 msgid "Generated by system"
 msgstr "系统自动生成"
 
-#: seahub/templates/repo.html:84
-msgid "You can't access this library."
-msgstr "无法在线查看该资料库。"
-
-#: seahub/templates/repo.html:100 seahub/templates/view_shared_dir.html:26
-msgid "ZIP"
-msgstr ""
-
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:226
-msgid "Upload"
-msgstr "上传"
-
-#: seahub/templates/repo.html:104 seahub/templates/repo.html.py:279
-msgid "New Directory"
-msgstr "新建目录"
-
-#: seahub/templates/repo.html:105 seahub/templates/repo.html.py:290
-msgid "New File"
-msgstr "新建文件"
-
-#: seahub/templates/repo.html:132 seahub/templates/repo.html.py:178
-msgid "Fetch failed"
-msgstr "获取失败"
-
-#: seahub/templates/repo.html:145
-msgid "More operations"
-msgstr "更多操作"
-
-#: seahub/templates/repo.html:148 seahub/templates/repo.html.py:196
-msgid "Rename"
-msgstr "重命名"
-
-#: seahub/templates/repo.html:149 seahub/templates/repo.html.py:197
-msgid "Move"
-msgstr "移动"
-
-#: seahub/templates/repo.html:150 seahub/templates/repo.html.py:198
-msgid "Copy"
-msgstr "复制"
-
-#: seahub/templates/repo.html:163 seahub/templates/repo.html.py:658
-msgid "starred"
-msgstr "已加星标"
-
-#: seahub/templates/repo.html:165 seahub/templates/repo.html.py:656
-msgid "unstarred"
-msgstr "未加星标"
-
-#: seahub/templates/repo.html:193
-msgid "More Operations"
-msgstr "更多操作"
-
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:65
 msgid "Upload Files"
 msgstr "上传文件"
 
-#: seahub/templates/repo.html:215 seahub/templates/repo.html.py:240
+#: seahub/templates/repo.html:67 seahub/templates/repo.html.py:92
 msgid "The owner of this library has ran out of space."
 msgstr "该资料库拥有者的空间已用完。"
 
-#: seahub/templates/repo.html:220
-msgid "Add files"
-msgstr "添加文件"
-
-#: seahub/templates/repo.html:221
+#: seahub/templates/repo.html:73
 msgid "smaller than"
 msgstr "文件总大小小于"
 
-#: seahub/templates/repo.html:229 seahub/templates/repo.html.py:251
+#: seahub/templates/repo.html:78
+#: seahub/templates/snippets/repo_dir_data.html:15
+msgid "Upload"
+msgstr "上传"
+
+#: seahub/templates/repo.html:81 seahub/templates/repo.html.py:103
 msgid "Uploaded:"
 msgstr "上传进度："
 
-#: seahub/templates/repo.html:229
+#: seahub/templates/repo.html:81
 msgid "Fetching ..."
 msgstr "获取中...请稍侯"
 
-#: seahub/templates/repo.html:238
+#: seahub/templates/repo.html:90
 msgid "Update File"
 msgstr "更新文件 "
 
-#: seahub/templates/repo.html:245
+#: seahub/templates/repo.html:97
 msgid "Smaller than"
 msgstr "文件总大小小于"
 
-#: seahub/templates/repo.html:251
+#: seahub/templates/repo.html:103
 msgid "Fetching..."
 msgstr "获取中...请稍侯"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:113
 msgid "Library Settings"
 msgstr "资料库设置"
 
-#: seahub/templates/repo.html:268
+#: seahub/templates/repo.html:121
 msgid "Keep full history"
 msgstr "保留所有历史"
 
-#: seahub/templates/repo.html:269
+#: seahub/templates/repo.html:122
 msgid "Don't keep history"
 msgstr "不保留历史"
 
-#: seahub/templates/repo.html:270
+#: seahub/templates/repo.html:123
 msgid "Only keep a period of history:"
 msgstr "仅保留一段时间的历史:"
 
-#: seahub/templates/repo.html:271
+#: seahub/templates/repo.html:123
 msgid "days"
 msgstr "天"
 
-#: seahub/templates/repo.html:280
+#: seahub/templates/repo.html:132
+#: seahub/templates/snippets/repo_dir_data.html:16
+msgid "New Directory"
+msgstr "新建目录"
+
+#: seahub/templates/repo.html:133
 msgid "Directory Name"
 msgstr "目录名"
 
-#: seahub/templates/repo.html:292
+#: seahub/templates/repo.html:141
+#: seahub/templates/snippets/repo_dir_data.html:17
+msgid "New File"
+msgstr "新建文件"
+
+#: seahub/templates/repo.html:143
 msgid "Featured File Type"
 msgstr "特色文件类型"
 
-#: seahub/templates/repo.html:293 seahub/templates/repo.html.py:299
+#: seahub/templates/repo.html:144 seahub/templates/repo.html.py:150
 msgid "Click to choose"
 msgstr "点击选择"
 
-#: seahub/templates/repo.html:293
+#: seahub/templates/repo.html:144
 msgid "online Rich Text format."
 msgstr "在线富文本格式"
 
-#: seahub/templates/repo.html:299
+#: seahub/templates/repo.html:150
 msgid "simple markup format."
 msgstr "简单的标记格式"
 
-#: seahub/templates/repo.html:306
-#: seahub/templates/snippets/my_owned_repos.html:100
+#: seahub/templates/repo.html:157
+#: seahub/templates/snippets/my_owned_repos.html:153
 msgid "File Name"
 msgstr "文件名称"
 
-#: seahub/templates/repo.html:319
+#: seahub/templates/repo.html:166
 msgid "Current Library"
 msgstr "当前资料库"
 
-#: seahub/templates/repo.html:321
+#: seahub/templates/repo.html:168
 msgid "Other Libraries"
 msgstr "其他资料库"
 
-#: seahub/templates/repo.html:331
+#: seahub/templates/repo.html:176 seahub/templates/shared_file_view.html:47
 msgid "Please click and choose a directory."
 msgstr "请点击选择目标目录。"
 
-#: seahub/templates/repo.html:337
-msgid "Rename <span id=\"rename-type\"></span>"
-msgstr "重命名<span id=\"rename-type\"></span>"
+#: seahub/templates/repo.html:182
+#, fuzzy, python-format
+msgid "Rename %%(name)s as:"
+msgstr "在 %(name)s"
 
-#: seahub/templates/repo.html:338
-msgid "Rename <span id=\"rename-obj\" class=\"op-target\"></span> as: "
-msgstr "将 <span id=\"rename-obj\" class=\"op-target\"></span> 重命名为："
-
-#: seahub/templates/repo.html:350
-msgid "Link: "
-msgstr "链接："
-
-#: seahub/templates/repo.html:353 seahub/templates/view_file_base.html:97
-msgid "Send to:"
-msgstr "发送到："
-
-#: seahub/templates/repo.html:354 seahub/templates/view_file_base.html:98
-msgid "Emails, Seperated by ','"
-msgstr "输入邮箱，多个以,分隔"
-
-#: seahub/templates/repo.html:358 seahub/templates/view_file_base.html:102
-msgid "Sending..."
-msgstr "发送中..."
-
-#: seahub/templates/repo.html:447
+#: seahub/templates/repo.html:290
 msgid "Click to remove"
 msgstr "点击删除"
 
-#: seahub/templates/repo.html:448
+#: seahub/templates/repo.html:291
 msgid "This file has already been selected:\\n$file!"
 msgstr "这个文件已经被添加：\\n$file!"
 
-#: seahub/templates/repo.html:591 seahub/templates/repo.html.py:618
-#: seahub/templates/repo_history_view.html:58
-#: seahub/templates/repo_recycle_view.html:61
-msgid "Directory"
-msgstr "目录"
+#: seahub/templates/repo.html:544
+#, fuzzy, python-format
+msgid "Successfully deleted %%(name)s"
+msgstr "%s 删除成功。"
 
-#: seahub/templates/repo.html:608
-msgid "Copy "
+#: seahub/templates/repo.html:571
+msgid "Rename File"
+msgstr "重命名文件"
+
+#: seahub/templates/repo.html:573
+#, fuzzy
+msgid "Rename Directory"
+msgstr "重命名了目录"
+
+#: seahub/templates/repo.html:591
+#, fuzzy
+msgid "Copy File"
 msgstr "复制"
 
-#: seahub/templates/repo.html:611
-msgid "Move "
+#: seahub/templates/repo.html:593
+#, fuzzy
+msgid "Move File"
 msgstr "移动"
 
-#: seahub/templates/repo.html:624
-msgid "to:"
-msgstr "到："
+#: seahub/templates/repo.html:595
+#, fuzzy
+msgid "Copy Directory"
+msgstr "目录"
 
-#: seahub/templates/repo.html:799 seahub/templates/repo.html.py:811
-#: seahub/templates/repo.html:819
-msgid "It can't be blank."
-msgstr "输入不能为空。"
+#: seahub/templates/repo.html:597
+#, fuzzy
+msgid "Move Directory"
+msgstr "移动了目录"
 
-#: seahub/templates/repo.html:803
+#: seahub/templates/repo.html:602
+#, fuzzy, python-format
+msgid "Copy %%(name)s to:"
+msgstr "在 %(name)s"
+
+#: seahub/templates/repo.html:605
+#, fuzzy, python-format
+msgid "Move %%(name)s to:"
+msgstr "在 %(name)s"
+
+#: seahub/templates/repo.html:655 seahub/templates/repo.html.py:800
+#: seahub/templates/snippets/repo_dir_data.html:83
+msgid "unstarred"
+msgstr "未加星标"
+
+#: seahub/templates/repo.html:657
+#: seahub/templates/snippets/repo_dir_data.html:81
+msgid "starred"
+msgstr "已加星标"
+
+#: seahub/templates/repo.html:696
+#, fuzzy
+msgid "Creating sub-library..."
+msgstr "创建了资料库"
+
+#: seahub/templates/repo.html:711
+#, fuzzy, python-format
+msgid "Created sub-library %%(name)s"
+msgstr "删除了资料库 %(library_name)s"
+
+#: seahub/templates/repo.html:743 seahub/templates/repo.html.py:775
+#, fuzzy
+msgid "It is required."
+msgstr "邮箱为必填项。"
+
+#: seahub/templates/repo.html:750
 msgid "Only an extension there, please input a name."
 msgstr "请输入完整的文件名。"
 
+#: seahub/templates/repo.html:779
+#, fuzzy
+msgid "You have not renamed it."
+msgstr "你还未下载"
+
+#: seahub/templates/repo.html:794
+#, fuzzy
+msgid "just now"
+msgstr "刚才"
+
+#: seahub/templates/repo.html:808
+#, fuzzy, python-format
+msgid "Successfully renamed %%(old_name)s to %%(new_name)s"
+msgstr "%(old)s 已重命名为 %(new)s"
+
+#: seahub/templates/repo.html:824
+#, fuzzy
+msgid "Invalid destination path"
+msgstr "服务器设置错误"
+
+#: seahub/templates/repo.html:900
+#, fuzzy
+msgid "Contacts is required."
+msgstr "联系人是必填项"
+
+#: seahub/templates/repo_access_deny.html:8
+msgid "You can't access this library."
+msgstr "无法在线查看该资料库。"
+
 #: seahub/templates/repo_history.html:9
 msgid "modification history"
 msgstr "修改历史"
@@ -3112,8 +3294,9 @@ msgid "View Snapshot"
 msgstr "查看镜像"
 
 #: seahub/templates/repo_history.html:60
-#: seahub/templates/repo_view_snapshot.html:55
+#: seahub/templates/repo_view_snapshot.html:58
 #: seahub/templates/sysadmin/sys_group_admin.html:37
+#: seahub/templates/sysadmin/sys_publink_admin.html:38
 #: seahub/templates/sysadmin/sys_repo_admin.html:37
 #: seahub/templates/sysadmin/sys_useradmin.html:72
 msgid "Per page: "
@@ -3131,6 +3314,11 @@ msgstr "返回镜像列表"
 msgid "Can't view this library"
 msgstr "无法在线查看该资料库。"
 
+#: seahub/templates/repo_history_view.html:58
+#: seahub/templates/repo_recycle_view.html:61
+msgid "Directory"
+msgstr "目录"
+
 #: seahub/templates/repo_recycle_view.html:32
 #: seahub/templates/repo_recycle_view.html:34
 msgid "a week"
@@ -3164,11 +3352,11 @@ msgstr "生成时间"
 msgid "Detail"
 msgstr "修改内容"
 
-#: seahub/templates/repo_view_snapshot.html:83
+#: seahub/templates/repo_view_snapshot.html:86
 msgid "Restore Library"
 msgstr "还原资料库"
 
-#: seahub/templates/repo_view_snapshot.html:84
+#: seahub/templates/repo_view_snapshot.html:87
 msgid "Are you sure you want to restore this library?"
 msgstr "确定要还原该资料库？"
 
@@ -3192,11 +3380,19 @@ msgstr "你的 Seafile 客户端版本太旧，请升级到最新版本。"
 msgid "Click to download."
 msgstr "点此下载"
 
-#: seahub/templates/shared_file_view.html:27
+#: seahub/templates/shared_file_view.html:26
 #: seahub/templates/view_shared_dir.html:9
 msgid "Shared by: "
 msgstr "共享来源："
 
+#: seahub/templates/shared_file_view.html:31
+msgid "Save to..."
+msgstr "保存到..."
+
+#: seahub/templates/shared_file_view.html:40
+msgid "Save To:"
+msgstr "保存到："
+
 #: seahub/templates/shared_link_email.html:2
 #, python-format
 msgid ""
@@ -3245,84 +3441,80 @@ msgstr "到"
 msgid "Sorry, this user is not registered yet."
 msgstr "抱歉，该用户还未注册。"
 
-#: seahub/templates/view_file_base.html:39
-#: seahub/templates/view_file_base.html:158
+#: seahub/templates/view_file_base.html:36
+#: seahub/templates/view_file_base.html:157
 msgid "Unstar"
 msgstr "取消星标"
 
-#: seahub/templates/view_file_base.html:41
-#: seahub/templates/view_file_base.html:155
+#: seahub/templates/view_file_base.html:38
+#: seahub/templates/view_file_base.html:153
 msgid "Star"
 msgstr "添加星标"
 
-#: seahub/templates/view_file_base.html:58
+#: seahub/templates/view_file_base.html:55
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "更新了该文件"
 
-#: seahub/templates/view_file_base.html:62
+#: seahub/templates/view_file_base.html:59
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] " %(counter)s 个贡献者 "
 
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:71
 msgid "Open local file"
 msgstr "打开本地文件"
 
-#: seahub/templates/view_file_base.html:96
-msgid "Send Link"
-msgstr "发送链接"
-
-#: seahub/templates/view_file_base.html:106
+#: seahub/templates/view_file_base.html:93
 msgid "Processing..."
 msgstr "处理中..."
 
-#: seahub/templates/view_file_base.html:109
+#: seahub/templates/view_file_base.html:96
 msgid "You have not downloaded "
 msgstr "你还未下载"
 
-#: seahub/templates/view_file_base.html:109
+#: seahub/templates/view_file_base.html:96
 msgid "."
 msgstr "。"
 
-#: seahub/templates/view_file_base.html:110
+#: seahub/templates/view_file_base.html:97
 msgid "Click to download"
 msgstr "点此下载"
 
-#: seahub/templates/view_file_base.html:154
+#: seahub/templates/view_file_base.html:151
 msgid "Unstarred successfully"
 msgstr "星标取消成功"
 
-#: seahub/templates/view_file_base.html:157
+#: seahub/templates/view_file_base.html:155
 msgid "Starred successfully"
 msgstr "星标添加成功"
 
-#: seahub/templates/view_file_base.html:197
+#: seahub/templates/view_file_base.html:196
 msgid ""
 "Failed to find an application to open the file. Seafile will open the folder."
 msgstr "找不到打开该类型文件的程序。Seafile 将为你打开该文件所在目录"
 
-#: seahub/templates/view_file_base.html:201
+#: seahub/templates/view_file_base.html:200
 msgid "The file is not synchronized, you can synchronize it manually."
 msgstr "本地文件尚未与服务器同步。请打开本地目录的自动同步，或者手动进行同步"
 
-#: seahub/templates/view_file_base.html:203
+#: seahub/templates/view_file_base.html:202
 msgid "The file is not synchronized, please retry later."
 msgstr "本地文件尚未与服务器同步，请稍后再试"
 
-#: seahub/templates/view_file_base.html:207
+#: seahub/templates/view_file_base.html:206
 msgid "An error occurred when open the local file."
 msgstr "打开本地文件时出错"
 
-#: seahub/templates/view_file_base.html:235
+#: seahub/templates/view_file_base.html:234
 msgid ""
 "You are running an old version of Seafile client, please <a target=\"_blank"
 "\">upgrade</a> it."
 msgstr "您的 Seafile 客户端版本太低， 请先 <a target=\"_blank\">升级</a>。"
 
-#: seahub/templates/view_file_base.html:249
+#: seahub/templates/view_file_base.html:248
 msgid ""
 "No running Seafile client is detected. If you are sure Seafile client is "
 "running, click the following link to open the local file:"
@@ -3401,6 +3593,10 @@ msgstr "在线查看：请使用 firefox, chrome 或 IE 9。"
 msgid "This type of file cannot be viewed online."
 msgstr "该类型文件无法在线查看。"
 
+#: seahub/templates/view_shared_dir.html:26
+msgid "ZIP"
+msgstr ""
+
 #: seahub/templates/registration/login.html:14
 msgid "Incorrect email or password"
 msgstr "你输入的邮箱或密码不正确"
@@ -3515,6 +3711,23 @@ msgstr "你注册的邮箱账号："
 msgid "We will send you an email to set new password"
 msgstr "我们会把新密码设置说明通过邮件发送给你"
 
+#: seahub/templates/registration/registration_complete.html:4
+#, fuzzy
+msgid "Registration complete"
+msgstr "Seafile注册信息"
+
+#: seahub/templates/registration/registration_complete.html:9
+msgid ""
+"An activation email has been sent. Please check your email and click on the "
+"link to activate your account."
+msgstr "激活邮件已发送。请点击邮件里的链接来激活账户。"
+
+#: seahub/templates/registration/registration_complete.html:11
+msgid ""
+"Registration complete, please wait for administrator to activate your "
+"account."
+msgstr "注册成功，请等待管理员激活你的账号。"
+
 #: seahub/templates/registration/registration_form.html:3
 msgid "Register"
 msgstr "注册"
@@ -3554,11 +3767,11 @@ msgstr "讨论"
 msgid "Group"
 msgstr "群组"
 
-#: seahub/templates/snippets/bottom_bar.html:56
+#: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "请至少选择一个群组。"
 
-#: seahub/templates/snippets/bottom_bar.html:61
+#: seahub/templates/snippets/bottom_bar.html:71
 msgid "Please input a discussion."
 msgstr "请输入一个讨论。"
 
@@ -3566,23 +3779,48 @@ msgstr "请输入一个讨论。"
 msgid "File Activities"
 msgstr "文件活动"
 
-#: seahub/templates/snippets/events.html:7
-#: seahub/templates/snippets/list_commit_detail.html:3
-msgid "Loading..."
-msgstr "加载中..."
-
 #: seahub/templates/snippets/events.html:9
 msgid "More"
 msgstr "更多"
 
-#: seahub/templates/snippets/events_body.html:29
-msgid "Created library"
-msgstr "创建了资料库"
+#: seahub/templates/snippets/file_share_popup.html:3
+#, fuzzy, python-format
+msgid "Share %%(name)s"
+msgstr "在 %(name)s"
 
-#: seahub/templates/snippets/events_body.html:33
-#, python-format
-msgid "Deleted library %(library_name)s"
-msgstr "删除了资料库 %(library_name)s"
+#: seahub/templates/snippets/file_share_popup.html:6
+#, fuzzy
+msgid "Private Share"
+msgstr "退出共享"
+
+#: seahub/templates/snippets/file_share_popup.html:7
+#, fuzzy
+msgid "Share Link"
+msgstr "我的共享外链"
+
+#: seahub/templates/snippets/file_share_popup.html:21
+msgid "Generate"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:23
+msgid "Link: "
+msgstr "链接："
+
+#: seahub/templates/snippets/file_share_popup.html:24
+msgid "Send"
+msgstr "发送"
+
+#: seahub/templates/snippets/file_share_popup.html:28
+msgid "Send to:"
+msgstr "发送到："
+
+#: seahub/templates/snippets/file_share_popup.html:29
+msgid "Emails, Seperated by ','"
+msgstr "输入邮箱，多个以,分隔"
+
+#: seahub/templates/snippets/file_share_popup.html:34
+msgid "Sending..."
+msgstr "发送中..."
 
 #: seahub/templates/snippets/file_upload_progress_js.html:51
 #: seahub/templates/snippets/file_upload_progress_js.html:75
@@ -3642,20 +3880,25 @@ msgstr "立即创建群组"
 msgid "Mine"
 msgstr "我拥有的"
 
-#: seahub/templates/snippets/my_owned_repos.html:7
+#: seahub/templates/snippets/my_owned_repos.html:8
+#, fuzzy
+msgid "Sub-libraries"
+msgstr "资料库"
+
+#: seahub/templates/snippets/my_owned_repos.html:10
 #: seahub/templates/sysadmin/userinfo.html:64
 msgid "Shared"
 msgstr "共享给我的"
 
-#: seahub/templates/snippets/my_owned_repos.html:8
+#: seahub/templates/snippets/my_owned_repos.html:11
 msgid "Starred"
 msgstr "星标文件"
 
-#: seahub/templates/snippets/my_owned_repos.html:42
+#: seahub/templates/snippets/my_owned_repos.html:47
 msgid "You have not created any libraries"
 msgstr "你还未创建资料库"
 
-#: seahub/templates/snippets/my_owned_repos.html:43
+#: seahub/templates/snippets/my_owned_repos.html:48
 msgid ""
 "You can create a library to organize your files. For example, you can create "
 "one for each of your projects. Each library can be synchronized and shared "
@@ -3664,23 +3907,39 @@ msgstr ""
 "你可以新建一个资料库来组织你的文件资料，比如为每个项目创建一个资料库，每个资"
 "料库可以单独地同步和共享。"
 
-#: seahub/templates/snippets/my_owned_repos.html:44
+#: seahub/templates/snippets/my_owned_repos.html:49
 msgid "Synchronize libraries with PC client"
 msgstr "与Seafile客户端同步"
 
-#: seahub/templates/snippets/my_owned_repos.html:45
+#: seahub/templates/snippets/my_owned_repos.html:50
 msgid "1. Download the library (make sure PC client is running)."
 msgstr "1. 下载这个资料库（请确认Seafile客户端已启动）。"
 
-#: seahub/templates/snippets/my_owned_repos.html:46
+#: seahub/templates/snippets/my_owned_repos.html:51
 msgid "2. Add files to the folder and they will be uploaded automatically."
 msgstr "2. 把文件拷贝到下载下来的目录中，它们会自动同步到服务器上。"
 
-#: seahub/templates/snippets/my_owned_repos.html:90
+#: seahub/templates/snippets/my_owned_repos.html:63
+msgid "Origin"
+msgstr ""
+
+#: seahub/templates/snippets/my_owned_repos.html:95
+#, fuzzy
+msgid "You have not created any sub-libraries"
+msgstr "你还未创建资料库"
+
+#: seahub/templates/snippets/my_owned_repos.html:96
+msgid ""
+"You can create a sub-library from a directory inside a library. A sub-"
+"library can be independently synced and shared. Files in the sub-library "
+"will be automatically kept in sync with the directory of the origin library."
+msgstr ""
+
+#: seahub/templates/snippets/my_owned_repos.html:142
 msgid "No library is shared to you"
 msgstr "还没有资料库共享给你"
 
-#: seahub/templates/snippets/my_owned_repos.html:91
+#: seahub/templates/snippets/my_owned_repos.html:143
 msgid ""
 "Libraries shared to you or shared to groups you joined will be listed here. "
 "Libraries shared as writable can be downloaded and synced. Read only "
@@ -3691,15 +3950,15 @@ msgstr ""
 "对于以只读方式共享给你的资料库，你只能下载，对本地文件所做的修改将不会被上"
 "传。"
 
-#: seahub/templates/snippets/my_owned_repos.html:106
+#: seahub/templates/snippets/my_owned_repos.html:159
 msgid "icon"
 msgstr "图标"
 
-#: seahub/templates/snippets/my_owned_repos.html:117
+#: seahub/templates/snippets/my_owned_repos.html:170
 msgid "You don't have any starred files yet"
 msgstr "你还没有星标文件"
 
-#: seahub/templates/snippets/my_owned_repos.html:118
+#: seahub/templates/snippets/my_owned_repos.html:171
 msgid ""
 "You can star important files by clicking the \"Star\" button on file viewing "
 "page, and they will be listed here."
@@ -3721,17 +3980,17 @@ msgstr "删除资料库"
 msgid "The file is being processed, please wait..."
 msgstr "文件正在处理，请稍后..."
 
-#: seahub/templates/snippets/office_convert_js.html:34
+#: seahub/templates/snippets/office_convert_js.html:39
 msgid "hide outline"
 msgstr "隐藏提纲"
 
-#: seahub/templates/snippets/office_convert_js.html:35
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "show outline"
 msgstr "显示提纲"
 
-#: seahub/templates/snippets/office_convert_js.html:108
-#: seahub/templates/snippets/office_convert_js.html:115
-#: seahub/templates/snippets/office_convert_js.html:140
+#: seahub/templates/snippets/office_convert_js.html:163
+#: seahub/templates/snippets/office_convert_js.html:170
+#: seahub/templates/snippets/office_convert_js.html:195
 msgid "Document convertion failed."
 msgstr "文档转换失败。"
 
@@ -3774,33 +4033,68 @@ msgstr "请再次输入密码"
 msgid "Please enter password"
 msgstr "请输入密码"
 
-#: seahub/templates/snippets/repo_share_form.html:3
-msgid "Share Library"
-msgstr "共享资料库"
+#: seahub/templates/snippets/repo_dir_data.html:50
+#: seahub/templates/snippets/repo_dir_data.html:96
+msgid "Fetch failed"
+msgstr "获取失败"
 
-#: seahub/templates/snippets/repo_share_form.html:4
-msgid "Share <span class=\"op-target\"></span> to"
+#: seahub/templates/snippets/repo_dir_data.html:61
+#, fuzzy
+msgid "Sub-library"
+msgstr "公共资料"
+
+#: seahub/templates/snippets/repo_dir_data.html:65
+msgid "More operations"
+msgstr "更多操作"
+
+#: seahub/templates/snippets/repo_dir_data.html:68
+#: seahub/templates/snippets/repo_dir_data.html:114
+msgid "Rename"
+msgstr "重命名"
+
+#: seahub/templates/snippets/repo_dir_data.html:69
+#: seahub/templates/snippets/repo_dir_data.html:115
+msgid "Move"
+msgstr "移动"
+
+#: seahub/templates/snippets/repo_dir_data.html:70
+#: seahub/templates/snippets/repo_dir_data.html:116
+msgid "Copy"
+msgstr "复制"
+
+#: seahub/templates/snippets/repo_dir_data.html:111
+msgid "More Operations"
+msgstr "更多操作"
+
+#: seahub/templates/snippets/repo_share_form.html:3
+#, fuzzy
+msgid "Share <span class=\"op-target\"></span> "
 msgstr "将 <span id=\"rename-obj\" class=\"op-target\"></span> 共享给："
 
-#: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/snippets/repo_share_form.html:6
 msgid "Enter"
 msgstr "直接输入"
 
-#: seahub/templates/snippets/repo_share_form.html:12
+#: seahub/templates/snippets/repo_share_form.html:11
 msgid "Emails or Groups, Seperated by ','"
 msgstr "输入邮箱或群组，多个以,分隔"
 
-#: seahub/templates/snippets/repo_share_form.html:15
+#: seahub/templates/snippets/repo_share_form.html:14
 msgid ""
 "Tip: must be organization members or organization groups, enter \"all\" to "
 "share to public library."
 msgstr "Tip：必须是团体内成员或群组，输入 all 共享到公共资料。"
 
-#: seahub/templates/snippets/repo_share_form.html:18
+#: seahub/templates/snippets/repo_share_form.html:17
 msgid "Tip: enter \"all\" to share to public library."
 msgstr "Tip：输入 all 共享到公共资料"
 
-#: seahub/templates/snippets/shared_link_js.html:87
+#: seahub/templates/snippets/shared_link_js.html:56
+#, fuzzy
+msgid "Select contacts"
+msgstr "删除联系人"
+
+#: seahub/templates/snippets/shared_link_js.html:86
 msgid "Please input at least an email."
 msgstr "请输入至少一个邮箱。"
 
@@ -3815,6 +4109,7 @@ msgstr "创建者"
 
 #: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:14
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
 #: seahub/templates/sysadmin/sys_useradmin.html:27
 msgid "Create At"
 msgstr "创建时间"
@@ -3835,14 +4130,25 @@ msgstr "个性域名"
 msgid "Delete Organization"
 msgstr "删除团体"
 
-#: seahub/templates/sysadmin/sys_repo_admin.html:6
-msgid "All Libraries"
-msgstr "所有资料库"
+#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#, fuzzy
+msgid "All Public Links"
+msgstr "公共资料"
 
+#: seahub/templates/sysadmin/sys_publink_admin.html:11
 #: seahub/templates/sysadmin/sys_repo_admin.html:12
 msgid "Owner"
 msgstr "拥有者"
 
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#, fuzzy
+msgid "Count"
+msgstr "个人基本信息"
+
+#: seahub/templates/sysadmin/sys_repo_admin.html:6
+msgid "All Libraries"
+msgstr "所有资料库"
+
 #: seahub/templates/sysadmin/sys_useradmin.html:8
 msgid "All Members"
 msgstr "所有用户"
@@ -3888,18 +4194,18 @@ msgid "Delete User"
 msgstr "删除用户"
 
 #: seahub/templates/sysadmin/sys_useradmin.html:100
-#, python-format
-msgid "Are you sure you want to reset the password of %s ?"
+#, fuzzy, python-format
+msgid "Are you sure you want to reset the password of %%s ?"
 msgstr "确定要重置 %s 的密码吗？"
 
 #: seahub/templates/sysadmin/sys_useradmin.html:104
-#, python-format
-msgid "Are you sure you want to revoke the admin permission of %s ?"
+#, fuzzy, python-format
+msgid "Are you sure you want to revoke the admin permission of %%s ?"
 msgstr "确定要取消 %s 的管理权限吗？"
 
 #: seahub/templates/sysadmin/sys_useradmin.html:108
-#, python-format
-msgid "Are you sure you want to set %s as admin?"
+#, fuzzy, python-format
+msgid "Are you sure you want to set %%s as admin?"
 msgstr "确定要设置 %s 为管理员吗？"
 
 #: seahub/templates/sysadmin/user_add_email.html:3
@@ -3981,334 +4287,358 @@ msgstr "个人维基"
 msgid "Personal Wiki Pages"
 msgstr "个人维基页面"
 
-#: seahub/utils/__init__.py:91
+#: seahub/utils/__init__.py:95
 msgid "permission error"
 msgstr "权限错误"
 
-#: seahub/utils/__init__.py:106 seahub/utils/__init__.py:1022
+#: seahub/utils/__init__.py:110 seahub/utils/__init__.py:1053
 msgid "Internal error"
 msgstr "内部错误"
 
-#: seahub/views/__init__.py:299
+#: seahub/views/__init__.py:379
 msgid "Unable to view recycle page"
 msgstr "无法查看文件回收站"
 
-#: seahub/views/__init__.py:324
+#: seahub/views/__init__.py:404 seahub/views/ajax.py:167
+#: seahub/views/ajax.py:226 seahub/views/ajax.py:313 seahub/views/ajax.py:370
+#: seahub/views/ajax.py:412
 msgid "Library does not exist."
 msgstr "资料库不存在"
 
-#: seahub/views/__init__.py:335
+#: seahub/views/__init__.py:415
 msgid "You do not have permission to perform this action."
 msgstr "你没有权限进行该操作"
 
-#: seahub/views/__init__.py:342
+#: seahub/views/__init__.py:422
 msgid "Failed to edit library information."
 msgstr "资料库信息编辑失败。"
 
-#: seahub/views/__init__.py:349
-msgid "Settings saved."
-msgstr "设置已保存。"
-
-#: seahub/views/__init__.py:353
+#: seahub/views/__init__.py:430
 msgid "Failed to save settings on server"
 msgstr "设置失败"
 
-#: seahub/views/__init__.py:362
+#: seahub/views/__init__.py:433
+msgid "Settings saved."
+msgstr "设置已保存。"
+
+#: seahub/views/__init__.py:443
 msgid "Filename contains invalid character"
 msgstr "上传的文件名包含非法字符"
 
-#: seahub/views/__init__.py:364
+#: seahub/views/__init__.py:445
 msgid "Duplicated filename"
 msgstr "已存在同名的文件"
 
-#: seahub/views/__init__.py:368
+#: seahub/views/__init__.py:449
 msgid "File size surpasses the limit"
 msgstr "文件大小超过限制"
 
-#: seahub/views/__init__.py:370
+#: seahub/views/__init__.py:451
 msgid "The space of owner is used up, upload failed"
 msgstr "该资料库所有者的空间已用完，无法上传"
 
-#: seahub/views/__init__.py:372
+#: seahub/views/__init__.py:453
 msgid "An error occurs during file transfer"
 msgstr "文件传输出错"
 
-#: seahub/views/__init__.py:384 seahub/views/__init__.py:406
+#: seahub/views/__init__.py:465 seahub/views/__init__.py:487
 msgid "Invalid url"
 msgstr "非法链接"
 
-#: seahub/views/__init__.py:431
-msgid "You don't have permission to access the library."
-msgstr "你没有权限访问该资料库。"
-
-#: seahub/views/__init__.py:439
-msgid "No path."
-msgstr "路径不存在"
-
-#: seahub/views/__init__.py:492
+#: seahub/views/__init__.py:507
 msgid "Unable to view library modification"
 msgstr "无法浏览该资料库修改历史"
 
-#: seahub/views/__init__.py:546
+#: seahub/views/__init__.py:563
 msgid "Unable to view library snapshots"
 msgstr "无法查看该资料库镜像"
 
-#: seahub/views/__init__.py:603
+#: seahub/views/__init__.py:620
 msgid "You have no permission to restore library"
 msgstr "你没有权限进行还原操作"
 
-#: seahub/views/__init__.py:619
+#: seahub/views/__init__.py:636
 msgid "Please specify history ID"
 msgstr "请指定历史记录ID"
 
-#: seahub/views/__init__.py:627 seahub/views/__init__.py:720
-#: seahub/views/__init__.py:1526 seahub/views/__init__.py:2135
-msgid "Library does not exist"
-msgstr "资料库不存在"
-
-#: seahub/views/__init__.py:629
+#: seahub/views/__init__.py:646
 msgid "History you specified does not exist"
 msgstr "指定的历史记录不存在"
 
-#: seahub/views/__init__.py:631
+#: seahub/views/__init__.py:648
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: seahub/views/__init__.py:701
-msgid "No conflict in the merge."
-msgstr "合并没有冲突。"
-
-#: seahub/views/__init__.py:740 seahub/views/__init__.py:757
+#: seahub/views/__init__.py:757 seahub/views/__init__.py:774
 msgid ""
 "Failed to remove library. Only staff or owner can perform this operation."
 msgstr "删除资料库失败, 只有团体管理员或资料库创建者有权删除资料库。"
 
-#: seahub/views/__init__.py:755
+#: seahub/views/__init__.py:772
 #, python-format
 msgid "Successfully deleted library \"%s\"."
 msgstr "成功删除资料库 \"%s\"。"
 
-#: seahub/views/__init__.py:916
+#: seahub/views/__init__.py:952
 #, python-format
 msgid "Successfully unsync client %s"
 msgstr "取消同步 %s 成功"
 
-#: seahub/views/__init__.py:918
+#: seahub/views/__init__.py:954
 msgid "Successfully unsync client"
 msgstr "成功取消同步"
 
-#: seahub/views/__init__.py:921
+#: seahub/views/__init__.py:957
 #, python-format
 msgid "Failed to unsync client %s"
 msgstr "取消同步 %s 失败"
 
-#: seahub/views/__init__.py:923
+#: seahub/views/__init__.py:959
 msgid "Failed to unsync client"
 msgstr "取消同步失败"
 
-#: seahub/views/__init__.py:1001 seahub/views/__init__.py:1500
+#: seahub/views/__init__.py:1037 seahub/views/__init__.py:1295
 msgid "Failed to create library"
 msgstr "创建资料库失败"
 
-#: seahub/views/__init__.py:1019
+#: seahub/views/__init__.py:1055
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "取消共享失败，该资料库不存在"
 
-#: seahub/views/__init__.py:1024
+#: seahub/views/__init__.py:1060
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "\"%s\" 取消共享成功"
 
-#: seahub/views/__init__.py:1026
+#: seahub/views/__init__.py:1062
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "\"%s\" 取消共享失败"
 
-#: seahub/views/__init__.py:1056
+#: seahub/views/__init__.py:1092
 msgid "Failed to delete file."
 msgstr "删除文件出错。"
 
-#: seahub/views/__init__.py:1063
+#: seahub/views/__init__.py:1099
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s 删除成功。"
 
-#: seahub/views/__init__.py:1065
+#: seahub/views/__init__.py:1101 seahub/views/ajax.py:396
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "内部错误。删除 %s 失败。"
 
-#: seahub/views/__init__.py:1080
-msgid "File size surpasses 10M, can not be previewed online."
-msgstr "文件超过10M，无法在线查看。"
-
-#: seahub/views/__init__.py:1085 seahub/views/file.py:105
-msgid "HTTPError: failed to open file online"
-msgstr "HTTPError: 无法在线打开该文件"
-
-#: seahub/views/__init__.py:1088 seahub/views/file.py:108
-msgid "URLError: failed to open file online"
-msgstr "URLError: 无法在线打开该文件"
-
-#: seahub/views/__init__.py:1095 seahub/views/file.py:115
-msgid "The encoding you chose is not proper."
-msgstr "文件编码不合适"
-
-#: seahub/views/__init__.py:1112 seahub/views/__init__.py:1115
-#: seahub/views/file.py:132 seahub/views/file.py:135
-msgid "Unknown file encoding"
-msgstr "文件编码无法识别"
-
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1147
 msgid "Unable to access file"
 msgstr "无法访问文件"
 
-#: seahub/views/__init__.py:1214
+#: seahub/views/__init__.py:1173
 msgid "Failed to download library, unable to find server"
 msgstr "下载失败：找不到服务器"
 
-#: seahub/views/__init__.py:1225
+#: seahub/views/__init__.py:1184
 msgid "Invalid server setting"
 msgstr "服务器设置错误"
 
-#: seahub/views/__init__.py:1268
-msgid "Destination path is too long."
-msgstr "目标路径过长"
-
-#: seahub/views/__init__.py:1274
-msgid "You can not modify that library."
-msgstr "你无法修改该资料库。"
-
-#: seahub/views/__init__.py:1287
-#, python-format
-msgid "Can not %(op)s directory %(src)s to its subdirectory %(des)s"
-msgstr "不能把目录 %(src)s %(op)s到它的子目录 %(des)s中"
-
-#: seahub/views/__init__.py:1288
-msgid "copy"
-msgstr "复制"
-
-#: seahub/views/__init__.py:1288
-msgid "move"
-msgstr "移动"
-
-#: seahub/views/__init__.py:1303
-#, python-format
-msgid "Successfully copying %(name)s：<a href=\"%(url)s\">view</a>"
-msgstr "复制 %(name)s 成功：<a href=\"%(url)s\">查看</a>"
-
-#: seahub/views/__init__.py:1309
-#, python-format
-msgid "Successfully moving %(name)s <a href=\"%(url)s\">view</a>"
-msgstr "移动 %(name)s 成功：<a href=\"%(url)s\">查看</a>"
-
-#: seahub/views/__init__.py:1368 seahub/views/__init__.py:1399
-#: seahub/views/__init__.py:1433 seahub/views/__init__.py:2276
-#: seahub/views/file.py:550
-msgid "Permission denied"
-msgstr "共享权限"
-
-#: seahub/views/__init__.py:1445
-#, python-format
-msgid "Successfully renamed %(old)s to %(new)s"
-msgstr "%(old)s 已重命名为 %(new)s"
-
-#: seahub/views/__init__.py:1607
+#: seahub/views/__init__.py:1435
 #, python-format
 msgid ""
 "Successfully revert %(path)s to <a href=\"%(root)s\">root directory.</a>"
 msgstr "成功还原 %(path)s 到<a href=\"%(root)s\">根目录。</a>"
 
-#: seahub/views/__init__.py:1611 seahub/views/__init__.py:1637
+#: seahub/views/__init__.py:1439 seahub/views/__init__.py:1465
 #, python-format
 msgid "Successfully revert <a href=\"%(url)s\">%(path)s</a>"
 msgstr "成功还原 <a href=\"%(url)s\">%(path)s</a>"
 
-#: seahub/views/__init__.py:1633
+#: seahub/views/__init__.py:1461
 #, python-format
 msgid "Successfully revert %(path)s to <a href=\"%(url)s\">root directory.</a>"
 msgstr "成功还原 %(path)s 到<a href=\"%(url)s\">根目录。</a>"
 
-#: seahub/views/__init__.py:2171 seahub/views/file.py:544
+#: seahub/views/__init__.py:1725 seahub/views/file.py:734
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: seahub/views/__init__.py:2174
+#: seahub/views/__init__.py:1728
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "无法下载 \"%s\"：目录大小超过限制。"
 
-#: seahub/views/__init__.py:2189
+#: seahub/views/__init__.py:1743
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "无法下载 \"%s\""
 
-#: seahub/views/__init__.py:2271
+#: seahub/views/ajax.py:61
+msgid "You don't have permission to access the library."
+msgstr "你没有权限访问该资料库。"
+
+#: seahub/views/ajax.py:68
+msgid "No path."
+msgstr "路径不存在"
+
+#: seahub/views/ajax.py:124
 msgid "The group doesn't exist"
 msgstr "该群组不存在"
 
-#: seahub/views/file.py:275 seahub/views/file.py:495 seahub/views/file.py:510
-#: seahub/views/file.py:532
-msgid "Unable to view file"
-msgstr "无法查看该文件"
+#: seahub/views/ajax.py:174 seahub/views/ajax.py:377
+#, fuzzy
+msgid "Permission denied."
+msgstr "共享权限"
 
-#: seahub/views/file.py:290 seahub/views/file.py:295 seahub/views/file.py:457
-#: seahub/views/file.py:462
+#: seahub/views/ajax.py:179
+#, fuzzy
+msgid "Library is encrypted."
+msgstr "该资料库已加密"
+
+#: seahub/views/ajax.py:185
+#, fuzzy
+msgid "Error: no head commit id"
+msgstr "错误：路径不存在。"
+
+#: seahub/views/ajax.py:385
+msgid "Argument missing."
+msgstr ""
+
+#: seahub/views/ajax.py:437
+msgid "Destination path is too long."
+msgstr "目标路径过长"
+
+#: seahub/views/ajax.py:466 seahub/views/ajax.py:518
+#, fuzzy, python-format
+msgid "Successfully moved %(name)s <a href=\"%(url)s\">view</a>"
+msgstr "移动 %(name)s 成功：<a href=\"%(url)s\">查看</a>"
+
+#: seahub/views/ajax.py:488 seahub/views/ajax.py:547
+#, fuzzy, python-format
+msgid "Successfully copied %(name)s <a href=\"%(url)s\">view</a>"
+msgstr "移动 %(name)s 成功：<a href=\"%(url)s\">查看</a>"
+
+#: seahub/views/ajax.py:506
+#, fuzzy, python-format
+msgid "Can not move directory %(src)s to its subdirectory %(des)s"
+msgstr "不能把目录 %(src)s %(op)s到它的子目录 %(des)s中"
+
+#: seahub/views/ajax.py:536
+#, fuzzy, python-format
+msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
+msgstr "不能把目录 %(src)s %(op)s到它的子目录 %(des)s中"
+
+#: seahub/views/file.py:116
+msgid "HTTPError: failed to open file online"
+msgstr "HTTPError: 无法在线打开该文件"
+
+#: seahub/views/file.py:120
+msgid "URLError: failed to open file online"
+msgstr "URLError: 无法在线打开该文件"
+
+#: seahub/views/file.py:127
+msgid "The encoding you chose is not proper."
+msgstr "文件编码不合适"
+
+#: seahub/views/file.py:144 seahub/views/file.py:147
+msgid "Unknown file encoding"
+msgstr "文件编码无法识别"
+
+#: seahub/views/file.py:268 seahub/views/file.py:275 seahub/views/file.py:487
+#: seahub/views/file.py:492
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "文件大小超过 %s，无法在线查看。"
 
-#: seahub/views/file.py:554
+#: seahub/views/file.py:314 seahub/views/file.py:525 seahub/views/file.py:540
+#: seahub/views/file.py:562
+msgid "Unable to view file"
+msgstr "无法查看该文件"
+
+#: seahub/views/file.py:744
 msgid "The library does not exist."
 msgstr "资料库不存在"
 
-#: seahub/views/file.py:558
+#: seahub/views/file.py:748
 msgid "The library is encrypted."
 msgstr "该资料库已加密"
 
-#: seahub/views/file.py:632
+#: seahub/views/file.py:822
 msgid "Unable to edit file"
 msgstr "无法编辑该文件"
 
-#: seahub/views/file.py:644
+#: seahub/views/file.py:834
 msgid "The file does not exist."
 msgstr "该文件不存在"
 
-#: seahub/views/file.py:672
+#: seahub/views/file.py:862
 msgid "Edit online is not offered for this type of file."
 msgstr "该类型文件不能在线编辑。"
 
-#: seahub/views/sysadmin.py:134
+#: seahub/views/file.py:1061
+#, fuzzy, python-format
+msgid "Failed to share to \"%s\", user not found."
+msgstr "发送消息失败，%s 未找到。"
+
+#: seahub/views/file.py:1075
+#, fuzzy, python-format
+msgid "Successfully shared %s."
+msgstr "编辑 %s 成功。"
+
+#: seahub/views/file.py:1096
+#, fuzzy, python-format
+msgid "Successfully unshared \"%s\"."
+msgstr "编辑 %s 成功。"
+
+#: seahub/views/file.py:1098
+#, fuzzy, python-format
+msgid "You don't have permission to unshared %s."
+msgstr "你没有权限访问该资料库。"
+
+#: seahub/views/file.py:1130
+#, fuzzy, python-format
+msgid "You don't have permission to save %s."
+msgstr "你没有权限访问该资料库。"
+
+#: seahub/views/sysadmin.py:130
 msgid "Failed to set quota: internal error"
 msgstr "内部错误，设置失败"
 
-#: seahub/views/sysadmin.py:191
+#: seahub/views/sysadmin.py:188
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "%s 删除成功。"
 
-#: seahub/views/sysadmin.py:193
+#: seahub/views/sysadmin.py:190
 msgid "Failed to delete: the user does not exist"
 msgstr "删除失败：该用户不存在"
 
-#: seahub/views/sysadmin.py:205
+#: seahub/views/sysadmin.py:202
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "成功设置 %s 为管理员"
 
-#: seahub/views/sysadmin.py:207
+#: seahub/views/sysadmin.py:204
 msgid "Failed to set admin: the user does not exist"
 msgstr "设置管理员失败：该用户不存在"
 
-#: seahub/views/sysadmin.py:219
+#: seahub/views/sysadmin.py:216
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "成功取消 %s 的管理权限"
 
-#: seahub/views/sysadmin.py:221
+#: seahub/views/sysadmin.py:218
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "取消管理员权限失败：该用户不存在"
 
+#: seahub/views/sysadmin.py:229
+#, fuzzy, python-format
+msgid "Successfully activated \"%s\"."
+msgstr "编辑 %s 成功。"
+
+#: seahub/views/sysadmin.py:231
+#, fuzzy
+msgid "Failed to activate: user does not exist."
+msgstr "创建失败：该群组不存在。"
+
 #: seahub/views/sysadmin.py:270
 #, python-format
 msgid ""
diff --git a/seahub/share/templates/repo/priv_shared_files.html b/seahub/share/templates/repo/priv_shared_files.html
index 715684e663..c60c98aac8 100644
--- a/seahub/share/templates/repo/priv_shared_files.html
+++ b/seahub/share/templates/repo/priv_shared_files.html
@@ -80,8 +80,8 @@
 
 {% else%}
 <div class="empty-tips">
-  <h2 class="center-contents">{% trans "You don't have any private shared files/folders" %}</h2>
-  <p>{% trans "You can share a single folder or file with a registered user if you don't want to share a whole library." %}</p>
+  <h2 class="center-contents">{% trans "You don't have any private shared files" %}</h2>
+  <p>{% trans "You can share a single file with a registered user if you don't want to share a whole library." %}</p>
 </div>
 {% endif %}