summaryrefslogtreecommitdiffstats
path: root/browser/base
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2017-12-31 13:45:14 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-18 10:23:42 +0100
commit1a418cf476709cc49a4b7dcf4aef64c5100ddaf9 (patch)
treeb5893e8569f5c0d183e8192cb5cb2675a5d55572 /browser/base
parente803a1be814ccffbed19072f77425c7252b5e19e (diff)
downloadUXP-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/base')
-rw-r--r--browser/base/content/browser-menubar.inc11
-rwxr-xr-xbrowser/base/content/browser.js4
-rw-r--r--browser/base/content/sync/customize.xul7
-rw-r--r--browser/base/jar.mn2
4 files changed, 3 insertions, 21 deletions
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index e952bc3ca..3fc098755 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -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>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a8aff1bd7..9ccd86b12 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -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");
diff --git a/browser/base/content/sync/customize.xul b/browser/base/content/sync/customize.xul
index d95536d9a..827edf565 100644
--- a/browser/base/content/sync/customize.xul
+++ b/browser/base/content/sync/customize.xul
@@ -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;"
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index c9dbbbb9f..60f1facc0 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -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)