diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index b14bcba63f..9684e80ba7 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -56,31 +56,27 @@ var snapshotFormatters = { if (data.updateChannel) $("updatechannel-box").textContent = data.updateChannel; - let statusText = "unknown status"; + let statusText = stringBundle().GetStringFromName("multiProcessStatus.unknown"); // Whitelist of known values with string descriptions: switch (data.autoStartStatus) { case 0: - statusText = "Enabled by user"; break; case 1: - statusText = "Enabled by default"; break; case 2: - statusText = "Disabled"; break; case 4: - statusText = "Disabled by accessibility tools"; break; case 6: - statusText = "Disabled by unsupported text input"; break; case 7: - statusText = "Disabled by add-ons"; break; case 8: - statusText = "Disabled forcibly"; break; + statusText = stringBundle().GetStringFromName("multiProcessStatus." + data.autoStartStatus); + break; case 10: statusText = (Services.appinfo.OS == "Darwin" ? "OS X 10.6 - 10.8" : "Windows XP"); break; } - $("multiprocess-box").textContent = data.numRemoteWindows + "/" + data.numTotalWindows + " (" + statusText + ")"; + $("multiprocess-box").textContent = stringBundle().formatStringFromName("multiProcessWindows", + [data.numRemoteWindows, data.numTotalWindows, statusText], 3); $("safemode-box").textContent = data.safeMode; }, diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml index 839ee8eb55..58014c509a 100644 --- a/toolkit/content/aboutSupport.xhtml +++ b/toolkit/content/aboutSupport.xhtml @@ -240,7 +240,7 @@ - Multiprocess Windows + &aboutSupport.appBasicsMultiProcessSupport; diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd index 96d9deef0d..8c4b4ddc6b 100644 --- a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd @@ -56,6 +56,8 @@ Windows/Mac use the term "Folder" instead of "Directory" --> + + diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties index 46e445f66d..b452514158 100644 --- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties +++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties @@ -101,6 +101,23 @@ gpuProcessKillButton = Terminate GPU Process minLibVersions = Expected minimum version loadedLibVersions = Version in use +# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number +# of windows, respectively, while %3$S will be replaced with one of the status strings below, +# which contains a description of the multi-process preference and status. +# Note: multiProcessStatus.3 doesn't exist because status=3 was deprecated. +multiProcessWindows = %1$S/%2$S (%3$S) +multiProcessStatus.0 = Enabled by user +multiProcessStatus.1 = Enabled by default +multiProcessStatus.2 = Disabled +multiProcessStatus.4 = Disabled by accessibility tools +multiProcessStatus.5 = Disabled by lack of graphics hardware acceleration on Mac OS X +multiProcessStatus.6 = Disabled by unsupported text input +multiProcessStatus.7 = Disabled by add-ons +multiProcessStatus.8 = Disabled forcibly +# No longer in use (bug 1296353) but we might bring this back. +multiProcessStatus.9 = Disabled by graphics hardware acceleration on Windows XP +multiProcessStatus.unknown = Unknown status + asyncPanZoom = Asynchronous Pan/Zoom apzNone = none wheelEnabled = wheel input enabled