зеркало из https://github.com/mozilla/gecko-dev.git
for bug 41535; r=cmanske, a=brendan; urgent=blake+l10n.
It seems that charsetOverlay was replaced by charsetDetectorsOverlay.
This commit is contained in:
timeless%mac.com
Родитель
cc28061427
Коммит
489d7a0d53
|
|
@ -124,13 +124,10 @@
|
|||
<!-- View Menu -->
|
||||
<broadcaster id="cmd_viewTextZoomReduce" value="&textZoomReduceCmd.label;" oncommand="reduceTextZoom();"/>
|
||||
<broadcaster id="cmd_viewTextZoomEnlarge" value="&textZoomEnlargeCmd.label;" oncommand="enlargeTextZoom();"/>
|
||||
<broadcaster id="cmd_viewnavbar" type="checkbox" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
|
||||
<broadcaster id="cmd_viewpersonaltoolbar" type="checkbox" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
|
||||
<broadcaster id="cmd_viewtaskbar" type="checkbox" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
|
||||
<broadcaster id="cmd_viewnavbar" value="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
|
||||
<broadcaster id="cmd_viewpersonaltoolbar" value="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
|
||||
<broadcaster id="cmd_viewtaskbar" value="&taskbarCmd.label;" accesskey="&taskbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
|
||||
|
||||
<broadcaster id="cmd_viewnavbar" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
|
||||
<broadcaster id="cmd_viewpersonaltoolbar" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
|
||||
<broadcaster id="cmd_viewtaskbar" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
|
||||
<broadcaster id="View:PageSource" value="&pageSourceCmd.label;" oncommand="BrowserViewSource();"/>
|
||||
|
||||
<!-- Search Menu -->
|
||||
|
|
@ -202,11 +199,11 @@
|
|||
|
||||
<menu id="menu_View" accesskey="&viewMenu.accesskey;" value="&viewMenu.label;">
|
||||
<menupopup id="menu_View_Popup" oncreate="initViewMenu()">
|
||||
<menu value="&toolbarsCmd.label;" id="view_toolbars">
|
||||
<menu value="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;" id="view_toolbars">
|
||||
<menupopup id="view_toolbars_popup">
|
||||
<menuitem value="&navbarCmd.label;" observes="cmd_viewnavbar" />
|
||||
<menuitem value="&personalbarCmd.label;" observes="cmd_viewpersonaltoolbar" />
|
||||
<menuitem value="&taskbarCmd.label;" observes="cmd_viewtaskbar" />
|
||||
<menuitem observes="cmd_viewnavbar" />
|
||||
<menuitem observes="cmd_viewpersonaltoolbar" />
|
||||
<menuitem observes="cmd_viewtaskbar" />
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menuseparator />
|
||||
|
|
@ -229,14 +226,15 @@ for some reason, this makes mac freak out. pulling out until i understand why (p
|
|||
</menu>
|
||||
<menuseparator />
|
||||
<menuitem id="menuitem-reload" accesskey="&reloadCmd.accesskey;" key="key_reload" value="&reloadCmd.label;" observes="canReload" />
|
||||
<menuitem value="&showImagesCmd.label;" disabled="true" oncommand="BrowserReload();"/>
|
||||
<menuitem value="&stopCmd.label;" id="menuitem-stop" oncommand="BrowserStop();"/>
|
||||
<menuitem value="&showImagesCmd.label;" accesskey="&showImagesCmd.accesskey;" disabled="true" oncommand="BrowserReload();"/>
|
||||
<menuitem value="&stopCmd.label;" accesskey="&stopCmd.accesskey;" id="menuitem-stop" oncommand="BrowserStop();"/>
|
||||
<menuseparator />
|
||||
<menuitem accesskey="&pageSourceCmd.accesskey;" key="key_viewsource" observes="View:PageSource"/>
|
||||
<menuitem accesskey="&pageInfoCmd.accesskey;" value="&pageInfoCmd.label;" oncommand="BrowserPageInfo();"/>
|
||||
<menuseparator />
|
||||
<menuitem value="&translateMenu.label;" oncommand="Translate();"/>
|
||||
<menuitem accesskey="&translateMenu.accesskey;" value="&translateMenu.label;" oncommand="Translate();"/>
|
||||
<menu value="&webContentMenu.label;"
|
||||
accesskey="&webContentMenu.accesskey;"
|
||||
datasources="rdf:chrome"
|
||||
ref="urn:mozilla:locale:root"
|
||||
sortResource="http://www.mozilla.org/rdf/chrome#name"
|
||||
|
|
@ -244,6 +242,7 @@ for some reason, this makes mac freak out. pulling out until i understand why (p
|
|||
>
|
||||
<menupopup>
|
||||
<menuitem value="&downloadMore.label;"
|
||||
accesskey="&downloadMore.accesskey;"
|
||||
oncommand="loadXURL('urn:clienturl:viewmenu:intlwebcontent');"/>
|
||||
<menuseparator />
|
||||
</menupopup>
|
||||
|
|
@ -260,91 +259,9 @@ for some reason, this makes mac freak out. pulling out until i understand why (p
|
|||
|
||||
</menu>
|
||||
|
||||
<!-- Deprecated BEGIN
|
||||
<menu value="&dcharMenu.label;">
|
||||
<menupopup>
|
||||
<menuitem value="&dcharIso1Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-1');"/>
|
||||
<menuitem value="&dcharIso15Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-15');"/>
|
||||
<menuitem value="&dcharIso2Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-2');"/>
|
||||
<menuitem value="&dcharIso3Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-3');"/>
|
||||
<menuitem value="&dcharIso4Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-4');"/>
|
||||
<menuitem value="&dcharIsoGreekCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-7');"/>
|
||||
<menuitem value="&dcharIso9Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-9');"/>
|
||||
<menuitem value="&dcharIso10Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-10');"/>
|
||||
<menuitem value="&dcharIso13Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-13');"/>
|
||||
<menuitem value="&dcharIso14Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-14');"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menu value="&dcharMenu1.label;">
|
||||
<menupopup>
|
||||
<menuitem value="&dcharJapanCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-2022-JP');"/>
|
||||
<menuitem value="&dcharJapanShiftjsCmd.label;" oncommand="BrowserSetDefaultCharacterSet('Shift_JIS');"/>
|
||||
<menuitem value="&dcharJapanEucCmd.label;" oncommand="BrowserSetDefaultCharacterSet('EUC-JP');"/>
|
||||
<menuseparator />
|
||||
<menuitem value="&dcharTradChiBigCmd.label;" oncommand="BrowserSetDefaultCharacterSet('Big5');"/>
|
||||
<menuitem value="&dcharTriChiEucCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-euc-tw');"/>
|
||||
<menuitem value="&dcharSimpChiGbCmd.label;" oncommand="BrowserSetDefaultCharacterSet('GB2312');"/>
|
||||
<menuseparator />
|
||||
<menuitem value="&dcharKoreanCmd.label;" oncommand="BrowserSetDefaultCharacterSet('EUC-KR');"/>
|
||||
<menuseparator />
|
||||
<menuitem value="&dcharUtf7Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('UTF-7');"/>
|
||||
<menuitem value="&dcharUtf8Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('UTF-8');"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menu value="&dcharMenu2.label;">
|
||||
<menupopup>
|
||||
<menuitem value="&dcharRusCmd.label; " oncommand="BrowserSetDefaultCharacterSet('KOI8-R');"/>
|
||||
<menuitem value="&dcharIsoCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-5');"/>
|
||||
<menuitem value="&dcharWinCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1251');"/>
|
||||
<menuitem value="&dcharEcmaCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-IR-111');"/>
|
||||
<menuitem value="&dcharDosCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('IBM866');"/>
|
||||
<menuitem value="&dcharMacCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-cyrillic');"/>
|
||||
<menuitem value="&dcharUkrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('KOI8-U');"/>
|
||||
<menuitem value="&dcharMacUkrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-ukrainian');"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menu value="&dcharMenu3.label;">
|
||||
<menupopup>
|
||||
<menuitem value="&dcharWinVietCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1258');"/>
|
||||
<menuitem value="&dcharVietTcnCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-viet-tcvn5712');"/>
|
||||
<menuitem value="&dcharVietViCmd.label;" oncommand="BrowserSetDefaultCharacterSet('VISCII');"/>
|
||||
<menuitem value="&dcharVieVpCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-viet-vps');"/>
|
||||
<menuseparator />
|
||||
<menuitem value="&dcharThaiCmd.label;" oncommand="BrowserSetDefaultCharacterSet('TIS-620');"/>
|
||||
<menuseparator />
|
||||
<menuitem value="&dcharArmCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ARMSCII-8');"/>
|
||||
<menuseparator />
|
||||
<menuitem value="&dcharIso6Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-6');"/>
|
||||
<menuitem value="&dcharCp1256Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1256');"/>
|
||||
<menuseparator />
|
||||
<menuitem value="&dcharIso8Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-8');"/>
|
||||
<menuitem value="&dcharCp1255Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1255');"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menu value="&dcharMenu4.label;">
|
||||
<menupopup>
|
||||
<menuitem value="&dcharMacRomCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-roman');"/>
|
||||
<menuitem value="&dcharMacCenEuroCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-ce');"/>
|
||||
<menuitem value="&dcharMacTurCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-turkish');"/>
|
||||
<menuitem value="&dcharMacCroaCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-croatian');"/>
|
||||
<menuitem value="&dcharMacRomanianCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-romanian');"/>
|
||||
<menuitem value="&dcharMacIceCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-icelandic');"/>
|
||||
<menuitem value="&dcharMacGreekCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-greek');"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menu value="&dcharMenu5.label;">
|
||||
<menupopup>
|
||||
<menuitem value="&dcharWinLat1Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1252');"/>
|
||||
<menuitem value="&dcharWinLat2Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1250');"/>
|
||||
<menuitem value="&dcharWinLat5Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1254');"/>
|
||||
<menuitem value="&dcharWinBalRimCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1257');"/>
|
||||
<menuitem value="&dcharWinGreekCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1253');"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
END of Deprecated -->
|
||||
<menu id = "charsetMenu" />
|
||||
<menuseparator/>
|
||||
<menu id="menu_Themes" value="&applyTheme.label;"
|
||||
<menuseparator/>
|
||||
<menu id="menu_Themes" value="&applyTheme.label;"
|
||||
accesskey="&applyTheme.accesskey;">
|
||||
<menupopup id="applyThemePopup" datasources="rdf:chrome" ref="urn:mozilla:skin:root">
|
||||
<menuitem id="themePrefs"
|
||||
|
|
|
|||
|
|
@ -52,9 +52,13 @@
|
|||
<!ENTITY reloadCmd.commandkey "r">
|
||||
|
||||
<!ENTITY toolbarsCmd.label "Toolbars">
|
||||
<!ENTITY toolbarsCmd.accesskey "t">
|
||||
<!ENTITY navbarCmd.label "Navigation Toolbar">
|
||||
<!ENTITY navbarCmd.accesskey "n">
|
||||
<!ENTITY personalbarCmd.label "Personal Toolbar">
|
||||
<!ENTITY personalbarCmd.accesskey "p">
|
||||
<!ENTITY taskbarCmd.label "Taskbar">
|
||||
<!ENTITY taskbarCmd.accesskey "t">
|
||||
|
||||
<!-- the command keys for Larger and Smaller were intended to be + and -, but see bug 52756 -->
|
||||
<!ENTITY textZoomEnlargeCmd.label "Larger">
|
||||
|
|
@ -68,75 +72,26 @@
|
|||
<!ENTITY textZoomOtherCmd.accesskey "o">
|
||||
|
||||
<!ENTITY useStyleSheetMenu.label "Use Stylesheet">
|
||||
<!ENTITY useStyleSheetMenu.accesskey "u">
|
||||
<!ENTITY useStyleSheetNone.label "None">
|
||||
<!ENTITY reloadCmd.label "Reload">
|
||||
<!ENTITY reloadCmd.accesskey "r">
|
||||
<!ENTITY showImagesCmd.label "Show Images">
|
||||
<!ENTITY showImagesCmd.accesskey "g">
|
||||
<!ENTITY stopCmd.label "Stop">
|
||||
<!ENTITY stopCmd.accesskey "s">
|
||||
<!ENTITY pageSourceCmd.label "Page Source">
|
||||
<!ENTITY pageSourceCmd.accesskey "u">
|
||||
<!ENTITY pageSourceCmd.commandkey "u">
|
||||
<!ENTITY pageInfoCmd.label "Page Info">
|
||||
<!ENTITY pageInfoCmd.accesskey "i">
|
||||
<!ENTITY translateMenu.label "Translate">
|
||||
<!ENTITY translateMenu.accesskey "t">
|
||||
<!ENTITY translate.commandKey "t">
|
||||
<!ENTITY webContentMenu.label "Languages and Web Content">
|
||||
<!ENTITY webContentMenu.accesskey "l">
|
||||
<!ENTITY downloadMore.label "Download More">
|
||||
<!ENTITY dcharMenu.label "Character Set ISO">
|
||||
<!ENTITY dcharMenu1.label "Character Set Multibyte">
|
||||
<!ENTITY dcharMenu2.label "Character Set Cyrillic">
|
||||
<!ENTITY dcharMenu3.label "Character Set SE Asian/Armenian/Semitic">
|
||||
<!ENTITY dcharMenu4.label "Character Set Macintosh">
|
||||
<!ENTITY dcharMenu5.label "Character Set Windows">
|
||||
<!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
|
||||
<!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
|
||||
<!ENTITY dcharIso3Cmd.label "South European (ISO-8859-3)">
|
||||
<!ENTITY dcharIso4Cmd.label "Baltic (ISO-8859-4)">
|
||||
<!ENTITY dcharIso9Cmd.label "Turkish (ISO-8859-9)">
|
||||
<!ENTITY dcharIso10Cmd.label "Nordic (ISO-8859-10)">
|
||||
<!ENTITY dcharIso13Cmd.label "Baltic (ISO-8859-13)">
|
||||
<!ENTITY dcharIso14Cmd.label "Celtic (ISO-8859-14)">
|
||||
<!ENTITY dcharIso15Cmd.label "Western (ISO-8859-15)">
|
||||
<!ENTITY dcharWinLat2Cmd.label "Central European (Windows-1250)">
|
||||
<!ENTITY dcharWinLat1Cmd.label "Western (Windows-1252)">
|
||||
<!ENTITY dcharWinLat5Cmd.label "Turkish (Windows-1254)">
|
||||
<!ENTITY dcharWinBalRimCmd.label "Baltic (Windows-1257)">
|
||||
<!ENTITY dcharMacRomCmd.label "Western (MacRoman)">
|
||||
<!ENTITY dcharMacCenEuroCmd.label "Central European (MacCE)">
|
||||
<!ENTITY dcharMacTurCmd.label "Turkish (MacTurkish)">
|
||||
<!ENTITY dcharMacCroaCmd.label "Croatian (MacCroatian)">
|
||||
<!ENTITY dcharMacRomanianCmd.label "Romanian (MacRomanian)">
|
||||
<!ENTITY dcharMacIceCmd.label "Icelandic (MacIcelandic)">
|
||||
<!ENTITY dcharJapanCmd.label "Japanese (ISO-2022-JP)">
|
||||
<!ENTITY dcharJapanShiftjsCmd.label "Japanese (Shift_JIS)">
|
||||
<!ENTITY dcharJapanEucCmd.label "Japanese (EUC-JP)">
|
||||
<!ENTITY dcharTradChiBigCmd.label "Chinese Traditional (Big5)">
|
||||
<!ENTITY dcharTriChiEucCmd.label "Chinese Traditional (EUC-TW)">
|
||||
<!ENTITY dcharSimpChiGbCmd.label "Chinese Simplified (GB2312)">
|
||||
<!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
|
||||
<!ENTITY dcharUtf7Cmd.label "Unicode (UTF-7)">
|
||||
<!ENTITY dcharUtf8Cmd.label "Unicode (UTF-8)">
|
||||
<!ENTITY dcharIsoCyrCmd.label "Cyrillic (ISO-8859-5)">
|
||||
<!ENTITY dcharEcmaCyrCmd.label "Cyrillic (ISO-IR-111)">
|
||||
<!ENTITY dcharDosCyrCmd.label "Cyrillic (CP-866)">
|
||||
<!ENTITY dcharWinCyrCmd.label "Cyrillic (Windows-1251)">
|
||||
<!ENTITY dcharMacCyrCmd.label "Cyrillic (MacCyrillic)">
|
||||
<!ENTITY dcharMacUkrCmd.label "Cyrillic/Ukrainian (MacUkrainian)">
|
||||
<!ENTITY dcharRusCmd.label "Cyrillic (KOI8-R)">
|
||||
<!ENTITY dcharUkrCmd.label "Cyrillic/Ukrainian (KOI8-U)">
|
||||
<!ENTITY dcharIsoGreekCmd.label "Greek (ISO-8859-7)">
|
||||
<!ENTITY dcharWinGreekCmd.label "Greek (Windows-1253)">
|
||||
<!ENTITY dcharMacGreekCmd.label "Greek (MacGreek)">
|
||||
<!ENTITY dcharWinVietCmd.label "Vietnamese (Windows-1258)">
|
||||
<!ENTITY dcharVietTcnCmd.label "Vietnamese (TCVN5712)">
|
||||
<!ENTITY dcharVietViCmd.label "Vietnamese (VISCII)">
|
||||
<!ENTITY dcharVieVpCmd.label "Vietnamese (VPS)">
|
||||
<!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
|
||||
<!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
|
||||
<!ENTITY dcharIso6Cmd.label ".Arabic (ISO-8859-6)">
|
||||
<!ENTITY dcharIso8Cmd.label ".Hebrew (ISO-8859-8)">
|
||||
<!ENTITY dcharCp1255Cmd.label "Hebrew (Windows-1255)">
|
||||
<!ENTITY dcharCp1256Cmd.label "Arabic (Windows-1256)">
|
||||
<!ENTITY downloadMore.accesskey "d">
|
||||
<!ENTITY applyTheme.label "Apply Theme">
|
||||
<!ENTITY applyTheme.accesskey "A">
|
||||
<!ENTITY themePreferencesCmd.label "Theme Preferences...">
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче