Bug 557133 - Conflict between Home Page and Help access keys. r=dietrich
authorTyler Downer <tyler.downer@gmail.com>
Thu, 16 Sep 2010 13:19:20 +0200
changeset 54148 38f96d215ccb44975d23d1a0015b0ee1704952ad
parent 54147 f38ef1080bfe788c6ee78c167a4e03087e5f79af
child 54149 5a68532076bfb8f1c0073b220641f9284c4db93d
push idunknown
push userunknown
push dateunknown
reviewersdietrich
bugs557133
milestone2.0b7pre
Bug 557133 - Conflict between Home Page and Help access keys. r=dietrich
browser/components/preferences/main.xul
browser/locales/en-US/chrome/browser/preferences/main.dtd
--- a/browser/components/preferences/main.xul
+++ b/browser/components/preferences/main.xul
@@ -117,17 +117,17 @@
             <menuitem label="&startupHomePage.label;"     value="1" id="browserStartupHomePage"/>
             <menuitem label="&startupBlankPage.label;"    value="0" id="browserStartupBlank"/>
             <menuitem label="&startupLastSession.label;"  value="3" id="browserStartupLastSession"/>
           </menupopup>
         </menulist>
       </hbox>
       <separator class="thin"/>
       <hbox align="center">
-        <label value="&location.label;" accesskey="&location.accesskey;" control="browserHomePage"/>
+        <label value="&homepage.label;" accesskey="&homepage.accesskey;" control="browserHomePage"/>
         <textbox id="browserHomePage" class="padded uri-element" flex="1"
                  type="autocomplete" autocompletesearch="history"
                  onsyncfrompreference="return gMainPane.syncFromHomePref();"
                  onsynctopreference="return gMainPane.syncToHomePref(this.value);"
                  placeholder="&abouthome.pageTitle;"
                  preference="browser.startup.homepage"/>
       </hbox>
       <hbox align="center" pack="end">
--- a/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -1,17 +1,17 @@
 <!ENTITY startup.label             "Startup">
 
 <!ENTITY startupPage.label         "When &brandShortName; starts:">
 <!ENTITY startupPage.accesskey     "s">
 <!ENTITY startupHomePage.label     "Show my home page">
 <!ENTITY startupBlankPage.label    "Show a blank page">
 <!ENTITY startupLastSession.label  "Show my windows and tabs from last time">
-<!ENTITY location.label            "Home Page:">
-<!ENTITY location.accesskey        "H">
+<!ENTITY homepage.label            "Home Page:">
+<!ENTITY homepage.accesskey        "P">
 <!ENTITY useCurrentPage.label      "Use Current Page">
 <!ENTITY useCurrentPage.accesskey  "C">
 <!ENTITY useMultiple.label         "Use Current Pages">
 <!ENTITY useBookmark.label         "Use Bookmark">
 <!ENTITY useBookmark.accesskey     "B">
 <!ENTITY restoreDefault.label      "Restore to Default">
 <!ENTITY restoreDefault.accesskey  "R">