Update strings for the OS sync section for SplitSettingsSync

We now have updated strings in go/cros-sync-mock, so remove some of
the placeholders.

There's still a placeholder for the feature description because that
line will be replaced with a sync status component that requires more
refactoring before I can use it.

Bug: 1013466
Change-Id: I4ccfcb408dcf3b01088a158fa01567c69d7babd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986961Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728346}

chrome/app/os_settings_strings.grdp

@@ -17,13 +17,22 @@
      =1 {<ph name="EMAIL">$1<ex>alice@example.com</ex></ph>, +1 more account}
      other {<ph name="EMAIL">$1<ex>alice@example.com</ex></ph>, +<ph name="EXTRA_ACCOUNTS">$2<ex>2</ex></ph> more accounts}}
   </message>
-  <message name="IDS_OS_SETTINGS_SYNC_OS_APPS_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of apps from the Google Play Store across devices.">
-    Play Store apps
+  <message name="IDS_OS_SETTINGS_SYNC_PAGE_TITLE" desc="Settings sub-page title for sync.">
+    Sync your settings
+  </message>
+  <message name="IDS_OS_SETTINGS_SYNC_TURN_ON" desc="Button label for turning on sync. Sync is capitalized because it is the proper name of a feature.">
+    Turn on Sync
+  </message>
+  <message name="IDS_OS_SETTINGS_SYNC_TURN_OFF" desc="Button label for turning off sync. Sync is capitalized because it is the proper name of a feature.">
+    Turn off Sync
+  </message>
+  <message name="IDS_OS_SETTINGS_SYNC_APPS_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of apps across devices.">
+    Apps
   </message>
   <message name="IDS_OS_SETTINGS_SYNC_PRINTERS_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of printers across devices.">
     Printers
   </message>
-  <message name="IDS_OS_SETTINGS_SYNC_OS_SETTINGS_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of OS settings across devices.">
+  <message name="IDS_OS_SETTINGS_SYNC_SETTINGS_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of OS settings across devices.">
     Settings
   </message>
   <message name="IDS_OS_SETTINGS_WALLPAPER_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of wallpaper across devices.">

chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SYNC_APPS_CHECKBOX_LABEL.png.sha1

+11cea5c78b8da11be25bd175bec9be0175d6fbf2
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SYNC_PAGE_TITLE.png.sha1

+bd03f9fe0e494c62da01f48bf65f44dd6ac7a719
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SYNC_SETTINGS_CHECKBOX_LABEL.png.sha1

+510105de3d5aca47da2bd0e0544b5982f0cde71c
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SYNC_TURN_OFF.png.sha1

+63f8ef2875ef3f7525c1eb2512c24e64ce2676c2
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SYNC_TURN_ON.png.sha1

+e5cee8ca272e5b43525bfdcbf3b465e04e70b2b6
\ No newline at end of file

chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.html

@@ -183,7 +183,7 @@
 
       <!-- Post-SplitSettingsSync we have separate OS sync controls. -->
       <template is="dom-if" route-path="/osSync">
-        <settings-subpage page-title="$i18n{syncAdvancedPageTitle}"
+        <settings-subpage page-title="$i18n{osSyncPageTitle}"
             associated-control="[[$$('#sync-setup')]]"
             learn-more-url="$i18n{syncAndGoogleServicesLearnMoreURL}">
           <os-sync-controls sync-status="[[syncStatus]]">

chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js

@@ -193,7 +193,7 @@ Polymer({
    */
   getSyncRowLabel_: function() {
     if (this.splitSettingsSyncEnabled_) {
-      return this.i18n('peopleOsSyncRowLabel');
+      return this.i18n('osSyncPageTitle');
     } else {
       return this.i18n('syncAndNonPersonalizedServices');
     }

chrome/browser/resources/settings/chromeos/os_people_page/os_sync_controls.html

@@ -40,13 +40,13 @@
           on-click="onTurnOnSyncButtonClick_"
           aria-describedby="featureLabel"
           hidden="[[osSyncFeatureEnabled]]">
-        Turn on PLACEHOLDER
+        $i18n{osSyncTurnOn}
       </cr-button>
       <cr-button id="turnOffSyncButton"
           on-click="onTurnOffSyncButtonClick_"
           aria-describedby="featureLabel"
           hidden="[[!osSyncFeatureEnabled]]">
-        Turn off PLACEHOLDER
+        $i18n{osSyncTurnOff}
       </cr-button>
     </div>
     <div class="settings-box">
@@ -67,7 +67,7 @@
       <div class="list-item" hidden="[[!osSyncPrefs.osAppsRegistered]]">
         <div id="osAppsCheckboxLabel"
             label-disabled$="[[areDataTypeTogglesDisabled_]]">
-          $i18n{syncOsAppsCheckboxLabel}
+          $i18n{osSyncAppsCheckboxLabel}
         </div>
         <cr-toggle id="osAppsControl"
             checked="{{osSyncPrefs.osAppsSynced}}"
@@ -80,7 +80,7 @@
       <div class="list-item" hidden="[[!osSyncPrefs.osPreferencesRegistered]]">
         <div id="osSettingsCheckboxLabel"
             label-disabled$="[[areDataTypeTogglesDisabled_]]">
-          $i18n{syncOsSettingsCheckboxLabel}
+          $i18n{osSyncSettingsCheckboxLabel}
         </div>
         <cr-toggle id="osPreferencesControl"
             checked="{{osSyncPrefs.osPreferencesSynced}}"

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

@@ -2138,10 +2138,12 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) {
     {"photoCaptureAccessibleText", IDS_SETTINGS_PHOTO_CAPTURE_ACCESSIBLE_TEXT},
     {"photoDiscardAccessibleText", IDS_SETTINGS_PHOTO_DISCARD_ACCESSIBLE_TEXT},
     {"photoModeAccessibleText", IDS_SETTINGS_PHOTO_MODE_ACCESSIBLE_TEXT},
-    {"syncOsAppsCheckboxLabel", IDS_OS_SETTINGS_SYNC_OS_APPS_CHECKBOX_LABEL},
-    {"syncOsSettingsCheckboxLabel",
-     IDS_OS_SETTINGS_SYNC_OS_SETTINGS_CHECKBOX_LABEL},
-    {"syncPrintersCheckboxLabel", IDS_OS_SETTINGS_SYNC_PRINTERS_CHECKBOX_LABEL},
+    {"osSyncPageTitle", IDS_OS_SETTINGS_SYNC_PAGE_TITLE},
+    {"osSyncTurnOn", IDS_OS_SETTINGS_SYNC_TURN_ON},
+    {"osSyncTurnOff", IDS_OS_SETTINGS_SYNC_TURN_OFF},
+    {"osSyncAppsCheckboxLabel", IDS_OS_SETTINGS_SYNC_APPS_CHECKBOX_LABEL},
+    {"osSyncSettingsCheckboxLabel",
+     IDS_OS_SETTINGS_SYNC_SETTINGS_CHECKBOX_LABEL},
     {"videoModeAccessibleText", IDS_SETTINGS_VIDEO_MODE_ACCESSIBLE_TEXT},
     {"wifiConfigurationsCheckboxLabel",
      IDS_SETTINGS_WIFI_CONFIGURATIONS_CHECKBOX_LABEL},
@@ -2237,8 +2239,6 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) {
   };
   AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 #if defined(OS_CHROMEOS)
-  // TODO(crbug.com/1013466): String for this row label.
-  html_source->AddString("peopleOsSyncRowLabel", "SYNC PLACEHOLDER LABEL");
   AddFingerprintStrings(html_source);
 #endif  // OS_CHROMEOS
   html_source->AddString("managementPage",