diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2017-12-31 13:45:14 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:23:42 +0100 |
| commit | 1a418cf476709cc49a4b7dcf4aef64c5100ddaf9 (patch) | |
| tree | b5893e8569f5c0d183e8192cb5cb2675a5d55572 /browser/components | |
| parent | e803a1be814ccffbed19072f77425c7252b5e19e (diff) | |
| download | UXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.tar UXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.tar.gz UXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.tar.lz UXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.tar.xz UXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.zip | |
Rename Options to Preferences and unify location.
This also removes OS-specific naming/handling for separate locations.
Fixes #270.
Diffstat (limited to 'browser/components')
| -rw-r--r-- | browser/components/customizableui/CustomizableWidgets.jsm | 5 | ||||
| -rw-r--r-- | browser/components/preferences/in-content/preferences.xul | 8 |
2 files changed, 1 insertions, 12 deletions
diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm index 907e2e0f7..1e68b01c1 100644 --- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -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 { diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index e9664eaf4..7ec7ef119 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -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"/> |