diff --git a/docs/chinese.md b/docs/chinese.md index f45439548d..acc8c5efc4 100644 --- a/docs/chinese.md +++ b/docs/chinese.md @@ -147,11 +147,11 @@ is also borrowed from the WeChat. * Deactivate/Reactivate - **禁用/启用(帐户),关闭/激活(社区)** When applied to a user account, translated as "禁用/启用 -(Disable/Enable)", for example "Deactivated Users" to "禁用的用户"; +(Disable/Enable)", for example "Deactivated users" to "禁用的用户"; when applied to a realm, translated as "关闭/激活(Close/Open)", for example "Your realm has been deactivated." to "您的社区已关闭". -当应用于用户帐户时,选择翻译为“禁用/启用”,例如“Deactivated Users”翻译 +当应用于用户帐户时,选择翻译为“禁用/启用”,例如“Deactivated users”翻译 为“禁用的用户”;当应用于“社区”(Realm)时,选择翻译为“关闭/激活”,如 “Your realm has been deactivated.”翻译为“您的社区已关闭”。 diff --git a/frontend_tests/casper_tests/10-admin.js b/frontend_tests/casper_tests/10-admin.js index 03498f5f22..7e24506046 100644 --- a/frontend_tests/casper_tests/10-admin.js +++ b/frontend_tests/casper_tests/10-admin.js @@ -105,7 +105,7 @@ casper.then(function () { casper.click('#settings-dropdown'); casper.click('a[href^="#administration"]'); - casper.test.assertSelectorHasText("#administration a[aria-controls='deactivated-users']", "Deactivated Users"); + casper.test.assertSelectorHasText("#administration a[aria-controls='deactivated-users']", "Deactivated users"); casper.click("#administration a[aria-controls='deactivated-users']"); diff --git a/static/locale/cs/translations.json b/static/locale/cs/translations.json index 62be7bb8d6..72b27bb2f4 100644 --- a/static/locale/cs/translations.json +++ b/static/locale/cs/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ Labs", "Please specify a stream": "Please specify a stream", "Mark all messages in __topic_name__ as read": "Mark all messages in __topic_name__ as read", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "This is a public stream. Anybody in your organization can join.": "This is a public stream. Anybody in your organization can join.", "The email subject will become the __page_params.product_name__ topic": "The email subject will become the __page_params.product_name__ topic", "Username": "Username", diff --git a/static/locale/de/translations.json b/static/locale/de/translations.json index 6aeee69257..782625bf10 100644 --- a/static/locale/de/translations.json +++ b/static/locale/de/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ Labs", "Please specify a stream": "Bitte wählen Sie einen Stream aus", "Mark all messages in __topic_name__ as read": "Mark all messages in __topic_name__ as read", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "This is a public stream. Anybody in your organization can join.": "This is a public stream. Anybody in your organization can join.", "The email subject will become the __page_params.product_name__ topic": "The email subject will become the __page_params.product_name__ topic", "Username": "Username", diff --git a/static/locale/en/translations.json b/static/locale/en/translations.json index 3dfe626fdc..b4eb50361a 100644 --- a/static/locale/en/translations.json +++ b/static/locale/en/translations.json @@ -231,7 +231,7 @@ "Name": "Name", "Error listing users or bots": "Error listing users or bots", "Yes, delete this stream": "Yes, delete this stream", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "Stream membership": "Stream membership", "\n The topic of a conversation is one or two words that describe\n what it is about, for example: Bug #345, lunch, or\n logo. Don't overthink it.\n ": "\n The topic of a conversation is one or two words that describe\n what it is about, for example: Bug #345, lunch, or\n logo. Don't overthink it.\n ", "Mute the stream __stream.name__": "Mute the stream __stream.name__", diff --git a/static/locale/es/translations.json b/static/locale/es/translations.json index d45ff9b05a..1692e76ff0 100644 --- a/static/locale/es/translations.json +++ b/static/locale/es/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ Labs", "Please specify a stream": "Please specify a stream", "Mark all messages in __topic_name__ as read": "Mark all messages in __topic_name__ as read", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "This is a public stream. Anybody in your organization can join.": "This is a public stream. Anybody in your organization can join.", "The email subject will become the __page_params.product_name__ topic": "The email subject will become the __page_params.product_name__ topic", "Username": "Username", diff --git a/static/locale/fr/translations.json b/static/locale/fr/translations.json index 62be7bb8d6..72b27bb2f4 100644 --- a/static/locale/fr/translations.json +++ b/static/locale/fr/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ Labs", "Please specify a stream": "Please specify a stream", "Mark all messages in __topic_name__ as read": "Mark all messages in __topic_name__ as read", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "This is a public stream. Anybody in your organization can join.": "This is a public stream. Anybody in your organization can join.", "The email subject will become the __page_params.product_name__ topic": "The email subject will become the __page_params.product_name__ topic", "Username": "Username", diff --git a/static/locale/it/translations.json b/static/locale/it/translations.json index 62be7bb8d6..72b27bb2f4 100644 --- a/static/locale/it/translations.json +++ b/static/locale/it/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ Labs", "Please specify a stream": "Please specify a stream", "Mark all messages in __topic_name__ as read": "Mark all messages in __topic_name__ as read", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "This is a public stream. Anybody in your organization can join.": "This is a public stream. Anybody in your organization can join.", "The email subject will become the __page_params.product_name__ topic": "The email subject will become the __page_params.product_name__ topic", "Username": "Username", diff --git a/static/locale/ja/translations.json b/static/locale/ja/translations.json index c98eeec27b..e9e5fa4c78 100644 --- a/static/locale/ja/translations.json +++ b/static/locale/ja/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ラボ", "Please specify a stream": "ストリームを指定してください", "Mark all messages in __topic_name__ as read": "__topic_name__のすべてのメッセージを既読にする", - "Deactivated Users": "無効なユーザー", + "Deactivated users": "無効なユーザー", "This is a public stream. Anybody in your organization can join.": "これは 公開ストリームです。この組織の人はだれでも参加できます。", "The email subject will become the __page_params.product_name__ topic": "メールの件名は__page_params.product_name__トピックになります", "Username": "ユーザー名", diff --git a/static/locale/ko/translations.json b/static/locale/ko/translations.json index 62be7bb8d6..72b27bb2f4 100644 --- a/static/locale/ko/translations.json +++ b/static/locale/ko/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ Labs", "Please specify a stream": "Please specify a stream", "Mark all messages in __topic_name__ as read": "Mark all messages in __topic_name__ as read", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "This is a public stream. Anybody in your organization can join.": "This is a public stream. Anybody in your organization can join.", "The email subject will become the __page_params.product_name__ topic": "The email subject will become the __page_params.product_name__ topic", "Username": "Username", diff --git a/static/locale/ml/translations.json b/static/locale/ml/translations.json index 1e1559edf0..21f5945955 100644 --- a/static/locale/ml/translations.json +++ b/static/locale/ml/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ ലാബ്ബ്", "Please specify a stream": "ഒരു ശാഖ നിർദ്ദേശിക്കുക", "Mark all messages in __topic_name__ as read": "__topic_name__ൽ ഉള്ള എല്ലാ സന്ദേശങ്ങളും വായിച്ചതായി രേഖപെടുത്തുക", - "Deactivated Users": "നിഷ്ക്രിയരാക്കിയാ ഉപയോക്താക്കൾ", + "Deactivated users": "നിഷ്ക്രിയരാക്കിയാ ഉപയോക്താക്കൾ", "This is a public stream. Anybody in your organization can join.": "ഇതൊരു പൊതുവായ ശാഖയാണ്. നിങ്ങളുടെ സംഘടനയിലെ ആർക്കു വേണമെങ്കിലും ചേരാം.", "The email subject will become the __page_params.product_name__ topic": "ഈമെയിലിന്റെ വിശയം __page_params.product_name__ ന്റെ വിശയമാകും", "Username": "യൂസർനെയിം", diff --git a/static/locale/pt/translations.json b/static/locale/pt/translations.json index 62be7bb8d6..72b27bb2f4 100644 --- a/static/locale/pt/translations.json +++ b/static/locale/pt/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ Labs", "Please specify a stream": "Please specify a stream", "Mark all messages in __topic_name__ as read": "Mark all messages in __topic_name__ as read", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "This is a public stream. Anybody in your organization can join.": "This is a public stream. Anybody in your organization can join.", "The email subject will become the __page_params.product_name__ topic": "The email subject will become the __page_params.product_name__ topic", "Username": "Username", diff --git a/static/locale/ru/translations.json b/static/locale/ru/translations.json index 8e4edfcaf1..dfb4cd9863 100644 --- a/static/locale/ru/translations.json +++ b/static/locale/ru/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ Labs", "Please specify a stream": "Please specify a stream", "Mark all messages in __topic_name__ as read": "Отметить все сообщения в __topic_name__ как прочитанные", - "Deactivated Users": "Отключенные пользователи", + "Deactivated users": "Отключенные пользователи", "This is a public stream. Anybody in your organization can join.": "This is a public stream. Anybody in your organization can join.", "The email subject will become the __page_params.product_name__ topic": "The email subject will become the __page_params.product_name__ topic", "Username": "Имя пользователя", diff --git a/static/locale/sr/translations.json b/static/locale/sr/translations.json index 41e93ee36c..66e4474031 100644 --- a/static/locale/sr/translations.json +++ b/static/locale/sr/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__ Labs", "Please specify a stream": "Please specify a stream", "Mark all messages in __topic_name__ as read": "Mark all messages in __topic_name__ as read", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "This is a public stream. Anybody in your organization can join.": "This is a public stream. Anybody in your organization can join.", "The email subject will become the __page_params.product_name__ topic": "The email subject will become the __page_params.product_name__ topic", "Username": "Username", diff --git a/static/locale/zh-CN/translations.json b/static/locale/zh-CN/translations.json index e39c722489..0ab2322b03 100644 --- a/static/locale/zh-CN/translations.json +++ b/static/locale/zh-CN/translations.json @@ -134,7 +134,7 @@ "__page_params.product_name__ Labs": "__page_params.product_name__实验室", "Please specify a stream": "请指定频道", "Mark all messages in __topic_name__ as read": "标记话题"__topic_name__"中的所有消息为已读", - "Deactivated Users": "禁用的用户", + "Deactivated users": "禁用的用户", "This is a public stream. Anybody in your organization can join.": "这是一个 公开的频道。社区中的所有用户都可以订阅。", "The email subject will become the __page_params.product_name__ topic": "邮件主题作为__page_params.product_name__的话题", "Username": "用户名", diff --git a/static/locale/zh_Hans/translations.json b/static/locale/zh_Hans/translations.json index 9153156125..8a0460f523 100644 --- a/static/locale/zh_Hans/translations.json +++ b/static/locale/zh_Hans/translations.json @@ -222,7 +222,7 @@ "Close": "Close", "Subscribe to __stream__": "Subscribe to __stream__", "Change notification settings for individual streams on your Streams page.": "Change notification settings for individual streams on your Streams page.", - "Deactivated Users": "Deactivated Users", + "Deactivated users": "Deactivated users", "Add New Default Stream": "Add New Default Stream", "Stream messages": "Stream messages", "Change later messages to this topic": "Change later messages to this topic", diff --git a/static/templates/admin_tab.handlebars b/static/templates/admin_tab.handlebars index cd8fcc759c..b9777f85b6 100644 --- a/static/templates/admin_tab.handlebars +++ b/static/templates/admin_tab.handlebars @@ -11,7 +11,7 @@ {{t "Users" }}
{{t "Name" }} | diff --git a/templates/zerver/help/deactivate-or-reactivate-a-user.md b/templates/zerver/help/deactivate-or-reactivate-a-user.md index 0b00a9c30e..b2410b5afc 100644 --- a/templates/zerver/help/deactivate-or-reactivate-a-user.md +++ b/templates/zerver/help/deactivate-or-reactivate-a-user.md @@ -39,7 +39,7 @@ disappear, confirming the success of the account's deactivation. Zulip organization administrators can choose to reactivate a user's deactivated account by following the following steps. -{!go-to-the.md!} [Deactivated Users](/#administration/deactivated-users-admin) +{!go-to-the.md!} [Deactivated users](/#administration/deactivated-users-admin) {!admin.md!} 4. Click the **Reactivate** button to the right of the user account that you
---|