Uplift of #26098 (squashed) to beta

brave · Oct 18, 2024 · 2ea1138 · 2ea1138
1 parent d4e3c59
commit 2ea1138
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp
@@ -933,7 +933,7 @@
     Automatically indexes websites that follow the OpenSearch spec.
   </message>
   <message name="IDS_SETTINGS_NORMAL_PROFILE_SEARCH_EXPLANATION" desc="Explanation for the search engine dropdown setting.">
-    Normal Window - Search engine used in the address bar
+    Normal Window - Search engine used in the address bar.
   </message>
   <message name="IDS_SETTINGS_PRIVATE_PROFILE_SEARCH_EXPLANATION" desc="Explanation for the search engine dropdown setting.">
     Private Window - Search engine used in the address bar

diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -12,9 +12,10 @@
 // Override some chromium strings
 #include "chrome/grit/branded_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/strings/grit/components_strings.h"
 
-#undef IDS_SETTINGS_SEARCH_EXPLANATION
-#define IDS_SETTINGS_SEARCH_EXPLANATION \
+#undef IDS_SEARCH_ENGINE_CHOICE_SETTINGS_ENTRY_POINT_SUBTITLE
+#define IDS_SEARCH_ENGINE_CHOICE_SETTINGS_ENTRY_POINT_SUBTITLE \
   IDS_SETTINGS_NORMAL_PROFILE_SEARCH_EXPLANATION
 
 #undef IDS_SETTINGS_CUSTOMIZE_PROFILE
@@ -76,4 +77,4 @@
 #undef IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO
 #undef IDS_SETTINGS_CUSTOMIZE_YOUR_CHROME_PROFILE
 #undef IDS_SETTINGS_CUSTOMIZE_PROFILE
-#undef IDS_SETTINGS_SEARCH_EXPLANATION
+#undef IDS_SEARCH_ENGINE_CHOICE_SETTINGS_ENTRY_POINT_SUBTITLE