diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html
index 7f4b21ac1e..33bef0bdc1 100644
--- a/group/templates/group/group_info.html
+++ b/group/templates/group/group_info.html
@@ -96,9 +96,7 @@
         </td>
         <td>{{ repo.owner|email2nickname }}</td>
         <td>
-	    {% if repo.user_perm == 'rw' %}
             <img src="{{ MEDIA_URL }}img/download-20.png" class="download op-icon vh" data="{{ SITE_ROOT }}seafile_access_check/?repo_id={{ repo.props.id }}" alt="{% trans "Download" %}" title="{% trans "Download" %}" />
-	    {% endif %}
         {% if is_staff or repo.share_from_me  %}
             <img src="{{ MEDIA_URL }}img/delete-20.png" class="cancel-share op-icon vh" data="{% url 'repo_remove_share' %}?repo_id={{ repo.props.id }}&from={{ repo.owner }}&gid={{ group.id }}" title="{% trans "Unshare" %}" alt="{% trans "Unshare" %}" />
         {% endif %}
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 89eb096cd0..a38ee7b59b 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-09 10:52+0800\n"
+"POT-Creation-Date: 2012-11-09 14:10+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"
@@ -598,10 +598,10 @@ msgstr "未知"
 msgid "Restore"
 msgstr "还原"
 
-#: templates/file_revisions.html:52 templates/public_home.html:46
-#: templates/repo.html:21 templates/repo.html.py:137
+#: templates/file_revisions.html:52 templates/public_home.html:45
+#: templates/repo.html:20 templates/repo.html.py:137
 #: templates/repo_view_file.html:123 templates/snippets/my_owned_repos.html:34
-#: templates/snippets/my_owned_repos.html:82
+#: templates/snippets/my_owned_repos.html:81
 msgid "Download"
 msgstr "下载"
 
@@ -727,10 +727,8 @@ msgid "Tips"
 msgstr "小提示"
 
 #: templates/public_home.html:10
-msgid ""
-"Libraries marked as read-only can only be viewed online, can not be "
-"downloaded."
-msgstr "标记为只读的资料库只能查看，无法整个下载。"
+msgid "Libraries marked as read-only can only be browsed online."
+msgstr "标记为只读的资料库只能在线浏览。"
 
 #: templates/public_home.html:15
 msgid "Public Libraries"
@@ -762,7 +760,7 @@ msgstr "描述"
 #: templates/public_home.html:23 templates/repo_history.html:16
 #: templates/snippets/my_owned_repos.html:20
 #: templates/snippets/my_owned_repos.html:58
-#: templates/snippets/my_owned_repos.html:103
+#: templates/snippets/my_owned_repos.html:101
 msgid "Last Update"
 msgstr "更新时间"
 
@@ -785,11 +783,11 @@ msgstr "可读写"
 msgid "Read-Only"
 msgstr "只读"
 
-#: templates/public_home.html:54
+#: templates/public_home.html:52
 msgid "No public library"
 msgstr "当前没有公共资料"
 
-#: templates/public_home.html:55
+#: templates/public_home.html:53
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
@@ -904,7 +902,7 @@ msgstr "目录名"
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/repo.html:173 templates/snippets/my_owned_repos.html:101
+#: templates/repo.html:173 templates/snippets/my_owned_repos.html:99
 msgid "File Name"
 msgstr "文件名称"
 
@@ -1565,7 +1563,7 @@ msgid "Deleted library"
 msgstr "删除了资料库"
 
 #: templates/snippets/events.html:66
-#: templates/snippets/my_owned_repos.html:102
+#: templates/snippets/my_owned_repos.html:100
 msgid "Library"
 msgstr "资料库"
 
@@ -1676,15 +1674,15 @@ msgstr "2. 把文件拷贝到下载下来的目录中，它们会自动同步到
 msgid "Shared By"
 msgstr "共享来源"
 
-#: templates/snippets/my_owned_repos.html:84
+#: templates/snippets/my_owned_repos.html:82
 msgid "Leave Share"
 msgstr "退出共享"
 
-#: templates/snippets/my_owned_repos.html:91
+#: templates/snippets/my_owned_repos.html:89
 msgid "No library is shared to you"
 msgstr "还没有资料库共享给你"
 
-#: templates/snippets/my_owned_repos.html:92
+#: templates/snippets/my_owned_repos.html:90
 msgid ""
 "Libraries shared to you will be listed here. Libraries shared as writable "
 "can be downloaded and synced. Read only libraries can only be viewed online."
@@ -1692,15 +1690,15 @@ msgstr ""
 "这里会显示共享给你的资料库。你可以下载这个资料库。你可以添加文件到这个下载下"
 "来的资料库，这些文件会自动同步到服务器。"
 
-#: templates/snippets/my_owned_repos.html:107
+#: templates/snippets/my_owned_repos.html:105
 msgid "icon"
 msgstr "图标"
 
-#: templates/snippets/my_owned_repos.html:118
+#: templates/snippets/my_owned_repos.html:116
 msgid "You don't have any starred files yet"
 msgstr "你还没有星标文件"
 
-#: templates/snippets/my_owned_repos.html:119
+#: templates/snippets/my_owned_repos.html:117
 msgid ""
 "You can star important files by clicking the \"Star\" button on file viewing "
 "page, and they will be listed here."
diff --git a/organizations/templates/organizations/org_public.html b/organizations/templates/organizations/org_public.html
index f38d8a497e..a7b9790886 100644
--- a/organizations/templates/organizations/org_public.html
+++ b/organizations/templates/organizations/org_public.html
@@ -46,9 +46,7 @@
         {% endif %}
         <td>{{ repo.props.user|email2nickname }}</td>
         <td>
-	    {% if repo.user_perm == 'rw' %}
             <img src="{{ MEDIA_URL }}img/download-20.png" data="{{ repo.props.repo_id }}" class="download-btn op-icon vh" title="{% trans "Download"%}" alt="{% trans "Download"%}" />
-	    {% endif %}
         </td>
     </tr>
     {% endfor %}
diff --git a/templates/public_home.html b/templates/public_home.html
index b85d23076a..335f71adf8 100644
--- a/templates/public_home.html
+++ b/templates/public_home.html
@@ -7,7 +7,7 @@
 {% block left_panel %}
 <div class="info-item">
 <h3 class="info-item-top">{% trans "Tips"%}</h3>
-<p class="info-item-bottom">{% trans "Libraries marked as read-only can only be viewed online, can not be downloaded."%}</p>
+<p class="info-item-bottom">{% trans "Libraries marked as read-only can only be browsed online."%}</p>
 </div>
 {% endblock %}
 
@@ -42,9 +42,7 @@
         {% endif %}
         <td>{{ repo.props.user|email2nickname }}</td>
         <td>
-	    {% if repo.user_perm == 'rw' %}
             <img src="{{ MEDIA_URL }}img/download-20.png" data="{{ repo.props.repo_id }}" class="download-btn op-icon vh" title="{% trans "Download"%}" alt="{% trans "Download"%}" />
-	    {% endif %}
         </td>
     </tr>
     {% endfor %}
diff --git a/templates/repo.html b/templates/repo.html
index 0d62216d49..f337381db1 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -16,12 +16,12 @@
 {% block main_panel %}
     <div class="w100 ovhd">
         <h2 class="fleft">{{repo.props.name}}</h2>
-        {% if user_perm == 'rw' %}
         <div class="fright">
             <button id="repo-download-btn">{% trans "Download"%}</button>
+            {% if user_perm == 'rw' %}
             <button id="recycle-btn" data="{% url 'repo_recycle_view' repo.id %}">{% trans "Trash"%}</button>
+            {% endif %}
         </div>
-        {% endif %}
     </div>
     {% if user_perm == 'r' %}
     <p>{% trans "This library is read-only, and you can only view the files."%}</p>
diff --git a/templates/snippets/my_owned_repos.html b/templates/snippets/my_owned_repos.html
index 90bf8f2442..0db97ed6ce 100644
--- a/templates/snippets/my_owned_repos.html
+++ b/templates/snippets/my_owned_repos.html
@@ -78,9 +78,7 @@
         {% endif %}
         <td>{{ repo.props.user|email2nickname }}</td>
         <td>
-        {% if repo.user_perm == 'rw' %}
             <img src="{{ MEDIA_URL }}img/download-20.png" data="{{ repo.props.repo_id }}" class="download-btn op-icon vh" title="{% trans "Download" %}" alt="{% trans "Download" %}" />
-        {% endif %}
             <img src="{{ MEDIA_URL }}img/delete-20.png" data="{% url 'repo_remove_share' %}?repo_id={{ repo.props.repo_id }}&from={{ repo.props.user }}&to={{ request.user }}" class="unshare-btn op-icon vh" title="{% trans "Leave Share" %}" alt="{% trans "Leave Share" %}" />
         </td>
     </tr>