tor-browser

commit 9410cde6f7ced04a01b7d24a464a64e80278995a
parent 54afadf9a3a55c7f88823ec522d3d975cada501b
Author: MagentaManifold <17zhaomingyuan@gmail.com>
Date:   Mon, 20 Oct 2025 04:30:59 +0000

Bug 1995168 - update appmenu-other-protection-header to use hardcoded "Mozilla" instead of -vendor-short-name r=flod,fluent-reviewers

"Mozilla" should be hardcoded here, since Firefox forks will override -vendor-short-name to their own.

Differential Revision: https://phabricator.services.mozilla.com/D269151

Diffstat:
M
browser/base/content/appmenu-viewcache.inc.xhtml
 | 
2
+-
M
browser/locales/en-US/browser/appmenu.ftl
 | 
5
++++-
M
tools/lint/fluent-lint/exclusions.yml
 | 
2
++

3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
@@ -677,7 +677,7 @@
       <!-- updateCTAPanel will control if we show this panel -->
       <vbox id="PanelUI-fxa-cta-menu" hidden="true">
         <toolbarseparator id="PanelUI-products-separator" />
-        <label id="fxa-menu-other-protection-tools-header" crop="end" class="PanelUI-fxa-menu-section-title" data-l10n-id="appmenu-other-protection-header" />
+        <label id="fxa-menu-other-protection-tools-header" crop="end" class="PanelUI-fxa-menu-section-title" data-l10n-id="appmenu-other-protection-header2" />
         <toolbarbutton id="PanelUI-fxa-menu-monitor-button" class="fxa-cta-button subviewbutton subviewbutton-iconic">
           <vbox flex="1">
             <hbox align="center">
diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl
@@ -316,7 +316,10 @@ appmenuitem-vpn-title = { -mozilla-vpn-brand-name }
 appmenuitem-vpn-description = Protect your online activity
 
 appmenu-services-header = My services
-appmenu-other-protection-header = Try other protection tools from { -vendor-short-name }:
+# "Mozilla" is intentionally hardcoded to prevent forks from replacing it
+# with their own vendor name, since these tools are created and maintained by
+# Mozilla.
+appmenu-other-protection-header2 = Try other protection tools from Mozilla:
 
 ## Profiles panel
 
diff --git a/tools/lint/fluent-lint/exclusions.yml b/tools/lint/fluent-lint/exclusions.yml
@@ -197,6 +197,8 @@ CO01:
         - cert-error-mitm-connection
         # browser/search.ftl
         - add-engine-name-placeholder
+        # browser/appmenu.ftl
+        - appmenu-other-protection-header2
     files:
         - browser/locales/en-US/browser/profile/default-bookmarks.ftl
         - toolkit/locales/en-US/toolkit/about/aboutMozilla.ftl