From 21e50add60ee1533cb7e528c7edc08f2f1ccddb1 Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Sat, 13 Jan 2024 04:33:19 -0500 Subject: [PATCH] Rename Safe Mode to Troubleshooting Mode (#3563) --- chrome/content/zotero/standalone/standalone.js | 6 +++--- chrome/content/zotero/zoteroPane.js | 4 ++-- chrome/content/zotero/zoteroPane.xhtml | 6 +++--- chrome/locale/en-US/zotero/zotero.ftl | 10 +++++----- components/zotero-service.js | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js index 83262f0e0c..b49c39ab49 100644 --- a/chrome/content/zotero/standalone/standalone.js +++ b/chrome/content/zotero/standalone/standalone.js @@ -645,11 +645,11 @@ const ZoteroStandalone = new function() { }; - this.promptForRestartInSafeMode = async function () { + this.promptForRestartInTroubleshootingMode = async function () { let ps = Services.prompt; let [title, description] = await document.l10n.formatValues([ - 'restart-in-safe-mode-dialog-title', - 'restart-in-safe-mode-dialog-description' + 'restart-in-troubleshooting-mode-dialog-title', + 'restart-in-troubleshooting-mode-dialog-description' ]); let buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING + ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL; diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js index fd83ed14ae..cae6516375 100644 --- a/chrome/content/zotero/zoteroPane.js +++ b/chrome/content/zotero/zoteroPane.js @@ -415,7 +415,7 @@ var ZoteroPane = new function() Zotero.hiDPI = window.devicePixelRatio > 1; Zotero.hiDPISuffix = Zotero.hiDPI ? "@2x" : ""; - // Show warning in toolbar for 'dev' channel builds and safe mode + // Show warning in toolbar for 'dev' channel builds and troubleshooting mode try { let isDevBuild = Zotero.version.includes('-dev'); // Uncomment to test @@ -436,7 +436,7 @@ var ZoteroPane = new function() label.onclick = function () { Zotero.Utilities.Internal.quit(true); }; - label.textContent = 'Safe Mode'; + label.textContent = 'Troubleshooting Mode'; let syncStop = document.getElementById('zotero-tb-sync-stop'); syncStop.parentNode.insertBefore(label, syncStop); } diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml index e23e051b9f..e1c8f84dbc 100644 --- a/chrome/content/zotero/zoteroPane.xhtml +++ b/chrome/content/zotero/zoteroPane.xhtml @@ -673,9 +673,9 @@ oncommand="ZoteroStandalone.DebugOutput.restartEnabled()"/> - + Considerations for licensors before placing your work under a CC license. Note that the license you apply cannot be revoked, even if you later choose different terms or cease publishing the work. licenses-cc0-more-info = Be sure you have read the Creative Commons CC0 FAQ before applying CC0 to your work. Please note that dedicating your work to the public domain is irreversible, even if you later choose different terms or cease publishing the work. -restart-in-safe-mode-menuitem = - .label = Restart in Safe Mode… - .accesskey = S -restart-in-safe-mode-dialog-title = Restart in Safe Mode -restart-in-safe-mode-dialog-description = { -app-name } will restart with all plugins disabled. Some features may not function correctly while Safe Mode is enabled. +restart-in-troubleshooting-mode-menuitem = + .label = Restart in Troubleshooting Mode… + .accesskey = T +restart-in-troubleshooting-mode-dialog-title = Restart in Troubleshooting Mode +restart-in-troubleshooting-mode-dialog-description = { -app-name } will restart with all plugins disabled. Some features may not function correctly while Troubleshooting Mode is enabled. diff --git a/components/zotero-service.js b/components/zotero-service.js index 19d9a912b0..2990e81241 100644 --- a/components/zotero-service.js +++ b/components/zotero-service.js @@ -487,8 +487,8 @@ ZoteroCommandLineHandler.prototype = { zInitOptions.forceDebugLog = 1; } // Pressing Ctrl-C via the terminal is interpreted as a crash, and after three crashes - // Firefox starts up in automatic safe mode. To avoid this, we clear the crash counter when - // using one of the debug-logging flags, which generally imply terminal usage. + // Firefox starts up in automatic safe mode (troubleshooting mode). To avoid this, we clear the crash + // counter when using one of the debug-logging flags, which generally imply terminal usage. if (zInitOptions.forceDebugLog) { Services.prefs.getBranch("toolkit.startup.").clearUserPref('recent_crashes'); }