Bug 585370 - Remove uses of appMenuButton.label. r=dao a=NPOTB

This commit is contained in:
Bill Gianopoulos 2010-11-07 13:55:14 +01:00
parent f0a9415110
commit e17d82592e
2 changed files with 2 additions and 8 deletions

View File

@ -435,11 +435,7 @@
<hbox id="appmenu-button-container" align="start"> <hbox id="appmenu-button-container" align="start">
<button id="appmenu-button" <button id="appmenu-button"
type="menu" type="menu"
#ifdef XP_WIN
label="&brandShortName;" label="&brandShortName;"
#else
label="&appMenuButton.label;"
#endif
style="-moz-user-focus: ignore;"> style="-moz-user-focus: ignore;">
#include browser-appmenu.inc #include browser-appmenu.inc
</button> </button>

View File

@ -45,12 +45,10 @@
%globalDTD; %globalDTD;
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd"> <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
%browserDTD; %browserDTD;
#ifdef XP_WIN #ifdef XP_MACOSX
<!ENTITY basePBMenu.label "<span class='appMenuButton'>&brandShortName;</span><span class='toolsMenu'>&toolsMenu.label;</span>">
#elifdef XP_MACOSX
<!ENTITY basePBMenu.label "&toolsMenu.label;"> <!ENTITY basePBMenu.label "&toolsMenu.label;">
#else #else
<!ENTITY basePBMenu.label "<span class='appMenuButton'>&appMenuButton.label;</span><span class='toolsMenu'>&toolsMenu.label;</span>"> <!ENTITY basePBMenu.label "<span class='appMenuButton'>&brandShortName;</span><span class='toolsMenu'>&toolsMenu.label;</span>">
#endif #endif
<!ENTITY % privatebrowsingpageDTD SYSTEM "chrome://browser/locale/aboutPrivateBrowsing.dtd"> <!ENTITY % privatebrowsingpageDTD SYSTEM "chrome://browser/locale/aboutPrivateBrowsing.dtd">
%privatebrowsingpageDTD; %privatebrowsingpageDTD;