[profile-menu] Update strings

- The sync error description is set to either:
  "Sync is paused" or "Sync isn't working"
- The sync button (no error) is changed to "Sync is on"
- The bottom heading is changed to "Other people"

Bug: 995720
Change-Id: I0f329462773f76c50d44fd178835474c01757b41
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849898
Auto-Submit: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704603}

chrome/app/profiles_strings.grdp

@@ -84,6 +84,9 @@
   <message name="IDS_PROFILES_SYNC_COMPLETE_TITLE" desc="Title of the profile card when sync is complete.">
     Syncing to
   </message>
+  <message name="IDS_PROFILES_OPEN_SYNC_SETTINGS_BUTTON" desc="Button in the profile menu to open sync settings when sync is on.">
+    Sync is on
+  </message>
   <message name="IDS_PROFILES_DICE_SIGNIN_BUTTON" desc="Button in the profile user menu to sign in and turn on Sync.">
     Turn on sync...
   </message>
@@ -118,6 +121,9 @@
     Addresses and more
   </message>
   <if expr="not use_titlecase">
+    <message name="IDS_PROFILES_OTHER_PROFILES_TITLE" desc="Title in the profile menu of the 'other profiles' section.">
+      Other people
+    </message>
     <message name="IDS_PROFILES_PROFILE_MANAGE_ACCOUNTS_BUTTON" desc="Button in the avatar menu bubble view used to manage accounts for a profile.">
       Your accounts
     </message>
@@ -135,6 +141,9 @@
     </message>
   </if>
   <if expr="use_titlecase">
+    <message name="IDS_PROFILES_OTHER_PROFILES_TITLE" desc="Title in the profile menu of the 'other profiles' section.">
+      Other People
+    </message>
     <message name="IDS_PROFILES_PROFILE_MANAGE_ACCOUNTS_BUTTON" desc="Button in the avatar menu bubble view used to manage accounts for a profile.">
       Your Accounts
     </message>

chrome/browser/ui/views/profiles/profile_menu_view.cc

@@ -517,27 +517,25 @@ void ProfileMenuView::BuildSyncInfo() {
     sync_ui_util::AvatarSyncErrorType error =
         sync_ui_util::GetMessagesForAvatarSyncError(
             browser()->profile(), &description_string_id, &button_string_id);
-    switch (error) {
-      case sync_ui_util::NO_SYNC_ERROR:
-        SetSyncInfo(
-            GetSyncIcon(),
-            /*description=*/base::string16(),
-            l10n_util::GetStringUTF16(IDS_SETTINGS_SYNC_ADVANCED_PAGE_TITLE),
-            base::BindRepeating(&ProfileMenuView::OnSyncSettingsButtonClicked,
-                                base::Unretained(this)));
-        break;
-      case sync_ui_util::MANAGED_USER_UNRECOVERABLE_ERROR:
-      case sync_ui_util::UNRECOVERABLE_ERROR:
-      case sync_ui_util::UPGRADE_CLIENT_ERROR:
-      case sync_ui_util::PASSPHRASE_ERROR:
-      case sync_ui_util::SETTINGS_UNCONFIRMED_ERROR:
-      case sync_ui_util::AUTH_ERROR:
-        SetSyncInfo(
-            GetSyncIcon(), l10n_util::GetStringUTF16(description_string_id),
-            l10n_util::GetStringUTF16(button_string_id),
-            base::BindRepeating(&ProfileMenuView::OnSyncErrorButtonClicked,
-                                base::Unretained(this), error));
-        break;
+
+    if (error == sync_ui_util::NO_SYNC_ERROR) {
+      SetSyncInfo(
+          GetSyncIcon(),
+          /*description=*/base::string16(),
+          l10n_util::GetStringUTF16(IDS_PROFILES_OPEN_SYNC_SETTINGS_BUTTON),
+          base::BindRepeating(&ProfileMenuView::OnSyncSettingsButtonClicked,
+                              base::Unretained(this)));
+    } else {
+      // Overwrite error description with short version for the menu.
+      description_string_id = (error == sync_ui_util::AUTH_ERROR)
+                                  ? IDS_PROFILES_DICE_SYNC_PAUSED_TITLE
+                                  : IDS_SYNC_ERROR_USER_MENU_TITLE;
+
+      SetSyncInfo(
+          GetSyncIcon(), l10n_util::GetStringUTF16(description_string_id),
+          l10n_util::GetStringUTF16(button_string_id),
+          base::BindRepeating(&ProfileMenuView::OnSyncErrorButtonClicked,
+                              base::Unretained(this), error));
     }
     return;
   }
@@ -594,7 +592,8 @@ void ProfileMenuView::BuildAccountFeatureButtons() {
 }
 
 void ProfileMenuView::BuildProfileHeading() {
-  SetProfileHeading(l10n_util::GetStringUTF16(IDS_PROFILES_OPTIONS_GROUP_NAME));
+  SetProfileHeading(
+      l10n_util::GetStringUTF16(IDS_PROFILES_OTHER_PROFILES_TITLE));
 }
 
 void ProfileMenuView::BuildSelectableProfiles() {