BASELINE: Update Chromium to 84.0.4147.141

Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 33 insertions, 2 deletions

diff --git a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
index 4822c50885f..e94261fc27d 100644
--- a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
+++ b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -68,6 +68,7 @@
     <output filename="values-sl/android_chrome_tab_ui_strings.xml" lang="sl" type="android" />
     <output filename="values-sq/android_chrome_tab_ui_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_tab_ui_strings.xml" lang="sr" type="android" />
+    <output filename="values-b+sr+Latn/android_chrome_tab_ui_strings.xml" lang="sr-Latn" type="android" />
     <output filename="values-sv/android_chrome_tab_ui_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_tab_ui_strings.xml" lang="sw" type="android" />
     <output filename="values-ta/android_chrome_tab_ui_strings.xml" lang="ta" type="android" />
@@ -205,6 +206,9 @@
       <message name="IDS_ACCESSIBILITY_BOTTOM_TAB_STRIP_EXPAND_TAB_SHEET" desc="Accessibility string for BottomTabStripToolbar button indicated visually by the '^' sign.">
         Show group's tabs in fullscreen grid
       </message>
+        <message name="IDS_ACCESSIBILITY_BOTTOM_TAB_STRIP_CLOSE_STRIP" desc="Accessibility string for BottomTabStripToolbar button indicated visually by the 'X' sign. When user clicks on it, the tab strip will be closed.">
+        Close tab strip
+      </message>
 
       <!-- Tab Group Tab Switcher strings -->
       <message name="IDS_TABSWITCHER_CREATE_GROUP" desc="This flat button is shown in the Tab Switcher, under an open tab. When the user taps the button, Chrome creates a new group of tabs that includes the existing tab. It's okay to use any of the following verbs in order to keep the text under 45 characters: Create, Make, Add.">
@@ -218,6 +222,12 @@
       <message name="IDS_TAB_SELECTION_EDITOR_TOOLBAR_SELECT_TABS" desc="Label shown on Tab Selection Editor Toolbar asking user to select tabs from the list.">
         Select tabs
       </message>
+      <message name="IDS_ACCESSIBILITY_TAB_SELECTION_EDITOR_GROUP_BUTTON" desc="The accessibility text to read when the 'Group' text button in the selection mode toolbar is focused. When this button is tapped, all the selected tabs will be grouped together.">
+        {TABS_COUNT, plural,
+          =1 {Group <ph name="TABS_COUNT_ONE">%1$d<ex>1</ex></ph> selected tab}
+          other {Group <ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> selected tabs}
+        }
+      </message>
 
       <!-- Tab Grid Dialog strings -->
       <message name="IDS_TAB_GRID_DIALOG_REMOVE_FROM_GROUP" desc="This text shows on the ungroup bar in TabGridDialog. When user drags a tab and drops it on the ungroup bar, this tab will be moved out of the group.">
@@ -256,7 +266,7 @@
       </message>
 
       <!-- Tab Suggestion strings -->
-      <message name="IDS_TAB_SUGGESTION_REVIEW_BUTTON" desc="This text button shows next the message 'X of your tabs haven't been used lately. Close them?'. When a user clicks this 'Review' text button, they will enter a selection mode where they can see the suggested tabs to close, see the rest of their open tabs, and choose what tabs to close.">
+      <message name="IDS_TAB_SUGGESTION_REVIEW_BUTTON" desc="This text button shows next to the message 'X of your tabs haven't been used lately. Close them?', or 'X tabs seem related. Group them?'. When a user clicks this 'Review' text button, they will enter a selection mode where they can see the suggested tabs to close or to group, see the rest of their open tabs, and choose what tabs to close or to group.">
           Review
       </message>
       <message name="IDS_TAB_SUGGESTION_CLOSE_TAB_ACTION_BUTTON" desc="When a user chooses to review suggested tabs to close, they enter a section mode to review and close the tabs. In that selection mode, this text button in the toolbar lets the user finalize their choices. When this button is tapped, all the selected tabs will be closed.">
@@ -265,13 +275,20 @@
       <message name="IDS_TAB_SUGGESTION_CLOSE_STALE_MESSAGE" desc="On Chrome mobile, this text shows as a suggestion under a user's tabs. The suggestion prompts the user to automatically close some tabs that haven't been used lately. The placeholder denotes the number of suggested tabs to close, which will always be 2 or more (so 'tabs' should be plural).">
           <ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> of your tabs haven't been used lately. Close them?
       </message>
+      <message name="IDS_TAB_SUGGESTION_GROUP_TABS_MESSAGE" desc="On Chrome mobile, this text shows as a suggestion under a user's tabs. The suggestion prompts the user to automatically group some tabs that haven been detected as closely related to each other. The placeholder denotes the number of suggested tabs to group, which will always be 2 or more (so 'tabs' should be plural).">
+          <ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> tabs seem related. Group them?
+      </message>
+
       <!-- Accessibility strings for Tab Suggestion -->
-      <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_REVIEW_BUTTON" desc="The accessibility text to read when the text button 'Review' is focused. The 'Review' button is shown next to the message 'X of your tabs haven't been used lately. Close them?'. User uses that text button to enter a selection mode where they can see the suggested tabs to close, see the rest of their open tabs, and choose what tabs to close.">
+      <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_REVIEW_BUTTON" desc="The accessibility text to read when the text button 'Review' is focused. The 'Review' button is shown next to the message 'X of your tabs haven't been used lately. Close them?', or 'X tabs seem related. Group them?'. User uses that text button to enter a selection mode where they can see the suggested tabs to close or to group, see the rest of their open tabs, and choose what tabs to close or to group.">
         Review the suggestions.
       </message>
       <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_CLOSE_STALE_MESSAGE" desc="The accessibility text to read when the TAB_SUGGESTION card is focused">
         Suggestion: <ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> of your tabs haven't been used lately. Close them?
       </message>
+      <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_GROUP_TABS_MESSAGE" desc="The accessibility text to read when the TAB_SUGGESTION card is focused">
+        Suggestion: <ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> tabs seem related. Group them?
+      </message>
       <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_DISMISS_BUTTON" desc="The accessibility text to read when the 'X' button on the TAB_SUGGESTION card is focused">
         Dismiss the suggestions.
       </message>
@@ -295,6 +312,20 @@
        <message name="IDS_ACCESSIBILITY_TAB_MOVEMENT_DOWN" desc="This text button shows in the accessibility mode action menu. When user selects a tab, triggers action menu and clicks on this button, the current tab will switch position with the tab below it in the grid to achieve reordering.">
           Move tab down
       </message>
+
+      <!-- Strings for Conditional Tab Strip -->
+      <message name="IDS_UNDO_TAB_STRIP_CLOSURE_MESSAGE" desc="Message shown on the snack bar when the conditional tab strip is closed.">
+          Closed tab strip
+      </message>
+      <message name="IDS_TAB_STRIP_INFO_BAR_QUESTION" desc="This text is shown on the info bar when the user has dismissed the tab strip for multiple times. It is to ask whether users want the tab strip to hide permanently or they still want it to show sometime later.">
+          Don't show tab strip again?
+      </message>
+      <message name="IDS_TAB_STRIP_INFO_BAR_NO_RESHOW" desc="This text is shown on the info bar action button and serves as one answer to &quot;Don't show tab strip again?&quot;. When a user clicks this button, tab strip will never show again for this user.">
+          Don't show again
+      </message>
+      <message name="IDS_TAB_STRIP_INFO_BAR_RESHOW" desc="This text is shown on the info bar action button and serves as one answer to &quot;Don't show tab strip again?&quot;. When a user clicks this button, tab strip will keep showing for this user.">
+          Show later
+      </message>
     </messages>
   </release>
 </grit>