Revert Developer Edition profile selection string changes for beta (bug 1086936). r=gavin, f=flod, a=gavin
authorPanos Astithas <past@mozilla.com>
Fri, 07 Nov 2014 15:54:41 +0200
changeset 235465 43fbd1a46c10ecdd158fc0be755072465c0781d4
parent 235464 08d628582d56f0761c6946d0f72a9bf98a121f7e
child 235466 084a4d8ad42bba638e257b28596cf6f0dbba22ba
push id611
push userraliiev@mozilla.com
push dateMon, 05 Jan 2015 23:23:16 +0000
treeherdermozilla-release@345cd3b9c445 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin, gavin
bugs1086936
milestone35.0
Revert Developer Edition profile selection string changes for beta (bug 1086936). r=gavin, f=flod, a=gavin
browser/components/preferences/in-content/main.xul
browser/components/preferences/main.xul
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -132,23 +132,23 @@
   <checkbox id="e10sAutoStart"
             label="Enable E10S (multi-process)"/>
 #endif
 
 #ifdef HAVE_SHELL_SERVICE
   <vbox id="defaultBrowserBox">
     <hbox align="center">
       <checkbox id="alwaysCheckDefault" preference="browser.shell.checkDefaultBrowser"
-                label="&alwaysCheckDefault2.label;" accesskey="&alwaysCheckDefault2.accesskey;"/>
+                label="&alwaysCheckDefault.label;" accesskey="&alwaysCheckDefault2.accesskey;"/>
     </hbox>
     <deck id="setDefaultPane">
       <hbox align="center" class="indent">
         <label id="isNotDefaultLabel" flex="1">&isNotDefault.label;</label>
         <button id="setDefaultButton"
-                label="&setAsMyDefaultBrowser2.label;" accesskey="&setAsMyDefaultBrowser2.accesskey;"
+                label="&setAsMyDefaultBrowser.label;" accesskey="&setAsMyDefaultBrowser.accesskey;"
                 preference="pref.general.disable_button.default_browser"/>
       </hbox>
       <hbox align="center" class="indent">
         <label id="isDefaultLabel" flex="1">&isDefault.label;</label>
       </hbox>
     </deck>
     <separator class="thin"/>
   </vbox>
--- a/browser/components/preferences/main.xul
+++ b/browser/components/preferences/main.xul
@@ -87,23 +87,23 @@
         </hbox>
       </vbox>
 #endif
 
 #ifdef HAVE_SHELL_SERVICE
       <vbox id="defaultBrowserBox">
         <hbox align="center">
           <checkbox id="alwaysCheckDefault" preference="browser.shell.checkDefaultBrowser"
-                    label="&alwaysCheckDefault2.label;" accesskey="&alwaysCheckDefault2.accesskey;"/>
+                    label="&alwaysCheckDefault.label;" accesskey="&alwaysCheckDefault2.accesskey;"/>
         </hbox>
         <deck id="setDefaultPane">
           <hbox align="center" class="indent">
             <label id="isNotDefaultLabel" flex="1">&isNotDefault.label;</label>
             <button id="setDefaultButton"
-                    label="&setAsMyDefaultBrowser2.label;" accesskey="&setAsMyDefaultBrowser2.accesskey;"
+                    label="&setAsMyDefaultBrowser.label;" accesskey="&setAsMyDefaultBrowser.accesskey;"
                     oncommand="gMainPane.setDefaultBrowser();"
                     preference="pref.general.disable_button.default_browser"/>
           </hbox>
           <hbox align="center" class="indent">
             <label id="isDefaultLabel" flex="1">&isDefault.label;</label>
           </hbox>
         </deck>
         <separator class="thin"/>