[tbb-commits] [torbutton/master] Bug 28196: Register Fluent src and add tor-browser-brand.ftl
gk at torproject.org
gk at torproject.org
Wed Oct 2 09:25:43 UTC 2019
commit 2d8ae8086b2fa0ed1c25a741a8bdcc269b290301
Author: Alex Catarineu <acat at torproject.org>
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 ""تور" و "شعار البصلة" علامات تجارية مسجلة باسم شركة مشروع تور المحدودة">
<!-- 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 = "تور" و "شعار البصلة" علامات تجارية مسجلة باسم شركة مشروع تور المحدودة
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 ""Tor" a "Onion logo" 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 = "Tor" a "Onion logo" 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 ""Tor" og "løg-logoet" 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 = "Tor" og "løg-logoet" 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 ""Tor" og "Løk-logoen" 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 = "Tor" og "Løk-logoen" 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 = {
More information about the tbb-commits
mailing list