Skip to content

Commit b5158ec

Browse files
committed
Add back localized e10s text
1 parent d16df0f commit b5158ec

File tree

4 files changed

+25
-10
lines changed

4 files changed

+25
-10
lines changed

toolkit/content/aboutSupport.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -56,31 +56,27 @@ var snapshotFormatters = {
5656
if (data.updateChannel)
5757
$("updatechannel-box").textContent = data.updateChannel;
5858

59-
let statusText = "unknown status";
59+
let statusText = stringBundle().GetStringFromName("multiProcessStatus.unknown");
6060

6161
// Whitelist of known values with string descriptions:
6262
switch (data.autoStartStatus) {
6363
case 0:
64-
statusText = "Enabled by user"; break;
6564
case 1:
66-
statusText = "Enabled by default"; break;
6765
case 2:
68-
statusText = "Disabled"; break;
6966
case 4:
70-
statusText = "Disabled by accessibility tools"; break;
7167
case 6:
72-
statusText = "Disabled by unsupported text input"; break;
7368
case 7:
74-
statusText = "Disabled by add-ons"; break;
7569
case 8:
76-
statusText = "Disabled forcibly"; break;
70+
statusText = stringBundle().GetStringFromName("multiProcessStatus." + data.autoStartStatus);
71+
break;
7772

7873
case 10:
7974
statusText = (Services.appinfo.OS == "Darwin" ? "OS X 10.6 - 10.8" : "Windows XP");
8075
break;
8176
}
8277

83-
$("multiprocess-box").textContent = data.numRemoteWindows + "/" + data.numTotalWindows + " (" + statusText + ")";
78+
$("multiprocess-box").textContent = stringBundle().formatStringFromName("multiProcessWindows",
79+
[data.numRemoteWindows, data.numTotalWindows, statusText], 3);
8480

8581
$("safemode-box").textContent = data.safeMode;
8682
},

toolkit/content/aboutSupport.xhtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240

241241
<tr>
242242
<th class="column">
243-
Multiprocess Windows
243+
&aboutSupport.appBasicsMultiProcessSupport;
244244
</th>
245245

246246
<td id="multiprocess-box">

toolkit/locales/en-US/chrome/global/aboutSupport.dtd

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ Windows/Mac use the term "Folder" instead of "Directory" -->
5656

5757
<!ENTITY aboutSupport.appBasicsProfiles "Profiles">
5858

59+
<!ENTITY aboutSupport.appBasicsMultiProcessSupport "Multiprocess Windows">
60+
5961
<!ENTITY aboutSupport.appBasicsSafeMode "Safe Mode">
6062

6163
<!ENTITY aboutSupport.showDir.label "Open Directory">

toolkit/locales/en-US/chrome/global/aboutSupport.properties

+17
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,23 @@ gpuProcessKillButton = Terminate GPU Process
101101
minLibVersions = Expected minimum version
102102
loadedLibVersions = Version in use
103103

104+
# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number
105+
# of windows, respectively, while %3$S will be replaced with one of the status strings below,
106+
# which contains a description of the multi-process preference and status.
107+
# Note: multiProcessStatus.3 doesn't exist because status=3 was deprecated.
108+
multiProcessWindows = %1$S/%2$S (%3$S)
109+
multiProcessStatus.0 = Enabled by user
110+
multiProcessStatus.1 = Enabled by default
111+
multiProcessStatus.2 = Disabled
112+
multiProcessStatus.4 = Disabled by accessibility tools
113+
multiProcessStatus.5 = Disabled by lack of graphics hardware acceleration on Mac OS X
114+
multiProcessStatus.6 = Disabled by unsupported text input
115+
multiProcessStatus.7 = Disabled by add-ons
116+
multiProcessStatus.8 = Disabled forcibly
117+
# No longer in use (bug 1296353) but we might bring this back.
118+
multiProcessStatus.9 = Disabled by graphics hardware acceleration on Windows XP
119+
multiProcessStatus.unknown = Unknown status
120+
104121
asyncPanZoom = Asynchronous Pan/Zoom
105122
apzNone = none
106123
wheelEnabled = wheel input enabled

0 commit comments

Comments
 (0)