[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [torbutton/master] Bug 28196: Register Fluent src and add tor-browser-brand.ftl

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbutton/master] Bug 28196: Register Fluent src and add tor-browser-brand.ftl
From: gk@xxxxxxxxxxxxxx
Date: Wed, 2 Oct 2019 09:25:43 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 02 Oct 2019 05:26:07 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Alex Catarineu <acat@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 2d8ae8086b2fa0ed1c25a741a8bdcc269b290301
Author: Alex Catarineu <acat@xxxxxxxxxxxxxx>
Date:   Wed Sep 25 23:06:58 2019 +0200

    Bug 28196: Register Fluent src and add tor-browser-brand.ftl
---
 chrome/locale/af/brand.dtd                         |  2 +-
 chrome/locale/af/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ak/brand.dtd                         |  2 +-
 chrome/locale/ak/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/am/brand.dtd                         |  2 +-
 chrome/locale/am/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ar/brand.dtd                         |  2 +-
 chrome/locale/ar/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/arn/brand.dtd                        |  2 +-
 chrome/locale/arn/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/ast/brand.dtd                        |  2 +-
 chrome/locale/ast/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/az/brand.dtd                         |  2 +-
 chrome/locale/az/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/be/brand.dtd                         |  2 +-
 chrome/locale/be/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/bg/brand.dtd                         |  2 +-
 chrome/locale/bg/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/bn-BD/brand.dtd                      |  2 +-
 chrome/locale/bn-BD/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/bn-IN/brand.dtd                      |  2 +-
 chrome/locale/bn-IN/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/bn/brand.dtd                         |  2 +-
 chrome/locale/bn/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/bo/brand.dtd                         |  2 +-
 chrome/locale/bo/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/br/brand.dtd                         |  2 +-
 chrome/locale/br/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/bs/brand.dtd                         |  2 +-
 chrome/locale/bs/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ca/brand.dtd                         |  2 +-
 chrome/locale/ca/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/cs/brand.dtd                         |  2 +-
 chrome/locale/cs/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/csb/brand.dtd                        |  2 +-
 chrome/locale/csb/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/cy/brand.dtd                         |  2 +-
 chrome/locale/cy/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/da/brand.dtd                         |  2 +-
 chrome/locale/da/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/de/brand.dtd                         |  2 +-
 chrome/locale/de/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/dz/brand.dtd                         |  2 +-
 chrome/locale/dz/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/el/brand.dtd                         |  2 +-
 chrome/locale/el/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/en-US/brand.dtd                      |  2 +-
 chrome/locale/en-US/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/eo/brand.dtd                         |  2 +-
 chrome/locale/eo/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/es-AR/brand.dtd                      |  2 +-
 chrome/locale/es-AR/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/es-ES/brand.dtd                      |  2 +-
 chrome/locale/es-ES/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/et/brand.dtd                         |  2 +-
 chrome/locale/et/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/eu/brand.dtd                         |  2 +-
 chrome/locale/eu/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/fa/brand.dtd                         |  2 +-
 chrome/locale/fa/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/fi/brand.dtd                         |  2 +-
 chrome/locale/fi/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/fil/brand.dtd                        |  2 +-
 chrome/locale/fil/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/fo/brand.dtd                         |  2 +-
 chrome/locale/fo/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/fr/brand.dtd                         |  2 +-
 chrome/locale/fr/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/fur/brand.dtd                        |  2 +-
 chrome/locale/fur/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/fy/brand.dtd                         |  2 +-
 chrome/locale/fy/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ga-IE/brand.dtd                      |  2 +-
 chrome/locale/ga-IE/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/gl/brand.dtd                         |  2 +-
 chrome/locale/gl/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/gu/brand.dtd                         |  2 +-
 chrome/locale/gu/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/gun/brand.dtd                        |  2 +-
 chrome/locale/gun/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/ha/brand.dtd                         |  2 +-
 chrome/locale/ha/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/he/brand.dtd                         |  2 +-
 chrome/locale/he/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/hi/brand.dtd                         |  2 +-
 chrome/locale/hi/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/hr/brand.dtd                         |  2 +-
 chrome/locale/hr/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ht/brand.dtd                         |  2 +-
 chrome/locale/ht/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/hu/brand.dtd                         |  2 +-
 chrome/locale/hu/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/hy/brand.dtd                         |  2 +-
 chrome/locale/hy/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/id/brand.dtd                         |  2 +-
 chrome/locale/id/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/is/brand.dtd                         |  2 +-
 chrome/locale/is/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/it/brand.dtd                         |  2 +-
 chrome/locale/it/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ja/brand.dtd                         |  2 +-
 chrome/locale/ja/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/jv/brand.dtd                         |  2 +-
 chrome/locale/jv/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ka/brand.dtd                         |  2 +-
 chrome/locale/ka/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/km/brand.dtd                         |  2 +-
 chrome/locale/km/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/kn/brand.dtd                         |  2 +-
 chrome/locale/kn/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ko/brand.dtd                         |  2 +-
 chrome/locale/ko/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ku/brand.dtd                         |  2 +-
 chrome/locale/ku/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/kw/brand.dtd                         |  2 +-
 chrome/locale/kw/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ky/brand.dtd                         |  2 +-
 chrome/locale/ky/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/lb/brand.dtd                         |  2 +-
 chrome/locale/lb/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ln/brand.dtd                         |  2 +-
 chrome/locale/ln/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/lo/brand.dtd                         |  2 +-
 chrome/locale/lo/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/lt/brand.dtd                         |  2 +-
 chrome/locale/lt/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/lv/brand.dtd                         |  2 +-
 chrome/locale/lv/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/mg/brand.dtd                         |  2 +-
 chrome/locale/mg/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/mi/brand.dtd                         |  2 +-
 chrome/locale/mi/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/mk/brand.dtd                         |  2 +-
 chrome/locale/mk/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ml/brand.dtd                         |  2 +-
 chrome/locale/ml/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/mn/brand.dtd                         |  2 +-
 chrome/locale/mn/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/mr/brand.dtd                         |  2 +-
 chrome/locale/mr/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ms/brand.dtd                         |  2 +-
 chrome/locale/ms/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/mt/brand.dtd                         |  2 +-
 chrome/locale/mt/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/my/brand.dtd                         |  2 +-
 chrome/locale/my/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/nah/brand.dtd                        |  2 +-
 chrome/locale/nah/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/nap/brand.dtd                        |  2 +-
 chrome/locale/nap/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/nb-NO/brand.dtd                      |  2 +-
 chrome/locale/nb-NO/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/ne/brand.dtd                         |  2 +-
 chrome/locale/ne/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/nl/brand.dtd                         |  2 +-
 chrome/locale/nl/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/nn/brand.dtd                         |  2 +-
 chrome/locale/nn/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/nso/brand.dtd                        |  2 +-
 chrome/locale/nso/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/oc/brand.dtd                         |  2 +-
 chrome/locale/oc/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/or/brand.dtd                         |  2 +-
 chrome/locale/or/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/pa/brand.dtd                         |  2 +-
 chrome/locale/pa/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/pap/brand.dtd                        |  2 +-
 chrome/locale/pap/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/pl/brand.dtd                         |  2 +-
 chrome/locale/pl/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/pms/brand.dtd                        |  2 +-
 chrome/locale/pms/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/ps/brand.dtd                         |  2 +-
 chrome/locale/ps/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/pt-BR/brand.dtd                      |  2 +-
 chrome/locale/pt-BR/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/pt/brand.dtd                         |  2 +-
 chrome/locale/pt/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ro/brand.dtd                         |  2 +-
 chrome/locale/ro/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ru/brand.dtd                         |  2 +-
 chrome/locale/ru/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/sco/brand.dtd                        |  2 +-
 chrome/locale/sco/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/sk/brand.dtd                         |  2 +-
 chrome/locale/sk/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/sl/brand.dtd                         |  2 +-
 chrome/locale/sl/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/so/brand.dtd                         |  2 +-
 chrome/locale/so/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/son/brand.dtd                        |  2 +-
 chrome/locale/son/branding/tor-browser-brand.ftl   | 12 ++++++++++
 chrome/locale/sq/brand.dtd                         |  2 +-
 chrome/locale/sq/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/sr/brand.dtd                         |  2 +-
 chrome/locale/sr/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/st/brand.dtd                         |  2 +-
 chrome/locale/st/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/su/brand.dtd                         |  2 +-
 chrome/locale/su/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/sv-SE/brand.dtd                      |  2 +-
 chrome/locale/sv-SE/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/sw/brand.dtd                         |  2 +-
 chrome/locale/sw/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ta/brand.dtd                         |  2 +-
 chrome/locale/ta/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/te/brand.dtd                         |  2 +-
 chrome/locale/te/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/tg/brand.dtd                         |  2 +-
 chrome/locale/tg/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/th/brand.dtd                         |  2 +-
 chrome/locale/th/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ti/brand.dtd                         |  2 +-
 chrome/locale/ti/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/tk/brand.dtd                         |  2 +-
 chrome/locale/tk/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/tr/brand.dtd                         |  2 +-
 chrome/locale/tr/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/uk/brand.dtd                         |  2 +-
 chrome/locale/uk/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ur/brand.dtd                         |  2 +-
 chrome/locale/ur/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/ve/brand.dtd                         |  2 +-
 chrome/locale/ve/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/vi/brand.dtd                         |  2 +-
 chrome/locale/vi/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/wa/brand.dtd                         |  2 +-
 chrome/locale/wa/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/wo/brand.dtd                         |  2 +-
 chrome/locale/wo/branding/tor-browser-brand.ftl    | 12 ++++++++++
 chrome/locale/zh-CN/brand.dtd                      |  2 +-
 chrome/locale/zh-CN/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/zh-HK/brand.dtd                      |  2 +-
 chrome/locale/zh-HK/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/zh-TW/brand.dtd                      |  2 +-
 chrome/locale/zh-TW/branding/tor-browser-brand.ftl | 12 ++++++++++
 chrome/locale/zu/brand.dtd                         |  2 +-
 chrome/locale/zu/branding/tor-browser-brand.ftl    | 12 ++++++++++
 components/startup-observer.js                     | 27 ++++++++++++++++++++--
 239 files changed, 1572 insertions(+), 121 deletions(-)

diff --git a/chrome/locale/af/brand.dtd b/chrome/locale/af/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/af/brand.dtd
+++ b/chrome/locale/af/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/af/branding/tor-browser-brand.ftl b/chrome/locale/af/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/af/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ak/brand.dtd b/chrome/locale/ak/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ak/brand.dtd
+++ b/chrome/locale/ak/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ak/branding/tor-browser-brand.ftl b/chrome/locale/ak/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ak/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/am/brand.dtd b/chrome/locale/am/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/am/brand.dtd
+++ b/chrome/locale/am/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/am/branding/tor-browser-brand.ftl b/chrome/locale/am/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/am/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ar/brand.dtd b/chrome/locale/ar/brand.dtd
index 654dc6a1..fa6e3d5d 100644
--- a/chrome/locale/ar/brand.dtd
+++ b/chrome/locale/ar/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Ù?ØªØµÙ?Ø ØªÙ?Ø±">
 <!ENTITY  brandFullName         "Ù?ØªØµÙ?Ø ØªÙ?Ø±">
 <!ENTITY  vendorShortName       "Ù?Ø´Ø±Ù?Ø¹ ØªÙ?Ø±">
-<!ENTITY  trademarkInfo.part1   "Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³ Ù?Ø´Ø¹Ø§Ø±Ø§Øª Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³ Ø¹Ù?Ø§Ù?Ø§Øª ØªØ¬Ø§Ø±Ù?Ø© Ù?Ø³Ø¬Ù?Ø© Ù?Ù?Ø¤Ø³Ø³Ø© Ù?Ù?Ø²Ù?Ù?Ø§.">
+<!ENTITY  trademarkInfo.part1   "&quot;ØªÙ?Ø±&quot; Ù? &quot;Ø´Ø¹Ø§Ø± Ø§Ù?Ø¨ØµÙ?Ø©&quot; Ø¹Ù?Ø§Ù?Ø§Øª ØªØ¬Ø§Ø±Ù?Ø© Ù?Ø³Ø¬Ù?Ø© Ø¨Ø§Ø³Ù? Ø´Ø±Ù?Ø© Ù?Ø´Ø±Ù?Ø¹ ØªÙ?Ø± Ø§Ù?Ù?ØØ¯Ù?Ø¯Ø©">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Ø§Ø¶ØºØ· Ù?ØªØÙ?Ù?Ù? Ø§Ù?Ø¥Ø¶Ø§Ù?Ø§Øª Ø§Ù?Ù?Ø«Ø¨ØªØ© Ø¹Ù?Ù? Ø§Ù?Ù?ØªØµÙ?Ø">
diff --git a/chrome/locale/ar/branding/tor-browser-brand.ftl b/chrome/locale/ar/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..9595f702
--- /dev/null
+++ b/chrome/locale/ar/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Ù?ØªØµÙ?Ø ØªÙ?Ø±
+-brand-short-name = Ù?ØªØµÙ?Ø ØªÙ?Ø±
+-brand-full-name = Ù?ØªØµÙ?Ø ØªÙ?Ø±
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Ù?ØªØµÙ?Ø ØªÙ?Ø±
+-vendor-short-name = Ù?Ø´Ø±Ù?Ø¹ ØªÙ?Ø±
+trademarkInfo = &quot;ØªÙ?Ø±&quot; Ù? &quot;Ø´Ø¹Ø§Ø± Ø§Ù?Ø¨ØµÙ?Ø©&quot; Ø¹Ù?Ø§Ù?Ø§Øª ØªØ¬Ø§Ø±Ù?Ø© Ù?Ø³Ø¬Ù?Ø© Ø¨Ø§Ø³Ù? Ø´Ø±Ù?Ø© Ù?Ø´Ø±Ù?Ø¹ ØªÙ?Ø± Ø§Ù?Ù?ØØ¯Ù?Ø¯Ø©
diff --git a/chrome/locale/arn/brand.dtd b/chrome/locale/arn/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/arn/brand.dtd
+++ b/chrome/locale/arn/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/arn/branding/tor-browser-brand.ftl b/chrome/locale/arn/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/arn/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ast/brand.dtd b/chrome/locale/ast/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ast/brand.dtd
+++ b/chrome/locale/ast/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ast/branding/tor-browser-brand.ftl b/chrome/locale/ast/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ast/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/az/brand.dtd b/chrome/locale/az/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/az/brand.dtd
+++ b/chrome/locale/az/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/az/branding/tor-browser-brand.ftl b/chrome/locale/az/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/az/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/be/brand.dtd b/chrome/locale/be/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/be/brand.dtd
+++ b/chrome/locale/be/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/be/branding/tor-browser-brand.ftl b/chrome/locale/be/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/be/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/bg/brand.dtd b/chrome/locale/bg/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/bg/brand.dtd
+++ b/chrome/locale/bg/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/bg/branding/tor-browser-brand.ftl b/chrome/locale/bg/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/bg/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/bn-BD/brand.dtd b/chrome/locale/bn-BD/brand.dtd
index 52c95b8b..54c496ac 100644
--- a/chrome/locale/bn-BD/brand.dtd
+++ b/chrome/locale/bn-BD/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°">
 <!ENTITY  brandFullName         "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°">
 <!ENTITY  vendorShortName       "à¦?à¦° à¦ªà§?à¦°à¦?à¦²à§?à¦ª">
-<!ENTITY  trademarkInfo.part1   "à¦«à¦¾à¦¯à¦¼à¦¾à¦°à¦«à¦?à§?à¦¸ à¦?à¦¬à¦? à¦«à¦¾à¦¯à¦¼à¦¾à¦°à¦«à¦?à§?à¦¸ à¦²à§?à¦?à§? à¦®à§?à¦?à¦¿à¦²à¦¾ à¦«à¦¾à¦?à¦¨à§?à¦¡à§?à¦¶à¦¨à§?à¦° à¦?à§?à¦°à§?à¦¡à¦®à¦¾à¦°à§?à¦?à¥¤">
+<!ENTITY  trademarkInfo.part1   "'à¦?à¦°' à¦?à¦¬à¦? 'à¦?à¦¯à¦¼à¦¾à¦¨à¦¿à¦¯à¦¼à¦¾à¦¨ à¦²à§?à¦?à§?' à¦?à¦° à¦ªà§?à¦°à¦?à§?à¦?à§?à¦?, à¦?à¦¨à¦?à¥¤ à¦?à¦° à¦¨à¦¿à¦¬à¦¨à§?à¦§à¦¿à¦¤ à¦?à§?à¦°à§?à¦¡à¦®à¦¾à¦°à§?à¦?">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "à¦¸à¦¿à¦¸à§?à¦?à§?à¦®à§? à¦?à¦¨à§?à¦¸à¦?à¦² à¦?à¦°à¦¾ à¦ªà§?à¦²à¦¾à¦?à¦¿à¦¨ à¦²à§?à¦¡ à¦?à¦°à¦¤à§? à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨">
diff --git a/chrome/locale/bn-BD/branding/tor-browser-brand.ftl b/chrome/locale/bn-BD/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..90d4a844
--- /dev/null
+++ b/chrome/locale/bn-BD/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°
+-brand-short-name = à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°
+-brand-full-name = à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°
+-vendor-short-name = à¦?à¦° à¦ªà§?à¦°à¦?à¦²à§?à¦ª
+trademarkInfo = 'à¦?à¦°' à¦?à¦¬à¦? 'à¦?à¦¯à¦¼à¦¾à¦¨à¦¿à¦¯à¦¼à¦¾à¦¨ à¦²à§?à¦?à§?' à¦?à¦° à¦ªà§?à¦°à¦?à§?à¦?à§?à¦?, à¦?à¦¨à¦?à¥¤ à¦?à¦° à¦¨à¦¿à¦¬à¦¨à§?à¦§à¦¿à¦¤ à¦?à§?à¦°à§?à¦¡à¦®à¦¾à¦°à§?à¦?
diff --git a/chrome/locale/bn-IN/brand.dtd b/chrome/locale/bn-IN/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/bn-IN/brand.dtd
+++ b/chrome/locale/bn-IN/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/bn-IN/branding/tor-browser-brand.ftl b/chrome/locale/bn-IN/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/bn-IN/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/bn/brand.dtd b/chrome/locale/bn/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/bn/brand.dtd
+++ b/chrome/locale/bn/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/bn/branding/tor-browser-brand.ftl b/chrome/locale/bn/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/bn/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/bo/brand.dtd b/chrome/locale/bo/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/bo/brand.dtd
+++ b/chrome/locale/bo/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/bo/branding/tor-browser-brand.ftl b/chrome/locale/bo/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/bo/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/br/brand.dtd b/chrome/locale/br/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/br/brand.dtd
+++ b/chrome/locale/br/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/br/branding/tor-browser-brand.ftl b/chrome/locale/br/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/br/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/bs/brand.dtd b/chrome/locale/bs/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/bs/brand.dtd
+++ b/chrome/locale/bs/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/bs/branding/tor-browser-brand.ftl b/chrome/locale/bs/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/bs/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ca/brand.dtd b/chrome/locale/ca/brand.dtd
index a0ffa28e..e9ff4544 100644
--- a/chrome/locale/ca/brand.dtd
+++ b/chrome/locale/ca/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Navegador Tor">
 <!ENTITY  brandFullName         "Navegador Tor">
 <!ENTITY  vendorShortName       "Projecte Tor">
-<!ENTITY  trademarkInfo.part1   "El Firefox i els logotips del Firefox sÃ³n marques registrades de la Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' i 'Onion Logo' sÃ³n marques registrades per Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Cliqueu per carregar els complements de sistema instalÂ·lats">
diff --git a/chrome/locale/ca/branding/tor-browser-brand.ftl b/chrome/locale/ca/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..3796e912
--- /dev/null
+++ b/chrome/locale/ca/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Navegador Tor
+-brand-short-name = Navegador Tor
+-brand-full-name = Navegador Tor
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Navegador Tor
+-vendor-short-name = Projecte Tor
+trademarkInfo = 'Tor' i 'Onion Logo' sÃ³n marques registrades per Tor Project, Inc.
diff --git a/chrome/locale/cs/brand.dtd b/chrome/locale/cs/brand.dtd
index acdcfbf6..62af5f04 100644
--- a/chrome/locale/cs/brand.dtd
+++ b/chrome/locale/cs/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "ProhlÃÅ¾eÄ? Tor">
 <!ENTITY  brandFullName         "ProhlÃÅ¾eÄ? Tor">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox a loga Firefoxu jsou ochrannou znÃ¡mkou Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "&quot;Tor&quot; a &quot;Onion logo&quot; jsou registrovanÃ© ochrannÃ© znÃ¡mky spoleÄ?nosti Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "KlepnutÃm naÄ?tete nainstalovanÃ© systÃ©movÃ© zÃ¡suvnÃ© moduly">
diff --git a/chrome/locale/cs/branding/tor-browser-brand.ftl b/chrome/locale/cs/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..61719fb2
--- /dev/null
+++ b/chrome/locale/cs/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = ProhlÃÅ¾eÄ? Tor
+-brand-short-name = ProhlÃÅ¾eÄ? Tor
+-brand-full-name = ProhlÃÅ¾eÄ? Tor
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = ProhlÃÅ¾eÄ? Tor
+-vendor-short-name = Tor Project
+trademarkInfo = &quot;Tor&quot; a &quot;Onion logo&quot; jsou registrovanÃ© ochrannÃ© znÃ¡mky spoleÄ?nosti Tor Project, Inc.
diff --git a/chrome/locale/csb/brand.dtd b/chrome/locale/csb/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/csb/brand.dtd
+++ b/chrome/locale/csb/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/csb/branding/tor-browser-brand.ftl b/chrome/locale/csb/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/csb/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/cy/brand.dtd b/chrome/locale/cy/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/cy/brand.dtd
+++ b/chrome/locale/cy/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/cy/branding/tor-browser-brand.ftl b/chrome/locale/cy/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/cy/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/da/brand.dtd b/chrome/locale/da/brand.dtd
index 38d686c1..188f2d0d 100644
--- a/chrome/locale/da/brand.dtd
+++ b/chrome/locale/da/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor-projektet">
-<!ENTITY  trademarkInfo.part1   "Firefox og Firefox logoer er varemÃ¦rker tilhÃ¸rende Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "&quot;Tor&quot; og &quot;lÃ¸g-logoet&quot; er registrerede varemÃ¦rker tilhÃ¸rende Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Klik for at indlÃ¦se installerede systemplugins">
diff --git a/chrome/locale/da/branding/tor-browser-brand.ftl b/chrome/locale/da/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..c8554742
--- /dev/null
+++ b/chrome/locale/da/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor-projektet
+trademarkInfo = &quot;Tor&quot; og &quot;lÃ¸g-logoet&quot; er registrerede varemÃ¦rker tilhÃ¸rende Tor Project, Inc.
diff --git a/chrome/locale/de/brand.dtd b/chrome/locale/de/brand.dtd
index c7c9feaf..924088b6 100644
--- a/chrome/locale/de/brand.dtd
+++ b/chrome/locale/de/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor-Browser">
 <!ENTITY  brandFullName         "Tor-Browser">
 <!ENTITY  vendorShortName       "Tor-Projekt">
-<!ENTITY  trademarkInfo.part1   "Firefox und die Firefox-Logos sind Warenzeichen der Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "Â»TorÂ« und das Â»Zwiebel-LogoÂ« sind eingetragene Warenzeichen von Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Klicke, um System-Erweiterungen zu laden">
diff --git a/chrome/locale/de/branding/tor-browser-brand.ftl b/chrome/locale/de/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..67da7fad
--- /dev/null
+++ b/chrome/locale/de/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor-Browser
+-brand-short-name = Tor-Browser
+-brand-full-name = Tor-Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor-Browser
+-vendor-short-name = Tor-Projekt
+trademarkInfo = Â»TorÂ« und das Â»Zwiebel-LogoÂ« sind eingetragene Warenzeichen von Tor Project, Inc.
diff --git a/chrome/locale/dz/brand.dtd b/chrome/locale/dz/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/dz/brand.dtd
+++ b/chrome/locale/dz/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/dz/branding/tor-browser-brand.ftl b/chrome/locale/dz/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/dz/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/el/brand.dtd b/chrome/locale/el/brand.dtd
index 65bd74eb..4ecec61f 100644
--- a/chrome/locale/el/brand.dtd
+++ b/chrome/locale/el/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "O Firefox ÎºÎ±Î¹ Ï?Î¿ Î»Î¿Î³Ï?Ï?Ï?Ï?Î¿ Firefox ÎµÎ¯Î½Î±Î¹ ÎµÎ¼Ï?Î¿Ï?Î¹ÎºÎ¬ Ï?Î®Î¼Î±Ï?Î± Ï?Î¿Ï? Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "Î¤Î¿ 'Tor' ÎºÎ±Î¹ Ï?Î¿ 'Onion Logo' ÎµÎ¯Î½Î±Î¹ ÎµÎ³Î³ÎµÎ³Ï?Î±Î¼ÎÎ½Î± Î»Î¿Î³Ï?Ï?Ï?Ï?Î± Ï?Î¿Ï? Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Î?Î¬Î½Ï?Îµ ÎºÎ»Î¹Îº Î³Î¹Î± Î½Î± Ï?Î¿Ï?Ï?Ï?Ï?ÎµÏ?Îµ ÎµÎ³ÎºÎ±Ï?ÎµÏ?Ï?Î·Î¼ÎÎ½Î± Ï?Ï?Ï?Ï?Î¸ÎµÏ?Î± Ï?Ï?Ï?Ï?Î®Î¼Î±Ï?Î¿Ï?">
diff --git a/chrome/locale/el/branding/tor-browser-brand.ftl b/chrome/locale/el/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..69f0b425
--- /dev/null
+++ b/chrome/locale/el/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = Î¤Î¿ 'Tor' ÎºÎ±Î¹ Ï?Î¿ 'Onion Logo' ÎµÎ¯Î½Î±Î¹ ÎµÎ³Î³ÎµÎ³Ï?Î±Î¼ÎÎ½Î± Î»Î¿Î³Ï?Ï?Ï?Ï?Î± Ï?Î¿Ï? Tor Project, Inc.
diff --git a/chrome/locale/en-US/brand.dtd b/chrome/locale/en-US/brand.dtd
index 3df1a084..b1dfc762 100644
--- a/chrome/locale/en-US/brand.dtd
+++ b/chrome/locale/en-US/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Click to load installed system plugins">
diff --git a/chrome/locale/en-US/branding/tor-browser-brand.ftl b/chrome/locale/en-US/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/en-US/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/eo/brand.dtd b/chrome/locale/eo/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/eo/brand.dtd
+++ b/chrome/locale/eo/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/eo/branding/tor-browser-brand.ftl b/chrome/locale/eo/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/eo/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/es-AR/brand.dtd b/chrome/locale/es-AR/brand.dtd
index 3b423ff3..6c5a7bb8 100644
--- a/chrome/locale/es-AR/brand.dtd
+++ b/chrome/locale/es-AR/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Navegador Tor">
 <!ENTITY  brandFullName         "Navegador Tor">
 <!ENTITY  vendorShortName       "Proyecto Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox y los logotipos de Firefox son marcas registradas de la FundaciÃ³n Mozilla.">
+<!ENTITY  trademarkInfo.part1   "'Tor' y el 'Onion Logo' son marcas registradas del Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Clic para cargar complementos del sistema instalados">
diff --git a/chrome/locale/es-AR/branding/tor-browser-brand.ftl b/chrome/locale/es-AR/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..6ad9c700
--- /dev/null
+++ b/chrome/locale/es-AR/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Navegador Tor
+-brand-short-name = Navegador Tor
+-brand-full-name = Navegador Tor
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Navegador Tor
+-vendor-short-name = Proyecto Tor
+trademarkInfo = 'Tor' y el 'Onion Logo' son marcas registradas del Tor Project, Inc.
diff --git a/chrome/locale/es-ES/brand.dtd b/chrome/locale/es-ES/brand.dtd
index a7f0a1eb..7a939ef1 100644
--- a/chrome/locale/es-ES/brand.dtd
+++ b/chrome/locale/es-ES/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Proyecto Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox y los logotipos de Firefox son marcas registradas de la Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' y el 'Onion Logo' (logo de la cebolla) son marcas registradas de la Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Haz clic para cargar los complementos instalados en el sistema">
diff --git a/chrome/locale/es-ES/branding/tor-browser-brand.ftl b/chrome/locale/es-ES/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..7c301ac8
--- /dev/null
+++ b/chrome/locale/es-ES/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Proyecto Tor
+trademarkInfo = 'Tor' y el 'Onion Logo' (logo de la cebolla) son marcas registradas de la Tor Project, Inc.
diff --git a/chrome/locale/et/brand.dtd b/chrome/locale/et/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/et/brand.dtd
+++ b/chrome/locale/et/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/et/branding/tor-browser-brand.ftl b/chrome/locale/et/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/et/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/eu/brand.dtd b/chrome/locale/eu/brand.dtd
index a65cca43..0a7e2278 100644
--- a/chrome/locale/eu/brand.dtd
+++ b/chrome/locale/eu/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox eta Firefox logoak Mozilla Fundazioaren marka errgistratuak dira.">
+<!ENTITY  trademarkInfo.part1   "'Tor' eta 'Onion Logo' Tor Project, Inc.ren marka erregistratuak dira.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Klikatu sisteman instalatuta daunden pluginak kargatzeko">
diff --git a/chrome/locale/eu/branding/tor-browser-brand.ftl b/chrome/locale/eu/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..c1904748
--- /dev/null
+++ b/chrome/locale/eu/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' eta 'Onion Logo' Tor Project, Inc.ren marka erregistratuak dira.
diff --git a/chrome/locale/fa/brand.dtd b/chrome/locale/fa/brand.dtd
index e70d89d8..83d0e722 100644
--- a/chrome/locale/fa/brand.dtd
+++ b/chrome/locale/fa/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±">
 <!ENTITY  brandFullName         "Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±">
 <!ENTITY  vendorShortName       "Ù¾Ø±Ù?Ú?Ù?Ù? ØªÙ?Ø±">
-<!ENTITY  trademarkInfo.part1   "Ù?Ø§Û?Ø±Ù?Ø§Ú©Ø³ Ù? Ù?Ù?Ú¯Ù? Ù?Ø§Û?Ø±Ù?Ø§Ú©Ø³ Ù?Ø´Ø§Ù? ØªØ¬Ø§Ø±Û? Ø¨Ù?Û?Ø§Ø¯ Ù?Ù?Ø²Û?Ù?Ø§ Ù?Û? Ø¨Ø§Ø´Ù?Ø¯.">
+<!ENTITY  trademarkInfo.part1   "'Tor' Ù? 'Onion Logo' Ø¹Ù?Ø§Ù?Øª Ù?Ø§Û? ØªØ¬Ø§Ø±Û? Ø«Ø¨Øª Ø´Ø¯Ù? Ø§Ø² Ù¾Ø±Ù?Ú?Ù? Tor Ù?Ø³ØªÙ?Ø¯">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ ØªØ§ Ù?Ù?Ø¯ Ø´Ù?Ø¯ Ø³Û?Ø³ØªÙ? Ù?ØµØ¨ Ù¾Ù?Ø§Ú¯Û?Ù? Ù?Ø§">
diff --git a/chrome/locale/fa/branding/tor-browser-brand.ftl b/chrome/locale/fa/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..11b305c4
--- /dev/null
+++ b/chrome/locale/fa/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±
+-brand-short-name = Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±
+-brand-full-name = Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±
+-vendor-short-name = Ù¾Ø±Ù?Ú?Ù?Ù? ØªÙ?Ø±
+trademarkInfo = 'Tor' Ù? 'Onion Logo' Ø¹Ù?Ø§Ù?Øª Ù?Ø§Û? ØªØ¬Ø§Ø±Û? Ø«Ø¨Øª Ø´Ø¯Ù? Ø§Ø² Ù¾Ø±Ù?Ú?Ù? Tor Ù?Ø³ØªÙ?Ø¯
diff --git a/chrome/locale/fi/brand.dtd b/chrome/locale/fi/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/fi/brand.dtd
+++ b/chrome/locale/fi/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/fi/branding/tor-browser-brand.ftl b/chrome/locale/fi/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/fi/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/fil/brand.dtd b/chrome/locale/fil/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/fil/brand.dtd
+++ b/chrome/locale/fil/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/fil/branding/tor-browser-brand.ftl b/chrome/locale/fil/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/fil/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/fo/brand.dtd b/chrome/locale/fo/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/fo/brand.dtd
+++ b/chrome/locale/fo/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/fo/branding/tor-browser-brand.ftl b/chrome/locale/fo/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/fo/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/fr/brand.dtd b/chrome/locale/fr/brand.dtd
index 572fa4cd..1002967c 100644
--- a/chrome/locale/fr/brand.dtd
+++ b/chrome/locale/fr/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Le NavigateurÂ Tor">
 <!ENTITY  brandFullName         "Le NavigateurÂ Tor">
 <!ENTITY  vendorShortName       "Le ProjetÂ Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox et les logos de Firefox sont des marques de commerce de la Fondation Mozilla.">
+<!ENTITY  trademarkInfo.part1   "Â«Â TorÂ Â» et le Â«Â logo OnionÂ Â» sont des marques de commerce de Â«Â The ProjetÂ Tor, Inc.Â Â»">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Cliquer pour charger les greffons systÃ¨me installÃ©s">
diff --git a/chrome/locale/fr/branding/tor-browser-brand.ftl b/chrome/locale/fr/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..293fa032
--- /dev/null
+++ b/chrome/locale/fr/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Le NavigateurÂ Tor
+-brand-short-name = Le NavigateurÂ Tor
+-brand-full-name = Le NavigateurÂ Tor
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Le NavigateurÂ Tor
+-vendor-short-name = Le ProjetÂ Tor
+trademarkInfo = Â«Â TorÂ Â» et le Â«Â logo OnionÂ Â» sont des marques de commerce de Â«Â The ProjetÂ Tor, Inc.Â Â»
diff --git a/chrome/locale/fur/brand.dtd b/chrome/locale/fur/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/fur/brand.dtd
+++ b/chrome/locale/fur/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/fur/branding/tor-browser-brand.ftl b/chrome/locale/fur/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/fur/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/fy/brand.dtd b/chrome/locale/fy/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/fy/brand.dtd
+++ b/chrome/locale/fy/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/fy/branding/tor-browser-brand.ftl b/chrome/locale/fy/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/fy/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ga-IE/brand.dtd b/chrome/locale/ga-IE/brand.dtd
index 7a8c4860..fd29da89 100644
--- a/chrome/locale/ga-IE/brand.dtd
+++ b/chrome/locale/ga-IE/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "BrabhsÃ¡laÃ Tor">
 <!ENTITY  brandFullName         "BrabhsÃ¡laÃ Tor">
 <!ENTITY  vendorShortName       "Tionscadal Tor">
-<!ENTITY  trademarkInfo.part1   "Is trÃ¡dmharcanna de chuid FondÃºireacht Mozilla 'Firefox' agus lÃ³gÃ³nna Firefox.">
+<!ENTITY  trademarkInfo.part1   "Is trÃ¡dmharcanna de chuid Tor Project, Inc. iad 'Tor' agus an 'Onion Logo'">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "CliceÃ¡il chun forlÃontÃ¡in an chÃ³rais a lÃ³dÃ¡il">
diff --git a/chrome/locale/ga-IE/branding/tor-browser-brand.ftl b/chrome/locale/ga-IE/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..518548c9
--- /dev/null
+++ b/chrome/locale/ga-IE/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = BrabhsÃ¡laÃ Tor
+-brand-short-name = BrabhsÃ¡laÃ Tor
+-brand-full-name = BrabhsÃ¡laÃ Tor
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = BrabhsÃ¡laÃ Tor
+-vendor-short-name = Tionscadal Tor
+trademarkInfo = Is trÃ¡dmharcanna de chuid Tor Project, Inc. iad 'Tor' agus an 'Onion Logo'
diff --git a/chrome/locale/gl/brand.dtd b/chrome/locale/gl/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/gl/brand.dtd
+++ b/chrome/locale/gl/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/gl/branding/tor-browser-brand.ftl b/chrome/locale/gl/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/gl/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/gu/brand.dtd b/chrome/locale/gu/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/gu/brand.dtd
+++ b/chrome/locale/gu/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/gu/branding/tor-browser-brand.ftl b/chrome/locale/gu/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/gu/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/gun/brand.dtd b/chrome/locale/gun/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/gun/brand.dtd
+++ b/chrome/locale/gun/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/gun/branding/tor-browser-brand.ftl b/chrome/locale/gun/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/gun/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ha/brand.dtd b/chrome/locale/ha/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ha/brand.dtd
+++ b/chrome/locale/ha/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ha/branding/tor-browser-brand.ftl b/chrome/locale/ha/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ha/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/he/brand.dtd b/chrome/locale/he/brand.dtd
index e58bb4d3..3ce90bf6 100644
--- a/chrome/locale/he/brand.dtd
+++ b/chrome/locale/he/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "×?×¤×?×¤×? Tor">
 <!ENTITY  brandFullName         "×?×¤×?×¤×? Tor">
 <!ENTITY  vendorShortName       "×?×?×?×? Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox ×?×¡×?×?×?×?×?×? ×?×?× ×? ×¡×?×?× ×?×? ×?×¡×?×¨×?×?×? ×¨×©×?×?×?×? ×?×?×¢×?×?×ª ×§×¨×? Mozilla.">
+<!ENTITY  trademarkInfo.part1   "'Tor' ×?'×¡×?×?×?×? ×?×?×¦×?' ×?×? ×¡×?×?× ×?×? ×?×¡×?×¨×?×?×? ×¨×©×?×?×?×? ×©×? Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "×?×?×¥ ×?×?×¢×?× ×ª ×ª×?×¡×¤×? ×?×¢×¨×?×ª ×?×?×ª×§× ×?×?">
diff --git a/chrome/locale/he/branding/tor-browser-brand.ftl b/chrome/locale/he/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..c51f3a8b
--- /dev/null
+++ b/chrome/locale/he/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = ×?×¤×?×¤×? Tor
+-brand-short-name = ×?×¤×?×¤×? Tor
+-brand-full-name = ×?×¤×?×¤×? Tor
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = ×?×¤×?×¤×? Tor
+-vendor-short-name = ×?×?×?×? Tor
+trademarkInfo = 'Tor' ×?'×¡×?×?×?×? ×?×?×¦×?' ×?×? ×¡×?×?× ×?×? ×?×¡×?×¨×?×?×? ×¨×©×?×?×?×? ×©×? Tor Project, Inc.
diff --git a/chrome/locale/hi/brand.dtd b/chrome/locale/hi/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/hi/brand.dtd
+++ b/chrome/locale/hi/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/hi/branding/tor-browser-brand.ftl b/chrome/locale/hi/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/hi/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/hr/brand.dtd b/chrome/locale/hr/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/hr/brand.dtd
+++ b/chrome/locale/hr/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/hr/branding/tor-browser-brand.ftl b/chrome/locale/hr/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/hr/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ht/brand.dtd b/chrome/locale/ht/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ht/brand.dtd
+++ b/chrome/locale/ht/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ht/branding/tor-browser-brand.ftl b/chrome/locale/ht/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ht/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/hu/brand.dtd b/chrome/locale/hu/brand.dtd
index 229ff97e..c9366d25 100644
--- a/chrome/locale/hu/brand.dtd
+++ b/chrome/locale/hu/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "A Firefox Ã©s a Firefox logÃ³ a Mozilla Foundation vÃ©djegyei.">
+<!ENTITY  trademarkInfo.part1   "A 'Tor' Ã©s az 'Onion Logo' a Tor Project, Inc. bejegyzett vÃ©djegyei.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Kattintson  telepÃtett bÃ¶ngÃ©szÅ? pluginek betltÃ©sÃ©hez">
diff --git a/chrome/locale/hu/branding/tor-browser-brand.ftl b/chrome/locale/hu/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..ab8ff46d
--- /dev/null
+++ b/chrome/locale/hu/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = A 'Tor' Ã©s az 'Onion Logo' a Tor Project, Inc. bejegyzett vÃ©djegyei.
diff --git a/chrome/locale/hy/brand.dtd b/chrome/locale/hy/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/hy/brand.dtd
+++ b/chrome/locale/hy/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/hy/branding/tor-browser-brand.ftl b/chrome/locale/hy/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/hy/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/id/brand.dtd b/chrome/locale/id/brand.dtd
index 1361c973..9b9ee763 100644
--- a/chrome/locale/id/brand.dtd
+++ b/chrome/locale/id/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Proyek Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox dan logo Firefox merupakan merek dagang dari Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' dan 'Logo Onion' adalah merek dagang terdaftar Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Klik untuk memuat pengaya sistem yang terpasang">
diff --git a/chrome/locale/id/branding/tor-browser-brand.ftl b/chrome/locale/id/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..b220851c
--- /dev/null
+++ b/chrome/locale/id/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Proyek Tor
+trademarkInfo = 'Tor' dan 'Logo Onion' adalah merek dagang terdaftar Tor Project, Inc.
diff --git a/chrome/locale/is/brand.dtd b/chrome/locale/is/brand.dtd
index 5b4ded3a..23fd98e1 100644
--- a/chrome/locale/is/brand.dtd
+++ b/chrome/locale/is/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor-vafrinn">
 <!ENTITY  brandFullName         "Tor-vafrinn">
 <!ENTITY  vendorShortName       "Tor-verkefniÃ°">
-<!ENTITY  trademarkInfo.part1   "Firefox og Firefox merkin eru vÃ¶rumerki Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' og 'LaukmerkiÃ°' (Onion Logo) eru skrÃ¡Ã° vÃ¶rumerki Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Smelltu til aÃ° hlaÃ°a inn uppsettum kerfisviÃ°bÃ³tum">
diff --git a/chrome/locale/is/branding/tor-browser-brand.ftl b/chrome/locale/is/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..73becf05
--- /dev/null
+++ b/chrome/locale/is/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor-vafrinn
+-brand-short-name = Tor-vafrinn
+-brand-full-name = Tor-vafrinn
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor-vafrinn
+-vendor-short-name = Tor-verkefniÃ°
+trademarkInfo = 'Tor' og 'LaukmerkiÃ°' (Onion Logo) eru skrÃ¡Ã° vÃ¶rumerki Tor Project, Inc.
diff --git a/chrome/locale/it/brand.dtd b/chrome/locale/it/brand.dtd
index e2d7b24e..28009a5a 100644
--- a/chrome/locale/it/brand.dtd
+++ b/chrome/locale/it/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox e i loghi Firefox sono marchi registrati della Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' e 'Onion Logo' sono marchi registrati su Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Clicca per caricare i plugin di sistema installati">
diff --git a/chrome/locale/it/branding/tor-browser-brand.ftl b/chrome/locale/it/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..5a97eead
--- /dev/null
+++ b/chrome/locale/it/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' e 'Onion Logo' sono marchi registrati su Tor Project, Inc.
diff --git a/chrome/locale/ja/brand.dtd b/chrome/locale/ja/brand.dtd
index ba1e5596..84702d46 100644
--- a/chrome/locale/ja/brand.dtd
+++ b/chrome/locale/ja/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefoxã??ã??ã?³Firefoxã?®ã?ã?´ã?¯Mozillaè²¡å?£ã?®ç?»é?²å??æ¨?ã?§ã??ã??">
+<!ENTITY  trademarkInfo.part1   "'Tor' ã?¨ 'Onion Logo' ã?¯ Tor Project, Inc. ã?®ç?»é?²å??æ¨?ã?§ã??ã??">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã??ã?·ã?¹ã??ã? ã??ã?©ã?°ã?¤ã?³ã??ã?ã?¼ã??ã??ã?¾ã??ã??">
diff --git a/chrome/locale/ja/branding/tor-browser-brand.ftl b/chrome/locale/ja/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..91a024d3
--- /dev/null
+++ b/chrome/locale/ja/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' ã?¨ 'Onion Logo' ã?¯ Tor Project, Inc. ã?®ç?»é?²å??æ¨?ã?§ã??ã??
diff --git a/chrome/locale/jv/brand.dtd b/chrome/locale/jv/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/jv/brand.dtd
+++ b/chrome/locale/jv/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/jv/branding/tor-browser-brand.ftl b/chrome/locale/jv/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/jv/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ka/brand.dtd b/chrome/locale/ka/brand.dtd
index 28e23451..f58c4f5d 100644
--- a/chrome/locale/ka/brand.dtd
+++ b/chrome/locale/ka/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor-á??á? á??á?£á??á??á? á??">
 <!ENTITY  brandFullName         "Tor-á??á? á??á?£á??á??á? á??">
 <!ENTITY  vendorShortName       "Tor-á??á? á??á??á?¥á?¢á??">
-<!ENTITY  trademarkInfo.part1   "Firefox á??á?? á??á??á?¡á?? á??á??á??á??á??á??á?? á?¬á??á? á??á??á??á??á??á??á??á?¡ Mozilla-á?¡ á?¤á??á??á??á??á?¡ á?¡á??á??á??á?á? á?? á??á??á?¨á??á??á??á?¡.">
+<!ENTITY  trademarkInfo.part1   "â??Torâ?? á??á?? â??Onion Logoâ?? á?¬á??á? á??á??á??á??á??á??á??á?¡ Tor Project Inc-á??á?¡ á??á?£á??á??á??á??á?? á?¡á??á??á??á?á? á?? á??á??á?¨á??á??á??á?¡.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "á??á??á??á?¬á??á??á??á??á?? á??á??á?§á??á??á??á??á?£á??á?? á?¡á??á?¡á?¢á??á??á?£á? á?? á??á??á??á?£á??á??á??á??á?¡ á?©á??á?¡á??á?¢á??á??á? á??á??á??">
diff --git a/chrome/locale/ka/branding/tor-browser-brand.ftl b/chrome/locale/ka/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..73298249
--- /dev/null
+++ b/chrome/locale/ka/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor-á??á? á??á?£á??á??á? á??
+-brand-short-name = Tor-á??á? á??á?£á??á??á? á??
+-brand-full-name = Tor-á??á? á??á?£á??á??á? á??
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor-á??á? á??á?£á??á??á? á??
+-vendor-short-name = Tor-á??á? á??á??á?¥á?¢á??
+trademarkInfo = â??Torâ?? á??á?? â??Onion Logoâ?? á?¬á??á? á??á??á??á??á??á??á??á?¡ Tor Project Inc-á??á?¡ á??á?£á??á??á??á??á?? á?¡á??á??á??á?á? á?? á??á??á?¨á??á??á??á?¡.
diff --git a/chrome/locale/km/brand.dtd b/chrome/locale/km/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/km/brand.dtd
+++ b/chrome/locale/km/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/km/branding/tor-browser-brand.ftl b/chrome/locale/km/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/km/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/kn/brand.dtd b/chrome/locale/kn/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/kn/brand.dtd
+++ b/chrome/locale/kn/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/kn/branding/tor-browser-brand.ftl b/chrome/locale/kn/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/kn/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ko/brand.dtd b/chrome/locale/ko/brand.dtd
index d8b78d3e..5f3e37ca 100644
--- a/chrome/locale/ko/brand.dtd
+++ b/chrome/locale/ko/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor ë¸?ë?¼ì?°ì ?">
 <!ENTITY  brandFullName         "Tor ë¸?ë?¼ì?°ì ?">
 <!ENTITY  vendorShortName       "Tor í??ë¡?ì ?í?¸">
-<!ENTITY  trademarkInfo.part1   "í??ì?´ì?´í?ì?¤ì?? í??ì?´ì?´í?ì?¤ ë¡?ê³ ë?¤ì?? ëª¨ì§?ë?¼ ì?¬ë?¨ì?? ë?±ë¡? ì??í??ì??ë??ë?¤.">
+<!ENTITY  trademarkInfo.part1   "'Tor'ì?? 'Onion Logo'ë?? Tor Projectì?? ë?±ë¡? ì??í??ì??ë??ë?¤.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "í?´ë¦í??ì?¬ í??ë?¬ê·¸ì?¸ ë¶?ë?¬ì?¤ê¸°">
diff --git a/chrome/locale/ko/branding/tor-browser-brand.ftl b/chrome/locale/ko/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..c6edf692
--- /dev/null
+++ b/chrome/locale/ko/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor ë¸?ë?¼ì?°ì ?
+-brand-short-name = Tor ë¸?ë?¼ì?°ì ?
+-brand-full-name = Tor ë¸?ë?¼ì?°ì ?
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor ë¸?ë?¼ì?°ì ?
+-vendor-short-name = Tor í??ë¡?ì ?í?¸
+trademarkInfo = 'Tor'ì?? 'Onion Logo'ë?? Tor Projectì?? ë?±ë¡? ì??í??ì??ë??ë?¤.
diff --git a/chrome/locale/ku/brand.dtd b/chrome/locale/ku/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ku/brand.dtd
+++ b/chrome/locale/ku/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ku/branding/tor-browser-brand.ftl b/chrome/locale/ku/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ku/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/kw/brand.dtd b/chrome/locale/kw/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/kw/brand.dtd
+++ b/chrome/locale/kw/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/kw/branding/tor-browser-brand.ftl b/chrome/locale/kw/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/kw/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ky/brand.dtd b/chrome/locale/ky/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ky/brand.dtd
+++ b/chrome/locale/ky/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ky/branding/tor-browser-brand.ftl b/chrome/locale/ky/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ky/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/lb/brand.dtd b/chrome/locale/lb/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/lb/brand.dtd
+++ b/chrome/locale/lb/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/lb/branding/tor-browser-brand.ftl b/chrome/locale/lb/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/lb/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ln/brand.dtd b/chrome/locale/ln/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ln/brand.dtd
+++ b/chrome/locale/ln/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ln/branding/tor-browser-brand.ftl b/chrome/locale/ln/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ln/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/lo/brand.dtd b/chrome/locale/lo/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/lo/brand.dtd
+++ b/chrome/locale/lo/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/lo/branding/tor-browser-brand.ftl b/chrome/locale/lo/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/lo/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/lt/brand.dtd b/chrome/locale/lt/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/lt/brand.dtd
+++ b/chrome/locale/lt/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/lt/branding/tor-browser-brand.ftl b/chrome/locale/lt/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/lt/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/lv/brand.dtd b/chrome/locale/lv/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/lv/brand.dtd
+++ b/chrome/locale/lv/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/lv/branding/tor-browser-brand.ftl b/chrome/locale/lv/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/lv/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/mg/brand.dtd b/chrome/locale/mg/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/mg/brand.dtd
+++ b/chrome/locale/mg/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/mg/branding/tor-browser-brand.ftl b/chrome/locale/mg/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/mg/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/mi/brand.dtd b/chrome/locale/mi/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/mi/brand.dtd
+++ b/chrome/locale/mi/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/mi/branding/tor-browser-brand.ftl b/chrome/locale/mi/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/mi/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/mk/brand.dtd b/chrome/locale/mk/brand.dtd
index e5e6dca5..30e201eb 100644
--- a/chrome/locale/mk/brand.dtd
+++ b/chrome/locale/mk/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Browser">
-<!ENTITY  trademarkInfo.part1   "Firefox Ð¸ Firefox Ð»Ð¾Ð³Ð¾Ð°Ñ?Ð° Ñ?Ðµ Ñ?Ñ?Ð³Ð¾Ð²Ñ?ÐºÐ¸ Ð¼Ð°Ñ?ÐºÐ¸ Ð½Ð° Mozilla Ð¤Ð¾Ð½Ð´Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ð°.">
+<!ENTITY  trademarkInfo.part1   "'Tor' Ð¸ 'Onion Logo' Ñ?Ðµ Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ñ?Ñ?Ð³Ð¾Ð²Ñ?ÐºÐ¸ Ð¼Ð°Ñ?ÐºÐ¸ Ð½Ð° Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Ð?Ð»Ð¸ÐºÐ½Ð¸ Ð·Ð° Ð²Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÐ¸ Ð¿Ñ?Ð¸ÐºÐ»Ñ?Ñ?Ð¾Ñ?Ð¸">
diff --git a/chrome/locale/mk/branding/tor-browser-brand.ftl b/chrome/locale/mk/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..48b59840
--- /dev/null
+++ b/chrome/locale/mk/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Browser
+trademarkInfo = 'Tor' Ð¸ 'Onion Logo' Ñ?Ðµ Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ñ?Ñ?Ð³Ð¾Ð²Ñ?ÐºÐ¸ Ð¼Ð°Ñ?ÐºÐ¸ Ð½Ð° Tor Project, Inc.
diff --git a/chrome/locale/ml/brand.dtd b/chrome/locale/ml/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ml/brand.dtd
+++ b/chrome/locale/ml/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ml/branding/tor-browser-brand.ftl b/chrome/locale/ml/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ml/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/mn/brand.dtd b/chrome/locale/mn/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/mn/brand.dtd
+++ b/chrome/locale/mn/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/mn/branding/tor-browser-brand.ftl b/chrome/locale/mn/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/mn/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/mr/brand.dtd b/chrome/locale/mr/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/mr/brand.dtd
+++ b/chrome/locale/mr/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/mr/branding/tor-browser-brand.ftl b/chrome/locale/mr/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/mr/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ms/brand.dtd b/chrome/locale/ms/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ms/brand.dtd
+++ b/chrome/locale/ms/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ms/branding/tor-browser-brand.ftl b/chrome/locale/ms/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ms/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/mt/brand.dtd b/chrome/locale/mt/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/mt/brand.dtd
+++ b/chrome/locale/mt/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/mt/branding/tor-browser-brand.ftl b/chrome/locale/mt/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/mt/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/my/brand.dtd b/chrome/locale/my/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/my/brand.dtd
+++ b/chrome/locale/my/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/my/branding/tor-browser-brand.ftl b/chrome/locale/my/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/my/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/nah/brand.dtd b/chrome/locale/nah/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/nah/brand.dtd
+++ b/chrome/locale/nah/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/nah/branding/tor-browser-brand.ftl b/chrome/locale/nah/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/nah/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/nap/brand.dtd b/chrome/locale/nap/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/nap/brand.dtd
+++ b/chrome/locale/nap/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/nap/branding/tor-browser-brand.ftl b/chrome/locale/nap/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/nap/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/nb-NO/brand.dtd b/chrome/locale/nb-NO/brand.dtd
index ff45f781..7457f7a4 100644
--- a/chrome/locale/nb-NO/brand.dtd
+++ b/chrome/locale/nb-NO/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor-nettleseren">
 <!ENTITY  brandFullName         "Tor-nettleseren">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox og Firefox-logene er varemarker tilhÃ¸rende Mozilla-stiftelsen.">
+<!ENTITY  trademarkInfo.part1   "&quot;Tor&quot; og &quot;LÃ¸k-logoen&quot; er registrerte varemerker tilhÃ¸rende the Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Klikk for Ã¥ laste inn installerte systemtillegg">
diff --git a/chrome/locale/nb-NO/branding/tor-browser-brand.ftl b/chrome/locale/nb-NO/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..b09f8a20
--- /dev/null
+++ b/chrome/locale/nb-NO/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor-nettleseren
+-brand-short-name = Tor-nettleseren
+-brand-full-name = Tor-nettleseren
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor-nettleseren
+-vendor-short-name = Tor Project
+trademarkInfo = &quot;Tor&quot; og &quot;LÃ¸k-logoen&quot; er registrerte varemerker tilhÃ¸rende the Tor Project, Inc.
diff --git a/chrome/locale/ne/brand.dtd b/chrome/locale/ne/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ne/brand.dtd
+++ b/chrome/locale/ne/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ne/branding/tor-browser-brand.ftl b/chrome/locale/ne/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ne/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/nl/brand.dtd b/chrome/locale/nl/brand.dtd
index e9f6f24a..ec04e8c6 100644
--- a/chrome/locale/nl/brand.dtd
+++ b/chrome/locale/nl/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox en de Firefox-logoâ??s zijn handelsmerken van de Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "â??Torâ?? en het â??Onion-logoâ?? zijn geregistreerde handelsmerken van het Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Klik om geÃ¯nstalleerde systeemplug-ins te laden">
diff --git a/chrome/locale/nl/branding/tor-browser-brand.ftl b/chrome/locale/nl/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..8ae5a2c6
--- /dev/null
+++ b/chrome/locale/nl/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = â??Torâ?? en het â??Onion-logoâ?? zijn geregistreerde handelsmerken van het Tor Project, Inc.
diff --git a/chrome/locale/nn/brand.dtd b/chrome/locale/nn/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/nn/brand.dtd
+++ b/chrome/locale/nn/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/nn/branding/tor-browser-brand.ftl b/chrome/locale/nn/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/nn/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/nso/brand.dtd b/chrome/locale/nso/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/nso/brand.dtd
+++ b/chrome/locale/nso/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/nso/branding/tor-browser-brand.ftl b/chrome/locale/nso/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/nso/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/oc/brand.dtd b/chrome/locale/oc/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/oc/brand.dtd
+++ b/chrome/locale/oc/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/oc/branding/tor-browser-brand.ftl b/chrome/locale/oc/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/oc/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/or/brand.dtd b/chrome/locale/or/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/or/brand.dtd
+++ b/chrome/locale/or/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/or/branding/tor-browser-brand.ftl b/chrome/locale/or/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/or/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/pa/brand.dtd b/chrome/locale/pa/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/pa/brand.dtd
+++ b/chrome/locale/pa/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/pa/branding/tor-browser-brand.ftl b/chrome/locale/pa/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/pa/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/pap/brand.dtd b/chrome/locale/pap/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/pap/brand.dtd
+++ b/chrome/locale/pap/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/pap/branding/tor-browser-brand.ftl b/chrome/locale/pap/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/pap/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/pl/brand.dtd b/chrome/locale/pl/brand.dtd
index a777445e..5cd5d9f2 100644
--- a/chrome/locale/pl/brand.dtd
+++ b/chrome/locale/pl/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Project Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox i jego loga sÄ? znakami towarowymi Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' oraz logo 'Onion' sÄ? zarejestrowanymi markami Tor Project Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Kliknij, aby zaÅ?adowaÄ? wszystkie zainstalowane wtyczki">
diff --git a/chrome/locale/pl/branding/tor-browser-brand.ftl b/chrome/locale/pl/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..3628b624
--- /dev/null
+++ b/chrome/locale/pl/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Project Tor
+trademarkInfo = 'Tor' oraz logo 'Onion' sÄ? zarejestrowanymi markami Tor Project Inc.
diff --git a/chrome/locale/pms/brand.dtd b/chrome/locale/pms/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/pms/brand.dtd
+++ b/chrome/locale/pms/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/pms/branding/tor-browser-brand.ftl b/chrome/locale/pms/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/pms/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ps/brand.dtd b/chrome/locale/ps/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ps/brand.dtd
+++ b/chrome/locale/ps/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ps/branding/tor-browser-brand.ftl b/chrome/locale/ps/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ps/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/pt-BR/brand.dtd b/chrome/locale/pt-BR/brand.dtd
index 4917743f..5532173b 100644
--- a/chrome/locale/pt-BR/brand.dtd
+++ b/chrome/locale/pt-BR/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Navegador Tor">
 <!ENTITY  brandFullName         "Navegador Tor">
 <!ENTITY  vendorShortName       "Projeto Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox e os logotipos do Firefox sÃ£o marcas registradas da FundaÃ§Ã£o Mozilla.">
+<!ENTITY  trademarkInfo.part1   "'Tor' e 'Logo da Cebola' sÃ£o marcas registradas do Projeto Tor,  Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Clique para carregar os plugins de sistema instalados">
diff --git a/chrome/locale/pt-BR/branding/tor-browser-brand.ftl b/chrome/locale/pt-BR/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..523f89c4
--- /dev/null
+++ b/chrome/locale/pt-BR/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Navegador Tor
+-brand-short-name = Navegador Tor
+-brand-full-name = Navegador Tor
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Navegador Tor
+-vendor-short-name = Projeto Tor
+trademarkInfo = 'Tor' e 'Logo da Cebola' sÃ£o marcas registradas do Projeto Tor,  Inc.
diff --git a/chrome/locale/pt/brand.dtd b/chrome/locale/pt/brand.dtd
index 2a412fc5..52e9a03d 100644
--- a/chrome/locale/pt/brand.dtd
+++ b/chrome/locale/pt/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Navegador Tor">
 <!ENTITY  brandFullName         "Navegador Tor">
 <!ENTITY  vendorShortName       "Projeto Tor">
-<!ENTITY  trademarkInfo.part1   "O Firefox e os logÃ³tipos do Firefox sÃ£o marcas registadas da FundaÃ§Ã£o Mozilla.">
+<!ENTITY  trademarkInfo.part1   "'Tor' e o 'LogÃ³tipo Onion' sÃ£o marcas registadas de Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Clique para carregar os plugins do sistema instalados">
diff --git a/chrome/locale/pt/branding/tor-browser-brand.ftl b/chrome/locale/pt/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..4ce5e701
--- /dev/null
+++ b/chrome/locale/pt/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Navegador Tor
+-brand-short-name = Navegador Tor
+-brand-full-name = Navegador Tor
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Navegador Tor
+-vendor-short-name = Projeto Tor
+trademarkInfo = 'Tor' e o 'LogÃ³tipo Onion' sÃ£o marcas registadas de Tor Project, Inc.
diff --git a/chrome/locale/ro/brand.dtd b/chrome/locale/ro/brand.dtd
index fbd3276e..dfe53fea 100644
--- a/chrome/locale/ro/brand.dtd
+++ b/chrome/locale/ro/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Proiectul Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox si logo-urile Firefox sunt mÄ?rci Ã®nregistrate ale Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' È?i 'Logo-ul Onion' sunt mÄ?rci Ã®nregistrate ale Proiectului Tor, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "ApÄ?saÈ?i pentru a Ã®ncÄ?rca extensiile de sistem instalate">
diff --git a/chrome/locale/ro/branding/tor-browser-brand.ftl b/chrome/locale/ro/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..4dd5a09b
--- /dev/null
+++ b/chrome/locale/ro/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Proiectul Tor
+trademarkInfo = 'Tor' È?i 'Logo-ul Onion' sunt mÄ?rci Ã®nregistrate ale Proiectului Tor, Inc.
diff --git a/chrome/locale/ru/brand.dtd b/chrome/locale/ru/brand.dtd
index 416dcd8e..f4983534 100644
--- a/chrome/locale/ru/brand.dtd
+++ b/chrome/locale/ru/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Ð?Ñ?Ð¾ÐµÐºÑ? Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox Ð¸ ÐµÐ³Ð¾ Ð»Ð¾Ð³Ð¾Ñ?Ð¸Ð¿Ñ? Ñ?Ð²Ð»Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?Ð¾Ñ?Ð³Ð¾Ð²Ñ?Ð¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸ Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' Ð¸ Ð»Ð¾Ð³Ð¾Ñ?Ð¸Ð¿ 'Onion' Ñ?Ð²Ð»Ñ?Ñ?Ñ?Ñ?Ñ? Ð·Ð°Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ñ?Ð¼Ð¸ Ñ?Ð¾Ñ?Ð³Ð¾Ð²Ñ?Ð¼Ð¸ Ð¼Ð°Ñ?ÐºÐ°Ð¼Ð¸ Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ Ð´Ð»Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·ÐºÐ¸ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð½Ñ?Ñ? Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð²">
diff --git a/chrome/locale/ru/branding/tor-browser-brand.ftl b/chrome/locale/ru/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..44a1226e
--- /dev/null
+++ b/chrome/locale/ru/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Ð?Ñ?Ð¾ÐµÐºÑ? Tor
+trademarkInfo = 'Tor' Ð¸ Ð»Ð¾Ð³Ð¾Ñ?Ð¸Ð¿ 'Onion' Ñ?Ð²Ð»Ñ?Ñ?Ñ?Ñ?Ñ? Ð·Ð°Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ñ?Ð¼Ð¸ Ñ?Ð¾Ñ?Ð³Ð¾Ð²Ñ?Ð¼Ð¸ Ð¼Ð°Ñ?ÐºÐ°Ð¼Ð¸ Tor Project, Inc.
diff --git a/chrome/locale/sco/brand.dtd b/chrome/locale/sco/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/sco/brand.dtd
+++ b/chrome/locale/sco/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/sco/branding/tor-browser-brand.ftl b/chrome/locale/sco/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/sco/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/sk/brand.dtd b/chrome/locale/sk/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/sk/brand.dtd
+++ b/chrome/locale/sk/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/sk/branding/tor-browser-brand.ftl b/chrome/locale/sk/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/sk/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/sl/brand.dtd b/chrome/locale/sl/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/sl/brand.dtd
+++ b/chrome/locale/sl/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/sl/branding/tor-browser-brand.ftl b/chrome/locale/sl/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/sl/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/so/brand.dtd b/chrome/locale/so/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/so/brand.dtd
+++ b/chrome/locale/so/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/so/branding/tor-browser-brand.ftl b/chrome/locale/so/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/so/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/son/brand.dtd b/chrome/locale/son/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/son/brand.dtd
+++ b/chrome/locale/son/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/son/branding/tor-browser-brand.ftl b/chrome/locale/son/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/son/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/sq/brand.dtd b/chrome/locale/sq/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/sq/brand.dtd
+++ b/chrome/locale/sq/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/sq/branding/tor-browser-brand.ftl b/chrome/locale/sq/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/sq/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/sr/brand.dtd b/chrome/locale/sr/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/sr/brand.dtd
+++ b/chrome/locale/sr/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/sr/branding/tor-browser-brand.ftl b/chrome/locale/sr/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/sr/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/st/brand.dtd b/chrome/locale/st/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/st/brand.dtd
+++ b/chrome/locale/st/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/st/branding/tor-browser-brand.ftl b/chrome/locale/st/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/st/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/su/brand.dtd b/chrome/locale/su/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/su/brand.dtd
+++ b/chrome/locale/su/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/su/branding/tor-browser-brand.ftl b/chrome/locale/su/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/su/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/sv-SE/brand.dtd b/chrome/locale/sv-SE/brand.dtd
index 797bdb92..db31aa3b 100644
--- a/chrome/locale/sv-SE/brand.dtd
+++ b/chrome/locale/sv-SE/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor-projektet">
-<!ENTITY  trademarkInfo.part1   "Firefox och Firefox-logotyperna Ã¤r varumÃ¤rken som tillhÃ¶r Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' och 'Onion Logotypen' Ã¤r registerade varumÃ¤rken av Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Klicka hÃ¤r fÃ¶r att ladda installerade systemtillÃ¤gg.">
diff --git a/chrome/locale/sv-SE/branding/tor-browser-brand.ftl b/chrome/locale/sv-SE/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..a7f08cfc
--- /dev/null
+++ b/chrome/locale/sv-SE/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor-projektet
+trademarkInfo = 'Tor' och 'Onion Logotypen' Ã¤r registerade varumÃ¤rken av Tor Project, Inc.
diff --git a/chrome/locale/sw/brand.dtd b/chrome/locale/sw/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/sw/brand.dtd
+++ b/chrome/locale/sw/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/sw/branding/tor-browser-brand.ftl b/chrome/locale/sw/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/sw/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ta/brand.dtd b/chrome/locale/ta/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ta/brand.dtd
+++ b/chrome/locale/ta/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ta/branding/tor-browser-brand.ftl b/chrome/locale/ta/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ta/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/te/brand.dtd b/chrome/locale/te/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/te/brand.dtd
+++ b/chrome/locale/te/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/te/branding/tor-browser-brand.ftl b/chrome/locale/te/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/te/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/tg/brand.dtd b/chrome/locale/tg/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/tg/brand.dtd
+++ b/chrome/locale/tg/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/tg/branding/tor-browser-brand.ftl b/chrome/locale/tg/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/tg/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/th/brand.dtd b/chrome/locale/th/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/th/brand.dtd
+++ b/chrome/locale/th/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/th/branding/tor-browser-brand.ftl b/chrome/locale/th/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/th/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ti/brand.dtd b/chrome/locale/ti/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ti/brand.dtd
+++ b/chrome/locale/ti/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ti/branding/tor-browser-brand.ftl b/chrome/locale/ti/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ti/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/tk/brand.dtd b/chrome/locale/tk/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/tk/brand.dtd
+++ b/chrome/locale/tk/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/tk/branding/tor-browser-brand.ftl b/chrome/locale/tk/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/tk/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/tr/brand.dtd b/chrome/locale/tr/brand.dtd
index 6b8bf0cc..dd472dc4 100644
--- a/chrome/locale/tr/brand.dtd
+++ b/chrome/locale/tr/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Projesi">
-<!ENTITY  trademarkInfo.part1   "Firefox ve Firefox logolarÄ± Mozilla VakfÄ±'nÄ±n ticari markalarÄ±dÄ±r.">
+<!ENTITY  trademarkInfo.part1   "'Tor' ve 'Onion Logo' Tor Project, Inc. tarafÄ±ndan tescillenmiÅ? markalardÄ±r.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "KurulmuÅ? sistem uygulama eklerini yÃ¼klemek iÃ§in tÄ±klayÄ±n">
diff --git a/chrome/locale/tr/branding/tor-browser-brand.ftl b/chrome/locale/tr/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..606a088b
--- /dev/null
+++ b/chrome/locale/tr/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Projesi
+trademarkInfo = 'Tor' ve 'Onion Logo' Tor Project, Inc. tarafÄ±ndan tescillenmiÅ? markalardÄ±r.
diff --git a/chrome/locale/uk/brand.dtd b/chrome/locale/uk/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/uk/brand.dtd
+++ b/chrome/locale/uk/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/uk/branding/tor-browser-brand.ftl b/chrome/locale/uk/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/uk/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ur/brand.dtd b/chrome/locale/ur/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ur/brand.dtd
+++ b/chrome/locale/ur/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ur/branding/tor-browser-brand.ftl b/chrome/locale/ur/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ur/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/ve/brand.dtd b/chrome/locale/ve/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/ve/brand.dtd
+++ b/chrome/locale/ve/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ve/branding/tor-browser-brand.ftl b/chrome/locale/ve/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/ve/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/vi/brand.dtd b/chrome/locale/vi/brand.dtd
index 0667b7ef..da8f04c3 100644
--- a/chrome/locale/vi/brand.dtd
+++ b/chrome/locale/vi/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "TrÃ¬nh duyá»?t Tor">
 <!ENTITY  brandFullName         "TrÃ¬nh duyá»?t Tor">
 <!ENTITY  vendorShortName       "Dá»± Ã¡n Tor">
-<!ENTITY  trademarkInfo.part1   "Firefox vÃ  logo cá»§a Firefox lÃ  thÆ°Æ¡ng hiá»?u cá»§a Tá»? chá»©c Mozilla">
+<!ENTITY  trademarkInfo.part1   "'Tor' vÃ  logo Cá»§ hÃ nh lÃ  thÆ°Æ¡ng hiá»?u Ä?Ã£ Ä?Æ°á»£c Ä?Ä?ng kÃ½ cá»§a Tor Project, Inc.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Báº¥m chuá»?t Ä?á»? táº£i nhá»¯ng nhá»¯ng chÆ°Æ¡ng trÃ¬nh gáº¯n thÃªm vÃ o há»? thá»?ng Ä?Ã£ Ä?Æ°á»£c cÃ i Ä?áº·t">
diff --git a/chrome/locale/vi/branding/tor-browser-brand.ftl b/chrome/locale/vi/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..a504879d
--- /dev/null
+++ b/chrome/locale/vi/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = TrÃ¬nh duyá»?t Tor
+-brand-short-name = TrÃ¬nh duyá»?t Tor
+-brand-full-name = TrÃ¬nh duyá»?t Tor
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = TrÃ¬nh duyá»?t Tor
+-vendor-short-name = Dá»± Ã¡n Tor
+trademarkInfo = 'Tor' vÃ  logo Cá»§ hÃ nh lÃ  thÆ°Æ¡ng hiá»?u Ä?Ã£ Ä?Æ°á»£c Ä?Ä?ng kÃ½ cá»§a Tor Project, Inc.
diff --git a/chrome/locale/wa/brand.dtd b/chrome/locale/wa/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/wa/brand.dtd
+++ b/chrome/locale/wa/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/wa/branding/tor-browser-brand.ftl b/chrome/locale/wa/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/wa/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/wo/brand.dtd b/chrome/locale/wo/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/wo/brand.dtd
+++ b/chrome/locale/wo/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/wo/branding/tor-browser-brand.ftl b/chrome/locale/wo/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/wo/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/zh-CN/brand.dtd b/chrome/locale/zh-CN/brand.dtd
index 48918147..1b96d120 100644
--- a/chrome/locale/zh-CN/brand.dtd
+++ b/chrome/locale/zh-CN/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox ä¸? Firefox å?¾æ ?ä¸º Mozilla Foundation ç??å??æ ?ã??">
+<!ENTITY  trademarkInfo.part1   "â??Torâ??å??â??Onion Logoâ??æ?¯ Tor Project, Inc ç??æ³¨å??å??æ ?ã??">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "ç?¹å?»å? è½½å·²å®?è£?ç??ç³»ç»?æ??ä»¶">
diff --git a/chrome/locale/zh-CN/branding/tor-browser-brand.ftl b/chrome/locale/zh-CN/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..acaab16c
--- /dev/null
+++ b/chrome/locale/zh-CN/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = â??Torâ??å??â??Onion Logoâ??æ?¯ Tor Project, Inc ç??æ³¨å??å??æ ?ã??
diff --git a/chrome/locale/zh-HK/brand.dtd b/chrome/locale/zh-HK/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/zh-HK/brand.dtd
+++ b/chrome/locale/zh-HK/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/zh-HK/branding/tor-browser-brand.ftl b/chrome/locale/zh-HK/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/zh-HK/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/chrome/locale/zh-TW/brand.dtd b/chrome/locale/zh-TW/brand.dtd
index 565fc618..2714358d 100644
--- a/chrome/locale/zh-TW/brand.dtd
+++ b/chrome/locale/zh-TW/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "æ´?è?¥è·¯ç?±ç??è¦½å?¨">
 <!ENTITY  brandFullName         "æ´?è?¥è·¯ç?±ç??è¦½å?¨">
 <!ENTITY  vendorShortName       "æ´?è?¥è·¯ç?±å°?æ¡?">
-<!ENTITY  trademarkInfo.part1   "Firefox è?? Firefox æ¨?èª?æ?¯ Mozilla å?ºé??æ??ç??è¨»å??å??æ¨?ã??">
+<!ENTITY  trademarkInfo.part1   "ã??Torã??å??ã??Onion Logoã??ç??æ?¯ Tor Project, Inc ç??è¨»å??å??æ¨?ã??">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "é»?æ??ä»¥è¼?å?¥å·²å®?è£?ç??ç³»çµ±å¤?æ??">
diff --git a/chrome/locale/zh-TW/branding/tor-browser-brand.ftl b/chrome/locale/zh-TW/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..67938d57
--- /dev/null
+++ b/chrome/locale/zh-TW/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = æ´?è?¥è·¯ç?±ç??è¦½å?¨
+-brand-short-name = æ´?è?¥è·¯ç?±ç??è¦½å?¨
+-brand-full-name = æ´?è?¥è·¯ç?±ç??è¦½å?¨
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = æ´?è?¥è·¯ç?±ç??è¦½å?¨
+-vendor-short-name = æ´?è?¥è·¯ç?±å°?æ¡?
+trademarkInfo = ã??Torã??å??ã??Onion Logoã??ç??æ?¯ Tor Project, Inc ç??è¨»å??å??æ¨?ã??
diff --git a/chrome/locale/zu/brand.dtd b/chrome/locale/zu/brand.dtd
index 59f665e8..47d33862 100644
--- a/chrome/locale/zu/brand.dtd
+++ b/chrome/locale/zu/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/zu/branding/tor-browser-brand.ftl b/chrome/locale/zu/branding/tor-browser-brand.ftl
new file mode 100644
index 00000000..af1fd648
--- /dev/null
+++ b/chrome/locale/zu/branding/tor-browser-brand.ftl
@@ -0,0 +1,12 @@
+# 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-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
diff --git a/components/startup-observer.js b/components/startup-observer.js
index 742b1a0f..bf2f0f48 100644
--- a/components/startup-observer.js
+++ b/components/startup-observer.js
@@ -15,8 +15,11 @@
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-                                  "resource://gre/modules/FileUtils.jsm");
+XPCOMUtils.defineLazyModuleGetters(this, {
+  FileUtils: "resource://gre/modules/FileUtils.jsm",
+  FileSource: "resource://gre/modules/L10nRegistry.jsm",
+  L10nRegistry: "resource://gre/modules/L10nRegistry.jsm",
+});
 
 ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs();
 let NoScriptControl = ChromeUtils.import("resource://torbutton/modules/noscript-control.js", {});
@@ -58,6 +61,26 @@ function StartupObserver() {
     } catch(e) {
       this.logger.log(4, "Early proxy change failed. Will try again at profile load. Error: "+e);
     }
+
+    // Using all possible locales so that we do not have to change this list every time we support
+    // a new one.
+    const allLocales = [
+      "en-US", "ach", "af", "an", "ar", "ast", "az", "be", "bg", "bn", "br", "bs", "ca", "cak",
+      "crh", "cs", "cy", "da", "de", "dsb", "el", "en-CA", "en-GB", "eo", "es-AR", "es-CL",
+      "es-ES", "es-MX", "et", "eu", "fa", "ff", "fi", "fr", "fy-NL", "ga-IE", "gd", "gl", "gn",
+      "gu-IN", "he", "hi-IN", "hr", "hsb", "hu", "hy-AM", "ia", "id", "is", "it", "ja",
+      "ja-JP-mac", "ka", "kab", "kk", "km", "kn", "ko", "lij", "lo", "lt", "ltg", "lv", "mk", "mr",
+      "ms", "my", "nb-NO", "ne-NP", "nl", "nn-NO", "oc", "pa-IN", "pl", "pt-BR", "pt-PT", "rm",
+      "ro", "ru", "si", "sk", "sl", "son", "sq", "sr", "sv-SE", "ta", "te", "th", "tl", "tr",
+      "trs", "uk", "ur", "uz", "vi", "wo", "xh", "zh-CN", "zh-TW"
+    ];
+    let torSource = new FileSource(
+      "torbutton",
+      allLocales,
+      "resource://torbutton/locale/{locale}/",
+      true, // skip this FileSource locales when computing Services.locale.availableLocales
+    );
+    L10nRegistry.registerSource(torSource);
 }
 
 StartupObserver.prototype = {

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [torbutton/master] Bug 30783: Add language strings for EOY 2019 campaign
Next by Author: [tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26690: Port padlock states for .onion services to mobile
Previous by thread: [tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 10760: Integrate TorButton to TorBrowser core
Next by thread: [tor-commits] [translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
Index(es):
- Author
- Thread