[unified-consent] Update settings strings

The following strings are updated as part of the
transition to Unity:
 - the title of the sync setup and personalization page
 - sync section title and description
 - personalization title
 - unity master toggle title
 - Sign-in prompt title

Mocks:
https://gallery.googleplex.com/projects/MCHbtQVoQ2HCZWnUS9sdsb0Q/files/MCHtA7U1iMGr68-mD5nfi-3ML6EZ2WWTC08

TBR=dpapad@chromium.org

Bug: 853187
Cq-Include-Trybots: luci.chromium.try:closure_compilation
Change-Id: I3184c5e9c8614a1d7bdd900f346b19769e2c985d
Reviewed-on: https://chromium-review.googlesource.com/1102501
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: Scott Chen <scottchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571432}

chrome/app/settings_strings.grdp

@@ -3186,10 +3186,7 @@
     Google Profile photo
   </message>
   <message name="IDS_SETTINGS_PEOPLE_SYNC_UNIFIED_CONSENT_TOGGLE_TITLE" desc="The title of the toggle to opt into unified consent and enable all its services.">
-    Sync and personalize Chrome across you devices
-  </message>
-  <message name="IDS_SETTINGS_PEOPLE_SYNC_UNIFIED_CONSENT_TOGGLE_SUBTITLE" desc="The subtitle of the toggle to opt into unified consent and enable all its services.">
-    Uses content on sites you visit and browser activity and interations.
+    Use sync and all services
   </message>
   <message name="IDS_SETTINGS_PEOPLE_SIGN_OUT" desc="The label of the button that lets user sign-out of Chrome.">
     Sign out
@@ -3392,7 +3389,7 @@
       Sign in
     </message>
     <message name="IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT" desc="The text displayed to prompt users to sign in to chrome.">
-      Web browsing with Google smarts
+      Get Google smarts in Chrome
     </message>
     <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
@@ -3457,23 +3454,29 @@
   <message name="IDS_SETTINGS_SYNC" desc="Name of the sync service.">
     Sync
   </message>
+  <message name="IDS_SETTINGS_SYNC_UNIFIED_CONSENT" desc="Name of the sync service when unified consent is enabled.">
+    Sync and personalization
+  </message>
   <message name="IDS_SETTINGS_SYNC_DESCRIPTION" desc="Text explaining what the sync system does.">
     Passwords, bookmarks, history, and more are synced to your account
   </message>
+  <message name="IDS_SETTINGS_SYNC_DESCRIPTION_UNIFIED_CONSENT" desc="Text explaining what the sync system does, when unified consent is enabled.">
+    Your browsing data and activity, synced to your Google account.
+  </message>
   <message name="IDS_SETTINGS_SYNC_SECTION_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the sync settings. Only visible by screen reader software.">
     Show sync settings
   </message>
-  <message name="IDS_SETTINGS_PERSONALIZATION_SECTION_LABEL" desc="Title for a section that shows options for various Google services">
-    Other Google services
+  <message name="IDS_SETTINGS_NON_PERSONALIZED_SERVICES_SECTION_LABEL" desc="Title for a section that shows options for various Google services">
+    Non-personalized services
   </message>
-  <message name="IDS_SETTINGS_PERSONALIZATION_SECTION_DESC" desc="Brief explanation of the capability of Google services.">
+  <message name="IDS_SETTINGS_NON_PERSONALIZED_SERVICES_SECTION_DESC" desc="Brief explanation of the capability of Google services.">
     Communicate with Google to improve browsing and Chrome
   </message>
-  <message name="IDS_SETTINGS_PERSONALIZATION_SECTION_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the google services settings. Only visible by screen reader software.">
+  <message name="IDS_SETTINGS_NON_PERSONALIZED_SERVICES_SECTION_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the google services settings. Only visible by screen reader software.">
     Show Google services settings
   </message>
-  <message name="IDS_SETTINGS_SYNC_SYNC_AND_PERSONALIZATION" desc="The name of the settings page and the label of the button that takes the user to manage their sync and personalization settings.">
-    Sync and personalization
+  <message name="IDS_SETTINGS_SYNC_SYNC_AND_NON_PERSONALIZED_SERVICES" desc="The name of the settings page and the label of the button that takes the user to manage their sync and non-personalized services settings.">
+    Sync and Google services
   </message>
   <message name="IDS_SETTINGS_SYNC_PAGE_TITLE" desc="Name of the settings page which manages syncing data between multiple browser instances with the same Google profile.">
     Advanced sync settings
@@ -3488,9 +3491,6 @@
     <message name="IDS_SETTINGS_SYNC_SETTINGS_CANCEL_SYNC" desc="The label of button that allows user to cancel sync.">
       Cancel sync
     </message>
-    <message name="IDS_SETTINGS_SYNC_SIGN_IN_PROMPT_SECONDARY" desc="The secondary text displayed to prompt users to sign in to chrome.">
-      Turns on the features listed here. Uses your browser activity, content on some sites you visit, and other browser interactions for personalization.
-    </message>
   </if>
   <message name="IDS_SETTINGS_SYNC_TIMEOUT" desc="Text explaining what to do if sync times out.">
     Check your internet connection. If the problem continues, try signing out and signing in again.

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

@@ -269,7 +269,7 @@
         <template is="dom-if" if="[[unifiedConsentEnabled_]]">
           <div class="settings-box" id="sync-setup" on-click="onSyncTap_"
               actionable>
-            <div class="start">$i18n{syncAndPersonalization}</div>
+            <div class="start">$i18n{syncAndNonPersonalizedServices}</div>
             <paper-icon-button-light class="subpage-arrow">
               <button aria-label="$i18n{sync}"></button>
             </paper-icon-button-light>

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

@@ -82,11 +82,12 @@
         syncStatus.signinAllowed)]]">
       <settings-sync-account-control always-show-promo
           sync-status="[[syncStatus]]"
-          promo-label-with-account="$i18n{syncSignInPromptWithAccount}"
-          promo-label-with-no-account="$i18n{syncSignInPromptWithNoAccount}"
-          promo-secondary-label-with-account="$i18n{syncSignInPromptSecondary}"
+          promo-label-with-account="$i18n{peopleSignInPrompt}"
+          promo-label-with-no-account="$i18n{peopleSignInPrompt}"
+          promo-secondary-label-with-account=
+              "$i18n{peopleSignInPromptSecondaryWithAccount}"
           promo-secondary-label-with-no-account=
-              "$i18n{syncSignInPromptSecondary}">
+              "$i18n{peopleSignInPromptSecondaryWithNoAccount}">
       </settings-sync-account-control>
     </template>
 </if>
@@ -403,8 +404,10 @@
       <div class="settings-box two-line" id="personalize-section-toggle"
           actionable on-click="toggleExpandButton_">
         <div class="start">
-          <div>$i18n{personalizationSectionLabel}</div>
-          <div class="secondary">$i18n{personalizationSectionDesc}</div>
+          <div>$i18n{nonPersonalizedServicesSectionLabel}</div>
+          <div class="secondary">
+            $i18n{nonPersonalizedServicesSectionDesc}
+          </div>
         </div>
         <cr-expand-button expanded="{{personalizeSectionOpened_}}"
             alt="$i18n{syncExpandA11yLabel}">

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

@@ -1620,7 +1620,6 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) {
      IDS_SETTINGS_SYNC_SIGN_IN_PROMPT_WITH_ACCOUNT},
     {"syncSignInPromptWithNoAccount",
      IDS_SETTINGS_SYNC_SIGN_IN_PROMPT_WITH_NO_ACCOUNT},
-    {"syncSignInPromptSecondary", IDS_SETTINGS_SYNC_SIGN_IN_PROMPT_SECONDARY},
 #endif
     {"syncUnifiedConsentToggleTitle",
      IDS_SETTINGS_PEOPLE_SYNC_UNIFIED_CONSENT_TOGGLE_TITLE},
@@ -1641,16 +1640,23 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) {
     {"deleteProfileWarningWithoutCounts",
      IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITHOUT_COUNTS},
     {"syncDisconnectConfirm", IDS_SETTINGS_SYNC_DISCONNECT_CONFIRM},
-    {"sync", IDS_SETTINGS_SYNC},
-    {"syncDescription", IDS_SETTINGS_SYNC_DESCRIPTION},
-    {"personalizationSectionLabel", IDS_SETTINGS_PERSONALIZATION_SECTION_LABEL},
-    {"personalizationSectionDesc", IDS_SETTINGS_PERSONALIZATION_SECTION_DESC},
-    {"personalizationExpandA11yLabel",
-     IDS_SETTINGS_PERSONALIZATION_SECTION_ACCESSIBILITY_LABEL},
+    {"sync", IsUnifiedConsentEnabled(profile)
+                 ? IDS_SETTINGS_SYNC_UNIFIED_CONSENT
+                 : IDS_SETTINGS_SYNC},
+    {"syncDescription", IsUnifiedConsentEnabled(profile)
+                            ? IDS_SETTINGS_SYNC_DESCRIPTION_UNIFIED_CONSENT
+                            : IDS_SETTINGS_SYNC_DESCRIPTION},
+    {"nonPersonalizedServicesSectionLabel",
+     IDS_SETTINGS_NON_PERSONALIZED_SERVICES_SECTION_LABEL},
+    {"nonPersonalizedServicesSectionDesc",
+     IDS_SETTINGS_NON_PERSONALIZED_SERVICES_SECTION_DESC},
+    {"nonPersonalizedServicesExpandA11yLabel",
+     IDS_SETTINGS_NON_PERSONALIZED_SERVICES_SECTION_ACCESSIBILITY_LABEL},
     {"syncExpandA11yLabel", IDS_SETTINGS_SYNC_SECTION_ACCESSIBILITY_LABEL},
-    {"syncAndPersonalization", IDS_SETTINGS_SYNC_SYNC_AND_PERSONALIZATION},
+    {"syncAndNonPersonalizedServices",
+     IDS_SETTINGS_SYNC_SYNC_AND_NON_PERSONALIZED_SERVICES},
     {"syncPageTitle", IsUnifiedConsentEnabled(profile)
-                          ? IDS_SETTINGS_SYNC_SYNC_AND_PERSONALIZATION
+                          ? IDS_SETTINGS_SYNC_SYNC_AND_NON_PERSONALIZED_SERVICES
                           : IDS_SETTINGS_SYNC_PAGE_TITLE},
     {"syncLoading", IDS_SETTINGS_SYNC_LOADING},
     {"syncTimeout", IDS_SETTINGS_SYNC_TIMEOUT},