[Dice] Update strings in settings & sync opt-in dialog

Strings in the Dice settings promos and in the
sync opt-in dialog are updated.

Screenshots:
https://drive.google.com/drive/folders/1_0_w_XxtReLR1JVwYZv5Wmow9zxHqFNO?usp=sharing

Bug: 889262, 872825
Change-Id: I8a784136587c365d5592f252ff49a186db927715
Reviewed-on: https://chromium-review.googlesource.com/1246454
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594541}

chrome/app/generated_resources.grd

@@ -6640,7 +6640,7 @@ the Bookmarks menu.">
         You've signed in and turned on Sync
       </message>
       <message name="IDS_SYNC_CONFIRMATION_DICE_TITLE" desc="Title of the sync confirmation dialog in the tab modal signin flow when Dice is enabled">
-        You've turned on Sync
+        Turn on sync?
       </message>
       <message name="IDS_SYNC_CONFIRMATION_UNITY_TITLE" desc="Title of the sync confirmation dialog in the tab modal signin flow when Unity is enabled">
         Get Google smarts in Chrome
@@ -6710,15 +6710,9 @@ the Bookmarks menu.">
       <message name="IDS_SYNC_CONFIRMATION_DICE_SYNC_SETTINGS_DESCRIPTION" desc="Body of the personalize services section of the sync confirmation dialog in the tab modal signin flow for child accounts">
         Google may use content on sites you visit, plus browser activity and interactions, to personalize Chrome and other Google services like Translate, Search, and ads. You can customize this in Settings.
       </message>
-      <message name="IDS_SYNC_CONFIRMATION_CONFIRM_BUTTON_LABEL" desc="Label of the confirmation button in the sync confirmation dialog of the tab modal signin flow">
-        Ok, got it
-      </message>
       <message name="IDS_SYNC_CONFIRMATION_DICE_CONFIRM_BUTTON_LABEL" desc="Label of the confirmation button in the sync confirmation dialog of the tab modal signin flow">
         Yes, I'm in
       </message>
-      <message name="IDS_SYNC_CONFIRMATION_UNDO_BUTTON_LABEL" desc="Label of the undo button in the sync confirmation dialog of the tab modal signin flow">
-        Undo
-      </message>
       <message name="IDS_SYNC_CONFIRMATION_DICE_SETTINGS_BUTTON_LABEL" desc="Label of the button in the sync confirmation dialog of the tab modal signin flow to open settings">
         Settings
       </message>

chrome/app/settings_chromium_strings.grdp

@@ -89,9 +89,6 @@
   <message name="IDS_SETTINGS_PROFILE_NAME_AND_PICTURE" desc="Label of the link that takes you to the page to edit your name and picture for your chrome profile.">
     Chromium name and picture
   </message>
-  <message name="IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT_SECONDARY_WITH_NO_ACCOUNT" desc="The secondary text displayed to prompt users to sign in to Chromium.">
-    Sign in to sync and personalize Chromium across your devices
-  </message>
   <message name="IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT_SECONDARY_WITH_ACCOUNT" desc="The secondary text displayed to prompt users to enable sync for an account that is alredy present in Chromium.">
     Sync and personalize Chromium across your devices
   </message>

chrome/app/settings_google_chrome_strings.grdp

@@ -89,9 +89,6 @@
   <message name="IDS_SETTINGS_PROFILE_NAME_AND_PICTURE" desc="Label of the link that takes you to the page to edit your name and picture for your chrome profile.">
     Chrome name and picture
   </message>
-  <message name="IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT_SECONDARY_WITH_NO_ACCOUNT" desc="The secondary text displayed to prompt users to sign in to Chrome.">
-    Sign in to sync and personalize Chrome across your devices
-  </message>
   <message name="IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT_SECONDARY_WITH_ACCOUNT" desc="The secondary text displayed to prompt users to enable sync for an account that is alredy present in Chrome.">
     Sync and personalize Chrome across your devices
   </message>

chrome/app/settings_strings.grdp

@@ -3455,9 +3455,6 @@
     <message name="IDS_SETTINGS_PEOPLE_SYNC_ANOTHER_ACCOUNT" desc="The label for the button that lets the user choose another account to sync with.">
       Use another account
     </message>
-    <message name="IDS_SETTINGS_PEOPLE_SYNC_AS_NAME" desc="The label for the button that lets the user start syncing with the selected account.">
-      Sync as <ph name="FULL_NAME">$1<ex>Bob Smith</ex></ph>
-    </message>
     <message name="IDS_SETTINGS_PEOPLE_SYNCING_TO_ACCOUNT" desc="The text displayed to the user that the profile is currently syncing to a specific account.">
       Syncing to <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
     </message>

chrome/browser/resources/settings/people_page/sync_account_control.html

@@ -193,8 +193,7 @@
         <paper-button id="sync-button" class="action-button"
             hidden="[[syncStatus.signedIn]]" on-click="onSyncButtonTap_"
             disabled="[[syncStatus.setupInProgress]]">
-          [[getSubstituteLabel_(
-              '$i18nPolymer{syncAsName}', shownAccount_.givenName)]]
+          $i18n{peopleSignIn}
         </paper-button>
         <paper-button id="turn-off" class="secondary-button"
             hidden="[[!shouldShowTurnOffButton_(syncStatus.signedIn)]]"

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -1644,15 +1644,14 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) {
     {"cancelSync", IDS_SETTINGS_SYNC_SETTINGS_CANCEL_SYNC},
 #endif  // defined(OS_CHROMEOS)
 #if BUILDFLAG(ENABLE_DICE_SUPPORT)
-    {"peopleSignIn", IDS_SETTINGS_PEOPLE_SIGN_IN},
+    {"peopleSignIn", IDS_PROFILES_DICE_SIGNIN_BUTTON},
     {"peopleSignOut", IDS_SETTINGS_PEOPLE_SIGN_OUT},
     {"peopleSignInPrompt", IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT},
     {"peopleSignInPromptSecondaryWithNoAccount",
-     IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT_SECONDARY_WITH_NO_ACCOUNT},
+     IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT_SECONDARY_WITH_ACCOUNT},
     {"peopleSignInPromptSecondaryWithAccount",
      IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT_SECONDARY_WITH_ACCOUNT},
     {"useAnotherAccount", IDS_SETTINGS_PEOPLE_SYNC_ANOTHER_ACCOUNT},
-    {"syncAsName", IDS_SETTINGS_PEOPLE_SYNC_AS_NAME},
     {"syncingTo", IDS_SETTINGS_PEOPLE_SYNCING_TO_ACCOUNT},
     {"turnOffSync", IDS_SETTINGS_PEOPLE_SYNC_TURN_OFF},
     {"signInAgain", IDS_SYNC_ERROR_USER_MENU_SIGNIN_AGAIN_BUTTON},

chrome/browser/ui/webui/signin/sync_confirmation_ui.cc

@@ -134,8 +134,8 @@ SyncConfirmationUI::SyncConfirmationUI(content::WebUI* web_ui)
     title_ids = AccountConsistencyModeManager::IsDiceEnabledForProfile(profile)
                     ? IDS_SYNC_CONFIRMATION_DICE_TITLE
                     : IDS_SYNC_CONFIRMATION_TITLE;
-    confirm_button_ids = IDS_SYNC_CONFIRMATION_CONFIRM_BUTTON_LABEL;
-    undo_button_ids = IDS_SYNC_CONFIRMATION_UNDO_BUTTON_LABEL;
+    confirm_button_ids = IDS_SETTINGS_TURN_ON;
+    undo_button_ids = IDS_CANCEL;
     consent_feature_ = consent_auditor::Feature::CHROME_SYNC;
     if (!is_sync_allowed) {
       title_ids = IDS_SYNC_DISABLED_CONFIRMATION_CHROME_SYNC_TITLE;

chrome/test/data/webui/settings/sync_account_control_test.js

@@ -151,8 +151,6 @@ cr.define('settings_sync_account_control', function() {
       // correct account when clicked.
       assertVisible(syncButton, true);
       assertVisible(testElement.$$('#turn-off'), false);
-      assertTrue(syncButton.textContent.includes('foo'));
-      assertFalse(syncButton.textContent.includes('bar'));
       syncButton.click();
       Polymer.dom.flush();
 
@@ -180,8 +178,6 @@ cr.define('settings_sync_account_control', function() {
             assertTrue(userInfo.textContent.includes('barName'));
             assertTrue(userInfo.textContent.includes('bar@bar.com'));
             assertVisible(syncButton, true);
-            assertTrue(syncButton.textContent.includes('bar'));
-            assertFalse(syncButton.textContent.includes('foo'));
 
             browserProxy.resetResolver('startSyncingWithEmail');
             syncButton.click();