[tor-commits] [tor-browser/tor-browser-60.2.1esr-8.5-1] squash! Bug 2176: Rebrand Firefox to TorBrowser

[gk at torproject.org]

commit 482dd99c9507ae456578ba1fedfb4cc714e87ecc
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Sat Sep 29 21:18:21 2018 -0500

    squash! Bug 2176: Rebrand Firefox to TorBrowser
    
    Also fix bug 27905.
---
 browser/branding/official/locales/en-US/tor-browser-brand.ftl | 5 +++++
 browser/components/preferences/in-content/preferences.xul     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/branding/official/locales/en-US/tor-browser-brand.ftl b/browser/branding/official/locales/en-US/tor-browser-brand.ftl
new file mode 100644
index 000000000000..817ce1b3f17c
--- /dev/null
+++ b/browser/branding/official/locales/en-US/tor-browser-brand.ftl
@@ -0,0 +1,5 @@
+# For Tor Browser, we use a new file (different than the brand.ftl file
+# that is used by Firefox) to avoid picking up the -brand-short-name values
+# that Mozilla includes in the Firefox language packs.
+
+-brand-short-name = Tor Browser
diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul
index f107ece67d04..91e1cf94ebb4 100644
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -90,7 +90,7 @@
       data-l10n-id="pref-page"
       data-l10n-attrs="title">
 
-  <link rel="localization" href="branding/brand.ftl"/>
+  <link rel="localization" href="branding/tor-browser-brand.ftl"/>
   <link rel="localization" href="browser/branding/sync-brand.ftl"/>
   <link rel="localization" href="browser/preferences/preferences.ftl"/>
   <script type="text/javascript" src="chrome://global/content/l10n.js"></script>