settings: Update text in templates.

docs/manual-testing.md

@@ -407,8 +407,8 @@ Do these tasks as Cordelia.
 - Display settings
     - Right now, these unfortunately require reloads to take effect.
     - Default language (change to Spanish)
-    - Display user list in narrow windows (verify by making window thinner)
-    - Display time in 24-hour format (and then test going back to AM/PM)
+    - User list on left sidebar in narrow windows (verify by making window thinner)
+    - 24-hour time (and then test going back to AM/PM)
 - Notifications
     - Stream Message
         - turn off notifications at user level

frontend_tests/node_tests/i18n.js

@@ -17,7 +17,7 @@ i18n.init({
         fr: {
             translation: {
                 "Quote and reply": "French translation",
-                "You'll receive notifications when a message arrives and Zulip isn't in focus or the message is offscreen.": "Some French text with Zulip",
+                "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "Some French text with Zulip",
             },
         },
     },

static/templates/settings/account-settings.handlebars

@@ -148,9 +148,12 @@
             <div class="input-group">
                 <p class="api-key-note">
                     {{#tr this}}
-                    Creating a bot, and using the bot's account / API key, is the recommended way to use
-                    the Zulip API. However, you can also use your personal API key if you need to a way
-                    to automatically send and edit messages from your own account.
+                    An API key can be used to programmatically access a Zulip account.
+                    Anyone with access to your API key has the ability to read your messages, send
+                    messages on your behalf, and otherwise impersonate you on Zulip, so you should
+                    guard your API key as carefully as you guard your password. <br />
+                    We recommend creating bots and using the bots' accounts and API keys to access
+                    the Zulip API, unless the task requires access to your account.
                     {{/tr}}
                 </p>
                 <button class="button rounded" id="api_key_button">{{t "Show/change your API key" }}</button>

static/templates/settings/display-settings.handlebars

@@ -26,7 +26,7 @@
                     {{/if}} />
                     <span></span>
                 </label>
-                <label for="high_contrast_mode" class="inline-block">{{t "Enable high contrast mode." }}</label>
+                <label for="high_contrast_mode" class="inline-block">{{t "High contrast mode" }}</label>
             </div>
 
             <div class="input-group">
@@ -37,7 +37,7 @@
                     {{/if}} />
                     <span></span>
                 </label>
-                <label for="left_side_userlist" class="inline-block">{{t "Display user list on left side in narrow windows." }}</label>
+                <label for="left_side_userlist" class="inline-block">{{t "User list on left sidebar in narrow windows" }}</label>
             </div>
 
             <div class="input-group">
@@ -48,7 +48,7 @@
                     {{/if}} />
                     <span></span>
                 </label>
-                <label for="emoji_alt_code" class="inline-block">{{t 'Display emoji reactions as text (:heart: instead of <img alt=":heart:" class="emoji" src="/static/generated/emoji/images/emoji/unicode/2764.png" title=":heart:"/>).' }}</label>
+                <label for="emoji_alt_code" class="inline-block">{{t 'Display emoji reactions as text (:heart: instead of <img alt=":heart:" class="emoji" src="/static/generated/emoji/images/emoji/unicode/2764.png" title=":heart:"/>)' }}</label>
             </div>
         </div>
 
@@ -64,7 +64,7 @@
                     <span></span>
                 </label>
                 <label for="twenty_four_hour_time" class="inline-block">
-                    {{t "Display time in 24-hour format (17:00 instead of 5:00 PM)" }}
+                    {{t "24-hour time (17:00 instead of 5:00 PM)" }}
                 </label>
             </div>
 

static/templates/settings/notification-settings.handlebars

@@ -1,6 +1,6 @@
 <div id="notification-settings" class="settings-section" data-name="notifications">
     <form class="notification-settings-form">
-        <div class="notification-reminder tip">{{#tr this }}You'll receive notifications when a message arrives and Zulip isn't in focus or the message is offscreen.{{/tr}}</div>
+        <div class="notification-reminder tip">{{#tr this }}Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.{{/tr}}</div>
         <div class="alert" id="notify-settings-status"></div>
 
         <h3 class="light">{{t "Stream messages" }}</h3>

static/templates/settings/organization-permissions-admin.handlebars

@@ -139,7 +139,7 @@
                 </label>
                 <label for="id_realm_allow_message_editing" class="inline-block"
                     title="{{t 'If checked, users can edit the content and topics of their old messages.' }}">
-                    {{t "Users can edit old messages" }}
+                    {{t "Allow users to edit old messages" }}
                 </label>
             </div>
 
@@ -190,7 +190,7 @@
                 </label>
                 <label for="id_realm_mandatory_topics" id="id_realm_mandatory_topics_label" class="inline-block"
                     title="{{t 'If checked, topics are required.'}}">
-                    {{t "Require topics in messages to streams" }}
+                    {{t "Require topics in stream messages" }}
                 </label>
             </div>
         </div>

static/templates/settings/ui-settings.handlebars

@@ -1,7 +1,7 @@
 <div id="ui-settings" class="settings-section" data-name="zulip-labs">
     <div class="alert" id="ui-settings-status"></div>
     <form class="ui-settings-form">
-        <div class="tip">{{t "The below features are experimental, and may not work as well as you would like." }}</div>
+        <div class="tip">{{t "Features for the brave. Labs features may change, break, or disappear at any time." }}</div>
 
         <h3 class="light">{{t "UI Settings"}}</h3>
 

templates/zerver/help/change-the-date-and-time-format.md

@@ -7,5 +7,5 @@ a 24-hour format, you can do so easily using the following procedure:
 {!go-to-the.md!} [Display settings](/#settings/display-settings)
 {!settings.md!}
 
-2. Select the option labeled **Display time in 24-hour format (17:00
+2. Select the option labeled **24-hour time (17:00
    instead of 5:00 PM)**.

templates/zerver/help/move-the-users-list-to-the-left-sidebar.md

@@ -13,5 +13,5 @@ steps.
 {!settings.md!}
 
 2. Select the option labeled
-    **Display user list on left side in narrow windows**, then reload the page
+    **User list on left sidebar in narrow windows**, then reload the page
     in order for the change to take effect.