wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-06 07:48:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Rename Options to Preferences and unify location.

Browse source 
This also removes OS-specific naming/handling for separate locations.
Fixes #270.
This commit is contained in:
wolfbeast 2017-12-31 13:45:14 +01:00 • committed by Roy Tam
commit 10c9be356b
14 changed files with 12 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

11
browser/base/content/browser-menubar.inc
View file

@ -179,15 +179,6 @@
label="&bidiSwitchTextDirectionItem.label;"
accesskey="&bidiSwitchTextDirectionItem.accesskey;"
hidden="true"/>
#ifdef XP_UNIX
#ifndef XP_MACOSX
<menuseparator/>
<menuitem id="menu_preferences"
label="&preferencesCmdUnix.label;"
accesskey="&preferencesCmdUnix.accesskey;"
oncommand="openPreferences();"/>
#endif
#endif
</menupopup>
</menu>
@ -521,13 +512,11 @@
<menupopup id="menu_mirrorTab-popup"
onpopupshowing="populateMirrorTabMenu(this)"/>
</menu>
#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences"
label="&preferencesCmd2.label;"
accesskey="&preferencesCmd2.accesskey;"
oncommand="openPreferences();"/>
#endif
</menupopup>
</menu>

4
browser/base/content/browser.js
View file

@ -473,9 +473,7 @@ var gPopupBlockerObserver = {
var brandShortName = brandBundle.getString("brandShortName");
var popupCount = gBrowser.selectedBrowser.blockedPopups.length;
var stringKey = AppConstants.platform == "win"
? "popupWarningButton"
: "popupWarningButtonUnix";
var stringKey = "popupWarningButton";
var popupButtonText = gNavigatorBundle.getString(stringKey);
var popupButtonAccesskey = gNavigatorBundle.getString(stringKey + ".accesskey");

7
browser/base/content/sync/customize.xul
View file

@ -31,12 +31,7 @@
<label id="sync-customize-title" value="&syncCustomize.title;"/>
<description id="sync-customize-subtitle"
#ifdef XP_UNIX
value="&syncCustomizeUnix.description;"
#else
value="&syncCustomize.description;"
#endif
/>
value="&syncCustomize.description;"/>
<vbox align="start">
<checkbox label="&engine.tabs.label;"

2
browser/base/jar.mn
View file

@ -152,7 +152,7 @@ browser.jar:
content/browser/sync/genericChange.js (content/sync/genericChange.js)
content/browser/sync/key.xhtml (content/sync/key.xhtml)
content/browser/sync/utils.js (content/sync/utils.js)
* content/browser/sync/customize.xul (content/sync/customize.xul)
content/browser/sync/customize.xul (content/sync/customize.xul)
content/browser/sync/customize.js (content/sync/customize.js)
content/browser/sync/customize.css (content/sync/customize.css)
content/browser/safeMode.css (content/safeMode.css)

5
browser/components/customizableui/CustomizableWidgets.jsm
View file

@ -1187,10 +1187,7 @@ let preferencesButton = {
win.openPreferences();
}
};
if (AppConstants.platform == "win") {
preferencesButton.label = "preferences-button.labelWin";
preferencesButton.tooltiptext = "preferences-button.tooltipWin2";
} else if (AppConstants.platform == "macosx") {
if (AppConstants.platform == "macosx") {
preferencesButton.tooltiptext = "preferences-button.tooltiptext.withshortcut";
preferencesButton.shortcutId = "key_preferencesCmdMac";
} else {

8
browser/components/preferences/in-content/preferences.xul
View file

@ -55,18 +55,10 @@
%advancedDTD;
]>
#ifdef XP_WIN
#define USE_WIN_TITLE_STYLE
#endif
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
disablefastfind="true"
#ifdef USE_WIN_TITLE_STYLE
title="&prefWindow.titleWin;">
#else
title="&prefWindow.title;">
#endif
<html:link rel="shortcut icon"
href="chrome://browser/skin/preferences/in-content/favicon.ico"/>

2
browser/locales/en-US/chrome/browser/aboutHome.dtd
View file

@ -26,7 +26,7 @@
<!ENTITY abouthome.historyButton.label "History">
<!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the
preferences/options item on about:home on Windows -->
<!ENTITY abouthome.preferencesButtonWin.label "Options">
<!ENTITY abouthome.preferencesButtonWin.label "Preferences">
<!-- LOCALIZATION NOTE (abouthome.preferencesButtonUnix.label): The label for the
preferences/options item on about:home on Linux and OS X -->
<!ENTITY abouthome.preferencesButtonUnix.label "Preferences">

6
browser/locales/en-US/chrome/browser/browser.dtd
View file

@ -315,10 +315,8 @@ These should match what Safari and other Apple applications use on OS X Lion. --
<!ENTITY selectAllCmd.label "Select All">
<!ENTITY selectAllCmd.key "A">
<!ENTITY selectAllCmd.accesskey "A">
<!ENTITY preferencesCmd2.label "Options">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferences">
<!ENTITY preferencesCmdUnix.accesskey "n">
<!ENTITY preferencesCmd2.label "Preferences">
<!ENTITY preferencesCmd2.accesskey "P">
<!ENTITY clearRecentHistory.label "Clear Recent History…">

6
browser/locales/en-US/chrome/browser/browser.properties
View file

@ -128,10 +128,8 @@ lwthemeNeedsRestart.accesskey=R
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
# #1 is brandShortName and #2 is the number of pop-ups blocked.
popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows.
popupWarningButton=Options
popupWarningButton.accesskey=O
popupWarningButtonUnix=Preferences
popupWarningButtonUnix.accesskey=P
popupWarningButton=Preferences
popupWarningButton.accesskey=P
popupAllow=Allow pop-ups for %S
popupBlock=Block pop-ups for %S
popupWarningDontShowFromMessage=Don’t show this message when pop-ups are blocked

4
browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
View file

@ -39,10 +39,6 @@ add-ons-button.tooltiptext3 = Manage your add-ons (%S)
preferences-button.label = Preferences
preferences-button.tooltiptext2 = Open preferences
preferences-button.tooltiptext.withshortcut = Open preferences (%S)
# LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options
preferences-button.labelWin = Options
# LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options
preferences-button.tooltipWin2 = Open options
zoom-controls.label = Zoom Controls
zoom-controls.tooltiptext2 = Zoom controls

3
browser/locales/en-US/chrome/browser/migration/migration.dtd
View file

@ -5,8 +5,7 @@
<!ENTITY migrationWizard.title "Import Wizard">
<!ENTITY importFrom.label "Import Options, Bookmarks, History, Passwords and other data from:">
<!ENTITY importFromUnix.label "Import Preferences, Bookmarks, History, Passwords and other data from:">
<!ENTITY importFrom.label "Import Preferences, Bookmarks, History, Passwords and other data from:">
<!ENTITY importFromBookmarks.label "Import Bookmarks from:">
<!ENTITY importFromIE.label "Microsoft Internet Explorer">

1
browser/locales/en-US/chrome/browser/preferences/preferences.dtd
View file

@ -3,7 +3,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!ENTITY prefWindow.titleWin "Options">
<!ENTITY prefWindow.title "Preferences">
<!-- LOCALIZATION NOTE (prefWindow.titleGNOME): This is not used for in-content preferences -->
<!ENTITY prefWindow.titleGNOME "&brandShortName; Preferences">

3
browser/locales/en-US/chrome/browser/syncCustomize.dtd
View file

@ -6,8 +6,7 @@
<!ENTITY syncCustomize.acceptButton.label "Start">
<!ENTITY syncCustomize.title "What would you like to sync?">
<!ENTITY syncCustomize.description "You can change this selection in Options.">
<!ENTITY syncCustomizeUnix.description "You can change this selection in Preferences.">
<!ENTITY syncCustomize.description "You can change this selection in Preferences.">
<!--
These engine names are the same as in browser/preferences/sync.dtd except

2
browser/locales/en-US/chrome/browser/syncSetup.dtd
View file

@ -72,7 +72,7 @@
<!-- Existing Account Page 2: Manual Login -->
<!ENTITY setup.signInPage.title.label "Sign In">
<!ENTITY existingRecoveryKey.description "You can get a copy of your Recovery Key by going to &syncBrand.shortName.label; Options on your other device, and selecting &#x0022;My Recovery Key&#x0022; under &#x0022;Manage Account&#x0022;.">
<!ENTITY existingRecoveryKey.description "You can get a copy of your Recovery Key by going to &syncBrand.shortName.label; Preferences on your other device, and selecting &#x0022;My Recovery Key&#x0022; under &#x0022;Manage Account&#x0022;.">
<!ENTITY verifying.label "Verifying…">
<!ENTITY resetPassword.label "Reset Password">
<!ENTITY resetSyncKey.label "I have lost my other device.">