diff --git a/frontend/src/components/search/ai-search.js b/frontend/src/components/search/ai-search.js
index 4b78af022a5..78e231bcf09 100644
--- a/frontend/src/components/search/ai-search.js
+++ b/frontend/src/components/search/ai-search.js
@@ -532,7 +532,7 @@ export default class AISearch extends Component {
 
   onDeleteIndex = () => {
     seafileAPI.deleteLibraryIndex(this.props.repoID).then(res => {
-      toaster.notify(gettext('Successfully turned off'));
+      toaster.notify(gettext('Successfully turned it off'));
       this.setState({ indexState: INDEX_STATE.UNCREATED });
     }).catch(error => {
       const errorMsg = Utils.getErrorMsg(error);
diff --git a/frontend/src/pages/sys-admin/orgs/org-repos.js b/frontend/src/pages/sys-admin/orgs/org-repos.js
index be9d7a83bc9..911c4a7ecd4 100644
--- a/frontend/src/pages/sys-admin/orgs/org-repos.js
+++ b/frontend/src/pages/sys-admin/orgs/org-repos.js
@@ -31,7 +31,7 @@ class Content extends Component {
               <tr>
                 <th width="5%"></th>
                 <th width="30%">{gettext('Name')}</th>
-                <th width="35%">{gettext('ID')}</th>
+                <th width="35%">{'ID'}</th>
                 <th width="20%">{gettext('Owner')}</th>
                 <th width="10%">{/* Operations */}</th>
               </tr>
diff --git a/frontend/src/pages/sys-admin/orgs/org-users.js b/frontend/src/pages/sys-admin/orgs/org-users.js
index aecf5dc8405..b9ca94a92ad 100644
--- a/frontend/src/pages/sys-admin/orgs/org-users.js
+++ b/frontend/src/pages/sys-admin/orgs/org-users.js
@@ -56,7 +56,7 @@ class Content extends Component {
               <tr>
                 <th width="25%">{gettext('Name')}</th>
                 <th width="15%">{gettext('Status')}</th>
-                <th width="15%">{gettext('Membership')}</th>
+                <th width="15%">{gettext('Role')}</th>
                 <th width="15%">{gettext('Space Used')}</th>
                 <th width="25%">{gettext('Created At')}{' / '}{gettext('Last Login')}</th>
                 <th width="5%">{/* Operations */}</th>
diff --git a/frontend/src/utils/text-translation.js b/frontend/src/utils/text-translation.js
index 5ad34fbdc1e..8e41cc66b73 100644
--- a/frontend/src/utils/text-translation.js
+++ b/frontend/src/utils/text-translation.js
@@ -26,7 +26,7 @@ const TextTranslation = {
   'CONVERT_TO_MARKDOWN' : {key : 'Convert to Markdown', value : gettext('Convert to Markdown')},
   'CONVERT_TO_SDOC' : {key : 'Convert to sdoc', value : gettext('Convert to sdoc')},
   'CONVERT_TO_DOCX' : {key : 'Convert to docx', value : gettext('Convert to docx')},
-  'EXPORT_DOCX' : {key : 'Export docx', value : gettext('Export docx')},
+  'EXPORT_DOCX' : {key : 'Export docx', value : gettext('Export as docx')},
   'MARK_AS_DRAFT' : {key : 'Mark as draft', value : gettext('Mark as draft')},
   'UNMARK_AS_DRAFT' : {key : 'Unmark as draft', value : gettext('Unmark as draft')},
   'HISTORY' : {key : 'History', value : gettext('History')},
diff --git a/seahub/notifications/templates/notifications/notice_email.html b/seahub/notifications/templates/notifications/notice_email.html
index 16468b49533..62907be9967 100644
--- a/seahub/notifications/templates/notifications/notice_email.html
+++ b/seahub/notifications/templates/notifications/notice_email.html
@@ -66,7 +66,7 @@
                 <p style="line-height:1.5; margin:.2em 10px .2em 0;">{% blocktrans with repo_url=notice.repo_url repo_name=notice.repo_name %}A large number of files in your library <a href="{{url_base}}{{ repo_url }}">{{ repo_name }}</a> has been deleted recently.{% endblocktrans %}</p>
 
                 {% elif notice.is_saml_sso_error_msg %}
-                <p style="line-height:1.5; margin:.2em 10px .2em 0;">{% blocktrans %}{{notice.error_msg}}{% endblocktrans %}</p>
+                <p style="line-height:1.5; margin:.2em 10px .2em 0;">{{notice.error_msg}}</p>
 
                 {% elif notice.is_repo_monitor_msg %}
                     <p style="line-height:1.5; margin:.2em 10px .2em 0;">
diff --git a/seahub/templates/client_login_confirm.html b/seahub/templates/client_login_confirm.html
index 041dc2eb2a9..38e2cb06463 100644
--- a/seahub/templates/client_login_confirm.html
+++ b/seahub/templates/client_login_confirm.html
@@ -7,7 +7,7 @@
 
 {% block main_content %}
 <div class="new-narrow-panel">
-    <h2 class="hd">{% trans "Client Login Confirm" %}</h2>
+    <h2 class="hd">{% trans "Desktop Client Login Confirm" %}</h2>
     <form action="" method="post" class="con">{% csrf_token %}
     <label>{% trans "Do you want to login to your client?" %}</label><br />
     <input type="submit" value="{% trans "Yes" %}" class="submit" />