From 27ed261436517368a45b13ed312616ff8b535209 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 29 Mar 2021 17:40:29 +0000
Subject: [PATCH] Bug 1698678 - Let about:preferences menubar item re-label to
 'Settings' ride out in v89 on Windows and Linux. r=Gijs,fluent-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D110127
---
 browser/base/content/browser-menubar.inc  |  8 --------
 browser/locales/en-US/browser/menubar.ftl | 11 -----------
 2 files changed, 19 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 9712bbe0d87b..55d1cd2a2a3b 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -135,11 +135,7 @@
                 <menuseparator/>
                 <menuitem id="menu_preferences"
                           oncommand="openPreferences(undefined);"
-#ifdef NIGHTLY_BUILD
                           data-l10n-id="menu-settings"
-#else
-                          data-l10n-id="menu-preferences"
-#endif
                           />
 #endif
 #endif
@@ -431,11 +427,7 @@
 #ifndef XP_UNIX
               <menuseparator id="prefSep"/>
               <menuitem id="menu_preferences"
-#ifdef NIGHTLY_BUILD
                         data-l10n-id="menu-settings"
-#else
-                        data-l10n-id="menu-preferences"
-#endif
                         oncommand="openPreferences(undefined);"/>
 #endif
 #ifdef MOZ_DEBUG
diff --git a/browser/locales/en-US/browser/menubar.ftl b/browser/locales/en-US/browser/menubar.ftl
index de3afd70b942..081823eb27ef 100644
--- a/browser/locales/en-US/browser/menubar.ftl
+++ b/browser/locales/en-US/browser/menubar.ftl
@@ -276,17 +276,6 @@ menu-settings =
             [windows] S
            *[other] n
         }
-menu-preferences =
-    .label =
-        { PLATFORM() ->
-            [windows] Options
-           *[other] Preferences
-        }
-    .accesskey =
-        { PLATFORM() ->
-            [windows] O
-           *[other] n
-        }
 menu-tools-layout-debugger =
     .label = Layout Debugger
     .accesskey = L