Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix capitalization in 'Deactivated users'.

This commit is contained in:
Tim Abbott 2017-01-15 11:27:45 -08:00
parent ab75b41a6f
commit e1e7788e67
19 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/chinese.md
View File

@ -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.”翻译为“您的社区已关闭”。

2
frontend_tests/casper_tests/10-admin.js
View File

@ -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']");

2
static/locale/cs/translations.json
View File

@ -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 <b>__topic_name__</b> as read": "Mark all messages in <b>__topic_name__</b> as read",
"Deactivated Users": "Deactivated Users",
"Deactivated users": "Deactivated users",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. 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",

2
static/locale/de/translations.json
View File

@ -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 <b>__topic_name__</b> as read": "Mark all messages in <b>__topic_name__</b> as read",
"Deactivated Users": "Deactivated Users",
"Deactivated users": "Deactivated users",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. 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",

2
static/locale/en/translations.json
View File

@ -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 <b>topic</b> of a conversation is one or two words that describe\n what it is about, for example: <b>Bug #345</b>, <b>lunch</b>, or\n <b>logo</b>. Don't overthink it.\n ": "\n The <b>topic</b> of a conversation is one or two words that describe\n what it is about, for example: <b>Bug #345</b>, <b>lunch</b>, or\n <b>logo</b>. Don't overthink it.\n ",
"Mute the stream <b>__stream.name__</b>": "Mute the stream <b>__stream.name__</b>",

2
static/locale/es/translations.json
View File

@ -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 <b>__topic_name__</b> as read": "Mark all messages in <b>__topic_name__</b> as read",
"Deactivated Users": "Deactivated Users",
"Deactivated users": "Deactivated users",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. 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",

2
static/locale/fr/translations.json
View File

@ -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 <b>__topic_name__</b> as read": "Mark all messages in <b>__topic_name__</b> as read",
"Deactivated Users": "Deactivated Users",
"Deactivated users": "Deactivated users",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. 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",

2
static/locale/it/translations.json
View File

@ -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 <b>__topic_name__</b> as read": "Mark all messages in <b>__topic_name__</b> as read",
"Deactivated Users": "Deactivated Users",
"Deactivated users": "Deactivated users",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. 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",

2
static/locale/ja/translations.json
View File

@ -134,7 +134,7 @@
"__page_params.product_name__ Labs": "__page_params.product_name__ラボ",
"Please specify a stream": "ストリームを指定してください",
"Mark all messages in <b>__topic_name__</b> as read": "<b>__topic_name__</b>のすべてのメッセージを既読にする",
"Deactivated Users": "無効なユーザー",
"Deactivated users": "無効なユーザー",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "これは<span class=\"icon-vector-globe\"></span> <b>公開ストリーム</b>です。この組織の人はだれでも参加できます。",
"The email subject will become the __page_params.product_name__ topic": "メールの件名は__page_params.product_name__トピックになります",
"Username": "ユーザー名",

2
static/locale/ko/translations.json
View File

@ -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 <b>__topic_name__</b> as read": "Mark all messages in <b>__topic_name__</b> as read",
"Deactivated Users": "Deactivated Users",
"Deactivated users": "Deactivated users",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. 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",

2
static/locale/ml/translations.json
View File

@ -134,7 +134,7 @@
"__page_params.product_name__ Labs": "__page_params.product_name__ ലാബ്ബ്",
"Please specify a stream": "ഒരു ശാഖ നിർദ്ദേശിക്കുക",
"Mark all messages in <b>__topic_name__</b> as read": "<b>__topic_name__</b>ൽ ഉള്ള എല്ലാ സന്ദേശങ്ങളും വായിച്ചതായി രേഖപെടുത്തുക",
"Deactivated Users": "നിഷ്ക്രിയരാക്കിയാ ഉപയോക്താക്കൾ",
"Deactivated users": "നിഷ്ക്രിയരാക്കിയാ ഉപയോക്താക്കൾ",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "ഇതൊരു <span class=\"icon-vector-globe\"></span> <b>പൊതുവായ ശാഖയാണ്</b>. നിങ്ങളുടെ സംഘടനയിലെ ആർക്കു വേണമെങ്കിലും ചേരാം.",
"The email subject will become the __page_params.product_name__ topic": "ഈമെയിലിന്റെ വിശയം __page_params.product_name__ ന്റെ വിശയമാകും",
"Username": "യൂസർനെയിം",

2
static/locale/pt/translations.json
View File

@ -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 <b>__topic_name__</b> as read": "Mark all messages in <b>__topic_name__</b> as read",
"Deactivated Users": "Deactivated Users",
"Deactivated users": "Deactivated users",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. 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",

2
static/locale/ru/translations.json
View File

@ -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 <b>__topic_name__</b> as read": "Отметить все сообщения в <b>__topic_name__</b> как прочитанные",
"Deactivated Users": "Отключенные пользователи",
"Deactivated users": "Отключенные пользователи",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. 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": "Имя пользователя",

2
static/locale/sr/translations.json
View File

@ -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 <b>__topic_name__</b> as read": "Mark all messages in <b>__topic_name__</b> as read",
"Deactivated Users": "Deactivated Users",
"Deactivated users": "Deactivated users",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. 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",

2
static/locale/zh-CN/translations.json
View File

@ -134,7 +134,7 @@
"__page_params.product_name__ Labs": "__page_params.product_name__实验室",
"Please specify a stream": "请指定频道",
"Mark all messages in <b>__topic_name__</b> as read": "标记话题&quot;<b>__topic_name__</b>&quot;中的所有消息为已读",
"Deactivated Users": "禁用的用户",
"Deactivated users": "禁用的用户",
"This is a <span class=\"icon-vector-globe\"></span> <b>public stream</b>. Anybody in your organization can join.": "这是一个<span class=\"icon-vector-globe\"></span> <b>公开的频道</b>。社区中的所有用户都可以订阅。",
"The email subject will become the __page_params.product_name__ topic": "邮件主题作为__page_params.product_name__的话题",
"Username": "用户名",

2
static/locale/zh_Hans/translations.json
View File

@ -222,7 +222,7 @@
"Close": "Close",
"Subscribe to __stream__": "Subscribe to __stream__",
"Change notification settings for individual streams on your <a href=\"/#subscriptions\">Streams page</a>.": "Change notification settings for individual streams on your <a href=\"/#subscriptions\">Streams page</a>.",
"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",

2
static/templates/admin_tab.handlebars
View File

@ -11,7 +11,7 @@
<a href="#users" aria-controls="users" role="tab" data-toggle="tab"><i class="icon-vector-user settings-section-icon"></i> {{t "Users" }}</a>
</li>
<li role="presentation">
<a href="#deactivated-users" aria-controls="deactivated-users" role="tab" data-toggle="tab"><i class="icon-vector-trash settings-section-icon"></i> {{t "Deactivated Users" }}</a>
<a href="#deactivated-users" aria-controls="deactivated-users" role="tab" data-toggle="tab"><i class="icon-vector-trash settings-section-icon"></i> {{t "Deactivated users" }}</a>
</li>
<li role="presentation">
<a href="#bots" aria-controls="bots" role="tab" data-toggle="tab"><i class="icon-vector-github settings-section-icon"></i> {{t "Bots" }}</a>

2
static/templates/settings/deactivated-users-admin.handlebars
View File

@ -1,6 +1,6 @@
<div id="admin-deactivated-users-list" class="settings-section">
<div class="settings-section-title"><i class="icon-vector-trash settings-section-icon"></i>
{{t "Deactivated Users" }}</div>
{{t "Deactivated users" }}</div>
<table class="table table-condensed table-striped">
<tbody id="admin_deactivated_users_table" class="admin_user_table">
<th>{{t "Name" }}</th>

2
templates/zerver/help/deactivate-or-reactivate-a-user.md
View File

@ -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