tbb-commits
Threads by month
- ----- 2025 -----
- 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
- 1 participants
- 18530 discussions

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 25702: Update Tor Browser icon to follow design guidelines
by gk@torproject.org 02 Oct '19
by gk@torproject.org 02 Oct '19
02 Oct '19
commit 4648902eeda584ebe14339ac632ff0ba483e1de2
Author: Alex Catarineu <acat(a)torproject.org>
Date: Mon Sep 30 16:46:26 2019 +0200
fixup! Bug 25702: Update Tor Browser icon to follow design guidelines
---
browser/branding/alpha/locales/en-US/brand.dtd | 2 +-
browser/branding/nightly/locales/en-US/brand.dtd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/browser/branding/alpha/locales/en-US/brand.dtd b/browser/branding/alpha/locales/en-US/brand.dtd
index 46c34c4b7765..044ef647b7f7 100644
--- a/browser/branding/alpha/locales/en-US/brand.dtd
+++ b/browser/branding/alpha/locales/en-US/brand.dtd
@@ -10,4 +10,4 @@
remain unchanged across different versions (Nightly, Beta, etc.). -->
<!ENTITY brandProductName "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/browser/branding/nightly/locales/en-US/brand.dtd b/browser/branding/nightly/locales/en-US/brand.dtd
index 46c34c4b7765..044ef647b7f7 100644
--- a/browser/branding/nightly/locales/en-US/brand.dtd
+++ b/browser/branding/nightly/locales/en-US/brand.dtd
@@ -10,4 +10,4 @@
remain unchanged across different versions (Nightly, Beta, etc.). -->
<!ENTITY brandProductName "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.">
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

[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

[tor-browser-spec/master] Bug 31911: Add information about monitoring disk space for cdn.tpo
by gk@torproject.org 01 Oct '19
by gk@torproject.org 01 Oct '19
01 Oct '19
commit aff3780c19d235bc98ff6b765f0eeb5e52a98535
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Tue Oct 1 17:49:19 2019 +0200
Bug 31911: Add information about monitoring disk space for cdn.tpo
---
processes/ReleaseProcess | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess
index c183c9a..2b772e5 100644
--- a/processes/ReleaseProcess
+++ b/processes/ReleaseProcess
@@ -127,6 +127,14 @@
for i in *.asc; do echo $i ; gpg -q $i || break; done
static-update-component dist.torproject.org
+#. Check diskspace available on cdn.tpo
+# We currently have enough disk space to host two alpha and stable
+# releases. However with the size of each Tor Browser release increasing,
+# it may become necessary to increase disk space. The server hosting
+# the files for cdn.tpo is savii.tpo and its disk usage can be monitored
+# by going to https://grafana.torproject.org/d/Z7T7Cfemz/node-exporter-full
+# and selecting the host savii.torproject.org.
+
#. Upload the *.mar files to cdn.tpo
#. Local to staticiforme:
mkdir /srv/cdn-master.torproject.org/htdocs/aus1/torbrowser/$TORBROWSER_VERSION
1
0
commit 177afba4be247dd88d089d7f5e769625003a181c
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Oct 1 07:31:11 2019 +0000
Fix typo in changelog
---
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 0f18eae..a13901f 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -21,7 +21,7 @@ Tor Browser 9.0a7 -- October 1 2019
* Bug 31491: Clean up the old meek http helper browser profiles
* Bug 26345: Hide tracking protection UI
* Bug 31601: Disable recommended extensions again
- * Bug 31604: Don't show Firefox Home when opening new tabs
+ * Bug 30662: Don't show Firefox Home when opening new tabs
* Bug 31457: disable per-installation profiles
* Bug 28822: Re-implement desktop onboarding for ESR 68
* Bug 25483: Provide Snowflake based on Pion for Windows, macOS, and Linux
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 01 Oct '19
by gk@torproject.org 01 Oct '19
01 Oct '19
commit b34d1fabc03309cd347070fa79c99c2534bd1650
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Mon Sep 30 22:10:26 2019 +0000
fixup! TB4: Tor Browser's Firefox preference overrides.
Bug 16285 - Disable DRM/EME on Android and drop Adobe CDM
---
browser/app/profile/000-tor-browser.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 1b936a3beb3d..93a661a894cb 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -215,14 +215,13 @@ pref("media.gmp-manager.updateEnabled", false);
// Mozilla is relying on preferences to make sure no DRM blob is downloaded and
// run. Even though those prefs should be set correctly by specifying
// --disable-eme (which we do), we disable all of them here as well for defense
-// in depth.
+// in depth (see bug 16285 for more details).
pref("browser.eme.ui.enabled", false);
-pref("media.gmp-eme-adobe.visible", false);
-pref("media.gmp-eme-adobe.enabled", false);
pref("media.gmp-widevinecdm.visible", false);
pref("media.gmp-widevinecdm.enabled", false);
pref("media.eme.enabled", false);
pref("media.eme.apiVisible", false);
+pref("media.mediadrm-widevinecdm.visible", false);
// WebIDE can bypass proxy settings for remote debugging. It also downloads
// some additional addons that we have not reviewed. Turn all that off.
pref("devtools.webide.autoinstallADBHelper", false);
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bump Torbutton commit to pick up fix for #31886
by gk@torproject.org 30 Sep '19
by gk@torproject.org 30 Sep '19
30 Sep '19
commit 73e6839b763f0fbed54010c723d8beea88eb62c8
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 30 08:21:36 2019 +0000
Bump Torbutton commit to pick up fix for #31886
---
toolkit/torproject/torbutton | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index a85133e2dc52..0e2b3bc5f111 160000
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit a85133e2dc52c707f936857402d4753d961c30f9
+Subproject commit 0e2b3bc5f11181fbd7d42524f2591149688e210d
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Revert "Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 2MB. r=jrmuizel"
by gk@torproject.org 30 Sep '19
by gk@torproject.org 30 Sep '19
30 Sep '19
commit 7b85373046c7a78416f71b9b1f65124e762ba596
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 30 08:20:27 2019 +0000
Revert "Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 2MB. r=jrmuizel"
This reverts commit 7813cebd9f79de65d16e262ce79b675e7ec132c3.
---
gfx/layers/PaintThread.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp
index 40ba4d3954b1..400e2d342b2f 100644
--- a/gfx/layers/PaintThread.cpp
+++ b/gfx/layers/PaintThread.cpp
@@ -79,7 +79,7 @@ static uint32_t GetPaintThreadStackSize() {
#else
// Workaround bug 1578075 by increasing the stack size of paint threads
if (nsCocoaFeatures::OnCatalinaOrLater()) {
- static const uint32_t kCatalinaPaintThreadStackSize = 2 * 1024 * 1024;
+ static const uint32_t kCatalinaPaintThreadStackSize = 1024 * 1024;
static_assert(kCatalinaPaintThreadStackSize >= nsIThreadManager::DEFAULT_STACK_SIZE,
"update default stack size of paint "
"workers");
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Revert "Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 1MB. r=jrmuizel"
by gk@torproject.org 30 Sep '19
by gk@torproject.org 30 Sep '19
30 Sep '19
commit 6ab20c9a7530efa3ba788c803f314d8a03c2c905
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 30 08:20:47 2019 +0000
Revert "Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 1MB. r=jrmuizel"
This reverts commit e179405cb2f2e8fbbde1ce75b7d7dd9eadc2d4a0.
---
gfx/layers/PaintThread.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp
index 400e2d342b2f..c35bf472d682 100644
--- a/gfx/layers/PaintThread.cpp
+++ b/gfx/layers/PaintThread.cpp
@@ -79,7 +79,7 @@ static uint32_t GetPaintThreadStackSize() {
#else
// Workaround bug 1578075 by increasing the stack size of paint threads
if (nsCocoaFeatures::OnCatalinaOrLater()) {
- static const uint32_t kCatalinaPaintThreadStackSize = 1024 * 1024;
+ static const uint32_t kCatalinaPaintThreadStackSize = 512 * 1024;
static_assert(kCatalinaPaintThreadStackSize >= nsIThreadManager::DEFAULT_STACK_SIZE,
"update default stack size of paint "
"workers");
1
0
commit 0e2b3bc5f11181fbd7d42524f2591149688e210d
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 30 08:17:00 2019 +0000
Bug 31886: Fix ko bundle bustage
---
chrome/locale/ko/aboutTor.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/locale/ko/aboutTor.dtd b/chrome/locale/ko/aboutTor.dtd
index b6151d13..70898aed 100644
--- a/chrome/locale/ko/aboutTor.dtd
+++ b/chrome/locale/ko/aboutTor.dtd
@@ -28,5 +28,5 @@
<!ENTITY aboutTor.newsletter.tagline "최신의 Tor 뉴스를 받은 편지함에 곧장 받으십시오.">
<!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독.">
-<!ENTITY aboutTor.donationBanner.line2e "Tor 를 강하게 유지하기.">
+<!ENTITY aboutTor.donationBanner.line2e "Tor 를 강하게 유지하기.">
<!ENTITY aboutTor.donationBanner.buttonA "기부하기">
1
0
commit 8a33fc78ff8f85939a0cf46feea671bb2369ac50
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Sep 27 21:49:52 2019 +0000
Add gk's new subkey
---
keyring/torbutton.gpg | Bin 234595 -> 290913 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg
index 9802147..5a505f2 100644
Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ
1
0

27 Sep '19
commit 9d253167005def507583f90f01f0fc96e2bdbe07
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Sep 27 21:50:14 2019 +0000
Release preparations for 9.0a7
Changelog update and versions bump
---
projects/firefox/config | 2 +-
.../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 58 ++++++++++++++++++++++
projects/tor-launcher/config | 2 +-
projects/tor/config | 2 +-
rbm.conf | 6 +--
5 files changed, 64 insertions(+), 6 deletions(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 334a1a8..3391a5a 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build3'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 2ecd3d1..0f18eae 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,61 @@
+Tor Browser 9.0a7 -- October 1 2019
+ * All platforms
+ * Bug 30304: Browser locale can be obtained via DTD strings
+ * Bug 31065: Set network.proxy.allow_hijacking_localhost to true
+ * Bug 24653: Merge securityLevel.properties into torbutton.dtd
+ * Bug 31725: Pick up mk in Torbutton properly
+ * Bug 31164: Set up default bridge at Karlstad University
+ * Bug 15563: Disable ServiceWorkers on all platforms
+ * Translations update
+ * Windows + OS X + Linux
+ * Update Tor to 0.4.2.1-alpha
+ * Update OpenSSL to 1.1.1d
+ * Bug 31844: OpenSSL 1.1.1d fails to compile for some platforms/architectures
+ * Update Tor Launcher to 0.2.19.4
+ * Bug 31303: Do not launch tor in browser toolbox
+ * Bug 31491: Clean up the old meek http helper browser profiles
+ * Translations update
+ * Bug 31598: Disable warning on window resize if letterboxing is enabled
+ * Bug 31562: Fix circuit display for error pages
+ * Bug 31575: Firefox is phoning home during start-up
+ * Bug 31491: Clean up the old meek http helper browser profiles
+ * Bug 26345: Hide tracking protection UI
+ * Bug 31601: Disable recommended extensions again
+ * Bug 31604: Don't show Firefox Home when opening new tabs
+ * Bug 31457: disable per-installation profiles
+ * Bug 28822: Re-implement desktop onboarding for ESR 68
+ * Bug 25483: Provide Snowflake based on Pion for Windows, macOS, and Linux
+ * Windows
+ * Bug 30800: ftp:// on Windows can be used to leak the system time zone
+ * OS X
+ * Bug 30126: Make Tor Browser on macOS compatible with Apple's notarization
+ * Bug 31702: Backport Mozilla's bug 1578075
+ * Linux
+ * Bug 31646: Update abicheck to require newer libstdc++.so.6
+ * Bug 31380: Snowflake does not start on older Linux systems
+ * Android
+ * Update Tor to 0.4.1.5
+ * Bug 31192: Support x86_64 target on Android
+ * Bug 30380: Cancel dormant by startup
+ * Bug 30943: Show version number on mobile
+ * Bug 31720: Enable website suggestions in address bar
+ * Build System
+ * All platforms
+ * Bug 31621: Fix node bug that makes large writes to stdout fail
+ * Bug 27493: Clean up mozconfig options
+ * Bug 31308: Sync mozconfig files used in tor-browser over to tor-browser-build for esr68
+ * Windows
+ * Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser
+ * Bug 31538: Windows bundles based on ESR 68 are not built reproducibly
+ * Bug 31584: Clean up mingw-w64 project
+ * Bug 31596: Bump mingw-w64 version to pick up fix for #31567
+ * Bug 39187: Bump NSIS version to 3.04
+ * Bug 31732: Windows nightly builds are busted due to mingw-w64 commit bump
+ * Linux
+ * Bug 31448: gold and lld break linking 32bit Linux bundles
+ * Bug 31618: linux32 builds of Tor Browser 9.0a6 are not matching
+ * Bug 31450: Use still GCC for our ASan builds
+
Tor Browser 8.5.6 -- September 9 2019
* Android
* Update Torbutton to 2.1.14
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 9c85b4c..6b9a3cf 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 0.2.19.3
+version: 0.2.19.4
git_url: https://git.torproject.org/tor-launcher.git
git_hash: '[% c("version") %]'
gpg_keyring: torbutton.gpg
diff --git a/projects/tor/config b/projects/tor/config
index 9a735c2..7bec267 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.4.1.5
+version: 0.4.2.1-alpha
git_hash: 'tor-[% c("version") %]'
git_url: https://git.torproject.org/tor.git
git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index 008fab7..2fe2391 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '9.0a6'
- torbrowser_build: 'build4'
+ torbrowser_version: '9.0a7'
+ torbrowser_build: 'build1'
torbrowser_incremental_from:
- - 9.0a4
+ - 9.0a6
project_name: tor-browser
multi_lingual: 0
build_mar: 1
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs
by gk@torproject.org 27 Sep '19
by gk@torproject.org 27 Sep '19
27 Sep '19
commit 8fe3191e67d007cf35969d888453096bd823af76
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Thu Sep 26 01:13:52 2019 +0000
fixup! Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs
---
mobile/android/app/000-tor-browser-android.js | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index 2410706bb5f5..7fdf796e5caf 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -23,7 +23,6 @@ pref("webchannel.allowObject.urlWhitelist", "");
// Disable browser auto updaters
pref("app.update.auto", false);
-pref("app.update.enabled", false);
pref("browser.startup.homepage_override.mstone", "ignore");
// Clear data on quit
@@ -39,10 +38,6 @@ pref("privacy.clearOnShutdown.siteSettings",true);
// Disable Control media casting & mirroring features
pref("browser.casting.enabled", false);
-pref("browser.mirroring.enabled", false);
-
-// Disable autoplay
-pref("media.autoplay.enabled", false);
// controls if we want camera support
pref("device.camera.enabled", false);
@@ -62,3 +57,7 @@ pref("media.hls.enabled", false);
// Inherit locale from the OS, used for multi-locale builds
pref("intl.locale.requested", "");
+
+// Disable WebAuthn. It requires Google Play Services, so it isn't
+// available, but avoid any potential problems.
+pref("security.webauth.webauthn_enable_android_fido2", false);
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 27 Sep '19
by gk@torproject.org 27 Sep '19
27 Sep '19
commit 726047a459acf9d8c26fcfdd72584f0196dd60ce
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Fri Sep 27 19:37:42 2019 +0000
fixup! TB4: Tor Browser's Firefox preference overrides.
Bug 15563 - Disable ServiceWorkers on all platforms
---
browser/app/profile/000-tor-browser.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 09386d32a12c..1b936a3beb3d 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -119,6 +119,9 @@ pref("browser.pocket.api", "");
pref("browser.pocket.site", "");
pref("network.http.referer.hideOnionSource", true);
+// Disable ServiceWorkers by default
+pref("dom.serviceWorkers.enabled", false);
+
// Fingerprinting
pref("webgl.disable-extensions", true);
pref("webgl.disable-fail-if-major-performance-caveat", true);
1
0

27 Sep '19
commit 936f5d7ad170e4d0dddc141906f006a6273196c8
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Jan 28 09:24:01 2019 +0000
Bug 29187: Bump NSIS to 3.04
---
projects/nsis/config | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/nsis/config b/projects/nsis/config
index 81273ab..0e6f7ad 100644
--- a/projects/nsis/config
+++ b/projects/nsis/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 3.03
+version: 3.04
filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
var:
container:
@@ -16,7 +16,7 @@ input_files:
- project: container-image
- filename: 'nsis-[% c("version") %].tar.bz2'
URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2'
- sha256sum: abae7f4488bc6de7a4dd760d5f0e7cd3aad7747d4d7cd85786697c8991695eaa
+ sha256sum: 609536046c50f35cfd909dd7df2ab38f2e835d0da3c1048aa0d48c59c5a4f4f5
- filename: no-insert-timestamp.patch
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Update Torbutton to latest master
by gk@torproject.org 27 Sep '19
by gk@torproject.org 27 Sep '19
27 Sep '19
commit 13e5b02421dd03a5625091847608dd832466d98e
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Sep 27 19:29:49 2019 +0000
Update Torbutton to latest master
---
toolkit/torproject/torbutton | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index 2abe720e3f1d..a85133e2dc52 160000
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit 2abe720e3f1dbe1b49b41fe78719f318407babd0
+Subproject commit a85133e2dc52c707f936857402d4753d961c30f9
1
0
commit a85133e2dc52c707f936857402d4753d961c30f9
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Sep 27 19:27:45 2019 +0000
Update translations
---
chrome/locale/ar/torbutton.dtd | 2 +-
chrome/locale/bn-BD/torbutton.dtd | 6 +++---
chrome/locale/ca/torbutton.dtd | 4 ++--
chrome/locale/el/torbutton.dtd | 2 +-
chrome/locale/es-AR/torbutton.dtd | 8 ++++----
chrome/locale/fa/torbutton.dtd | 4 ++--
chrome/locale/fr/torbutton.dtd | 4 ++--
chrome/locale/he/torbutton.dtd | 10 +++++-----
chrome/locale/id/torbutton.dtd | 6 +++---
chrome/locale/ja/aboutTor.dtd | 8 ++++----
chrome/locale/ja/torbutton.dtd | 10 +++++-----
chrome/locale/ja/torbutton.properties | 4 ++--
chrome/locale/ko/torbutton.dtd | 14 +++++++-------
chrome/locale/mk/torbutton.dtd | 6 +++---
chrome/locale/nl/torbutton.dtd | 10 +++++-----
chrome/locale/pt-BR/torbutton.dtd | 2 +-
chrome/locale/ro/torbutton.dtd | 3 ++-
chrome/locale/ru/torbutton.dtd | 2 +-
chrome/locale/tr/torbutton.dtd | 2 +-
chrome/locale/zh-TW/torbutton.dtd | 6 +++---
20 files changed, 57 insertions(+), 56 deletions(-)
diff --git a/chrome/locale/ar/torbutton.dtd b/chrome/locale/ar/torbutton.dtd
index 015fddfa..ec8a3c9c 100644
--- a/chrome/locale/ar/torbutton.dtd
+++ b/chrome/locale/ar/torbutton.dtd
@@ -31,7 +31,7 @@
<!ENTITY torbutton.prefs.sec_safest_label "الأكثر أمنا">
<!ENTITY torbutton.prefs.sec_safest_description "اسمح فقط بالخصائص المطلوبة للمواقع غير الديناميكية والخدمات الأساسية. تؤثر هذه التغييرات على الصور والوسائط والنصوص البرمجية.">
<!ENTITY torbutton.prefs.sec_safest_list_label "في الإعداد الأكثر أمنا:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "تعرف على المزيد">
+<!ENTITY torbutton.prefs.sec_learn_more_label "تعرّف على المزيد">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "تعطل جافا سكربت على المواقع التي لا تستخدم HTTPS">
<!ENTITY torbutton.prefs.sec_js_disabled "تعطل جافا سكربت مبدئيا على جميع المواقع.">
<!ENTITY torbutton.prefs.sec_limit_typography "تعطّل بعض الخطوط والرموز الرياضية.">
diff --git a/chrome/locale/bn-BD/torbutton.dtd b/chrome/locale/bn-BD/torbutton.dtd
index 118a4866..cd7491ed 100644
--- a/chrome/locale/bn-BD/torbutton.dtd
+++ b/chrome/locale/bn-BD/torbutton.dtd
@@ -28,15 +28,15 @@
<!ENTITY torbutton.prefs.sec_safer_label "নিরাপদ">
<!ENTITY torbutton.prefs.sec_safer_description "ওয়েবসাইটের বৈশিষ্ট্যগুলি প্রায়ই বিপজ্জনক করে, যা কিছু সাইটগুলি কার্যকারিতা হারাতে বাধা দেয়।">
<!ENTITY torbutton.prefs.sec_safer_list_label "নিরাপদ সেটিংসে:">
-<!ENTITY torbutton.prefs.sec_safest_label "সবচে’ নিরাপদ">
+<!ENTITY torbutton.prefs.sec_safest_label "নিরাপদ">
<!ENTITY torbutton.prefs.sec_safest_description "শুধুমাত্র স্থায়ী সাইট এবং মৌলিক পরিষেবাগুলির জন্য প্রয়োজনীয় ওয়েবসাইট বৈশিষ্ট্যগুলি মঞ্জুরি দেয় এই পরিবর্তনগুলি ইমেজ, মিডিয়া এবং স্ক্রিপ্টগুলি প্রভাবিত করে।">
<!ENTITY torbutton.prefs.sec_safest_list_label "নিরাপদ সেটিং এ:">
<!ENTITY torbutton.prefs.sec_learn_more_label "আরও জানুন">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Non-HTTPS সাইটগুলিতে জাভাস্ক্রিপ্ট অক্ষম করা আছে।">
-<!ENTITY torbutton.prefs.sec_js_disabled "স্বয়ংক্রিয়ভাবে সকল সাইটে জাভাস্ক্রিপ্ট নিষ্ক্রিয়কৃত।">
+<!ENTITY torbutton.prefs.sec_js_disabled "জাভাস্ক্রিপ্ট সব সাইটে ডিফল্ট দ্বারা নিষ্ক্রিয় করা হয়।">
<!ENTITY torbutton.prefs.sec_limit_typography "কিছু ফন্ট এবং গণিত চিহ্ন অক্ষম আছে।">
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "কিছু ফন্ট, আইকন, গণিত প্রতীক এবং ছবি অক্ষম রয়েছে।">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "অডিও ও ভিডিও (এইচটিএমএল5 মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "অডিও ও ভিডিও (এইচটিএমএল৫ মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন">
<!ENTITY torbutton.prefs.sec_custom_warning "পছন্দসই">
<!ENTITY torbutton.prefs.sec_overview "আপনার নিরাপত্তা এবং গোপনীয়তা আক্রমণ করতে ব্যবহার করা যেতে পারে এমন কিছু ওয়েব বৈশিষ্ট্য অক্ষম করুন।">
<!ENTITY torbutton.prefs.sec_standard_tooltip "নিরাপত্তা স্তর: স্ট্যান্ডার্ড">
diff --git a/chrome/locale/ca/torbutton.dtd b/chrome/locale/ca/torbutton.dtd
index e7434a76..4d4c2790 100644
--- a/chrome/locale/ca/torbutton.dtd
+++ b/chrome/locale/ca/torbutton.dtd
@@ -25,13 +25,13 @@
<!ENTITY torbutton.prefs.sec_caption_tooltip "El control lliscant de seguretat permet deshabilitar característiques del navegador que poden permetre vulnerabilitats en atemptats de furoners.">
<!ENTITY torbutton.prefs.sec_standard_label "Estàndard">
<!ENTITY torbutton.prefs.sec_standard_description "Totes les característiques del buscador Tor i de la pàgina web estan actives.">
-<!ENTITY torbutton.prefs.sec_safer_label "Més segur">
+<!ENTITY torbutton.prefs.sec_safer_label "Més segur.">
<!ENTITY torbutton.prefs.sec_safer_description "Desactivar les funcions del lloc web que sovint són perilloses, pot fent que alguns llocs perden funcionalitat.">
<!ENTITY torbutton.prefs.sec_safer_list_label "A la configuració més segura:">
<!ENTITY torbutton.prefs.sec_safest_label "més segur">
<!ENTITY torbutton.prefs.sec_safest_description "Només es permeten funcions del lloc web requerides per a llocs estàtics i serveis bàsics. Aquests canvis afecten imatges, mitjans de comunicació i scripts.">
<!ENTITY torbutton.prefs.sec_safest_list_label "A la configuració més segura:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Aprèn més">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Apreneu-ne més">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "El JavaScript està desactivat per defecte en tots els llocs no-HTTPS">
<!ENTITY torbutton.prefs.sec_js_disabled "El JavaScript està desactivat per defecte a tots els llocs.">
<!ENTITY torbutton.prefs.sec_limit_typography "Algunes fonts i símbols matemàtics estan desactivats. ">
diff --git a/chrome/locale/el/torbutton.dtd b/chrome/locale/el/torbutton.dtd
index d2e51f99..7c5deb34 100644
--- a/chrome/locale/el/torbutton.dtd
+++ b/chrome/locale/el/torbutton.dtd
@@ -31,7 +31,7 @@
<!ENTITY torbutton.prefs.sec_safest_label "Ασφαλέστατο">
<!ENTITY torbutton.prefs.sec_safest_description "Επιτρέπει μόνο τις παροχές ιστοσελίδας που απαιτούνται για βασικές ιστοσελίδες και υπηρεσίες. Αυτό επηρεάζει εικόνες, μέσα και scripts.">
<!ENTITY torbutton.prefs.sec_safest_list_label "Στην πιο ασφαλή ρύθμιση:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Μάθε περισσότερα">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Μάθετε περισσότερα">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Η JavaScript είναι απενεργοποιημένη σε ιστότοπους που δεν είναι HTTPS.">
<!ENTITY torbutton.prefs.sec_js_disabled "Η JavaScript είναι απενεργοποιημένη σε όλους τους ιστότοπους ως προεπιλογή.">
<!ENTITY torbutton.prefs.sec_limit_typography "Μερικές γραμματοσειρές και μαθηματικά σύμβολα είναι απενεργοποιημένα.">
diff --git a/chrome/locale/es-AR/torbutton.dtd b/chrome/locale/es-AR/torbutton.dtd
index b45d0e84..8adc028a 100644
--- a/chrome/locale/es-AR/torbutton.dtd
+++ b/chrome/locale/es-AR/torbutton.dtd
@@ -21,17 +21,17 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas salvo las protegidas ">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger nuevas Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger nuevas Cookies">
-<!ENTITY torbutton.prefs.sec_caption "Nivel de Seguridad">
+<!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad">
<!ENTITY torbutton.prefs.sec_caption_tooltip "La regla deslizante de Seguridad te deja deshabilitar ciertas características del navegador que pueden hacerlo más vulnerable a intentos de apropiación.">
<!ENTITY torbutton.prefs.sec_standard_label "Estándar">
-<!ENTITY torbutton.prefs.sec_standard_description "Todas las características del Navegador Tor y el sitio web están habilitadas.">
+<!ENTITY torbutton.prefs.sec_standard_description "Todas las características del navegador Tor y el sitio web están habilitadas.">
<!ENTITY torbutton.prefs.sec_safer_label "Más seguro">
<!ENTITY torbutton.prefs.sec_safer_description "Deshabilita características del sitio web que son a menudo peligrosas, causando que algunos sitios pierdan funcionalidad.">
<!ENTITY torbutton.prefs.sec_safer_list_label "En el ajuste "Más seguro":">
-<!ENTITY torbutton.prefs.sec_safest_label "El más seguro">
+<!ENTITY torbutton.prefs.sec_safest_label "En extremo seguro">
<!ENTITY torbutton.prefs.sec_safest_description "Sólo permite características del sitio web requeridas por sitios estáticos y servicios básicos. Estos cambios afectan imágenes, medios y código ejecutable.">
<!ENTITY torbutton.prefs.sec_safest_list_label "En el ajuste "En extremo seguro":">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Aprendé más">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Más informacion">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está deshabilitado en sitios no-HTTPS.">
<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está deshabilitado por defecto en todos los sitios.">
<!ENTITY torbutton.prefs.sec_limit_typography "Algunos tipos de letra y símbolos matemáticos están deshabilitados.">
diff --git a/chrome/locale/fa/torbutton.dtd b/chrome/locale/fa/torbutton.dtd
index 5883e8ef..93daabb0 100644
--- a/chrome/locale/fa/torbutton.dtd
+++ b/chrome/locale/fa/torbutton.dtd
@@ -25,10 +25,10 @@
<!ENTITY torbutton.prefs.sec_caption_tooltip "نوار لغزنده امنیتی به شما اجازه میدهد که مشخصههای خاص مرورگر را غیرفعال کنید که ممکن است مرورگر شما را در برابر تلاشهای هک آسیبپذیر سازد.">
<!ENTITY torbutton.prefs.sec_standard_label "استاندارد">
<!ENTITY torbutton.prefs.sec_standard_description "همه مرورگر تور و ویژگیهای وبسایت به کار انداخته شدهاند.">
-<!ENTITY torbutton.prefs.sec_safer_label "ایمن تر">
+<!ENTITY torbutton.prefs.sec_safer_label "ایمن تر ">
<!ENTITY torbutton.prefs.sec_safer_description "از کار انداختن ویژگیهای وبسایت که اغلب خطرناک هستند و باعث از دست رفتن برخی سایتها میشوند.">
<!ENTITY torbutton.prefs.sec_safer_list_label "تنظیم مکانی امنتر:">
-<!ENTITY torbutton.prefs.sec_safest_label "ایمن ترین">
+<!ENTITY torbutton.prefs.sec_safest_label "ایمن ترین ">
<!ENTITY torbutton.prefs.sec_safest_description "تنها اجازه میدهد که ویژگیهای وبسایت برای سایتهای ایستا و خدمات پایه مورد نیاز باشد. این تغییرات بر تصاویر، رسانهها و متن تاثیر میگذارند.">
<!ENTITY torbutton.prefs.sec_safest_list_label "تنظیم امنترین مکان">
<!ENTITY torbutton.prefs.sec_learn_more_label "اطلاعات بیشتر">
diff --git a/chrome/locale/fr/torbutton.dtd b/chrome/locale/fr/torbutton.dtd
index ed86525a..68d9b5f8 100644
--- a/chrome/locale/fr/torbutton.dtd
+++ b/chrome/locale/fr/torbutton.dtd
@@ -38,12 +38,12 @@
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Certaines polices, icônes, images et certains symboles mathématiques sont désactivés.">
<!ENTITY torbutton.prefs.sec_click_to_play_media "Le son et la vidéo (médias HTML5) ainsi que WebGL sont « cliquer pour lire ».">
<!ENTITY torbutton.prefs.sec_custom_warning "Personnalisé">
-<!ENTITY torbutton.prefs.sec_overview "Désactive certaines fonctions Web qui peuvent être utilisées pour attaquer votre sécurité et votre anonymat.">
+<!ENTITY torbutton.prefs.sec_overview "Désactives certaines fonctions Web qui peuvent être utilisées pour attaquer votre sécurité et votre anonymat.">
<!ENTITY torbutton.prefs.sec_standard_tooltip "Niveau de sécurité : normal">
<!ENTITY torbutton.prefs.sec_safer_tooltip "Niveau de sécurité : plus sûr">
<!ENTITY torbutton.prefs.sec_safest_tooltip "Niveau de sécurité : le plus sûr">
<!ENTITY torbutton.prefs.sec_custom_summary "Les préférences personnalisées de votre navigateur ont entraîné des paramètres de sécurité inhabituels. Pour des raisons de sécurité et de protection des données personnelles, nous vous recommandons de choisir un des niveaux de sécurité par défaut.">
<!ENTITY torbutton.prefs.sec_restore_defaults "Rétablir les paramètres par défaut">
<!ENTITY torbutton.prefs.sec_advanced_security_settings "Paramètres de sécurité avancés…">
-<!ENTITY torbutton.circuit_display.title "Circuit Tor">
+<!ENTITY torbutton.circuit_display.title "Circuit Tor">
<!ENTITY torbutton.circuit_display.new_circuit "Nouveau circuit pour ce site">
diff --git a/chrome/locale/he/torbutton.dtd b/chrome/locale/he/torbutton.dtd
index 77527559..befc9fdc 100644
--- a/chrome/locale/he/torbutton.dtd
+++ b/chrome/locale/he/torbutton.dtd
@@ -23,12 +23,12 @@
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "אל תגן על עוגיות חדשות">
<!ENTITY torbutton.prefs.sec_caption "רמת אבטחה">
<!ENTITY torbutton.prefs.sec_caption_tooltip "מחוון האבטחה נותן לך להשבית תכונות דפדפן מסוימות אשר עלולות לעשות את הדפדפן שלך יותר פגיע לנסיונות פיצוח.">
-<!ENTITY torbutton.prefs.sec_standard_label "תקנית">
-<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתר מאופשרים.">
-<!ENTITY torbutton.prefs.sec_safer_label "בטוחה יותר">
+<!ENTITY torbutton.prefs.sec_standard_label "תקני">
+<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתר מושבתים.">
+<!ENTITY torbutton.prefs.sec_safer_label "בטוח יותר">
<!ENTITY torbutton.prefs.sec_safer_description "משבית מאפייני אתר שמסוכנים לעיתים קרובות, מה שגורם למספר אתרים לאבד תפקודיות.">
<!ENTITY torbutton.prefs.sec_safer_list_label "בהגדרה הבטוחה יותר:">
-<!ENTITY torbutton.prefs.sec_safest_label "הכי בטוחה">
+<!ENTITY torbutton.prefs.sec_safest_label "הכי בטוח">
<!ENTITY torbutton.prefs.sec_safest_description "מתיר רק למאפייני אתר הדרושים עבור אתרים נייחים ושירותים יסודיים. שינויים אלו משפיעים על תמונות, מדיה ותסריטים.">
<!ENTITY torbutton.prefs.sec_safest_list_label "בהגדרה הבטוחה ביותר:">
<!ENTITY torbutton.prefs.sec_learn_more_label "למד עוד">
@@ -36,7 +36,7 @@
<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript מושבת כברירת מחדל בכל האתרים.">
<!ENTITY torbutton.prefs.sec_limit_typography "מספר גופנים וסמלים מתמטיים מושבתים.">
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "מספר גופנים, צלמיות, סמלים מתמטיים ותמונות מושבתים.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "שמע, וידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "שמע ווידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן.">
<!ENTITY torbutton.prefs.sec_custom_warning "מותאמת אישית">
<!ENTITY torbutton.prefs.sec_overview "השבת מאפייני אתר מסוימים אשר יכולים לשמש כדי לתקוף את אבטחתך ואלמוניותך.">
<!ENTITY torbutton.prefs.sec_standard_tooltip "רמת אבטחה: תקנית">
diff --git a/chrome/locale/id/torbutton.dtd b/chrome/locale/id/torbutton.dtd
index 414a7554..4d0aa1e7 100644
--- a/chrome/locale/id/torbutton.dtd
+++ b/chrome/locale/id/torbutton.dtd
@@ -29,11 +29,11 @@
<!ENTITY torbutton.prefs.sec_safer_description "Menonaktifkan fitur-fitur situs web yang sering berbahaya, ini akan membuat beberapa situs kehilangan fungsionalitas.">
<!ENTITY torbutton.prefs.sec_safer_list_label "Di pengaturan yang lebih aman:">
<!ENTITY torbutton.prefs.sec_safest_label "Paling aman">
-<!ENTITY torbutton.prefs.sec_safest_description "Hanya mengizinkan fitur-fitur situs web yang diperlukan untuk menjalankan situs web statis dan layanan dasar. Perubahan ini mempengaruhi gambar, media, dan skrip.">
+<!ENTITY torbutton.prefs.sec_safest_description "Hanya menjalankan fitur-fitur situs yang diperlukan untuk menjalankan situs web statis dan servis dasar. Perubahan ini mempengaruhi gambar, media, dan skrip.">
<!ENTITY torbutton.prefs.sec_safest_list_label "Di pengaturan yang paling aman:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Pelajari Selengkapnya">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Pelajari lebih lanjut">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript dinonaktifkan di semua situs non-HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript dinonaktifkan secara bawaan di semua situs.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript dinonaktifkan secara default di semua situs.">
<!ENTITY torbutton.prefs.sec_limit_typography "Beberapa font dan simbol matematika dinonaktifkan.">
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Beberapa font, icon, simbol matematika, dan gambar dinonaktifkan.">
<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio dan video (media HTML5), dan WebGL dijalankan saat diklik.">
diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd
index 339848eb..b657853f 100644
--- a/chrome/locale/ja/aboutTor.dtd
+++ b/chrome/locale/ja/aboutTor.dtd
@@ -22,11 +22,11 @@
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser マニュアル">
-<!ENTITY aboutTor.tor_mission.label "Torプロジェクトはフリーオープンソース匿名性やプライバシーソフトウェアの開発と展開によって人権や自由の向上に尽力するUS 501(c)(3)非営利団体である。ソフトウェアへの無制限アクセスと利用をサポート、そしてその科学的と国民の理解を深めたいと思います。">
-<!ENTITY aboutTor.getInvolved.label "参加しよう!»">
+<!ENTITY aboutTor.tor_mission.label "Tor Project はフリー・オープンソースの匿名性技術・プライバシー技術の開発と展開によって人権と自由を向上し、その制限されない有効性と利用を支援し、また、人々の正確な理解を促進している US 501(c)(3) 非営利団体です。">
+<!ENTITY aboutTor.getInvolved.label "参加しよう »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.newsletter.tagline "Torからの最新ニュースを受信トレイに。">
-<!ENTITY aboutTor.newsletter.link_text "Torニュースにを申し込む。">
+<!ENTITY aboutTor.newsletter.tagline "Tor からの最新ニュースを受信トレイに。">
+<!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。">
<!ENTITY aboutTor.donationBanner.line2e "Tor を強く保つ。">
<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付">
diff --git a/chrome/locale/ja/torbutton.dtd b/chrome/locale/ja/torbutton.dtd
index 321a052b..1894af5d 100644
--- a/chrome/locale/ja/torbutton.dtd
+++ b/chrome/locale/ja/torbutton.dtd
@@ -2,7 +2,7 @@
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "このサイト用の新しい Tor サーキット">
<!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.networksettings "Tor ネットワークの設定...">
+<!ENTITY torbutton.context_menu.networksettings "Tor ネットワークの設定…">
<!ENTITY torbutton.context_menu.networksettings.key "N">
<!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser のアップデートを確認">
<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
@@ -31,19 +31,19 @@
<!ENTITY torbutton.prefs.sec_safest_label "最も安全">
<!ENTITY torbutton.prefs.sec_safest_description "静的なサイトと基本的なサービスに必要な機能だけを許可します。この変更は画像、メディア、スクリプトに影響します。">
<!ENTITY torbutton.prefs.sec_safest_list_label "「最も安全」設定では:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "さらに知る">
+<!ENTITY torbutton.prefs.sec_learn_more_label "詳細情報">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "HTTPS非対応のサイトで JavaScript が無効化されます。">
<!ENTITY torbutton.prefs.sec_js_disabled "すべてのサイトで JavaScript が無効化されます。">
<!ENTITY torbutton.prefs.sec_limit_typography "いくつかのフォントと数学記号が無効化されます。">
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "いくつかのアイコン、数学記号および画像が無効化されます。">
<!ENTITY torbutton.prefs.sec_click_to_play_media "オーディオ、ビデオ(HTML5メディア)、WebGLはクリックすると再生されます。">
<!ENTITY torbutton.prefs.sec_custom_warning "カスタム">
-<!ENTITY torbutton.prefs.sec_overview "セキュリティと匿名性を攻撃するために利用されるあるウェブ機能を無効にする。">
+<!ENTITY torbutton.prefs.sec_overview "セキュリティと匿名性を攻撃するために利用される可能性のあるウェブ機能を無効化します。">
<!ENTITY torbutton.prefs.sec_standard_tooltip "セキュリティレベル:標準">
-<!ENTITY torbutton.prefs.sec_safer_tooltip "セキュリティレベル:やや安全">
+<!ENTITY torbutton.prefs.sec_safer_tooltip "セキュリティレベル:より安全">
<!ENTITY torbutton.prefs.sec_safest_tooltip "セキュリティレベル:最も安全">
<!ENTITY torbutton.prefs.sec_custom_summary "あなたのブラウザーにおけるカスタム設定はセキュリティ結果に影響を及ぼしません。セキュリティとプライバシーに関してはデフォルトのセキュリティレベルのひとつを選択することをおすすめいたします。">
<!ENTITY torbutton.prefs.sec_restore_defaults "デフォルトにもどす">
-<!ENTITY torbutton.prefs.sec_advanced_security_settings "詳細セキュリティ設定...">
+<!ENTITY torbutton.prefs.sec_advanced_security_settings "詳細セキュリティ設定…">
<!ENTITY torbutton.circuit_display.title "Tor サーキット">
<!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使用する">
diff --git a/chrome/locale/ja/torbutton.properties b/chrome/locale/ja/torbutton.properties
index daf9abd4..b30ecc3c 100644
--- a/chrome/locale/ja/torbutton.properties
+++ b/chrome/locale/ja/torbutton.properties
@@ -56,5 +56,5 @@ profileMigrationFailed=存在しているプロファイル %S へのマイグ
updateDownloadingPanelUILabel=%S 更新をダウンロードしています
# .Onion Page Info prompt. Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=接続は暗号化された(オニオンサービス、%1$S, %2$S ビットキー、 %3$S)
-pageInfo_OnionEncryption=接続は暗号化された(オニオンサービス)
+pageInfo_OnionEncryptionWithBitsAndProtocol=接続が暗号化されています (Onionサービス、%1$S、鍵長 %2$S bit、%3$S)
+pageInfo_OnionEncryption=接続が暗号化されています (Onionサービス)
diff --git a/chrome/locale/ko/torbutton.dtd b/chrome/locale/ko/torbutton.dtd
index 605c01e8..52d981bc 100644
--- a/chrome/locale/ko/torbutton.dtd
+++ b/chrome/locale/ko/torbutton.dtd
@@ -24,18 +24,18 @@
<!ENTITY torbutton.prefs.sec_caption "보안 등급">
<!ENTITY torbutton.prefs.sec_caption_tooltip "보안 슬라이더를 사용하면 특정 브라우저 기능이 비활성화 되어 브라우저가 해킹 시도에 취약해질 수 있습니다.">
<!ENTITY torbutton.prefs.sec_standard_label "표준">
-<!ENTITY torbutton.prefs.sec_standard_description "모든 Tor 브라우저와 웹사이트의 기능들이 활성화됩니다.">
+<!ENTITY torbutton.prefs.sec_standard_description "모든 Tor 브라우저와 웹사이트의 기능들이 활성화 됩니다.">
<!ENTITY torbutton.prefs.sec_safer_label "더 안전합니다">
-<!ENTITY torbutton.prefs.sec_safer_description "이 설정을 하여 흔히 위험한 웹사이트의 기능이 비활성화하면, 일부 사이트의 기능들을 사용할 수 없습니다.">
+<!ENTITY torbutton.prefs.sec_safer_description "이 설정으로 흔히 위험한 웹사이트의 기능이 비활성화하면 일부의 사이트의 기능들을 사용 할 수 없습니다.">
<!ENTITY torbutton.prefs.sec_safer_list_label "더 안전한 설정을 선택하고 있습니다:">
<!ENTITY torbutton.prefs.sec_safest_label "제일 안전합니다">
-<!ENTITY torbutton.prefs.sec_safest_description "정적 사이트와 기본 서비스에 필요한 기능에만 허용됩니다. 이 변경사항들은 이미지, 미디어, 스크립트에 영향을 줍니다.">
+<!ENTITY torbutton.prefs.sec_safest_description "정적 사이트와 기본 서비스에 필요한 기능이만 용남합니다. 그 변경들은 사진이며 메디아며 스크립트를 영향할 것입니다.">
<!ENTITY torbutton.prefs.sec_safest_list_label "제일 안전한 설정을 선택하고 있습니다:">
<!ENTITY torbutton.prefs.sec_learn_more_label "더 알아보기">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "HTTPS을 적용되지 않은 사이트에서는 JavaScript가 비활성화됩니다.">
-<!ENTITY torbutton.prefs.sec_js_disabled "기본 설정으로 모든 사이트에서 자바스크립트는 비활성화되어 있습니다.">
-<!ENTITY torbutton.prefs.sec_limit_typography "일부 글꼴과 수학기호가 비활성화됩니다.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "일부 글꼴과 아이콘, 수학기호, 이미지는 비활성화 됩니다.">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript가 HTTPS을 적용되지 않은 사이트에서 비활성화 됩니다.">
+<!ENTITY torbutton.prefs.sec_js_disabled "자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다.">
+<!ENTITY torbutton.prefs.sec_limit_typography "일부 글꼴이며 수학기호가 비활성화 됩니다.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "일부 글꼴이며 상징이며 수학기호며 사진이 비활성화 됩니다.">
<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play.">
<!ENTITY torbutton.prefs.sec_custom_warning "사용자 맞춤">
<!ENTITY torbutton.prefs.sec_overview "보안과 익명성을 공격하는 데 사용될 수 있는 특정한 웹의 기능을 해제합니다.">
diff --git a/chrome/locale/mk/torbutton.dtd b/chrome/locale/mk/torbutton.dtd
index f4a1aa14..677300f0 100644
--- a/chrome/locale/mk/torbutton.dtd
+++ b/chrome/locale/mk/torbutton.dtd
@@ -26,10 +26,10 @@
<!ENTITY torbutton.prefs.sec_standard_label "Стандардно">
<!ENTITY torbutton.prefs.sec_standard_description "Сите можности на Tor Browser и веб страните се овозможени.">
<!ENTITY torbutton.prefs.sec_safer_label "Побезбедно">
-<!ENTITY torbutton.prefs.sec_safer_description "Оневозможува можности на веб страните кои често се опасни, сепак воедно предизвикувајќи некои веб страни да ја изгубат функционалноста.">
+<!ENTITY torbutton.prefs.sec_safer_description "Оневозможува можности на веб страните кои често се опасни, предизвикувајќи некои страни да ја изгубат функционалноста.">
<!ENTITY torbutton.prefs.sec_safer_list_label "На побезбедна поставка:">
<!ENTITY torbutton.prefs.sec_safest_label "Најбезбедно">
-<!ENTITY torbutton.prefs.sec_safest_description "Дозволува само можности на веб страните потребни за статичните страни и основните услужни сервиси. Овие измени влијаат на сликите, разни мултимедијални датотеки, и скрипти.">
+<!ENTITY torbutton.prefs.sec_safest_description "Дозволува само можности на веб страните потребни за статичните страни и основните услужни сервиси. Овие измени влијаат на сликите, разни мултимедијални датотеки, и на скрптите.">
<!ENTITY torbutton.prefs.sec_safest_list_label "На најбезбедна поставка:">
<!ENTITY torbutton.prefs.sec_learn_more_label "Научи повеќе">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript е оневозможен на не-HTTPS веб страните.">
@@ -44,6 +44,6 @@
<!ENTITY torbutton.prefs.sec_safest_tooltip "Безбедносно ниво: Најбезбедно">
<!ENTITY torbutton.prefs.sec_custom_summary "Вашите прилагодени својства на прелистувачот резултираа со невообичаени безбедносни поставки. Од причини поврзани со безбедноста и приватноста, ви препорачуваме да ги изберете почетните безбедносни нивоа.">
<!ENTITY torbutton.prefs.sec_restore_defaults "Врати на стандардно">
-<!ENTITY torbutton.prefs.sec_advanced_security_settings "Напредни Безбедносни Поставки">
+<!ENTITY torbutton.prefs.sec_advanced_security_settings "Напредни Безбедносни Поставки...">
<!ENTITY torbutton.circuit_display.title "Tor круг">
<!ENTITY torbutton.circuit_display.new_circuit "Нов круг за оваа веб страна">
diff --git a/chrome/locale/nl/torbutton.dtd b/chrome/locale/nl/torbutton.dtd
index 3ab23642..a84bf230 100644
--- a/chrome/locale/nl/torbutton.dtd
+++ b/chrome/locale/nl/torbutton.dtd
@@ -29,14 +29,14 @@
<!ENTITY torbutton.prefs.sec_safer_description "Schakelt websitefuncties uit die vaak gevaarlijk zijn, waardoor sommige websites functionaliteit verliezen.">
<!ENTITY torbutton.prefs.sec_safer_list_label "Op de veiliger instelling:">
<!ENTITY torbutton.prefs.sec_safest_label "Veiligste">
-<!ENTITY torbutton.prefs.sec_safest_description "Staat alleen websitefuncties toe die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts.">
+<!ENTITY torbutton.prefs.sec_safest_description "Alleen websitefuncties toestaan die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts.">
<!ENTITY torbutton.prefs.sec_safest_list_label "Op de veiligste instelling:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Meer info">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is uitgeschakeld op niet-HTTPS-websites.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is standaard uitgeschakeld op alle websites.">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Leer Meer">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript zijn uitgeschakeld op non-HTTP sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "Javascript zijn standaard uitgeschakeld op alle sites.">
<!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld.">
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) zijn klikken-voor-afspelen.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) en WebGL zijn klikken-voor-afspelen.">
<!ENTITY torbutton.prefs.sec_custom_warning "Aangepast">
<!ENTITY torbutton.prefs.sec_overview "Bepaalde websitefuncties uitschakelen die kunnen worden gebruikt om uw beveiliging en anonimiteit aan te vallen.">
<!ENTITY torbutton.prefs.sec_standard_tooltip "Beveiligingsniveau: standaard">
diff --git a/chrome/locale/pt-BR/torbutton.dtd b/chrome/locale/pt-BR/torbutton.dtd
index 10fd6924..632a814d 100644
--- a/chrome/locale/pt-BR/torbutton.dtd
+++ b/chrome/locale/pt-BR/torbutton.dtd
@@ -31,7 +31,7 @@
<!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima">
<!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts.">
<!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Saber mais">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS.">
<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites.">
<!ENTITY torbutton.prefs.sec_limit_typography "Algumas fontes e símbolos matemáticos estão desativados.">
diff --git a/chrome/locale/ro/torbutton.dtd b/chrome/locale/ro/torbutton.dtd
index eb075065..e1ba1570 100644
--- a/chrome/locale/ro/torbutton.dtd
+++ b/chrome/locale/ro/torbutton.dtd
@@ -38,7 +38,8 @@
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Unele fonturi, pictograme, simboluri matematice și imagini sunt dezactivate.">
<!ENTITY torbutton.prefs.sec_click_to_play_media "Fișierele audio și video (HTML5 media) și WebGL sunt pot fi redate la clic.">
<!ENTITY torbutton.prefs.sec_custom_warning "Personalizat">
-<!ENTITY torbutton.prefs.sec_overview "Dezactivează anuminte facilități web care pot fi folosite pentru a-ți ataca securitatea și anonimitatea.\n">
+<!ENTITY torbutton.prefs.sec_overview "Dezactivează anuminte facilități web care pot fi folosite pentru a-ți ataca securitatea și anonimitatea.
+">
<!ENTITY torbutton.prefs.sec_standard_tooltip "Nivel Securitate: Normal">
<!ENTITY torbutton.prefs.sec_safer_tooltip "Nivel Securitate: Sigur">
<!ENTITY torbutton.prefs.sec_safest_tooltip "Nivel Securitate: Prudent">
diff --git a/chrome/locale/ru/torbutton.dtd b/chrome/locale/ru/torbutton.dtd
index 08b03019..da471978 100644
--- a/chrome/locale/ru/torbutton.dtd
+++ b/chrome/locale/ru/torbutton.dtd
@@ -31,7 +31,7 @@
<!ENTITY torbutton.prefs.sec_safest_label "Наиболее безопасные">
<!ENTITY torbutton.prefs.sec_safest_description "Разрешены только функции веб-сайтов, требующиеся для статических сайтов и основных сервисов. Эти изменения влияют на изображения, медиа и скрипты.">
<!ENTITY torbutton.prefs.sec_safest_list_label "При самых безопасных настройках:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Узнать больше">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Подробнее">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only " JavaScript отключен на всех не HTTPS сайтах. ">
<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript отключен по умолчанию на всех сайтах.">
<!ENTITY torbutton.prefs.sec_limit_typography "Некоторые шрифты и математические символы отключены.">
diff --git a/chrome/locale/tr/torbutton.dtd b/chrome/locale/tr/torbutton.dtd
index a10c034d..1da81004 100644
--- a/chrome/locale/tr/torbutton.dtd
+++ b/chrome/locale/tr/torbutton.dtd
@@ -43,7 +43,7 @@
<!ENTITY torbutton.prefs.sec_safer_tooltip "Güvenlik Düzeyi : Daha Güvenli">
<!ENTITY torbutton.prefs.sec_safest_tooltip "Güvenlik Düzeyi : En Güvenli">
<!ENTITY torbutton.prefs.sec_custom_summary "Tarayıcınız standart olmayan özel güvenlik düzeyi ayarları kullanıyor. Güvenlik ve gizliliğinizi korumak için aşağıdaki varsayılan güvenlik ayarı düzeylerinden birini seçmeniz önerilir.">
-<!ENTITY torbutton.prefs.sec_restore_defaults "Varsayılanlara Sıfırla">
+<!ENTITY torbutton.prefs.sec_restore_defaults "Varsayılanları Yükle">
<!ENTITY torbutton.prefs.sec_advanced_security_settings "Gelişmiş Güvenlik Düzeyi Ayarları…">
<!ENTITY torbutton.circuit_display.title "Tor Devresi">
<!ENTITY torbutton.circuit_display.new_circuit "Bu Sitenin Devresini Yenile">
diff --git a/chrome/locale/zh-TW/torbutton.dtd b/chrome/locale/zh-TW/torbutton.dtd
index 2d85dbca..b9d9611f 100644
--- a/chrome/locale/zh-TW/torbutton.dtd
+++ b/chrome/locale/zh-TW/torbutton.dtd
@@ -21,17 +21,17 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "全部刪除,但受保護">
<!ENTITY torbutton.cookiedialog.saveAllCookies "保護新的 Cookie">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保護新的 Cookie">
-<!ENTITY torbutton.prefs.sec_caption "安全性等級">
+<!ENTITY torbutton.prefs.sec_caption "安全等級">
<!ENTITY torbutton.prefs.sec_caption_tooltip "此安全性調整滑棒會關閉某些瀏覽器的功能,導致您的瀏覽器更容易遭受駭客攻擊。">
<!ENTITY torbutton.prefs.sec_standard_label "標準">
-<!ENTITY torbutton.prefs.sec_standard_description "啟用 Tor 瀏覽器及網站的所有功能。">
+<!ENTITY torbutton.prefs.sec_standard_description "所有瀏覽器與網站的功能都啟用">
<!ENTITY torbutton.prefs.sec_safer_label "較安全">
<!ENTITY torbutton.prefs.sec_safer_description "停用某些功能,因為其有危險,會造成部份網站失能">
<!ENTITY torbutton.prefs.sec_safer_list_label "在較安全設定:">
<!ENTITY torbutton.prefs.sec_safest_label "最安全">
<!ENTITY torbutton.prefs.sec_safest_description "只同意靜態網站和基本服務的網站功能.這些變動會影響圖片,媒體和腳本.">
<!ENTITY torbutton.prefs.sec_safest_list_label "在最安全設定:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "了解更多">
+<!ENTITY torbutton.prefs.sec_learn_more_label "繼續閱讀">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "所有非HTTPS網站會預設停用JavaScript ">
<!ENTITY torbutton.prefs.sec_js_disabled "所有網站會預設停用JavaScript ">
<!ENTITY torbutton.prefs.sec_limit_typography "有些字型與數學符號被停用。">
1
0
commit e5db13e282265dc3441013fa308042976d9b2669
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Sep 27 17:36:49 2019 +0000
Release prep for 0.2.19.4
Version bump
---
src/install.rdf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/install.rdf b/src/install.rdf
index 8989427..5676e6d 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
<em:creator>The Tor Project, Inc.</em:creator>
<em:contributor>Pearl Crescent, LLC</em:contributor>
<em:id>tor-launcher(a)torproject.org</em:id>
- <em:version>0.2.19.3</em:version>
+ <em:version>0.2.19.4</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL>
<em:updateURL>data:text/plain,</em:updateURL>
1
0
commit 11229d9d6ad5a4be1d9fca479f0e5a6598bec69a
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Sep 27 17:35:39 2019 +0000
Update Translations
---
src/chrome/locale/ja/network-settings.dtd | 4 +-
src/chrome/locale/ml/network-settings.dtd | 68 +++++------
src/chrome/locale/ml/torlauncher.properties | 152 ++++++++++++-------------
src/chrome/locale/nb/torlauncher.properties | 10 +-
src/chrome/locale/nl/network-settings.dtd | 2 +-
src/chrome/locale/nl/torlauncher.properties | 108 +++++++++---------
src/chrome/locale/sk/torlauncher.properties | 2 +-
src/chrome/locale/ur/torlauncher.properties | 4 +-
src/chrome/locale/zh-TW/network-settings.dtd | 16 +--
src/chrome/locale/zh-TW/torlauncher.properties | 12 +-
10 files changed, 189 insertions(+), 189 deletions(-)
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 1f22ffa..40b8739 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -29,7 +29,7 @@
<!ENTITY torsettings.useProxy.type "ãããã·ã®çš®é¡:">
<!ENTITY torsettings.useProxy.type.placeholder "ãããã·ã®çš®é¡ãéžæ">
<!ENTITY torsettings.useProxy.address "ã¢ãã¬ã¹:">
-<!ENTITY torsettings.useProxy.address.placeholder "IPã¢ãã¬ã¹ ãŸãã¯ãã¹ãããŒã ">
+<!ENTITY torsettings.useProxy.address.placeholder "IP ã¢ãã¬ã¹ãŸãã¯ãã¹ãå">
<!ENTITY torsettings.useProxy.port "ããŒã">
<!ENTITY torsettings.useProxy.username "ãŠãŒã¶ãŒå:">
<!ENTITY torsettings.useProxy.password "ãã¹ã¯ãŒã:">
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Torã®ãã°ãã¯ãªããããŒãã«ã³ããŒ">
<!ENTITY torsettings.proxyHelpTitle "ãããã·ãã«ã">
-<!ENTITY torsettings.proxyHelp1 "äŒç€ŸãåŠæ ¡ã倧åŠçã®ãããã¯ãŒã¯ãéããŠæ¥ç¶ããå ŽåãããŒã«ã«ããã¯ã·ãå¿
èŠã«ãªãå ŽåããããŸãã ããã¯ã·ãå¿
èŠã§ãããã©ããããããªãå Žåã¯ãä»ã®ãã©ãŠã¶ã®ã€ã³ã¿ãŒãããèšå®ãèŠãããã·ã¹ãã ã®ãããã¯ãŒã¯èšå®ã確èªããŠãã ããã">
+<!ENTITY torsettings.proxyHelp1 "äŒç€ŸãåŠæ ¡ã倧åŠçã®ãããã¯ãŒã¯ãéããŠæ¥ç¶ããå ŽåãããŒã«ã«ãããã·ãå¿
èŠã«ãªãå ŽåããããŸãã ãããã·ãå¿
èŠã§ãããã©ããããããªãå Žåã¯ãä»ã®ãã©ãŠã¶ã®ã€ã³ã¿ãŒãããèšå®ãèŠãããã·ã¹ãã ã®ãããã¯ãŒã¯èšå®ã確èªããŠãã ããã">
<!ENTITY torsettings.bridgeHelpTitle "ããªããžãªã¬ãŒã®ãã«ã">
<!ENTITY torsettings.bridgeHelp1 "ããªããžãšã¯Torãããã¯ãŒã¯ãžã®æ¥ç¶ããããã¯ããããšãé£ããããããã®ãªã¹ããããŠããªããªã¬ãŒã§ãã  ããããã®çš®é¡ã®ããªããžã¯æ€é²ãé¿ããããã®ç°ãªãææ³ãå©çšããŠããŸãã  obfsã®ãã®ã¯ããªãã®ãã©ãã£ãã¯ãã©ã³ãã ãªãã€ãºã®ããã«èŠãããïŒmeekã®ãã®ã¯ããªãã®ãã©ãã£ãã¯ãTorã§ã¯ãªããã®ãµãŒãã¹ãžã®æ¥ç¶ã§ããããã«èŠããããŸãã">
diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd
index 986e8f4..93f3e79 100644
--- a/src/chrome/locale/ml/network-settings.dtd
+++ b/src/chrome/locale/ml/network-settings.dtd
@@ -9,54 +9,54 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click âConnectâ to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click âConfigureâ to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
+<!ENTITY torSettings.connectPrompt "àŽàµàޱàµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàŽŸàµ» àŽàŽ£àŽàµàŽàŽ¿àµœ àŽàµàŽ²àŽ¿àŽàµàŽàµ àŽàµàޝàµàŽ ">
+<!ENTITY torSettings.configurePrompt "àŽàµàµŒ àŽžàµàµ»àŽžàµŒ àŽàµàޝàµàŽ€àŽ¿àŽàµàŽàµà޳àµà޳ àŽ°àŽŸàŽàµàޝàŽàµàŽàŽ³àŽ¿àµœàŽªàµàŽàµàŽ (àŽ
àŽ€àŽŸàŽ¯àŽ€àµ àŽàŽàŽ¿àŽªàµàŽ€àµ , àŽàµàŽš , àŽ€àµàµŒàŽàµàŽàŽ¿ )àŽàŽ³àŽŸàŽ£àµ àŽšàŽ¿àŽàµàŽà޳àµàŽàµàŽàŽ¿àµœ àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽšàŽ¿àŽàµàŽàµŸ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàŽ€àµ àŽªàµàޱàµàŽàµàŽžàŽ¿ àŽàŽµàŽ¶àµàŽ¯àŽ®àµà޳àµà޳ àŽ°àµ àŽžàµà޵àŽàŽŸàŽ°àµàޝ àŽšàµàޱàµàŽµàµŒàŽàŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽàŽ£àµàŽàµàŽàŽ¿àµœ àŽšàµàޱàµàޱàµâàŽµàµŒàŽàµàŽàµ àŽžàµàޱàµàŽ±àŽ¿àŽàŽàµàŽžàŽ¿àµœ àŽ®àŽŸàŽ±àµàŽ±àŽ àŽµàŽ°àµàŽ€àµàŽ€àŽŸàµ» àŽàµàµºàŽ«àŽ¿àŽàµàµŒ àŽ¬àŽàµàŽàŽ£àŽ¿àµœ àŽàµàŽ²àŽ¿àŽàµàŽàµ àŽàµàޝàµàŽ ">
<!ENTITY torSettings.configure "àŽàµàŽ°àŽ®àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµ ">
-<!ENTITY torSettings.connect "Connect">
+<!ENTITY torSettings.connect "àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽ ">
<!-- Other: -->
-<!ENTITY torsettings.startingTor "Waiting for Tor to startâŠ">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.startingTor "àŽàµàµŒ àŽ€àµàŽàŽàµàŽàŽŸàµ» àŽàŽŸàŽ€àµàŽ€àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ ">
+<!ENTITY torsettings.restartTor "àŽàµàµŒ àŽàŽšàµàŽšàµàŽàµàŽàµ àŽ€àµàŽàŽàµàŽàµàŽ ">
<!ENTITY torsettings.reconfigTor "àŽªàµàŽšàŽàµŒàŽàµàŽ°àŽ®àµàŽàŽ°àŽ¿àŽàµàŽàµàŽ ">
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "àŽšàŽ¿àŽàµàŽàµŸ àŽàµàµŒ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽžàµ àŽ°àµàŽªàŽªàµàŽªàµàŽàµàŽ€àµàŽ€àŽ¿àŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽàŽ°àµ àŽžàŽŸàŽ§àŽŸàŽ°àŽ£ àŽªàµàްàµàŽàµàŽžàŽ¿ àŽžàµàޱàµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽàŽšàµàŽ±àµŒ àŽàµàޝàµàŽ€àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ &#160 àŽàµàޱàµàŽ®àŽŸàŽ¯àŽ¿ àŽàŽ°àµ àŽšàµàµŒ àŽ¬àŽšàµàŽ§àŽ àŽžàµàŽ¥àŽŸàŽªàŽ¿àŽàµàŽàŽŸàµ» àŽ àŽžàµàޱàµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽšàµàŽàµàŽàŽ àŽàµàޝàµàޝàµàŽ£àµàŽàŽ€àŽŸàŽ£àµ ">
+<!ENTITY torsettings.discardSettings.proceed "àŽžàµàޱàµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽšàµàŽàµàŽàŽ àŽàµàޝàµàŽ€àµ àŽ¬àŽšàµàŽ§àŽ àŽžàµàŽ¥àŽŸàŽªàŽ¿àŽàµàŽàµàŽ ">
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "àŽšàŽ¿àŽ°àµàŽ¬àŽšàµàŽ§àŽ®àŽ¿àŽ²àµàŽ²àŽŸàŽ€àµàŽ€àŽ€àµ ">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!ENTITY torsettings.useProxy.address "Address:">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
+<!ENTITY torsettings.useProxy.checkbox "àŽàŽŸàµ» àŽàŽšàµàŽ±àµŒàŽšàµàޱàµàŽ±àŽ¿àŽ²àµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàŽŸàµ» àŽàŽ°àµ àŽªàµàްàµàŽàµàŽžàŽ¿ àŽàŽªàŽ¯àµàŽàŽ¿àŽàµàŽàµàŽšàµàŽšàµ ">
+<!ENTITY torsettings.useProxy.type "àŽªàµàްàµàŽàµàŽžàŽ¿ àŽàŽšàŽ :">
+<!ENTITY torsettings.useProxy.type.placeholder "àŽàŽ°àµ àŽªàµàްàµàŽàµàŽžàŽ¿ àŽàŽšàŽ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ :">
+<!ENTITY torsettings.useProxy.address "àŽ®àµàµœàŽµàŽ¿àŽ²àŽŸàŽžàŽ :">
+<!ENTITY torsettings.useProxy.address.placeholder "àŽ àŽªàŽ¿ àŽ®àµàµœàŽµàŽ¿àŽ²àŽŸàŽžàŽ àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽ¹àµàŽžàµàޱàµàŽ±àµ àŽšàµàŽ¯àŽ¿àŽ ">
<!ENTITY torsettings.useProxy.port "Port:">
-<!ENTITY torsettings.useProxy.username "Username:">
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.username "àŽ¯àµàŽžàµŒ àŽšàµàŽ¯àŽ¿àŽ :">
+<!ENTITY torsettings.useProxy.password "àŽªàŽŸàŽžàµàŽžàµâàŽµàµàµŒàŽ¡àµâ ">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
-<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
+<!ENTITY torsettings.useProxy.type.http "àŽàŽàµ àŽàŽ¿ àŽàŽ¿ àŽªàŽ¿ /àŽàŽàµ àŽàŽ¿ àŽàŽ¿ àŽªàŽ¿ àŽàŽžàµ ">
+<!ENTITY torsettings.firewall.checkbox "àŽ àŽàŽàŽªàµàޝàµàŽàµàŽàµŒ àŽàŽ¿àŽ² àŽªàµàŽ°àŽ€àµàޝàµàŽ àŽªàµàµŒàŽàµàŽàµàŽàŽ³àŽ¿àŽ²àµàŽàµ àŽ®àŽŸàŽ€àµàŽ°àŽ àŽ¬àŽšàµàŽ§àŽ àŽ
àŽšàµàŽµàŽŠàŽ¿àŽàµàŽàµàŽšàµàŽš àŽ«àŽ¯àµŒàŽµàŽŸàµŸ àŽµàŽŽàŽ¿àŽ¯àŽŸàŽ£àµ àŽªàµàŽàµàŽšàµàŽšàŽ€àµ">
+<!ENTITY torsettings.firewall.allowedPorts "àŽ
àŽšàµàŽµàŽŠàŽ¿àŽàµàŽàŽ¿àŽàµàŽàµà޳àµà޳ àŽªàµàµŒàŽàµàŽàµàŽàµŸ ">
+<!ENTITY torsettings.useBridges.checkbox "àŽàŽšàµàŽ±àµ àŽ°àŽŸàŽàµàŽ¯àŽ€àµàŽ€àµ àŽàµàµŒ àŽžàµàµ»àŽžàµŒ àŽàµàޝàµàŽ€àŽ¿àŽàµàŽàµà޳àµàŽ³àŽ€àŽŸàŽ£àµ ">
+<!ENTITY torsettings.useBridges.default "àŽàŽ€àŽ¿àŽšàŽàŽ€àµàŽ€àµ àŽ€àŽšàµàŽšàµàޝàµà޳àµà޳ àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ ">
+<!ENTITY torsettings.useBridges.default.placeholder "àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ ">
+<!ENTITY torsettings.useBridges.bridgeDB "torproject.org àŽšàŽ¿àŽšàµàŽšàµàŽ àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽ ">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder " àŽàŽŸàŽ£àµàŽšàµàŽš àŽàŽ¿àŽ€àµàŽ°àŽ€àµàŽ€àŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽ
àŽàµàŽ·àŽ°àŽàµàŽàµŸ àŽàµàµŒàŽàµàŽàµàŽ ">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "àŽàŽ°àµ àŽªàµàŽ€àŽ¿àŽ¯ àŽà޹àµàŽµàŽŸàŽšàŽ àŽàµàޝàµàޝàµàŽ ">
<!ENTITY torsettings.useBridges.captchaSubmit "àŽžàŽ®àµŒàŽªàµàŽªàŽ¿àŽàµàŽàµàŽ ">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
-<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
+<!ENTITY torsettings.useBridges.custom "àŽàŽšàŽ¿àŽàµàŽàµ àŽ
àŽ±àŽ¿àŽ¯àŽŸàŽµàµàŽšàµàŽš àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽ€àŽ°àŽ¿àŽ ">
+<!ENTITY torsettings.useBridges.label "àŽµàŽ¿àŽ¶àµàŽµàŽžàŽ¿àŽàµàŽàŽŸàŽµàµàŽšàµàŽš àŽ¶àµàŽ°àŽ¿àŽ€àŽžàµàŽžàŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽàŽ¿àŽàµàŽàŽ¿àŽ¯ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµàŽ±àµ àŽµàŽ¿àŽµàŽ°àŽàµàŽàµŸ àŽàµàµŒàŽàµàŽàµàŽ ">
+<!ENTITY torsettings.useBridges.placeholder "àŽ
àŽ¡àµàŽ°àŽžàµ : àŽªàµàµŒàŽàµàŽàµ (àŽàŽ°àµ àŽµàŽ°àŽ¿àŽ¯àŽ¿àµœ àŽàްàµàŽ£àµàŽ£àŽ àŽàŽšàµàŽš àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àŽàµŸ àŽàµàµŒàŽàµàŽàµàŽ )">
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
+<!ENTITY torsettings.copyLog "àŽàµàµŒ àŽµàŽ¿àŽµàŽ°àŽªàµàŽªàŽàµàŽàŽ¿àŽ àŽàµàŽ³àŽ¿àŽªàµ àŽ¬àµàµŒàŽ¡àŽ¿àŽ²àµàŽàµàŽàµ àŽàµàµŒàŽàµàŽàµàŽ ">
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelpTitle "àŽªàµàްàµàŽàµàŽžàŽ¿ àŽžàŽ¹àŽŸàŽ¯àŽ ">
+<!ENTITY torsettings.proxyHelp1 "àŽàŽ®àµàŽªàŽšàŽ¿ , àŽžàµâàŽàµàµŸ àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽ¯àµàŽ£àŽ¿àŽµàµàŽŽàµàŽžàŽ¿àŽ±àµàŽ±àŽ¿ àŽàŽšàµàŽšàŽ¿àŽµàŽ¿àŽàŽàµàŽàŽ³àŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽ±àµàޱàµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽ®àµàŽªàµàµŸ àŽàŽ°àµ àŽªàµàްàµàŽàµàŽžàŽ¿ àŽàŽµàŽ¶àµàŽ¯àŽ®àŽŸàŽ¯àŽ¿ àŽµàŽ°àµàŽ &#160 , àŽàŽ°àµ àŽªàµàްàµàŽàµàŽžàŽ¿ àŽ
àŽµàŽžàŽŸàŽ¯àŽ®àŽŸàŽ£àµ àŽ
àŽ²àµàŽ²àŽ¯àµ àŽàŽšàµàŽšàµ àŽšàŽ¿àŽàµàŽàµŸàŽàµ àŽ
àŽ±àŽ¿àŽ¯àŽ¿àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ , àŽšàŽ¿àŽàµàŽà޳àµàŽàµ àŽàŽšàµàŽ±àµŒàŽšàµàޱàµàŽ±àµ àŽžàµàޱàµàŽ±àŽ¿àŽàµàŽžàŽ¿àŽ²àµ àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽ®àŽ±àµàޱàµàŽ°àµ àŽ¬àµàްàµàŽžàµàŽ°àŽ¿àŽ²àµ àŽ
àŽ€àµàŽ àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽšàŽ¿àŽàµàŽà޳àµàŽàµ àŽžàŽ¿àŽžàµàޱàµàŽ±àŽ€àµàŽ€àŽ¿àŽšàµàŽ±àµ àŽšàµàޱàµàޱàµâàŽµàµŒàŽàµàŽàµ àŽžàµàޱàµàŽ±àŽ¿àŽàµàŽžàŽ¿àŽ²àµ àŽšàµàŽàµàŽàµàŽ ">
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelpTitle "àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽ±àŽ¿àŽ²àµ àŽžàŽ¹àŽŸàŽ¯àŽ ">
+<!ENTITY torsettings.bridgeHelp1 "àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽàŽšàµàŽšàµ àŽªàŽ±àŽ¯àµàŽšàµàŽšàŽ€àµ àŽµàŽ¿àŽµàŽ°àŽªàµàŽªàŽàµàŽàŽ¿àŽàŽ¯àŽ¿àµœ àŽàµàµŒàŽàµàŽàŽªàµàŽàŽŸàŽ€àµàŽ€ àŽ±àµàŽ²àŽ¯àµàŽàŽ³àŽŸàŽ£àµ àŽ
àŽ€àµ àŽ±àµàޱàµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàŽ€àµ àŽ€àŽàŽžàµàŽžàŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽàµàŽàµàŽ€àµœ àŽŠàµàŽ·àµàŽàŽ°àŽ®àŽŸàŽàµàŽàµàŽšàµàŽšàµ &#160. àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµâàŽàµàŽ àŽžàµàŽšàµàŽžàŽ°àµàŽ·àŽ¿àŽªàµ àŽ€àŽàޝàµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽµàµàŽ£àµàŽàŽ¿ àŽµàµàŽ¯àŽ€àµàŽ¯àŽžàµàŽ€àŽ®àŽŸàŽ¯ àŽ°àµàŽ€àŽ¿àŽàµŸ àŽàŽªàŽ¯àµàŽàŽ¿àŽàµàŽàµàŽšàµàŽšàµ &#160. obfs àŽšàŽ¿àŽàµàŽà޳àµàŽàµ àŽªàµàŽàµàŽàµàŽµàŽ°àŽµàŽ¿àŽšàµ àŽ
àŽàµàŽàµàŽàŽ¿àŽ²àµàŽ²àŽŸàŽ€àµàŽ€ àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àŽ²àµàŽ àŽ®àµàŽàµ àŽªàµà޲àµà޳àµàŽ³àŽ€àµ àŽžàµàŽ°àŽ¿àŽàµàŽàµàŽ àŽ±àµàޱàµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµ
àŽš àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àµœ àŽ€àŽšàµàŽšàµàޝàµàŽ àŽªàµàްàµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµ ">
+<!ENTITY torsettings.bridgeHelp2 "àŽ°àŽŸàŽàµàޝàŽàµàŽàµŸ àŽàŽ€àµàŽàµàŽàµ àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àŽ²àµàŽ àŽàµàŽ±àŽ¿àŽšàµ àŽ€àŽàŽ¯àŽŸàµ» àŽ¶àµàްàµàŽ®àŽ¿àŽàµàŽàŽŸàŽ²àµàŽ , àŽªàµàŽ°àŽ€àµàޝàµàŽàŽ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽªàµàŽ°àŽ€àµàޝàµàŽàŽ àŽ°àŽŸàŽàµàޝàŽàµàŽàµŸ àŽªàµàްàµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµàŽ£àµàŽàµ &#160. àŽšàŽ¿àŽàµàŽà޳àµàŽàµ àŽ°àŽŸàŽàµàŽ¯àŽ€àµàŽ€àµ àŽàŽ€àµàŽàµàŽàµ àŽ¬àµàŽ°àŽ¿àŽ¡àµâàŽàµàŽàŽ³àŽŸàŽ£àµ àŽªàµàްàµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àµ àŽàŽšàµàŽšàµ àŽšàŽ¿àŽàµàŽàµŸàŽàµàŽàµ àŽàŽ±àŽªàµàŽªàŽ¿àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ torproject.org/about/contact.html#support àŽàŽŸàŽ£àµàŽ ">
<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "àŽ±àµàޱàµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàŽ€àµ àŽµàŽ°àµ àŽŠàŽ¯àŽµàŽŸàŽ¯àŽ¿ àŽàµàŽ·àµàŽ®àŽ¿àŽàµàŽàµàŽ &#160. àŽàŽ€àµ àŽšàŽ¿àŽ°àŽµàŽ§àŽ¿ àŽžàŽ®àŽ¯àŽ àŽàŽàµàŽàµàŽàµàŽ ">
diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties
index 7abbd44..31467ce 100644
--- a/src/chrome/locale/ml/torlauncher.properties
+++ b/src/chrome/locale/ml/torlauncher.properties
@@ -1,94 +1,94 @@
### Copyright (c) 2016, The Tor Project, Inc.
### See LICENSE for licensing information.
-torlauncher.error_title=Tor Launcher
+torlauncher.error_title=àŽàµàµŒ àŽàŽ¯àµŒàŽ€àµàŽ€àµàŽšàµàŽšàŽ€àµ
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start.
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited_during_startup=àŽàµàµŒ àŽ€àµàŽàŽàµàŽàŽ€àµàŽ€àŽ¿àŽ²àµ àŽªàµàŽ±àŽ€àµàŽ€àŽŸàŽàµàŽàŽªàµàŽªàµàŽàµàŽàµ . àŽàŽ€àµ àŽ®àŽ¿àŽàµàŽàŽµàŽŸàŽ±àµàŽ àŽàµàµŒ àŽàµŒ àŽžàŽ¿ àŽ«àŽ¯àŽ²àŽ¿àŽ²àµ àŽªàµàްàµàŽžàŽšàŽ àŽàŽŸàŽ°àŽ£àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽ , àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽ±àµàޱàµàŽ±àŽ¿àŽ²àµ àŽàŽ°àµ àŽ¬àŽàµ àŽàŽŸàŽ°àŽ£àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽŸàŽ , àŽ
àŽ€àµàŽ àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽšàŽ¿àŽàµàŽà޳àµàŽàµ àŽžàŽ¿àŽžàµàޱàµàŽ±àŽ€àµàŽ€àŽ¿àŽ²àµ àŽàŽ€àµàŽàµàŽàŽ¿àŽ²àµàŽ àŽàŽ°àµ àŽ
àŽªàµàŽ²àŽ¿àŽàµàŽàµàŽ·àµ» àŽ®àµàŽàŽŸàŽšàµàŽ€àŽ°àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽŸàŽ , àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽ€àµàޱàµàŽ±àŽŸàŽ¯ àŽàŽ°àµ àŽ¹àŽŸàµŒàŽ¡àµâàŽµàµàŽ¯àµŒ àŽàŽŸàŽ°àŽ£àŽµàµàŽ.àŽšàŽ¿àŽàµàŽàµŸ àŽ àŽªàµàްàµàŽžàŽšàŽ àŽªàŽ°àŽ¿àŽ¹àŽ°àŽ¿àŽàµàŽàµ àŽàµàµŒ àŽàŽšàµàŽšàµàŽàµ àŽ€àµàŽàŽàµàŽàŽŸàŽ€àµ àŽàµàµŒ àŽ¬àµàްàµàŽžàµŒ àŽ€àµàŽàŽàµàŽàµàŽàŽ¯àŽ¿àŽ²àµà޲ .
+torlauncher.tor_exited=àŽàµàµŒ àŽªàµàްàµàŽ€àµàŽàµàŽ·àŽ¿àŽàµàŽàŽŸàŽ€àµ àŽªàµàŽ±àŽ€àµàŽ€àŽŸàŽàµàŽàŽªàµàŽªàµàŽàµàŽàµ . àŽàŽ€àµ àŽ®àŽ¿àŽàµàŽàŽµàŽŸàŽ±àµàŽ àŽ±àµàޱàµàŽ±àŽ¿àŽ²àµ àŽàŽ°àµ àŽ¬àŽàµ àŽàŽŸàŽ°àŽ£àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽŸàŽ , àŽ
àŽ€àµàŽ àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽšàŽ¿àŽàµàŽà޳àµàŽàµ àŽžàŽ¿àŽžàµàޱàµàŽ±àŽ€àµàŽ€àŽ¿àŽ²àµ àŽàŽ€àµàŽàµàŽàŽ¿àŽ²àµàŽ àŽàŽ°àµ àŽ
àŽªàµàŽ²àŽ¿àŽàµàŽàµàŽ·àµ» àŽ®àµàŽàŽŸàŽšàµàŽ€àŽ°àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽŸàŽ , àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽ€àµàޱàµàŽ±àŽŸàŽ¯ àŽàŽ°àµ àŽ¹àŽŸàµŒàŽ¡àµâàŽµàµàŽ¯àµŒ àŽàŽŸàŽ°àŽ£àŽµàµàŽ.àŽšàŽ¿àŽàµàŽàµŸ àŽ àŽªàµàްàµàŽžàŽšàŽ àŽªàŽ°àŽ¿àŽ¹àŽ°àŽ¿àŽàµàŽàµ àŽàµàµŒ àŽàŽšàµàŽšàµàŽàµ àŽ€àµàŽàŽàµàŽàŽŸàŽ€àµ àŽšàŽ¿àŽàµàŽàµŸàŽàµàŽàµ àŽµàµàެàµàŽžàµàޱàµàޱàµàŽàŽ³àŽ¿àµœ àŽàŽ€àŽŸàŽ£àµ àŽªàŽ±àµàŽ±àŽ¿àŽ²àµà޲ . àŽªàµàްàµàŽžàŽšàŽ àŽªàŽ¿àŽšàµàŽšàµàޝàµàŽ àŽàŽŸàŽ£àµàŽàŽ¯àŽŸàŽ£àµàŽàµàŽàŽ¿àµœ , àŽŠàŽ¯àŽµàŽ
ŸàŽ¯àŽ¿ àŽšàŽ¿àŽàµàŽà޳àµàŽàµ àŽàµàŽ±àŽ¿àŽšàµàŽ±àµ àŽàŽ°àµ àŽµàŽ¿àŽµàŽ° àŽªàŽàµàŽàŽ¿àŽ àŽàŽàµàŽà޳àµàŽàµ àŽžàŽ¹àŽŸàŽ¯àŽ¿àŽàµàŽàµàŽšàµàŽš àŽžàŽàŽàŽ€àµàŽ€àŽ¿àŽšàµ àŽ
àŽ¯àŽàµàŽàµ àŽ€àŽ°àŽ¿àŽ
torlauncher.tor_exited2=àŽàµàµŒ àŽªàµàŽšàŽàŽ°àŽŸàŽ°àŽàŽàŽ¿àŽàµàŽàµàŽ®àµàŽªàµàµŸ àŽ¬àµàްàµàŽžàµŒ àŽàŽŸàŽ¬àµàŽàµŸ àŽ
àŽµàŽžàŽŸàŽšàŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàŽ¿àŽ²àµà޲ .
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor failed to start.
-torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
-torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
+torlauncher.tor_controlconn_failed=àŽàµàµŒ àŽàŽ£àµàŽàµàްàµàµŸ àŽªàµàްàµàŽàŽ¿àŽ²àµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàŽŸàµ» àŽžàŽŸàŽ§àŽ¿àŽàµàŽàŽ¿àŽ²àµà޲
+torlauncher.tor_failed_to_start=àŽàµàµŒ àŽ€àµàŽàŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àµœ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ
+torlauncher.tor_control_failed=àŽàµàµŒ àŽšàŽ¿àŽ¯àŽšàµàŽ€àµàŽ°àŽ£àŽ àŽàŽàµàŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àµœ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ
+torlauncher.tor_bootstrap_failed=àŽàµàµŒ àŽàŽ°àµ àŽàµàµŒ àŽ¶àµàŽàŽà޲ àŽ°àµàŽªàµàŽàŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àµœ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ
+torlauncher.tor_bootstrap_failed_details=%1$S àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ (%2$S).
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
+torlauncher.unable_to_start_tor=àŽàµàµŒ àŽ€àµàŽàŽàµàŽàŽŸàµ» àŽžàŽŸàŽ§àŽ¿àŽàµàŽàŽ¿àŽ²àµà޲ \n\n%S
+torlauncher.tor_missing=àŽàµàµŒ àŽ€àµàŽàŽàµàŽàŽŸàŽšàµà޳àµà޳ àŽàŽàµàŽžàŽ¿àŽàµàޝàµàŽàµàŽàŽ¬àŽ¿àµŸ àŽàŽŸàŽ£àŽŸàŽšàŽ¿àŽ²àµà޲
torlauncher.torrc_missing="àŽàµàµŒ àŽàµŒàŽžàŽ¿" àŽ«àŽ¯àµœ àŽàŽŸàŽ£àµàŽšàµàŽšàŽ¿àŽ²àµà޲ àŽàŽªàµàŽªàŽ àŽ
àŽ€àŽ¿àŽšàµàŽ±àµ àŽšàŽ¿àµŒàŽ®àŽŸàŽ£àŽµàµàŽ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ .
-torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
-torlauncher.password_hash_missing=Failed to get hashed password.
+torlauncher.datadir_missing=àŽàµàµŒ àŽ¡àŽŸàŽ±àµàޱ àŽ¡àŽ¿àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽšàŽ¿àŽ² àŽšàŽ¿àµœàŽàµàŽàµàŽšàµàŽšàŽ¿àŽ²àµà޲ àŽàŽªàµàŽªàŽ àŽ
àŽ€àµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàŽŸàŽšàµàŽ àŽžàŽŸàŽ§àŽ¿àŽàµàŽàŽ¿àŽ²àµà޲
+torlauncher.password_hash_missing=àŽ¹àŽŸàŽ·àµàŽ¡àµ àŽªàŽŸàŽžàµâàŽµàµàŽ¡àµ àŽàŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àµœ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ
-torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
-torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
+torlauncher.failed_to_get_settings=àŽàµàµŒ àŽžàµàޱàµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽàŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àµ àŽžàŽŸàŽ§àµàŽ¯àŽ®àŽŸàŽ¯àŽ¿àŽ²àµà޲
+torlauncher.failed_to_save_settings=àŽàµàµŒ àŽžàµàޱàµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽžàµàŽàµàŽ·àŽ¿àŽàµàŽàŽŸàµ» àŽžàŽŸàŽ§àµàŽ¯àŽ®àŽŸàŽ¯àŽ¿àŽ²àµà޲
+torlauncher.ensure_tor_is_running=àŽàµàµŒ àŽ±àµº àŽàµàޝàµàޝàµàŽšàµàŽšàµàŽ£àµàŽàµàŽšàµàŽšàµ àŽàŽ±àŽªàµàŽªàµ àŽµàŽ°àµàŽ€àµàŽ€àµàŽ
-torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
-torlauncher.error_proxy_type_missing=You must select the proxy type.
-torlauncher.error_bridges_missing=You must specify one or more bridges.
-torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
-torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
+torlauncher.error_proxy_addr_missing=àŽšàŽ¿àŽàµàŽàµŸ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽ àŽªàŽ¿ àŽ
àŽ¡àµàŽ°àŽžàµ àŽ
àŽ²àµà޲àµàŽàµàŽàŽ¿àµœ àŽ¹àµàŽžàµàޱàµàŽ±àµ àŽšàµàŽ¯àŽ¿àŽ®àµàŽ àŽªàµàµŒàŽàµàŽàµ àŽšàŽ®àµàŽªàŽ±àµàŽ àŽµàŽ¿àŽ¶àŽŠàŽ®àŽŸàŽàµàŽàµàŽ , àŽàŽšàµàŽšàŽŸàµœ àŽ®àŽŸàŽ€àµàŽ°àŽ®àµ àŽ±àµàޱàµàŽ±àŽ¿àŽšàµ àŽàŽšàµàŽ±àµŒàŽšàµàޱàµàŽ±àŽ¿àŽšàµ àŽ
àŽàµàŽžàŽžàµàŽžàµ àŽàµàޝàµàŽ¯àŽŸàµ» àŽžàŽŸàŽ§àŽ¿àŽàµàŽàµàŽàޝàµà޳àµà޳àµ
+torlauncher.error_proxy_type_missing=àŽšàŽ¿àŽàµàŽàµŸ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽàŽ°àµ àŽªàµàްàµàŽàµàŽžàŽ¿ àŽàµàŽªàµàŽªàµ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ
+torlauncher.error_bridges_missing=àŽšàŽ¿àŽàµàŽàµŸ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽàŽšàµàŽšàµ àŽàŽšàµàŽšàŽ¿àµœ àŽàµàŽàµàŽ€àŽ²àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽµàŽ¿àŽ¶àŽŠàµàŽàŽ°àŽ¿àŽàµàŽàµàŽ
+torlauncher.error_default_bridges_type_missing=àŽšàŽ¿àŽàµàŽàµŸ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽµàŽ¿àŽ¶àŽŠàµàŽàŽ°àŽ¿àŽàµàŽ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽà޳àµàŽàµ àŽàŽ°àµ àŽàµàŽ°àŽŸàµ»àŽžàµâàŽªàµàµŒàŽàµ àŽàµàŽªàµàŽªàµ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ
+torlauncher.error_bridgedb_bridges_missing=àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽ
+torlauncher.error_bridge_bad_default_type=àŽšàŽ¿àŽàµàŽàµŸ àŽªàŽ±àŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽš àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽà޳àµàŽàµ àŽàµàŽ°àŽŸàµ»àŽžàµâàŽªàµàµŒàŽàµ àŽàµàŽªàµàŽªàµàŽàµŸ àŽ²àŽàµàŽ¯àŽ®àŽ²àµà޲ . àŽŠàŽ¯àŽµàŽŸàŽ¯àŽ¿ àŽšàŽ¿àŽàµàŽà޳àµàŽàµ àŽžàµàޱàµàŽ±àŽ¿àŽàµàŽàµàŽžàµàŽàµŸ àŽ€àŽ¿àŽ°àŽ¿àŽ€àµàŽ€àµàŽ
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(àŽàµàŽšàŽ¯àŽ¿àµœ àŽªàµàްàµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµ )
+torlauncher.bridge_suffix.meek-azure=(àŽàµàŽšàŽ¯àŽ¿àµœ àŽªàµàްàµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµ )
-torlauncher.request_a_bridge=Request a BridgeâŠ
-torlauncher.request_a_new_bridge=Request a New BridgeâŠ
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.request_a_bridge=àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽ
+torlauncher.request_a_new_bridge=àŽàŽ°àµ àŽªàµàŽ€àŽ¿àŽ¯ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽ ...
+torlauncher.contacting_bridgedb=àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽ¡àŽ¿ àŽ¬àŽ¿àŽ¯àµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàµ , àŽŠàŽ¯àŽµàŽŸàŽ¯àŽ¿ àŽàŽŸàŽ€àµàŽ€àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽ
+torlauncher.captcha_prompt=àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽàŽ¿àŽàµàŽàŽŸàµ» àŽ€àŽšàµàŽšàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽš àŽàŽŸàŽªàµàŽ àŽªàŽ°àŽ¿àŽ¹àŽ°àŽ¿àŽàµàŽàµàŽ
+torlauncher.bad_captcha_solution=àŽªàŽ°àŽ¿àŽ¹àŽŸàŽ°àŽ àŽ¶àµàŽ°àŽ¿àŽ¯àŽ²àµà޲ . àŽŠàŽ¯àŽµàŽŸàŽ¯àŽ¿ àŽàŽšàµàŽšàµàŽàµàŽàµ àŽ¶àµàްàµàŽ®àŽ¿àŽàµàŽàµàŽ
+torlauncher.unable_to_get_bridge=àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽàŽ¿àŽ¬àŽ¿àŽ¯àŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽàŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽžàŽŸàŽ§àµàŽ¯àŽ®àŽ²àµà޲
+torlauncher.no_meek=àŽ àŽ¬àµàްàµàŽžàµŒ àŽ®àµàŽàµ àŽàŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽµàµàŽ£àµàŽàŽ¿ àŽžàµàŽ°àŽ¿àŽ¯àŽŸàŽ¯ àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àµœ àŽàµàµºàŽ«àŽ¿àŽàµàŽ°àµ àŽàµàޝàµàŽ€àŽ¿àŽàµàŽàŽ¿àŽ²àµà޲ , àŽ
àŽ€àµ àŽàµàޝàµâàŽ€àŽŸàµœ àŽ®àŽŸàŽ€àµàŽ°àŽ®àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽàŽ¿àŽàµàŽàµàŽàޝàµà޳àµà޳àµ
+torlauncher.no_bridges_available=àŽ àŽžàŽ®àŽ¯àŽ€àµàŽ€àµ àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽà޳àµàŽ àŽàŽ¿àŽàµàŽàµàŽàŽ¯àŽ¿àŽ²àµà޲ , àŽàµàŽ·àµàŽ®àŽ¿àŽàµàŽàµàŽ
-torlauncher.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
+torlauncher.connect=àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽ
+torlauncher.restart_tor=àŽàµàµŒ àŽàŽšàµàŽšàµàŽàµàŽàµ àŽ€àµàŽàŽàµàŽàµàŽ
+torlauncher.quit=àŽªàµàŽ±àŽ€àµàŽ€àµàŽªàµàŽàµàŽ
+torlauncher.quit_win=àŽªàµàŽ±àŽ€àµàŽ€àµàŽªàµàŽàµàŽ
torlauncher.done=àŽàŽŽàŽ¿àŽàµàŽàµ
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
+torlauncher.forAssistance=àŽžàŽ¹àŽŸàŽ¯àŽ€àµàŽ€àŽ¿àŽšàŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ , %S
+torlauncher.forAssistance2=àŽžàŽ¹àŽŸàŽ¯àŽ€àµàŽ€àŽ¿àŽšàŽŸàŽ¯àŽ¿ àŽžàŽšàµàŽŠàµŒàŽ¶àŽ¿àŽàµàŽàµàŽ , %S
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+torlauncher.copiedNLogMessages=àŽàµàŽªàµàŽªàŽ¿ àŽªàµàµŒàŽ€àµàŽ€àŽ¿àŽ¯àŽŸàŽ¯àŽ¿ , àŽàµàµŒ àŽµàŽ¿àŽµàŽ°àŽªàŽàµàŽàŽ¿àŽ àŽžàŽšàµàŽŠàµà޶àŽàµàŽàµŸ àŽàŽ°àµ àŽàµàŽàµàŽžàµàޱàµàŽ±àµ àŽàŽ¡àŽ¿àŽ±àµàŽ±àŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽªàµàŽžàµàޱàµàŽ±àµ àŽàµàޝàµàޝàµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽ®àµàŽ¯àŽ¿àµœ àŽ
àŽ¯àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽ€àŽ¯àµàŽ¯àŽŸàŽ±àŽŸàŽ£àµ
-torlauncher.bootstrapStatus.starting=Starting
-torlauncher.bootstrapStatus.conn_pt=Connecting to bridge
-torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge
-torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy
-torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy
-torlauncher.bootstrapStatus.conn=Connecting to a Tor relay
-torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay
-torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay
-torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay
-torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
-torlauncher.bootstrapStatus.requesting_status=Retrieving network status
-torlauncher.bootstrapStatus.loading_status=Loading network status
-torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
-torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
-torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information
-torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge
-torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge
-torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy
-torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy
-torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay
-torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay
-torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay
-torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay
-torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
+torlauncher.bootstrapStatus.starting=àŽ€àµàŽàŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.conn_pt=àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽàŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.conn_done_pt=àŽ¬àµàŽ°àŽ¿àŽàŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.conn_proxy=àŽªàµàްàµàŽàµàŽžàŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.conn_done_proxy=àŽªàµàްàµàŽàµàŽžàŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.conn=àŽàŽ°àµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.conn_done=àŽàŽ°àµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.handshake=àŽàŽ°àµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽàµŒàŽàµàŽ àŽàµàޝàµàޝàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.handshake_done=àŽàŽ°àµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽàµŒàŽàµàŽ àŽàµàޝàµàޝàµàŽšàµàŽšàŽ€àµ àŽªàµàµŒàŽ€àµàŽ€àŽ¿àŽ¯àŽŸàŽ¯àŽ¿
+torlauncher.bootstrapStatus.onehop_create=àŽàµ»àŽàµàŽ°àŽ¿àŽªàµàޱàµàŽ±àŽ¡àµ àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽ¬àŽšàµàŽ§àŽ àŽžàµàŽ¥àŽŸàŽªàŽ¿àŽàµàŽàµàŽàµàŽ£àµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.requesting_status=àŽ¶àµàŽàŽàŽ²àŽŸ àŽ
àŽµàŽžàµàŽ¥ àŽàŽ¿àŽàµàŽàŽ¿àŽàµàŽàµàŽ£àµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.loading_status=àŽ¶àµàŽàŽàŽ²àŽŸ àŽ
àŽµàŽžàµàŽ¥ àŽàŽ¯àŽ±àµàޱàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.loading_keys=àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ àŽ
àŽ§àŽ¿àŽàŽŸàŽ° àŽžàµàµŒàŽàµàŽàŽ¿àŽ«àŽ¿àŽàµàŽàޱàµàޱàµàŽàµŸ àŽàŽ¯àŽ±àµàޱàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.requesting_descriptors=àŽ±àŽ¿àŽ²àµ àŽµàŽ¿àŽµàŽ°àŽàµàŽàµŸ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.loading_descriptors=àŽ±àŽ¿àŽ²àµ àŽµàŽ¿àŽµàŽ°àŽàµàŽàµŸ àŽàŽ¯àŽ±àµàޱàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.enough_dirinfo=àŽ±àŽ¿àŽ²àµ àŽµàŽ¿àŽµàŽ°àŽàµàŽàµŸ àŽàŽ¯àŽ±àµàޱàµàŽšàµàŽšàŽ€àµ àŽªàµàµŒàŽ€àµàŽ€àŽ¿àŽ¯àŽŸàŽ¯àŽ¿
+torlauncher.bootstrapStatus.ap_conn_pt=àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.ap_conn_done_pt=àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.ap_conn_proxy=àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ: àŽªàµàްàµàŽàµàŽžàŽ¿àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.ap_conn_done_proxy=àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽªàµàްàµàŽàµàŽžàŽ¿àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.ap_conn=àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.ap_conn_done=àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.ap_handshake=àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽàµŒàŽàµàŽ àŽàµàޝàµàޝàµàŽšàµàŽšàµ
+torlauncher.bootstrapStatus.ap_handshake_done=àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽàµŒàŽàµàŽ àŽàµàޝàµàޝàµàŽšàµàŽšàŽ€àµ àŽªàµàµŒàŽ€àµàŽ€àŽ¿àŽ¯àŽŸàŽ¯àŽ¿
+torlauncher.bootstrapStatus.circuit_create=àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ: àŽàµàµŒ àŽžàµŒàŽàµàޝàµàŽàµàŽàµ àŽžàµàŽ¥àŽŸàŽªàŽ¿àŽàµàŽàµàŽšàµàŽšàµÂ
+torlauncher.bootstrapStatus.done=àŽàµàµŒ àŽšàµàޱàµàޱàµâàŽµàµŒàŽàµàŽàŽàµœ àŽàµàµŒàŽàµàŽàŽªàµàŽªàµàŽàµàŽàµ
-torlauncher.bootstrapWarning.done=done
-torlauncher.bootstrapWarning.connectrefused=connection refused
-torlauncher.bootstrapWarning.misc=miscellaneous
-torlauncher.bootstrapWarning.resourcelimit=insufficient resources
-torlauncher.bootstrapWarning.identity=identity mismatch
-torlauncher.bootstrapWarning.timeout=connection timeout
-torlauncher.bootstrapWarning.noroute=no route to host
-torlauncher.bootstrapWarning.ioerror=read/write error
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+torlauncher.bootstrapWarning.done=àŽàŽŽàŽ¿àŽàµàŽàµ
+torlauncher.bootstrapWarning.connectrefused=àŽàŽ£àŽàµàŽ·àµ» àŽšàŽ¿àŽ°àŽžàŽ¿àŽàµàŽàµ
+torlauncher.bootstrapWarning.misc=àŽàŽàŽàŽ²àµŒàŽšàµàŽš
+torlauncher.bootstrapWarning.resourcelimit=àŽàµàޱàŽàµàŽ àŽàŽªàŽŸàŽ§àŽ¿àŽàµŸ
+torlauncher.bootstrapWarning.identity=àŽµàµàޝàŽàµàŽ€àŽ¿àŽ€àµàŽµàŽ àŽªàµàްàµàŽ€àµàŽ€àŽªàµàŽªàµàŽàµàŽšàµàŽšàŽ¿àŽ²àµà޲
+torlauncher.bootstrapWarning.timeout=àŽàŽ£àŽàµàŽ·àµ» àŽžàŽ®àŽ¯àŽ àŽàŽŽàŽ¿àŽàµàŽàµ
+torlauncher.bootstrapWarning.noroute=àŽ¹àµàŽžàµàޱàµàŽ±àµ àŽàµàޝàµàŽ¯àŽŸàµ» àŽàŽ°àµ àŽ±àµàŽàµàŽàµàŽ àŽà޲àµà޲
+torlauncher.bootstrapWarning.ioerror=àŽ±àµàŽ¡àµ àŽµàŽ±àµàޱàµàŽ±àµ àŽ€àµàޱàµàޱàµ
+torlauncher.bootstrapWarning.pt_missing=àŽªàµà޲àµàŽàµâàŽàŽ¬àŽ¿àµœ àŽàµàŽ°àŽŸàµ»àŽžàµâàŽªàµàµŒàŽàµ àŽàŽŸàŽ£àŽŸàŽšàŽ¿àŽ²àµà޲
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=àŽžàµŒàŽµàŽ°àµàŽ àŽàŽ¯àŽ¿àŽàµàŽàµà޳àµà޳ àŽ¬àŽšàµàŽ§àŽ àŽšàŽ·àµàŽàŽªàµàŽªàµàŽàµàŽàµ
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=àŽžàµŒàŽµàŽ±àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàŽŸàµ» àŽàŽŽàŽ¿àŽ¯àµàŽšàµàŽšàŽ¿àŽ²àµà޲
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=àŽªàµàްàµàŽàµàŽžàŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àŽŸàµ» àŽàŽŽàŽ¿àŽàµàŽàŽ¿àŽ²àµà޲
diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties
index db8b132..35bb8fe 100644
--- a/src/chrome/locale/nb/torlauncher.properties
+++ b/src/chrome/locale/nb/torlauncher.properties
@@ -72,11 +72,11 @@ torlauncher.bootstrapStatus.ap_conn_pt=Bygger kretser: Kobler til bro
torlauncher.bootstrapStatus.ap_conn_done_pt=Bygger kretser: Koblet til bro
torlauncher.bootstrapStatus.ap_conn_proxy=Bygger kretser: Kobler til proxy
torlauncher.bootstrapStatus.ap_conn_done_proxy=Bygger kretser: Koblet til proxy
-torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay
-torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay
-torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay
-torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay
-torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit
+torlauncher.bootstrapStatus.ap_conn=Bygger kretser: Kobler til et Tor-relé
+torlauncher.bootstrapStatus.ap_conn_done=Bygger kretser: Koblet til et Tor-relé
+torlauncher.bootstrapStatus.ap_handshake=Bygger kretser: Forhandler med et Tor-relé
+torlauncher.bootstrapStatus.ap_handshake_done=Bygger kretser: Ferdig med å forhandle med et Tor-relé
+torlauncher.bootstrapStatus.circuit_create=Bygger kretser: Etablering av en Tor-krets
torlauncher.bootstrapStatus.done=Koblet til Tor-nettverket!
torlauncher.bootstrapWarning.done=ferdig
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index 1b63518..f39a8f9 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -55,7 +55,7 @@
<!ENTITY torsettings.proxyHelp1 "Een lokale proxy kan nodig zijn als u verbinding maakt via het netwerk van een bedrijf, school of universiteit. Als u niet zeker weet of een proxy nodig is, bekijk dan de internetinstellingen in een andere browser, of bekijk de netwerkinstellingen van uw systeem.">
<!ENTITY torsettings.bridgeHelpTitle "Bridge relay-hulp">
-<!ENTITY torsettings.bridgeHelp1 "Bridges zijn niet-vermelde relays die het moeilijk maken om verbindingen met het Tor-netwerk te blokkeren.  Elk van deze bridges gebruikt een andere methode om censuur te vermijden.  Degene die obfs gebruiken, laten uw verkeer eruitzien als willekeurige ruis, en degene die meek gebruiken, laten uw netwerk verkeer eruitzien alsof u met een andere service dan Tor verbinding maakt.">
+<!ENTITY torsettings.bridgeHelp1 "Bridges zijn niet-vermelde relays die het moeilijker maken om verbindingen met het Tor-netwerk te blokkeren.  Elk type bridge gebruikt een andere methode om censuur te vermijden.  Bridges die obfs gebruiken, laten uw verkeer eruitzien als willekeurige ruis, en bridges die meek gebruiken, laten uw netwerkverkeer eruitzien alsof u met een andere service dan Tor verbinding maakt.">
<!ENTITY torsettings.bridgeHelp2 "Vanwege de manier waarop bepaalde landen Tor proberen te blokkeren, werken sommige bridges in bepaalde landen wel, maar niet in andere.  Als u niet zeker weet welke bridges in uw land werken, bezoek dan torproject.org/about/contact.html#support">
<!-- Progress -->
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index 56d6363..6edbe32 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -3,31 +3,31 @@
torlauncher.error_title=Tor Starter
-torlauncher.tor_exited_during_startup=Tor is onverwachts afgesloten tijdens het opstarten. Dit kan veroorzaakt zijn door een fout in uw torrc bestand, een bug in Tor zelf, slecht werkende hardware of door een ander op je systeem geïnstalleerd programma. Totdat dit probleem is opgelost en u Tor opnieuw opgestart heeft, zal de Tor Browser niet opstarten.
-torlauncher.tor_exited=Tor is onverwachts afgesloten. Dit kan veroorzaakt zijn door een fout in Tor zelf, een ander op je systeem geïnstalleerd programma of door slecht functionerende hardware. Totdat je tor opnieuw hebt opgestart zal de Tor Browser niet in staat zijn een website te bereiken. Stuur een kopie van je Tor Log naar het support team als het probleem zich voor blijft doen.
-torlauncher.tor_exited2=Tor herstarten zal niet uw browser tabbladen sluiten.
-torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort.
-torlauncher.tor_failed_to_start=Tor kon niet starten.
+torlauncher.tor_exited_during_startup=Tor is afgesloten tijdens het opstarten. Dit kan komen door een fout in uw torrc-bestand, een bug in Tor of ander programma op uw systeem, of defecte hardware. Totdat u het onderliggende probleem oplost en Tor opnieuw start, zal Tor Browser niet opstarten.
+torlauncher.tor_exited=Tor is onverwachts afgesloten. Dit kan komen door een fout in Tor zelf, een ander programma op uw systeem, of defecte hardware. Totdat u Tor opnieuw start, zal Tor Browser geen websites kunnen bereiken. Stuur een kopie van uw Tor-logboek naar het ondersteuningsteam als het probleem zich blijft voordoen.
+torlauncher.tor_exited2=Tor herstarten zal niet uw browsertabbladen sluiten.
+torlauncher.tor_controlconn_failed=Kon geen verbinding maken met Tor-controlepoort.
+torlauncher.tor_failed_to_start=Tor kon niet worden gestart.
torlauncher.tor_control_failed=Controle over Tor mislukt.
-torlauncher.tor_bootstrap_failed=Tor kon geen Tor netwerkverbinding maken
-torlauncher.tor_bootstrap_failed_details=%1$S mislukte (%2$S).
+torlauncher.tor_bootstrap_failed=Tor kon geen Tor-netwerkverbinding maken.
+torlauncher.tor_bootstrap_failed_details=%1$S mislukt (%2$S).
torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S
-torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt.
-torlauncher.torrc_missing=Het torrc bestand is missend en kon niet worden aangemaakt.
-torlauncher.datadir_missing=De Tor data directory bestaat niet en kon niet worden aangemaakt.
-torlauncher.password_hash_missing=Ophalen van een gehashed wachtwoord is mislukt.
+torlauncher.tor_missing=Het uitvoerbare Tor-bestand ontbreekt.
+torlauncher.torrc_missing=Het torrc-bestand ontbreekt en kon niet worden aangemaakt.
+torlauncher.datadir_missing=De Tor-gegevensmap bestaat niet en kon niet worden aangemaakt.
+torlauncher.password_hash_missing=Ophalen van gehasht wachtwoord is mislukt.
-torlauncher.failed_to_get_settings=Kon Tor instellingen niet ophalen.\n\n%S
-torlauncher.failed_to_save_settings=Kon Tor instellingen niet opslaan.\n\n%S
-torlauncher.ensure_tor_is_running=Controleer dat Tor actief is alstublieft.
+torlauncher.failed_to_get_settings=Kon Tor-instellingen niet ophalen.\n\n%S
+torlauncher.failed_to_save_settings=Kon Tor-instellingen niet opslaan.\n\n%S
+torlauncher.ensure_tor_is_running=Zorg ervoor dat Tor actief is.
-torlauncher.error_proxy_addr_missing=Je moet zowel een IP-adres of hostnaam en een poortnummer invoeren om Tor te configureren om een ââproxy te gebruiken om toegang te krijgen tot het internet.
-torlauncher.error_proxy_type_missing=Je moet het proxy-type kiezen.
-torlauncher.error_bridges_missing=Je moet één of meerdere bridges opgeven.
-torlauncher.error_default_bridges_type_missing=Je moet een transport-type selecteren voor de verstrekte bridges.
+torlauncher.error_proxy_addr_missing=U moet zowel een IP-adres of hostnaam en een poortnummer opgeven om Tor te configureren voor het gebruik van een ââproxy om toegang te krijgen tot het internet.
+torlauncher.error_proxy_type_missing=U moet het proxytype selecteren.
+torlauncher.error_bridges_missing=U moet een of meer bridges opgeven.
+torlauncher.error_default_bridges_type_missing=U moet een transporttype selecteren voor de verstrekte bridges.
torlauncher.error_bridgedb_bridges_missing=Vraag een bridge aan.
-torlauncher.error_bridge_bad_default_type=Géén van de verstrekte bridges met het transport-type %S zijn beschikbaar. Pas aub je instellingen aan.
+torlauncher.error_bridge_bad_default_type=Er zijn geen verstrekte bridges met het transporttype %S beschikbaar. Pas uw instellingen aan.
torlauncher.bridge_suffix.meek-amazon=(Werkt in China)
torlauncher.bridge_suffix.meek-azure=(werkt in China)
@@ -36,59 +36,59 @@ torlauncher.request_a_bridge=Een bridge aanvragenâŠ
torlauncher.request_a_new_bridge=Een nieuwe bridge aanvragenâŠ
torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik.
torlauncher.captcha_prompt=Los de CAPTCHA op om een bridge aan te vragen.
-torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw.
+torlauncher.bad_captcha_solution=De oplossing is niet juist. Probeer het opnieuw.
torlauncher.unable_to_get_bridge=Kan geen bridge verkrijgen van BridgeDB.\n\n%S
torlauncher.no_meek=Deze browser is niet geconfigureerd voor meek, wat nodig is om bridges te verkrijgen.
torlauncher.no_bridges_available=Er zijn op dit moment geen bridges beschikbaar.
-torlauncher.connect=Verbind
-torlauncher.restart_tor=Herstart Tor
-torlauncher.quit=Stop
-torlauncher.quit_win=Sluit af
-torlauncher.done=OK
+torlauncher.connect=Verbinden
+torlauncher.restart_tor=Tor herstarten
+torlauncher.quit=Stoppen
+torlauncher.quit_win=Afsluiten
+torlauncher.done=Gereed
-torlauncher.forAssistance=Voor hulp, contacteer %S
-torlauncher.forAssistance2=Voor bijstand, bezoek %S
+torlauncher.forAssistance=Neem contact op met %S voor hulp
+torlauncher.forAssistance2=Bezoek %S voor hulp
-torlauncher.copiedNLogMessages=Kopiëren klaar. %S Tor logberichten zijn klaar om in een teksteditor of een e-mailbericht te worden geplakt.
+torlauncher.copiedNLogMessages=Kopiëren voltooid. %S Tor-logberichten kunnen in een teksteditor of een e-mailbericht worden geplakt.
torlauncher.bootstrapStatus.starting=Starten
-torlauncher.bootstrapStatus.conn_pt=Verbinden met brug
-torlauncher.bootstrapStatus.conn_done_pt=Verbonden met brug
+torlauncher.bootstrapStatus.conn_pt=Verbinden met bridge
+torlauncher.bootstrapStatus.conn_done_pt=Verbonden met bridge
torlauncher.bootstrapStatus.conn_proxy=Verbinden met proxy
torlauncher.bootstrapStatus.conn_done_proxy=Verbonden met proxy
torlauncher.bootstrapStatus.conn=Verbinden met een Tor-relay
torlauncher.bootstrapStatus.conn_done=Verbonden met een Tor-relay
torlauncher.bootstrapStatus.handshake=Onderhandelen met een Tor-relay
torlauncher.bootstrapStatus.handshake_done=Onderhandelen met een Tor-relay voltooid
-torlauncher.bootstrapStatus.onehop_create=Maken van een versleutelde verbinding met de lijst
-torlauncher.bootstrapStatus.requesting_status=Ontvangen van de netwerkstatus
-torlauncher.bootstrapStatus.loading_status=Laden van de netwerkstatus
-torlauncher.bootstrapStatus.loading_keys=Laden van de authoriteitcertificaten
-torlauncher.bootstrapStatus.requesting_descriptors=Opvragen van verbindingsinformatie
-torlauncher.bootstrapStatus.loading_descriptors=Laden van verbindingsinformatie
+torlauncher.bootstrapStatus.onehop_create=Een versleutelde adreslijstverbinding maken
+torlauncher.bootstrapStatus.requesting_status=Netwerkstatus ophalen
+torlauncher.bootstrapStatus.loading_status=Netwerkstatus laden
+torlauncher.bootstrapStatus.loading_keys=Autoriteitscertificaten laden
+torlauncher.bootstrapStatus.requesting_descriptors=Relay-informatie opvragen
+torlauncher.bootstrapStatus.loading_descriptors=Relay-informatie laden
torlauncher.bootstrapStatus.enough_dirinfo=Laden van relay-informatie voltooid
-torlauncher.bootstrapStatus.ap_conn_pt=Circuit maken: verbinden met brug
-torlauncher.bootstrapStatus.ap_conn_done_pt=Circuits bouwen: verbonden met bridge
-torlauncher.bootstrapStatus.ap_conn_proxy=Circuits bouwen: verbinden met proxy
-torlauncher.bootstrapStatus.ap_conn_done_proxy=Circuits bouwen: verbonden met proxy
-torlauncher.bootstrapStatus.ap_conn=Circuits bouwen: verbinden met een Tor-relay
-torlauncher.bootstrapStatus.ap_conn_done=Circuit opbouwen: Verbonden met een Tor relay
-torlauncher.bootstrapStatus.ap_handshake=Circuits opzetten: onderhandelen met een Tor-relay
-torlauncher.bootstrapStatus.ap_handshake_done=Circuits opzetten: onderhandelen met een Tor-relay voltooid
-torlauncher.bootstrapStatus.circuit_create=Circuits opzetten: Tor-circuit tot stand brengen
+torlauncher.bootstrapStatus.ap_conn_pt=Circuits opbouwen: verbinden met bridge
+torlauncher.bootstrapStatus.ap_conn_done_pt=Circuits opbouwen: verbonden met bridge
+torlauncher.bootstrapStatus.ap_conn_proxy=Circuits opbouwen: verbinden met proxy
+torlauncher.bootstrapStatus.ap_conn_done_proxy=Circuits opbouwen: verbonden met proxy
+torlauncher.bootstrapStatus.ap_conn=Circuits opbouwen: verbinden met een Tor-relay
+torlauncher.bootstrapStatus.ap_conn_done=Circuits opbouwen: verbonden met een Tor-relay
+torlauncher.bootstrapStatus.ap_handshake=Circuits opbouwen: onderhandelen met een Tor-relay
+torlauncher.bootstrapStatus.ap_handshake_done=Circuits opbouwen: onderhandelen met een Tor-relay voltooid
+torlauncher.bootstrapStatus.circuit_create=Circuits opbouwen: Tor-circuit tot stand brengen
torlauncher.bootstrapStatus.done=Verbonden met het Tor-netwerk!
-torlauncher.bootstrapWarning.done=uitgevoerd
+torlauncher.bootstrapWarning.done=gereed
torlauncher.bootstrapWarning.connectrefused=verbinding geweigerd
-torlauncher.bootstrapWarning.misc=willekeurig
-torlauncher.bootstrapWarning.resourcelimit=onvoldoende resources
+torlauncher.bootstrapWarning.misc=overig
+torlauncher.bootstrapWarning.resourcelimit=onvoldoende bronnen
torlauncher.bootstrapWarning.identity=identiteitsfout
-torlauncher.bootstrapWarning.timeout=verbindingstimeout
-torlauncher.bootstrapWarning.noroute=geen route naar de server
-torlauncher.bootstrapWarning.ioerror=lees/schrijffout
-torlauncher.bootstrapWarning.pt_missing=ontbrekend plugbaar vervoer
+torlauncher.bootstrapWarning.timeout=verbindingstime-out
+torlauncher.bootstrapWarning.noroute=geen route naar host
+torlauncher.bootstrapWarning.ioerror=lees-/schrijffout
+torlauncher.bootstrapWarning.pt_missing=pluggable transport ontbreekt
torlauncher.nsresult.NS_ERROR_NET_RESET=De verbinding met de server is verbroken.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kon niet verbinden met de server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kon niet verbinden met de proxy.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kon geen verbinding maken met de server.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kon geen verbinding maken met de proxy.
diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties
index 5eb4dfa..548e598 100644
--- a/src/chrome/locale/sk/torlauncher.properties
+++ b/src/chrome/locale/sk/torlauncher.properties
@@ -4,7 +4,7 @@
torlauncher.error_title=SpúšťaÄ Tor
torlauncher.tor_exited_during_startup=Tor bol ukonÄenÜ poÄas spúšťania. Mohla to spÃŽsibiÅ¥ chyba vo VaÅ¡om torrc súbore, chyba v Tor alebo inom programe vo VaÅ¡om systéme, alebo chybnÜ hardvér. KÜm nevyrieÅ¡ite tento problém a nereÅ¡tartujete Tor, nebude moÅŸné spustiÅ¥ prehliadaÄ Tor.
-torlauncher.tor_exited=Tor bol neoÄakávane ukonÄenÜ. Mohlo to byÅ¥ spÃŽsobené chybou v Tor samotnom, inÜm programom vo vaÅ¡om systéme, alebo chybnÜm hardvérom. KÜm nereÅ¡tartujete Tor, Tor Browser nebude schopnÜ otvoriÅ¥ akékoÄŸvek webové stránky. Ak problém pretrváva, prosÃm poÅ¡lite kópiu Tor logu tÃmu podpory.
+torlauncher.tor_exited=Tor bol neoÄakávane ukonÄenÜ. Mohlo to byÅ¥ spÃŽsobené chybou v Tor samotnom, inÜm programom vo vaÅ¡om systéme, alebo chybnÜm hardvérom. KÜm nereÅ¡tartujete Tor, PrehliadaÄ Tor nebude schopnÜ otvoriÅ¥ akékoÄŸvek webové stránky. Ak problém pretrváva, prosÃm poÅ¡lite kópiu Tor logu tÃmu podpory.
torlauncher.tor_exited2=ReÅ¡tartovanie Tor nezatvorà VaÅ¡e záloÅŸky prehliadaÄa.
torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor.
torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť.
diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties
index 436f2c1..a66e6eb 100644
--- a/src/chrome/locale/ur/torlauncher.properties
+++ b/src/chrome/locale/ur/torlauncher.properties
@@ -41,10 +41,10 @@ torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
-torlauncher.connect=Connect
+torlauncher.connect=Ø±Ø§ØšØ·Û Ú©Ø±ÛÚº
torlauncher.restart_tor=Restart Tor
torlauncher.quit=ÚÚŸÙÚØ¯ÛجÛÛ (Quit)
-torlauncher.quit_win=Exit
+torlauncher.quit_win=خارج Ú©Ø±ÙØ§
torlauncher.done=Ù
Ú©Ù
Ù ÛÙÚ¯ÛØ§
torlauncher.forAssistance=For assistance, contact %S
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index 464c60a..3fff34e 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -1,5 +1,5 @@
<!ENTITY torsettings.dialog.title "æŽè¥è·¯ç±ç¶²è·¯èšå®">
-<!ENTITY torsettings.wizard.title.default "é£çµ Tor">
+<!ENTITY torsettings.wizard.title.default "é£ç·å° Tor">
<!ENTITY torsettings.wizard.title.configure "Tor 網路èšå®">
<!ENTITY torsettings.wizard.title.connecting "å»ºç« Tor é£ç·">
@@ -10,7 +10,7 @@
<!-- For "first run" wizard: -->
<!ENTITY torSettings.connectPrompt "黿"飿¥"äŸé£äž Tor ">
-<!ENTITY torSettings.configurePrompt "åŠææšèæŒæç£èŠtor網絡çåå®¶ïŒäŸåŠååïŒäžåïŒåè³å
¶ïŒæè
æšäœæŒç§äººç¶²è·¯äžïŒéèŠä»£ç蚪åäºè¯ç¶²ãè«é»æïŒãèšå®ãæŽæ¹ç¶²è·¯èšçœ®ã">
+<!ENTITY torSettings.configurePrompt "åŠææšèæŒæç£èŠ tor 網路çåå®¶ïŒäŸåŠååãäžåãåè³å
¶ïŒæè
æšäœæŒéèŠä»£ç䌺æåšçç§äººç¶²è·¯äžïŒè«é»æãèšå®ãäŸèª¿æŽç¶²è·¯èšå®ã">
<!ENTITY torSettings.configure "èšå®">
<!ENTITY torSettings.connect "飿¥">
@@ -36,12 +36,12 @@
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "éå°é»è
Šééæååªå
èš±é£æ¥è³ç¹å®é£ç·å çé²ç«ç">
+<!ENTITY torsettings.firewall.checkbox "éå°é»è
Šééæååªå
èš±é£æ¥è³ç¹å®é£æ¥å çé²ç«ç">
<!ENTITY torsettings.firewall.allowedPorts "å
èš±ç飿¥å ïŒ">
<!ENTITY torsettings.useBridges.checkbox "æçåå®¶äž Tor åå°å¯©æ¥">
<!ENTITY torsettings.useBridges.default "éžæå
§å»ºçæ©æ¥">
-<!ENTITY torsettings.useBridges.default.placeholder "éžæç¶²æ©">
-<!ENTITY torsettings.useBridges.bridgeDB "åŸ torproject.org è«æ±ç¶²æ©">
+<!ENTITY torsettings.useBridges.default.placeholder "éžææ©æ¥">
+<!ENTITY torsettings.useBridges.bridgeDB "åŸ torproject.org è«æ±æ©æ¥">
<!ENTITY torsettings.useBridges.captchaSolution.placeholder "茞å
¥åçäžçæå">
<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "ç²åŸæ°çææ°">
<!ENTITY torsettings.useBridges.captchaSubmit "æäº€">
@@ -55,8 +55,8 @@
<!ENTITY torsettings.proxyHelp1 "ç¶æšééå
¬åžãåžæ ¡æè
倧åžç¶²è·¯é²è¡é£ç·æïŒæšå¯èœéèŠäžåæ¬å°ä»£ç䌺æåšãåŠææšäžç¢ºå®æ¯åŠéèŠä»£ç䌺æåšïŒè«åèå
¶ä»ç芜åšç網路èšå®æè
系統網路èšå®ã">
<!ENTITY torsettings.bridgeHelpTitle "æ©æ¥äžç¹Œåšä¹èªªæ">
-<!ENTITY torsettings.bridgeHelp1 "ç¶²æ©æ¯æªäœæŒå衚çäžç¹ŒïŒå¯ä»¥äœ¿åŸtor網絡æŽé£è¢«å±èœã äžåé¡å¥çç¶²æ©äœ¿çšäžåæ¹æ³èŠé¿å¯©æ¥ã. Â obfs䜿æšçéèšé¡äŒŒéšæ©çŒåºçéé³ïŒmeek䜿æšçéèšçèµ·äŸæ¯èšªåä»åçæåèäžæ¯torã">
-<!ENTITY torsettings.bridgeHelp2 "å çºæäºåå®¶å詊å±èœtorïŒäžäºç¹å®çç¶²æ©åªèœåšç¹å®çåå®¶çæåšå
¶ä»å°ååæå€±æŽ»ã åŠææšäžç¢ºå®åªäºç¶²æ©åšæšçåå®¶çæïŒè«èšªåtorproject.org/about/contact.html#supportã">
+<!ENTITY torsettings.bridgeHelp1 "æ©æ¥æ¯æªååºçäžç¹ŒïŒå¯ä»¥äœ¿åŸ Tor 網路æŽé£è¢«å°éã  äžåé¡åçæ©æ¥äœ¿çšäžåæ¹æ³èŠé¿å¯©æ¥ã  obfs 䜿æšçéèšé¡äŒŒéšæ©çŒåºçéé³ïŒmeek 䜿æšçéèšçèµ·äŸæ¯èšªåä»åçæåèäžæ¯ Torã">
+<!ENTITY torsettings.bridgeHelp2 "å çºæäºåå®¶å詊å°é TorïŒäžäºç¹å®çæ©æ¥åªèœåšç¹å®çåå®¶ææïŒåšå
¶ä»å°ååæå€±æã  åŠææšäžç¢ºå®åªäºæ©æ¥åšæšçåå®¶ææïŒè«èšªå torproject.org/about/contact.html#support">
<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "è«èå¿çåïŒæåæ£åšå»ºç«tor網絡ã éåéçšå°æéèŠå¹Ÿåéçæéã">
+<!ENTITY torprogress.pleaseWait "è«èå¿çåïŒæåæ£åšå»ºç« Tor 網路é£ç·ã  éåéçšå¯èœéèŠå¹Ÿåéçæéã">
diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties
index 12f03d9..47124e5 100644
--- a/src/chrome/locale/zh-TW/torlauncher.properties
+++ b/src/chrome/locale/zh-TW/torlauncher.properties
@@ -15,7 +15,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S 倱æ (%2$S)ã
torlauncher.unable_to_start_tor=ç¡æ³ååæŽè¥è·¯ç±ã\n\n%S
torlauncher.tor_missing=æŽè¥è·¯ç±å¯å·è¡æªéºå€±ã
torlauncher.torrc_missing=æŽè¥è·¯ç±çé
眮æä»¶éºå€±èäžç¡æ³åµå»ºã
-torlauncher.datadir_missing=æŽè¥è·¯ç±çè³æè·¯åŸäžŠäžååšïŒäžç¡æ³è¢«åµå»ºã
+torlauncher.datadir_missing=æŽè¥è·¯ç±çè³æå€ŸäžååšïŒäžç¡æ³è¢«åµå»ºã
torlauncher.password_hash_missing=ç¡æ³ååŸéæ¹éçå¯ç¢Œã
torlauncher.failed_to_get_settings=ç¡æ³æ·åæŽè¥è·¯ç±èšå®ã\n\n%S
@@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=æšå¿
é æå®äžå IP äœåæäž»æ©å
torlauncher.error_proxy_type_missing=æšå¿
é éžæä»£ç䌺æåšé¡åã
torlauncher.error_bridges_missing=æšå¿
é æå®äžåæå€åæ©æ¥ã
torlauncher.error_default_bridges_type_missing=æšå¿
é çºè©²æ©æ¥åšéžæäžçš®å³èŒžé¡åã
-torlauncher.error_bridgedb_bridges_missing=è«è«æ±äžåbridge
+torlauncher.error_bridgedb_bridges_missing=è«è«æ±äžåæ©æ¥
torlauncher.error_bridge_bad_default_type=æ²ææäŸå³èŒžé¡åçº %S çæ©æ¥åšãè«èª¿æŽæšçèšå®ã
torlauncher.bridge_suffix.meek-amazon=ïŒèœåšäžå䜿çšïŒ
torlauncher.bridge_suffix.meek-azure=ïŒèœåšäžå䜿çšïŒ
-torlauncher.request_a_bridge=è«æ±äžåbridge...
-torlauncher.request_a_new_bridge=è«æ±äžåæ°çbridge...
-torlauncher.contacting_bridgedb=飿¥å°BridgeDBïŒ è«çåŸ
ã
+torlauncher.request_a_bridge=è«æ±äžåæ©æ¥...
+torlauncher.request_a_new_bridge=è«æ±äžåæ°çæ©æ¥...
+torlauncher.contacting_bridgedb=æ£åšé£æ¥å° BridgeDBïŒè«çšçã
torlauncher.captcha_prompt=解決é©è碌äŸè«æ±æ©æ¥
torlauncher.bad_captcha_solution=è§£çäžæ£ç¢ºãè«åè©Šäžæ¬¡ã
torlauncher.unable_to_get_bridge=ç¡æ³åŸ BridgeDB ç²åŸæ©æ¥ã\n\n%S
torlauncher.no_meek=æ€çèŠœåšæ²æèšå®å¥œ meekïŒç²åŸæ©æ¥éèŠäœ¿çšå®ã
-torlauncher.no_bridges_available=æ±æïŒçŸå𿲿å¯ä»¥äœ¿çšçbridge
+torlauncher.no_bridges_available=æ±æïŒçŸå𿲿å¯ä»¥äœ¿çšçæ©æ¥ã
torlauncher.connect=é£ç·
torlauncher.restart_tor=éæ°ååæŽè¥è·¯ç±
1
0

[tor-browser-build/master] Update testsuite_git_commit: Add android-x86_64 to nightly builds
by boklm@torproject.org 27 Sep '19
by boklm@torproject.org 27 Sep '19
27 Sep '19
commit 3648313adf9f11f692055ef449be013ee36b4661
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Fri Sep 27 13:51:45 2019 +0200
Update testsuite_git_commit: Add android-x86_64 to nightly builds
---
tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml
index acc88f9..34d3929 100644
--- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml
+++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml
@@ -5,7 +5,7 @@ nightly_build_cron_minute: 20
nightly_build_keep_builds: 2
testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite"
testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git
-testsuite_git_commit: 6a2c39273bfd729446ef787e4f7d1bf3138cfc4a
+testsuite_git_commit: d5e23151bf4ff48146c0c33355fe70def5e4d3f2
nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www"
nightly_build_nginx_enable: true
nightly_build_nginx_listen: 127.0.0.1:80
1
0

[tor-browser-bundle-testsuite/master] Add android-x86_64 to nightly builds
by boklm@torproject.org 27 Sep '19
by boklm@torproject.org 27 Sep '19
27 Sep '19
commit d5e23151bf4ff48146c0c33355fe70def5e4d3f2
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Fri Sep 27 13:47:54 2019 +0200
Add android-x86_64 to nightly builds
---
TBBTestSuite/TestSuite/TorBrowserBuild.pm | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm
index a6def45..1389092 100644
--- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm
+++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm
@@ -104,6 +104,18 @@ sub set_tests {
publish_dir => 'nightly-android-x86',
},
{
+ name => 'nightly-android-x86_64',
+ descr => 'build tor-browser nightly android-x86_64',
+ type => 'rbm_build',
+ project => 'release',
+ targets => [
+ 'noversiondir',
+ 'nightly',
+ 'torbrowser-android-x86_64',
+ ],
+ publish_dir => 'nightly-android-x86_64',
+ },
+ {
name => 'nightly-android-aarch64',
descr => 'build tor-browser nightly android-aarch64',
type => 'rbm_build',
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 1MB. r=jrmuizel
by gk@torproject.org 27 Sep '19
by gk@torproject.org 27 Sep '19
27 Sep '19
commit e179405cb2f2e8fbbde1ce75b7d7dd9eadc2d4a0
Author: Lee Salzman <lsalzman(a)mozilla.com>
Date: Mon Sep 23 20:02:17 2019 +0000
Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 1MB. r=jrmuizel
Differential Revision: https://phabricator.services.mozilla.com/D46834
--HG--
extra : moz-landing-system : lando
---
gfx/layers/PaintThread.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp
index c35bf472d682..400e2d342b2f 100644
--- a/gfx/layers/PaintThread.cpp
+++ b/gfx/layers/PaintThread.cpp
@@ -79,7 +79,7 @@ static uint32_t GetPaintThreadStackSize() {
#else
// Workaround bug 1578075 by increasing the stack size of paint threads
if (nsCocoaFeatures::OnCatalinaOrLater()) {
- static const uint32_t kCatalinaPaintThreadStackSize = 512 * 1024;
+ static const uint32_t kCatalinaPaintThreadStackSize = 1024 * 1024;
static_assert(kCatalinaPaintThreadStackSize >= nsIThreadManager::DEFAULT_STACK_SIZE,
"update default stack size of paint "
"workers");
1
0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 2MB. r=jrmuizel
by gk@torproject.org 27 Sep '19
by gk@torproject.org 27 Sep '19
27 Sep '19
commit 7813cebd9f79de65d16e262ce79b675e7ec132c3
Author: Lee Salzman <lsalzman(a)mozilla.com>
Date: Thu Sep 26 02:31:15 2019 +0000
Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 2MB. r=jrmuizel
Still getting some crash reports on nightly with a 1MB stack. Let's try one more time
with 2MB just to see if we can eliminate those. If this fails, then we may need to consider
more drastic approaches like disabling OMTP in this case.
Differential Revision: https://phabricator.services.mozilla.com/D47080
--HG--
extra : moz-landing-system : lando
---
gfx/layers/PaintThread.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp
index 400e2d342b2f..40ba4d3954b1 100644
--- a/gfx/layers/PaintThread.cpp
+++ b/gfx/layers/PaintThread.cpp
@@ -79,7 +79,7 @@ static uint32_t GetPaintThreadStackSize() {
#else
// Workaround bug 1578075 by increasing the stack size of paint threads
if (nsCocoaFeatures::OnCatalinaOrLater()) {
- static const uint32_t kCatalinaPaintThreadStackSize = 1024 * 1024;
+ static const uint32_t kCatalinaPaintThreadStackSize = 2 * 1024 * 1024;
static_assert(kCatalinaPaintThreadStackSize >= nsIThreadManager::DEFAULT_STACK_SIZE,
"update default stack size of paint "
"workers");
1
0