Bug 1391933 - Fix localization issues in Kill Add-on dialogs, r?kmag draft
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Sun, 20 Aug 2017 10:52:32 +0200
changeset 649559 c4379b4cf2d847d810b56029284577b6c42d7aa3
parent 649541 5ca5691372cb432ec1fa4693ca608a30858226de
child 727105 c5e1478bd0bb38673eda0226575af1dc387e410a
push id75060
push userbmo:francesco.lodolo@gmail.com
push dateSun, 20 Aug 2017 08:59:44 +0000
reviewerskmag
bugs1391933, 1356334
milestone57.0a1
Bug 1391933 - Fix localization issues in Kill Add-on dialogs, r?kmag Changes originally landed in bug 1356334: * Removed SUMO link as a localizable string. * Updated SUMO link: removed "en-US" from link and "cache" parameter. * Use ordered placeholder instead of %S. * Fix typo ("responsing"). * Use "extension" instead of "add-on" in DOM strings for consistency. * Removed period from KillAddonScriptGlobalMessage, since it's a checkbox. MozReview-Commit-ID: 5IFH2ruISZb
browser/locales/en-US/chrome/browser/browser.properties
browser/modules/ProcessHangMonitor.jsm
dom/locales/en-US/chrome/dom/dom.properties
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -581,21 +581,20 @@ browser.menu.showCharacterEncoding=false
 
 # Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
 dataReportingNotification.message       = %1$S automatically sends some data to %2$S so that we can improve your experience.
 dataReportingNotification.button.label  = Choose What I Share
 dataReportingNotification.button.accessKey  = C
 
 # Process hang reporter
 processHang.label = A web page is slowing down your browser. What would you like to do?
-# LOCALIZATION NOTE (processHang.add-on.label): The first %S is the name of
-# an extension. The second %S is the name of the product (e.g., Firefox)
-processHang.add-on.label = A script in the extension “%S” is causing %S to slow down.
+# LOCALIZATION NOTE (processHang.add-on.label): %1$S is the name of the
+# extension. %2$S is the name of the product (e.g., Firefox)
+processHang.add-on.label = A script in the extension “%1$S” is causing %2$S to slow down.
 processHang.add-on.learn-more.text = Learn more
-processHang.add-on.learn-more.url = https://support.mozilla.org/en-US/kb/warning-unresponsive-script?cache=no#w_other-causes
 processHang.button_stop.label = Stop It
 processHang.button_stop.accessKey = S
 processHang.button_stop_sandbox.label = Temporarily Disable Extension on Page
 processHang.button_stop_sandbox.accessKey = A
 processHang.button_wait.label = Wait
 processHang.button_wait.accessKey = W
 processHang.button_debug.label = Debug Script
 processHang.button_debug.accessKey = D
--- a/browser/modules/ProcessHangMonitor.jsm
+++ b/browser/modules/ProcessHangMonitor.jsm
@@ -337,17 +337,17 @@ var ProcessHangMonitor = {
       let brandBundle = doc.getElementById("bundle_brand");
 
       let addonName = aps.getExtensionName(report.addonId);
 
       let label = bundle.getFormattedString("processHang.add-on.label",
                                             [addonName, brandBundle.getString("brandShortName")]);
 
       let linkText = bundle.getString("processHang.add-on.learn-more.text");
-      let linkURL = bundle.getString("processHang.add-on.learn-more.url");
+      let linkURL = "https://support.mozilla.org/kb/warning-unresponsive-script#w_other-causes";
 
       let link = doc.createElement("label");
       link.setAttribute("class", "text-link");
       link.setAttribute("role", "link");
       link.setAttribute("onclick", `openUILinkIn(${JSON.stringify(linkURL)}, "tab")`);
       link.setAttribute("value", linkText);
 
       message = doc.createDocumentFragment();
--- a/dom/locales/en-US/chrome/dom/dom.properties
+++ b/dom/locales/en-US/chrome/dom/dom.properties
@@ -3,19 +3,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 KillScriptTitle=Warning: Unresponsive script
 KillScriptMessage=A script on this page may be busy, or it may have stopped responding. You can stop the script now, or you can continue to see if the script will complete.
 KillScriptWithDebugMessage=A script on this page may be busy, or it may have stopped responding. You can stop the script now, open the script in the debugger, or let the script continue.
 KillScriptLocation=Script: %S
 
 KillAddonScriptTitle=Warning: Unresponsive add-on script
-# LOCALIZATION NOTE (KillAddonScriptMessage): The first %S is the name of an add-on. The second %S is the name of the application (e.g., Firefox).
-KillAddonScriptMessage=A script from the add-on “%S” is running on this page, and making %S unresponsive.\n\nIt may be busy, or it may have stopped responsing permanently. You can stop the script now, or you can continue to see if it will complete.
-KillAddonScriptGlobalMessage=Prevent the add-on script from running on this page until it next reloads.
+# LOCALIZATION NOTE (KillAddonScriptMessage): %1$S is the name of an extension.
+# %2$S is the name of the application (e.g., Firefox).
+KillAddonScriptMessage=A script from the extension “%1$S” is running on this page, and making %2$S unresponsive.\n\nIt may be busy, or it may have stopped responding permanently. You can stop the script now, or you can continue to see if it will complete.
+KillAddonScriptGlobalMessage=Prevent the extension script from running on this page until it next reloads
 
 StopScriptButton=Stop script
 DebugScriptButton=Debug script
 WaitForScriptButton=Continue
 DontAskAgain=&Don’t ask me again
 JSURLLoadBlockedWarning=Attempt to load a javascript: URL from one host\nin a window displaying content from another host\nwas blocked by the security manager.
 WindowCloseBlockedWarning=Scripts may not close windows that were not opened by script.
 OnBeforeUnloadTitle=Are you sure?