diff --git a/contacts/templates/contacts/contact_list.html b/contacts/templates/contacts/contact_list.html
index 73bda74f1e..f668455b68 100644
--- a/contacts/templates/contacts/contact_list.html
+++ b/contacts/templates/contacts/contact_list.html
@@ -35,10 +35,9 @@
 {% endfor %}
 </table>
 {% else %}
-<p>暂无</p>
+<p class="empty-repo-tips">添加联系人时，如果该用户已注册，则显示为您的站内联系人。</p>
 {% endif %}
 
-
 <h3>站外联系人列表</h3>
 {% if unregistered_contacts %}
 <table>
@@ -63,7 +62,7 @@
 {% endfor %}
 </table>
 {% else %}
-<p>暂无</p>
+<p class="empty-repo-tips">添加联系人时，如果该用户未注册，则显示为您的站外联系人。</p>
 {% endif %}
 
 <form action="{% url contact_add_post %}" method="post" id="contact-add-form" class="hide">
diff --git a/group/templates/group/groups_right_panel.html b/group/templates/group/groups_right_panel.html
index 910bb7c71e..7bcfa60764 100644
--- a/group/templates/group/groups_right_panel.html
+++ b/group/templates/group/groups_right_panel.html
@@ -20,6 +20,8 @@
     </li>
     {% endfor %}
 </ul>
+{% else %}
+<p class="empty-repo-tips">您还没有参加任何群组，可以点击“添加群组”按钮创建群组。</p>
 {% endif %}
 
 <h3>所有群组</h3>
diff --git a/group/views.py b/group/views.py
index 1561c3499b..e2d968a4a5 100644
--- a/group/views.py
+++ b/group/views.py
@@ -641,7 +641,7 @@ def group_unshare_repo(request, repo_id, group_id, from_email):
     # Check whether user is group staff or the one share the repo
     if not check_group_staff(group_id, from_email) and \
             seafserv_threaded_rpc.get_group_repo_owner(repo_id) != from_email:
-        return render_permission_error(request, u'取消共享失败:只有群组管理员或共享目录发布者有权取消共享')
+        return render_permission_error(request, u'取消共享失败:只有群组管理员或共享资料库发布者有权取消共享')
         
     if seafserv_threaded_rpc.group_unshare_repo(repo_id, group_id, from_email) != 0:
         return render_error(request, u'取消共享失败:内部错误')
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 96cdeeaae7..80b0723fa0 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -593,6 +593,10 @@ ul.with-bg li {
 #repo-create-form {
     padding:0 20px;
 }
+.empty-repo-tips {
+    width: 60%;
+    margin: 25px auto;
+}
 #repo-name,
 #repo-desc,
 .repo-create-encryption .passwd,
diff --git a/share/templates/repo/share_admin.html b/share/templates/repo/share_admin.html
index b1ac2e523d..8f528da613 100644
--- a/share/templates/repo/share_admin.html
+++ b/share/templates/repo/share_admin.html
@@ -41,7 +41,7 @@
     {% endfor %}
 </table>
 {% else %}
-<p>暂无</p>
+<p class="empty-repo-tips">这里将显示您共享给您朋友的资料库。您可以点击“我的页面”任意资料库旁的“共享”图标将您的资料库共享给您的朋友。</p>
 {% endif %}
 
 <h3>我管理的文件外链</h3>
@@ -66,7 +66,7 @@
   {% endfor %}
 </table>
 {% else %}
-<p>暂无</p>
+<p class="empty-repo-tips">这里将显示您分享的文件外链。您可以在文件浏览页面点击“获取分享地址”按钮生成文件外链。</p>
 {% endif %}
 <p id="link" class="hide">该文件外链为：<input type="text" readonly="readonly" value="" id="shared-link" /></p>
 {% endblock %}
diff --git a/templates/myhome.html b/templates/myhome.html
index 545fa1f3cd..4a50f4f29b 100644
--- a/templates/myhome.html
+++ b/templates/myhome.html
@@ -67,7 +67,7 @@
                 <span class="time">{{ commit.ctime|translate_commit_time }}</span>
                 <a href="{% url 'user_profile' author %}" title="{{ author|email2nickname}}">{{ author|email2nickname }}</a>
             </div>
-            <p>更新了目录 <a href="{{SITE_ROOT}}repo/{{repo.id}}">{{ repo.name }}</a> <a class="lsch" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ commit.id }}" data="{{ commit.props.ctime|tsstr_sec }}">详情</a></P>
+            <p>更新了资料库 <a href="{{SITE_ROOT}}repo/{{repo.id}}">{{ repo.name }}</a> <a class="lsch" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ commit.id }}" data="{{ commit.props.ctime|tsstr_sec }}">详情</a></P>
         </div>
         {% endwith %}
     {% endif %}
@@ -82,7 +82,7 @@
                 <span class="time">{{ ev.timestamp|translate_commit_time }}</span>
                 <a href="{% url 'user_profile' author %}" title="{{ author|email2nickname}}">{{ author|email2nickname }}</a>
             </div>
-            <p>创建了目录 <a href="{{SITE_ROOT}}repo/{{repo_id}}">{{ repo_name }}</a></p>
+            <p>创建了资料库 <a href="{{SITE_ROOT}}repo/{{repo_id}}">{{ repo_name }}</a></p>
         </div>
         {% endwith %}
     {% endif %}
@@ -97,7 +97,7 @@
                 <span class="time">{{ ev.timestamp|translate_commit_time }}</span>
                 <a href="{% url 'user_profile' author %}" title="{{ author|email2nickname}}">{{ author|email2nickname }}</a>
             </div>
-            <p>删除了目录 {{ repo_name }}</p>
+            <p>删除了资料库 {{ repo_name }}</p>
         </div>
         {% endwith %}
     {% endif %}
diff --git a/templates/public_home.html b/templates/public_home.html
index d1602bae37..1144f19ff3 100644
--- a/templates/public_home.html
+++ b/templates/public_home.html
@@ -5,16 +5,10 @@
 {% block nav_publichome_class %}class="cur"{% endblock %}
 
 {% block left_panel %}
-<h3>成员</h3>
-{% if users %}
-<ul>
-    {% for member in users %}
-	<li class="member">{% avatar member.email 16 %}<a class="name" href="{% url 'user_profile' member.email %}">{{ member.email|email2nickname }}</a></li>
-    {% endfor %}
-</ul>
-{% else %}
-<p>暂无</p>
-{% endif %}
+<h3>小提示</h3>
+<div>
+  <p>标记为只读的资料库只能查看，无法下载。</p>
+</div>
 {% endblock %}
 
 {% block right_panel %}
@@ -55,6 +49,8 @@
     </tr>
     {% endfor %}
 </table>
+{% else %}
+<p class="empty-repo-tips">您可以新建一个公开的资料库，网站内的其他人都可以查看下载这个资料库。</p>
 {% endif %}
 <!-- /.main -->
 {% include "snippets/repo_share_form.html" %}
diff --git a/templates/snippets/my_owned_repos.html b/templates/snippets/my_owned_repos.html
index a0dbaddf82..32f24ed2d4 100644
--- a/templates/snippets/my_owned_repos.html
+++ b/templates/snippets/my_owned_repos.html
@@ -29,5 +29,5 @@
     {% endfor %}
 </table>
 {% else %}
-<p>您可以新建一个资料库来组织您的文件资料，比如为每个项目创建一个资料库，每个资料库可以单独地同步和共享。</p>
+<p class="empty-repo-tips">您可以新建一个资料库来组织您的文件资料，比如为每个项目创建一个资料库，每个资料库可以单独地同步和共享。</p>
 {% endif %}
diff --git a/templates/snippets/shared_in_repos.html b/templates/snippets/shared_in_repos.html
index 65fa95f61f..e351f1fb39 100644
--- a/templates/snippets/shared_in_repos.html
+++ b/templates/snippets/shared_in_repos.html
@@ -38,5 +38,5 @@
     {% endfor %}
 </table>
 {% else %}
-<p>暂无</p>
+<p class="empty-repo-tips">您的朋友可以将他的资料库共享给您，这些资料库会显示在这里。</p>
 {% endif %}
diff --git a/views.py b/views.py
index 5368281982..6cb90d3e97 100644
--- a/views.py
+++ b/views.py
@@ -352,7 +352,7 @@ def repo_upload_file(request, repo_id):
                                                       'upload',
                                                       request.user.username)
         else:
-            return render_permission_error(request, u'无法访问该目录')
+            return render_permission_error(request, u'无法访问该资料库')
 
         no_quota = False
         if seafserv_threaded_rpc.check_quota(repo_id) < 0:
@@ -388,7 +388,7 @@ def repo_update_file(request, repo_id):
                                                       'update',
                                                       request.user.username)
         else:
-            return render_permission_error(request, u'无法访问该目录')
+            return render_permission_error(request, u'无法访问该资料库')
 
         no_quota = False
         if seafserv_threaded_rpc.check_quota(repo_id) < 0:
@@ -738,7 +738,7 @@ def remove_repo(request, repo_id):
                 is_org_repo_owner(org.org_id, repo_id, user):
             seafserv_threaded_rpc.remove_repo(repo_id)
         else:
-            err_msg = u'删除资料库失败, 只有团体管理员或目录创建者有权删除目录。'
+            err_msg = u'删除资料库失败, 只有团体管理员或资料库创建者有权删除资料库。'
             return render_permission_error(request, err_msg)
     else:
         # Remove repo in personal context, only repo owner or site staff can
@@ -753,7 +753,7 @@ def remove_repo(request, repo_id):
                               repo_name=repo.name,
                           )
         else:
-            err_msg = u'删除资料库失败, 只有管理员或目录创建者有权删除目录。'
+            err_msg = u'删除资料库失败, 只有管理员或资料库创建者有权删除资料库。'
             return render_permission_error(request, err_msg)
 
     next = request.META.get('HTTP_REFERER', None)
@@ -1003,7 +1003,7 @@ def public_repo_create(request):
         except:
             repo_id = None
         if not repo_id:
-            result['error'] = u"创建目录失败"
+            result['error'] = u"创建失败"
         else:
             result['success'] = True
             repo_created.send(sender=None,