Bug 1323211 - In Sync preferences change the engine name Tabs to Open Tabs. r?markh draft
authorEdouard Oger <eoger@fastmail.com>
Tue, 03 Jan 2017 17:20:05 -0500
changeset 455471 1a2b1a72023a55e0cf4f2b3b3ec5a7a3c45b490d
parent 455333 cad2ea346d06ec5a3a70eda912513201dff0c21e
child 541004 2733c2786e48274c054896f105f9925fa888a16e
push id40253
push userbmo:eoger@fastmail.com
push dateTue, 03 Jan 2017 22:25:32 +0000
reviewersmarkh
bugs1323211
milestone53.0a1
Bug 1323211 - In Sync preferences change the engine name Tabs to Open Tabs. r?markh
browser/base/content/sync/customize.xul
browser/base/content/sync/setup.xul
browser/components/preferences/in-content/sync.xul
browser/locales/en-US/chrome/browser/preferences/sync.dtd
browser/locales/en-US/chrome/browser/syncCustomize.dtd
browser/locales/en-US/chrome/browser/syncSetup.dtd
--- a/browser/base/content/sync/customize.xul
+++ b/browser/base/content/sync/customize.xul
@@ -34,17 +34,17 @@
 #ifdef XP_UNIX
                  value="&syncCustomizeUnix.description;"
 #else
                  value="&syncCustomize.description;"
 #endif
                  />
 
   <vbox align="start">
-      <checkbox label="&engine.tabs.label;"
+      <checkbox label="&engine.tabs.label2;"
                 accesskey="&engine.tabs.accesskey;"
                 preference="engine.tabs"/>
       <checkbox label="&engine.bookmarks.label;"
                 accesskey="&engine.bookmarks.accesskey;"
                 preference="engine.bookmarks"/>
       <checkbox label="&engine.passwords.label;"
                 accesskey="&engine.passwords.accesskey;"
                 preference="engine.passwords"/>
--- a/browser/base/content/sync/setup.xul
+++ b/browser/base/content/sync/setup.xul
@@ -387,17 +387,17 @@
             <checkbox label="&engine.prefs.label;"
                       accesskey="&engine.prefs.accesskey;"
                       id="engine.prefs"
                       checked="true"/>
             <checkbox label="&engine.history.label;"
                       accesskey="&engine.history.accesskey;"
                       id="engine.history"
                       checked="true"/>
-            <checkbox label="&engine.tabs.label;"
+            <checkbox label="&engine.tabs.label2;"
                       accesskey="&engine.tabs.accesskey;"
                       id="engine.tabs"
                       checked="true"/>
           </vbox>
         </row>
       </rows>
     </grid>
     </groupbox>
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -111,17 +111,17 @@
                       preference="engine.prefs"/>
           </richlistitem>
           <richlistitem>
             <checkbox label="&engine.history.label;"
                       accesskey="&engine.history.accesskey;"
                       preference="engine.history"/>
           </richlistitem>
           <richlistitem>
-            <checkbox label="&engine.tabs.label;"
+            <checkbox label="&engine.tabs.label2;"
                       accesskey="&engine.tabs.accesskey;"
                       preference="engine.tabs"/>
           </richlistitem>
         </richlistbox>
       </vbox>
     </groupbox>
 
     <groupbox class="syncGroupBox">
@@ -281,17 +281,17 @@
               </vbox>
             </hbox>
           </deck>
         </groupbox>
         <groupbox id="syncOptions">
           <caption><label>&signedIn.engines.label;</label></caption>
           <hbox id="fxaSyncEngines">
             <vbox align="start" flex="1">
-              <checkbox label="&engine.tabs.label;"
+              <checkbox label="&engine.tabs.label2;"
                         accesskey="&engine.tabs.accesskey;"
                         preference="engine.tabs"/>
               <checkbox label="&engine.bookmarks.label;"
                         accesskey="&engine.bookmarks.accesskey;"
                         preference="engine.bookmarks"/>
               <checkbox label="&engine.passwords.label;"
                         accesskey="&engine.passwords.accesskey;"
                         preference="engine.passwords"/>
--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
@@ -20,17 +20,17 @@
 <!ENTITY myRecoveryKey.label          "My Recovery Key">
 <!ENTITY resetSync2.label             "Reset Sync…">
 
 <!ENTITY pairDevice.label             "Pair a Device">
 
 <!ENTITY syncMy.label               "Sync My">
 <!ENTITY engine.bookmarks.label     "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey "m">
-<!ENTITY engine.tabs.label          "Tabs">
+<!ENTITY engine.tabs.label2         "Open Tabs">
 <!ENTITY engine.tabs.accesskey      "T">
 <!ENTITY engine.history.label       "History">
 <!ENTITY engine.history.accesskey   "r">
 <!ENTITY engine.passwords.label     "Passwords">
 <!ENTITY engine.passwords.accesskey "P">
 <!ENTITY engine.prefs.label         "Preferences">
 <!ENTITY engine.prefs.accesskey     "S">
 <!ENTITY engine.addons.label        "Add-ons">
--- a/browser/locales/en-US/chrome/browser/syncCustomize.dtd
+++ b/browser/locales/en-US/chrome/browser/syncCustomize.dtd
@@ -12,16 +12,16 @@
 <!--
   These engine names are the same as in browser/preferences/sync.dtd except
   for the last two that are marked as being specific to Desktop browsers.
 -->
 <!ENTITY engine.bookmarks.label           "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey       "m">
 <!ENTITY engine.history.label             "History">
 <!ENTITY engine.history.accesskey         "r">
-<!ENTITY engine.tabs.label                "Tabs">
+<!ENTITY engine.tabs.label2               "Open Tabs">
 <!ENTITY engine.tabs.accesskey            "T">
 <!ENTITY engine.passwords.label           "Passwords">
 <!ENTITY engine.passwords.accesskey       "P">
 <!ENTITY engine.addons.label              "Desktop Add-ons">
 <!ENTITY engine.addons.accesskey          "A">
 <!ENTITY engine.prefs.label               "Desktop Preferences">
 <!ENTITY engine.prefs.accesskey           "S">
--- a/browser/locales/en-US/chrome/browser/syncSetup.dtd
+++ b/browser/locales/en-US/chrome/browser/syncSetup.dtd
@@ -80,17 +80,17 @@
 <!-- Sync Options -->
 <!ENTITY setup.optionsPage.title      "Sync Options">
 <!ENTITY syncDeviceName.label       "Device Name:">
 <!ENTITY syncDeviceName.accesskey   "c">
 
 <!ENTITY syncMy.label               "Sync My">
 <!ENTITY engine.bookmarks.label     "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey "m">
-<!ENTITY engine.tabs.label          "Tabs">
+<!ENTITY engine.tabs.label2         "Open Tabs">
 <!ENTITY engine.tabs.accesskey      "T">
 <!ENTITY engine.history.label       "History">
 <!ENTITY engine.history.accesskey   "r">
 <!ENTITY engine.passwords.label     "Passwords">
 <!ENTITY engine.passwords.accesskey "P">
 <!ENTITY engine.prefs.label         "Preferences">
 <!ENTITY engine.prefs.accesskey     "S">
 <!ENTITY engine.addons.label        "Add-ons">