diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 12:21:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 12:21:38 +0100 |
| commit | 51b6354f31b5f2122c11afec7fc0e3d650ce5e5d (patch) | |
| tree | cfc8e519c89e459f7199a8210c72879537dec208 /browser/base/content | |
| parent | d38f865699b1c1cb2395f719324b661acffa3223 (diff) | |
| parent | 31c5e63eda295ed87419ff035631cadf776244af (diff) | |
| download | UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar.gz UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar.lz UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar.xz UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.zip | |
Merge branch 'ported-moebius'
Diffstat (limited to 'browser/base/content')
| -rw-r--r-- | browser/base/content/browser-menubar.inc | 11 | ||||
| -rwxr-xr-x | browser/base/content/browser.js | 4 | ||||
| -rw-r--r-- | browser/base/content/sync/customize.xul | 7 |
3 files changed, 2 insertions, 20 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;" |