Bug 1694507 - Update messaging in "restart with add-ons disabled" / "safe mode" dialog r=jaws,flod

Differential Revision: https://phabricator.services.mozilla.com/D107524

browser/components/BrowserGlue.jsm

@@ -1454,12 +1454,18 @@ BrowserGlue.prototype = {
 
   _onSafeModeRestart: function BG_onSafeModeRestart() {
     // prompt the user to confirm
+    let productName = gBrandBundle.GetStringFromName("brandShortName");
     let strings = gBrowserBundle;
-    let promptTitle = strings.GetStringFromName("safeModeRestartPromptTitle");
-    let promptMessage = strings.GetStringFromName(
-      "safeModeRestartPromptMessage"
+    let promptTitle = strings.formatStringFromName(
+      "troubleshootModeRestartPromptTitle",
+      [productName]
+    );
+    let promptMessage = strings.GetStringFromName(
+      "troubleshootModeRestartPromptMessage"
+    );
+    let restartText = strings.GetStringFromName(
+      "troubleshootModeRestartButton"
     );
-    let restartText = strings.GetStringFromName("safeModeRestartButton");
     let buttonFlags =
       Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING +
       Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL +

browser/locales/en-US/chrome/browser/browser.properties

@@ -671,10 +671,11 @@ ctrlTab.listAllTabs.label=;List All #1 Tabs
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Search %S
 
-# safeModeRestart
-safeModeRestartPromptTitle=Restart with Add-ons Disabled
-safeModeRestartPromptMessage=Are you sure you want to disable all add-ons and restart?
-safeModeRestartButton=Restart
+# troubleshootModeRestart
+# LOCALIZATION NOTE (troubleshootModeRestartPromptTitle): %S is the name of the product (e.g., Firefox)
+troubleshootModeRestartPromptTitle=Restart %S in Troubleshoot Mode?
+troubleshootModeRestartPromptMessage=Your extensions, themes, and custom settings will be temporarily disabled.
+troubleshootModeRestartButton=Restart
 
 # LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string
 # "true" (spelled and capitalized exactly that way) to show the "Text

toolkit/content/aboutSupport.xhtml

@@ -38,8 +38,8 @@
         <button id="reset-box-button" data-l10n-id="refresh-profile-button"/>
       </div>
       <div id="safe-mode-box">
-        <h3 data-l10n-id="safe-mode-title"/>
-        <button id="restart-in-safe-mode-button" data-l10n-id="restart-in-safe-mode-label"/>
+        <h3 data-l10n-id="troubleshoot-mode-title"/>
+        <button id="restart-in-safe-mode-button" data-l10n-id="restart-in-troubleshoot-mode-label"/>
       </div>
       <div id="clear-startup-cache-box">
         <h3 data-l10n-id="clear-startup-cache-title"/>

toolkit/locales/en-US/toolkit/about/aboutSupport.ftl

@@ -127,8 +127,8 @@ sandbox-sys-call-tid = TID
 sandbox-sys-call-proc-type = Process Type
 sandbox-sys-call-number = Syscall
 sandbox-sys-call-args = Arguments
-safe-mode-title = Try Safe Mode
-restart-in-safe-mode-label = Restart with Add-ons Disabled…
+troubleshoot-mode-title = Diagnose issues
+restart-in-troubleshoot-mode-label = Troubleshoot Mode…
 clear-startup-cache-title = Try clearing the startup cache
 clear-startup-cache-label = Clear startup cache…
 startup-cache-dialog-title2 = Restart { -brand-short-name } to clear startup cache?