summaryrefslogtreecommitdiffstats
path: root/browser/base/content/browser-menubar.inc
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/content/browser-menubar.inc
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/content/browser-menubar.inc')
-rw-r--r--browser/base/content/browser-menubar.inc11
1 files changed, 0 insertions, 11 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>