From d7b1e04902fe093566b379d1c3e4f1f6e9b5c76b Mon Sep 17 00:00:00 2001
From: Evan Tseng <evan@tseng.io>
Date: Wed, 17 May 2017 15:24:58 +0800
Subject: [PATCH] Bug 1365210 - Update performance settings strings to align
 the spec. r=jaws

MozReview-Commit-ID: 5GfsyWG8KLY

--HG--
extra : rebase_source : 183545e49d3e81920676071e2d9ba6e43a525446
---
 .../components/preferences/in-content/main.xul   | 10 +++++-----
 .../chrome/browser/preferences/advanced.dtd      | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/browser/components/preferences/in-content/main.xul b/browser/components/preferences/in-content/main.xul
index cb7935201c95..720a884d34da 100644
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -562,12 +562,12 @@
 
   <hbox align="center">
     <checkbox id="useRecommendedPerformanceSettings"
-              label="&useRecommendedPerformanceSettings.label;"
-              accesskey="&useRecommendedPerformanceSettings.accesskey;"
+              label="&useRecommendedPerformanceSettings2.label;"
+              accesskey="&useRecommendedPerformanceSettings2.accesskey;"
               preference="browser.preferences.defaultPerformanceSettings.enabled"/>
     <label id="performanceSettingsLearnMore" class="learnMore text-link">&performanceSettingsLearnMore.label;</label>
   </hbox>
-  <description class="indent">&useRecommendedPerformanceSettings.description;</description>
+  <description class="indent">&useRecommendedPerformanceSettings2.description;</description>
 
   <vbox id="performanceSettings" class="indent" hidden="true">
     <checkbox id="allowHWAccel"
@@ -575,7 +575,7 @@
               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="&limitContentProcess2.accesskey;" control="contentProcessCount">&limitContentProcess2.label;</label>
       <menulist id="contentProcessCount" preference="dom.ipc.processCount">
         <menupopup>
           <menuitem label="1" value="1"/>
@@ -588,6 +588,6 @@
         </menupopup>
       </menulist>
     </hbox>
-    <description>&limitContentProcess.description;</description>
+    <description>&limitContentProcess2.description;</description>
   </vbox>
 </groupbox>
diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index 0325d1d704c2..9ecf03a47f39 100644
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -138,17 +138,17 @@
 <!ENTITY viewSecurityDevices.accesskey   "D">
 
 <!ENTITY performance.label               "Performance">
-<!ENTITY useRecommendedPerformanceSettings.label
+<!ENTITY useRecommendedPerformanceSettings2.label
                                          "Use recommended performance settings">
-<!ENTITY useRecommendedPerformanceSettings.description
-                                         "Recommended performance settings are tailored to your computer.">
-<!ENTITY useRecommendedPerformanceSettings.accesskey
+<!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 limitContentProcess.label       "Content process limit">
-<!ENTITY limitContentProcess.description
-                                         "More content processes can make &brandShortName; more responsive when using multiple tabs, but will also consume more memory.">
-<!ENTITY limitContentProcess.accesskey   "L">
+<!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 allowHWAccel.label              "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey          "r">