Correct strings in Add Supervision settings UI

Also removed unused string


Bug: 989218
Change-Id: I0cafa7c7e305cf84342c29eaab9058ee544573bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1746627
Commit-Queue: Danan S <danan@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686245}

chrome/app/chromeos_strings.grdp

@@ -4121,10 +4121,10 @@
     Add Supervision
   </message>
   <message name="IDS_ADD_SUPERVISION_NETWORK_DOWN_HEADING" desc="Heading string shown in the Add Supervision page when the network is not available.">
-    Network not available
+    Can’t connect to the internet
   </message>
   <message name="IDS_ADD_SUPERVISION_NETWORK_DOWN_DESCRIPTION" desc="Description shown in the Add Supervision page when the network is not available.">
-    Please check your network connection and retry.
+    Check your internet connection
   </message>
   <message name="IDS_ADD_SUPERVISION_NETWORK_DOWN_BUTTON_LABEL" desc="Label of the button shown on the Add Supervision page when the network is not available.">
     Close
@@ -4132,13 +4132,15 @@
   <message name="IDS_ADD_SUPERVISION_EXIT_DIALOG_TITLE" desc="Title for the dialog shown when attempting to exit the Add Supervision screen.">
     Are you sure you want to exit?
   </message>
-  <!-- TODO(danan):  Add final string and remove untranslateable -->
-  <message translateable="false" name="IDS_ADD_SUPERVISION_EXIT_DIALOG_BODY" desc="Body for the dialog shown when attempting to exit the Add Supervision screen.">
-    Supervision is already set up for <ph name="USER_FIRST_NAME">$1<ex>John</ex></ph>'s Google Account.
-You can always stop supervision from the Famly Link app. We've sent instructions to you in an email that explains how to install Family Link.
+  <message name="IDS_ADD_SUPERVISION_EXIT_DIALOG_BODY" desc="Body for the dialog shown when attempting to exit the Add Supervision screen.">
+Supervision is set up for this Google Account. To set up more parental controls, select Continue.
+
+Otherwise, sign out now so that the changes to this account will be reflected on this device.
+
+You can manage this account’s settings by installing the Family Link app on your device.  We sent you instructions in an email.
   </message>
-  <message name="IDS_ADD_SUPERVISION_EXIT_DIALOG_CANCEL_BUTTON_LABEL" desc="Label for the cancel button on the dialog shown when attempting to exit the Add Supervision screen.">
-    Cancel
+  <message name="IDS_ADD_SUPERVISION_EXIT_DIALOG_CANCEL_BUTTON_LABEL" desc="Label for the cancel button on the dialog shown when attempting to exit the Add Supervision screen. 'Continue' means to continue setting up supervision, rather than exiting the dialog">
+    Continue
   </message>
   <message name="IDS_ADD_SUPERVISION_EXIT_DIALOG_SIGNOUT_BUTTON_LABEL" desc="Label for the signout button on the dialog shown when attempting to exit the Add Supervision screen.">
     Sign out

chrome/app/settings_strings.grdp

@@ -4295,16 +4295,16 @@
   <!-- Parental Controls -->
   <if expr="chromeos">
     <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_TITLE" desc="Name of the settings page which manages ChromeOS's parental controls.">
-      Parental Controls
+      Parental controls
     </message>
     <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_SET_UP_LABEL" desc="Label/description of the settings page which manages ChromeOS's parental controls.">
       Set website restrictions &amp; screen time limits with Family Link
     </message>
     <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_CONNECT_TO_INTERNET_LABEL" desc="Label/description shown when the Parental control setup can't be launched because there is no Internet Connection.">
-      Connect to the Internet to set up Parental Controls
+      Connect to the internet to set up parental controls
     </message>
     <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_VIEW_SETTINGS_LABEL" desc="Label/description of the settings page which manages ChromeOS's parental controls.">
-      View your Family Link settings
+      Open the Family Link app to see your supervision settings
     </message>
     <message name="IDS_SETTINGS_PARENTAL_CONTROLS_SET_UP_BUTTON_LABEL" desc="Label/description of the button which launches page which enables ChromeOS's parental controls.">
       Set up
@@ -4316,10 +4316,6 @@
     <message name="IDS_SETTINGS_CLOSE_ADD_SUPERVISION_DIALOG_TITLE" desc="Title of dialog shown when a user closes the Add Supervision dialog after an account has been converted to use supervision.">
       Sign out to finish?
     </message>
-    <message name="IDS_SETTINGS_CLOSE_ADD_SUPERVISION_DIALOG_BODY" desc="Body of dialog shown when a user closes the Add Supervision dialog after an account has been converted to use supervision.">
-      <ph name="BEGIN_PARAGRAPH1">&lt;p&gt;</ph>To finish setting up supervision on this device, you must sign out of <ph name="USER_NAME">$1<ex>John Smith</ex></ph>'s account.<ph name="END_PARAGRAPH1">&lt;/p&gt;</ph>
-      <ph name="BEGIN_PARAGRAPH2">&lt;p&gt;</ph>You can manage your child's parental controls by installing Family Link for parents on your own device.<ph name="END_PARAGRAPH2">&lt;/p&gt;</ph>
-    </message>
     <message name="IDS_SETTINGS_CLOSE_ADD_SUPERVISION_DIALOG_SIGN_OUT_BUTTON_LABEL" desc="Text of sign-out button on dialog shown when the Add Supervision flow is closed, which results in a user being signed out.">
       Sign out
     </message>

chrome/browser/ui/webui/chromeos/add_supervision/confirm_signout_dialog.cc

@@ -11,7 +11,6 @@
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
-#include "components/user_manager/user_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
@@ -35,15 +34,12 @@ ConfirmSignoutDialog::ConfirmSignoutDialog() {
       views::LayoutProvider::Get()->GetDialogInsetsForContentType(
           views::DialogContentType::TEXT, views::DialogContentType::TEXT)));
 
-  base::string16 given_name =
-      user_manager::UserManager::Get()->GetPrimaryUser()->GetGivenName();
-
-  // |body_| will be owned by the views system.
+  // |body| will be owned by the views system.
   views::Label* body = new views::Label;
   body->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   body->SetMultiLine(true);
-  body->SetText(l10n_util::GetStringFUTF16(IDS_ADD_SUPERVISION_EXIT_DIALOG_BODY,
-                                           given_name));
+  body->SetText(
+      l10n_util::GetStringUTF16(IDS_ADD_SUPERVISION_EXIT_DIALOG_BODY));
   body->SizeToFit(kDialogBodyTextWidth);
   AddChildView(body);
 }