Rename Options to Preferences and unify location.

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

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 {

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"/>