From 37e7898303ff4f03080f3fa00e078fa396cd1be9 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 15 Jan 2017 11:32:42 -0800 Subject: [PATCH] Fix capitalization in 'Default streams'. --- static/locale/cs/translations.json | 2 +- static/locale/de/translations.json | 2 +- static/locale/en/translations.json | 2 +- static/locale/es/translations.json | 2 +- static/locale/fr/translations.json | 2 +- static/locale/it/translations.json | 2 +- static/locale/ja/translations.json | 2 +- static/locale/ko/translations.json | 2 +- static/locale/ml/translations.json | 2 +- static/locale/pt/translations.json | 2 +- static/locale/ru/translations.json | 2 +- static/locale/sr/translations.json | 2 +- static/locale/zh-CN/translations.json | 2 +- static/locale/zh_Hans/translations.json | 2 +- static/templates/admin_tab.handlebars | 2 +- .../settings/default-streams-list-admin.handlebars | 2 +- .../zerver/help/set-default-streams-for-new-users.md | 8 ++++---- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/static/locale/cs/translations.json b/static/locale/cs/translations.json index d3dc5ca127..52f60faa30 100644 --- a/static/locale/cs/translations.json +++ b/static/locale/cs/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "Choose custom color", "Save": "Save", "Yes": "Yes", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "Unsubscribe", "Custom alert words": "Custom alert words", diff --git a/static/locale/de/translations.json b/static/locale/de/translations.json index 5060c032b5..55e4d920e5 100644 --- a/static/locale/de/translations.json +++ b/static/locale/de/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "Choose custom color", "Save": "Save", "Yes": "Ja", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "Unsubscribe", "Custom alert words": "Custom alert words", diff --git a/static/locale/en/translations.json b/static/locale/en/translations.json index b7656c8390..c1f7d42a34 100644 --- a/static/locale/en/translations.json +++ b/static/locale/en/translations.json @@ -154,7 +154,7 @@ "Error updating the stream description": "Error updating the stream description", "Subscribed": "Subscribed", "Remove admin": "Remove admin", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "If non-zero, users can edit their message for this many minutes after it is sent. If zero, users can edit all their past messages.": "If non-zero, users can edit their message for this many minutes after it is sent. If zero, users can edit all their past messages.", "Unsubscribe": "Unsubscribe", "Error removing subscription": "Error removing subscription", diff --git a/static/locale/es/translations.json b/static/locale/es/translations.json index 456d9f4c50..76f74cb9d5 100644 --- a/static/locale/es/translations.json +++ b/static/locale/es/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "Choose custom color", "Save": "Save", "Yes": "Yes", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "Unsubscribe", "Custom alert words": "Custom alert words", diff --git a/static/locale/fr/translations.json b/static/locale/fr/translations.json index d3dc5ca127..52f60faa30 100644 --- a/static/locale/fr/translations.json +++ b/static/locale/fr/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "Choose custom color", "Save": "Save", "Yes": "Yes", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "Unsubscribe", "Custom alert words": "Custom alert words", diff --git a/static/locale/it/translations.json b/static/locale/it/translations.json index d3dc5ca127..52f60faa30 100644 --- a/static/locale/it/translations.json +++ b/static/locale/it/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "Choose custom color", "Save": "Save", "Yes": "Yes", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "Unsubscribe", "Custom alert words": "Custom alert words", diff --git a/static/locale/ja/translations.json b/static/locale/ja/translations.json index 56737bac80..b3b8cb80b4 100644 --- a/static/locale/ja/translations.json +++ b/static/locale/ja/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "色を選択", "Save": "保存", "Yes": "はい", - "Default Streams": "デフォルトストリーム", + "Default streams": "デフォルトストリーム", "By deactivating <>, they will be logged out immediately.": " <>を無効にすると、無効にしたユーザーはすぐにログアウトさせられます。", "Unsubscribe": "購読解除", "Custom alert words": "カスタムアラート単語", diff --git a/static/locale/ko/translations.json b/static/locale/ko/translations.json index d3dc5ca127..52f60faa30 100644 --- a/static/locale/ko/translations.json +++ b/static/locale/ko/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "Choose custom color", "Save": "Save", "Yes": "Yes", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "Unsubscribe", "Custom alert words": "Custom alert words", diff --git a/static/locale/ml/translations.json b/static/locale/ml/translations.json index 9a67b5da4c..644117ea5d 100644 --- a/static/locale/ml/translations.json +++ b/static/locale/ml/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "വേണ്ട നീറം തിരഞ്ഞെടുക്കുക", "Save": "സേവ് ചെയ്യുക", "Yes": "ശരി", - "Default Streams": "സ്ഥിരമായ ശാഖകൾ", + "Default streams": "സ്ഥിരമായ ശാഖകൾ", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "വരിക്കാരനല്ലാതാവുക", "Custom alert words": "Custom alert words", diff --git a/static/locale/pt/translations.json b/static/locale/pt/translations.json index d3dc5ca127..52f60faa30 100644 --- a/static/locale/pt/translations.json +++ b/static/locale/pt/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "Choose custom color", "Save": "Save", "Yes": "Yes", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "Unsubscribe", "Custom alert words": "Custom alert words", diff --git a/static/locale/ru/translations.json b/static/locale/ru/translations.json index c451c383b0..f9c281feb5 100644 --- a/static/locale/ru/translations.json +++ b/static/locale/ru/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "Choose custom color", "Save": "Save", "Yes": "Yes", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "Отписаться", "Custom alert words": "Custom alert words", diff --git a/static/locale/sr/translations.json b/static/locale/sr/translations.json index 053101abb8..6b16e316fb 100644 --- a/static/locale/sr/translations.json +++ b/static/locale/sr/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "Choose custom color", "Save": "Save", "Yes": "Yes", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "By deactivating <>, they will be logged out immediately.": "By deactivating <>, they will be logged out immediately.", "Unsubscribe": "Unsubscribe", "Custom alert words": "Custom alert words", diff --git a/static/locale/zh-CN/translations.json b/static/locale/zh-CN/translations.json index 435660c8a0..2c28274bc0 100644 --- a/static/locale/zh-CN/translations.json +++ b/static/locale/zh-CN/translations.json @@ -68,7 +68,7 @@ "Choose custom color": "选择自定义颜色", "Save": "保存", "Yes": "是", - "Default Streams": "默认频道", + "Default streams": "默认频道", "By deactivating <>, they will be logged out immediately.": "去激活用户后 <>, 这些用户会立即退出登录。", "Unsubscribe": "退订", "Custom alert words": "提示词设置", diff --git a/static/locale/zh_Hans/translations.json b/static/locale/zh_Hans/translations.json index b459ea29a1..55016341f7 100644 --- a/static/locale/zh_Hans/translations.json +++ b/static/locale/zh_Hans/translations.json @@ -175,7 +175,7 @@ "URL format string": "URL format string", "Notifications": "Notifications", "Remove admin": "Remove admin", - "Default Streams": "Default Streams", + "Default streams": "Default streams", "If non-zero, users can edit their message for this many minutes after it is sent. If zero, users can edit all their past messages.": "If non-zero, users can edit their message for this many minutes after it is sent. If zero, users can edit all their past messages.", "Reactivate": "Reactivate", "Unsubscribe": "Unsubscribe", diff --git a/static/templates/admin_tab.handlebars b/static/templates/admin_tab.handlebars index b9777f85b6..8ae885cd63 100644 --- a/static/templates/admin_tab.handlebars +++ b/static/templates/admin_tab.handlebars @@ -20,7 +20,7 @@ {{t "Streams Deletion" }}
  • - {{t "Default Streams" }} + {{t "Default streams" }}
  • diff --git a/static/templates/settings/default-streams-list-admin.handlebars b/static/templates/settings/default-streams-list-admin.handlebars index fdbba31980..ff8a2d181b 100644 --- a/static/templates/settings/default-streams-list-admin.handlebars +++ b/static/templates/settings/default-streams-list-admin.handlebars @@ -1,6 +1,6 @@
    -{{t "Default Streams"}}
    +{{t "Default streams"}}

    {{#tr this}}Configure the default streams new users are subscribed to when joining the {{domain}} organization.{{/tr}}

    diff --git a/templates/zerver/help/set-default-streams-for-new-users.md b/templates/zerver/help/set-default-streams-for-new-users.md index 75938a4a6a..4df40bd29b 100644 --- a/templates/zerver/help/set-default-streams-for-new-users.md +++ b/templates/zerver/help/set-default-streams-for-new-users.md @@ -4,16 +4,16 @@ If you are an administrator of a Zulip organization, you can set the default streams that new users are automatically subscribed to by following the following steps. -{!go-to-the.md!} [Default Streams](/#administration/default-streams-list) +{!go-to-the.md!} [Default streams](/#administration/default-streams-list) {!admin.md!} -2. To add a new stream to **Default Streams**, enter the name of stream in the +2. To add a new stream to **Default streams**, enter the name of stream in the box next to **Stream Name**. Autocompletion suggestions will appear in a dropdown as you type; select the stream name from the dropdown. 3. Once you select the stream name from the dropdown, the stream will appear in -the **Default Streams** list, confirming the success of your action. +the **Default streams** list, confirming the success of your action. !!! tip "" - To remove a stream from **Default Streams** click on the **Remove from default** + To remove a stream from **Default streams** click on the **Remove from default** button next to the name of the stream you want to remove.