[Profile menu] Update strings to match new picker

This CL adapts terminology in the profile menu to the new terminology
in the profile picker: namely replaces "people" with "profiles".

It also removes two strings not used any more.

Bug: 1063856
Change-Id: I467a6ee9a3e5c4eb2600fd47698ea74e6e3c4fe7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521510Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824824}

chrome/app/profiles_strings.grdp

@@ -142,6 +142,9 @@
     <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_LIST_PROFILES_TITLE" desc="Title in the profile menu for the list of 'other profiles'.">
+      Other profiles
+    </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>
@@ -156,6 +159,9 @@
     <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_LIST_PROFILES_TITLE" desc="Title in the profile menu for the list of 'other profiles'.">
+      Other Profiles
+    </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>
@@ -166,11 +172,11 @@
       Manage People
     </message>
   </if>
-  <message name="IDS_PROFILES_EDIT_PROFILE_ACCESSIBLE_NAME" desc="Description of the Edit Profile button. This is used for accessibility.">
-    Edit person, <ph name="PROFILE_NAME">$1<ex>Jane Doe</ex></ph>
+  <message name="IDS_PROFILES_MANAGE_PROFILES_BUTTON_TOOLTIP" desc="Button in the avatar menu bubble view for launching the profile picker.">
+    Manage profiles
   </message>
-  <message name="IDS_PROFILES_EDIT_SIGNED_IN_PROFILE_ACCESSIBLE_NAME" desc="Description of the Edit Profile button for a signed-in profile. This is used for accessibility.">
-    Edit person, <ph name="PROFILE_NAME">$1<ex>Jane Doe</ex></ph>, <ph name="USERNAME">$2<ex>jane.doe@gmail.com</ex></ph>
+  <message name="IDS_PROFILES_CUSTOMIZE_PROFILE_BUTTON_TOOLTIP" desc="Button in the avatar menu bubble view for editing the current profile.">
+    Customize profile
   </message>
   <message name="IDS_PROFILES_GUEST_PROFILE_NAME" desc="Name of the guest profile.">
     Guest

chrome/app/profiles_strings_grdp/IDS_PROFILES_CUSTOMIZE_PROFILE_BUTTON_TOOLTIP.png.sha1

+f9bd39ef826cc947337647265035f48c80130b01
\ No newline at end of file

chrome/app/profiles_strings_grdp/IDS_PROFILES_LIST_PROFILES_TITLE.png.sha1

+d1917d8c0341b8ba7b6f995affa05d332921e3de
\ No newline at end of file

chrome/app/profiles_strings_grdp/IDS_PROFILES_MANAGE_PROFILES_BUTTON_TOOLTIP.png.sha1

+8d87819c890537c2b631164fe5623f0420b50c30
\ No newline at end of file

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

@@ -158,6 +158,10 @@ bool IsGuest(Profile* profile) {
   return profile->IsGuestSession() || profile->IsEphemeralGuestProfile();
 }
 
+bool UseNewPicker() {
+  return base::FeatureList::IsEnabled(features::kNewProfilePicker);
+}
+
 }  // namespace
 
 // ProfileMenuView ---------------------------------------------------------
@@ -453,7 +457,9 @@ void ProfileMenuView::BuildIdentity() {
     profile_name = profile_attributes->GetLocalProfileName();
     edit_button_params = EditButtonParams(
         &vector_icons::kEditIcon,
-        l10n_util::GetStringUTF16(IDS_SETTINGS_EDIT_PERSON),
+        UseNewPicker() ? l10n_util::GetStringUTF16(
+                             IDS_PROFILES_CUSTOMIZE_PROFILE_BUTTON_TOOLTIP)
+                       : l10n_util::GetStringUTF16(IDS_SETTINGS_EDIT_PERSON),
         base::BindRepeating(&ProfileMenuView::OnEditProfileButtonClicked,
                             base::Unretained(this)));
   }
@@ -639,7 +645,9 @@ void ProfileMenuView::BuildFeatureButtons() {
 #if !defined(OS_CHROMEOS)
 void ProfileMenuView::BuildProfileManagementHeading() {
   SetProfileManagementHeading(
-      l10n_util::GetStringUTF16(IDS_PROFILES_OTHER_PROFILES_TITLE));
+      UseNewPicker()
+          ? l10n_util::GetStringUTF16(IDS_PROFILES_LIST_PROFILES_TITLE)
+          : l10n_util::GetStringUTF16(IDS_PROFILES_OTHER_PROFILES_TITLE));
 }
 
 void ProfileMenuView::BuildSelectableProfiles() {
@@ -678,7 +686,10 @@ void ProfileMenuView::BuildSelectableProfiles() {
 void ProfileMenuView::BuildProfileManagementFeatureButtons() {
   AddProfileManagementShortcutFeatureButton(
       vector_icons::kSettingsIcon,
-      l10n_util::GetStringUTF16(IDS_PROFILES_MANAGE_USERS_BUTTON),
+      UseNewPicker()
+          ? l10n_util::GetStringUTF16(
+                IDS_PROFILES_MANAGE_PROFILES_BUTTON_TOOLTIP)
+          : l10n_util::GetStringUTF16(IDS_PROFILES_MANAGE_USERS_BUTTON),
       base::BindRepeating(&ProfileMenuView::OnManageProfilesButtonClicked,
                           base::Unretained(this)));