[Tab Groups] Update menu strings with an object for better translations.

b/153670807

Bug: 1064674
Change-Id: I398bb52dd11da5a8b26aa491b011359f7f34edd2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2158034Reviewed-by: Connie Wan <connily@chromium.org>
Commit-Queue: Charlene Yan <cyan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761088}

chrome/app/generated_resources.grd

@@ -6309,11 +6309,15 @@ the Bookmarks menu.">
         <message name="IDS_TAB_CXMENU_SOUND_UNMUTE_SITE" desc="The label of the tab context menu item for unmuting one or more sites. NOTE: If having no explicit # makes the phrasing awkward, feel free to add a # as necessary. [ICU Syntax]">
           {NUM_TABS, plural, =1 {Unmute site} other {Unmute sites}}
         </message>
-        <message name="IDS_TAB_CXMENU_ADD_TAB_TO_GROUP" desc="The label of the tab context menu submenu for adding one or more tabs to either a new group or an existing tab group.">
-          Add to group
+        <message name="IDS_TAB_CXMENU_ADD_TAB_TO_GROUP" desc="The label of the tab context menu submenu for adding one or more tabs to either a new group or an existing tab group. NOTE: If having no explicit # makes the phrasing awkward, feel free to add a # as necessary. [ICU Syntax]">
+          {NUM_TABS, plural,
+          =1 {Add tab to group}
+          other {Add tabs to group}}
         </message>
-        <message name="IDS_TAB_CXMENU_ADD_TAB_TO_NEW_GROUP" desc="The label of the tab context menu item for creating a new tab group and adding one or more tabs to it.">
-          Add to new group
+        <message name="IDS_TAB_CXMENU_ADD_TAB_TO_NEW_GROUP" desc="The label of the tab context menu item for creating a new tab group and adding one or more tabs to it. NOTE: If having no explicit # makes the phrasing awkward, feel free to add a # as necessary. [ICU Syntax]">
+          {NUM_TABS, plural,
+          =1 {Add tab to new group}
+          other {Add tabs to new group}}
         </message>
         <message name="IDS_TAB_CXMENU_SUBMENU_NEW_GROUP" desc="The label of the tab context menu sub-menu item for adding one more tabs to a new group.">
           New group
@@ -6372,11 +6376,15 @@ the Bookmarks menu.">
         <message name="IDS_TAB_CXMENU_SOUND_UNMUTE_SITE" desc="In Title Case: The label of the tab context menu item for unmuting one or more sites. NOTE: If having no explicit # makes the phrasing awkward, feel free to add a # as necessary. [ICU Syntax]">
           {NUM_TABS, plural, =1 {Unmute Site} other {Unmute Sites}}
         </message>
-        <message name="IDS_TAB_CXMENU_ADD_TAB_TO_GROUP" desc="In Title Case: The label of the tab context menu submenu for adding one or more tabs to either a new group or an existing tab group.">
-          Add to Group
+        <message name="IDS_TAB_CXMENU_ADD_TAB_TO_GROUP" desc="In Title Case: The label of the tab context menu submenu for adding one or more tabs to either a new group or an existing tab group. NOTE: If having no explicit # makes the phrasing awkward, feel free to add a # as necessary. [ICU Syntax]">
+          {NUM_TABS, plural,
+          =1 {Add Tab to Group}
+          other {Add Tabs to Group}}
         </message>
-        <message name="IDS_TAB_CXMENU_ADD_TAB_TO_NEW_GROUP" desc="In Title Case: The label of the tab context menu item for creating a new tab group and adding one or more tabs to it.">
-          Add to New Group
+        <message name="IDS_TAB_CXMENU_ADD_TAB_TO_NEW_GROUP" desc="In Title Case: The label of the tab context menu item for creating a new tab group and adding one or more tabs to it. NOTE: If having no explicit # makes the phrasing awkward, feel free to add a # as necessary. [ICU Syntax]">
+          {NUM_TABS, plural,
+          =1 {Add Tab to New Group}
+          other {Add Tabs to New Group}}
         </message>
         <message name="IDS_TAB_CXMENU_SUBMENU_NEW_GROUP" desc="In Title Case: The label of the tab context menu sub-menu item for adding one more tabs to a new group.">
           New Group

chrome/app/generated_resources_grd/IDS_TAB_CXMENU_ADD_TAB_TO_GROUP.png.sha1

-e8a529c4df5aae933c85f6dd8e1ec492cc1a0187
\ No newline at end of file
+006fc27ee30265d65d393e9564cf63dd6f63cb07
\ No newline at end of file

chrome/app/generated_resources_grd/IDS_TAB_CXMENU_ADD_TAB_TO_NEW_GROUP.png.sha1

-4bdce84eda61d0dc4dedaa4bbc6a5e9dfeba00a6
\ No newline at end of file
+ce2a41ece9a208503c571beee976599f12bd654d
\ No newline at end of file

chrome/browser/ui/tabs/tab_menu_model.cc

@@ -46,12 +46,14 @@ void TabMenuModel::Build(TabStripModel* tab_strip, int index) {
       add_to_existing_group_submenu_ =
           std::make_unique<ExistingTabGroupSubMenuModel>(delegate(), tab_strip,
                                                          index);
-      AddSubMenuWithStringId(TabStripModel::CommandAddToExistingGroup,
-                             IDS_TAB_CXMENU_ADD_TAB_TO_GROUP,
-                             add_to_existing_group_submenu_.get());
+      AddSubMenu(TabStripModel::CommandAddToExistingGroup,
+                 l10n_util::GetPluralStringFUTF16(
+                     IDS_TAB_CXMENU_ADD_TAB_TO_GROUP, num_affected_tabs),
+                 add_to_existing_group_submenu_.get());
     } else {
-      AddItemWithStringId(TabStripModel::CommandAddToNewGroup,
-                          IDS_TAB_CXMENU_ADD_TAB_TO_NEW_GROUP);
+      AddItem(TabStripModel::CommandAddToNewGroup,
+              l10n_util::GetPluralStringFUTF16(
+                  IDS_TAB_CXMENU_ADD_TAB_TO_NEW_GROUP, num_affected_tabs));
     }
 
     for (size_t index = 0; index < affected_indices.size(); index++) {