Update crash reporting settings strings (#11360)

* Update crash reporting settings strings
* clang format
* Fix type

app/brave_generated_resources.grd

@@ -275,6 +275,13 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
       <message name="IDS_UNVETTED_EXTENSION_INSTALL_PROMPT_TITLE" desc="Titlebar of the extension or app installation prompt which was not vetted by Brave. Asks the user if they want to install a particular extension or app.">
         Brave does not review extensions for security and safety. Only install this extension if you trust the developer.
       </message>
+      <!-- Settings / Diagnostic reports -->
+      <message name="IDS_BRAVE_DIAGNOSTIC_REPORTS_PREF" desc="The label of the checkbox to enable/disable sending diagnostic reports (crashes, hangs).">
+        Automatically send diagnostic reports
+      </message>
+      <message name="IDS_BRAVE_DIAGNOSTIC_REPORTS_PREF_DESC" desc="The description of the checkbox to enable/disable sending diagnostic reports (crashes, hangs).">
+        Help improve Brave's product stability by automatically sending diagnostic reports when the Brave Browser crashes or freezes.
+      </message>
       <!-- Settings / Get Started -->
       <message name="IDS_SETTINGS_BRAVE_EDIT_PROFILE" desc="Title to edit the profile user name and picture">
         Profile name and icon
@@ -1308,7 +1315,7 @@ Are you sure you want to do this?
           Don't ask again
         </message>
         <message name="IDS_CRASH_REPORT_PERMISSION_ASK_DIALOG_CONTENT_TEXT" desc="The contents for crash report ask dialog">
-          Send crash reports automatically so Brave can prevent this issue from happening again?
+          Help improve Brave's product stability by automatically sending diagnostic reports when the Brave Browser crashes or freezes.
         </message>
         <message name="IDS_CRASH_REPORT_PERMISSION_ASK_DIALOG_HEADER_TEXT" desc="The header text for crash report ask dialog">
           <ph name="BROWSER_NAME">$1<ex>Brave Browser</ex></ph> quit unexpectedly.
@@ -1317,7 +1324,7 @@ Are you sure you want to do this?
           Brave Browser
         </message>
         <message name="IDS_CRASH_REPORT_PERMISSION_ASK_DIALOG_FOOTNOTE_TEXT" desc="The footnote text for crash report ask dialog.">
-          You can change <ph name="SETTING_TEXT">$1<ex>this setting</ex></ph> again at any time.
+          You can change <ph name="SETTING_TEXT">$1<ex>this</ex></ph> at any time in browser settings.
         </message>
         <message name="IDS_CRASH_REPORT_PERMISSION_ASK_DIALOG_FOOTNOTE_TEXT_SETTING_PART" desc="This is used for replacing SETTING_TEXT from above FOOTNOTE_TEXT.">
           this setting

app/generated_resources.grd

@@ -7474,7 +7474,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
 
       <!-- First-run dialog -->
       <message name="IDS_FR_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging">
-        Automatically send crash reports to Brave
+        Automatically send usage statistics and crash reports to Brave
       </message>
 
       <!-- Mac First-run dialog messages -->

app/generated_resources_override.grd

@@ -649,10 +649,6 @@ are declared in tools/grit/grit_rule.gni.
       <if expr="is_macosx">
         </if>
 
-      <message name="IDS_FR_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging">
-        Automatically send crash reports to Brave
-      </message>
-
       <if expr="is_macosx">
         </if>
 

app/shared_settings_strings.grdp

@@ -214,7 +214,7 @@
     Help improve Brave's features and performance
   </message>
   <message name="IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC" desc="The description of the checkbox to enable/disable crash and user metrics logging">
-    Automatically sends crash reports to Brave
+    Automatically sends usage statistics and crash reports to Brave
   </message>
   <message name="IDS_SETTINGS_LINKDOCTOR_PREF" desc="The documentation string of the 'Use Link Doctor' preference to help with navigation errors.">
     Show suggestions for similar pages when a page can't be found

app/shared_settings_strings_override.grdp

@@ -4,9 +4,6 @@
   <message name="IDS_SETTINGS_NEARBY_SHARE_DESCRIPTION" desc="A description of nearby share that helps users understand what the feature is used for.">
     Share files with profiles around you. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
   </message>
-  <message name="IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC" desc="The description of the checkbox to enable/disable crash and user metrics logging">
-    Automatically sends crash reports to Brave
-  </message>
   <if expr="chromeos">
     </if>
 

browser/ui/android/strings/android_brave_strings.grd

@@ -315,11 +315,11 @@ This file contains all "about" strings.  It is set to NOT be translated, in tran
       <message name="IDS_SEND_P3A_ANALYTICS_SUMMARY" desc="Summary for checkbox of send p3a analytics.">
         Anonymized P3A info helps Brave estimate overall usage, and ensure we’re improving popular features.
       </message>
-      <message name="IDS_SEND_CRASH_REPORTS_TITLE" desc="Title for checkbox of send crash reports automatically.">
-        Automatically send crash reports
+      <message name="IDS_SEND_CRASH_REPORTS_TITLE" desc="Title for checkbox enable/disable sending diagnostic reports (crashes, hangs).">
+        Automatically send diagnostic reports
       </message>
-      <message name="IDS_SEND_CRASH_REPORTS_SUMMARY" desc="Summary for checkbox of send crash reports automatically.">
-        Crash reports help Brave improve product stability for all users.
+      <message name="IDS_SEND_CRASH_REPORTS_SUMMARY" desc="Summary for checkbox enable/disable sending diagnostic reports (crashes, hangs).">
+        Help improve Brave\u2019s product stability by automatically sending diagnostic reports when the Brave Browser crashes or freeze.
       </message>
       <message name="IDS_BRAVE_STATS_TEXT_DATA_SAVED" desc="Title for the data saved stats">
         Est. Data\nSaved

browser/ui/android/strings/android_chrome_strings.grd

@@ -354,7 +354,7 @@ CHAR_LIMIT guidelines:
         Help improve Brave\u2019s features and performance
       </message>
       <message name="IDS_USAGE_AND_CRASH_REPORTS_SUMMARY" desc="Description for 'Help improve Brave's features and performance' preference.">
-        Automatically sends crash reports to Brave
+        Automatically sends usage statistics and crash reports to Brave
       </message>
 
       <!-- Metrics settings -->

browser/ui/android/strings/android_chrome_strings_override.grd

@@ -122,10 +122,6 @@ CHAR_LIMIT guidelines:
       <message name="IDS_SETTINGS_INCOGNITO_TAB_LOCK_SUMMARY_ANDROID_SETTING_ON" desc="Summary for a toggle in Settings that allows users to lock their existing Private tabs with a device reauthentication mechanism. This summary is shown to the user when the screen lock setting is on in the device.">
         Use screen lock to see open Private tabs
       </message>
-      <message name="IDS_USAGE_AND_CRASH_REPORTS_SUMMARY" desc="Description for 'Help improve Brave's features and performance' preference.">
-        Automatically sends crash reports to Brave
-      </message>
-
       <message name="IDS_DATA_REDUCTION_DESCRIPTION_LITE_MODE" desc="Text describing how the Lite mode feature works. Seen only before the user has enabled the feature.">
         When Lite mode is on, Brave uses Brave servers to make pages load faster. Lite mode rewrites very slow pages to load only essential content. Lite mode does not apply to Private tabs.
       </message>

chromium_src/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc

@@ -0,0 +1,15 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/grit/generated_resources.h"
+
+// Use custom strings for diagnostic (crashes, hangs) reporting settings.
+#undef IDS_SETTINGS_ENABLE_LOGGING_PREF
+#undef IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC
+#define IDS_SETTINGS_ENABLE_LOGGING_PREF IDS_BRAVE_DIAGNOSTIC_REPORTS_PREF
+#define IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC \
+  IDS_BRAVE_DIAGNOSTIC_REPORTS_PREF_DESC
+
+#include "src/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc"

script/lib/grd_string_replacements.py

@@ -21,10 +21,6 @@ branding_replacements = [
 # to translate the XTB files
 default_replacements = [
     (r'Brave Web Store', r'Web Store'),
-    (r'Automatically send usage statistics and crash reports to Brave',
-     r'Automatically send crash reports to Brave'),
-    (r'Automatically sends usage statistics and crash reports to Brave',
-     r'Automatically sends crash reports to Brave'),
     (r'You\'re incognito', r'This is a private window'),
     (r'an incognito', r'a private'),
     (r'an Incognito', r'a Private'),