From 48afc55b1bbc80436a81d9da3e31e28cd79850da Mon Sep 17 00:00:00 2001
From: Rishi Gupta <rishig@zulipchat.com>
Date: Fri, 1 Dec 2017 20:12:31 -0800
Subject: [PATCH] settings: Reword notifications settings strings.

Audible notifications is a confusing term, especially since it could
plausibly mean audible notifications on your phone.

Mobile push notifications is also not great, since most people don't know
what push notifications are.

I removed "receive" from stream settings strings since I think it isn't
necessary, and so that the strings (and translations) would be the same as
what's on the settings pages.
---
 .../propagate_notification_change.handlebars     |  2 +-
 .../settings/notification-settings.handlebars    | 16 ++++++++--------
 .../templates/subscription_settings.handlebars   |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/static/templates/propagate_notification_change.handlebars b/static/templates/propagate_notification_change.handlebars
index 635bcfeb0d..a044fec802 100644
--- a/static/templates/propagate_notification_change.handlebars
+++ b/static/templates/propagate_notification_change.handlebars
@@ -1,5 +1,5 @@
 <div>
-    <p>{{t "Apply this change to all stream subscriptions?" }}</p>
+    <p>{{t "Apply this change to all current stream subscriptions?" }}</p>
 
     <div class="control-group">
         <div class="controls propagate-notifications-controls">
diff --git a/static/templates/settings/notification-settings.handlebars b/static/templates/settings/notification-settings.handlebars
index a234779ab2..36576745a8 100644
--- a/static/templates/settings/notification-settings.handlebars
+++ b/static/templates/settings/notification-settings.handlebars
@@ -17,7 +17,7 @@
                     <span></span>
                 </label>
                 <label for="enable_stream_desktop_notifications" class="inline-block">
-                    {{t "Desktop notifications" }}
+                    {{t "Visual desktop notifications" }}
                 </label>
                 <div class="propagate_stream_notifications_change"></div>
             </div>
@@ -31,7 +31,7 @@
                     <span></span>
                 </label>
                 <label for="enable_stream_sounds" class="inline-block no-border">
-                    {{t "Audible notifications" }}
+                    {{t "Audible desktop notifications" }}
                 </label>
                 <div class="propagate_stream_notifications_change"></div>
             </div>
@@ -45,7 +45,7 @@
                     <span></span>
                 </label>
                 <label for="enable_stream_push_notifications" class="inline-block no-border">
-                    {{t "Mobile push notifications" }}
+                    {{t "Mobile notifications" }}
                 </label>
                 <div class="propagate_stream_notifications_change"></div>
             </div>
@@ -70,7 +70,7 @@
                     <span></span>
                 </label>
                 <label for="enable_desktop_notifications" class="inline-block">
-                    {{t "Desktop notifications" }}
+                    {{t "Visual desktop notifications" }}
                 </label>
             </div>
 
@@ -85,7 +85,7 @@
                     <span></span>
                 </label>
                 <label for="pm_content_in_desktop_notifications" id="pm_content_in_desktop_notifications_label" class="inline-block">
-                    {{t "Include content of private messages in desktop notifications" }}
+                    {{t "Include content of private messages" }}
                 </label>
             </div>
 
@@ -98,7 +98,7 @@
                     <span></span>
                 </label>
                 <label for="enable_sounds" class="inline-block">
-                    {{t "Audible notifications" }}
+                    {{t "Audible desktop notifications" }}
                 </label>
             </div>
 
@@ -124,7 +124,7 @@
                     <span></span>
                 </label>
                 <label for="enable_offline_push_notifications" class="inline-block">
-                    {{t "Mobile push notifications when offline" }}
+                    {{t "Mobile notifications when offline" }}
                 </label>
             </div>
 
@@ -138,7 +138,7 @@
                     <span></span>
                 </label>
                 <label for="enable_online_push_notifications" id="enable_online_push_notifications_label" class="inline-block">
-                    {{t "Mobile push notifications always (even when online)" }}
+                    {{t "Mobile notifications always (even when online)" }}
                 </label>
             </div>
 
diff --git a/static/templates/subscription_settings.handlebars b/static/templates/subscription_settings.handlebars
index b865d44cf9..11139c1435 100644
--- a/static/templates/subscription_settings.handlebars
+++ b/static/templates/subscription_settings.handlebars
@@ -49,21 +49,21 @@
                         <div id="sub_desktop_notifications_setting"
                             class="sub_setting_checkbox sub_notification_setting {{#unless in_home_view}}muted-sub{{/unless}}">
                             <input id="desktop-notifystream-{{stream_id}}" class="sub_setting_control" type="checkbox" tabindex="-1" {{#if desktop_notifications}}checked{{/if}} {{#unless in_home_view}}disabled="disabled"{{/unless}}/>
-                            <label class="subscription-control-label">{{t "Receive desktop notifications" }}</label>
+                            <label class="subscription-control-label">{{t "Visual desktop notifications" }}</label>
                         </div>
                     </li>
                     <li>
                         <div id="sub_audible_notifications_setting"
                             class="sub_setting_checkbox sub_notification_setting {{#unless in_home_view}}muted-sub{{/unless}}">
                             <input id="audible-notifystream-{{stream_id}}" class="sub_setting_control" type="checkbox" tabindex="-1" {{#if audible_notifications}}checked{{/if}} {{#unless in_home_view}}disabled="disabled"{{/unless}}/>
-                            <label class="subscription-control-label">{{t "Receive audible notifications" }}</label>
+                            <label class="subscription-control-label">{{t "Audible desktop notifications" }}</label>
                         </div>
                     </li>
                     <li>
                         <div id="sub_push_notifications_setting"
                             class="sub_setting_checkbox sub_notification_setting {{#unless in_home_view}}muted-sub{{/unless}}">
                             <input id="push-notifystream-{{stream_id}}" class="sub_setting_control" type="checkbox" tabindex="-1" {{#if push_notifications}}checked{{/if}} {{#unless in_home_view}}disabled="disabled"{{/unless}}/>
-                            <label class="subscription-control-label">{{t "Receive push notifications" }}</label>
+                            <label class="subscription-control-label">{{t "Mobile notifications" }}</label>
                         </div>
                     </li>
                     <li>