Bug 1367959 - Remove brandShortName from the string "… can improve &brandShortName; performance".
MozReview-Commit-ID: FSewvreb330
--- a/browser/components/preferences/in-content-old/main.xul
+++ b/browser/components/preferences/in-content-old/main.xul
@@ -332,24 +332,24 @@
<description class="indent">&useRecommendedPerformanceSettings.description;</description>
<vbox id="performanceSettings" class="indent" hidden="true">
<checkbox id="allowHWAccel"
label="&allowHWAccel.label;"
accesskey="&allowHWAccel.accesskey;"
preference="layers.acceleration.disabled"/>
<hbox align="center">
- <label id="limitContentProcess" accesskey="&limitContentProcess.accesskey;" control="contentProcessCount">&limitContentProcess.label;</label>
+ <label id="limitContentProcess" accesskey="&limitContentProcessOption.accesskey;" control="contentProcessCount">&limitContentProcessOption.label;</label>
<menulist id="contentProcessCount" preference="dom.ipc.processCount">
<menupopup>
<menuitem label="1" value="1"/>
<menuitem label="2" value="2"/>
<menuitem label="3" value="3"/>
<menuitem label="4" value="4"/>
<menuitem label="5" value="5"/>
<menuitem label="6" value="6"/>
<menuitem label="7" value="7"/>
</menupopup>
</menulist>
</hbox>
- <description>&limitContentProcess.description;</description>
+ <description>&limitContentProcessOption.description;</description>
</vbox>
</groupbox>
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -570,24 +570,24 @@
<description class="indent">&useRecommendedPerformanceSettings2.description;</description>
<vbox id="performanceSettings" class="indent" hidden="true">
<checkbox id="allowHWAccel"
label="&allowHWAccel.label;"
accesskey="&allowHWAccel.accesskey;"
preference="layers.acceleration.disabled"/>
<hbox align="center">
- <label id="limitContentProcess" accesskey="&limitContentProcess2.accesskey;" control="contentProcessCount">&limitContentProcess2.label;</label>
+ <label id="limitContentProcess" accesskey="&limitContentProcessOption.accesskey;" control="contentProcessCount">&limitContentProcessOption.label;</label>
<menulist id="contentProcessCount" preference="dom.ipc.processCount">
<menupopup>
<menuitem label="1" value="1"/>
<menuitem label="2" value="2"/>
<menuitem label="3" value="3"/>
<menuitem label="4" value="4"/>
<menuitem label="5" value="5"/>
<menuitem label="6" value="6"/>
<menuitem label="7" value="7"/>
</menupopup>
</menulist>
</hbox>
- <description>&limitContentProcess2.description;</description>
+ <description>&limitContentProcessOption.description;</description>
</vbox>
</groupbox>
--- a/browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd
@@ -128,14 +128,14 @@
<!ENTITY useRecommendedPerformanceSettings.label
"Use recommended performance settings">
<!ENTITY useRecommendedPerformanceSettings.description
"These settings are tailored to your computer’s hardware and operating system.">
<!ENTITY useRecommendedPerformanceSettings.accesskey
"U">
<!ENTITY performanceSettingsLearnMore.label
"Learn more">
-<!ENTITY limitContentProcess.label "Content process limit">
-<!ENTITY limitContentProcess.description
- "Additional content processes can improve &brandShortName; performance when using multiple tabs, but will also use more memory.">
-<!ENTITY limitContentProcess.accesskey "L">
+<!ENTITY limitContentProcessOption.label "Content process limit">
+<!ENTITY limitContentProcessOption.description
+ "Additional content processes can improve performance when using multiple tabs, but will also use more memory.">
+<!ENTITY limitContentProcessOption.accesskey "L">
<!ENTITY allowHWAccel.label "Use hardware acceleration when available">
<!ENTITY allowHWAccel.accesskey "r">
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -141,14 +141,14 @@
<!ENTITY useRecommendedPerformanceSettings2.label
"Use recommended performance settings">
<!ENTITY useRecommendedPerformanceSettings2.description
"These settings are tailored to your computer’s hardware and operating system.">
<!ENTITY useRecommendedPerformanceSettings2.accesskey
"U">
<!ENTITY performanceSettingsLearnMore.label
"Learn more">
-<!ENTITY limitContentProcess2.label "Content process limit">
-<!ENTITY limitContentProcess2.description
- "Additional content processes can improve &brandShortName; performance when using multiple tabs, but will also use more memory.">
-<!ENTITY limitContentProcess2.accesskey "L">
+<!ENTITY limitContentProcessOption.label "Content process limit">
+<!ENTITY limitContentProcessOption.description
+ "Additional content processes can improve performance when using multiple tabs, but will also use more memory.">
+<!ENTITY limitContentProcessOption.accesskey "L">
<!ENTITY allowHWAccel.label "Use hardware acceleration when available">
<!ENTITY allowHWAccel.accesskey "r">