tor-commits
Threads by month
- ----- 2025 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
October 2019
- 22 participants
- 4141 discussions

[translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
by translation@torproject.org 02 Oct '19
by translation@torproject.org 02 Oct '19
02 Oct '19
commit e3eec9746c65092358b03b55a64ca7e9f47e02de
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Oct 2 09:45:54 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
---
sw/exonerator.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sw/exonerator.properties b/sw/exonerator.properties
index 318e48cfe..7236861c6 100644
--- a/sw/exonerator.properties
+++ b/sw/exonerator.properties
@@ -1,7 +1,7 @@
form.explanation=Enter an IP address and date to find out whether that address was used as a Tor relay:
form.ip.label=IP address
form.timestamp.label=Date
-form.search.label=Search
+form.search.label=Tafuta
summary.heading=Summary
summary.serverproblem.dbnoconnect.title=Server problem
summary.serverproblem.dbnoconnect.body.text=Unable to connect to the database. Please try again later. If this problem persists, please %s!
1
0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation@torproject.org 02 Oct '19
by translation@torproject.org 02 Oct '19
02 Oct '19
commit fbfd11d5da5ea3df80607ada1c73890748a96286
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Oct 2 09:45:43 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message…
---
locale/ml/LC_MESSAGES/messages.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/locale/ml/LC_MESSAGES/messages.po b/locale/ml/LC_MESSAGES/messages.po
index 358fdd2b2..5f249847e 100644
--- a/locale/ml/LC_MESSAGES/messages.po
+++ b/locale/ml/LC_MESSAGES/messages.po
@@ -920,7 +920,7 @@ msgstr ""
#: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:389
#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:348
msgid "State"
-msgstr ""
+msgstr "അവസ്ഥ "
#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:375
#: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:394
1
0

[torbutton/master] Bug 28196: Register Fluent src and add tor-browser-brand.ftl
by gk@torproject.org 02 Oct '19
by gk@torproject.org 02 Oct '19
02 Oct '19
commit 2d8ae8086b2fa0ed1c25a741a8bdcc269b290301
Author: Alex Catarineu <acat(a)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 = {
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk@torproject.org 02 Oct '19
by gk@torproject.org 02 Oct '19
02 Oct '19
commit f662b3c5708d97a137d9bbfd91fa2fac0bdeeccf
Author: Alex Catarineu <acat(a)torproject.org>
Date: Wed Oct 2 08:39:26 2019 +0200
fixup! Bug 10760: Integrate TorButton to TorBrowser core
Fixes #31914.
---
.../eslint/eslint-plugin-mozilla/lib/environments/browser-window.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js
index 73a5d9dd118f..e6ae80a637bd 100644
--- a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js
+++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js
@@ -75,7 +75,11 @@ function getGlobalScriptIncludes(scriptPath) {
"browser/components/search/content/"
)
.replace("chrome://browser/content/", "browser/base/content/")
- .replace("chrome://global/content/", "toolkit/content/");
+ .replace("chrome://global/content/", "toolkit/content/")
+ .replace(
+ "chrome://torbutton/content/",
+ "toolkit/torproject/torbutton/chrome/content/"
+ );
for (let mapping of Object.getOwnPropertyNames(MAPPINGS)) {
if (sourceFile.includes(mapping)) {
1
0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation@torproject.org 02 Oct '19
by translation@torproject.org 02 Oct '19
02 Oct '19
commit 28557fbdf902952874c2ebb0290b16deccc08815
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Oct 2 08:46:50 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co…
---
code_of_conduct+ml.po | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/code_of_conduct+ml.po b/code_of_conduct+ml.po
index 079b96e57..f2e6f7c41 100644
--- a/code_of_conduct+ml.po
+++ b/code_of_conduct+ml.po
@@ -67,6 +67,12 @@ msgid ""
" Project, Inc. (TPI) are also subject to company policies and procedures. "
"Those people should feel free to contact HR with questions or concerns."
msgstr ""
+"ഈ കോഡിന്റെ പെരുമാറ്റ രീതി ടോർ പ്രോജക്ട് മുഴുവനും ബാധകമാണ് . ഇതിന്റെ "
+"ഉദ്ദേശ്യം സംഭാവനചെയ്യുന്നയാള്ക്ക് , ടോർ പ്രോജക്ടിന്റെ കോൺട്രാക്ടർമാർക്കും "
+"ഇതിൽ ജോലി ചെയ്യുന്നവർക്കും മാര്ഗനിര്ദ്ദേശകരേഖകള് നൽകുക എന്നുള്ളതാണ് . ( "
+"ടി പി ഐ ) യും കമ്പനിയുടെ നയത്തിനും നടപടിക്രമത്തിനും വിഷയമാകുന്നതാണ് . ഈ "
+"ആളുകൾ ചോദ്യങ്ങളോ സംബന്ധിക്കുന്ന എന്തെങ്കിലും ഉണ്ടെങ്കിൽ സ്വാതന്ത്ര്യമായി എഛ്"
+" ആറിനെ ബനധപ്പെടാവുന്നതാണ് ."
#. type: Plain text
#: ../code_of_conduct.txt:23
1
0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation@torproject.org 02 Oct '19
by translation@torproject.org 02 Oct '19
02 Oct '19
commit 56d55e78a34ea5056ce6d1e0f76c6644186f7b79
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Oct 2 08:16:58 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co…
---
code_of_conduct+ml.po | 676 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 676 insertions(+)
diff --git a/code_of_conduct+ml.po b/code_of_conduct+ml.po
new file mode 100644
index 000000000..079b96e57
--- /dev/null
+++ b/code_of_conduct+ml.po
@@ -0,0 +1,676 @@
+# Code of conduct of the tor project
+# Copyright (C) 2019 tor project.
+# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0
+# International license.e.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# Translators:
+# ameer pb <ameerpbekm(a)gmail.com>, 2019
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Code of conduct of the Tor Project\n"
+"POT-Creation-Date: 2019-08-02 12:00+0000\n"
+"PO-Revision-Date: 2019-08-27 18:54+0000\n"
+"Last-Translator: ameer pb <ameerpbekm(a)gmail.com>, 2019\n"
+"Language-Team: Malayalam (https://www.transifex.com/otf/teams/1519/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24
+#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75
+#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180
+#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213
+#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243
+#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278
+#, no-wrap
+msgid "============================================================\n"
+msgstr "============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:3
+#, no-wrap
+msgid ""
+"Tor Project Code of Conduct\n"
+"============================================================\n"
+msgstr ""
+"ടോർ പ്രോജക്ട് കോഡിന്റെ നടത്തിപ്പ്\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:6
+msgid "Statement of Intent:"
+msgstr "ഉദ്ദേശ്യത്തിന്റെ വിവരണം;"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:10
+msgid ""
+"The Tor Project is committed to fostering an inclusive environment and "
+"community. Tor is a place where people should feel safe to engage, share "
+"their point of view, and participate."
+msgstr ""
+"ടോർ പ്രോജക്ട് പരിസ്ഥിതിയും സമൂഹവും അടങ്ങിയത് പരിപോഷിപ്പിക്കാനായിട്ട് "
+"അർപ്പിചിരിക്കുകയായിരുന്നു . ടോർ എന്നത് ആളുകൾക്ക് സുരക്ഷിതമായി പരസ്പരം "
+"സംഭാഷണത്തിലേര്പ്പെടാനും കാഴ്ചപ്പാട് പങ്കുവെയ്ക്കാനും പങ്കാളിയാകാനും "
+"പറ്റിയ ഒരു സ്ഥലമാണ് ."
+
+#. type: Plain text
+#: ../code_of_conduct.txt:15
+msgid ""
+"This code of conduct applies to The Tor Project as a whole. It is intended "
+"to provide guidelines for contributors. Employees and contractors of The Tor"
+" Project, Inc. (TPI) are also subject to company policies and procedures. "
+"Those people should feel free to contact HR with questions or concerns."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:23
+msgid ""
+"This code of conduct is not exhaustive or complete. It is an ongoing effort "
+"to summarize our shared understanding. We want to provide a welcoming, safe "
+"environment, so we can work together to pursue powerful solutions. We "
+"reserve the right to deviate from strictly enforcing this code. Any "
+"deviations must produce an outcome which is fairer, and aligned with our "
+"values. We understand that keeping a living document relevant and “patched” "
+"involves sustained effort."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:26
+#, no-wrap
+msgid ""
+"0. Summary: Don't be a jerk. Be awesome instead.\n"
+"============================================================\n"
+msgstr ""
+"0. സംഗ്രഹം : ഒരു മോശപ്പെട്ട ആൾ ആകാണ്ടിരിക്കുക. പകരം ശ്രദ്ധേയമായ ഒരാൾ ആകുക. \n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:29
+msgid "The Tor community should be a good place where people are glad to be."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:31
+#, no-wrap
+msgid " DO: Be kind, thoughtful, and considerate.\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:33
+#, no-wrap
+msgid " DO: Make Tor a place where people are happy and comfortable.\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:36
+#, no-wrap
+msgid ""
+" DO: Remember: We are all contributing; we are all learning. Nobody was born\n"
+" an expert.\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:38
+#, no-wrap
+msgid " DO: Yield the floor. Listen. Make sure everyone gets heard.\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:40
+#, no-wrap
+msgid " DON'T: Insult, harass, intimidate, or be a jerk.\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:43
+#, no-wrap
+msgid ""
+" DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are for\n"
+" learning.\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:46
+#, no-wrap
+msgid ""
+" DON'T: Hunt for ways to uphold the letter of this code while violating its\n"
+" spirit.\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:50
+#, no-wrap
+msgid ""
+" AND DO: Eagerly email: tor-community-council(a)lists.torproject.org with\n"
+" questions or concerns. Public key:\n"
+" https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:53
+#, no-wrap
+msgid ""
+"1. Purpose\n"
+"============================================================\n"
+msgstr ""
+"1. ഉദ്ദേശ്യം\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:63
+msgid ""
+"A primary goal of the Tor community is to be inclusive of many different "
+"contributors. We want to include contributors from the most varied and "
+"diverse backgrounds possible. As such, we are committed to providing a "
+"friendly, safe and welcoming environment for all, regardless of their "
+"experience, gender identity or expression, sexual orientation, family, "
+"relationships, ability (whether bodily or mental), personal appearance, "
+"socioeconomic status, body size, race, ethnicity, age, religion, "
+"nationality, or membership in a disadvantaged and/or underrepresented group."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:68
+msgid ""
+"A safe environment means one free from abuse, whether isolated or systemic. "
+"We explicitly acknowledge that tolerating abuse is a security problem. "
+"Allowing abusers and malicious people to disrupt our community puts our "
+"software, developers, and users at risk."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:71
+msgid ""
+"This code of conduct outlines our expectations for all those who participate"
+" in our community, as well as the consequences for unacceptable behavior."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:74
+msgid ""
+"We invite all those who participate in The Tor Project to help us create "
+"safe and positive experiences for everyone."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:77
+#, no-wrap
+msgid ""
+"2. Be your best self\n"
+"============================================================\n"
+msgstr ""
+"2. നിങ്ങളുടെ കഴിവിന്റെ പരമാവധി ഉത്തമമായ അവസ്ഥയിൽ ആകുക \n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:80
+msgid ""
+"The following behaviors are expected and requested of all community members:"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:83
+msgid ""
+"Participate in an honest and active way. In doing so, you contribute to the "
+"health and longevity of this community."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:85
+msgid "Exercise consideration and respect in your speech and actions."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:87
+msgid "Attempt collaboration and dialog before engaging in conflict."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:89
+msgid ""
+"Refrain from demeaning, discriminatory, or harassing behavior and speech."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:92
+msgid ""
+"Be mindful of your surroundings and of your fellow participants. Alert "
+"community leaders if you notice:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:94
+msgid "a dangerous situation"
+msgstr "ഒരു അപകടകരമായ അവസ്ഥ "
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:96
+msgid "someone in distress"
+msgstr "ആരെങ്കിലും ദുരവസ്ഥയിൽ ആണെങ്കിൽ "
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:98
+msgid "violations of this code of conduct, even if they seem minor"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:101
+msgid ""
+"Remember that community event venues may be shared with members of the "
+"public. Please be respectful to everyone using these locations."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:103
+msgid "Respect the privacy of your fellow community members."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:106
+#, no-wrap
+msgid ""
+"3. Unacceptable behaviors\n"
+"============================================================\n"
+msgstr ""
+"3. അംഗീകരിക്കാനാവാത്ത സ്വഭാവo\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:109
+msgid "The following behaviors are unacceptable within our community:"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:114
+msgid ""
+"Violence, sexual assault, threats of violence, or violent language directed "
+"against another person, especially violence against a person or group based "
+"on a protected characteristic. (Display of weapons may constitute "
+"intimidation or a threat of violence.)"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:117
+msgid ""
+"Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory"
+" jokes and language."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:122
+msgid ""
+"Spontaneously posting or displaying sexually explicit or violent material. "
+"(If it is necessary to share such material when working on Tor's mission, do"
+" so with sensitivity. Be aware that many people don't want to see it.)"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:125
+msgid ""
+"Posting or threatening to post other people’s personally identifying "
+"information (\"doxing\") without their consent."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:127
+msgid "Personal insults or attacks, particularly those related to:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:129
+msgid "experience"
+msgstr "പരിചയം"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:131
+msgid "gender identity or expression"
+msgstr "ലിംഗ സവിശേഷത അല്ലെങ്കിൽ ആവിഷ്കരണം"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:133
+msgid "sexual orientation"
+msgstr "ലൈംഗികമായ ക്രമീകരണം"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:135
+msgid "family"
+msgstr "കുടുംബം"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:137
+msgid "relationships"
+msgstr "അടുപ്പം"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:139
+msgid "ability (whether bodily or mental)"
+msgstr "കഴിവ് (ശാരീരികമായോ മാനസികമായോ )"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:141
+msgid "personal appearance"
+msgstr "വ്യക്തിപരമായ രൂപം"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:143
+msgid "socioeconomic status"
+msgstr "സമൂഹത്തിലെ സാമ്പത്തികമായ നില"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:145
+msgid "body size"
+msgstr "ബോഡി വലുപ്പം"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:147
+msgid "race"
+msgstr "സമൂഹം"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:149
+msgid "ethnicity"
+msgstr "വംശീയമായ"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:151
+msgid "age"
+msgstr "വയസ്സ്"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:153
+msgid "religion"
+msgstr "മതം"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:155
+msgid "nationality"
+msgstr "ദേശീയത"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:157
+msgid "membership in a disadvantaged and/or underrepresented group"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:161
+msgid ""
+"Inappropriate photography, audio recording, or recording of personal "
+"information. You should have someone's consent before recording these "
+"things, and before posting them publicly."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:164
+msgid ""
+"Inappropriate physical contact. You should have someone’s consent before "
+"touching them."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:167
+msgid ""
+"Unwelcome sexual attention: this includes sexualized comments or jokes, "
+"inappropriate touching, groping, and unwelcome sexual advances."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:169
+msgid "Deliberate intimidation, stalking or following (online or in person)."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:172
+msgid ""
+"Deliberately undermining the spirit of this code while following the letter."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:175
+msgid ""
+"Sustained disruption of any community events, including talks, "
+"presentations, and online conversations."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:177
+msgid "Deliberately pushing against someone's stated boundaries."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:179
+msgid "Advocating for, or encouraging, any of the above behavior."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:182
+#, no-wrap
+msgid ""
+"4. Unacceptable behavior has consequences\n"
+"============================================================\n"
+msgstr ""
+"4. അംഗീകരിക്കാനാവാത്ത സ്വഭാവത്തിന് അനന്തരഫലം ഉണ്ടായിരിക്കുന്നതാണ് \n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:188
+msgid ""
+"We will not tolerate unacceptable behavior from any community member. We "
+"will not make exceptions for sponsors and those with decision-making "
+"authority. People in formal or informal leadership roles must model the "
+"highest standards of behavior."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:192
+msgid ""
+"Anyone asked by another community member to stop unacceptable behavior is "
+"expected to comply immediately. Please don't step in on someone else's "
+"behalf without their consent."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:195
+#, no-wrap
+msgid ""
+"5. Where to go for help\n"
+"============================================================\n"
+msgstr ""
+"5. സഹായത്തിനായി എവിടെ പോകണം \n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:201
+msgid ""
+"The Community Council is an elected body of Tor Core Contributors who can "
+"assist with intra-community conflict resolution. Community Council policies "
+"and information can be found on the Community Council wiki [1]. You can "
+"contact the whole Community council:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:203
+msgid "if you have questions or concerns about the code of conduct, or"
+msgstr ""
+"നിങ്ങൾക്ക് കോഡിന്റെ പെരുമാറ്റ ലംഘനം സംബന്ധിച്ചു ചോദ്യം ഉണ്ടെങ്കിൽ , "
+"അല്ലെങ്കിൽ "
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:205
+msgid "if you feel that you have witnessed a code of conduct violation"
+msgstr "നിങ്ങൾ ഒരു കോഡിന്റെ പെരുമാറ്റ ലംഘനം കാണാൻ ഇട വന്നാൽ "
+
+#. type: Plain text
+#: ../code_of_conduct.txt:212
+msgid ""
+"However, if you feel that there is a conflict of interest with any council "
+"member, you may contact members individually. Council members' GPG keys are "
+"listed on the Community Council wiki. If there is a conflict of interest, "
+"the affected council member will recuse themselves. They will not be "
+"involved in any discussion or documentation of the incident. More about the "
+"Community Council can be found in the guidelines [2]."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:215
+#, no-wrap
+msgid ""
+"6. What to do if you witness unacceptable behavior\n"
+"============================================================\n"
+msgstr ""
+"6. അംഗീകരിക്കാനാവാത്ത ഒരു സ്വഭാവം കണ്ടാൽ എന്താണ് ചെയ്യേണ്ടത് \n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:230
+msgid ""
+"If you are subject to or witness unacceptable behavior, or have any other "
+"concerns, please notify the Community Council as soon as possible. You can "
+"contact the community council in person, or at tor-community-"
+"council(a)lists.torproject.org. Current councilmembers are listed on the wiki "
+"[1]. The Community Council's incident response will vary on a case-by-case "
+"basis. The council will make every effort to respond to the incident "
+"immediately. The council will prioritize the safety of the person who has "
+"been harmed, or is at risk of harm. Person(s) who have been harmed or are at"
+" risk of harm can withdraw the incident report at any time. We will never do"
+" anything without the consent of the person who has been harmed or is at "
+"risk of harm, except in situations where there is a threat of imminent "
+"danger or harm to anyone. More information about the Community Council's "
+"incident reporting and response policies can be found on their wiki [1]."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:233
+#, no-wrap
+msgid ""
+"7. What the person reporting a violation can expect\n"
+"============================================================\n"
+msgstr ""
+"7. ഒരു അതിക്രമം റിപ്പോർട്ട് ചെയ്യുന്ന വ്യക്തി എന്താണ് പ്രതീക്ഷിക്കേണ്ടത് \n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:242
+msgid ""
+"The Community Council prioritizes the safety and well-being of any person "
+"who feels that they have been harmed or may be in danger of being harmed. "
+"Anyone reporting an issue to the Community Council can expect that their "
+"report will be taken seriously. Initial reports can be taken in written or "
+"verbal form. If the incident does not require an immediate resolution, then "
+"a written report can be shared with the Community Council in an encrypted "
+"format. The next steps in an incident response will vary on a case-by-case "
+"basis."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:245
+#, no-wrap
+msgid ""
+"8. How the Community Council responds to incidents\n"
+"============================================================\n"
+msgstr ""
+"8. കമ്മ്യൂണിറ്റി കൌൺസിൽ ഒരു സംഭവിക്കലുമായി എങ്ങനെയാണ് പ്രതികരിക്കുന്നത് \n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:252
+msgid ""
+"If a community member engages in unacceptable behavior, the Community "
+"Council may take any action they deem appropriate, including but not limited"
+" to a warning, informal mediation, temporary ban or permanent expulsion from"
+" the community. Any actions and decisions by the Community Council may be "
+"appealed by following the appeals process in the Community Council "
+"Guidelines [1]."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:255
+#, no-wrap
+msgid ""
+"9. Scope of this document\n"
+"============================================================\n"
+msgstr ""
+"9. ഈ ഡോക്യൂമെന്റിന്റെ ലക്ഷ്യം\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:258
+msgid "This code of conduct covers all community participants:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:260
+msgid "paid and unpaid contributors"
+msgstr "പണം കൊടുത്തും അല്ലാതെയും സംഭാവന ചെയ്യുന്നയാള്"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:262
+msgid "sponsors"
+msgstr "രക്ഷാധികാരികൾ "
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:264
+msgid "other guests"
+msgstr "മറ്റുള്ള അതിഥികള്"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:266
+msgid "when interacting:"
+msgstr "പരസ്പരം പ്രവര്ത്തനം നടത്തുമ്പോൾ :"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:268
+msgid "in all online and in-person community venues"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:270
+msgid "in one-on-one communications that relate to community work"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:277
+msgid ""
+"This code of conduct and its related procedures also applies to unacceptable"
+" behavior occurring outside the scope of community activities when such "
+"behavior has the potential to adversely affect the safety and well-being of "
+"community members. As members of the Tor community, we support and follow "
+"this Code while we are working on Tor, and take care not to undermine it in "
+"the rest of our time."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:280
+#, no-wrap
+msgid ""
+"10. License and attribution\n"
+"============================================================\n"
+msgstr ""
+"10. അനുമതിയും ഗുണവും \n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:284
+msgid ""
+"This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 "
+"International license."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:287
+msgid ""
+"This code of conduct uses some language and framing from the Citizen Code of"
+" Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:289
+msgid ""
+"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] "
+"https://gitweb.torproject.org/community/policies.git/tree/community_council…"
+msgstr ""
1
0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation@torproject.org 02 Oct '19
by translation@torproject.org 02 Oct '19
02 Oct '19
commit ab930df2267a572a642b36ff5c898ce5734f49ff
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Oct 2 08:15:45 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message…
---
locale/gd/LC_MESSAGES/messages.po | 7 +++++--
locale/uz/LC_MESSAGES/messages.po | 7 ++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/locale/gd/LC_MESSAGES/messages.po b/locale/gd/LC_MESSAGES/messages.po
index 2016d7eaa..47782b385 100644
--- a/locale/gd/LC_MESSAGES/messages.po
+++ b/locale/gd/LC_MESSAGES/messages.po
@@ -1,6 +1,9 @@
+# Translators:
+# Tor Project <support-team-private(a)lists.torproject.org>, 2019
#
msgid ""
msgstr ""
+"Last-Translator: Tor Project <support-team-private(a)lists.torproject.org>, 2019\n"
"Language-Team: Gaelic, Scottish (https://www.transifex.com/otf/teams/1519/gd/)\n"
"Language: gd\n"
"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
@@ -999,7 +1002,7 @@ msgstr ""
#: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:483
#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:443
msgid "Donate"
-msgstr ""
+msgstr "Donate"
#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:479
#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:453
@@ -1174,7 +1177,7 @@ msgstr ""
#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:64
#: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:44
msgid "Questions?"
-msgstr ""
+msgstr "Questions?"
#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:80
#: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:59
diff --git a/locale/uz/LC_MESSAGES/messages.po b/locale/uz/LC_MESSAGES/messages.po
index b04e1fe38..ec3a9a5c1 100644
--- a/locale/uz/LC_MESSAGES/messages.po
+++ b/locale/uz/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@
# erinm, 2018
# IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2018
# Adham Kurbanov <uz(a)zu.uz>, 2019
+# Tor Project <support-team-private(a)lists.torproject.org>, 2019
#
msgid ""
msgstr ""
-"Last-Translator: Adham Kurbanov <uz(a)zu.uz>, 2019\n"
+"Last-Translator: Tor Project <support-team-private(a)lists.torproject.org>, 2019\n"
"Language-Team: Uzbek (https://www.transifex.com/otf/teams/1519/uz/)\n"
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -1004,7 +1005,7 @@ msgstr ""
#: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:483
#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:443
msgid "Donate"
-msgstr ""
+msgstr "Donate"
#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:479
#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:453
@@ -1179,7 +1180,7 @@ msgstr ""
#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:64
#: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:44
msgid "Questions?"
-msgstr ""
+msgstr "Questions?"
#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:80
#: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:59
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up latest Torbutton fix
by gk@torproject.org 02 Oct '19
by gk@torproject.org 02 Oct '19
02 Oct '19
commit 75df2c9702ae02f5bed8c7d69e4738cdddc69904
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Oct 2 08:00:31 2019 +0000
Pick up latest Torbutton fix
---
toolkit/torproject/torbutton | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index 0e2b3bc5f111..b7218ab186ef 160000
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit 0e2b3bc5f11181fbd7d42524f2591149688e210d
+Subproject commit b7218ab186ef8d1e1ded5fe9b19eaecfad767be0
1
0

02 Oct '19
commit b7218ab186ef8d1e1ded5fe9b19eaecfad767be0
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Oct 2 07:56:58 2019 +0000
Bug 31929: Don't escape DTD entity in ar
---
chrome/locale/ar/aboutDialog.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/locale/ar/aboutDialog.dtd b/chrome/locale/ar/aboutDialog.dtd
index fbd16aec..e211f8b1 100644
--- a/chrome/locale/ar/aboutDialog.dtd
+++ b/chrome/locale/ar/aboutDialog.dtd
@@ -1,6 +1,6 @@
<!ENTITY project.start "طوّر &brandShortName;">
<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
-<!ENTITY project.tpoLink "&vendorShortName؛">
+<!ENTITY project.tpoLink "&vendorShortName;">
<!ENTITY project.end "، مؤسسة غير هادفة للربح تعمل على حماية خصوصيتك وحريتك على الإنترنت.">
<!ENTITY help.start "هل ترغب في المساعدة؟">
1
0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation@torproject.org 02 Oct '19
by translation@torproject.org 02 Oct '19
02 Oct '19
commit ede7440eb7b16e08982f09466100395d05711818
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Oct 2 07:53:50 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
contents+gu.po | 5 +++--
contents+my.po | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/contents+gu.po b/contents+gu.po
index 3ec34e7d3..808d43b43 100644
--- a/contents+gu.po
+++ b/contents+gu.po
@@ -2,6 +2,7 @@
# Drashti Pandya <drashtipandya37(a)gmail.com>, 2019
# Michael Hathi <numerativetech(a)gmail.com>, 2019
# Emma Peel, 2019
+# Tor Project <support-team-private(a)lists.torproject.org>, 2019
#
msgid ""
msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-26 17:56+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Tor Project <support-team-private(a)lists.torproject.org>, 2019\n"
"Language-Team: Gujarati (https://www.transifex.com/otf/teams/1519/gu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -5867,7 +5868,7 @@ msgstr "સંપર્ક કરો"
#: https//support.torproject.org/misc/menu/
#: (content/misc/menu/contents+en.lrquestion.description)
msgid "Donate"
-msgstr ""
+msgstr "Donate"
#: https//support.torproject.org/misc/menu/
#: (content/misc/menu/contents+en.lrquestion.description)
diff --git a/contents+my.po b/contents+my.po
index 6be79e000..baf99e9a5 100644
--- a/contents+my.po
+++ b/contents+my.po
@@ -1,6 +1,7 @@
# Translators:
# Emma Peel, 2019
# erinm, 2019
+# Tor Project <support-team-private(a)lists.torproject.org>, 2019
#
msgid ""
msgstr ""
@@ -8,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-26 17:56+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Tor Project <support-team-private(a)lists.torproject.org>, 2019\n"
"Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -5866,7 +5867,7 @@ msgstr "အဆက်အသွယ်"
#: https//support.torproject.org/misc/menu/
#: (content/misc/menu/contents+en.lrquestion.description)
msgid "Donate"
-msgstr ""
+msgstr "Donate"
#: https//support.torproject.org/misc/menu/
#: (content/misc/menu/contents+en.lrquestion.description)
1
0