From f5f985e8cd57a10a6d571982d8cedd0f86bce893 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 15 Mar 2024 10:50:34 -0400
Subject: [PATCH] Fixes overly aggressive string replacements.

---
 .../tab_ui/java/strings/android_chrome_tab_ui_strings.grd    | 2 +-
 .../java/strings/android_chrome_tab_ui_strings_override.grd  | 4 ----
 components/privacy_sandbox_strings.grdp                      | 2 +-
 components/privacy_sandbox_strings_override.grdp             | 5 +----
 script/lib/l10n/grd_string_replacements.py                   | 2 ++
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
index 16d643a664c..eaf9d5e21eb 100644
--- a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
+++ b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -207,7 +207,7 @@
         Hide fullscreen grid
       </message>
       <message name="IDS_TAB_GRID_INVITE_BUTTON_TEXT" desc="Text for sharing the current tab group from the tab group dialog bottom toolbar.">
-        Invite profiles
+        Invite people
       </message>
 
       <!-- Bottom Tab Strip strings -->
diff --git a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings_override.grd b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings_override.grd
index ffc83f6da96..3dc3bfbf1ee 100644
--- a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings_override.grd
+++ b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings_override.grd
@@ -86,10 +86,6 @@
   </translations>
   <release seq="1">
     <messages fallback_to_english="true">
-      <message name="IDS_TAB_GRID_INVITE_BUTTON_TEXT" desc="Text for sharing the current tab group from the tab group dialog bottom toolbar.">
-        Invite profiles
-      </message>
-
       <message name="IDS_CLOSE_ALL_TABS_DIALOG_MESSAGE_WITH_INCOGNITO_TABS" desc="When users click the menu item 'Close all tabs' in tab switcher, a dialog will pop up and this text is the message of the dialog. If there are any Private tabs opened this message would warn users that those Private tabs would be lost.">
       {INCOGNITO_TABS_COUNT, plural,
         =1 {You can find your closed tabs in Recent tabs under the Brave main menu. Your Private tab won't be available.}
diff --git a/components/privacy_sandbox_strings.grdp b/components/privacy_sandbox_strings.grdp
index 7974f5258a1..54d6576103a 100644
--- a/components/privacy_sandbox_strings.grdp
+++ b/components/privacy_sandbox_strings.grdp
@@ -1116,7 +1116,7 @@
     Social Networks
   </message>
   <message name="IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_254" desc="Taxonomy Member. Meaning: [Umbrella category that encompasses social groups and social issues based on personal identity, cultural traditions, family, faith and personal beliefs; &quot;special interest&quot; groups and communities; communities based on age, gender, ethnicity, religion, political affiliation or lifestyle choice; the scientific study of profiles and social groups in the &quot;social sciences&quot;.] Existing Ref: http://tc-message/message/FatCatTaxonomy_Verticals4/5098251294806643822">
-    Profiles &amp; Society
+    People &amp; Society
   </message>
   <message name="IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_255" desc="Taxonomy Member. Meaning: [interpersonal relationships, including family, friendship and romance] Existing Ref: http://tc-message/message/FatCatTaxonomy_Verticals4/1748891129952062597">
     Family &amp; Relationships
diff --git a/components/privacy_sandbox_strings_override.grdp b/components/privacy_sandbox_strings_override.grdp
index b0e14472e18..9ade4084ca4 100644
--- a/components/privacy_sandbox_strings_override.grdp
+++ b/components/privacy_sandbox_strings_override.grdp
@@ -1,9 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <grit-part>
-    <message name="IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_254" desc="Taxonomy Member. Meaning: [Umbrella category that encompasses social groups and social issues based on personal identity, cultural traditions, family, faith and personal beliefs; &quot;special interest&quot; groups and communities; communities based on age, gender, ethnicity, religion, political affiliation or lifestyle choice; the scientific study of profiles and social groups in the &quot;social sciences&quot;.] Existing Ref: http://tc-message/message/FatCatTaxonomy_Verticals4/5098251294806643822">
-    Profiles &amp; Society
-  </message>
-  <message name="IDS_PRIVACY_SANDBOX_TRACKING_PROTECTION_BULLET_ONE_DESCRIPTION" desc="Description of the first explanatory bullet point on the Tracking Protection settings page." formatter_data="android_java">
+    <message name="IDS_PRIVACY_SANDBOX_TRACKING_PROTECTION_BULLET_ONE_DESCRIPTION" desc="Description of the first explanatory bullet point on the Tracking Protection settings page." formatter_data="android_java">
     Most sites can’t use third-party cookies to track you as you browse, and sites can’t use third-party cookies in Private mode.
   </message>
   </grit-part>
diff --git a/script/lib/l10n/grd_string_replacements.py b/script/lib/l10n/grd_string_replacements.py
index cd981c5bddd..ac202e9c8ea 100755
--- a/script/lib/l10n/grd_string_replacements.py
+++ b/script/lib/l10n/grd_string_replacements.py
@@ -68,6 +68,8 @@ fixup_replacements = [
     (r'Brave Projects', r'Chromium Projects'),
     (r'BraveVox', r'ChromeVox'),
     (r'powered by Brave AI', r'powered by Google AI'),
+    (r'Invite profiles', r'Invite people'),
+    (r'Profiles & Society', r'People & Society'),
 ]