tbb-commits
Threads by month
- ----- 2025 -----
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
January 2020
- 3 participants
- 73 discussions

[tor-launcher/master] Bug 32636: Clean up locales shipped with Tor Launcher
by sysrqb@torproject.org 03 Jan '20
by sysrqb@torproject.org 03 Jan '20
03 Jan '20
commit d95b8fa0448623bdd47b32b8b3ce60274bc3c540
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Mon Dec 16 16:57:15 2019 -0500
Bug 32636: Clean up locales shipped with Tor Launcher
Synchronize locale names with those that are used on Transifex and
remove old locales (the Transifex locale names were recently updated
to match the names that Mozilla uses).
Limit the locales that we ship to those for which we ship a localized
Tor Browser. The list is defined via a new BUNDLE_LOCALES variable
within localization/import-translations.sh (this is the same technique
that is used by Torbutton).
Pull in recent translation updates.
---
chrome.manifest | 127 +----------
jar.mn | 254 +--------------------
localization/import-translations.sh | 36 ++-
src/chrome/locale/ady/network-settings.dtd | 68 ------
src/chrome/locale/ady/torlauncher.properties | 75 ------
src/chrome/locale/af-ZA/network-settings.dtd | 5 -
src/chrome/locale/af-ZA/torlauncher.properties | 54 -----
src/chrome/locale/ak/network-settings.dtd | 68 ------
src/chrome/locale/ak/torlauncher.properties | 75 ------
src/chrome/locale/am-ET/network-settings.dtd | 77 -------
src/chrome/locale/am-ET/torlauncher.properties | 58 -----
src/chrome/locale/am/network-settings.dtd | 68 ------
src/chrome/locale/am/torlauncher.properties | 78 -------
src/chrome/locale/arn/network-settings.dtd | 68 ------
src/chrome/locale/arn/torlauncher.properties | 78 -------
src/chrome/locale/{gu => ast}/network-settings.dtd | 6 +-
.../locale/{es-CL => ast}/torlauncher.properties | 0
src/chrome/locale/bg-BG/network-settings.dtd | 5 -
src/chrome/locale/bg-BG/torlauncher.properties | 54 -----
src/chrome/locale/bn-BD/network-settings.dtd | 29 ++-
src/chrome/locale/bn-BD/torlauncher.properties | 28 ++-
src/chrome/locale/bn-IN/network-settings.dtd | 68 ------
src/chrome/locale/bn-IN/torlauncher.properties | 75 ------
src/chrome/locale/bn/network-settings.dtd | 83 -------
src/chrome/locale/bn/torlauncher.properties | 94 --------
src/chrome/locale/bo/network-settings.dtd | 68 ------
src/chrome/locale/bo/torlauncher.properties | 78 -------
src/chrome/locale/ca(a)valencia/network-settings.dtd | 56 -----
.../locale/ca(a)valencia/torlauncher.properties | 30 ---
src/chrome/locale/cs-CZ/network-settings.dtd | 77 -------
src/chrome/locale/cs-CZ/torlauncher.properties | 58 -----
src/chrome/locale/cs/network-settings.dtd | 10 +-
src/chrome/locale/cs/torlauncher.properties | 2 +-
src/chrome/locale/csb/network-settings.dtd | 68 ------
src/chrome/locale/csb/torlauncher.properties | 75 ------
src/chrome/locale/cv/network-settings.dtd | 68 ------
src/chrome/locale/cv/torlauncher.properties | 75 ------
src/chrome/locale/dz/network-settings.dtd | 68 ------
src/chrome/locale/dz/torlauncher.properties | 78 -------
src/chrome/locale/el-GR/network-settings.dtd | 5 -
src/chrome/locale/el-GR/torlauncher.properties | 54 -----
src/chrome/locale/es-CL/network-settings.dtd | 68 ------
src/chrome/locale/es-CO/network-settings.dtd | 68 ------
src/chrome/locale/es-CO/torlauncher.properties | 78 -------
.../locale/{es => es-ES}/network-settings.dtd | 0
.../locale/{es => es-ES}/torlauncher.properties | 0
src/chrome/locale/es-NI/network-settings.dtd | 5 -
src/chrome/locale/es-NI/torlauncher.properties | 55 -----
src/chrome/locale/fa/network-settings.dtd | 44 ++--
src/chrome/locale/fil/network-settings.dtd | 68 ------
src/chrome/locale/fil/torlauncher.properties | 78 -------
src/chrome/locale/fo/network-settings.dtd | 68 ------
src/chrome/locale/fo/torlauncher.properties | 78 -------
src/chrome/locale/fr-CA/network-settings.dtd | 68 ------
src/chrome/locale/fr-CA/torlauncher.properties | 75 ------
src/chrome/locale/fur/network-settings.dtd | 68 ------
src/chrome/locale/fur/torlauncher.properties | 78 -------
.../locale/{fy => fy-NL}/network-settings.dtd | 0
.../locale/{fy => fy-NL}/torlauncher.properties | 0
.../locale/{ga => ga-IE}/network-settings.dtd | 0
.../locale/{ga => ga-IE}/torlauncher.properties | 0
src/chrome/locale/gu-IN/network-settings.dtd | 21 +-
src/chrome/locale/gu-IN/torlauncher.properties | 28 ++-
src/chrome/locale/gu/torlauncher.properties | 94 --------
src/chrome/locale/gun/network-settings.dtd | 68 ------
src/chrome/locale/gun/torlauncher.properties | 75 ------
src/chrome/locale/ha/network-settings.dtd | 68 ------
src/chrome/locale/ha/torlauncher.properties | 75 ------
.../locale/{hi => hi-IN}/network-settings.dtd | 0
.../locale/{hi => hi-IN}/torlauncher.properties | 0
src/chrome/locale/hr-HR/network-settings.dtd | 68 ------
src/chrome/locale/hr-HR/torlauncher.properties | 94 --------
src/chrome/locale/ht/network-settings.dtd | 68 ------
src/chrome/locale/ht/torlauncher.properties | 78 -------
src/chrome/locale/hy-AM/network-settings.dtd | 92 ++++----
src/chrome/locale/hy-AM/torlauncher.properties | 62 +++--
src/chrome/locale/ia/network-settings.dtd | 68 ------
src/chrome/locale/ia/torlauncher.properties | 78 -------
src/chrome/locale/id/network-settings.dtd | 14 +-
src/chrome/locale/jv/network-settings.dtd | 68 ------
src/chrome/locale/jv/torlauncher.properties | 78 -------
src/chrome/locale/ko-KR/network-settings.dtd | 68 ------
src/chrome/locale/ko-KR/torlauncher.properties | 75 ------
src/chrome/locale/ko/network-settings.dtd | 10 +-
src/chrome/locale/ku/network-settings.dtd | 68 ------
src/chrome/locale/ku/torlauncher.properties | 78 -------
src/chrome/locale/kw/network-settings.dtd | 68 ------
src/chrome/locale/kw/torlauncher.properties | 75 ------
src/chrome/locale/ky/network-settings.dtd | 68 ------
src/chrome/locale/ky/torlauncher.properties | 78 -------
src/chrome/locale/lb/network-settings.dtd | 68 ------
src/chrome/locale/lb/torlauncher.properties | 78 -------
src/chrome/locale/lg/network-settings.dtd | 68 ------
src/chrome/locale/lg/torlauncher.properties | 78 -------
src/chrome/locale/ln/network-settings.dtd | 68 ------
src/chrome/locale/ln/torlauncher.properties | 78 -------
src/chrome/locale/lo/network-settings.dtd | 68 ------
src/chrome/locale/lo/torlauncher.properties | 78 -------
src/chrome/locale/lt/network-settings.dtd | 16 +-
src/chrome/locale/lt/torlauncher.properties | 26 +--
src/chrome/locale/mg/network-settings.dtd | 68 ------
src/chrome/locale/mg/torlauncher.properties | 78 -------
src/chrome/locale/mi/network-settings.dtd | 68 ------
src/chrome/locale/mi/torlauncher.properties | 78 -------
src/chrome/locale/mn/network-settings.dtd | 68 ------
src/chrome/locale/mn/torlauncher.properties | 78 -------
src/chrome/locale/ms-MY/network-settings.dtd | 83 -------
src/chrome/locale/ms-MY/torlauncher.properties | 94 --------
src/chrome/locale/mt/network-settings.dtd | 68 ------
src/chrome/locale/mt/torlauncher.properties | 78 -------
src/chrome/locale/nah/network-settings.dtd | 68 ------
src/chrome/locale/nah/torlauncher.properties | 78 -------
src/chrome/locale/nap/network-settings.dtd | 68 ------
src/chrome/locale/nap/torlauncher.properties | 78 -------
.../locale/{nb => nb-NO}/network-settings.dtd | 10 +-
.../locale/{nb => nb-NO}/torlauncher.properties | 0
src/chrome/locale/nds/network-settings.dtd | 68 ------
src/chrome/locale/nds/torlauncher.properties | 75 ------
.../locale/{nn => nn-NO}/network-settings.dtd | 0
.../locale/{nn => nn-NO}/torlauncher.properties | 0
src/chrome/locale/nso/network-settings.dtd | 68 ------
src/chrome/locale/nso/torlauncher.properties | 78 -------
src/chrome/locale/{hy => oc}/network-settings.dtd | 6 +-
.../locale/{hy => oc}/torlauncher.properties | 4 +-
.../locale/{pa => pa-IN}/network-settings.dtd | 0
.../locale/{pa => pa-IN}/torlauncher.properties | 0
src/chrome/locale/pap/network-settings.dtd | 68 ------
src/chrome/locale/pap/torlauncher.properties | 78 -------
src/chrome/locale/pl-PL/network-settings.dtd | 57 -----
src/chrome/locale/pl-PL/torlauncher.properties | 31 ---
src/chrome/locale/pms/network-settings.dtd | 68 ------
src/chrome/locale/pms/torlauncher.properties | 78 -------
src/chrome/locale/ps/network-settings.dtd | 68 ------
src/chrome/locale/ps/torlauncher.properties | 78 -------
src/chrome/locale/pt-PT/network-settings.dtd | 6 +-
src/chrome/locale/pt-PT/torlauncher.properties | 4 +-
src/chrome/locale/pt/network-settings.dtd | 68 ------
src/chrome/locale/pt/torlauncher.properties | 94 --------
src/chrome/locale/ro/network-settings.dtd | 26 +--
src/chrome/locale/ru(a)petr1708/network-settings.dtd | 68 ------
.../locale/ru(a)petr1708/torlauncher.properties | 78 -------
src/chrome/locale/sco/network-settings.dtd | 68 ------
src/chrome/locale/sco/torlauncher.properties | 78 -------
.../locale/{si-LK => si}/network-settings.dtd | 0
.../locale/{si-LK => si}/torlauncher.properties | 0
src/chrome/locale/sk-SK/network-settings.dtd | 68 ------
src/chrome/locale/sk-SK/torlauncher.properties | 78 -------
src/chrome/locale/sl-SI/network-settings.dtd | 68 ------
src/chrome/locale/sl-SI/torlauncher.properties | 78 -------
src/chrome/locale/sn/network-settings.dtd | 68 ------
src/chrome/locale/sn/torlauncher.properties | 78 -------
src/chrome/locale/so/network-settings.dtd | 68 ------
src/chrome/locale/so/torlauncher.properties | 78 -------
src/chrome/locale/sq-AL/network-settings.dtd | 77 -------
src/chrome/locale/sq-AL/torlauncher.properties | 58 -----
src/chrome/locale/sr(a)latin/network-settings.dtd | 68 ------
src/chrome/locale/sr(a)latin/torlauncher.properties | 78 -------
src/chrome/locale/st/network-settings.dtd | 68 ------
src/chrome/locale/st/torlauncher.properties | 78 -------
src/chrome/locale/su/network-settings.dtd | 68 ------
src/chrome/locale/su/torlauncher.properties | 75 ------
.../locale/{sv => sv-SE}/network-settings.dtd | 2 +-
.../locale/{sv => sv-SE}/torlauncher.properties | 0
src/chrome/locale/szl/network-settings.dtd | 68 ------
src/chrome/locale/szl/torlauncher.properties | 75 ------
src/chrome/locale/ta/network-settings.dtd | 2 +-
src/chrome/locale/te-IN/network-settings.dtd | 68 ------
src/chrome/locale/te-IN/torlauncher.properties | 75 ------
src/chrome/locale/tg/network-settings.dtd | 68 ------
src/chrome/locale/tg/torlauncher.properties | 78 -------
src/chrome/locale/ti/network-settings.dtd | 68 ------
src/chrome/locale/ti/torlauncher.properties | 78 -------
src/chrome/locale/tk/network-settings.dtd | 68 ------
src/chrome/locale/tk/torlauncher.properties | 78 -------
src/chrome/locale/tr/torlauncher.properties | 4 +-
src/chrome/locale/ur-PK/network-settings.dtd | 68 ------
src/chrome/locale/ur-PK/torlauncher.properties | 75 ------
src/chrome/locale/ve/network-settings.dtd | 68 ------
src/chrome/locale/ve/torlauncher.properties | 75 ------
src/chrome/locale/wa/network-settings.dtd | 68 ------
src/chrome/locale/wa/torlauncher.properties | 75 ------
src/chrome/locale/wo/network-settings.dtd | 68 ------
src/chrome/locale/wo/torlauncher.properties | 75 ------
.../locale/zh-CN.GB2312/network-settings.dtd | 5 -
.../locale/zh-CN.GB2312/torlauncher.properties | 49 ----
src/chrome/locale/zh-TW/network-settings.dtd | 22 +-
src/chrome/locale/zh/network-settings.dtd | 8 -
src/chrome/locale/zh/torlauncher.properties | 49 ----
src/chrome/locale/zu/network-settings.dtd | 68 ------
src/chrome/locale/zu/torlauncher.properties | 75 ------
190 files changed, 326 insertions(+), 10597 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index 8e044b0..1ee6e15 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -16,156 +16,37 @@ contract @torproject.org/torlauncher-process-service;1 {FE7B4CAF-BCF4-4848-8BFF-
category profile-after-change TorProcessService @torproject.org/torlauncher-process-service;1
locale torlauncher en-US chrome/locale/en-US/
-locale torlauncher ady chrome/locale/ady/
-locale torlauncher af chrome/locale/af/
-locale torlauncher af-ZA chrome/locale/af-ZA/
-locale torlauncher ak chrome/locale/ak/
-locale torlauncher am chrome/locale/am/
-locale torlauncher am-ET chrome/locale/am-ET/
locale torlauncher ar chrome/locale/ar/
-locale torlauncher arn chrome/locale/arn/
-locale torlauncher ast chrome/locale/ast/
-locale torlauncher az chrome/locale/az/
-locale torlauncher be chrome/locale/be/
-locale torlauncher bg chrome/locale/bg/
-locale torlauncher bg-BG chrome/locale/bg-BG/
-locale torlauncher bn chrome/locale/bn/
-locale torlauncher bn-BD chrome/locale/bn-BD/
-locale torlauncher bn-IN chrome/locale/bn-IN/
-locale torlauncher bo chrome/locale/bo/
-locale torlauncher br chrome/locale/br/
-locale torlauncher bs chrome/locale/bs/
locale torlauncher ca chrome/locale/ca/
-locale torlauncher ca@valencia chrome/locale/ca@valencia/
locale torlauncher cs chrome/locale/cs/
-locale torlauncher cs-CZ chrome/locale/cs-CZ/
-locale torlauncher csb chrome/locale/csb/
-locale torlauncher cv chrome/locale/cv/
-locale torlauncher cy chrome/locale/cy/
locale torlauncher da chrome/locale/da/
locale torlauncher de chrome/locale/de/
-locale torlauncher dz chrome/locale/dz/
locale torlauncher el chrome/locale/el/
-locale torlauncher el-GR chrome/locale/el-GR/
-locale torlauncher eo chrome/locale/eo/
-locale torlauncher es chrome/locale/es/
locale torlauncher es-AR chrome/locale/es-AR/
-locale torlauncher es-CL chrome/locale/es-CL/
-locale torlauncher es-CO chrome/locale/es-CO/
-locale torlauncher es-MX chrome/locale/es-MX/
-locale torlauncher es-NI chrome/locale/es-NI/
-locale torlauncher et chrome/locale/et/
-locale torlauncher eu chrome/locale/eu/
+locale torlauncher es-ES chrome/locale/es-ES/
locale torlauncher fa chrome/locale/fa/
-locale torlauncher fi chrome/locale/fi/
-locale torlauncher fil chrome/locale/fil/
-locale torlauncher fo chrome/locale/fo/
locale torlauncher fr chrome/locale/fr/
-locale torlauncher fr-CA chrome/locale/fr-CA/
-locale torlauncher fur chrome/locale/fur/
-locale torlauncher fy chrome/locale/fy/
-locale torlauncher ga chrome/locale/ga/
-locale torlauncher gl chrome/locale/gl/
-locale torlauncher gu chrome/locale/gu/
-locale torlauncher gu-IN chrome/locale/gu-IN/
-locale torlauncher gun chrome/locale/gun/
-locale torlauncher ha chrome/locale/ha/
+locale torlauncher ga-IE chrome/locale/ga-IE/
locale torlauncher he chrome/locale/he/
-locale torlauncher hi chrome/locale/hi/
-locale torlauncher hr chrome/locale/hr/
-locale torlauncher hr-HR chrome/locale/hr-HR/
-locale torlauncher ht chrome/locale/ht/
locale torlauncher hu chrome/locale/hu/
-locale torlauncher hy chrome/locale/hy/
-locale torlauncher hy-AM chrome/locale/hy-AM/
-locale torlauncher ia chrome/locale/ia/
locale torlauncher id chrome/locale/id/
locale torlauncher is chrome/locale/is/
locale torlauncher it chrome/locale/it/
locale torlauncher ja chrome/locale/ja/
-locale torlauncher jv chrome/locale/jv/
locale torlauncher ka chrome/locale/ka/
-locale torlauncher kk chrome/locale/kk/
-locale torlauncher km chrome/locale/km/
locale torlauncher ko chrome/locale/ko/
-locale torlauncher ko-KR chrome/locale/ko-KR/
-locale torlauncher ku chrome/locale/ku/
-locale torlauncher kw chrome/locale/kw/
-locale torlauncher ky chrome/locale/ky/
-locale torlauncher lb chrome/locale/lb/
-locale torlauncher lg chrome/locale/lg/
-locale torlauncher ln chrome/locale/ln/
-locale torlauncher lo chrome/locale/lo/
locale torlauncher lt chrome/locale/lt/
-locale torlauncher lv chrome/locale/lv/
-locale torlauncher mg chrome/locale/mg/
-locale torlauncher mi chrome/locale/mi/
locale torlauncher mk chrome/locale/mk/
-locale torlauncher ml chrome/locale/ml/
-locale torlauncher mn chrome/locale/mn/
-locale torlauncher mr chrome/locale/mr/
locale torlauncher ms chrome/locale/ms/
-locale torlauncher ms-MY chrome/locale/ms-MY/
-locale torlauncher mt chrome/locale/mt/
-locale torlauncher my chrome/locale/my/
-locale torlauncher nah chrome/locale/nah/
-locale torlauncher nap chrome/locale/nap/
-locale torlauncher nb chrome/locale/nb/
-locale torlauncher nds chrome/locale/nds/
-locale torlauncher ne chrome/locale/ne/
+locale torlauncher nb-NO chrome/locale/nb-NO/
locale torlauncher nl chrome/locale/nl/
-locale torlauncher nl-BE chrome/locale/nl-BE/
-locale torlauncher nn chrome/locale/nn/
-locale torlauncher nso chrome/locale/nso/
-locale torlauncher oc chrome/locale/oc/
-locale torlauncher pa chrome/locale/pa/
-locale torlauncher pap chrome/locale/pap/
locale torlauncher pl chrome/locale/pl/
-locale torlauncher pl-PL chrome/locale/pl-PL/
-locale torlauncher pms chrome/locale/pms/
-locale torlauncher ps chrome/locale/ps/
-locale torlauncher pt chrome/locale/pt/
locale torlauncher pt-BR chrome/locale/pt-BR/
-locale torlauncher pt-PT chrome/locale/pt-PT/
locale torlauncher ro chrome/locale/ro/
locale torlauncher ru chrome/locale/ru/
-locale torlauncher ru@petr1708 chrome/locale/ru@petr1708/
-locale torlauncher sco chrome/locale/sco/
-locale torlauncher si-LK chrome/locale/si-LK/
-locale torlauncher sk chrome/locale/sk/
-locale torlauncher sk-SK chrome/locale/sk-SK/
-locale torlauncher sl chrome/locale/sl/
-locale torlauncher sl-SI chrome/locale/sl-SI/
-locale torlauncher sn chrome/locale/sn/
-locale torlauncher so chrome/locale/so/
-locale torlauncher sq chrome/locale/sq/
-locale torlauncher sq-AL chrome/locale/sq-AL/
-locale torlauncher sr chrome/locale/sr/
-locale torlauncher sr@latin chrome/locale/sr@latin/
-locale torlauncher st chrome/locale/st/
-locale torlauncher su chrome/locale/su/
-locale torlauncher sv chrome/locale/sv/
-locale torlauncher sw chrome/locale/sw/
-locale torlauncher szl chrome/locale/szl/
-locale torlauncher ta chrome/locale/ta/
-locale torlauncher te chrome/locale/te/
-locale torlauncher te-IN chrome/locale/te-IN/
-locale torlauncher tg chrome/locale/tg/
+locale torlauncher sv-SE chrome/locale/sv-SE/
locale torlauncher th chrome/locale/th/
-locale torlauncher ti chrome/locale/ti/
-locale torlauncher tk chrome/locale/tk/
locale torlauncher tr chrome/locale/tr/
-locale torlauncher uk chrome/locale/uk/
-locale torlauncher ur chrome/locale/ur/
-locale torlauncher ur-PK chrome/locale/ur-PK/
-locale torlauncher uz chrome/locale/uz/
-locale torlauncher ve chrome/locale/ve/
locale torlauncher vi chrome/locale/vi/
-locale torlauncher wa chrome/locale/wa/
-locale torlauncher wo chrome/locale/wo/
-locale torlauncher zh chrome/locale/zh/
locale torlauncher zh-CN chrome/locale/zh-CN/
-locale torlauncher zh-CN.GB2312 chrome/locale/zh-CN.GB2312/
-locale torlauncher zh-HK chrome/locale/zh-HK/
locale torlauncher zh-TW chrome/locale/zh-TW/
-locale torlauncher zu chrome/locale/zu/
diff --git a/jar.mn b/jar.mn
index 87710dd..8947a82 100644
--- a/jar.mn
+++ b/jar.mn
@@ -25,132 +25,32 @@ torlauncher.jar:
% locale torlauncher en-US %locale/en-US/
locale/en-US/ (src/chrome/locale/en-US/*)
-% locale torlauncher ady %locale/ady/
- locale/ady/ (src/chrome/locale/ady/*)
-% locale torlauncher af %locale/af/
- locale/af/ (src/chrome/locale/af/*)
-% locale torlauncher af-ZA %locale/af-ZA/
- locale/af-ZA/ (src/chrome/locale/af-ZA/*)
-% locale torlauncher ak %locale/ak/
- locale/ak/ (src/chrome/locale/ak/*)
-% locale torlauncher am %locale/am/
- locale/am/ (src/chrome/locale/am/*)
-% locale torlauncher am-ET %locale/am-ET/
- locale/am-ET/ (src/chrome/locale/am-ET/*)
% locale torlauncher ar %locale/ar/
locale/ar/ (src/chrome/locale/ar/*)
-% locale torlauncher arn %locale/arn/
- locale/arn/ (src/chrome/locale/arn/*)
-% locale torlauncher ast %locale/ast/
- locale/ast/ (src/chrome/locale/ast/*)
-% locale torlauncher az %locale/az/
- locale/az/ (src/chrome/locale/az/*)
-% locale torlauncher be %locale/be/
- locale/be/ (src/chrome/locale/be/*)
-% locale torlauncher bg %locale/bg/
- locale/bg/ (src/chrome/locale/bg/*)
-% locale torlauncher bg-BG %locale/bg-BG/
- locale/bg-BG/ (src/chrome/locale/bg-BG/*)
-% locale torlauncher bn %locale/bn/
- locale/bn/ (src/chrome/locale/bn/*)
-% locale torlauncher bn-BD %locale/bn-BD/
- locale/bn-BD/ (src/chrome/locale/bn-BD/*)
-% locale torlauncher bn-IN %locale/bn-IN/
- locale/bn-IN/ (src/chrome/locale/bn-IN/*)
-% locale torlauncher bo %locale/bo/
- locale/bo/ (src/chrome/locale/bo/*)
-% locale torlauncher br %locale/br/
- locale/br/ (src/chrome/locale/br/*)
-% locale torlauncher bs %locale/bs/
- locale/bs/ (src/chrome/locale/bs/*)
% locale torlauncher ca %locale/ca/
locale/ca/ (src/chrome/locale/ca/*)
-% locale torlauncher ca@valencia %locale/ca@valencia/
- locale/ca@valencia/ (src/chrome/locale/ca@valencia/*)
% locale torlauncher cs %locale/cs/
locale/cs/ (src/chrome/locale/cs/*)
-% locale torlauncher cs-CZ %locale/cs-CZ/
- locale/cs-CZ/ (src/chrome/locale/cs-CZ/*)
-% locale torlauncher csb %locale/csb/
- locale/csb/ (src/chrome/locale/csb/*)
-% locale torlauncher cv %locale/cv/
- locale/cv/ (src/chrome/locale/cv/*)
-% locale torlauncher cy %locale/cy/
- locale/cy/ (src/chrome/locale/cy/*)
% locale torlauncher da %locale/da/
locale/da/ (src/chrome/locale/da/*)
% locale torlauncher de %locale/de/
locale/de/ (src/chrome/locale/de/*)
-% locale torlauncher dz %locale/dz/
- locale/dz/ (src/chrome/locale/dz/*)
% locale torlauncher el %locale/el/
locale/el/ (src/chrome/locale/el/*)
-% locale torlauncher el-GR %locale/el-GR/
- locale/el-GR/ (src/chrome/locale/el-GR/*)
-% locale torlauncher eo %locale/eo/
- locale/eo/ (src/chrome/locale/eo/*)
-% locale torlauncher es %locale/es/
- locale/es/ (src/chrome/locale/es/*)
% locale torlauncher es-AR %locale/es-AR/
locale/es-AR/ (src/chrome/locale/es-AR/*)
-% locale torlauncher es-CL %locale/es-CL/
- locale/es-CL/ (src/chrome/locale/es-CL/*)
-% locale torlauncher es-CO %locale/es-CO/
- locale/es-CO/ (src/chrome/locale/es-CO/*)
-% locale torlauncher es-MX %locale/es-MX/
- locale/es-MX/ (src/chrome/locale/es-MX/*)
-% locale torlauncher es-NI %locale/es-NI/
- locale/es-NI/ (src/chrome/locale/es-NI/*)
-% locale torlauncher et %locale/et/
- locale/et/ (src/chrome/locale/et/*)
-% locale torlauncher eu %locale/eu/
- locale/eu/ (src/chrome/locale/eu/*)
+% locale torlauncher es-ES %locale/es-ES/
+ locale/es-ES/ (src/chrome/locale/es-ES/*)
% locale torlauncher fa %locale/fa/
locale/fa/ (src/chrome/locale/fa/*)
-% locale torlauncher fi %locale/fi/
- locale/fi/ (src/chrome/locale/fi/*)
-% locale torlauncher fil %locale/fil/
- locale/fil/ (src/chrome/locale/fil/*)
-% locale torlauncher fo %locale/fo/
- locale/fo/ (src/chrome/locale/fo/*)
% locale torlauncher fr %locale/fr/
locale/fr/ (src/chrome/locale/fr/*)
-% locale torlauncher fr-CA %locale/fr-CA/
- locale/fr-CA/ (src/chrome/locale/fr-CA/*)
-% locale torlauncher fur %locale/fur/
- locale/fur/ (src/chrome/locale/fur/*)
-% locale torlauncher fy %locale/fy/
- locale/fy/ (src/chrome/locale/fy/*)
-% locale torlauncher ga %locale/ga/
- locale/ga/ (src/chrome/locale/ga/*)
-% locale torlauncher gl %locale/gl/
- locale/gl/ (src/chrome/locale/gl/*)
-% locale torlauncher gu %locale/gu/
- locale/gu/ (src/chrome/locale/gu/*)
-% locale torlauncher gu-IN %locale/gu-IN/
- locale/gu-IN/ (src/chrome/locale/gu-IN/*)
-% locale torlauncher gun %locale/gun/
- locale/gun/ (src/chrome/locale/gun/*)
-% locale torlauncher ha %locale/ha/
- locale/ha/ (src/chrome/locale/ha/*)
+% locale torlauncher ga-IE %locale/ga-IE/
+ locale/ga-IE/ (src/chrome/locale/ga-IE/*)
% locale torlauncher he %locale/he/
locale/he/ (src/chrome/locale/he/*)
-% locale torlauncher hi %locale/hi/
- locale/hi/ (src/chrome/locale/hi/*)
-% locale torlauncher hr %locale/hr/
- locale/hr/ (src/chrome/locale/hr/*)
-% locale torlauncher hr-HR %locale/hr-HR/
- locale/hr-HR/ (src/chrome/locale/hr-HR/*)
-% locale torlauncher ht %locale/ht/
- locale/ht/ (src/chrome/locale/ht/*)
% locale torlauncher hu %locale/hu/
locale/hu/ (src/chrome/locale/hu/*)
-% locale torlauncher hy %locale/hy/
- locale/hy/ (src/chrome/locale/hy/*)
-% locale torlauncher hy-AM %locale/hy-AM/
- locale/hy-AM/ (src/chrome/locale/hy-AM/*)
-% locale torlauncher ia %locale/ia/
- locale/ia/ (src/chrome/locale/ia/*)
% locale torlauncher id %locale/id/
locale/id/ (src/chrome/locale/id/*)
% locale torlauncher is %locale/is/
@@ -159,175 +59,37 @@ torlauncher.jar:
locale/it/ (src/chrome/locale/it/*)
% locale torlauncher ja %locale/ja/
locale/ja/ (src/chrome/locale/ja/*)
-% locale torlauncher jv %locale/jv/
- locale/jv/ (src/chrome/locale/jv/*)
% locale torlauncher ka %locale/ka/
locale/ka/ (src/chrome/locale/ka/*)
-% locale torlauncher kk %locale/kk/
- locale/kk/ (src/chrome/locale/kk/*)
-% locale torlauncher km %locale/km/
- locale/km/ (src/chrome/locale/km/*)
% locale torlauncher ko %locale/ko/
locale/ko/ (src/chrome/locale/ko/*)
-% locale torlauncher ko-KR %locale/ko-KR/
- locale/ko-KR/ (src/chrome/locale/ko-KR/*)
-% locale torlauncher ku %locale/ku/
- locale/ku/ (src/chrome/locale/ku/*)
-% locale torlauncher kw %locale/kw/
- locale/kw/ (src/chrome/locale/kw/*)
-% locale torlauncher ky %locale/ky/
- locale/ky/ (src/chrome/locale/ky/*)
-% locale torlauncher lb %locale/lb/
- locale/lb/ (src/chrome/locale/lb/*)
-% locale torlauncher lg %locale/lg/
- locale/lg/ (src/chrome/locale/lg/*)
-% locale torlauncher ln %locale/ln/
- locale/ln/ (src/chrome/locale/ln/*)
-% locale torlauncher lo %locale/lo/
- locale/lo/ (src/chrome/locale/lo/*)
% locale torlauncher lt %locale/lt/
locale/lt/ (src/chrome/locale/lt/*)
-% locale torlauncher lv %locale/lv/
- locale/lv/ (src/chrome/locale/lv/*)
-% locale torlauncher mg %locale/mg/
- locale/mg/ (src/chrome/locale/mg/*)
-% locale torlauncher mi %locale/mi/
- locale/mi/ (src/chrome/locale/mi/*)
% locale torlauncher mk %locale/mk/
locale/mk/ (src/chrome/locale/mk/*)
-% locale torlauncher ml %locale/ml/
- locale/ml/ (src/chrome/locale/ml/*)
-% locale torlauncher mn %locale/mn/
- locale/mn/ (src/chrome/locale/mn/*)
-% locale torlauncher mr %locale/mr/
- locale/mr/ (src/chrome/locale/mr/*)
% locale torlauncher ms %locale/ms/
locale/ms/ (src/chrome/locale/ms/*)
-% locale torlauncher ms-MY %locale/ms-MY/
- locale/ms-MY/ (src/chrome/locale/ms-MY/*)
-% locale torlauncher mt %locale/mt/
- locale/mt/ (src/chrome/locale/mt/*)
-% locale torlauncher my %locale/my/
- locale/my/ (src/chrome/locale/my/*)
-% locale torlauncher nah %locale/nah/
- locale/nah/ (src/chrome/locale/nah/*)
-% locale torlauncher nap %locale/nap/
- locale/nap/ (src/chrome/locale/nap/*)
-% locale torlauncher nb %locale/nb/
- locale/nb/ (src/chrome/locale/nb/*)
-% locale torlauncher nds %locale/nds/
- locale/nds/ (src/chrome/locale/nds/*)
-% locale torlauncher ne %locale/ne/
- locale/ne/ (src/chrome/locale/ne/*)
+% locale torlauncher nb-NO %locale/nb-NO/
+ locale/nb-NO/ (src/chrome/locale/nb-NO/*)
% locale torlauncher nl %locale/nl/
locale/nl/ (src/chrome/locale/nl/*)
-% locale torlauncher nl-BE %locale/nl-BE/
- locale/nl-BE/ (src/chrome/locale/nl-BE/*)
-% locale torlauncher nn %locale/nn/
- locale/nn/ (src/chrome/locale/nn/*)
-% locale torlauncher nso %locale/nso/
- locale/nso/ (src/chrome/locale/nso/*)
-% locale torlauncher oc %locale/oc/
- locale/oc/ (src/chrome/locale/oc/*)
-% locale torlauncher pa %locale/pa/
- locale/pa/ (src/chrome/locale/pa/*)
-% locale torlauncher pap %locale/pap/
- locale/pap/ (src/chrome/locale/pap/*)
% locale torlauncher pl %locale/pl/
locale/pl/ (src/chrome/locale/pl/*)
-% locale torlauncher pl-PL %locale/pl-PL/
- locale/pl-PL/ (src/chrome/locale/pl-PL/*)
-% locale torlauncher pms %locale/pms/
- locale/pms/ (src/chrome/locale/pms/*)
-% locale torlauncher ps %locale/ps/
- locale/ps/ (src/chrome/locale/ps/*)
-% locale torlauncher pt %locale/pt/
- locale/pt/ (src/chrome/locale/pt/*)
% locale torlauncher pt-BR %locale/pt-BR/
locale/pt-BR/ (src/chrome/locale/pt-BR/*)
-% locale torlauncher pt-PT %locale/pt-PT/
- locale/pt-PT/ (src/chrome/locale/pt-PT/*)
% locale torlauncher ro %locale/ro/
locale/ro/ (src/chrome/locale/ro/*)
% locale torlauncher ru %locale/ru/
locale/ru/ (src/chrome/locale/ru/*)
-% locale torlauncher ru@petr1708 %locale/ru@petr1708/
- locale/ru@petr1708/ (src/chrome/locale/ru@petr1708/*)
-% locale torlauncher sco %locale/sco/
- locale/sco/ (src/chrome/locale/sco/*)
-% locale torlauncher si-LK %locale/si-LK/
- locale/si-LK/ (src/chrome/locale/si-LK/*)
-% locale torlauncher sk %locale/sk/
- locale/sk/ (src/chrome/locale/sk/*)
-% locale torlauncher sk-SK %locale/sk-SK/
- locale/sk-SK/ (src/chrome/locale/sk-SK/*)
-% locale torlauncher sl %locale/sl/
- locale/sl/ (src/chrome/locale/sl/*)
-% locale torlauncher sl-SI %locale/sl-SI/
- locale/sl-SI/ (src/chrome/locale/sl-SI/*)
-% locale torlauncher sn %locale/sn/
- locale/sn/ (src/chrome/locale/sn/*)
-% locale torlauncher so %locale/so/
- locale/so/ (src/chrome/locale/so/*)
-% locale torlauncher sq %locale/sq/
- locale/sq/ (src/chrome/locale/sq/*)
-% locale torlauncher sq-AL %locale/sq-AL/
- locale/sq-AL/ (src/chrome/locale/sq-AL/*)
-% locale torlauncher sr %locale/sr/
- locale/sr/ (src/chrome/locale/sr/*)
-% locale torlauncher sr@latin %locale/sr@latin/
- locale/sr@latin/ (src/chrome/locale/sr@latin/*)
-% locale torlauncher st %locale/st/
- locale/st/ (src/chrome/locale/st/*)
-% locale torlauncher su %locale/su/
- locale/su/ (src/chrome/locale/su/*)
-% locale torlauncher sv %locale/sv/
- locale/sv/ (src/chrome/locale/sv/*)
-% locale torlauncher sw %locale/sw/
- locale/sw/ (src/chrome/locale/sw/*)
-% locale torlauncher szl %locale/szl/
- locale/szl/ (src/chrome/locale/szl/*)
-% locale torlauncher ta %locale/ta/
- locale/ta/ (src/chrome/locale/ta/*)
-% locale torlauncher te %locale/te/
- locale/te/ (src/chrome/locale/te/*)
-% locale torlauncher te-IN %locale/te-IN/
- locale/te-IN/ (src/chrome/locale/te-IN/*)
-% locale torlauncher tg %locale/tg/
- locale/tg/ (src/chrome/locale/tg/*)
+% locale torlauncher sv-SE %locale/sv-SE/
+ locale/sv-SE/ (src/chrome/locale/sv-SE/*)
% locale torlauncher th %locale/th/
locale/th/ (src/chrome/locale/th/*)
-% locale torlauncher ti %locale/ti/
- locale/ti/ (src/chrome/locale/ti/*)
-% locale torlauncher tk %locale/tk/
- locale/tk/ (src/chrome/locale/tk/*)
% locale torlauncher tr %locale/tr/
locale/tr/ (src/chrome/locale/tr/*)
-% locale torlauncher uk %locale/uk/
- locale/uk/ (src/chrome/locale/uk/*)
-% locale torlauncher ur %locale/ur/
- locale/ur/ (src/chrome/locale/ur/*)
-% locale torlauncher ur-PK %locale/ur-PK/
- locale/ur-PK/ (src/chrome/locale/ur-PK/*)
-% locale torlauncher uz %locale/uz/
- locale/uz/ (src/chrome/locale/uz/*)
-% locale torlauncher ve %locale/ve/
- locale/ve/ (src/chrome/locale/ve/*)
% locale torlauncher vi %locale/vi/
locale/vi/ (src/chrome/locale/vi/*)
-% locale torlauncher wa %locale/wa/
- locale/wa/ (src/chrome/locale/wa/*)
-% locale torlauncher wo %locale/wo/
- locale/wo/ (src/chrome/locale/wo/*)
-% locale torlauncher zh %locale/zh/
- locale/zh/ (src/chrome/locale/zh/*)
% locale torlauncher zh-CN %locale/zh-CN/
locale/zh-CN/ (src/chrome/locale/zh-CN/*)
-% locale torlauncher zh-CN.GB2312 %locale/zh-CN.GB2312/
- locale/zh-CN.GB2312/ (src/chrome/locale/zh-CN.GB2312/*)
-% locale torlauncher zh-HK %locale/zh-HK/
- locale/zh-HK/ (src/chrome/locale/zh-HK/*)
% locale torlauncher zh-TW %locale/zh-TW/
locale/zh-TW/ (src/chrome/locale/zh-TW/*)
-% locale torlauncher zu %locale/zu/
- locale/zu/ (src/chrome/locale/zu/*)
diff --git a/localization/import-translations.sh b/localization/import-translations.sh
index a1d9bd4..181560f 100755
--- a/localization/import-translations.sh
+++ b/localization/import-translations.sh
@@ -3,6 +3,10 @@
### Copyright (c) 2019, The Tor Project, Inc.
### See LICENSE for licensing information.
+# This var comes from the TBB locale list.
+# XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync
+BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko lt mk ms nb-NO nl pl pt-BR ro ru sv-SE th tr vi zh-CN zh-TW"
+
TRANSLATION_BRANCHES="
tor-launcher-network-settings
tor-launcher-properties
@@ -39,8 +43,7 @@ cd ..
# Remove all locales that are missing one or more string files.
# Remove all locales for which no translation has been done.
-# Re-create the chrome.manifest and jar.mn files by appending to templates.
-echo "Removing incomplete locales; updating chrome.manifest and jar.mn"
+echo "Removing incomplete locales"
cd ../src/chrome/locale
CHROME_MANIFEST=../../../chrome.manifest
JAR_MN=../../../jar.mn
@@ -54,7 +57,7 @@ for locale in *; do
omit_locale=0
for f in ${REQUIRED_TRANSLATION_FILES}; do
if [ ! -e "${locale}/${f}" ]; then
- echo "Removing locale ${locale} due to missing resource ${f}"
+ echo " removing locale ${locale} due to missing resource ${f}"
omit_locale=1
break
fi
@@ -62,18 +65,29 @@ for locale in *; do
if [ ${omit_locale} -eq 0 ]; then
diff -r en-US "${locale}" > /dev/null
if [ $? -eq 0 ]; then
- echo "Removing locale ${locale} because it has the same content as en-US"
+ echo " removing locale ${locale} because it has the same content as en-US"
omit_locale=1
fi
fi
if [ ${omit_locale} -ne 0 ]; then
rm -rf "${locale}"
- else
- echo "locale torlauncher ${locale} chrome/locale/${locale}/" >> \
- ${CHROME_MANIFEST}
- echo "% locale torlauncher ${locale} %locale/${locale}/" >> \
- ${JAR_MN}
- echo " locale/${locale}/ (src/chrome/locale/${locale}/*)" >> \
- ${JAR_MN}
fi
done
+
+# Re-create the chrome.manifest and jar.mn files from the BUNDLE_LOCALES list
+# (by appending to templates).
+echo "Updating chrome.manifest and jar.mn"
+echo " locales to be included in the package: $BUNDLE_LOCALES"
+for locale in $BUNDLE_LOCALES; do
+ if [ ! -d "$locale" ]; then
+ echo "Error: missing locale $locale" 1>&2
+ exit 1
+ fi
+
+ echo "locale torlauncher ${locale} chrome/locale/${locale}/" >> \
+ ${CHROME_MANIFEST}
+ echo "% locale torlauncher ${locale} %locale/${locale}/" >> \
+ ${JAR_MN}
+ echo " locale/${locale}/ (src/chrome/locale/${locale}/*)" >> \
+ ${JAR_MN}
+done
diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd
deleted file mode 100644
index 247385b..0000000
--- a/src/chrome/locale/ady/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed.">
-
-<!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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/ady/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/af-ZA/network-settings.dtd b/src/chrome/locale/af-ZA/network-settings.dtd
deleted file mode 100644
index 24db3c8..0000000
--- a/src/chrome/locale/af-ZA/network-settings.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/af-ZA/torlauncher.properties b/src/chrome/locale/af-ZA/torlauncher.properties
deleted file mode 100644
index 376904d..0000000
--- a/src/chrome/locale/af-ZA/torlauncher.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-### Copyright (c) 2014, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
-torlauncher.password_hash_missing=Failed to get hashed password.
-
-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.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_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
-
-torlauncher.recommended_bridge=(recommended)
-
-torlauncher.connect=Connect
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-
-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.done=Connected to the Tor network!
-
-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
diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/ak/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/ak/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd
deleted file mode 100644
index 666d19a..0000000
--- a/src/chrome/locale/am-ET/network-settings.dtd
+++ /dev/null
@@ -1,77 +0,0 @@
-<!ENTITY torsettings.dialog.title "የቶር ኔትዎርክ አደረጃጀት">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
-
-<!ENTITY torSettings.yes "Yes">
-<!ENTITY torSettings.no "No">
-
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
-<!ENTITY torSettings.connect "Connect">
-
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
-<!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
-<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
-<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "Optional">
-
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type">
-<!ENTITY torsettings.useProxy.address "Address">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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 "My Internet Service Provider (ISP) blocks connections to the Tor network">
-<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
-<!ENTITY torsettings.useBridges.type "Transport type:">
-<!ENTITY torsettings.useBridges.custom "Enter custom bridges">
-<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "type address:port">
-
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
-<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
-<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
-<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
-<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request.">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/am-ET/torlauncher.properties b/src/chrome/locale/am-ET/torlauncher.properties
deleted file mode 100644
index da5641e..0000000
--- a/src/chrome/locale/am-ET/torlauncher.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-### Copyright (c) 2014, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
-torlauncher.password_hash_missing=Failed to get hashed password.
-
-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.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_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
-
-torlauncher.recommended_bridge=(recommended)
-
-torlauncher.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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
diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd
deleted file mode 100644
index 4d89bce..0000000
--- a/src/chrome/locale/am/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "አገናኝ">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties
deleted file mode 100644
index be395d5..0000000
--- a/src/chrome/locale/am/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=አገናኝ
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=አቋርጥ
-torlauncher.quit_win=ቅጣ
-torlauncher.done=ተሰርቷል
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/arn/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/arn/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd
similarity index 97%
rename from src/chrome/locale/gu/network-settings.dtd
rename to src/chrome/locale/ast/network-settings.dtd
index 2e013e8..a087026 100644
--- a/src/chrome/locale/gu/network-settings.dtd
+++ b/src/chrome/locale/ast/network-settings.dtd
@@ -32,7 +32,7 @@
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
<!ENTITY torsettings.useProxy.port "Port">
<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "પાસવર્ડ">
+<!ENTITY torsettings.useProxy.password "Contraseña">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
@@ -62,7 +62,7 @@
<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.categoryTitle "ટોર">
+<!ENTITY torPreferences.categoryTitle "Tor">
<!ENTITY torPreferences.torSettings "Tor Settings">
<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
<!ENTITY torPreferences.learnMore "Learn More">
@@ -71,7 +71,7 @@
<!ENTITY torPreferences.useBridge "Use a bridge">
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
-<!ENTITY torPreferences.advanced "અદ્યતન">
+<!ENTITY torPreferences.advanced "Avanzao">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/es-CL/torlauncher.properties
rename to src/chrome/locale/ast/torlauncher.properties
diff --git a/src/chrome/locale/bg-BG/network-settings.dtd b/src/chrome/locale/bg-BG/network-settings.dtd
deleted file mode 100644
index 24db3c8..0000000
--- a/src/chrome/locale/bg-BG/network-settings.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/bg-BG/torlauncher.properties b/src/chrome/locale/bg-BG/torlauncher.properties
deleted file mode 100644
index 376904d..0000000
--- a/src/chrome/locale/bg-BG/torlauncher.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-### Copyright (c) 2014, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
-torlauncher.password_hash_missing=Failed to get hashed password.
-
-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.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_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
-
-torlauncher.recommended_bridge=(recommended)
-
-torlauncher.connect=Connect
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-
-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.done=Connected to the Tor network!
-
-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
diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd
index d18fc76..7abd3a8 100644
--- a/src/chrome/locale/bn-BD/network-settings.dtd
+++ b/src/chrome/locale/bn-BD/network-settings.dtd
@@ -26,18 +26,18 @@
<!ENTITY torsettings.optional "ঐচ্ছিক">
<!ENTITY torsettings.useProxy.checkbox "আমি ইন্টারনেটে সংযোগ স্থাপন করতে প্রক্সি ব্যবহার করি">
-<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার">
+<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার:">
<!ENTITY torsettings.useProxy.type.placeholder "একটি প্রক্সি টাইপ নির্বাচন করুন">
-<!ENTITY torsettings.useProxy.address "ঠিকানা">
+<!ENTITY torsettings.useProxy.address "ঠিকানা:">
<!ENTITY torsettings.useProxy.address.placeholder "আইপি ঠিকানা বা হোস্টনাম">
-<!ENTITY torsettings.useProxy.port "পোর্টঃ">
+<!ENTITY torsettings.useProxy.port "বন্দর">
<!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 "এই কম্পিউটারটি একটি ফায়ারওয়ালের মাধ্যমে যায় যা কেবলমাত্র কিছু পোর্টের সংযোগের অনুমতি দেয়">
-<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ">
+<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ:">
<!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়">
<!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন">
<!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন">
@@ -59,10 +59,25 @@
<!ENTITY torsettings.bridgeHelp2 "কিছু দেশ টোরকে বাধা দেওয়ার চেষ্টা করে কেন, কিছু কিছু ব্রিজ নির্দিষ্ট দেশে কাজ করে কিন্তু অন্যদের নয়।   আপনার দেশে কোন ব্রিজগুলি কাজ করে তা যদি আপনি অনিশ্চিত থাকেন, তাহলে torproject.org/about/contact.html#support দেখুন">
<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কে একটি সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন। এই কয়েক মিনিট সময় নিতে পারে.">
+<!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কে একটি সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন।   এই কয়েক মিনিট সময় নিতে পারে.">
-<!-- #31286 about:preferences strings -->
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Tor">
+<!ENTITY torPreferences.torSettings "টর সেটিংস">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser আপনার ট্র্যাফিকটি সারা বিশ্বে হাজার হাজার স্বেচ্ছাসেবীর দ্বারা পরিচালিত টর নেটওয়ার্কের পথে নিয়ে যায়।" >
+<!ENTITY torPreferences.learnMore "আরও জানুন">
+<!ENTITY torPreferences.bridges "ব্রিজ">
+<!ENTITY torPreferences.bridgesDescription "ব্রিজগুলি যেখানে টরকে অবরুদ্ধ করা হয়েছে সেখানে টর নেটওয়ার্ক অ্যাক্সেস করতে আপনাকে সহায়তা করে। আপনি কোথায় আছেন তার উপর নির্ভর করে একটি সেতু অন্যের চেয়ে ভাল কাজ করতে পারে।">
+<!ENTITY torPreferences.useBridge "একটি ব্রিজ ব্যবহার করুন">
<!ENTITY torPreferences.requestNewBridge "একটি নতুন ব্রিজ অনুরোধ করুন">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "ব্রিজডিবি এ যোগাযোগ করা হচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন.">
+<!ENTITY torPreferences.provideBridge "একটি ব্রিজ সরবরাহ করুন">
+<!ENTITY torPreferences.advanced "অগ্রবর্তী">
+<!ENTITY torPreferences.advancedDescription "Tor Browser কীভাবে ইন্টারনেটে সংযুক্ত হয় তা কনফিগার করুন।">
+<!ENTITY torPreferences.firewallPortsPlaceholder "কমা পৃথক করা মান">
+<!ENTITY torPreferences.requestBridgeDialogTitle "একটি ব্রিজের জন্য অনুরোধ করুন">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDB এর সাথে যোগাযোগ করা হচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "একটি ব্রিজ অনুরোধ করার জন্য ক্যাপচা সমাধান করুন।...">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "সমাধান সঠিক নয়। অনুগ্রহপূর্বক আবার চেষ্টা করুন.">
+<!ENTITY torPreferences.viewTorLogs "টর লগগুলি দেখুন।">
+<!ENTITY torPreferences.viewLogs "লগ দেখুন....">
+<!ENTITY torPreferences.torLogsDialogTitle "টর লগ">
diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties
index e607db2..87cff7a 100644
--- a/src/chrome/locale/bn-BD/torlauncher.properties
+++ b/src/chrome/locale/bn-BD/torlauncher.properties
@@ -44,23 +44,39 @@ torlauncher.no_bridges_available=এই সময়ে কোন ব্রি
torlauncher.connect=সংযোগ করা
torlauncher.restart_tor=টর্চ পুনরায় চালু করুন
torlauncher.quit=অব্যাহতিপ্রাপ্ত
-torlauncher.quit_win=বাহির
-torlauncher.done=সম্পন্ন
+torlauncher.quit_win=বেরিয়ে যান
+torlauncher.done=সমাপ্ত
torlauncher.forAssistance=সহায়তার জন্য, যোগাযোগ করুন %S
torlauncher.forAssistance2=সহায়তার জন্য, %S এ যান
torlauncher.copiedNLogMessages=কপি সম্পূর্ণ। %S টর লগ বার্তা একটি টেক্সট এডিটর বা একটি ইমেইল বার্তা আটকানোর জন্য প্রস্তুত।
-torlauncher.bootstrapStatus.conn_dir=একটি রিলে ডিরেক্টরি সাথে সংযোগ স্থাপন
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+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=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=নেটওয়ার্ক স্থিতি পুনরুদ্ধার
torlauncher.bootstrapStatus.loading_status=নেটওয়ার্ক স্থিতি লোড হচ্ছে
torlauncher.bootstrapStatus.loading_keys=কর্তৃপক্ষ সার্টিফিকেট লোড হচ্ছে
torlauncher.bootstrapStatus.requesting_descriptors=রিলে তথ্য অনুরোধ
torlauncher.bootstrapStatus.loading_descriptors=রিলে তথ্য লোড হচ্ছে
-torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কে সংযুক্ত হচ্ছে
-torlauncher.bootstrapStatus.handshake_or=একটি টর্ক সার্কিট স্থাপন
+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=সম্পন্ন
diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd
deleted file mode 100644
index 247385b..0000000
--- a/src/chrome/locale/bn-IN/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed.">
-
-<!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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/bn-IN/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd
deleted file mode 100644
index 524f311..0000000
--- a/src/chrome/locale/bn/network-settings.dtd
+++ /dev/null
@@ -1,83 +0,0 @@
-<!ENTITY torsettings.dialog.title "টর নেটওয়ার্ক সেটিংস">
-<!ENTITY torsettings.wizard.title.default "টর সাথে সংযোগ স্থাপন করুন">
-<!ENTITY torsettings.wizard.title.configure "টর নেটওয়ার্ক সেটিংস">
-<!ENTITY torsettings.wizard.title.connecting "একটি সংযোগ স্থাপন">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "টর ব্রাউজার ভাষা">
-<!ENTITY torlauncher.localePicker.prompt "দয়া করে একটি ভাষা নির্বাচন করুন">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torSettings.connectPrompt "টর সাথে সংযোগ করতে "সংযোগ করুন" ক্লিক করুন">
-<!ENTITY torSettings.configurePrompt "আপনি এমন একটি দেশে থাকলে নেটওয়ার্ক সেটিংস সংশোধন করতে "কনফিগার করুন" ক্লিক করুন যা টরকে সেন্সর করে (যেমনঃ মিশর, চীন, তুরস্ক) অথবা যদি আপনি একটি প্রাইভেট নেটওয়ার্ক থেকে সংযোগ করেন যা প্রক্সি প্রয়োজন।">
-<!ENTITY torSettings.configure "কনফিগার করুন">
-<!ENTITY torSettings.connect "সংযোগ করা">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "টর শুরু করার জন্য অপেক্ষা করছে ...">
-<!ENTITY torsettings.restartTor "টর্চ পুনরায় চালু করুন">
-<!ENTITY torsettings.reconfigTor "পুনরায় কনফিগার করুন">
-
-<!ENTITY torsettings.discardSettings.prompt "আপনি টর ব্রিজগুলি কনফিগার করেছেন বা আপনি স্থানীয় প্রক্সি সেটিংস এ প্রবেশ করেছেন।  টর নেটওয়ার্কের সাথে সরাসরি সংযোগ স্থাপনের জন্য, এই সেটিংস মুছে ফেলা আবশ্যক।">
-<!ENTITY torsettings.discardSettings.proceed "সেটিংস সরান এবং সংযুক্ত করুন">
-
-<!ENTITY torsettings.optional "ঐচ্ছিক">
-
-<!ENTITY torsettings.useProxy.checkbox "আমি ইন্টারনেটে সংযোগ স্থাপন করতে প্রক্সি ব্যবহার করি">
-<!ENTITY torsettings.useProxy.type "Proxy Type">
-<!ENTITY torsettings.useProxy.type.placeholder "একটি প্রক্সি টাইপ নির্বাচন করুন">
-<!ENTITY torsettings.useProxy.address "Address">
-<!ENTITY torsettings.useProxy.address.placeholder "আইপি ঠিকানা বা হোস্টনাম">
-<!ENTITY torsettings.useProxy.port "বন্দর">
-<!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 "এই কম্পিউটারটি একটি ফায়ারওয়ালের মাধ্যমে যায় যা কেবলমাত্র কিছু পোর্টের সংযোগের অনুমতি দেয়">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
-<!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 "একটি ব্রিজ প্রদান আমি জানি">
-<!ENTITY torsettings.useBridges.label "বিশ্বস্ত উৎস থেকে ব্রিজ তথ্য প্রবেশ করান।">
-<!ENTITY torsettings.useBridges.placeholder "টাইপ ঠিকানা: পোর্ট (প্রতি লাইন প্রতি)">
-
-<!ENTITY torsettings.copyLog "ক্লিপবোর্ডে কপি টর লগ করুন">
-
-<!ENTITY torsettings.proxyHelpTitle "প্রক্সি সাহায্য">
-<!ENTITY torsettings.proxyHelp1 "একটি প্রতিষ্ঠান, স্কুল বা বিশ্ববিদ্যালয়ের নেটওয়ার্কের মাধ্যমে সংযোগ করার সময় স্থানীয় প্রক্সির প্রয়োজন হতে পারে । #160; যদি আপনি নিশ্চিত না হন যে কোন প্রক্সি প্রয়োজন কিনা, অন্য ব্রাউজারে ইন্টারনেট সেটিংসের দিকে তাকান অথবা আপনার সিস্টেম এর নেটওয়ার্ক সেটিংস চেক করুন.">
-
-<!ENTITY torsettings.bridgeHelpTitle "ব্রিজ রিলে সহায়তা">
-<!ENTITY torsettings.bridgeHelp1 "ব্রিজগুলি তালিকাভুক্ত নয় এমন রিলে যা টর নেটওয়ার্ক সংযোগ বন্ধ করে আরও কঠিন করে তোলে।   সেন্সরশিপ এড়ানোর জন্য প্রতিটি ধরনের সেতু একটি ভিন্ন পদ্ধতি ব্যবহার করে।   Obfs আপনার ট্র্যাফিক র্যান্ডম শব্দ মত চেহারা, এবং নিছক টাওয়ার ট্র্যাফিক চেহারা মত এটি টর পরিবর্তে যে পরিষেবা সংযোগ করা হয়।">
-<!ENTITY torsettings.bridgeHelp2 "কিছু দেশ টোরকে বাধা দেওয়ার চেষ্টা করে কেন, কিছু কিছু ব্রিজ নির্দিষ্ট দেশে কাজ করে কিন্তু অন্যদের নয়।   আপনার দেশে কোন ব্রিজগুলি কাজ করে তা যদি আপনি অনিশ্চিত থাকেন, তাহলে torproject.org/about/contact.html#support দেখুন">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কে একটি সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন।   এই কয়েক মিনিট সময় নিতে পারে.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "আরও জানুন">
-<!ENTITY torPreferences.bridges "ব্রিজ">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "একটি নতুন ব্রিজ অনুরোধ করুন">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
-<!ENTITY torPreferences.advanced "অগ্রবর্তী">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "একটি ব্রিজ অনুরোধ করার জন্য ক্যাপচা সমাধান করুন।...">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "সমাধান সঠিক নয়। অনুগ্রহপূর্বক আবার চেষ্টা করুন.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties
deleted file mode 100644
index 87cff7a..0000000
--- a/src/chrome/locale/bn/torlauncher.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=টর লঞ্চার
-
-torlauncher.tor_exited_during_startup=টর্চ প্রারম্ভকালে exited। এটি আপনার torrc ফাইলের ত্রুটির কারণে, টর বা আপনার সিস্টেমে অন্য প্রোগ্রামের একটি বাগ বা ত্রুটির হার্ডওয়্যারগুলির কারণে হতে পারে। যতক্ষন না আপনি অন্তর্নিহিত সমস্যাটি সমাধান করেন এবং টর পুনরায় চালু করুন, টর ব্রাউজারটি শুরু হবে না।
-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_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=টর্চ নিয়ন্ত্রণ নিতে ব্যর্থ হয়েছে
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
-torlauncher.tor_bootstrap_failed_details=%1$S ব্যর্থ (%2$S)।
-
-torlauncher.unable_to_start_tor=টর শুরু করতে অক্ষম %S
-torlauncher.tor_missing=টর্ক এক্সিকিউটেবল মিস করা হয়।
-torlauncher.torrc_missing=Torrc ফাইলটি অনুপস্থিত এবং তৈরি করা যায়নি।
-torlauncher.datadir_missing=টর ডেটা ডিরেক্টরিটি বিদ্যমান নয় এবং তৈরি করা যাবে না।
-torlauncher.password_hash_missing=হ্যাশড পাসওয়ার্ড পেতে ব্যর্থ।
-
-torlauncher.failed_to_get_settings=টর সেটিংস পুনরুদ্ধার করতে অক্ষম। %S
-torlauncher.failed_to_save_settings=টর সেটিংস সংরক্ষণ করতে অক্ষম %S
-torlauncher.ensure_tor_is_running=টর চলছে তা নিশ্চিত করুন।
-
-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=একটি ব্রিজ অনুরোধ করুন
-torlauncher.error_bridge_bad_default_type=কোনও ব্রিজ নেই যেটি ট্রান্সপোর্ট টাইপ% S আছে। আপনার সেটিংস সামঞ্জস্য করুন দয়া করে।
-
-torlauncher.bridge_suffix.meek-amazon=(চীন মধ্যে কাজ করে)
-torlauncher.bridge_suffix.meek-azure=(চীন মধ্যে কাজ করে)
-
-torlauncher.request_a_bridge=ব্রিজ অনুরোধ করুন........
-torlauncher.request_a_new_bridge=একটি নতুন ব্রিজ অনুরোধ করুন
-torlauncher.contacting_bridgedb=ব্রিজডিবি এ যোগাযোগ করা হচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন.
-torlauncher.captcha_prompt=একটি ব্রিজ অনুরোধ করার জন্য ক্যাপচা সমাধান করুন।...
-torlauncher.bad_captcha_solution=সমাধান সঠিক নয়। অনুগ্রহপূর্বক আবার চেষ্টা করুন.
-torlauncher.unable_to_get_bridge=BridgeDB থেকে একটি ব্রিজ প্রাপ্ত করতে অক্ষম।
-torlauncher.no_meek=এই ব্রাউজারটি meek এর জন্য কনফিগার করা হয় নি, যা ব্রিজ প্রাপ্ত করার প্রয়োজন হয়।
-torlauncher.no_bridges_available=এই সময়ে কোন ব্রিজ নেই। দুঃখিত।
-
-torlauncher.connect=সংযোগ করা
-torlauncher.restart_tor=টর্চ পুনরায় চালু করুন
-torlauncher.quit=অব্যাহতিপ্রাপ্ত
-torlauncher.quit_win=বেরিয়ে যান
-torlauncher.done=সমাপ্ত
-
-torlauncher.forAssistance=সহায়তার জন্য, যোগাযোগ করুন %S
-torlauncher.forAssistance2=সহায়তার জন্য, %S এ যান
-
-torlauncher.copiedNLogMessages=কপি সম্পূর্ণ। %S টর লগ বার্তা একটি টেক্সট এডিটর বা একটি ইমেইল বার্তা আটকানোর জন্য প্রস্তুত।
-
-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=Establishing an encrypted directory connection
-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=সম্পন্ন
-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=সার্ভারের সংযোগ হারিয়ে গেছে।
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=সার্ভারের সাথে যুক্ত হতে পারছে না.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=প্রক্সি সাথে সংযোগ করা যায়নি
diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd
deleted file mode 100644
index fa1e143..0000000
--- a/src/chrome/locale/bo/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "མཐུད།">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties
deleted file mode 100644
index 47b407c..0000000
--- a/src/chrome/locale/bo/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=མཐུད།
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=དོར་བྱེད།
-torlauncher.quit_win=ཕྱིར་ཐོན།
-torlauncher.done=ཚར་སོང་།
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ca(a)valencia/network-settings.dtd b/src/chrome/locale/ca(a)valencia/network-settings.dtd
deleted file mode 100644
index 3cfb839..0000000
--- a/src/chrome/locale/ca(a)valencia/network-settings.dtd
+++ /dev/null
@@ -1,56 +0,0 @@
-<!ENTITY torsettings.dialog.title "">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torsettings.prompt "">
-
-<!ENTITY torSettings.yes "">
-<!ENTITY torSettings.no "">
-
-<!ENTITY torSettings.firstQuestion "">
-<!ENTITY torSettings.configurePrompt1 "">
-<!ENTITY torSettings.configurePrompt2 "">
-<!ENTITY torSettings.configure "">
-<!ENTITY torSettings.connectPrompt1 "">
-<!ENTITY torSettings.connectPrompt2 "">
-<!ENTITY torSettings.connect "">
-
-<!ENTITY torSettings.proxyQuestion "">
-<!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "">
-<!ENTITY torSettings.enterProxy "">
-<!ENTITY torSettings.firewallQuestion "">
-<!ENTITY torSettings.firewallHelp "">
-<!ENTITY torSettings.enterFirewall "">
-<!ENTITY torSettings.bridgeQuestion "">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "">
-
-<!ENTITY torsettings.optional "">
-
-<!ENTITY torsettings.useProxy.checkbox "">
-<!ENTITY torsettings.useProxy.type "">
-<!ENTITY torsettings.useProxy.address "">
-<!ENTITY torsettings.useProxy.address.placeholder "">
-<!ENTITY torsettings.useProxy.port "">
-<!ENTITY torsettings.useProxy.username "">
-<!ENTITY torsettings.useProxy.password "">
-<!ENTITY torsettings.useProxy.type.socks4 "">
-<!ENTITY torsettings.useProxy.type.socks5 "">
-<!ENTITY torsettings.useProxy.type.http "">
-<!ENTITY torsettings.firewall.checkbox "">
-<!ENTITY torsettings.firewall.allowedPorts "">
-<!ENTITY torsettings.useBridges.checkbox "">
-<!ENTITY torsettings.useBridges.label "">
-<!ENTITY torsettings.useBridges.placeholder "">
-
-<!ENTITY torsettings.copyLog "">
-<!ENTITY torsettings.bridgeHelpTitle "">
-<!ENTITY torsettings.bridgeHelp1 "">
-<!ENTITY torsettings.bridgeHelp2 "">
-<!ENTITY torsettings.bridgeHelp3 "">
-<!ENTITY torsettings.bridgeHelp4 "">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/ca(a)valencia/torlauncher.properties b/src/chrome/locale/ca(a)valencia/torlauncher.properties
deleted file mode 100644
index 0e49bc8..0000000
--- a/src/chrome/locale/ca(a)valencia/torlauncher.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-### Copyright (c) 2013, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-# torlauncher.error_title=Tor Launcher
-
-# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-# torlauncher.tor_failed_to_start=Tor failed to start.
-# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
-
-# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-# torlauncher.tor_missing=The Tor executable is missing.
-# torlauncher.torrc_missing=The torrc file is missing.
-# torlauncher.datadir_missing=The Tor data directory does not exist.
-# torlauncher.password_hash_missing=Failed to get hashed password.
-
-# 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.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.connect=Connect
-# torlauncher.quit=Quit
-# torlauncher.quit_win=Exit
-# torlauncher.done=Done
-
-# torlauncher.forAssistance=For assistance, contact %S
diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd
deleted file mode 100644
index 3c445d0..0000000
--- a/src/chrome/locale/cs-CZ/network-settings.dtd
+++ /dev/null
@@ -1,77 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
-
-<!ENTITY torSettings.yes "Yes">
-<!ENTITY torSettings.no "No">
-
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
-<!ENTITY torSettings.connect "Connect">
-
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
-<!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
-<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
-<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "Optional">
-
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type">
-<!ENTITY torsettings.useProxy.address "Address">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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 "My Internet Service Provider (ISP) blocks connections to the Tor network">
-<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
-<!ENTITY torsettings.useBridges.type "Transport type:">
-<!ENTITY torsettings.useBridges.custom "Enter custom bridges">
-<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "type address:port">
-
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
-<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
-<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
-<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
-<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request.">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/cs-CZ/torlauncher.properties b/src/chrome/locale/cs-CZ/torlauncher.properties
deleted file mode 100644
index da5641e..0000000
--- a/src/chrome/locale/cs-CZ/torlauncher.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-### Copyright (c) 2014, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
-torlauncher.password_hash_missing=Failed to get hashed password.
-
-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.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_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
-
-torlauncher.recommended_bridge=(recommended)
-
-torlauncher.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index f99a50a..9679c3a 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -66,12 +66,12 @@
<!ENTITY torPreferences.torSettings "Nastavení sítě Tor">
<!ENTITY torPreferences.torSettingsDescription "Prohlížeč Tor vás připojí k síti Tor, provozované tisíci dobrovolníků po celém světě." >
<!ENTITY torPreferences.learnMore "Zjistit více">
-<!ENTITY torPreferences.bridges "Bridge">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Použít bridge">
+<!ENTITY torPreferences.bridges "Mosty">
+<!ENTITY torPreferences.bridgesDescription "Mosty pomáhají v přístupu k sítě Tor na místech, kde je Tor blokován. Podle toho, kde se nacházíte, mohou některé mosty fungovat lépe než jiné.">
+<!ENTITY torPreferences.useBridge "Použít most">
<!ENTITY torPreferences.requestNewBridge "Požádat o nový most…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
-<!ENTITY torPreferences.advanced "Pokročilé">
+<!ENTITY torPreferences.provideBridge "Poskytnout most">
+<!ENTITY torPreferences.advanced "Rozšířené">
<!ENTITY torPreferences.advancedDescription "Nastavení, jak se prohlížeč Tor připojuje k internetu.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Hodnoty oddělené čárkou">
<!ENTITY torPreferences.requestBridgeDialogTitle "Požádat o most">
diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties
index c401ba9..a90bda6 100644
--- a/src/chrome/locale/cs/torlauncher.properties
+++ b/src/chrome/locale/cs/torlauncher.properties
@@ -52,7 +52,7 @@ torlauncher.forAssistance2=Pro asistenci navštivte %S
torlauncher.copiedNLogMessages=Kopírování dokončeno. %S zprávy protokolu Tor jsou připraveny k vložení do textového editoru nebo e-mailu.
-torlauncher.bootstrapStatus.starting=Startuji
+torlauncher.bootstrapStatus.starting=Spouštění
torlauncher.bootstrapStatus.conn_pt=Připojování k mostu
torlauncher.bootstrapStatus.conn_done_pt=Připojeno k mostu
torlauncher.bootstrapStatus.conn_proxy=Připojování k proxy serveru
diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/csb/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/csb/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd
deleted file mode 100644
index 818a3a0..0000000
--- a/src/chrome/locale/cv/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Çыхăнтар">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "Optional">
-
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!ENTITY torsettings.useProxy.type "Прокси">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!ENTITY torsettings.useProxy.address "Адрĕс">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Порчĕ">
-<!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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties
deleted file mode 100644
index a227407..0000000
--- a/src/chrome/locale/cv/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Çыхăнтар
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/dz/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/dz/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/el-GR/network-settings.dtd b/src/chrome/locale/el-GR/network-settings.dtd
deleted file mode 100644
index 24db3c8..0000000
--- a/src/chrome/locale/el-GR/network-settings.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/el-GR/torlauncher.properties b/src/chrome/locale/el-GR/torlauncher.properties
deleted file mode 100644
index 376904d..0000000
--- a/src/chrome/locale/el-GR/torlauncher.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-### Copyright (c) 2014, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
-torlauncher.password_hash_missing=Failed to get hashed password.
-
-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.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_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
-
-torlauncher.recommended_bridge=(recommended)
-
-torlauncher.connect=Connect
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-
-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.done=Connected to the Tor network!
-
-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
diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd
deleted file mode 100644
index ed60823..0000000
--- a/src/chrome/locale/es-CL/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Configuracion De Internet Tor">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Configuracion De Internet Tor">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd
deleted file mode 100644
index f30313a..0000000
--- a/src/chrome/locale/es-CO/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Configuraciones de red de Tor">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Configuraciones de red de Tor">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor">
-<!ENTITY torlauncher.localePicker.prompt "Por favor selecciona un idioma.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties
deleted file mode 100644
index 9a1b292..0000000
--- a/src/chrome/locale/es-CO/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Hecho
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Conectando a la red de Tor
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es-ES/network-settings.dtd
similarity index 100%
rename from src/chrome/locale/es/network-settings.dtd
rename to src/chrome/locale/es-ES/network-settings.dtd
diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es-ES/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/es/torlauncher.properties
rename to src/chrome/locale/es-ES/torlauncher.properties
diff --git a/src/chrome/locale/es-NI/network-settings.dtd b/src/chrome/locale/es-NI/network-settings.dtd
deleted file mode 100644
index 24db3c8..0000000
--- a/src/chrome/locale/es-NI/network-settings.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/es-NI/torlauncher.properties b/src/chrome/locale/es-NI/torlauncher.properties
deleted file mode 100644
index 97851ac..0000000
--- a/src/chrome/locale/es-NI/torlauncher.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-### Copyright (c) 2014, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
-torlauncher.password_hash_missing=Failed to get hashed password.
-
-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.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_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
-
-torlauncher.recommended_bridge=(recommended)
-
-torlauncher.connect=Connect
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-
-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.done=Connected to the Tor network!
-
-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
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index 4be86b3..fb7561c 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -1,23 +1,23 @@
-<!ENTITY torsettings.dialog.title "تنظیمات شبکه Tor">
-<!ENTITY torsettings.wizard.title.default "اتصال به Tor">
-<!ENTITY torsettings.wizard.title.configure "تنظیمات شبکه Tor">
+<!ENTITY torsettings.dialog.title "تنظیمات شبکه تور">
+<!ENTITY torsettings.wizard.title.default "اتصال به تور">
+<!ENTITY torsettings.wizard.title.configure "تنظیمات شبکه تور">
<!ENTITY torsettings.wizard.title.connecting "ارتباط پایدار است">
<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "زبان مرورگر Tor">
+<!ENTITY torlauncher.localePicker.title "زبان مرورگر تور">
<!ENTITY torlauncher.localePicker.prompt "لطفا یک زبان انتخاب کنید.">
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "برای اتصال به Tor بر روی "اتصال" کلیک کنید.">
+<!ENTITY torSettings.connectPrompt "برای اتصال به تور بر روی "اتصال" کلیک کنید.">
<!ENTITY torSettings.configurePrompt "اگر شما در کشورهایی هستید که سعی می کنند Tor را سانسور کنند (مانند مصر، چین، ترکیه)، یا اگر از یک شبکه خصوصی که نیاز به یک پروکسی دارد استفاده کنید؛ برای اعمال تنظیمات شبکه روی "پیکربندی" کلیک کنید.">
<!ENTITY torSettings.configure "پیکربندی">
<!ENTITY torSettings.connect "اتصال">
<!-- Other: -->
-<!ENTITY torsettings.startingTor "در انتظار آغاز به کار Tor...">
-<!ENTITY torsettings.restartTor "Tor را دوباره شوروع کنید.">
+<!ENTITY torsettings.startingTor "در انتظار برای آغاز به کار تور...">
+<!ENTITY torsettings.restartTor "راه اندازی دوباره تور">
<!ENTITY torsettings.reconfigTor "پیکربندی مجدد">
<!ENTITY torsettings.discardSettings.prompt "شما تنظیمات bridge تٌٌر را انجام داده اید و یا از پروکسی محلی استفاده می کنید.  برای برقراری ارتباط مستقیم با شبکه تٌر، این تنظیمات باید حذف گردند.">
@@ -37,15 +37,15 @@
<!ENTITY torsettings.useProxy.type.socks5 "ساکس ۵">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "به نظر می رسد شبکه ارتباطی شما به اینترنت، از یک فایروال استفاده می کند. یعنی فقط اجازه اتصال از یک سری درگاه های به خصوص را می دهد.">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
+<!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.captchaSolution.placeholder "حروف موجود در تصویر را وارد کنید">
<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "یک چالش جدید داشته باشید">
-<!ENTITY torsettings.useBridges.captchaSubmit "ثبت کردن">
-<!ENTITY torsettings.useBridges.custom "یک پل فراهم کنید که من میشناسم.">
+<!ENTITY torsettings.useBridges.captchaSubmit "درخواست">
+<!ENTITY torsettings.useBridges.custom "استفاده از یک پل که آدرس آن را می دانم">
<!ENTITY torsettings.useBridges.label "اطلاعات پل را از یک منبع مورد اعتماد وارد کنید.">
<!ENTITY torsettings.useBridges.placeholder "نوع آدرس: درگاه - پورت (هر کدام در یک خط)">
@@ -63,21 +63,21 @@
<!-- #31286 about:preferences strings -->
<!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "تنظیمات Tor">
+<!ENTITY torPreferences.torSettingsDescription "مرورگر Tor ترافیک شما را از طریق شبکه Tor هدایت میکند، که به واسطه هزاران داوطلب در سراسر جهان به اجرا درآمده است." >
<!ENTITY torPreferences.learnMore "بیشتر بدانید">
<!ENTITY torPreferences.bridges "پل ها">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
+<!ENTITY torPreferences.bridgesDescription "پلها به شما کمک میکنند که در مناطقی که Tor مسدود شده است، به شبکه Tor دسترسی پیدا کنید. وابسته به منطقهای که در آن هستید، ممکن است یک پل بهتر از دیگری عمل کند.">
+<!ENTITY torPreferences.useBridge "از یک پل استفاده کن">
<!ENTITY torPreferences.requestNewBridge "درخواست یک پل جدید...">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.provideBridge "یک پل فراهم کن">
<!ENTITY torPreferences.advanced "پیشرفته ">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
+<!ENTITY torPreferences.advancedDescription "روش دسترسی مرورگر تور به اینترنت را ویرایش کنید.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "مقادیر جداشده با ویرگول">
+<!ENTITY torPreferences.requestBridgeDialogTitle "پل درخواست کن">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "در حال تماس با BridgeDB. لطفا منتظر بمانید.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "برای درخواست یک پل کپچا را حل کنید.">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "راه حل درست نیست. لطفا دوباره تلاش کنید.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
+<!ENTITY torPreferences.viewTorLogs "وقایع Tor را مشاهده کنید.">
+<!ENTITY torPreferences.viewLogs "مشاهده وقایع...">
+<!ENTITY torPreferences.torLogsDialogTitle "وقایع Tor">
diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd
deleted file mode 100644
index c82efd4..0000000
--- a/src/chrome/locale/fil/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Makipag-ugnay">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "I-restart ang Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.  Maari itong tumagal ng ilang minuto.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties
deleted file mode 100644
index 41a5ee3..0000000
--- a/src/chrome/locale/fil/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tagapaglunsad ng Tor
-
-torlauncher.tor_exited_during_startup=Tor exited during startup. Maaring ang dahilan nito ay ang an error sa torrc file, bug sa Tor o iba pang program sa iyong system, or sirang hardware. Hanggat di mo na fix ang underlying problem at mag-restart ng Tor, ang Tor Browser ay hindi gagana.
-torlauncher.tor_exited=Ang Tor ay nagsara ng hindi sinasadya. Ito ay marahil sa isang bug sa Tor, ibang programa sa iyong sistema, o depektibong hardware. Hanggang ma-restart mo ang Tor, ang Tor Browser ay hindi makakapagabot sa kahit anong mga website. Kung ang problema ay nagpapatuloy, mag-sumite ng isang kopya ng iyong Tor Log sa support team.
-torlauncher.tor_exited2=Ang pag-restart sa Tor ay hindi magsasara ng mga tab sa browser.
-torlauncher.tor_controlconn_failed=Hindi makakonekta sa Tor control port.
-torlauncher.tor_failed_to_start=Nabigong magsimula ang Tor.
-torlauncher.tor_control_failed=Nabigong kontrolin ang Tor.
-torlauncher.tor_bootstrap_failed=Nabigong magtatag ang Tor ng koneksyon sa network Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S nabigo (%2$S).
-
-torlauncher.unable_to_start_tor=Hindi magawang simulan ang Tor.\n\n%S
-torlauncher.tor_missing=Ang Tor executable ay nawawala.
-torlauncher.torrc_missing=Ang torrc file ay missing at hindi ma create.
-torlauncher.datadir_missing=Ang Tor data directory ay not exist at could not be created.
-torlauncher.password_hash_missing=Nabigong makakuha ng na-hash na password.
-
-torlauncher.failed_to_get_settings=Hindi nabawi ang mga setting ng Tor.\n\n%S
-torlauncher.failed_to_save_settings=Hindi mai-save ang mga setting ng Tor.
-torlauncher.ensure_tor_is_running=Mangyaring tiyakin na ang Tor ay tumatakbo.
-
-torlauncher.error_proxy_addr_missing=Kailangan mong kapwa tukuyin ang isang IP address o hostname at isang numero ng port upang i-configure ang Tor na gumamit ng isang proxy upang makapasok sa Internet.
-torlauncher.error_proxy_type_missing=Dapat mong piliin ang uri ng proxy.
-torlauncher.error_bridges_missing=Kailangan mong tukuyin ang isa o higit pang mga tulay.
-torlauncher.error_default_bridges_type_missing=Dapat kang pumili ng uri ng transportasyon para sa mga ibinigay na tulay.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
-torlauncher.error_bridge_bad_default_type=Walang maaaring gamitin sa mga ibinigay na uri ng transportasyong tulay %S. Mangyaring ayusin ang iyong mga setting.
-
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Kumonekta
-torlauncher.restart_tor=I-restart ang Tor
-torlauncher.quit=Tumigil
-torlauncher.quit_win=Lumabas
-torlauncher.done=Tapos na
-
-torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S
-torlauncher.forAssistance2=Para sa gabay o tulong, bisitahin ang %S
-
-torlauncher.copiedNLogMessages=Kumpleto na ang Pag-kopya. %S Ang mga log messages ng Tor ay handa na ma-paste sa isang text editor o sa e-mail message.
-
-torlauncher.bootstrapStatus.conn_dir=Kumokonekta sa isang direktoryo ng relay
-torlauncher.bootstrapStatus.handshake_dir= Itinatatag ang isang naka-encrypt na direktoryo ng koneksyon
-torlauncher.bootstrapStatus.requesting_status=Kinukuha ang katayuan ng network
-torlauncher.bootstrapStatus.loading_status=Ikinakarga ang katayuan ng network
-torlauncher.bootstrapStatus.loading_keys=Ikinakarga ang mga sertipiko ng awtoridad
-torlauncher.bootstrapStatus.requesting_descriptors=Humihiling ng impormasyon tungkol sa relay
-torlauncher.bootstrapStatus.loading_descriptors=Ikinakarga ang impormasyon tungkol sa relay
-torlauncher.bootstrapStatus.conn_or=Kumukonekta sa network ng Tor
-torlauncher.bootstrapStatus.handshake_or=Nagtatatag ng Tor circuit
-torlauncher.bootstrapStatus.done=Nakakonekta sa Tor Network.
-
-torlauncher.bootstrapWarning.done=tapos na
-torlauncher.bootstrapWarning.connectrefused=hindi tinanggap ang koneksyon
-torlauncher.bootstrapWarning.misc=samut-sari
-torlauncher.bootstrapWarning.resourcelimit=hindi sapat ang mga mapagkukunan
-torlauncher.bootstrapWarning.identity=maling pagtutugma ng pagkakakilanlan
-torlauncher.bootstrapWarning.timeout=Nag-timeout ang koneksyon
-torlauncher.bootstrapWarning.noroute=walang ruta papunta sa host
-torlauncher.bootstrapWarning.ioerror=pagkakamali sa pagbasa/pagsulat
-torlauncher.bootstrapWarning.pt_missing=nawawala transportasyong pluggable
-
-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.
diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/fo/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/fo/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd
deleted file mode 100644
index 687e4e2..0000000
--- a/src/chrome/locale/fr-CA/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Paramètres du réseau Tor">
-<!ENTITY torsettings.wizard.title.default "Se connecter à Tor">
-<!ENTITY torsettings.wizard.title.configure "Paramètres du réseau Tor">
-<!ENTITY torsettings.wizard.title.connecting "Établissement d’une connexion">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Langue du navigateur Tor">
-<!ENTITY torlauncher.localePicker.prompt "Veuillez choisir une langue.">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torSettings.connectPrompt "Cliquez sur « Se connecter » pour vous connecter à Tor.">
-<!ENTITY torSettings.configurePrompt "Cliquez sur « Configurer » pour ajuster les paramètres du réseau si vous êtes dans un pays qui censure Tor (tel que la Chine, l’Iran, la Turquie) ou si vous vous connectez d’un réseau privé qui exige un mandataire.">
-<!ENTITY torSettings.configure "Configurer">
-<!ENTITY torSettings.connect "Se connecter">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "En attente du démarrage de Tor...">
-<!ENTITY torsettings.restartTor "Redémarrer Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigurer">
-
-<!ENTITY torsettings.discardSettings.prompt "Vous avez configuré des ponts Tor ou vous avez saisi des paramètres de mandataire local.  Pour établir une connexion directe vers le réseau Tor, ces paramètres doivent être supprimés.">
-<!ENTITY torsettings.discardSettings.proceed "Supprimer les paramètres et se connecter">
-
-<!ENTITY torsettings.optional "Facultatif">
-
-<!ENTITY torsettings.useProxy.checkbox "J’utilise un mandataire pour accéder à Internet">
-<!ENTITY torsettings.useProxy.type "Type de mandataire ">
-<!ENTITY torsettings.useProxy.type.placeholder "sélectionner un type de mandataire">
-<!ENTITY torsettings.useProxy.address "Adresse ">
-<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte">
-<!ENTITY torsettings.useProxy.port "Port ">
-<!ENTITY torsettings.useProxy.username "Nom d’utilisateur ">
-<!ENTITY torsettings.useProxy.password "Mot de passe ">
-<!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 "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports">
-<!ENTITY torsettings.firewall.allowedPorts "Ports autorisés ">
-<!ENTITY torsettings.useBridges.checkbox "Tor est censuré dans mon pays">
-<!ENTITY torsettings.useBridges.default "Sélectionner un pont intégré">
-<!ENTITY torsettings.useBridges.default.placeholder "sélectionner un pont">
-<!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.useBridges.captchaSubmit "Submit">
-<!ENTITY torsettings.useBridges.custom "Fournir un pont que je connais">
-<!ENTITY torsettings.useBridges.label "Saisir des informations de pont provenant d’une source fiable">
-<!ENTITY torsettings.useBridges.placeholder "type adresse:port (un par ligne)">
-
-<!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers">
-
-<!ENTITY torsettings.proxyHelpTitle "Aide sur les mandataires">
-<!ENTITY torsettings.proxyHelp1 "Un mandataire local est requis lors d’une connexion par un réseau d’entreprise, d’école ou d’université. Si vous n’êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d’un autre navigateur ou les paramètres réseau de votre système pour voir si un mandataire est requis.">
-
-<!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts">
-<!ENTITY torsettings.bridgeHelp1 "Les ponts sont des relais non référencés qui rendent les connexions au Tor réseau plus difficile à bloquer.  Chaque type de pont utilise un moyen différent pour éviter la censure.  Avec les ponts obfs, votre trafic ressemble à du bruit aléatoire et avec les ponts meek, il semble que votre trafic se connecte à ce service plutôt qu’à Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Dans la mesure où certains pays essaient de bloquer Tor, certains ponts fonctionnent dans certains pays, mais pas dans d’autres.  Si vous ne savez pas quels ponts fonctionnent dans votre pays, visitez torproject.org/about/contact.html#support">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties
deleted file mode 100644
index 1e1ad99..0000000
--- a/src/chrome/locale/fr-CA/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Lanceur Tor
-
-torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas.
-torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien.
-torlauncher.tor_exited2=Redémarrer Tor ne fermera par les onglets de votre navigateur.
-torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor.
-torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer.
-torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué.
-torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S).
-
-torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S
-torlauncher.tor_missing=Il manque l’exécutable Tor.
-torlauncher.torrc_missing=Le fichier torrc manque et n’a pas pu être créé.
-torlauncher.datadir_missing=Le répertoire de données de Tor n’existe pas et n’a pas pu être créé.
-torlauncher.password_hash_missing=Impossible d’obtenir le mot de passe haché.
-
-torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S
-torlauncher.failed_to_save_settings=Impossible d’enregistrer les paramètres de Tor.\n\n%S
-torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne.
-
-torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d’hôte et un numéro de port afin de configurer Tor pour qu’il utilise un mandataire pour accéder à Internet.
-torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire.
-torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts.
-torlauncher.error_default_bridges_type_missing=Vous devez choisir un type de transport pour les ponts fournis.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
-torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres.
-
-torlauncher.bridge_suffix.meek-amazon=(fonctionne en Chine)
-torlauncher.bridge_suffix.meek-azure=(fonctionne en Chine)
-
-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.connect=Se connecter
-torlauncher.restart_tor=Redémarrer Tor
-torlauncher.quit=Quitter
-torlauncher.quit_win=Sortie
-torlauncher.done=Terminé
-
-torlauncher.forAssistance=Pour de l’assistance, contacter %S
-torlauncher.forAssistance2=Pour de l’assistance, visiter %S
-
-torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel.
-
-torlauncher.bootstrapStatus.onehop_create=Mise en place d’une connexion chiffrée à l’annuaire
-torlauncher.bootstrapStatus.requesting_status=Récupération de l’état du réseau
-torlauncher.bootstrapStatus.loading_status=Chargement de l’état du réseau
-torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d’autorité
-torlauncher.bootstrapStatus.requesting_descriptors=Demande d’informations sur le relais
-torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais
-torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor!
-
-torlauncher.bootstrapWarning.done=effectué
-torlauncher.bootstrapWarning.connectrefused=connexion refusée
-torlauncher.bootstrapWarning.misc=divers
-torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes
-torlauncher.bootstrapWarning.identity=mauvaise concordance de l’identité
-torlauncher.bootstrapWarning.timeout=expiration du temps de connexion
-torlauncher.bootstrapWarning.noroute=pas de route vers l’hôte
-torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture
-torlauncher.bootstrapWarning.pt_missing=le transport enfichable manque
-
-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.
diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/fur/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/fur/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy-NL/network-settings.dtd
similarity index 100%
rename from src/chrome/locale/fy/network-settings.dtd
rename to src/chrome/locale/fy-NL/network-settings.dtd
diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy-NL/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/fy/torlauncher.properties
rename to src/chrome/locale/fy-NL/torlauncher.properties
diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga-IE/network-settings.dtd
similarity index 100%
rename from src/chrome/locale/ga/network-settings.dtd
rename to src/chrome/locale/ga-IE/network-settings.dtd
diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga-IE/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/ga/torlauncher.properties
rename to src/chrome/locale/ga-IE/torlauncher.properties
diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd
index f22f1c8..2e013e8 100644
--- a/src/chrome/locale/gu-IN/network-settings.dtd
+++ b/src/chrome/locale/gu-IN/network-settings.dtd
@@ -32,7 +32,7 @@
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
<!ENTITY torsettings.useProxy.port "Port">
<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "Password">
+<!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">
@@ -61,8 +61,23 @@
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-<!-- #31286 about:preferences strings -->
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "ટોર">
+<!ENTITY torPreferences.torSettings "Tor Settings">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.bridges "Bridges">
+<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
+<!ENTITY torPreferences.useBridge "Use a bridge">
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
+<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.advanced "અદ્યતન">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties
index a4d097a..b040847 100644
--- a/src/chrome/locale/gu-IN/torlauncher.properties
+++ b/src/chrome/locale/gu-IN/torlauncher.properties
@@ -44,23 +44,39 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
torlauncher.connect=Connect
torlauncher.restart_tor=Restart Tor
torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
+torlauncher.quit_win=બહાર નીકળો
+torlauncher.done=થઈ ગયું
torlauncher.forAssistance=For assistance, contact %S
torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
+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.bootstrapWarning.done=done
diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties
deleted file mode 100644
index b040847..0000000
--- a/src/chrome/locale/gu/torlauncher.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=બહાર નીકળો
-torlauncher.done=થઈ ગયું
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.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.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.
diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/gun/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/gun/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/ha/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/ha/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi-IN/network-settings.dtd
similarity index 100%
rename from src/chrome/locale/hi/network-settings.dtd
rename to src/chrome/locale/hi-IN/network-settings.dtd
diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi-IN/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/hi/torlauncher.properties
rename to src/chrome/locale/hi-IN/torlauncher.properties
diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd
deleted file mode 100644
index fc0825a..0000000
--- a/src/chrome/locale/hr-HR/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Postavke Tor mreže">
-<!ENTITY torsettings.wizard.title.default "Poveži se na Tor">
-<!ENTITY torsettings.wizard.title.configure "Postavke Tor mreže">
-<!ENTITY torsettings.wizard.title.connecting "Uspostavljanje veze">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Jezik Tor Browsera">
-<!ENTITY torlauncher.localePicker.prompt "Molimo odaberite jezik.">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torSettings.connectPrompt "Kliknite "Spoji" kako biste se spojili na Tor.">
-<!ENTITY torSettings.configurePrompt "Kliknite "Podesi" kako biste promijenili postavke mreže ako ste u državi koja cenzurira Tor (kao Egipat, Kina, Turska) ili ako se spajate preko privatne mreže za koju je potreban proxy.">
-<!ENTITY torSettings.configure "Podesi">
-<!ENTITY torSettings.connect "Spoji">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Čekanje da se Tor pokrene...">
-<!ENTITY torsettings.restartTor "Ponovno pokreni Tor">
-<!ENTITY torsettings.reconfigTor "Rekonfiguriraj">
-
-<!ENTITY torsettings.discardSettings.prompt "Konfigurirali ste Tor mostove ili ste unijeli postavke lokalnog proxya.  Kako bi ostvarili direktnu vezu s Tor mrežom, ove postavke moraju biti uklonjene.">
-<!ENTITY torsettings.discardSettings.proceed "Ukloni postavke i poveži">
-
-<!ENTITY torsettings.optional "Opcionalno">
-
-<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na Internet">
-<!ENTITY torsettings.useProxy.type "Tip proxya">
-<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxya">
-<!ENTITY torsettings.useProxy.address "Adresa">
-<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili hostname">
-<!ENTITY torsettings.useProxy.port "Port">
-<!ENTITY torsettings.useProxy.username "Korisničko ime">
-<!ENTITY torsettings.useProxy.password "Lozinka">
-<!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 "Ovo računalo je iza vatrozida koji dopušta spajanje samo na određene portove">
-<!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi">
-<!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj državi">
-<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most">
-<!ENTITY torsettings.useBridges.default.placeholder "odaberite most">
-<!ENTITY torsettings.useBridges.bridgeDB "Zatražite most od torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesite znakove sa slike">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dobij novi izazov">
-<!ENTITY torsettings.useBridges.captchaSubmit "Pošalji">
-<!ENTITY torsettings.useBridges.custom "Pruži mi most koji poznajem">
-<!ENTITY torsettings.useBridges.label "Unesite informacije o mostu iz povjerenog izvora">
-<!ENTITY torsettings.useBridges.placeholder "vrsta adresa:port (jedan po liniji)">
-
-<!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik">
-
-<!ENTITY torsettings.proxyHelpTitle "Pomoć s proxyem">
-<!ENTITY torsettings.proxyHelp1 "Ako se povezujete kroz mrežu tvrtke, škole ili sveučilišta moguće je da će vam trebati lokalni proxy. Ako niste sigurni treba li vam proxy, pregledajte postavke interneta u drugom pregledniku ili provjerite postavke mreže Vašeg sistema.">
-
-<!ENTITY torsettings.bridgeHelpTitle "Pomoć za releje mostove">
-<!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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties
deleted file mode 100644
index 1748e08..0000000
--- a/src/chrome/locale/hr-HR/torlauncher.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga može doći zbog greške u Vašoj torrc datoteci, greške u Toru ili drugom programu u Vašem sustavu ili zbog neispravnog hardwarea. Dok ne popravite inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti.
-torlauncher.tor_exited=Tor je neočekivano izašao. Ovo bi moglo biti zbog greške u samom Toru, drugog programa na Vašem sustavu ili neispravnog hardwarea. Dok ne pokrenete Tor ponovno, Tor Browser neće biti u mogućnosti pristupiti web stranicama. Ako problem ustraje, molimo Vas da pošaljete kopiju Vašeg Tor zapisa timu za podršku.
-torlauncher.tor_exited2=Ponovno pokretanje Tora neće zatvoriti Vaše kartice u pregledniku.
-torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port.
-torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti.
-torlauncher.tor_control_failed=Preuzimanje kontrole nad Torom nije uspjelo.
-torlauncher.tor_bootstrap_failed=Tor nije uspio uspostaviti Tor mrežnu vezu.
-torlauncher.tor_bootstrap_failed_details=%1$S neuspjelo (%2$S).
-
-torlauncher.unable_to_start_tor=Nije moguće pokrenuti Tor.\n\n%S
-torlauncher.tor_missing=Nije moguće pronaći izvršni program za Tor.
-torlauncher.torrc_missing=Torrc datoteka nedostaje i nije mogla biti stvorena.
-torlauncher.datadir_missing=Direktorij s Tor podacima ne postoji i nije mogao biti stvoren.
-torlauncher.password_hash_missing=Nije moguće dobiti hash lozinke.
-
-torlauncher.failed_to_get_settings=Nije moguće dobaviti Tor postavke.\n\n%S
-torlauncher.failed_to_save_settings=Nije moguće spremiti Tor postavke.\n\n%S
-torlauncher.ensure_tor_is_running=Molimo osigurajte da je Tor pokrenut.
-
-torlauncher.error_proxy_addr_missing=Morate navesti i IP adresu ili ime računala i broj porta da biste konfigurirali Tor za korištenje proxya za pristup Internetu.
-torlauncher.error_proxy_type_missing=Morate odabrati tip proxya.
-torlauncher.error_bridges_missing=Morate odrediti jedan ili više mostova.
-torlauncher.error_default_bridges_type_missing=Morate odabrati vrstu transporta za pružene mostove.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
-torlauncher.error_bridge_bad_default_type=Nema dostupnih pruženih mostova koji imaju %S vrstu transporta. Molimo, prilagodite svoje postavke.
-
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Spoji
-torlauncher.restart_tor=Ponovno pokreni Tor
-torlauncher.quit=Prekini
-torlauncher.quit_win=Izlaz
-torlauncher.done=Gotovo
-
-torlauncher.forAssistance=Za pomoć, kontaktirajte %S
-torlauncher.forAssistance2=Za pomoć posjetite %S
-
-torlauncher.copiedNLogMessages=Kopiranje završeno. %S Tor zapisi su spremni za lijepljenje u uređivač teksta ili email poruku.
-
-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=Uspostavljanje enkriptirane veze na direktorij
-torlauncher.bootstrapStatus.requesting_status=Dohvaćanje statusa mreže
-torlauncher.bootstrapStatus.loading_status=Učitavanje statusa mreže
-torlauncher.bootstrapStatus.loading_keys=Učitavanje certifikata autoriteta
-torlauncher.bootstrapStatus.requesting_descriptors=Zahtjevanje informacija o releju
-torlauncher.bootstrapStatus.loading_descriptors=Učitavanje informacija o releju
-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=Spojen na Tor mrežu!
-
-torlauncher.bootstrapWarning.done=gotovo
-torlauncher.bootstrapWarning.connectrefused=veza odbijena
-torlauncher.bootstrapWarning.misc=razno
-torlauncher.bootstrapWarning.resourcelimit=nedostatni resursi
-torlauncher.bootstrapWarning.identity=nepodudaranje identiteta
-torlauncher.bootstrapWarning.timeout=vrijeme čekanja veze isteklo
-torlauncher.bootstrapWarning.noroute=nema rute do domaćina
-torlauncher.bootstrapWarning.ioerror=greška čitanja/pisanja
-torlauncher.bootstrapWarning.pt_missing=nedostaje priključni transport
-
-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.
diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/ht/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/ht/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd
index dc977d2..0a20cc6 100644
--- a/src/chrome/locale/hy-AM/network-settings.dtd
+++ b/src/chrome/locale/hy-AM/network-settings.dtd
@@ -1,4 +1,7 @@
<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.wizard.title.default "Connect to Tor">
+<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
+<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
@@ -6,30 +9,10 @@
<!-- For "first run" wizard: -->
-<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
-
-<!ENTITY torSettings.yes "Yes">
-<!ENTITY torSettings.no "Ոչ">
-
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!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.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
-<!ENTITY torSettings.connect "Միանալ">
-
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
-<!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
-<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
-<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
+<!ENTITY torSettings.connect "Միացնել">
<!-- Other: -->
@@ -42,36 +25,59 @@
<!ENTITY torsettings.optional "Optional">
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
+<!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.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 "My Internet Service Provider (ISP) blocks connections to the Tor network">
-<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
-<!ENTITY torsettings.useBridges.type "Transport type:">
-<!ENTITY torsettings.useBridges.custom "Enter custom bridges">
-<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "type address:port">
+<!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.useBridges.captchaSubmit "Submit">
+<!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.copyLog "Copy Tor Log To Clipboard">
+
+<!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.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
-<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
-<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
-<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
-<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request.">
+<!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">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-<!-- #31286 about:preferences strings -->
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Tor">
+<!ENTITY torPreferences.torSettings "Tor Settings">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.bridges "Bridges">
+<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
+<!ENTITY torPreferences.useBridge "Use a bridge">
+<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
+<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.advanced "Advanced">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
+<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
+<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
diff --git a/src/chrome/locale/hy-AM/torlauncher.properties b/src/chrome/locale/hy-AM/torlauncher.properties
index d352808..a945dde 100644
--- a/src/chrome/locale/hy-AM/torlauncher.properties
+++ b/src/chrome/locale/hy-AM/torlauncher.properties
@@ -1,50 +1,82 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
### See LICENSE for licensing information.
torlauncher.error_title=Tor Launcher
+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_exited2=Restarting Tor will not close your browser tabs.
torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor-ի թողարկման սխալ;
+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.unable_to_start_tor=Unable to start Tor.\n\n%S
torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+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.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-torlauncher.failed_to_save_settings=Tor-ի կարգավորումներ չեն պահպանվել:\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.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=Դուք պետո է ընտրեք proxy-ի տիպը:
-torlauncher.error_bridges_missing=Դուք պետք է կանխորոշեք մեկ կամ մի քանի կամուրջներ;
+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.recommended_bridge=(recommended)
+torlauncher.bridge_suffix.meek-amazon=(works in China)
+torlauncher.bridge_suffix.meek-azure=(works in China)
-torlauncher.connect=Միանալ
+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.connect=Միացնել
torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Չեղարկել
-torlauncher.quit_win=Ելք
-torlauncher.done=Պատրաստ է
+torlauncher.quit=Quit
+torlauncher.quit_win=Դուրս գալ
+torlauncher.done=Done
-torlauncher.forAssistance=Օգնության համար կապվեք %S
+torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+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.bootstrapWarning.done=done
@@ -56,3 +88,7 @@ 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.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.
diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd
deleted file mode 100644
index 1b7be98..0000000
--- a/src/chrome/locale/ia/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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 "Adresse">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Porto">
-<!ENTITY torsettings.useProxy.username "Nomine de usator">
-<!ENTITY torsettings.useProxy.password "Contrasigno">
-<!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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties
deleted file mode 100644
index b20f152..0000000
--- a/src/chrome/locale/ia/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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=Tu debe seliger un typo de proxy
-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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quitar
-torlauncher.quit_win=Sortir
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-torlauncher.bootstrapWarning.done=facite
-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.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.
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index e1781a2..79c1226 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -37,7 +37,7 @@
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Komputer ini pergi melalui firewall yang hanya mengizinkan koneksi untuk beberapa port">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
+<!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan">
<!ENTITY torsettings.useBridges.checkbox "Tor disensor di negara saya">
<!ENTITY torsettings.useBridges.default "Pilih satu built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "pilih satu bridge">
@@ -63,8 +63,8 @@
<!-- #31286 about:preferences strings -->
<!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "Pengaturan Tor">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser mengalihkan lalulintas kamu melalui Jaringan Tor, di jalankan oleh ribuan sukarelawan di seluruh dunia." >
<!ENTITY torPreferences.learnMore "Pelajari lebih lanjut">
<!ENTITY torPreferences.bridges "Jembatan-jembatan">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
@@ -72,12 +72,12 @@
<!ENTITY torPreferences.requestNewBridge "Meminta bridge baru...">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced ">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
+<!ENTITY torPreferences.advancedDescription "Konfigurasikan bagaimana Tor Browser terhubung ke internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta sebuah bridge.">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Solusinya tidak tepat. Silakan coba lagi.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
+<!ENTITY torPreferences.viewTorLogs "Lihat Catatan Tor">
+<!ENTITY torPreferences.viewLogs "Lihat Catatan....">
+<!ENTITY torPreferences.torLogsDialogTitle "Catatan Tor">
diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/jv/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/jv/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd
deleted file mode 100644
index 4a93912..0000000
--- a/src/chrome/locale/ko-KR/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor 네트워크 설정">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor 네트워크 설정">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor 사용 언어">
-<!ENTITY torlauncher.localePicker.prompt "사용할 언어를 설정해주세요.">
-
-<!-- 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.configure "구성">
-<!ENTITY torSettings.connect "연결">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Tor 재시작">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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 "주소">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "포트">
-<!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 "허용된 포트">
-<!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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties
deleted file mode 100644
index a513276..0000000
--- a/src/chrome/locale/ko-KR/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor 런처
-
-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_exited2=Restarting Tor will not close your browser tabs.
-torlauncher.tor_controlconn_failed=Tor 제어 포트에 접속할 수 없습니다.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.error_proxy_addr_missing=프록시를 써서 인터넷에 접속하도록 Tor를 설정하려면 IP 주소 또는 호스트 이름이랑 포트 숫자를 적어 주셔야 해요.
-torlauncher.error_proxy_type_missing=프록시 종류를 정해 주세요.
-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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=연결
-torlauncher.restart_tor=Tor 재시작
-torlauncher.quit=연결 끝내기
-torlauncher.quit_win=나가기
-torlauncher.done=완료
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Tor 네트워크에 연결되었어요!
-
-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=missing pluggable transport
-
-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.
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index abfdf0d..bf2af2b 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -37,7 +37,7 @@
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "이 컴퓨터는 특정 포트만 허용하는 방화벽을 통해서 연결됩니다.">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
+<!ENTITY torsettings.firewall.allowedPorts "허용된 포트">
<!ENTITY torsettings.useBridges.checkbox "우리나라에서는 Tor를 검열합니다.">
<!ENTITY torsettings.useBridges.default "제공된 브릿지를 선택하세요.">
<!ENTITY torsettings.useBridges.default.placeholder "브릿지를 선택하세요.">
@@ -64,18 +64,18 @@
<!-- #31286 about:preferences strings -->
<!ENTITY torPreferences.categoryTitle "바위 산">
<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettingsDescription "Tor 브라우저는 전세계 수천명의 자원 봉사자에 의해 운영되는 Tor 네트워크와 당신을 연결합니다." >
<!ENTITY torPreferences.learnMore "더 알아보기">
<!ENTITY torPreferences.bridges "중계서버">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
<!ENTITY torPreferences.requestNewBridge "새로운 브릿지 요청하기">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.provideBridge "브릿지를 제공하세요">
<!ENTITY torPreferences.advanced "고급">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
+<!ENTITY torPreferences.requestBridgeDialogTitle "브릿지 요청하기">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "브릿지DB에 연결하고 있으니, 잠시 기다려주세요.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "브릿지를 요청하기 위해 CAPCHA를 풀어주세요.">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "풀이가 맞지 않습니다. 다시 시도해주세요.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/ku/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/ku/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/kw/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/kw/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd
deleted file mode 100644
index ece5873..0000000
--- a/src/chrome/locale/ky/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Байланышуу ">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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 "Дарек">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port">
-<!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.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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties
deleted file mode 100644
index b489a96..0000000
--- a/src/chrome/locale/ky/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Байланышуу
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Чыгуу
-torlauncher.quit_win=Чыгуу
-torlauncher.done=Даяр
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Tor тармагына туташтырылып турат!
-
-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.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.
diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd
deleted file mode 100644
index d33b082..0000000
--- a/src/chrome/locale/lb/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "Passwuert">
-<!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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties
deleted file mode 100644
index 584a9ee..0000000
--- a/src/chrome/locale/lb/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Ausgang
-torlauncher.done=Fäerdeg
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd
deleted file mode 100644
index 3526afa..0000000
--- a/src/chrome/locale/lg/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Kiriza">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/lg/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/ln/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/ln/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd
deleted file mode 100644
index f4b4974..0000000
--- a/src/chrome/locale/lo/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "ການຕັ້ງຄ່າເຄືອຂ່າຍ Tor">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "ການຕັ້ງຄ່າເຄືອຂ່າຍ Tor">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "ກຳນົດຄ່າ">
-<!ENTITY torSettings.connect "ເຊື່ອມຕໍ່">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "ພັອດ">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "ກະລຸນາລໍຖ້າໃນຂະນະທີ່ພວກເຮົາຈັດແຈງການເຊື່ອມຕໍ່ເຂົ້າເຄືອຂ່າຍ Tor.  ອາດຈະໃຊ້ເວລາຫລາຍນາທີ.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties
deleted file mode 100644
index 92d8d3a..0000000
--- a/src/chrome/locale/lo/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=ໂຕເປີດ Tor
-
-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 ໂດຍບໍ່ຄາດຄິດ. ນີ້ອາດເປັນຍ້ອນຂໍ້ຜິດພາດໃນໂຕ ຂອງ Tor ເອງ, ຈາກໂປຣແກຣມອື່ນໃນລະບົບຂອງທ່ານ ຫຼື ຂໍ້ຜິດພາດຈາກໂຕເຄື່ອງເອງ. Tor ຈະບໍ່ສາມາດເຂົ້າເຖິງ ເວັບໄຊຕ໌ ໃດໆໄດ້ ຈົນກວ່າ ທ່ານຈະແລ່ນ Tor ຄືນໃໝ່. ຖ້າຫາກວ່າ ບັນຫາຍັງເປັນຄືເກົ່າ, ກະລຸນາ ສົ່ງສຳເນົາບັນທຶກ Tor ຂອງ ທ່ານ ໄປຍັງ ໜ່ວຍງານສະໜັບສະໜູນໄດ້.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=ເຊື່ອມຕໍ່
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=ແລ້ວໆ
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=ກຳລັງເຊື່ອມຕໍ່ເຂົ້າກັບເຄືອຂ່າຍ Tor
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd
index faf089e..6bac8f7 100644
--- a/src/chrome/locale/lt/network-settings.dtd
+++ b/src/chrome/locale/lt/network-settings.dtd
@@ -4,8 +4,8 @@
<!ENTITY torsettings.wizard.title.connecting "Užmezgiamas ryšys">
<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser kalba">
-<!ENTITY torlauncher.localePicker.prompt "Prašome pasirinkti kalbą.">
+<!ENTITY torlauncher.localePicker.title "Tor Naršyklės kalba">
+<!ENTITY torlauncher.localePicker.prompt "Pasirinkite kalbą.">
<!-- For "first run" wizard: -->
@@ -16,7 +16,7 @@
<!-- Other: -->
-<!ENTITY torsettings.startingTor "Laukiama, kol Tor bus paleistas…">
+<!ENTITY torsettings.startingTor "Laukiama, kol bus paleistas Tor…">
<!ENTITY torsettings.restartTor "Paleisti Tor iš naujo">
<!ENTITY torsettings.reconfigTor "Konfigūruoti iš naujo">
@@ -64,20 +64,20 @@
<!-- #31286 about:preferences strings -->
<!ENTITY torPreferences.categoryTitle "Tor">
<!ENTITY torPreferences.torSettings "Tor nustatymai">
-<!ENTITY torPreferences.torSettingsDescription "Tor naršyklė nukreipia jūsų srautą per Tor tinklą, veikiančio po visą pasaulį išsidėsčiusių tūkstančių savanorių dėka." >
+<!ENTITY torPreferences.torSettingsDescription "Tor Naršyklė nukreipia jūsų srautą per Tor tinklą, veikiantį po visą pasaulį išsidėsčiusių tūkstančių savanorių dėka." >
<!ENTITY torPreferences.learnMore "Sužinokite daugiau">
<!ENTITY torPreferences.bridges "Tinklų tiltai">
<!ENTITY torPreferences.bridgesDescription "Tinklo tiltai padeda jums pasiekti Tor tinklą, vietose kur Tor užblokuotas. Priklausomai nuo to kur esate, vienas tiltas gali veikti geriau nei kitas.">
-<!ENTITY torPreferences.useBridge "Naudokite tinklo tiltą">
+<!ENTITY torPreferences.useBridge "Naudoti tinklų tiltą">
<!ENTITY torPreferences.requestNewBridge "Užklausti naują tinklų tiltą…">
<!ENTITY torPreferences.provideBridge "Pateikite tinklų tiltą">
<!ENTITY torPreferences.advanced "Išplėstiniai">
-<!ENTITY torPreferences.advancedDescription "Sukonfigūruokite kaip Tor naršyklė jungsis prie interneto.">
+<!ENTITY torPreferences.advancedDescription "Sukonfigūruokite kaip Tor Naršyklė jungsis prie interneto.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Kableliais atskirtos reikšmės">
<!ENTITY torPreferences.requestBridgeDialogTitle "Užklausti tinklų tiltą…">
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Susisiekiama su BridgeDB. Palaukite.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Norėdami užklausti tinklų tiltą, išspręskite saugos kodą.">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Sprendimas neteisingas. Bandykite dar kartą.">
-<!ENTITY torPreferences.viewTorLogs "Žiūrėti Tor žurnalą.">
+<!ENTITY torPreferences.viewTorLogs "Rodyti Tor žurnalus.">
<!ENTITY torPreferences.viewLogs "Rodyti žurnalus…">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor žurnalas">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor žurnalai">
diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties
index 7b12176..9c0f698 100644
--- a/src/chrome/locale/lt/torlauncher.properties
+++ b/src/chrome/locale/lt/torlauncher.properties
@@ -1,29 +1,29 @@
### Copyright (c) 2016, The Tor Project, Inc.
### See LICENSE for licensing information.
-torlauncher.error_title=Tor leistukas
+torlauncher.error_title=Tor paleidyklė
-torlauncher.tor_exited_during_startup=Tor nustojo veikti paleisties metu. Taip galėjo nutikti dėl klaidos jūsų torrc faile, klaidos Tor ar kitoje jūsų sistemos programoje, arba dėl aparatinės įrangos kaltės. Tor naršyklė nepasileis tol, kol neištaisysite slypinčios problemos ir iš naujo nepaleisite Tor.
-torlauncher.tor_exited=Tor netikėtai nustojo veikti. Taip galėjo atsitikti arba dėl klaidos Tor, arba dėl klaidos kitoje jūsų sistemos programoje, arba dėl sugedusios aparatinės įrangos. Kol iš naujo nepaleisite Tor, Tor naršyklė negalės prisijungti prie jokių interneto tinklalapių. Jei problema išlieka, prašome išsiųsti Tor įvykių žurnalo kopiją Tor palaikymo komandai.
+torlauncher.tor_exited_during_startup=Tor nustojo veikti paleisties metu. Taip galėjo nutikti dėl klaidos jūsų torrc faile, klaidos Tor ar kitoje jūsų sistemos programoje, arba dėl aparatinės įrangos kaltės. Tor Naršyklė nepasileis tol, kol neištaisysite slypinčios problemos ir iš naujo nepaleisite Tor.
+torlauncher.tor_exited=Tor netikėtai nustojo veikti. Taip galėjo atsitikti arba dėl klaidos Tor, arba dėl klaidos kitoje jūsų sistemos programoje, arba dėl sugedusios aparatinės įrangos. Kol iš naujo nepaleisite Tor, Tor Naršyklė negalės prisijungti prie jokių interneto tinklalapių. Jei problema išlieka, prašome išsiųsti Tor įvykių žurnalo kopiją Tor palaikymo komandai.
torlauncher.tor_exited2=Paleidus Tor iš naujo, jūsų naršyklės kortelės nebus užvertos.
torlauncher.tor_controlconn_failed=Nepavyko prisijungti prie Tor valdymo prievado.
-torlauncher.tor_failed_to_start=Tor nepavyko paleisti.
+torlauncher.tor_failed_to_start=Tor nepavyko pasileisti.
torlauncher.tor_control_failed=Nepavyko perimti Tor valdymo.
torlauncher.tor_bootstrap_failed=Tor nepavyko užmegzti ryšio su Tor tinklu.
torlauncher.tor_bootstrap_failed_details=%1$S patyrė nesėkmę (%2$S).
torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S
torlauncher.tor_missing=Trūksta Tor vykdomojo failo.
-torlauncher.torrc_missing=Trūksta torrc failo ir nepavyko jo sukurti.
+torlauncher.torrc_missing=Trūksta torrc failo ir jo nepavyko sukurti.
torlauncher.datadir_missing=Nėra Tor duomenų katalogo ir nepavyko jo sukurti.
-torlauncher.password_hash_missing=Nepavyko perskaityti slaptažodžio santrumpos
+torlauncher.password_hash_missing=Nepavyko gauti maišyto slaptažodžio.
-torlauncher.failed_to_get_settings=Nepavyko perskaityti Tor nustatymo parametrų.\n\n%S
-torlauncher.failed_to_save_settings=Nepavyko įrašyti Tor nustatymo parametrų.\n\n%S
-torlauncher.ensure_tor_is_running=Įsitikinkite, kad Tor yra vykdomas.
+torlauncher.failed_to_get_settings=Nepavyko gauti Tor nustatymų.\n\n%S
+torlauncher.failed_to_save_settings=Nepavyko įrašyti Tor nustatymų.\n\n%S
+torlauncher.ensure_tor_is_running=Įsitikinkite, kad Tor veikia.
torlauncher.error_proxy_addr_missing=Jei norite, kad Tor prie interneto jungtųsi per įgaliotąjį serverį, turite nurodyti ir prievado numerį, ir serverio IP adresą arba serverio vardą.
-torlauncher.error_proxy_type_missing=Turite pasirinkti įgaliotojo serverio tipą.
+torlauncher.error_proxy_type_missing=Privalote pasirinkti įgaliotojo serverio tipą.
torlauncher.error_bridges_missing=Privalote nurodyti bent vieną tinklų tiltą.
torlauncher.error_default_bridges_type_missing=Privalote nurodytiems tinklų tiltams pasirinkti perdavimo tipą.
torlauncher.error_bridgedb_bridges_missing=Užklauskite tinklų tiltą.
@@ -47,7 +47,7 @@ torlauncher.quit=Baigti
torlauncher.quit_win=Išeiti
torlauncher.done=Atlikta
-torlauncher.forAssistance=Jei Jums reikia pagalbos, susisiekti galite su %S
+torlauncher.forAssistance=Jeigu jums reikia pagalbos, susisiekite su %S
torlauncher.forAssistance2=Norėdami gauti pagalbos, apsilankykite %S
torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor įvykių žurnalas paruoštas įklijuoti į teksto redagavimo programą ar elektroninio pašto pranešimą.
@@ -62,7 +62,7 @@ torlauncher.bootstrapStatus.conn_done=Prisijungta prie Tor retransliavimo
torlauncher.bootstrapStatus.handshake=Derimasi su Tor retransliavimu
torlauncher.bootstrapStatus.handshake_done=Užbaigtas derėjimasis su Tor retransliavimu
torlauncher.bootstrapStatus.onehop_create=Užmezgiamas šifruoto katalogo ryšys
-torlauncher.bootstrapStatus.requesting_status=Nuskaitoma tinklo būklė
+torlauncher.bootstrapStatus.requesting_status=Gaunama tinklo būsena
torlauncher.bootstrapStatus.loading_status=Įkeliama tinklo būsena
torlauncher.bootstrapStatus.loading_keys=Įkeliami liudijimų įstaigos liudijimai
torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retransliavimo informacija
@@ -87,7 +87,7 @@ torlauncher.bootstrapWarning.identity=tapatybės neatitiktis
torlauncher.bootstrapWarning.timeout=pasibaigė ryšiui skirtas laikas
torlauncher.bootstrapWarning.noroute=nėra maršruto iki pagrindinio kompiuterio
torlauncher.bootstrapWarning.ioerror=skaitymo/rašymo klaida
-torlauncher.bootstrapWarning.pt_missing=trūksta prijungiamo perdavimo
+torlauncher.bootstrapWarning.pt_missing=trūksta keičiamojo perdavimo
torlauncher.nsresult.NS_ERROR_NET_RESET=Ryšys su serveriu nutrūko.
torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Nepavyko prisijungti prie serverio.
diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/mg/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/mg/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/mi/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/mi/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/mn/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/mn/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd
deleted file mode 100644
index 5e37095..0000000
--- a/src/chrome/locale/ms-MY/network-settings.dtd
+++ /dev/null
@@ -1,83 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tetapan Rangkaian Tor">
-<!ENTITY torsettings.wizard.title.default "Sambung denganTor">
-<!ENTITY torsettings.wizard.title.configure "Tetapan Rangkaian Tor">
-<!ENTITY torsettings.wizard.title.connecting "Menjalinkan Sambungan">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Bahasa Pelayar Tor">
-<!ENTITY torlauncher.localePicker.prompt "Sila pilih satu bahasa.">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torSettings.connectPrompt "Klik "Sambung" untuk bersambung dengan Tor.">
-<!ENTITY torSettings.configurePrompt ".Klik "Konfigur" untuk laraskan tetapan rangkaian jika anda berada di negara yang melarang penggunaan Tor (seperti Mesir, China, Turki) atau jika anda menyambung dengan rangkaian persendirian yang memerlukan proksi">
-<!ENTITY torSettings.configure "Konfigur">
-<!ENTITY torSettings.connect "Sambung">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Menunggu Tor untuk dimulakan...">
-<!ENTITY torsettings.restartTor "Mula Semula Tor">
-<!ENTITY torsettings.reconfigTor "Konfigur Semula">
-
-<!ENTITY torsettings.discardSettings.prompt "Anda telah mengkonfigur titi Tor atau telah memasukkan tetapan proksi setempat.  Untuk membuat sambungan terus dengan rangkaian Tor. tetapan ini mesti dibuang.">
-<!ENTITY torsettings.discardSettings.proceed "Buang Tetapan dan Sambung">
-
-<!ENTITY torsettings.optional "Pilihan">
-
-<!ENTITY torsettings.useProxy.checkbox "Saya guna proksi untuk bersambung dengan Internet">
-<!ENTITY torsettings.useProxy.type "Jenis Proxy">
-<!ENTITY torsettings.useProxy.type.placeholder "pilih sejenis proksi">
-<!ENTITY torsettings.useProxy.address "Address">
-<!ENTITY torsettings.useProxy.address.placeholder "Alamat IP atau nama hos">
-<!ENTITY torsettings.useProxy.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "Kata Laluan">
-<!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 "Komputer ini melalui tembok api yang hanya membolehkan sambungan ke port tertentu">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
-<!ENTITY torsettings.useBridges.checkbox "Tor dilarang penggunaannya di negara saya">
-<!ENTITY torsettings.useBridges.default "Pilih satu titi terbina-dalam">
-<!ENTITY torsettings.useBridges.default.placeholder "pilih satu titi">
-<!ENTITY torsettings.useBridges.bridgeDB "Pinta titi dari torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Masukkan aksara yang tertera dari imej">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dapatkan satu cabaran baharu">
-<!ENTITY torsettings.useBridges.captchaSubmit "Serah">
-<!ENTITY torsettings.useBridges.custom "Sediakan satu titi yang saya tahu">
-<!ENTITY torsettings.useBridges.label "Masukkan maklumat titi dari sumber yang dipercayai.">
-<!ENTITY torsettings.useBridges.placeholder "taip alamat:port (satu per baris)">
-
-<!ENTITY torsettings.copyLog "Salin log Tor ke Papan Keratan">
-
-<!ENTITY torsettings.proxyHelpTitle "Bantuan Proksi">
-<!ENTITY torsettings.proxyHelp1 "Satu proksi setempat diperlukan semasa menyambung dengan rangkaian syarikat, sekolah, atau universiti. Jika anda tidak pasti sama ada proksi diperlukan atau sebaliknya, lihat tetapan Internet dalam pelayar yang lain atau periksa tetapan rangkaian sistem anda.">
-
-<!ENTITY torsettings.bridgeHelpTitle "Bantuan Geganti Titi">
-<!ENTITY torsettings.bridgeHelp1 "Titi adalah geganti tidak tersenarai yang menjadikannya lebih sukar menyekat sambungan dengan Rangkaian Tor.  Setiap jenis titi menggunakan kaedah berbeza untuk menghindari sekatan.  Obf menjadikan trafik anda seakan-akan hingar rawak, dan paling teruk menjadikan trafik anda kelihatan mahu bersambung dengan perkhidmatan lain selain dari Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Oleh kerana terdapat beberapa negara menyekat Tor, sesetengah titi berfungsi di negara tertentu tetapi tidak pada negar lain.  Jika anda tidak pasti titi yang manakah sesuai untuk negara anda, sila lawati torproject.org/about/contact.html#support">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Tunggu sebentar sementara kami menjalinkan sambungan dengan rangkaian Tor.  Ia mengambil masa beberapa minit.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
-<!ENTITY torPreferences.bridges "Jambatan, ataupun Bridges">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Pinta satu Titi Baharu...">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
-<!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta satu titi.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Jawapan salah. Cuba sekali lagi.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties
deleted file mode 100644
index 5ffbae7..0000000
--- a/src/chrome/locale/ms-MY/torlauncher.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Pelancar Tor
-
-torlauncher.tor_exited_during_startup=Tor tertutup ketika permulaan. Ia berkemungkinan dari ralat dalam fail torrc, pepijat dalam Tor atau berpunca dari lain-lain program dalam sistem anda, atau perkakasan bermasalah. Sehinggalah anda membaiki masalah tersebut dan mulakan semula Tor, Pelayar Tor tidak dapat dimulakan.
-torlauncher.tor_exited=Tor keluar secara tidak dijangka. Ia berkemungkinan dari pepijat yang wujud di dalam Tor, berpunca dari lain-lain program dalam sistem anda, atau perkakasan bermasalah. Sehinggalah anda mulakan semula Tor, Pelayar Tor tidak dapat mencapai mana-mana laman sesawang. Jika masalah masih berlanjutan, sila hantar satu salinan Log Tor kepada pasukan sokongan.
-torlauncher.tor_exited2=Memulakan semula Tor tidak akan menutup tab pelayar anda.
-torlauncher.tor_controlconn_failed=Tidak dapat menyambung ke port kawalan Tor.
-torlauncher.tor_failed_to_start=Tor gagal untuk bermula.
-torlauncher.tor_control_failed=Gagal mengambil alih Tor.
-torlauncher.tor_bootstrap_failed=Tor gagal untuk mewujudkan sambungan rangkaian Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S).
-
-torlauncher.unable_to_start_tor=Tidak dapat memulakan Tor.\n\n%S
-torlauncher.tor_missing=Tor executable hilang.
-torlauncher.torrc_missing=Fail torrc hilang dan tidak dapat dicipta.
-torlauncher.datadir_missing=Direktori data Tor tidak wujud dan tidak dapat dicipta.
-torlauncher.password_hash_missing=Gagal untuk mendapatkan kata laluan hashes.
-
-torlauncher.failed_to_get_settings=Gagal mendapatkan tetapan Tor.\n\n%S
-torlauncher.failed_to_save_settings=Gagal menyimpan tetapan Tor.\n\n%S
-torlauncher.ensure_tor_is_running=Sila pastikan bahawa Tor telah berjalan.
-
-torlauncher.error_proxy_addr_missing=Anda mesti nyatakan kedua-dua alamat IP atau nama hos dan nombor port bagi mengkonfigur Tor untuk menggunakan proksi yang dapat mencapai Internet.
-torlauncher.error_proxy_type_missing=Anda mesti pilih jenis proksi.
-torlauncher.error_bridges_missing=Anda mesti nyatakan satu atau lebih titi.
-torlauncher.error_default_bridges_type_missing=Anda mesti pilih jenis angkutan untuk titi yang disediakan.
-torlauncher.error_bridgedb_bridges_missing=Sila pinta satu titi.
-torlauncher.error_bridge_bad_default_type=Tiada titi disediakan yang mempunyai jenis angkutan %S tersedia. Sila laras tetapan anda.
-
-torlauncher.bridge_suffix.meek-amazon=(berfungsi di China)
-torlauncher.bridge_suffix.meek-azure=(berfungsi di China)
-
-torlauncher.request_a_bridge=Pinta satu Titi...
-torlauncher.request_a_new_bridge=Pinta satu Titi Baharu...
-torlauncher.contacting_bridgedb=Menghubungi BridgeDB. Tunggu sebentar.
-torlauncher.captcha_prompt=Selesaikan CAPTCHA untuk meminta satu titi.
-torlauncher.bad_captcha_solution=Jawapan salah. Cuba sekali lagi.
-torlauncher.unable_to_get_bridge=Gagal memperoleh satu titi dari BridgeDB.\n\n%S
-torlauncher.no_meek=Pelayar ini tidak dikonfigur untuk meek, yang mana perlu dapatkan titi terlebih dahulu.
-torlauncher.no_bridges_available=Tiada titi tersedia buat masa ini. Mohon maaf.
-
-torlauncher.connect=Sambung
-torlauncher.restart_tor=Mula Semula Tor
-torlauncher.quit=Henti
-torlauncher.quit_win=Keluar
-torlauncher.done=Selesai
-
-torlauncher.forAssistance=Untuk bantuan, hubungi %S
-torlauncher.forAssistance2=Untuk dapatkan bantuan, lawati %S
-
-torlauncher.copiedNLogMessages=Salin selesai. %S mesej log Tor sedia ditampal ke dalam penyunting teks atau mesej emel.
-
-torlauncher.bootstrapStatus.starting=Memulakan
-torlauncher.bootstrapStatus.conn_pt=Menyambung dengan titi
-torlauncher.bootstrapStatus.conn_done_pt=Bersambung dengan titi
-torlauncher.bootstrapStatus.conn_proxy=Menyambung dengan proksi
-torlauncher.bootstrapStatus.conn_done_proxy=Bersambung dengan proksi
-torlauncher.bootstrapStatus.conn=Menyambung dengan satu geganti Tor
-torlauncher.bootstrapStatus.conn_done=Bersambung dengan satu geganti Tor
-torlauncher.bootstrapStatus.handshake=Berunding dengan satu geganti Tor
-torlauncher.bootstrapStatus.handshake_done=Selesai berunding dengan satu geganti Tor
-torlauncher.bootstrapStatus.onehop_create=Menjalinkan sambungan direktori tersulit
-torlauncher.bootstrapStatus.requesting_status=Memperoleh status rangkaian
-torlauncher.bootstrapStatus.loading_status=Memuatkan status rangkaian
-torlauncher.bootstrapStatus.loading_keys=Memuatkan sijil kuasa
-torlauncher.bootstrapStatus.requesting_descriptors=Meminta maklumat geganti
-torlauncher.bootstrapStatus.loading_descriptors=Memuatkan maklumat geganti
-torlauncher.bootstrapStatus.enough_dirinfo=Selesai memuatkan maklumat geganti
-torlauncher.bootstrapStatus.ap_conn_pt=Membina litar: Menyambung dengan titi
-torlauncher.bootstrapStatus.ap_conn_done_pt=Membina litar: Bersambung dengan Titi
-torlauncher.bootstrapStatus.ap_conn_proxy=Membina litar: Menyambung dengan proksi
-torlauncher.bootstrapStatus.ap_conn_done_proxy=Membina litar: Bersambung dengan proksi
-torlauncher.bootstrapStatus.ap_conn=Membina litar: Menyambung dengan satu geganti Tor
-torlauncher.bootstrapStatus.ap_conn_done=Membina litar: Bersambung dengan geganti Tor
-torlauncher.bootstrapStatus.ap_handshake=Membina litar: Berunding dengan satu geganti Tor
-torlauncher.bootstrapStatus.ap_handshake_done=Membina litar: Selesai berunding dengan satu geganti Tor
-torlauncher.bootstrapStatus.circuit_create=Membina litar: Menjalinkan satu litar Tor
-torlauncher.bootstrapStatus.done=Bersambung dengan rangkaian Tor!
-
-torlauncher.bootstrapWarning.done=selesai
-torlauncher.bootstrapWarning.connectrefused=sambungan dinafikan
-torlauncher.bootstrapWarning.misc=pelbagai
-torlauncher.bootstrapWarning.resourcelimit=sumber tidak mencukupi
-torlauncher.bootstrapWarning.identity=identiti tidak sepadan
-torlauncher.bootstrapWarning.timeout=sambungan tamat masa
-torlauncher.bootstrapWarning.noroute=tiada hala dihoskan
-torlauncher.bootstrapWarning.ioerror=ralat baca/tulis
-torlauncher.bootstrapWarning.pt_missing=angkutan boleh palam hilang
-
-torlauncher.nsresult.NS_ERROR_NET_RESET=Sambungan dengan pelayan telah terputus.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Tidak dapat bersambung dengan pelayan.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Tidak dapat bersambung dengan proksi.
diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/mt/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/mt/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/nah/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/nah/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/nap/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/nap/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb-NO/network-settings.dtd
similarity index 93%
rename from src/chrome/locale/nb/network-settings.dtd
rename to src/chrome/locale/nb-NO/network-settings.dtd
index 145b427..2254760 100644
--- a/src/chrome/locale/nb/network-settings.dtd
+++ b/src/chrome/locale/nb-NO/network-settings.dtd
@@ -37,7 +37,7 @@
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Denne datamaskinen går gjennom en brannmur som kun tillater tilkoblinger til visse porter">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
+<!ENTITY torsettings.firewall.allowedPorts "Tillatte porter">
<!ENTITY torsettings.useBridges.checkbox "Tor er sensurert i mitt land">
<!ENTITY torsettings.useBridges.default "Velg en bro med flere innfartsårer">
<!ENTITY torsettings.useBridges.default.placeholder "velg en bro">
@@ -64,20 +64,20 @@
<!-- #31286 about:preferences strings -->
<!ENTITY torPreferences.categoryTitle "Tor">
<!ENTITY torPreferences.torSettings "Tor Innstillinger">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser dirigerer trafikken din over Tor-nettverket, drevet av tusenvis av frivillige rundt om i verden." >
<!ENTITY torPreferences.learnMore "Lær mer">
<!ENTITY torPreferences.bridges "Broer">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
+<!ENTITY torPreferences.useBridge "Bruk en bro">
<!ENTITY torPreferences.requestNewBridge "Forespør ny bro…">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avansert">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
+<!ENTITY torPreferences.requestBridgeDialogTitle "Forespør en bro">
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA-en for å forespørre en bro.">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke riktig. Vær så snill, prøv på nytt.">
<!ENTITY torPreferences.viewTorLogs "Se Tor-loggene.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!ENTITY torPreferences.viewLogs "Vis logger...">
<!ENTITY torPreferences.torLogsDialogTitle "Tor Logger">
diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb-NO/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/nb/torlauncher.properties
rename to src/chrome/locale/nb-NO/torlauncher.properties
diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd
deleted file mode 100644
index 247385b..0000000
--- a/src/chrome/locale/nds/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed.">
-
-<!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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/nds/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn-NO/network-settings.dtd
similarity index 100%
rename from src/chrome/locale/nn/network-settings.dtd
rename to src/chrome/locale/nn-NO/network-settings.dtd
diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn-NO/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/nn/torlauncher.properties
rename to src/chrome/locale/nn-NO/torlauncher.properties
diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/nso/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/nso/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd
similarity index 96%
rename from src/chrome/locale/hy/network-settings.dtd
rename to src/chrome/locale/oc/network-settings.dtd
index 0a20cc6..656b834 100644
--- a/src/chrome/locale/hy/network-settings.dtd
+++ b/src/chrome/locale/oc/network-settings.dtd
@@ -12,7 +12,7 @@
<!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.configure "Configure">
-<!ENTITY torSettings.connect "Միացնել">
+<!ENTITY torSettings.connect "Connect">
<!-- Other: -->
@@ -31,8 +31,8 @@
<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
<!ENTITY torsettings.useProxy.port "Port">
-<!ENTITY torsettings.useProxy.username "Օգտագործողիանուն">
-<!ENTITY torsettings.useProxy.password "Գաղտնագիր">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Senhal">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties
similarity index 98%
rename from src/chrome/locale/hy/torlauncher.properties
rename to src/chrome/locale/oc/torlauncher.properties
index a945dde..ca9774b 100644
--- a/src/chrome/locale/hy/torlauncher.properties
+++ b/src/chrome/locale/oc/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=Միացնել
+torlauncher.connect=Connect
torlauncher.restart_tor=Restart Tor
torlauncher.quit=Quit
-torlauncher.quit_win=Դուրս գալ
+torlauncher.quit_win=Exit
torlauncher.done=Done
torlauncher.forAssistance=For assistance, contact %S
diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa-IN/network-settings.dtd
similarity index 100%
rename from src/chrome/locale/pa/network-settings.dtd
rename to src/chrome/locale/pa-IN/network-settings.dtd
diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa-IN/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/pa/torlauncher.properties
rename to src/chrome/locale/pa-IN/torlauncher.properties
diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/pap/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/pap/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd
deleted file mode 100644
index 49683d0..0000000
--- a/src/chrome/locale/pl-PL/network-settings.dtd
+++ /dev/null
@@ -1,57 +0,0 @@
-<!ENTITY torsettings.dialog.title "">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torsettings.prompt "">
-
-<!ENTITY torSettings.yes "Tak">
-<!ENTITY torSettings.no "Nie">
-
-<!ENTITY torSettings.firstQuestion "">
-<!ENTITY torSettings.configurePrompt1 "">
-<!ENTITY torSettings.configurePrompt2 "">
-<!ENTITY torSettings.configure "">
-<!ENTITY torSettings.connectPrompt1 "">
-<!ENTITY torSettings.connectPrompt2 "">
-<!ENTITY torSettings.connect "">
-
-<!ENTITY torSettings.proxyQuestion "">
-<!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "">
-<!ENTITY torSettings.enterProxy "">
-<!ENTITY torSettings.firewallQuestion "">
-<!ENTITY torSettings.firewallHelp "">
-<!ENTITY torSettings.enterFirewall "">
-<!ENTITY torSettings.bridgeQuestion "">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "">
-<!ENTITY torsettings.restart "">
-
-<!ENTITY torsettings.optional "">
-
-<!ENTITY torsettings.useProxy.checkbox "">
-<!ENTITY torsettings.useProxy.type "">
-<!ENTITY torsettings.useProxy.address "">
-<!ENTITY torsettings.useProxy.address.placeholder "">
-<!ENTITY torsettings.useProxy.port "">
-<!ENTITY torsettings.useProxy.username "">
-<!ENTITY torsettings.useProxy.password "">
-<!ENTITY torsettings.useProxy.type.socks4 "">
-<!ENTITY torsettings.useProxy.type.socks5 "">
-<!ENTITY torsettings.useProxy.type.http "">
-<!ENTITY torsettings.firewall.checkbox "">
-<!ENTITY torsettings.firewall.allowedPorts "">
-<!ENTITY torsettings.useBridges.checkbox "">
-<!ENTITY torsettings.useBridges.label "">
-<!ENTITY torsettings.useBridges.placeholder "">
-
-<!ENTITY torsettings.copyLog "">
-<!ENTITY torsettings.bridgeHelpTitle "">
-<!ENTITY torsettings.bridgeHelp1 "">
-<!ENTITY torsettings.bridgeHelp2 "">
-<!ENTITY torsettings.bridgeHelp3 "">
-<!ENTITY torsettings.bridgeHelp4 "">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/pl-PL/torlauncher.properties b/src/chrome/locale/pl-PL/torlauncher.properties
deleted file mode 100644
index 54c1f90..0000000
--- a/src/chrome/locale/pl-PL/torlauncher.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-### Copyright (c) 2013, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-# torlauncher.error_title=Tor Launcher
-
-# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
-# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-# torlauncher.tor_failed_to_start=Tor failed to start.
-# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
-
-# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-# torlauncher.tor_missing=The Tor executable is missing.
-# torlauncher.torrc_missing=The torrc file is missing.
-# torlauncher.datadir_missing=The Tor data directory does not exist.
-# torlauncher.password_hash_missing=Failed to get hashed password.
-
-# 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.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.connect=Connect
-# torlauncher.quit=Quit
-torlauncher.quit_win=Wyjście
-torlauncher.done=Zrobione
-
-# torlauncher.forAssistance=For assistance, contact %S
diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/pms/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/pms/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/ps/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/ps/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/pt-PT/network-settings.dtd b/src/chrome/locale/pt-PT/network-settings.dtd
index 131cb4a..c67eda7 100644
--- a/src/chrome/locale/pt-PT/network-settings.dtd
+++ b/src/chrome/locale/pt-PT/network-settings.dtd
@@ -1,6 +1,6 @@
-<!ENTITY torsettings.dialog.title "Definições da Rede Tor">
+<!ENTITY torsettings.dialog.title "Configurações da Rede Tor">
<!ENTITY torsettings.wizard.title.default "Ligar ao Tor">
-<!ENTITY torsettings.wizard.title.configure "Definições da Rede Tor">
+<!ENTITY torsettings.wizard.title.configure "Configurações da Rede Tor">
<!ENTITY torsettings.wizard.title.connecting "Estabelecer uma Ligação">
<!-- For locale picker: -->
@@ -10,7 +10,7 @@
<!-- For "first run" wizard: -->
<!ENTITY torSettings.connectPrompt "Clique em "Ligar" para ligar ao Tor.">
-<!ENTITY torSettings.configurePrompt "Clique em “Configurar” para ajustar as definições de rede se estiver num país que censura o Tor (tal como a China, o Egito, a Turquia) ou se estiver a ligar a partir de uma rede privada que requer um proxy.">
+<!ENTITY torSettings.configurePrompt "Clique em “Configurar” para ajustar as definições de rede se estiver num país que censura o Tor (tais como China, Egito, Turquia) ou se estiver a ligar a partir de uma rede privada que requer um proxy.">
<!ENTITY torSettings.configure "Configurar">
<!ENTITY torSettings.connect "Ligar">
diff --git a/src/chrome/locale/pt-PT/torlauncher.properties b/src/chrome/locale/pt-PT/torlauncher.properties
index 0d3cb6b..36e225e 100644
--- a/src/chrome/locale/pt-PT/torlauncher.properties
+++ b/src/chrome/locale/pt-PT/torlauncher.properties
@@ -18,8 +18,8 @@ torlauncher.torrc_missing=O ficheiro torrc está em falta e não foi possível c
torlauncher.datadir_missing=O diretório de dados do Tor não existe e não foi possível criá-lo.
torlauncher.password_hash_missing=Não foi possível obter a palavra-passe "hashed".
-torlauncher.failed_to_get_settings=Não é possível obter as configurações do Tor\n\n %S
-torlauncher.failed_to_save_settings=Não é possível guardar as configurações do Tor\n\n %S
+torlauncher.failed_to_get_settings=Não é possível obter as definições do Tor\n\n %S
+torlauncher.failed_to_save_settings=Não é possível guardar as definições do Tor\n\n %S
torlauncher.ensure_tor_is_running=Por favor, certifique-se que o Tor está em execução.
torlauncher.error_proxy_addr_missing=Deve especificar ambos, um endereço de IP ou o nome de hospedeiro e um número de porta para configurar o Tor, para utilizar um proxy para aceder à Internet.
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
deleted file mode 100644
index aa57861..0000000
--- a/src/chrome/locale/pt/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Configurações da Rede Tor">
-<!ENTITY torsettings.wizard.title.default "Ligar ao Tor">
-<!ENTITY torsettings.wizard.title.configure "Definições da Rede Tor">
-<!ENTITY torsettings.wizard.title.connecting "Estabelecer uma Ligação">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Idioma do Navegador Tor">
-<!ENTITY torlauncher.localePicker.prompt "Por favor, selecione um idioma.">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torSettings.connectPrompt "Clique em 'Ligar' para ligar ao Tor.">
-<!ENTITY torSettings.configurePrompt "Clique em “Configurar” para ajustar as definições de rede se estiver num país que censura o Tor (tal como China, Egito, Turquia) ou se estiver a ligar a partir de uma rede privada que requer um proxy.">
-<!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connect "Ligar">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "A aguardar que o Tor inicie...">
-<!ENTITY torsettings.restartTor "Reiniciar Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigurar">
-
-<!ENTITY torsettings.discardSettings.prompt "Configurou as pontes do Tor ou inseriu as definições do proxy local.  Para efetuar uma ligação direta à rede Tor, estas definições devem ser removidas.">
-<!ENTITY torsettings.discardSettings.proceed "Remover Definições e Ligar">
-
-<!ENTITY torsettings.optional "Opcional">
-
-<!ENTITY torsettings.useProxy.checkbox "Eu utilizo um proxy para ligar à Internet">
-<!ENTITY torsettings.useProxy.type "Tipo de proxy">
-<!ENTITY torsettings.useProxy.type.placeholder "selecionar um tipo de proxy">
-<!ENTITY torsettings.useProxy.address "Endereço">
-<!ENTITY torsettings.useProxy.address.placeholder "Endereço de IP ou nome do hospedeiro">
-<!ENTITY torsettings.useProxy.port "Porta">
-<!ENTITY torsettings.useProxy.username "Nome do utilizador">
-<!ENTITY torsettings.useProxy.password "Senha">
-<!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 "Este computador liga através de uma firewall que só permite ligações para determinadas portas.">
-<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas">
-<!ENTITY torsettings.useBridges.checkbox "Tor é censurado no meu país">
-<!ENTITY torsettings.useBridges.default "Selecionar um ponte integrada">
-<!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte">
-<!ENTITY torsettings.useBridges.bridgeDB "Solicitar uma ponte a partir de torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Insira os carateres da imagem">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obter um novo desafio">
-<!ENTITY torsettings.useBridges.captchaSubmit "Submeter">
-<!ENTITY torsettings.useBridges.custom "Fornecer uma ponte que eu conheça">
-<!ENTITY torsettings.useBridges.label "Inserir a informação de ponte de uma fonte confiável">
-<!ENTITY torsettings.useBridges.placeholder "digite address:port (uma por linha)">
-
-<!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência">
-
-<!ENTITY torsettings.proxyHelpTitle "Ajuda de Proxy">
-<!ENTITY torsettings.proxyHelp1 "Um proxy local pode ser necessário ao conectar-se através de uma empresa, escola ou rede universitária. Se você não tiver certeza se um proxy é necessário, verifique as configurações da Internet em outro navegador ou verifique as configurações de rede do seu sistema.">
-
-<!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte">
-<!ENTITY torsettings.bridgeHelp1 "As pontes são retransmissões não listadas que dificultam o bloqueio de ligações à Rede Tor. Cada tipo de ponte utiliza um método diferente para evitar a censura. Os "obfs" fazem com que o seu tráfego pareça um ruído aleatório, e os pacíficos fazem com que o seu tráfego pareça que está a ligar-se ao serviço, em vez ao Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Por causa de como certos países tentam bloquear o Tor, certas pontes funcionam em certos países, mas não em outros. Se não tiver a certeza sobre quais as pontes que funcionam no seu país, visite torproject.org/about/contact.htmupport">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Solicite uma Nova Ponte...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "A contactar BridgeDB. Por favor, aguarde.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente.">
diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties
deleted file mode 100644
index 9a58dd2..0000000
--- a/src/chrome/locale/pt/torlauncher.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-torlauncher.tor_exited_during_startup=O Tor fechou-se durante o arranque. Isto pode ter acontecido devido a erro no seu ficheiro torrc, um erro no Tor ou outro programa no seu sistema, ou falha de hardware. Até que corrija o problema em causa reinicie o Tor, o Tor Browser não irá iniciar.
-torlauncher.tor_exited=O Tor fechou.se inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. Até que reinicie o Tor, o Tor Browser não irá poder aceder a quaisquer sítios da Web. Se o problema persistir, por favor, envie uma cópia do Registo de Eventos do seu Tor para a equipa de suporte.
-torlauncher.tor_exited2=Ao reiniciar o Tor não irá fechar os separadores do seu navegador.
-torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor.
-torlauncher.tor_failed_to_start=O Tor não foi iniciado.
-torlauncher.tor_control_failed=Não foi possível obter o controlo do Tor
-torlauncher.tor_bootstrap_failed=O Tor não conseguiu estabelecer uma ligação de rede Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S).
-
-torlauncher.unable_to_start_tor=Não é possível iniciar o Tor.\n\n %S
-torlauncher.tor_missing=O executável do Tor está em falta.
-torlauncher.torrc_missing=O ficheiro torc está em falta e não foi possível criá-lo.
-torlauncher.datadir_missing=A diretoria de dados do Tor não existe e não foi possível criá-la.
-torlauncher.password_hash_missing=Não foi possível obter a palavra-passe "hashed".
-
-torlauncher.failed_to_get_settings=Não é possível obter as configurações do Tor\n\n %S
-torlauncher.failed_to_save_settings=Não é possível guardar as configurações do Tor\n\n %S
-torlauncher.ensure_tor_is_running=Por favor, assegure que o Tor está em execução.
-
-torlauncher.error_proxy_addr_missing=Deve especificar ambos, um endereço de IP ou o nome de hospedeiro e um número de porta para configurar o Tor, para utilizar um proxy para aceder à Internet.
-torlauncher.error_proxy_type_missing=Deve selecionar o tipo de proxy.
-torlauncher.error_bridges_missing=Deve especificar uma ou mais pontes.
-torlauncher.error_default_bridges_type_missing=Deve selecionar o tipo de transporte para as pontes fornecidas
-torlauncher.error_bridgedb_bridges_missing=Por favor, solicite uma ponte.
-torlauncher.error_bridge_bad_default_type=Não estão disponíveis as pontes fornecidas que têm o tipo de transporte %S. Por favor, ajuste as suas configurações.
-
-torlauncher.bridge_suffix.meek-amazon=(funciona na China)
-torlauncher.bridge_suffix.meek-azure=(funciona na China)
-
-torlauncher.request_a_bridge=Solicite uma Ponte...
-torlauncher.request_a_new_bridge=Solicite uma Nova Ponte...
-torlauncher.contacting_bridgedb=A contactar BridgeDB. Por favor, aguarde.
-torlauncher.captcha_prompt=Resolva o CAPTCHA para solicitar uma ponte.
-torlauncher.bad_captcha_solution=A solução não está correta. Por favor, tente novamente.
-torlauncher.unable_to_get_bridge=Não é possível obter uma ponte de BridgeDB.\n\n%S
-torlauncher.no_meek=Este navegador não está configurado para "meek", que é necessário para obter as pontes.
-torlauncher.no_bridges_available=De momento, não estão disponíveis pontes. Desculpe.
-
-torlauncher.connect=Ligar
-torlauncher.restart_tor=Reiniciar o Tor
-torlauncher.quit=Sair
-torlauncher.quit_win=Fechar
-torlauncher.done=Concluído
-
-torlauncher.forAssistance=Para assistência, contacte %S
-torlauncher.forAssistance2=Para assistência, visite %S
-
-torlauncher.copiedNLogMessages=Cópia completa. Estão prontas %S mensagens do registo de eventos do Tor para serem coladas num editor de texto ou numa mensagem de correio eletrónico.
-
-torlauncher.bootstrapStatus.starting=Iniciando
-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=A estabelecer uma ligação de diretoria encriptada
-torlauncher.bootstrapStatus.requesting_status=A obter o estado da rede
-torlauncher.bootstrapStatus.loading_status=A carregar o estado da rede
-torlauncher.bootstrapStatus.loading_keys=A carregar os certificados de autoridade
-torlauncher.bootstrapStatus.requesting_descriptors=A solicitar a informação do retransmissor
-torlauncher.bootstrapStatus.loading_descriptors=A carregar a informação do retransmissor
-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=Ligado à rede Tor
-
-torlauncher.bootstrapWarning.done=finalizado
-torlauncher.bootstrapWarning.connectrefused=ligação recusada
-torlauncher.bootstrapWarning.misc=diversos
-torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes
-torlauncher.bootstrapWarning.identity=identidade não correspondente
-torlauncher.bootstrapWarning.timeout=ligação expirada
-torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro
-torlauncher.bootstrapWarning.ioerror=Erro de leitura/gravação
-torlauncher.bootstrapWarning.pt_missing=transporte de ligação em falta
-
-torlauncher.nsresult.NS_ERROR_NET_RESET=A ligação para o servidor foi perdida.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Não foi possível ligar ao servidor.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Não foi possível ligar ao proxy.
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index 9efedab..4260ea0 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -37,7 +37,7 @@
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Acest computer trece printr-un firewall care permite doar conexiuni către anumite porturi">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
+<!ENTITY torsettings.firewall.allowedPorts "Porturi permise">
<!ENTITY torsettings.useBridges.checkbox "Tor este cenzurat în țara mea">
<!ENTITY torsettings.useBridges.default "Selectează o punte integrată">
<!ENTITY torsettings.useBridges.default.placeholder "selectează o punte">
@@ -63,21 +63,21 @@
<!-- #31286 about:preferences strings -->
<!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "Setări Tor">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser vă orientează traficul prin rețeaua Tor, condusă de mii de voluntari din întreaga lume." >
<!ENTITY torPreferences.learnMore "Află mai multe">
<!ENTITY torPreferences.bridges "Punți">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
+<!ENTITY torPreferences.bridgesDescription "Podurile vă ajută să accesați rețeaua Tor în locurile în care Tor este blocat. În funcție de locul în care vă aflați, un pod poate funcționa mai bine decât altul.">
+<!ENTITY torPreferences.useBridge "Folosiți un pod">
<!ENTITY torPreferences.requestNewBridge "Cerere Punte Nouă">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.provideBridge "Furnizați un pod">
<!ENTITY torPreferences.advanced "Avansat">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
+<!ENTITY torPreferences.advancedDescription "Configurați modul în care Tor Browser se conectează la internet.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Valori separate prin virgulă">
+<!ENTITY torPreferences.requestBridgeDialogTitle "Cere podul">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactarea BridgeDB. Te rog asteapta.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rezolvă acest CAPTCHA pentru a cere o punte.">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Soluția nu este corectă. Încearcă din nou.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
+<!ENTITY torPreferences.viewTorLogs "Vizualizați jurnalele Tor.">
+<!ENTITY torPreferences.viewLogs "Vizualizați jurnalele ...">
+<!ENTITY torPreferences.torLogsDialogTitle "Jurnalele Tor">
diff --git a/src/chrome/locale/ru(a)petr1708/network-settings.dtd b/src/chrome/locale/ru(a)petr1708/network-settings.dtd
deleted file mode 100644
index 203d8e3..0000000
--- a/src/chrome/locale/ru(a)petr1708/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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 "Адрес">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Порт">
-<!ENTITY torsettings.useProxy.username "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ru(a)petr1708/torlauncher.properties b/src/chrome/locale/ru(a)petr1708/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/ru(a)petr1708/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/sco/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/sco/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si/network-settings.dtd
similarity index 100%
rename from src/chrome/locale/si-LK/network-settings.dtd
rename to src/chrome/locale/si/network-settings.dtd
diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/si-LK/torlauncher.properties
rename to src/chrome/locale/si/torlauncher.properties
diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd
deleted file mode 100644
index b3882a7..0000000
--- a/src/chrome/locale/sk-SK/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Nastavenia Tor Network">
-<!ENTITY torsettings.wizard.title.default "Pripojiť k Tor">
-<!ENTITY torsettings.wizard.title.configure "Nastavenia Tor Network">
-<!ENTITY torsettings.wizard.title.connecting "Vytváram spojenie">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Jazyk Tor Browser">
-<!ENTITY torlauncher.localePicker.prompt "Prosím zvoľte jazyk.">
-
-<!-- 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.configure "Konfigurovať">
-<!ENTITY torSettings.connect "Pripojiť">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Čakanie na štart Toru...">
-<!ENTITY torsettings.restartTor "Reštartovať Tor">
-<!ENTITY torsettings.reconfigTor "Rekonfigurovať">
-
-<!ENTITY torsettings.discardSettings.prompt "Nakonfigurovali ste Tor premostenia alebo ste uviedli miestne nastavenia proxy.  Pre vytvorenie priameho spojenia so sieťou Tor, musia byť tieto nastavenia odstránené.">
-<!ENTITY torsettings.discardSettings.proceed "Odstrániť nastavenia a spojenia">
-
-<!ENTITY torsettings.optional "Voliteľné">
-
-<!ENTITY torsettings.useProxy.checkbox "Na pripojenie k internetu používam proxy">
-<!ENTITY torsettings.useProxy.type "Typ proxy">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!ENTITY torsettings.useProxy.address "Adresa">
-<!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa">
-<!ENTITY torsettings.useProxy.port "Port">
-<!ENTITY torsettings.useProxy.username "Užívateľské meno">
-<!ENTITY torsettings.useProxy.password "Heslo">
-<!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 "Tento počítač prechádza cez firewall, ktorý povoľuje spojenie len k určitým portom.">
-<!ENTITY torsettings.firewall.allowedPorts "Povolené porty">
-<!ENTITY torsettings.useBridges.checkbox "Tor je v mojej krajine cenzurovaný">
-<!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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Kopírovať log Toru do schránky">
-
-<!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.bridgeHelpTitle "Pomocník pre premostenia relé">
-<!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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Prosím počkajte na vytvorenie pripojenia do siete Tor.  Môže to trvať niekoľko minút. ">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties
deleted file mode 100644
index 2f77c46..0000000
--- a/src/chrome/locale/sk-SK/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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 nečakane ukončený. Mohla nastať chyba v prehliadači Tor, alebo to mohlo byť spôsobené iným programom vo Vašom systéme alebo chybným hardvérom. Kým nereštartujete Tor, prehliadač Tor nebude schopný načítať žiadne webové stránky. Ak sa tým problém nevyrieši, pošlite kópiu záznamu Tor Log tímu technickej podpory.
-torlauncher.tor_exited2=Reštartovanie Tor spojenia nezavrie záložky
-torlauncher.tor_controlconn_failed=Pripojenie ku kontrolnému portu Tor bolo neúspešné.
-torlauncher.tor_failed_to_start=Nepodarilo sa spustiť Tor.
-torlauncher.tor_control_failed=Nepodarilo sa získať kontrolu nad Tor-om
-torlauncher.tor_bootstrap_failed=Tor nedokázal nadviazať spojenie do siete Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S zlyhaných (%2$S).
-
-torlauncher.unable_to_start_tor=Nie je možné spustiť Tor.\n\n%S
-torlauncher.tor_missing=Chýbjú dáta pre spustenie Tor.
-torlauncher.torrc_missing=Chýba súbor torrc a nemohol byť vytvorený.
-torlauncher.datadir_missing=Priečinok pre dáta Tor neexistuje a nemohol byť vytvorený.
-torlauncher.password_hash_missing=Nebolo možné prevziať zašifrované heslo.
-
-torlauncher.failed_to_get_settings=Nepodarilo sa získať Tor nastavenia.\n\n%S
-torlauncher.failed_to_save_settings=Nepodarilo sa uložiť Tor nastavenia.\n\n%S
-torlauncher.ensure_tor_is_running=Prosím, uistite sa že Tor beží.
-
-torlauncher.error_proxy_addr_missing=Musíte špecifikovať tak IP adresu alebo host, ako aj port, aby Tor používal proxy na pripájanie sa do internetu.
-torlauncher.error_proxy_type_missing=Musíte si vybrať proxy typ.
-torlauncher.error_bridges_missing=Musíte špecifikovať jedno alebo viac premostení
-torlauncher.error_default_bridges_type_missing=Musíte vybrať typ transportu pre získanie premostení.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
-torlauncher.error_bridge_bad_default_type=Nie sú k dispozícii žiadne premostenia s typom transportu %S. Prosím upravte nastavenia.
-
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Pripojiť
-torlauncher.restart_tor=Reštartovať Tor
-torlauncher.quit=Ukončiť
-torlauncher.quit_win=Ukončiť
-torlauncher.done=Hotovo
-
-torlauncher.forAssistance=Pre pomoc konaktujte %S
-torlauncher.forAssistance2=Pre pomoc navštívte %S
-
-torlauncher.copiedNLogMessages=Kopírovanie kompletné. %S záznamov je pripravených na vloženie do textového editora alebo emailu.
-
-torlauncher.bootstrapStatus.conn_dir=Pripájam sa do priečinka relé
-torlauncher.bootstrapStatus.handshake_dir=Vytváram spojenie so zašifrovaným priečinkom
-torlauncher.bootstrapStatus.requesting_status=Získavam stav siete
-torlauncher.bootstrapStatus.loading_status=Načítavam stav siete
-torlauncher.bootstrapStatus.loading_keys=Načítavam certifikáty autority
-torlauncher.bootstrapStatus.requesting_descriptors=Vyžiadavam informácie o relé
-torlauncher.bootstrapStatus.loading_descriptors=Načítavam informácie o relé
-torlauncher.bootstrapStatus.conn_or=Pripájanie do siete Tor
-torlauncher.bootstrapStatus.handshake_or=Vytváram obvod Tor
-torlauncher.bootstrapStatus.done=Pripojené do siete Tor!
-
-torlauncher.bootstrapWarning.done=hotovo
-torlauncher.bootstrapWarning.connectrefused=spojenie odmietnuté
-torlauncher.bootstrapWarning.misc=rôzne
-torlauncher.bootstrapWarning.resourcelimit=nedostatočné zdroje
-torlauncher.bootstrapWarning.identity=nezhoda v identite
-torlauncher.bootstrapWarning.timeout=timeout spojenia
-torlauncher.bootstrapWarning.noroute=Žiadna cesta ku hostiteľovi
-torlauncher.bootstrapWarning.ioerror=chyba čítania, alebo zápisu
-torlauncher.bootstrapWarning.pt_missing=chýba zásuvný - pluggable transport
-
-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.
diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd
deleted file mode 100644
index 22c9ec6..0000000
--- a/src/chrome/locale/sl-SI/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor mrežne nastavitve">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor mrežne nastavitve">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Oblikovanje">
-<!ENTITY torSettings.connect "Povezava">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Čakanje na zagon Tor-a...">
-<!ENTITY torsettings.restartTor "Ponovno zaženite Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "Po izbiri">
-
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy tip">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!ENTITY torsettings.useProxy.address "Naslov">
-<!ENTITY torsettings.useProxy.address.placeholder "IP naslov ali ime domene">
-<!ENTITY torsettings.useProxy.port "Vhod">
-<!ENTITY torsettings.useProxy.username "Uporabniško ime">
-<!ENTITY torsettings.useProxy.password "Geslo">
-<!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 "Računalnik uporablja požarni zid, ki dovoljuje povezavo le na določena vrata">
-<!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata">
-<!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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Kopirajte Tor poročilo v odložišče">
-
-<!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.bridgeHelpTitle "Pomoč premostitveno vozlišče">
-<!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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties
deleted file mode 100644
index bfbe535..0000000
--- a/src/chrome/locale/sl-SI/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor zaganjalnik
-
-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=Nepričakovan izstop Tor-a. To je lahko posledica napake v Tor-u samem, drugega programa na vašem sistemu, ali pomanjkljive opreme. Dokler ne boste ponovno zagnali Tor, Tor brskalnik ne more odpreti nobene spletne strani. Če se težave nadaljujejo, prosimo, pošljite kopijo Tor poročila ekipi za podporo.
-torlauncher.tor_exited2=Ponoven zagon Tor-a ne bo zaprl tabulatorjev brskalnika
-torlauncher.tor_controlconn_failed=Nemogoče se povezati z Tor kontrolnimi vrati
-torlauncher.tor_failed_to_start=Tor se ni zagnal.
-torlauncher.tor_control_failed=Neuspešen nadzor Tor-a.
-torlauncher.tor_bootstrap_failed=Tor ni mogel vzpostaviti Tor mrežno povezavo
-torlauncher.tor_bootstrap_failed_details=%1$S neuspešno (%2$S).
-
-torlauncher.unable_to_start_tor=Nemogoče zagnati Tor,\n\n%S
-torlauncher.tor_missing=Tor zagonska manjka.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
-torlauncher.password_hash_missing=Neuspelo pridobivanje hash gesla.
-
-torlauncher.failed_to_get_settings=Ni moč pridobiti nastavitve Tor,\n\n%S
-torlauncher.failed_to_save_settings=Nastavitve Tor ni mogoče shraniti,\n\n%S
-torlauncher.ensure_tor_is_running=Prepričajte se, da Tor deluje.
-
-torlauncher.error_proxy_addr_missing=Določiti morate tako IP-naslov ali ime gostitelja in številko vrat, da nastavite Tor uporabo proxi-ja za dostop do interneta.
-torlauncher.error_proxy_type_missing=Izbrati morate tip proxi-ja
-torlauncher.error_bridges_missing=Določiti morate enega ali več mostičkov.
-torlauncher.error_default_bridges_type_missing=Izbrati morate tip prometa za ponujene premostitve.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
-torlauncher.error_bridge_bad_default_type=Nobenih ponujenih premostitev, ki imajo tip transporta% S ni na voljo. Prosimo, da prilagodite nastavitve.
-
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Povezava
-torlauncher.restart_tor=Ponovno zaženite Tor
-torlauncher.quit=Opusti
-torlauncher.quit_win=Izhod
-torlauncher.done=Narejeno
-
-torlauncher.forAssistance=Za podporo, stik %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Kopiranje končano. % S Tor poročila so pripravljena za lepljenje v urejevalnik besedil ali e-poštno sporočilo.
-
-torlauncher.bootstrapStatus.conn_dir=Povezovanje na imenik vmesnika
-torlauncher.bootstrapStatus.handshake_dir=Urejanje šifriranega imenika povezave
-torlauncher.bootstrapStatus.requesting_status=Stanje vzpostavljenega omrežja
-torlauncher.bootstrapStatus.loading_status=Stanje nalaganja omrežja
-torlauncher.bootstrapStatus.loading_keys=Nalaganje veljavnosti certifikatov
-torlauncher.bootstrapStatus.requesting_descriptors=Info zahtevanih vmesnikov
-torlauncher.bootstrapStatus.loading_descriptors=Nalaganje informacij vmesnikov
-torlauncher.bootstrapStatus.conn_or=Povezovanje v Tor omrežje
-torlauncher.bootstrapStatus.handshake_or=Vzpostavljanje Tor povezave
-torlauncher.bootstrapStatus.done=Povezan v Tor omrežje
-
-torlauncher.bootstrapWarning.done=narejeno
-torlauncher.bootstrapWarning.connectrefused=povezava zavrnjena
-torlauncher.bootstrapWarning.misc=razno
-torlauncher.bootstrapWarning.resourcelimit=nezadostni viri
-torlauncher.bootstrapWarning.identity=zmešnjava identitet
-torlauncher.bootstrapWarning.timeout=potekel čas povezave
-torlauncher.bootstrapWarning.noroute=ni poti gostitelja
-torlauncher.bootstrapWarning.ioerror=napaka read/write
-torlauncher.bootstrapWarning.pt_missing=manjka vtični promet
-
-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.
diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd
deleted file mode 100644
index c73d96a..0000000
--- a/src/chrome/locale/sn/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Tumira">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties
deleted file mode 100644
index 85bb97c..0000000
--- a/src/chrome/locale/sn/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Regedza
-torlauncher.quit_win=Buda
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/so/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/so/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd
deleted file mode 100644
index 3c445d0..0000000
--- a/src/chrome/locale/sq-AL/network-settings.dtd
+++ /dev/null
@@ -1,77 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- For "first run" wizard: -->
-
-<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
-
-<!ENTITY torSettings.yes "Yes">
-<!ENTITY torSettings.no "No">
-
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
-<!ENTITY torSettings.connect "Connect">
-
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
-<!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
-<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
-<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "Optional">
-
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type">
-<!ENTITY torsettings.useProxy.address "Address">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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 "My Internet Service Provider (ISP) blocks connections to the Tor network">
-<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
-<!ENTITY torsettings.useBridges.type "Transport type:">
-<!ENTITY torsettings.useBridges.custom "Enter custom bridges">
-<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "type address:port">
-
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
-<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
-<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
-<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
-<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request.">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/sq-AL/torlauncher.properties b/src/chrome/locale/sq-AL/torlauncher.properties
deleted file mode 100644
index da5641e..0000000
--- a/src/chrome/locale/sq-AL/torlauncher.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-### Copyright (c) 2014, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
-torlauncher.password_hash_missing=Failed to get hashed password.
-
-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.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_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
-
-torlauncher.recommended_bridge=(recommended)
-
-torlauncher.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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
diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd
deleted file mode 100644
index 23af3e2..0000000
--- a/src/chrome/locale/sr(a)latin/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Podešavanja Tor mreže">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Podešavanja Tor mreže">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Konfiguriši">
-<!ENTITY torSettings.connect "Povezivanje">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restartovanje Tor-a">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "Opciono">
-
-<!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 "Adresa">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port">
-<!ENTITY torsettings.useProxy.username "Korisničko ime">
-<!ENTITY torsettings.useProxy.password "Lozinka">
-<!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 "Dozvoljeni portovi: ">
-<!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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties
deleted file mode 100644
index 6a75211..0000000
--- a/src/chrome/locale/sr(a)latin/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Povezivanje
-torlauncher.restart_tor=Restartovanje Tor-a
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/st/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties
deleted file mode 100644
index a4d097a..0000000
--- a/src/chrome/locale/st/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/su/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/su/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd
similarity index 98%
rename from src/chrome/locale/sv/network-settings.dtd
rename to src/chrome/locale/sv-SE/network-settings.dtd
index a346d0c..a31aa57 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv-SE/network-settings.dtd
@@ -49,7 +49,7 @@
<!ENTITY torsettings.useBridges.label "Ange broinformationen från en betrodd källa">
<!ENTITY torsettings.useBridges.placeholder "skriv adress:port (en per rad)">
-<!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet">
+<!ENTITY torsettings.copyLog "Kopiera Tor-logg till urklipp">
<!ENTITY torsettings.proxyHelpTitle "Proxy hjälp">
<!ENTITY torsettings.proxyHelp1 "En lokal proxy kan behövas när du ansluter via ett företags-, skol- eller universitetsnätverk. Om du inte är säker på om en proxy behövs, titta på internetinställningarna i en annan webbläsare eller kontrollera systemets nätverksinställningar.">
diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties
similarity index 100%
rename from src/chrome/locale/sv/torlauncher.properties
rename to src/chrome/locale/sv-SE/torlauncher.properties
diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd
deleted file mode 100644
index 247385b..0000000
--- a/src/chrome/locale/szl/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed.">
-
-<!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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/szl/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd
index 02168c4..529f134 100644
--- a/src/chrome/locale/ta/network-settings.dtd
+++ b/src/chrome/locale/ta/network-settings.dtd
@@ -74,7 +74,7 @@
<!ENTITY torPreferences.provideBridge "Bridge ஐ வழங்குக">
<!ENTITY torPreferences.advanced "மேம்பட்டது">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.firewallPortsPlaceholder "காற்புள்ளியால் பிரிக்கப்பட்ட தகவுமதிப்புகள்">
<!ENTITY torPreferences.requestBridgeDialogTitle "Bridge ஐ வேண்டுக">
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd
deleted file mode 100644
index 247385b..0000000
--- a/src/chrome/locale/te-IN/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed.">
-
-<!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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/te-IN/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd
deleted file mode 100644
index fa41990..0000000
--- a/src/chrome/locale/tg/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Пайваст шудан">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties
deleted file mode 100644
index bdc9b73..0000000
--- a/src/chrome/locale/tg/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Пайваст шудан
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Баромадан
-torlauncher.quit_win=Баромад
-torlauncher.done=Иҷро шуд
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd
deleted file mode 100644
index 782ff95..0000000
--- a/src/chrome/locale/ti/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "ኣራኽብ">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties
deleted file mode 100644
index c438d31..0000000
--- a/src/chrome/locale/ti/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=ኣራኽብ
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=ኣቋርጽ
-torlauncher.quit_win=ውጻእ
-torlauncher.done=ተዓሚሙ
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd
deleted file mode 100644
index b01b8db..0000000
--- a/src/chrome/locale/tk/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Birikdirildi">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Iber">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties
deleted file mode 100644
index 7a3e6af..0000000
--- a/src/chrome/locale/tk/torlauncher.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Birikdirildi
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Çykyş
-torlauncher.done=Boldy
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=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.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties
index 78c62bb..0a9dbb7 100644
--- a/src/chrome/locale/tr/torlauncher.properties
+++ b/src/chrome/locale/tr/torlauncher.properties
@@ -3,8 +3,8 @@
torlauncher.error_title=Tor Başlatıcı
-torlauncher.tor_exited_during_startup=Tor başlatılırken sonlandı. Bu durum torrc dosyasındaki ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Sorun çözülene ve Tor uygulaması yeniden başlatılana kadar Tor Browser çalışmayacak.
-torlauncher.tor_exited=Tor, beklenmedik şekilde sonlandı. Bu durum Tor içinde ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Yeniden başlatılana kadar Tor Browser hiçbir web sitesine erişemeyecek. Sorun devam ederse lütfen Tor Günlüğünün bir kopyasını destek ekibine gönderin.
+torlauncher.tor_exited_during_startup=Tor başlatılırken sonlandı. Bu durum torrc dosyasındaki ya da sisteminizdeki başka bir uygulamada bulunan bir hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Sorun çözülene ve Tor uygulaması yeniden başlatılana kadar Tor Browser çalışmayacak.
+torlauncher.tor_exited=Tor, beklenmedik şekilde sonlandı. Bu durum Tor içinde ya da sisteminizdeki başka bir uygulamada bulunan bir hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Yeniden başlatılana kadar Tor Browser hiçbir web sitesine erişemeyecek. Sorun devam ederse lütfen Tor Günlüğünün bir kopyasını destek ekibine gönderin.
torlauncher.tor_exited2=Tor uygulaması yeniden başlatıldığında tarayıcı sekmeleriniz kapatılmayacak.
torlauncher.tor_controlconn_failed=Tor denetim bağlantı noktasına bağlanılamadı.
torlauncher.tor_failed_to_start=Tor başlatılamadı.
diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd
deleted file mode 100644
index 7cdf82a..0000000
--- a/src/chrome/locale/ur-PK/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "ٹور نیٹ ورک سیٹنگز">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "ٹور نیٹ ورک سیٹنگز">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.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.port "پورٹ">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties
deleted file mode 100644
index 4d1db29..0000000
--- a/src/chrome/locale/ur-PK/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=چھوڑدیجیے (Quit)
-torlauncher.quit_win=Exit
-torlauncher.done=مکمل ہوگیا
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/ve/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/ve/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/wa/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/wa/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/wo/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/wo/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
diff --git a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd b/src/chrome/locale/zh-CN.GB2312/network-settings.dtd
deleted file mode 100644
index 76c4c53..0000000
--- a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established.">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
deleted file mode 100644
index 65407db..0000000
--- a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-### Copyright (c) 2014, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-# torlauncher.error_title=Tor Launcher
-
-# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
-# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-# torlauncher.tor_failed_to_start=Tor failed to start.
-# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
-# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
-
-# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-# torlauncher.tor_missing=The Tor executable is missing.
-# torlauncher.torrc_missing=The torrc file is missing.
-# torlauncher.datadir_missing=The Tor data directory does not exist.
-# torlauncher.password_hash_missing=Failed to get hashed password.
-
-# 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.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.connect=Connect
-# torlauncher.quit=Quit
-# torlauncher.quit_win=Exit
-# torlauncher.done=Done
-
-# torlauncher.forAssistance=For assistance, contact %S
-
-# 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.done=Connected to the Tor network!
-
-# 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
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index 05cbd95..8bc4339 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -37,7 +37,7 @@
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "這台電腦通過某個只允許連接至特定連接埠的防火牆">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
+<!ENTITY torsettings.firewall.allowedPorts "允許的連接埠">
<!ENTITY torsettings.useBridges.checkbox "我的國家中 Tor 受到審查">
<!ENTITY torsettings.useBridges.default "選擇內建的橋接">
<!ENTITY torsettings.useBridges.default.placeholder "選擇橋接">
@@ -63,21 +63,21 @@
<!-- #31286 about:preferences strings -->
<!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "Tor 設定">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser 透過 Tor 網路將您的流量進行路由,而 Tor 網路是由世界上數千名志願者所支持。" >
<!ENTITY torPreferences.learnMore "了解更多">
<!ENTITY torPreferences.bridges "橋接器">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
+<!ENTITY torPreferences.useBridge "使用橋接">
<!ENTITY torPreferences.requestNewBridge "請求一個新的橋接...">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.provideBridge "提供橋接">
<!ENTITY torPreferences.advanced "進階的">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
+<!ENTITY torPreferences.advancedDescription "設定 Tor Browser 如何連線到網際網路。">
+<!ENTITY torPreferences.firewallPortsPlaceholder "逗點分隔值">
+<!ENTITY torPreferences.requestBridgeDialogTitle "請求橋接">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "正在連接到 BridgeDB,請稍候。">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "解決驗證碼來請求橋接">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "解答不正確。請再試一次。">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
+<!ENTITY torPreferences.viewTorLogs "查看 Tor 紀錄。">
<!ENTITY torPreferences.viewLogs "查看日誌…">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor 記錄">
diff --git a/src/chrome/locale/zh/network-settings.dtd b/src/chrome/locale/zh/network-settings.dtd
deleted file mode 100644
index 965652e..0000000
--- a/src/chrome/locale/zh/network-settings.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established.">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established.">
-
-<!-- #31286 about:preferences strings -->
diff --git a/src/chrome/locale/zh/torlauncher.properties b/src/chrome/locale/zh/torlauncher.properties
deleted file mode 100644
index 65407db..0000000
--- a/src/chrome/locale/zh/torlauncher.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-### Copyright (c) 2014, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-# torlauncher.error_title=Tor Launcher
-
-# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
-# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-# torlauncher.tor_failed_to_start=Tor failed to start.
-# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
-# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
-
-# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-# torlauncher.tor_missing=The Tor executable is missing.
-# torlauncher.torrc_missing=The torrc file is missing.
-# torlauncher.datadir_missing=The Tor data directory does not exist.
-# torlauncher.password_hash_missing=Failed to get hashed password.
-
-# 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.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.connect=Connect
-# torlauncher.quit=Quit
-# torlauncher.quit_win=Exit
-# torlauncher.done=Done
-
-# torlauncher.forAssistance=For assistance, contact %S
-
-# 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.done=Connected to the Tor network!
-
-# 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
diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd
deleted file mode 100644
index f22f1c8..0000000
--- a/src/chrome/locale/zu/network-settings.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
-
-<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
-
-<!-- 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.configure "Configure">
-<!ENTITY torSettings.connect "Connect">
-
-<!-- Other: -->
-
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
-
-<!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.optional "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.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
-<!ENTITY torsettings.useProxy.password "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.useBridges.captchaSubmit "Submit">
-<!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.copyLog "Copy Tor Log To Clipboard">
-
-<!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.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">
-
-<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties
deleted file mode 100644
index 15a3fc1..0000000
--- a/src/chrome/locale/zu/torlauncher.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-### Copyright (c) 2016, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-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_exited2=Restarting Tor will not close your browser tabs.
-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.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-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.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.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.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
-
-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.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
-
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-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.done=Connected to the Tor network!
-
-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.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.
1
0

[torbutton/maint-9.0] Bug 31855: Remove End of Year Fundraising Campaign from about:tor
by sysrqb@torproject.org 03 Jan '20
by sysrqb@torproject.org 03 Jan '20
03 Jan '20
commit 61ccbe66353e84b33147490d4080d58f8f7fdf46
Author: Richard Pospesel <richard(a)torproject.org>
Date: Mon Dec 16 14:10:13 2019 -0800
Bug 31855: Remove End of Year Fundraising Campaign from about:tor
---
LICENSE | 115 ----------------------------
chrome/content/aboutTor/aboutTor-content.js | 18 -----
chrome/content/aboutTor/aboutTor.xhtml | 26 +------
chrome/locale/ar/aboutTor.dtd | 5 --
chrome/locale/bn-BD/aboutTor.dtd | 5 --
chrome/locale/ca/aboutTor.dtd | 5 --
chrome/locale/cs/aboutTor.dtd | 5 --
chrome/locale/da/aboutTor.dtd | 5 --
chrome/locale/de/aboutTor.dtd | 5 --
chrome/locale/el/aboutTor.dtd | 5 --
chrome/locale/en-US/aboutTor.dtd | 5 --
chrome/locale/es-AR/aboutTor.dtd | 5 --
chrome/locale/es-ES/aboutTor.dtd | 5 --
chrome/locale/eu/aboutTor.dtd | 5 --
chrome/locale/fa/aboutTor.dtd | 5 --
chrome/locale/fr/aboutTor.dtd | 5 --
chrome/locale/ga-IE/aboutTor.dtd | 5 --
chrome/locale/he/aboutTor.dtd | 5 --
chrome/locale/hu/aboutTor.dtd | 5 --
chrome/locale/id/aboutTor.dtd | 5 --
chrome/locale/is/aboutTor.dtd | 5 --
chrome/locale/it/aboutTor.dtd | 5 --
chrome/locale/ja/aboutTor.dtd | 5 --
chrome/locale/ka/aboutTor.dtd | 5 --
chrome/locale/ko/aboutTor.dtd | 5 --
chrome/locale/mk/aboutTor.dtd | 5 --
chrome/locale/nb-NO/aboutTor.dtd | 5 --
chrome/locale/nl/aboutTor.dtd | 5 --
chrome/locale/pl/aboutTor.dtd | 5 --
chrome/locale/pt-BR/aboutTor.dtd | 5 --
chrome/locale/ro/aboutTor.dtd | 5 --
chrome/locale/ru/aboutTor.dtd | 5 --
chrome/locale/sv-SE/aboutTor.dtd | 5 --
chrome/locale/tr/aboutTor.dtd | 5 --
chrome/locale/vi/aboutTor.dtd | 5 --
chrome/locale/zh-CN/aboutTor.dtd | 5 --
chrome/locale/zh-TW/aboutTor.dtd | 5 --
chrome/skin/Take_Back_Monochrome_purple.png | Bin 117916 -> 0 bytes
chrome/skin/aboutTor.css | 113 +--------------------------
chrome/skin/aboutTorFonts.css | 19 -----
40 files changed, 5 insertions(+), 456 deletions(-)
diff --git a/LICENSE b/LICENSE
index 9c4498df..66c78f65 100644
--- a/LICENSE
+++ b/LICENSE
@@ -27,118 +27,3 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-"League Gothic" font embedded in chrome/skin/aboutTorFonts.css is licensed
-under:
-
-Copyright (c) 2010, Caroline Hadilaksono & Micah Rich
-<caroline@hadilaksono, micah(a)micahrich.com>, with Reserved Font Name:
-"League Gothic".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-===============================================================================
-
-'Source' font embedded in chrome/skin/aboutTorFonts.css is licensed under:
-
-Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/) with
-Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of
-Adobe Systems Incorporated in the United States and/or other countries.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-===============================================================================
-
-SIL OPEN FONT LICENSE
-
-Version 1.1 - 26 February 2007
-
-PREAMBLE
-
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-DEFINITIONS
-
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting — in part or in whole — any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-PERMISSION & CONDITIONS
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-TERMINATION
-
-This license becomes null and void if any of the above conditions are
-not met.
-DISCLAIMER
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/chrome/content/aboutTor/aboutTor-content.js b/chrome/content/aboutTor/aboutTor-content.js
index 13aa39da..9dd885fa 100644
--- a/chrome/content/aboutTor/aboutTor-content.js
+++ b/chrome/content/aboutTor/aboutTor-content.js
@@ -127,24 +127,6 @@ var AboutTorListener = {
elem.appendChild(content.document.createTextNode(productName + ' '
+ tbbVersion));
} catch (e) {}
-
- let ey2019_elem_id = "ey2019_donate";
- let ey2019_locale_url =
- `https://www.torproject.org/donate/donate-tbi-${aLocale}`;
-
- if (content.document.body.getAttribute("mobile")) {
- ey2019_elem_id = "ey2019_donate_mobile";
- ey2019_locale_url =
- `https://www.torproject.org/donate/donate-tbi-mobile-${aLocale}`;
- }
-
- content.document
- .getElementById(ey2019_elem_id)
- .setAttribute("href", ey2019_locale_url);
-
- content.document
- .getElementById(ey2019_elem_id + "_bottom")
- .setAttribute("href", ey2019_locale_url);
}
};
diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml
index 92a941ac..b146fb1b 100644
--- a/chrome/content/aboutTor/aboutTor.xhtml
+++ b/chrome/content/aboutTor/aboutTor.xhtml
@@ -20,12 +20,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: resource: 'unsafe-inline'; font-src data:;" />
+ <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: resource: 'unsafe-inline';" />
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>&aboutTor.title;</title>
<link rel="stylesheet" type="text/css" media="all"
- href="resource://torbutton-assets/aboutTorFonts.css"/>
- <link rel="stylesheet" type="text/css" media="all"
href="resource://torbutton-assets/aboutTor.css"/>
<script type="text/javascript">
<![CDATA[
@@ -36,7 +34,7 @@ window.addEventListener("pageshow", function() {
]]>
</script>
</head>
-<body dir="&locale.dir;" ey2019="yes">
+<body dir="&locale.dir;">
<div class="torcontent-container">
<div id="torbrowser-info">
<div id="torbrowser-version"/>
@@ -44,26 +42,11 @@ window.addEventListener("pageshow", function() {
</div>
<img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/>
<div id="torstatus" class="top">
- <div class="hideIfTorOff hideIfHasBeenUpdated hideIfEY2019 torstatus-container">
+ <div class="hideIfTorOff hideIfHasBeenUpdated torstatus-container">
<div class="heading1">&aboutTor.ready.label;</div>
<br/>
<div class="heading2">&aboutTor.ready2.label;</div>
</div>
- <div class="hideIfTorOff hideIfHasBeenUpdated showIfEY2019 torstatus-container">
- <div id="ey2019_banner">
- <div id="ey2019_1">
- <p id="ey2019_tracking">&aboutTor.ey2019.tracking;</p>
- </div>
- <div id="ey2019_2">
- <h1 id="ey2019_takeback">&aboutTor.ey2019.takeback;</h1>
- </div>
- <div id="ey2019_3">
- <a id="ey2019_donate" href="https://www.torproject.org/donate/donate-tbi-default">&aboutTor.donationBanner.buttonA;</a>
- <a id="ey2019_donate_mobile" href="https://www.torproject.org/donate/donate-tbi-mobile-default">&aboutTor.donationBanner.buttonA;</a>
- <p id="ey2019_mozilla">&aboutTor.ey2019.mozilla;</p>
- </div>
- </div>
- </div>
<div class="showIfHasBeenUpdated torstatus-container">
<div class="heading1">&aboutTBUpdate.updated;</div>
<br/>
@@ -91,8 +74,7 @@ window.addEventListener("pageshow", function() {
<div id="bottom">
<p id="donate" class="moreInfoLink">&aboutTor.donationBanner.line2e;
- <a id="ey2019_donate_bottom" href="https://www.torproject.org/donate/donate-tbi-default">&aboutTor.donationBanner.buttonA;</a>
- <a id="ey2019_donate_mobile_bottom" href="https://www.torproject.org/donate/donate-tbi-mobile-default">&aboutTor.donationBanner.buttonA;</a>
+ <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a>
</p>
<p id="manual" class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label;
<a id="manualLink" target="_blank">&aboutTor.torbrowser_user_manual_link.label;</a></p>
diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd
index d0ca0d2b..610e2f77 100644
--- a/chrome/locale/ar/aboutTor.dtd
+++ b/chrome/locale/ar/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور.">
<!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور.">
<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "تبرع اليوم، وستجاريك موزيلا وتبرع بنفس المبلغ.">
-<!ENTITY aboutTor.ey2019.tracking "ينتشر التّتبُّع والرقابة والحجب على صعيد واسع في الانترنت">
-<!ENTITY aboutTor.ey2019.takeback "استعد السيطرة على الانترنت مع تور Tor">
diff --git a/chrome/locale/bn-BD/aboutTor.dtd b/chrome/locale/bn-BD/aboutTor.dtd
index 2d3feb03..76bc83da 100644
--- a/chrome/locale/bn-BD/aboutTor.dtd
+++ b/chrome/locale/bn-BD/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।">
<!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। ">
<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! ">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "অর্থ সাহায্য করুন, এবং মজিলা সমপরিমাণ সাহায্য করবে। ">
-<!ENTITY aboutTor.ey2019.tracking "ট্র্যাকিং, নজরদারি এবং সেন্সরশিপ অনলাইনে ব্যাপক।">
-<!ENTITY aboutTor.ey2019.takeback "Tor দিয়ে ইন্টারনেট আবার ফিরিয়ে নিন">
diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd
index 55cc87c6..1c3ac654 100644
--- a/chrome/locale/ca/aboutTor.dtd
+++ b/chrome/locale/ca/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Feu que Tor segueixi fort.">
<!ENTITY aboutTor.donationBanner.buttonA "Feu una donació">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Dóna avui, i Mozilla donarà el mateix import.">
-<!ENTITY aboutTor.ey2019.tracking "El seguiment, la vigilància i la censura en línia estan a l'ordre del dia.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/cs/aboutTor.dtd b/chrome/locale/cs/aboutTor.dtd
index e28721f7..06e411e5 100644
--- a/chrome/locale/cs/aboutTor.dtd
+++ b/chrome/locale/cs/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru.">
<!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sílit.">
<!ENTITY aboutTor.donationBanner.buttonA "Přispějte">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Přispějte hned a Mozilla vás dar zdvojnásobí.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd
index c461bc15..6fba4caf 100644
--- a/chrome/locale/da/aboutTor.dtd
+++ b/chrome/locale/da/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder.">
<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nu">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Giv i dag, og Mozilla vil matche din donation.">
-<!ENTITY aboutTor.ey2019.tracking "Sporing, overvågning og censur bruges meget online.">
-<!ENTITY aboutTor.ey2019.takeback "Tag internettet tilbage med Tor">
diff --git a/chrome/locale/de/aboutTor.dtd b/chrome/locale/de/aboutTor.dtd
index 2b2493cd..1263d928 100644
--- a/chrome/locale/de/aboutTor.dtd
+++ b/chrome/locale/de/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren.">
<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark.">
<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Gib noch heute, und Mozilla wird deiner Spende entsprechen.">
-<!ENTITY aboutTor.ey2019.tracking "Verfolgung, Überwachung und Zensur sind online weit verbreitet.">
-<!ENTITY aboutTor.ey2019.takeback "Erobere mit Tor das Internet zurück!">
diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd
index 33e005a0..1d23b6bb 100644
--- a/chrome/locale/el/aboutTor.dtd
+++ b/chrome/locale/el/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Διατηρήστε το Tor ισχυρό.">
<!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Δωρίστε σήμερα και το Mozilla θα δωρίσει το ίδιο ποσό!">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd
index 49215c75..c4273ad2 100644
--- a/chrome/locale/en-US/aboutTor.dtd
+++ b/chrome/locale/en-US/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd
index 972aaf90..552db139 100644
--- a/chrome/locale/es-AR/aboutTor.dtd
+++ b/chrome/locale/es-AR/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor.">
<!ENTITY aboutTor.donationBanner.buttonA "Doná ahora">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Dá hoy, y Mozilla emparejará tu donación.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/es-ES/aboutTor.dtd b/chrome/locale/es-ES/aboutTor.dtd
index aa075278..aff6157d 100644
--- a/chrome/locale/es-ES/aboutTor.dtd
+++ b/chrome/locale/es-ES/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora.">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Dona hoy, y Mozilla igualará tu donación.">
-<!ENTITY aboutTor.ey2019.tracking "El rastreo, la vigilancia y la censura están muy extendidos en línea.">
-<!ENTITY aboutTor.ey2019.takeback "Recupera Internet con Tor.">
diff --git a/chrome/locale/eu/aboutTor.dtd b/chrome/locale/eu/aboutTor.dtd
index 5d11d9cf..227035d0 100644
--- a/chrome/locale/eu/aboutTor.dtd
+++ b/chrome/locale/eu/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Harpidetu Tor berrietara">
<!ENTITY aboutTor.donationBanner.line2e "Mantendu Tor indartsu.">
<!ENTITY aboutTor.donationBanner.buttonA "Egin dohaintza orain">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/fa/aboutTor.dtd b/chrome/locale/fa/aboutTor.dtd
index 73f9017b..0ba77914 100644
--- a/chrome/locale/fa/aboutTor.dtd
+++ b/chrome/locale/fa/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "ثبتنام برای اخبار Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Tor را محکم نگه دارید.">
<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "امروز کمک کنید و موزیلا با کمک مالی شما همراهی میکند.">
-<!ENTITY aboutTor.ey2019.tracking "ردیابی ، نظارت و سانسور به صورت آنلاین گسترده است.">
-<!ENTITY aboutTor.ey2019.takeback "اینترنت را با Tor برگردانید">
diff --git a/chrome/locale/fr/aboutTor.dtd b/chrome/locale/fr/aboutTor.dtd
index 64a436cc..fc6929b5 100644
--- a/chrome/locale/fr/aboutTor.dtd
+++ b/chrome/locale/fr/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor">
<!ENTITY aboutTor.donationBanner.line2e "Assurez la robustesse de Tor.">
<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Faites un don aujourd’hui et Mozilla fera un don équivalent.">
-<!ENTITY aboutTor.ey2019.tracking "Le pistage, la surveillance et la censure sont très répandus sur Internet.">
-<!ENTITY aboutTor.ey2019.takeback "Avec Tor, réappropriez-vous Internet.">
diff --git a/chrome/locale/ga-IE/aboutTor.dtd b/chrome/locale/ga-IE/aboutTor.dtd
index 0d253b65..7f2f5d82 100644
--- a/chrome/locale/ga-IE/aboutTor.dtd
+++ b/chrome/locale/ga-IE/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor.">
<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Tabhair síntiús airgid inniu agus tabharfaidh Mozilla an méid céanna arís dúinn.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/he/aboutTor.dtd b/chrome/locale/he/aboutTor.dtd
index 9187529a..bf26a153 100644
--- a/chrome/locale/he/aboutTor.dtd
+++ b/chrome/locale/he/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor.">
<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק.">
<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "תן היום, ו־Mozilla תשווה את תרומתך.">
-<!ENTITY aboutTor.ey2019.tracking "מעקב, ציתות וצנזורה נפוצים ברשת.">
-<!ENTITY aboutTor.ey2019.takeback "קח בחזרה את האינטרנט עם Tor">
diff --git a/chrome/locale/hu/aboutTor.dtd b/chrome/locale/hu/aboutTor.dtd
index 8d8077aa..5d8e327c 100644
--- a/chrome/locale/hu/aboutTor.dtd
+++ b/chrome/locale/hu/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez.">
<!ENTITY aboutTor.donationBanner.line2e "Tartsuk meg a Tor-t erősnek.">
<!ENTITY aboutTor.donationBanner.buttonA "Támogasson most">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Adjon ma és a Mozilla is annyival támogat.">
-<!ENTITY aboutTor.ey2019.tracking "A követés, megfigyelés és cenzúra széles körben elterjedt online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/id/aboutTor.dtd b/chrome/locale/id/aboutTor.dtd
index bde5f87e..09bac66d 100644
--- a/chrome/locale/id/aboutTor.dtd
+++ b/chrome/locale/id/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Bantu Tor tetap kuat.">
<!ENTITY aboutTor.donationBanner.buttonA "Donasi Sekarang">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/is/aboutTor.dtd b/chrome/locale/is/aboutTor.dtd
index 54b0885e..2ee6f8d7 100644
--- a/chrome/locale/is/aboutTor.dtd
+++ b/chrome/locale/is/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir.">
<!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku">
<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Gefðu í dag - og Mozilla mun jafna framlag þitt.">
-<!ENTITY aboutTor.ey2019.tracking "Eftirlit, ritskoðun og njósnir er útbreiddar hættur á internetinu.">
-<!ENTITY aboutTor.ey2019.takeback "Taktu stjórnina yfir netvafrinu þínu með Tor">
diff --git a/chrome/locale/it/aboutTor.dtd b/chrome/locale/it/aboutTor.dtd
index a250de89..27cd6ab9 100644
--- a/chrome/locale/it/aboutTor.dtd
+++ b/chrome/locale/it/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona Adesso">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Dai oggi, e Mozilla ricambierà la tua donazione.">
-<!ENTITY aboutTor.ey2019.tracking "Tracciamento, sorveglianza e censura sono ampiamente diffuse in rete.">
-<!ENTITY aboutTor.ey2019.takeback "Riprendi possesso di internet con Tor">
diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd
index c5421168..b657853f 100644
--- a/chrome/locale/ja/aboutTor.dtd
+++ b/chrome/locale/ja/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。">
<!ENTITY aboutTor.donationBanner.line2e "Tor を強く保つ。">
<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "寄付をお願いします。Mozillaはあなたの寄付に裏切りません。">
-<!ENTITY aboutTor.ey2019.tracking "トラッキング、監視、検閲はネット上で広く行われています。">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/ka/aboutTor.dtd b/chrome/locale/ka/aboutTor.dtd
index 4a47f3d8..144ae7e5 100644
--- a/chrome/locale/ka/aboutTor.dtd
+++ b/chrome/locale/ka/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები.">
<!ENTITY aboutTor.donationBanner.line2e "შეინარჩუნეთ Tor ძლიერი.">
<!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "გაეცით დღესვე და Mozilla გააორმაგებს თქვენს შემოწირულობას.">
-<!ENTITY aboutTor.ey2019.tracking "მეთვალყურეობა, ზედამხედველობა და აკრძალვები მთელ ინტერნეტშია გავრცელებული.">
-<!ENTITY aboutTor.ey2019.takeback "დაიბრუნეთ ინტერნეტი Tor-ით.">
diff --git a/chrome/locale/ko/aboutTor.dtd b/chrome/locale/ko/aboutTor.dtd
index 84f24b44..70898aed 100644
--- a/chrome/locale/ko/aboutTor.dtd
+++ b/chrome/locale/ko/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독.">
<!ENTITY aboutTor.donationBanner.line2e "Tor 를 강하게 유지하기.">
<!ENTITY aboutTor.donationBanner.buttonA "기부하기">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd
index 8dd5c069..551ad217 100644
--- a/chrome/locale/mk/aboutTor.dtd
+++ b/chrome/locale/mk/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Пријавете се за Tor Вести.">
<!ENTITY aboutTor.donationBanner.line2e "Чувај го Tor силен.">
<!ENTITY aboutTor.donationBanner.buttonA "Донирај сега">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Донирај денес, и Mozilla ќе ја поврзе Вашата донација.">
-<!ENTITY aboutTor.ey2019.tracking "Следењето, надзорот, и цензурата се раширени насекаде низ Интернетот.">
-<!ENTITY aboutTor.ey2019.takeback "Вратете го назад вашиот Интернет со Tor">
diff --git a/chrome/locale/nb-NO/aboutTor.dtd b/chrome/locale/nb-NO/aboutTor.dtd
index 9c21095a..7b7e3caf 100644
--- a/chrome/locale/nb-NO/aboutTor.dtd
+++ b/chrome/locale/nb-NO/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter.">
<!ENTITY aboutTor.donationBanner.line2e "Hold Tor sterk.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nå">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd
index 808cb3ed..fac87025 100644
--- a/chrome/locale/nl/aboutTor.dtd
+++ b/chrome/locale/nl/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Meld u aan voor de Tor-nieuwsbrief.">
<!ENTITY aboutTor.donationBanner.line2e "Houd Tor sterk.">
<!ENTITY aboutTor.donationBanner.buttonA "Doneer nu">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Geef vandaag, en Mozilla geeft hetzelfde bedrag.">
-<!ENTITY aboutTor.ey2019.tracking "Volgen, toezicht en censuur zijn wijdverspreid online.">
-<!ENTITY aboutTor.ey2019.takeback "Pak het internet terug met Tor">
diff --git a/chrome/locale/pl/aboutTor.dtd b/chrome/locale/pl/aboutTor.dtd
index 56ffbd76..d0239848 100644
--- a/chrome/locale/pl/aboutTor.dtd
+++ b/chrome/locale/pl/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Zapisz się na Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Utrzymuj Tor silnym.">
<!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Przekaż dziś, a Mozilla podwoi Twoją dotację.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd
index c5c1237c..ec235f5b 100644
--- a/chrome/locale/pt-BR/aboutTor.dtd
+++ b/chrome/locale/pt-BR/aboutTor.dtd
@@ -31,8 +31,3 @@
<!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Mantenha o Tor forte.">
<!ENTITY aboutTor.donationBanner.buttonA "Doe Agora">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Doe hoje, e a Mozilla duplicará a sua doação.">
-<!ENTITY aboutTor.ey2019.tracking "Rastreamento, vigilância e censura são comuns online.">
-<!ENTITY aboutTor.ey2019.takeback "Recupere a Internet com o Tor">
diff --git a/chrome/locale/ro/aboutTor.dtd b/chrome/locale/ro/aboutTor.dtd
index af4e0ff5..ceaf5b07 100644
--- a/chrome/locale/ro/aboutTor.dtd
+++ b/chrome/locale/ro/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Abonează-te la Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Menține Tor puternic.">
<!ENTITY aboutTor.donationBanner.buttonA "Donează Acum">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Donează azi, și Mozilla va dona în aceeași măsură.">
-<!ENTITY aboutTor.ey2019.tracking "Urmărirea, supravegherea și cenzura sunt răspândite online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/ru/aboutTor.dtd b/chrome/locale/ru/aboutTor.dtd
index d38920d1..fddd66c7 100644
--- a/chrome/locale/ru/aboutTor.dtd
+++ b/chrome/locale/ru/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным.">
<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Пожертвуйте сегодня и Mozilla удвоит ваше пожертвование.">
-<!ENTITY aboutTor.ey2019.tracking "Отслеживание, наблюдение и цензура широко распространены в интернете.">
-<!ENTITY aboutTor.ey2019.takeback "Верните себе интернет вместе с Tor">
diff --git a/chrome/locale/sv-SE/aboutTor.dtd b/chrome/locale/sv-SE/aboutTor.dtd
index 075d692d..d403bb76 100644
--- a/chrome/locale/sv-SE/aboutTor.dtd
+++ b/chrome/locale/sv-SE/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter.">
<!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark.">
<!ENTITY aboutTor.donationBanner.buttonA "Donera nu">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Ge idag, och Mozilla kommer att matcha din donation.">
-<!ENTITY aboutTor.ey2019.tracking "Spårning, övervakning och censur är utbrett på nätet.">
-<!ENTITY aboutTor.ey2019.takeback "Ta tillbaka internet med Tor">
diff --git a/chrome/locale/tr/aboutTor.dtd b/chrome/locale/tr/aboutTor.dtd
index a0c27b36..42c9bc18 100644
--- a/chrome/locale/tr/aboutTor.dtd
+++ b/chrome/locale/tr/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Tor Duyurularına Abone Olun">
<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koruyun.">
<!ENTITY aboutTor.donationBanner.buttonA "Bağış Yapın">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Bugün yaptığınız her bağış kadar Mozilla da bağış yapacak.">
-<!ENTITY aboutTor.ey2019.tracking "Çevrimiçi izleme, gözetim ve sansür uygulamaları yaygındır.">
-<!ENTITY aboutTor.ey2019.takeback "Tor kullanın İnterneti geri alın.">
diff --git a/chrome/locale/vi/aboutTor.dtd b/chrome/locale/vi/aboutTor.dtd
index f06ed541..e69430c7 100644
--- a/chrome/locale/vi/aboutTor.dtd
+++ b/chrome/locale/vi/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ.">
<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "Hãy đóng góp ngay hôm nay, và Mozilla sẽ đóng góp tương ứng với phần của bạn.">
-<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
-<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/zh-CN/aboutTor.dtd b/chrome/locale/zh-CN/aboutTor.dtd
index f0468fbf..2048dc54 100644
--- a/chrome/locale/zh-CN/aboutTor.dtd
+++ b/chrome/locale/zh-CN/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "订阅 Tor 的最新动态">
<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。">
<!ENTITY aboutTor.donationBanner.buttonA "立即捐助">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "现在捐款, Mozilla 会匹配你的捐赠。">
-<!ENTITY aboutTor.ey2019.tracking "跟踪,监视和审查在网上广泛存在。">
-<!ENTITY aboutTor.ey2019.takeback "使用 Tor 夺回互联网">
diff --git a/chrome/locale/zh-TW/aboutTor.dtd b/chrome/locale/zh-TW/aboutTor.dtd
index 76ddf0f2..e937a010 100644
--- a/chrome/locale/zh-TW/aboutTor.dtd
+++ b/chrome/locale/zh-TW/aboutTor.dtd
@@ -30,8 +30,3 @@
<!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。">
<!ENTITY aboutTor.donationBanner.line2e "使 Tor 更加茁壯。">
<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">
-
-<!-- End of year 2019 Fundraising campaign -->
-<!ENTITY aboutTor.ey2019.mozilla "今日您捐款,Mozilla 也會捐出相同數額。">
-<!ENTITY aboutTor.ey2019.tracking "在網路世界中,追蹤、監視和審查無所不在。">
-<!ENTITY aboutTor.ey2019.takeback "透過 Tor 找回對網際網路的自主權">
diff --git a/chrome/skin/Take_Back_Monochrome_purple.png b/chrome/skin/Take_Back_Monochrome_purple.png
deleted file mode 100644
index f2503f1a..00000000
Binary files a/chrome/skin/Take_Back_Monochrome_purple.png and /dev/null differ
diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css
index 5da0e509..170cda27 100644
--- a/chrome/skin/aboutTor.css
+++ b/chrome/skin/aboutTor.css
@@ -95,7 +95,7 @@ a {
min-height: 92px;
}
-body:not([ey2019]) .top {
+.top {
white-space: nowrap;
}
@@ -345,114 +345,3 @@ body[mobile] .onion-pattern-container {
position: absolute;
bottom: 0px;
}
-
-/* End of year 2019 Fundraising campaign */
-body[toron][ey2019] {
- background-color: black;
-}
-
-body[ey2019] .searchbox form {
- width: 500px;
- margin: 3px auto 0px auto;
- text-align: left;
-}
-
-body[ey2019] .torcontent-logo {
- display: none!important;
-}
-
-#ey2019_1 {
- margin-bottom: 30px;
-}
-
-#ey2019_2 {
- margin-bottom: 30px;
- text-align: left;
-}
-
-#ey2019_3 {
- padding-bottom: 30px;
- text-align: left;
-}
-
-#ey2019_tracking {
- color: lime;
- font-family: 'Source Code Pro', monospace;
- font-size: 14px;
- font-weight: 400;
- line-height: 17px;
- text-align: left;
- max-width: 305px;
-}
-
-#ey2019_takeback {
- color: lime;
- font-family: 'LeagueGothic', sans-serif;
- font-size: 60px;
- line-height: 52px;
- text-transform: uppercase;
- width: 245px;
- font-synthesis: style;
- text-align: left;
-}
-
-#ey2019_donate_mobile,
-#ey2019_donate {
- border: 3px solid blueViolet;
- background: black;
- color: white;
- padding: 0.2em 0.8em;
- text-transform: uppercase;
- font-size: 1.5em;
- font-family: 'LeagueGothic', sans-serif;
- text-decoration: none;
- display: inline-block;
- margin-left: 5px;
- margin-right: 35px;
- vertical-align: super;
-}
-
-#ey2019_donate_mobile,
-#ey2019_donate:hover {
- background: blueViolet;
- color: black;
-}
-
-#ey2019_mozilla {
- color: white;
- font-family: 'Source Code Pro', monospace;
- font-size: 14px;
- font-weight: 400;
- display: inline-block;
- max-width: 300px;
- text-align: left;
- margin-top: 10px;
-}
-
-#ey2019_banner {
- background-image: url('Take_Back_Monochrome_purple.png');
- background-size: contain;
- background-position: 90% 100%;
- background-repeat: no-repeat;
- max-width: 540px;
- margin: 0 auto;
-}
-
-body[ey2019] #torstatus {
- margin-top: 40px;
-}
-
-body:not([ey2019]) .showIfEY2019,
-body[ey2019] .hideIfEY2019 {
- display: none;
-}
-
-body:not([mobile]) #ey2019_donate_mobile,
-body:not([mobile]) #ey2019_donate_mobile_bottom {
- display: none;
-}
-
-body[mobile] #ey2019_donate,
-body[mobile] #ey2019_donate_bottom {
- display: none;
-}
diff --git a/chrome/skin/aboutTorFonts.css b/chrome/skin/aboutTorFonts.css
deleted file mode 100644
index ce9a457b..00000000
--- a/chrome/skin/aboutTorFonts.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2019, The Tor Project, Inc.
- * See LICENSE for licensing information.
- *
- * vim: set sw=2 sts=2 ts=8 et syntax=css:
- */
-
-@font-face {
- font-family: 'Source Code Pro'; /* https://github.com/adobe-fonts/source-code-pro */
- font-weight: 400;
- font-style: normal;
- font-stretch: normal;
- src: url('data:application/font-woff;base64,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') format('woff2');
-}
-
-@font-face {
- font-family: LeagueGothic; /* https://open-foundry.com/fonts/league_gothic_italic */
- src: url('data:font/opentype;base64,T1RUTwALAIAAAwAwQ0ZGIPjyxbYAAAqcAABIRUdQT1OYXpa3AABYBAAAAHJHU1VCAAEAAAAAV/gAAAAKT1MvMmjVgOgAAAEgAAAAYGNtYXBD25mIAAAF9AAABIhoZWFk+wU83QAAALwAAAA2aGhlYQbOAocAAAD0AAAAJGhtdHimXUk5AABS5AAABRRtYXhwAUZQAAAAARgAAAAGbmFtZYeLmusAAAGAAAAEc3Bvc3T/0QAyAAAKfAAAACAAAQAAAAEAQXqG+qxfDzz1AAMD6AAAAADMZPx/AAAAAMxk/H//xP8GA2ADuAAAAAMAAgAAAAAAAAABAAADp/73AAADI//E/ygDYAABAAAAAAAAAAAAAAAAAAABRAAAUAABRgAAAAMBTQGQAAUACAKKAlgAAABLAooCWAAAAV4AMgFIAAAAAAUAAAAAAAAAAAAABwAAAAAAAAAAAAAAAFVLV04AQAAA+wIC3/73AMgDpwEJIAAAkwAAAAACIwLfAAAAIAACAAAAGAEmAAEAAAAAAAAAKAAAAAEAAAAAAAEADQAoAAEAAAAAAAIABgA1AAEAAAAAAAMAHgA7AAEAAAAAAAQAFABZAAEAAAAAAAUAPABtAAEAAAAAAAYAEwCpAAEAAAAAAAgAGwC8AAEAAAAAAAkACwDXAAEAAAAAAAsAIgDiAAEAAAAAAAwAEQEEAAMAAQQJAAAAUAEVAAMAAQQJAAEAKAFlAAMAAQQJAAIADgGNAAMAAQQJAAMAPAGbAAMAAQQJAAQAJgHXAAMAAQQJAAUAeAH9AAMAAQQJAAYAJgHXAAMAAQQJAAgANgJ1AAMAAQQJAAkAFgKrAAMAAQQJAAsARALBAAMAAQQJAAwAIgMFAAMAAQQJABAAGgMnAAMAAQQJABEADANBMjAwOSAtIDIwMTEsIFRoZSBMZWFndWUgb2YgTW92ZWFibGUgVHlwZUx
lYWd1ZSBHb3RoaWNJdGFsaWMxLjAwMTtVS1dOO0xlYWd1ZUdvdGhpYy1JdGFsaWNMZWFndWUgR290aGljIEl0YWxpY1ZlcnNpb24gMS4wMDE7UFMgMDAxLjAwMTtob3Rjb252IDEuMC41NjttYWtlb3RmLmxpYjIuMC4yMTMyNUxlYWd1ZUdvdGhpYy1JdGFsaWNUaGUgTGVhZ3VlIG9mIE1vdmVhYmxlIFR5cGVUeWxlciBGaW5ja2h0dHA6Ly90aGVsZWFndWVvZm1vdmVhYmxldHlwZS5jb21odHRwOi8vc3Vyc2x5LmNvbQAyADAAMAA5ACAALQAgADIAMAAxADEALAAgAFQAaABlACAATABlAGEAZwB1AGUAIABvAGYAIABNAG8AdgBlAGEAYgBsAGUAIABUAHkAcABlAEwAZQBhAGcAdQBlACAARwBvAHQAaABpAGMAIABJAHQAYQBsAGkAYwBSAGUAZwB1AGwAYQByADEALgAwADAAMQA7AFUASwBXAE4AOwBMAGUAYQBnAHUAZQBHAG8AdABoAGkAYwAtAEkAdABhAGwAaQBjAEwAZQBhAGcAdQBlAEcAbwB0AGgAaQBjAC0ASQB0AGEAbABpAGMAVgBlAHIAcwBpAG8AbgAgADEALgAwADAAMQA7AFAAUwAgADAAMAAxAC4AMAAwADEAOwBoAG8AdABjAG8AbgB2ACAAMQAuADAALgA1ADYAOwBtAGEAawBlAG8AdABmAC4AbABpAGIAMgAuADAALgAyADEAMwAyADUAVABoAGUAIABMAGUAYQBnAHUAZQAgAG8AZgAgAE0AbwB2AGUAYQBiAGwAZQAgAFQAeQBwAGUAVAB5AGwAZQByACAARgBpAG4AYwBrAGgAdAB0AHAAOgAvAC8AdABoAGUAbABlAGEAZwB1AGUAbwBmAG0AbwB2AGUAYQBiAGwAZQB0AHkAcABlAC4AYwBvAG0AaAB0AHQAcAA6AC8ALwBz
AHUAcgBzAGwAeQAuAGMAbwBtAEwAZQBhAGcAdQBlACAARwBvAHQAaABpAGMASQB0AGEAbABpAGMAAAAAAwAAAAMAAAEiAAEAAAAAABwAAwABAAABIgAAAQYAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAA4SLhqGoqoyUlX6pgpiHjnR1dnd4eXp7fH2BjaelpomrvgoLDQ4TFBUWGxwdHh8hKSorLC0uMzQ1NjiSf5Owj7g5QUJERUpLTE1TVFVWV1lhYmNkZmdsbW5vcZCskaQABQcMDyAkMTo9Ozw/PkNGSUdIT1JQUVhaXVtcX2hraWoAAKCiAIAAZa6tr7G2AAkmAAAAAKMAAAAAAAAAAABAXoqFAAAAAAAAAIMABggnKGCXlpqbnJ0AAHA3AJ8AAHJzAIiemQAEEL8REhcYGRoiIwAlLzAyTrW9urK3vLS5u7MABANmAAAAVABAAAUAFAAAAA0ALwA5AEUASQBOAE8AVQBZAGUAaQBuAG8AcwB1AHkAfgCUAKMApQCpAK8AtAC4ANYA9gFhAX8CGwLHAt0gFCAaIB8gIiAmIKwhIiIS+wL//wAAAAAADQAgADAAOgBGAEoATwBQAFYAWgBmAGoAbwBwAHQAdgB6AJMAoQClAKgArgC0ALcAvwDYAPgBZAIaAsYC2CATIBggHCAiICYgrCEiIhL7Af//AAH/9QAAAEQAAP/N/9H/0v/Z/90AAP/k/+n/6v/x//L/9gAAALEAAP/+AAAAAP/9AAAAAAAAAAAAAAAAAAAAAAAA4IQAAOBe4F3f89+N3zAFcQABAAAAAABQAAAAbAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAACCAAAAiAAAAIoAjAAAAIwAjgC8APgBygIAAgICBAIOAAACDgAAAAAAAAAAAAAAAAAAAAMAhACLAIYAoQCoAKoAjACUAJUAfgCpAIIAmACHAI4AgQCNAKcApQCmAIkAqwC+A
AoACwANAA4AOACSAH8AkwCwAI8AuAA5AEEAQgBEAEUAcQCQAKwAkQCkAIUAoACiALYArQCuALoAiAC0AIoABgC/AAQACAAFAAcACQAMABIADwAQABEAGgAXABgAGQDGACAAJQAiACMAJwAkACYAMgAvADAAMQD6AOgAZQA9ADoAOwA/ADwAPgBAAEMASQBGAEcASABSAE8AUABRAQYAWABdAFoAWwBfAFwAXgBrAGgAaQBqATwBKQBwAMABAAFBAP8AwQEBAMIBAgDEAQQAxQEFAMMBAwDHAQcAyAEIAMwBDADJAQkAywELAM0BDQDKAQoAzwEPAM4BDgDRAREA0AEQANMBEwDSARIA2QEYANcBFgDVARQA2AEXANYATgDUARUA2gEZANsBGgEbANwBHADeAR4A3QEdAN8BHwDgASAA4QEhAOMBJADiASMBIgDkASUA5wEoAOUBJgDmAScAKABgAOkBKgDrASwA6gErAOwBLQDvATAA7gEvAO0BLgDxATMA8AEyAPgBOgD1ATcA8wE1APcBOQD0ATYA9gE4APkBOwD7AT0ANwD8AT4A/gFAAP0BPwExAPIBNAC1ALMAsgC3ALwAuwC9ALkAlwCWAJoAmwCZAUMAAwAAAAAAAP/OADIAAAAAAAAAAAAAAAAAAAAAAAAAAAEABAIAAQEBFExlYWd1ZUdvdGhpYy1JdGFsaWMAAQEBKPgQAPiXAfiYAviZA/gYBEAMA0/7jvoC+kwFHA9LDxwQ8BGkHDx+EgB/AgABAAgADwATABoAHgAlACwAMgA4AEMATQBTAFkAXwBlAG8AdgB9AIMAjgCaAKQAqACzALUAuwDFAMwA0wDZAOQA8AD2APwBCAEMARIBGAEkAScBLQE6AUEBRwFNAVkBXwFnAXIBdgF8AYMBiQGWAZ0BpAGpAa8BugHFAcsB1QHbAeIB6QHvAfUCAAIKAhACFgIcAiICLAIzAjoCQAJLAlcCYQJlAnACdgJ4An
8ChgKMApcCowKvArUCuwLHAssC0QLcAuIC7gLxAvcDBAMLAxEDFwMjAykDMQM8A0EDRQNLA1IDWANlA2wDcwN4A34DiQOUA5oDpAOqA7ED2QPtA/p1bmkwMDkzdW5pMDA5NE5VTEx1bmkwMDBERXVyb0FtYWNyb25Bb2dvbmVrQ2FjdXRlQ2Nhcm9uQ2NpcmN1bWZsZXhDZG90YWNjZW50RGNhcm9uRGNyb2F0RWJyZXZlRWNhcm9uRWRvdGFjY2VudEVtYWNyb25Fb2dvbmVrR2JyZXZlR2NpcmN1bWZsZXhHY29tbWFhY2NlbnRHZG90YWNjZW50SGJhckhjaXJjdW1mbGV4SUpJYnJldmVJZG90YWNjZW50SW1hY3JvbklvZ29uZWtJdGlsZGVKY2lyY3VtZmxleEtjb21tYWFjY2VudExhY3V0ZUxjYXJvbkxjb21tYWFjY2VudExkb3ROYWN1dGVOY2Fyb25OY29tbWFhY2NlbnRFbmdPYnJldmVPaHVuZ2FydW1sYXV0T21hY3JvblJhY3V0ZVJjYXJvblJjb21tYWFjY2VudFNhY3V0ZVNjZWRpbGxhU2NpcmN1bWZsZXhUYmFyVGNhcm9udW5pMDIxQVVicmV2ZVVodW5nYXJ1bWxhdXRVbWFjcm9uVW9nb25la1VyaW5nVXRpbGRlV2NpcmN1bWZsZXhZY2lyY3VtZmxleFphY3V0ZVpkb3RhY2NlbnRhYnJldmVhbWFjcm9uYW9nb25la2NhY3V0ZWNjYXJvbmNjaXJjdW1mbGV4Y2RvdGFjY2VudGRjYXJvbmRjcm9hdGVicmV2ZWVjYXJvbmVkb3RhY2NlbnRlbWFjcm9uZW9nb25la2dicmV2ZWdjaXJjdW1mbGV4Z2NvbW1hYWNjZW50Z2RvdGFjY2VudGhiYXJoY2lyY3VtZmxleGlicmV2ZWlqaW1hY3JvbmlvZ29uZWtpdGlsZGVqY2lyY3VtZmxleGt
jb21tYWFjY2VudGtncmVlbmxhbmRpY2xhY3V0ZWxjYXJvbmxjb21tYWFjY2VudGxkb3RuYWN1dGVuYXBvc3Ryb3BoZW5jYXJvbm5jb21tYWFjY2VudGVuZ29icmV2ZW9odW5nYXJ1bWxhdXRvbWFjcm9ucmFjdXRlcmNhcm9ucmNvbW1hYWNjZW50c2FjdXRlc2NlZGlsbGFzY2lyY3VtZmxleGxvbmdzdGJhcnRjYXJvbnVuaTAyMUJ1YnJldmV1aHVuZ2FydW1sYXV0dW1hY3JvbnVvZ29uZWt1cmluZ3V0aWxkZXdjaXJjdW1mbGV4eWNpcmN1bWZsZXh6YWN1dGV6ZG90YWNjZW50QWJyZXZldW5pMjAxRjIwMDkgLSAyMDExLCBUaGUgTGVhZ3VlIG9mIE1vdmVhYmxlIFR5cGVMZWFndWUgR290aGljLUl0YWxpY0xlYWd1ZSBHb3RoaWMAuAIAAQASAB0ANABJAFEAagB/AJIAmgDLANQA3QDnAUQBVgFgAWYBagF1AXoBiQGaAaMBywHbAeAB6wHyAg0CXAJkAqwC5wL/AwIDBgMTAyQDMgM6Az8DSQNhA3UDnQOiA7EDuwPCA8kENwQ8BEEERARMBFQEWQRfBHYElAScBKEEpwTFBNEE2gTlBQ8FFgUbBSgFNQU9BUsFWAVdBW4FdwV/BYkFjwWWBZ8F1gXiBegF+QX+BgUGDAYQBiEGJgYrBi4GPQZCBkcGSwZhBmUGagZvBncGfQaBBogGmwagBqoGsAa1BrsGvwbKBs4G2QbqBu8G8wb3BwAHGQcpBy4HSQdOB1IHVwdbB18HYwduB3IHdgd9B4EHhQeUB5gHnQelB6wHsQe3B7sHxAfIB8wH0QfWB9oH3gfiB+gH7AfxB/UIAQgICBMIGAgeCCIIJggvCDoIQAhHCE4IUwhXCGEIZQhpCG0IdQh5CH4IgwiHCIsIjwiTFU8KfHd6eHR8CHpzboNoIAoVJgoo
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
MLBd8GC28K95EWQQoLiIAKC/cDBQtLCg5qHQ73FgUL+IL3hQELGCYGC4qGigv5tHgdoWiyaAoLrMMdAcMLoQr39QsBxPfaAwv3d5LdkgukngiUlpuPnxuyl3V2kh+PC2wKAQuOlIwLjZSKkoiSCI6KiIyGG4ALg5yDnIMLltYKCwUmBgsFJwYLfFZ1xgoLi/i3AQujpQoLgAiGC3uSfwt0egiCgHuHdxtjfgv3A3cdCwGzywoLpvde9y0LxfeQ93sLiJKIC8OeCvcK+AoDCx+IhoqGiBpe+2kLoB3HCgt8dnGEahsL0/gC9PekCwZ5NwULbAWRBgv3+QMLkx+OC5IfjgualAgLnpaWmZbOCgsBxfgbAwu091YYCwZ3MAULBncsBQsF9x8GC5KEkgsZkIcLBSsGCwAAAACaAAAAAAAAAJoAAACaAAABdgAKAXYACgF2AAoBdgAKAXYACgIZAAgBbAAoAVoAPAFaADwBdAAoATMAKAEzACgBMwAoATMAKAEzACgBLQAoAWgAOQF8ACgAvAAoAMQAKAC1ACQAtgAlAMQAMADPAAQBdwAoAScAKAHkACgBiwAoAYsAKAFiADwBYgA8AWIAPAFiADwBYgA8AWIAGgFiADwB4AA8AWAAKAFkADwBaQAoAVcAMAE8AGgBbgBCAW4AQgFuAEIBbgBCAW4AQgFeAHkB8ABlAWgACAFWAHUBWAB2ATIACgFNACsBTQArAU0AKwFNACsBTQArAU0AKwFNACsB4wArAU8AKAE7ADgBOwA4AU8ANQFCADkBQgA5AUIAOQFCADkBQgA5AOgAPQFW//ABUQAoALUAKAC1ACgAtQAoALUAKAC2ACgAtQAoALL/xAE5ACgAtQAoAfMAKAFRACgBUQAoAUEAOAFBADgBQQA4AUEAOAFBADgBQQA0AUEAOAHmADgBTwAAAU8ANQD2ACgBNAAsAWYAIAD1AFUBUQA3AVEANwFRADcBUQA3AVEANwEmAGE
BugBbAS4ACAE2/+cBNv/nAQQABgF5AD0BeQA9AWIAPADoAFQBZQAbAU8AOgFOAC4BWABCAVYAOgEgADgBVAA2AVYANgFLAKUBgwCzAUQAeQCxACQAl//7AdcAGgC9ACoAvf/9AloARQCdABoAaQBDATsAYQE7AAUBDwCjAJcAjgCxAAgBYP/1Ak8AAgFQAEwBUP/uAQcAEQEHAAUBEgBSARL//gHbAGcBigBnANkAUwEx//8BMQCDATEAgwCXAIEAlwB/AJf/+wGNAFIBNwBMAVIAMgGPAAgBYABHAnEAwwIFAFUCBQA2AgUAZwHpAE0CBgBnAaEANAGqADwArv/zAyMAXwMjAF8BygCsAhoAbQH0AU8B9AEdAfMBGQH0ALMB8wEGAfQBDAHzAU0B9AEpAfQA8AH0ASEB9ACRAfMBQAH0ASABdgAKAXYACgF2AAoBdgAKAVoAPAFaADwBWgA8AVoAPAF0ACgBdAAoAXQAKAEzACgBMwAoATMAKAEzACgBMwAoAWgAOQFoADkBaAA5AWgAOQF8ACgBfAAoAYsAKAC8ACgAvAAoALwAKAC8/9wAvAAoAM8ABAF3ACgBJwAoAScAKAEnACgBJwAoATMANAGLACgBiwAoAYsAKAGLACgBYgA8AWIAPAFiADwBYgAoAWkAKAFpACgBaQAoAVcAMAFXADABVwAwAVcAMAE8AGgBPABoATwAZgFuAEIBbgBCAW4AQgFuAEIBbgBCAW4AQgH6AG8BWAB2AVYAdQEyAAoBMgAKATIACgFNACsBTQArAU0AKwE7ADgBOwA4ATsAOAE7ADgBSQA+AeYANQFPADUBQgA5AUIAOQFCADkBQgA5AUIAOQFW//ABVv/wAVb/8AFW//ABUQAoAVEAKAC1ACgBZwAoALUAKAC1//MAtQAoALL/xAE5ACgBOQAoALUAKAFMACgAtQAXAR4AKADlAEABUQAoAVEAKAFRACgBUQAoAVEAKAFBADgBQQA4
AUEAOAFPAAAA9gAoAPYAKAD2ABUBNAAsATQALAE0ACwBNAAsAOgAEgD1AFUBjABVAPUAVQFRADcBUQA3AVEANwFRADcBUQA3AVEANwG6AFsBNv/nATb/5wEEAAYBBAAGAQQABgF2AAoBewBnATEAngCDAIMAAQAAAAAAAAAAAAAAAQAAAAoAMABKAAJERkxUAA5sYXRuABoABAAAAAD//wABAAAABAAAAAD//wABAAEAAmtlcm4ADmtlcm4AFAAAAAEAAAAAAAEAAAABAAQAAgAAAAEACAABABYABAAAAAEADAACAC3/5gA0/+IAAQABAL4AAA==');
-}
\ No newline at end of file
1
0

[torbutton/maint-9.0] Revert "Merge remote-tracking branch 'richardtpo/bug_31855' into maint-9.0"
by sysrqb@torproject.org 03 Jan '20
by sysrqb@torproject.org 03 Jan '20
03 Jan '20
commit 26b81644c979951e6773dd05d6801d359b725433
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Fri Jan 3 22:39:19 2020 +0000
Revert "Merge remote-tracking branch 'richardtpo/bug_31855' into maint-9.0"
This reverts commit 7362d231508e4c0e78985d51672d3051ab209de4, reversing
changes made to ae1a9af4a4830bde7034565615a853102e5fe1df.
Merging 0e5ac5d22f59487d857fea57dd3db69daf2e56d2 for Bug 31855 brought
along many other commits from the master branch.
---
LICENSE | 115 +++++++
chrome.manifest | 5 +
chrome/content/locale/non-localized.properties | 6 +
chrome/content/preferences.xhtml | 1 +
chrome/content/tor-circuit-display.js | 30 +-
chrome/content/torbutton.js | 263 ++++++++++++--
chrome/content/torbutton_util.js | 79 +++++
chrome/locale/en-US/torbutton.dtd | 3 -
chrome/locale/en-US/torbutton.properties | 10 -
chrome/locale/ko/torbutton.dtd | 14 +-
chrome/locale/ko/torbutton.properties | 2 +-
chrome/locale/lt/aboutDialog.dtd | 19 -
chrome/locale/lt/aboutTBUpdate.dtd | 8 -
chrome/locale/lt/aboutTor.dtd | 57 +--
chrome/locale/lt/brand.dtd | 15 +-
chrome/locale/lt/brand.properties | 17 +-
chrome/locale/lt/browserOnboarding.properties | 72 ----
chrome/locale/lt/torbutton.dtd | 66 +---
chrome/locale/lt/torbutton.properties | 81 +----
chrome/locale/ms/aboutDialog.dtd | 19 -
chrome/locale/ms/aboutTBUpdate.dtd | 8 -
chrome/locale/ms/aboutTor.dtd | 57 +--
chrome/locale/ms/brand.dtd | 15 +-
chrome/locale/ms/brand.properties | 17 +-
chrome/locale/ms/browserOnboarding.properties | 72 ----
chrome/locale/ms/torbutton.dtd | 65 +---
chrome/locale/ms/torbutton.properties | 87 ++---
chrome/locale/th/aboutDialog.dtd | 19 -
chrome/locale/th/aboutTBUpdate.dtd | 8 -
chrome/locale/th/aboutTor.dtd | 57 +--
chrome/locale/th/brand.dtd | 11 +-
chrome/locale/th/brand.properties | 13 +-
chrome/locale/th/browserOnboarding.properties | 72 ----
chrome/locale/th/torbutton.dtd | 65 +---
chrome/locale/th/torbutton.properties | 85 ++---
chrome/locale/tr/torbutton.properties | 2 +-
components/cookie-jar-selector.js | 460 +++++++++++++++++++++++++
components/domain-isolator.js | 3 +
components/dragDropFilter.js | 2 +
components/external-app-blocker.js | 16 +-
components/startup-observer.js | 19 +-
components/torbutton-logger.js | 2 +
defaults/preferences/preferences.js | 58 ++++
import-translations.sh | 2 +-
jar.mn | 12 +-
modules/default-prefs.js | 36 ++
modules/security-prefs.js | 1 -
modules/tor-control-port.js | 95 +----
modules/utils.js | 54 +--
moz.build | 3 +
50 files changed, 1308 insertions(+), 990 deletions(-)
diff --git a/LICENSE b/LICENSE
index 66c78f65..9c4498df 100644
--- a/LICENSE
+++ b/LICENSE
@@ -27,3 +27,118 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+
+===============================================================================
+
+"League Gothic" font embedded in chrome/skin/aboutTorFonts.css is licensed
+under:
+
+Copyright (c) 2010, Caroline Hadilaksono & Micah Rich
+<caroline@hadilaksono, micah(a)micahrich.com>, with Reserved Font Name:
+"League Gothic".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+===============================================================================
+
+'Source' font embedded in chrome/skin/aboutTorFonts.css is licensed under:
+
+Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/) with
+Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of
+Adobe Systems Incorporated in the United States and/or other countries.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+===============================================================================
+
+SIL OPEN FONT LICENSE
+
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+DEFINITIONS
+
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting â in part or in whole â any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+TERMINATION
+
+This license becomes null and void if any of the above conditions are
+not met.
+DISCLAIMER
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/chrome.manifest b/chrome.manifest
index d1ffe6d6..13bef661 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -143,6 +143,9 @@ contract @torproject.org/torbutton-extAppBlocker;1 {3da0269f-fc29-4e9e-a678-c3b1
component {06322def-6fde-4c06-aef6-47ae8e799629} components/startup-observer.js
contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629}
+component {e6204253-b690-4159-bfe8-d4eedab6b3be} components/cookie-jar-selector.js
+contract @torproject.org/cookie-jar-selector;1 {e6204253-b690-4159-bfe8-d4eedab6b3be}
+
component {5d57312b-5d8c-4169-b4af-e80d6a28a72e} components/torCheckService.js
contract @torproject.org/torbutton-torCheckService;1 {5d57312b-5d8c-4169-b4af-e80d6a28a72e}
@@ -152,6 +155,8 @@ contract @torproject.org/torbutton-logger;1 {f36d72c9-9718-4134-b550-e109638331d
component {e33fd6d4-270f-475f-a96f-ff3140279f68} components/domain-isolator.js
contract @torproject.org/domain-isolator;1 {e33fd6d4-270f-475f-a96f-ff3140279f68}
+category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selector;1
+
category profile-after-change StartupObserver @torproject.org/startup-observer;1
category profile-after-change DomainIsolator @torproject.org/domain-isolator;1
category profile-after-change DragDropFilter @torproject.org/torbutton-dragDropFilter;1
diff --git a/chrome/content/locale/non-localized.properties b/chrome/content/locale/non-localized.properties
new file mode 100644
index 00000000..dca78639
--- /dev/null
+++ b/chrome/content/locale/non-localized.properties
@@ -0,0 +1,6 @@
+# This file must be located in a subdirectory named "locale" so that
+# about:config will display the correct value for browser.startup.homepage.
+# See fetchPref() inside toolkit/components/viewconfig/content/config.js
+
+# Default home page
+browser.startup.homepage=about:tor
diff --git a/chrome/content/preferences.xhtml b/chrome/content/preferences.xhtml
index eafbf01e..6f662f5f 100644
--- a/chrome/content/preferences.xhtml
+++ b/chrome/content/preferences.xhtml
@@ -6,6 +6,7 @@
<title>&torbutton.prefs.security_settings;</title>
<link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences.css"/>
<link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences-mobile.css"/>
+ <script type="text/javascript" src="torbutton_util.js"></script>
<script type="text/javascript" src="preferences-mobile.js"></script>
<style>
</style>
diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js
index 19b55d18..21bcc57b 100644
--- a/chrome/content/tor-circuit-display.js
+++ b/chrome/content/tor-circuit-display.js
@@ -6,8 +6,9 @@
// with docco.js to produce pretty documentation.
//
// This script is to be embedded in torbutton.xul. It defines a single global
-// function, createTorCircuitDisplay(), which activates the automatic Tor
-// circuit display for the current tab and any future tabs.
+// function, createTorCircuitDisplay(ipcFile, host, port, password), which
+// activates the automatic Tor circuit display for the current tab and any
+// future tabs.
//
// See https://trac.torproject.org/8641
@@ -15,12 +16,11 @@
/* global document, gBrowser, Components */
// ### Main function
-// __createTorCircuitDisplay(enablePrefName)__.
+// __createTorCircuitDisplay(ipcFile, host, port, password, enablePrefName)__.
// The single function that prepares tor circuit display. Connects to a tor
-// control port using information provided to the control port module via
-// a previous call to configureControlPortModule(), and binds to a named
-// bool pref whose value determines whether the circuit display is enabled
-// or disabled.
+// control port with the given ipcFile or host plus port, and password, and
+// binds to a named bool pref whose value determines whether the circuit display
+// is enabled or disabled.
let createTorCircuitDisplay = (function () {
"use strict";
@@ -32,7 +32,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
let { controller } = ChromeUtils.import("resource://torbutton/modules/tor-control-port.js", {});
// Utility functions
-let { bindPrefAndInit, observe, getLocale, getDomainForBrowser, torbutton_get_property_string } = ChromeUtils.import("resource://torbutton/modules/utils.js", {});
+let { bindPrefAndInit, observe, getLocale, getDomainForBrowser } = ChromeUtils.import("resource://torbutton/modules/utils.js", {});
// Make the TorButton logger available.
let logger = Cc["@torproject.org/torbutton-logger;1"]
@@ -204,10 +204,15 @@ let collectBrowserCredentials = function () {
// ## User interface
+// __torbuttonBundle__.
+// Bundle of localized strings for torbutton UI.
+let torbuttonBundle = Services.strings.createBundle(
+ "chrome://torbutton/locale/torbutton.properties");
+
// __uiString__.
// Read the localized strings for this UI.
let uiString = function (shortName) {
- return torbutton_get_property_string("torbutton.circuit_display." + shortName);
+ return torbuttonBundle.GetStringFromName("torbutton.circuit_display." + shortName);
};
// __localizedCountryNameFromCode(countryCode)__.
@@ -410,11 +415,11 @@ let ensureCorrectPopupDimensions = function () {
// ## Main function
-// __setupDisplay(enablePrefName)__.
+// __setupDisplay(ipcFile, host, port, password, enablePrefName)__.
// Once called, the Tor circuit display will be started whenever
// the "enablePref" is set to true, and stopped when it is set to false.
// A reference to this function (called createTorCircuitDisplay) is exported as a global.
-let setupDisplay = function (enablePrefName) {
+let setupDisplay = function (ipcFile, host, port, password, enablePrefName) {
setupGuardNote();
let myController = null,
stopCollectingIsolationData = null,
@@ -437,7 +442,8 @@ let setupDisplay = function (enablePrefName) {
},
start = function () {
if (!myController) {
- myController = controller(function (err) {
+ myController = controller(ipcFile, host, port || 9151, password,
+ function (err) {
// An error has occurred.
logger.eclog(5, err);
logger.eclog(5, "Disabling tor display circuit because of an error.");
diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js
index 5ef63af2..9846b864 100644
--- a/chrome/content/torbutton.js
+++ b/chrome/content/torbutton.js
@@ -1,9 +1,3 @@
-// window globals
-var torbutton_init;
-var torbutton_new_circuit;
-var torbutton_new_identity;
-
-(() => {
// Bug 1506 P1-P5: This is the main Torbutton overlay file. Much needs to be
// preserved here, but in an ideal world, most of this code should perhaps be
// moved into an XPCOM service, and much can also be tossed. See also
@@ -13,23 +7,20 @@ var torbutton_new_identity;
// TODO: Double-check there are no strange exploits to defeat:
// http://kb.mozillazine.org/Links_to_local_pages_don%27t_work
-/* global gBrowser, CustomizableUI,
- createTorCircuitDisplay, gFindBarInitialized,
- gFindBar, OpenBrowserWindow, PrivateBrowsingUtils,
+/* global torbutton_log, gBrowser, torbutton_safelog, CustomizableUI,
+ createTorCircuitDisplay, torbutton_get_property_string, gFindBarInitialized,
+ gFindBar, OpenBrowserWindow, PrivateBrowsingUtils, torbutton_get_stringbundle,
Services, AppConstants
*/
let {
+ showDialog,
show_torbrowser_manual,
unescapeTorString,
bindPrefAndInit,
getDomainForBrowser,
- torbutton_safelog,
- torbutton_log,
- torbutton_get_property_string,
} = ChromeUtils.import("resource://torbutton/modules/utils.js", {});
let SecurityPrefs = ChromeUtils.import("resource://torbutton/modules/security-prefs.js", {});
-let { configureControlPortModule } = Cu.import("resource://torbutton/modules/tor-control-port.js", {});
const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion";
const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded";
@@ -40,10 +31,17 @@ var m_tb_prefs = Services.prefs;
// status
var m_tb_wasinited = false;
+var m_tb_plugin_string = false;
var m_tb_is_main_window = false;
+var m_tb_hidden_browser = false;
var m_tb_confirming_plugins = false;
+var m_tb_window_height = window.outerHeight;
+var m_tb_window_width = window.outerWidth;
+
+var m_tb_tbb = false;
+
var m_tb_control_ipc_file = null; // Set if using IPC (UNIX domain socket).
var m_tb_control_port = null; // Set if using TCP.
var m_tb_control_host = null; // Set if using TCP.
@@ -102,9 +100,11 @@ var torbutton_unique_pref_observer =
{
this.forced_ua = false;
m_tb_prefs.addObserver("extensions.torbutton", this, false);
+ m_tb_prefs.addObserver("network.cookie", this, false);
m_tb_prefs.addObserver("browser.privatebrowsing.autostart", this, false);
m_tb_prefs.addObserver("javascript", this, false);
m_tb_prefs.addObserver("plugin.disable", this, false);
+ m_tb_prefs.addObserver("privacy.firstparty.isolate", this, false);
m_tb_prefs.addObserver("privacy.resistFingerprinting", this, false);
m_tb_prefs.addObserver("privacy.resistFingerprinting.letterboxing", this, false);
@@ -116,9 +116,11 @@ var torbutton_unique_pref_observer =
unregister: function()
{
m_tb_prefs.removeObserver("extensions.torbutton", this);
+ m_tb_prefs.removeObserver("network.cookie", this);
m_tb_prefs.removeObserver("browser.privatebrowsing.autostart", this);
m_tb_prefs.removeObserver("javascript", this);
m_tb_prefs.removeObserver("plugin.disable", this);
+ m_tb_prefs.removeObserver("privacy.firstparty.isolate", this);
m_tb_prefs.removeObserver("privacy.resistFingerprinting", this);
m_tb_prefs.removeObserver("privacy.resistFingerprinting.letterboxing", this);
@@ -173,6 +175,9 @@ var torbutton_unique_pref_observer =
case "privacy.resistFingerprinting.letterboxing":
torbutton_update_fingerprinting_prefs();
break;
+ case "privacy.firstparty.isolate":
+ torbutton_update_isolation_prefs();
+ break;
}
}
}
@@ -235,7 +240,7 @@ function torbutton_is_mobile() {
// Bug 1506 P2-P4: This code sets some version variables that are irrelevant.
// It does read out some important environment variables, though. It is
// called once per browser window.. This might belong in a component.
-torbutton_init = function() {
+function torbutton_init() {
torbutton_log(3, 'called init()');
SecurityPrefs.initialize();
@@ -249,6 +254,7 @@ torbutton_init = function() {
var cur_version;
try {
cur_version = m_tb_prefs.getCharPref("torbrowser.version");
+ m_tb_tbb = true;
torbutton_log(3, "This is a Tor Browser");
} catch(e) {
torbutton_log(3, "This is not a Tor Browser: "+e);
@@ -338,9 +344,6 @@ torbutton_init = function() {
}
}
- configureControlPortModule(m_tb_control_ipc_file, m_tb_control_host,
- m_tb_control_port, m_tb_control_pass);
-
// Add about:tor IPC message listener.
window.messageManager.addMessageListener("AboutTor:Loaded",
torbutton_abouttor_message_handler);
@@ -360,7 +363,9 @@ torbutton_init = function() {
torbutton_notify_if_update_needed();
try {
- createTorCircuitDisplay("extensions.torbutton.display_circuit");
+ createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host,
+ m_tb_control_port, m_tb_control_pass,
+ "extensions.torbutton.display_circuit");
} catch(e) {
torbutton_log(4, "Error creating the tor circuit display " + e);
}
@@ -490,6 +495,25 @@ function torbutton_confirm_plugins() {
}
}
+function torbutton_inform_about_tbb() {
+ var prompts = Services.prompt;
+
+ var message = torbutton_get_property_string("torbutton.popup.prompt_torbrowser");
+ var title = torbutton_get_property_string("torbutton.title.prompt_torbrowser");
+ var checkbox = {value: false};
+
+ var sb = Services.strings;
+ var browserstrings = sb.createBundle("chrome://browser/locale/browser.properties");
+
+ var askagain = browserstrings.GetStringFromName("privateBrowsingNeverAsk");
+
+ var response = prompts.alertCheck(null, title, message, askagain, checkbox);
+
+ // Update preferences to reflect their response and to prevent the prompt from
+ // being displayed again.
+ m_tb_prefs.setBoolPref("extensions.torbutton.prompt_torbrowser", !checkbox.value);
+}
+
// Bug 1506 P2: It might be nice to let people move the button around, I guess?
function torbutton_get_toolbutton() {
var o_toolbutton = false;
@@ -540,10 +564,30 @@ function torbutton_notify_if_update_needed() {
setOrClearAttribute(item, "tbUpdateNeeded", updateNeeded);
}
+function torbutton_check_for_update() {
+ // Open the update prompt in the correct mode. The update state
+ // checks used here were adapted from isPending() and isApplied() in
+ // Mozilla's browser/base/content/aboutDialog.js code.
+ let updateMgr = Cc["@mozilla.org/updates/update-manager;1"]
+ .getService(Ci.nsIUpdateManager);
+ let update = updateMgr.activeUpdate;
+ let updateState = (update) ? update.state : undefined;
+ let pendingStates = [ "pending", "pending-service",
+ "applied", "applied-service" ];
+ let isPending = (updateState && (pendingStates.indexOf(updateState) >= 0));
+
+ let prompter = Cc["@mozilla.org/updates/update-prompt;1"]
+ .createInstance(Ci.nsIUpdatePrompt);
+ if (isPending)
+ prompter.showUpdateDownloaded(update, false);
+ else
+ prompter.checkForUpdates();
+}
+
// Bug 1506 P4: Checking for Tor Browser updates is pretty important,
// probably even as a fallback if we ever do get a working updater.
function torbutton_do_async_versioncheck() {
- if (!m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) {
+ if (!m_tb_tbb || !m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) {
return;
}
@@ -749,7 +793,7 @@ function torbutton_send_ctrl_cmd(command) {
}
// Bug 1506 P4: Needed for New IP Address
-torbutton_new_circuit = function() {
+function torbutton_new_circuit() {
let firstPartyDomain = getDomainForBrowser(gBrowser.selectedBrowser);
let domainIsolator = Cc["@torproject.org/domain-isolator;1"]
@@ -761,7 +805,7 @@ torbutton_new_circuit = function() {
}
// Bug 1506 P4: Needed for New Identity.
-torbutton_new_identity = async function() {
+async function torbutton_new_identity() {
try {
// Make sure that we can only click once on New Identiy to avoid race
// conditions leading to failures (see bug 11783 for an example).
@@ -995,7 +1039,16 @@ async function torbutton_do_new_identity() {
torbutton_log(3, "New Identity: Clearing Cookies and DOM Storage");
- torbutton_clear_cookies();
+ if (m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections")) {
+ var selector = Cc["@torproject.org/cookie-jar-selector;1"]
+ .getService(Ci.nsISupports)
+ .wrappedJSObject;
+ // This emits "cookie-changed", "cleared", which kills DOM storage
+ // and the safe browsing API key
+ selector.clearUnprotectedCookies("tor");
+ } else {
+ torbutton_clear_cookies();
+ }
torbutton_log(3, "New Identity: Closing open connections");
@@ -1368,19 +1421,21 @@ function torbutton_tor_check_ok()
//
// toggles plugins: true for disabled, false for enabled
function torbutton_toggle_plugins(disable_plugins) {
- var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
- var P=PH.getPluginTags({});
- for(var i=0; i<P.length; i++) {
- if ("enabledState" in P[i]) { // FF24
- // FIXME: DOCDOC the reasoning for the isDisabled check, or remove it.
- var isDisabled = (P[i].enabledState == Ci.nsIPluginTag.STATE_DISABLED);
- if (!isDisabled && disable_plugins)
- P[i].enabledState = Ci.nsIPluginTag.STATE_DISABLED;
- else if (isDisabled && !disable_plugins)
- P[i].enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
- } else if (P[i].disabled != disable_plugins) { // FF17
- P[i].disabled=disable_plugins;
- }
+ if (m_tb_tbb) {
+ var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
+ var P=PH.getPluginTags({});
+ for(var i=0; i<P.length; i++) {
+ if ("enabledState" in P[i]) { // FF24
+ // FIXME: DOCDOC the reasoning for the isDisabled check, or remove it.
+ var isDisabled = (P[i].enabledState == Ci.nsIPluginTag.STATE_DISABLED);
+ if (!isDisabled && disable_plugins)
+ P[i].enabledState = Ci.nsIPluginTag.STATE_DISABLED;
+ else if (isDisabled && !disable_plugins)
+ P[i].enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
+ } else if (P[i].disabled != disable_plugins) { // FF17
+ P[i].disabled=disable_plugins;
+ }
+ }
}
}
@@ -1395,7 +1450,7 @@ function torbutton_update_disk_prefs() {
// No way to clear this beast during New Identity. Leave it off.
//m_tb_prefs.setBoolPref("dom.indexedDB.enabled", !mode);
- m_tb_prefs.setBoolPref("permissions.memory_only", mode);
+ if (m_tb_tbb) m_tb_prefs.setBoolPref("permissions.memory_only", mode);
// Third party abuse. Leave it off for now.
//m_tb_prefs.setBoolPref("browser.cache.offline.enable", !mode);
@@ -1417,6 +1472,15 @@ function torbutton_update_fingerprinting_prefs() {
Services.prefs.savePrefFile(null);
}
+function torbutton_update_isolation_prefs() {
+ let isolate = m_tb_prefs.getBoolPref("privacy.firstparty.isolate");
+
+ m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !isolate);
+
+ // Force prefs to be synced to disk
+ Services.prefs.savePrefFile(null);
+}
+
// This function closes all XUL browser windows except this one. For this
// window, it closes all existing tabs and creates one about:blank tab.
function torbutton_close_tabs_on_new_identity() {
@@ -1469,6 +1533,50 @@ function torbutton_close_tabs_on_new_identity() {
torbutton_log(3, "Closed all tabs");
}
+// Bug 1506 P2: This code is only important for disabling
+// New Identity where it is not supported (ie no control port).
+function torbutton_check_protections()
+{
+ var env = Cc["@mozilla.org/process/environment;1"]
+ .getService(Ci.nsIEnvironment);
+
+ // Bug 14100: check for the existence of an environment variable
+ // in order to toggle the visibility of networksettings menuitem
+ if (env.exists("TOR_NO_DISPLAY_NETWORK_SETTINGS"))
+ document.getElementById("torbutton-networksettings").hidden = true;
+ else
+ document.getElementById("torbutton-networksettings").hidden = false;
+
+ // Bug 21091: check for the existence of an environment variable
+ // in order to toggle the visibility of the torbutton-checkForUpdate
+ // menuitem and its separator.
+ if (env.exists("TOR_HIDE_UPDATE_CHECK_UI")) {
+ document.getElementById("torbutton-checkForUpdateSeparator").hidden = true;
+ document.getElementById("torbutton-checkForUpdate").hidden = true;
+ } else {
+ document.getElementById("torbutton-checkForUpdateSeparator").hidden = false;
+ document.getElementById("torbutton-checkForUpdate").hidden = false;
+ }
+
+ var cookie_pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections");
+ document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref;
+
+ // XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR
+ // See https://trac.torproject.org/projects/tor/ticket/10353 for more info.
+ document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart");
+
+ if (!m_tb_control_pass || (!m_tb_control_ipc_file && !m_tb_control_port)) {
+ // TODO: Remove the Torbutton menu entry again once we have done our
+ // security control redesign.
+ document.getElementById("menu_newIdentity").disabled = true;
+ document.getElementById("appMenuNewIdentity").disabled = true;
+ }
+
+ if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) {
+ torbutton_inform_about_tbb();
+ }
+}
+
// -------------- HISTORY & COOKIES ---------------------
// Bug 1506 P4: Used by New Identity if cookie protections are
@@ -1627,6 +1735,23 @@ function torbutton_do_startup()
// Bug 30565: sync browser.privatebrowsing.autostart with security.nocertdb
torbutton_update_disk_prefs();
+ // #5758: Last ditch effort to keep Vanilla Torbutton users from totally
+ // being pwnt. This is a pretty darn ugly hack, too. But because of #5863,
+ // we really don't care about preserving the user's values for this.
+ if (!m_tb_tbb) {
+ // Bug 1506 P5: You have to set these two for non-TBB Firefoxen
+ m_tb_prefs.setBoolPref("network.websocket.enabled", false);
+ m_tb_prefs.setBoolPref("dom.indexedDB.enabled", false);
+ }
+
+ // Still need this in case people shove this thing back into FF
+ if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) {
+ var warning = torbutton_get_property_string("torbutton.popup.short_torbrowser");
+ var title = torbutton_get_property_string("torbutton.title.prompt_torbrowser");
+ var prompts = Services.prompt;
+ prompts.alert(null, title, warning);
+ }
+
// For general pref fixups to handle pref damage in older versions
torbutton_fixup_old_prefs();
@@ -1727,6 +1852,9 @@ function torbutton_new_window(event)
return;
}
+ m_tb_window_height = window.outerHeight;
+ m_tb_window_width = window.outerWidth;
+
if (!m_tb_wasinited) {
torbutton_init();
}
@@ -1794,6 +1922,13 @@ function torbutton_close_window(event) {
}
}
+
+function torbutton_open_network_settings() {
+ var obsSvc = Services.obs;
+ obsSvc.notifyObservers(this, "TorOpenNetworkSettings");
+}
+
+
window.addEventListener('load',torbutton_new_window,false);
window.addEventListener('unload', torbutton_close_window, false);
@@ -1900,6 +2035,60 @@ var torbutton_resizelistener =
onSecurityChange: function() {}
};
+// aURI should be an http or https nsIURI object.
+function torbutton_get_current_accept_language_value(aURI)
+{
+ try {
+ let ioService = Services.io;
+ let channel = ioService.newChannelFromURI(aURI);
+ let httpChannel = channel.QueryInterface(Ci.nsIHttpChannel);
+ return httpChannel.getRequestHeader("Accept-Language");
+ } catch (e) {}
+
+ return null;
+}
+
+// Take URL strings the user has specified for a homepage
+// and normalize it so it looks like a real URL.
+function torbutton_normalize_homepage_url_string(aURLString)
+{
+ if (!aURLString) return null;
+ if (typeof aURLString !== "string") return null;
+ let url;
+ try {
+ url = new URL(aURLString);
+ } catch (e) {
+ try {
+ url = new URL("http://" + aURLString);
+ } catch (e) {
+ return null;
+ }
+ }
+ return url.href;
+}
+
+function torbutton_is_homepage_url(aURI)
+{
+ if (!aURI)
+ return false;
+
+ let homePageURLs;
+ let choice = m_tb_prefs.getIntPref("browser.startup.page");
+ if ((1 == choice) || (3 == choice)) try {
+ // A homepage may be used at startup. Get the values and check against
+ // aURI.spec.
+ homePageURLs = m_tb_prefs.getComplexValue("browser.startup.homepage",
+ Ci.nsIPrefLocalizedString).data;
+ } catch (e) {}
+
+ if (!homePageURLs)
+ return false;
+
+ let urls = homePageURLs.split('|')
+ .map(torbutton_normalize_homepage_url_string);
+ return (urls.indexOf(aURI.spec) >= 0);
+}
+
// Makes sure the item in the Help Menu and the link in about:tor
// for the Tor Browser User Manual are only visible when
// show_torbrowser_manual() returns true.
@@ -1910,5 +2099,5 @@ function torbutton_init_user_manual_links() {
torbutton_abouttor_message_handler.updateAllOpenPages();
});
}
-})();
+
//vim:set ts=4
diff --git a/chrome/content/torbutton_util.js b/chrome/content/torbutton_util.js
new file mode 100644
index 00000000..e6446cde
--- /dev/null
+++ b/chrome/content/torbutton_util.js
@@ -0,0 +1,79 @@
+// Bug 1506 P1-P3: These utility functions might be useful, but
+// you probably just want to rewrite them or use the underlying
+// code directly. I don't see any of them as essential for 1506,
+// really.
+
+var m_tb_torlog = Cc["@torproject.org/torbutton-logger;1"]
+.getService(Ci.nsISupports).wrappedJSObject;
+
+var m_tb_string_bundle = torbutton_get_stringbundle();
+
+function torbutton_safelog(nLevel, sMsg, scrub) {
+ m_tb_torlog.safe_log(nLevel, sMsg, scrub);
+ return true;
+}
+
+function torbutton_log(nLevel, sMsg) {
+ m_tb_torlog.log(nLevel, sMsg);
+
+ // So we can use it in boolean expressions to determine where the
+ // short-circuit is..
+ return true;
+}
+
+// get a preferences branch object
+// FIXME: this is lame.
+function torbutton_get_prefbranch(branch_name) {
+ var o_prefs = false;
+ var o_branch = false;
+
+ torbutton_log(1, "called get_prefbranch()");
+ o_prefs = Services.prefs;
+ if (!o_prefs) {
+ torbutton_log(5, "Failed to get preferences-service!");
+ return false;
+ }
+
+ o_branch = o_prefs.getBranch(branch_name);
+ if (!o_branch)
+ {
+ torbutton_log(5, "Failed to get prefs branch!");
+ return false;
+ }
+
+ return o_branch;
+}
+
+// load localization strings
+function torbutton_get_stringbundle()
+{
+ var o_stringbundle = false;
+
+ try {
+ var oBundle = Services.strings;
+ o_stringbundle = oBundle.createBundle("chrome://torbutton/locale/torbutton.properties");
+ } catch(err) {
+ o_stringbundle = false;
+ }
+ if (!o_stringbundle) {
+ torbutton_log(5, 'ERROR (init): failed to find torbutton-bundle');
+ }
+
+ return o_stringbundle;
+}
+
+function torbutton_get_property_string(propertyname)
+{
+ try {
+ if (!m_tb_string_bundle) {
+ m_tb_string_bundle = torbutton_get_stringbundle();
+ }
+
+ return m_tb_string_bundle.GetStringFromName(propertyname);
+ } catch(e) {
+ torbutton_log(4, "Unlocalized string "+propertyname);
+ }
+
+ return propertyname;
+}
+
diff --git a/chrome/locale/en-US/torbutton.dtd b/chrome/locale/en-US/torbutton.dtd
index ed3cb1a6..d14bd1da 100644
--- a/chrome/locale/en-US/torbutton.dtd
+++ b/chrome/locale/en-US/torbutton.dtd
@@ -47,6 +47,3 @@
<!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security SettingsâŠ">
<!ENTITY torbutton.circuit_display.title "Tor Circuit">
<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
-
-<!-- Onion services strings. Strings are kept here for ease of translation. -->
-<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt">
diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties
index 1020e57a..ea7a7d63 100644
--- a/chrome/locale/en-US/torbutton.properties
+++ b/chrome/locale/en-US/torbutton.properties
@@ -58,13 +58,3 @@ updateDownloadingPanelUILabel=Downloading %S update
# .Onion Page Info prompt. Strings are kept here for ease of translation.
pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
-
-# Onion services strings. Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
-onionServices.clientAuthMissing=Tor onion service missing client authorization
-onionServices.authPrompt.description=%S is requesting your private key.
-onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
-onionServices.authPrompt.done=Done
-onionServices.authPrompt.doneAccessKey=d
-onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters)
-onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key
diff --git a/chrome/locale/ko/torbutton.dtd b/chrome/locale/ko/torbutton.dtd
index 109e2117..044cd417 100644
--- a/chrome/locale/ko/torbutton.dtd
+++ b/chrome/locale/ko/torbutton.dtd
@@ -1,18 +1,18 @@
<!ENTITY torbutton.context_menu.new_identity "ìë¡ìŽ ì ì">
<!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.new_circuit "ìŽ ì¬ìŽížììì ì Tor ìí·">
+<!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 "í 륎 ë€ížìí¬ ì€ì ...">
<!ENTITY torbutton.context_menu.networksettings.key "N">
<!ENTITY torbutton.context_menu.downloadUpdate "í 륎 ëžëŒì°ì ì
ë°ìŽíž 첎í¬íêž°...">
<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "ì¿ í€ ë³Žíž...">
+<!ENTITY torbutton.context_menu.cookieProtections "ì¿ í€ ë³Žíž....">
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "íŽëŠíì¬ Torbutton ì€ì ìŽêž°íêž°">
+<!ENTITY torbutton.button.tooltip "Torbutton ì€ì ìŽêž°í">
<!ENTITY torbutton.prefs.security_settings "Tor ëžëŒì°ì 볎ì ì€ì ">
<!ENTITY torbutton.cookiedialog.title "ì¿ í€ ë³Žíž êŽëЬ">
<!ENTITY torbutton.cookiedialog.lockCol "볎ížëš">
-<!ENTITY torbutton.cookiedialog.domainCol "ížì€íž">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
<!ENTITY torbutton.cookiedialog.nameCol "ìŽëŠ">
<!ENTITY torbutton.cookiedialog.pathCol "겜ë¡">
<!ENTITY torbutton.cookiedialog.protectCookie "ì¿ í€ ë³Žíž">
@@ -22,7 +22,7 @@
<!ENTITY torbutton.cookiedialog.saveAllCookies "ìë¡ìŽ ì¿ í€ ë³Žíž">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ìë¡ìŽ ì¿ í€ë¥Œ 볎ížíì§ ìì">
<!ENTITY torbutton.prefs.sec_caption "볎ì ë±êž">
-<!ENTITY torbutton.prefs.sec_caption_tooltip "볎ì ì¬ëŒìŽë륌 ì¬ì©í멎 í¹ì ëžëŒì°ì êž°ë¥ìŽ ë¹íì±íëìŽ ëžëŒì°ì ê° íŽí¹ ìëì ì·šìœíŽì§ ì ììµëë€.">
+<!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 "ë ìì í©ëë€">
@@ -36,7 +36,7 @@
<!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 "ì€ëì€ì ë¹ëì€(HTML5ë¡ ííë), ê·žëŠ¬ê³ WebGL ì íŽëŠíì¬ ì¬ìí©ëë€.">
+<!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 "볎ì곌 ìµëª
ì±ì 공격íë ë° ì¬ì©ë ì ìë í¹ì í ì¹ì êž°ë¥ì íŽì í©ëë€.">
<!ENTITY torbutton.prefs.sec_standard_tooltip "볎ì ìì€:íì€">
diff --git a/chrome/locale/ko/torbutton.properties b/chrome/locale/ko/torbutton.properties
index fed47bf8..9eef842b 100644
--- a/chrome/locale/ko/torbutton.properties
+++ b/chrome/locale/ko/torbutton.properties
@@ -53,7 +53,7 @@ profileMigrationFailed=Ʞ졎 %S íë¡íì ìŽì íì§ ëª»íìµëë€. ì
# "Downloading update" string for the hamburger menu (see #28885).
# This string is kept here for ease of translation.
# LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=ì
ë°ìŽíž %S ë€ìŽë¡ë ì€
+updateDownloadingPanelUILabel=Downloading %S update
# .Onion Page Info prompt. Strings are kept here for ease of translation.
pageInfo_OnionEncryptionWithBitsAndProtocol=ì°ê²°ì ìížííìµëë€ (Onion ìë¹ì€, %1$S, %2$S ë¹íž í€ë€, %3$S)
diff --git a/chrome/locale/lt/aboutDialog.dtd b/chrome/locale/lt/aboutDialog.dtd
deleted file mode 100644
index 8086ac53..00000000
--- a/chrome/locale/lt/aboutDialog.dtd
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY project.start "&brandShortName; plÄtoja ">
-<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
-<!ENTITY project.tpoLink "&vendorShortName;">
-<!ENTITY project.end ", ne pelno siekianti organizacija, dirbanti tam, kad apsaugotų jÅ«sų privatumÄ
ir laisvÄ internete.">
-
-<!ENTITY help.start "Norite padÄti?">
-<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
-<!ENTITY help.donateLink "Paaukokite">
-<!ENTITY help.or " arba ">
-<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
-<!ENTITY help.getInvolvedLink "įsitraukite">
-<!ENTITY help.end "!">
-<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
-<!ENTITY bottomLinks.questions "Klausimai?">
-<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
-<!ENTITY bottomLinks.grow "PadÄkite Tor tinklui augti!">
-<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
-<!ENTITY bottomLinks.license "Licencijavimo informacija">
-<!ENTITY tor.TrademarkStatement ""Tor" ir "Onion logotipas" yra registruoti Tor Project, Inc. prekių şenklai.">
diff --git a/chrome/locale/lt/aboutTBUpdate.dtd b/chrome/locale/lt/aboutTBUpdate.dtd
deleted file mode 100644
index a555d655..00000000
--- a/chrome/locale/lt/aboutTBUpdate.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser keitinių şurnalas">
-<!ENTITY aboutTBUpdate.updated "Tor NarÅ¡yklÄ atnaujinta.">
-<!ENTITY aboutTBUpdate.linkPrefix "NorÄdami suÅŸinoti naujausiÄ
informacijÄ
apie Å¡iÄ
laida, ">
-<!ENTITY aboutTBUpdate.linkLabel "apsilankykite mÅ«sų internetinÄje svetainÄje">
-<!ENTITY aboutTBUpdate.linkSuffix ".">
-<!ENTITY aboutTBUpdate.version "Versija">
-<!ENTITY aboutTBUpdate.releaseDate "Laidos data">
-<!ENTITY aboutTBUpdate.releaseNotes "Laidos informacija">
diff --git a/chrome/locale/lt/aboutTor.dtd b/chrome/locale/lt/aboutTor.dtd
index b6f8a23d..9f14022b 100644
--- a/chrome/locale/lt/aboutTor.dtd
+++ b/chrome/locale/lt/aboutTor.dtd
@@ -1,32 +1,47 @@
<!--
- - Copyright (c) 2019, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
-<!ENTITY aboutTor.title "Apie Tor">
+<!ENTITY aboutTor.title "About Tor">
-<!ENTITY aboutTor.viewChangelog.label "Rodyti keitinių ÅŸurnalÄ
">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
-<!ENTITY aboutTor.ready.label "NarÅ¡ykite. PrivaÄiai.">
-<!ENTITY aboutTor.ready2.label "JÅ«s esate pasiruoÅ¡Ä privaÄiausiam narÅ¡ymo patyrimui pasaulyje.">
-<!ENTITY aboutTor.failure.label "KaÅŸkas nutiko!">
-<!ENTITY aboutTor.failure2.label "Å ioje narÅ¡yklÄje Tor neveikia.">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
-<!ENTITY aboutTor.search.label "Ieškoti naudojant DuckDuckGo">
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org">
+<!ENTITY aboutTor.failure3suffix.label ".">
-<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Turite klausimų?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "PerÅŸiÅ«rÄkite mÅ«sų Tor Browser naudotojo vadovÄ
»">
-<!-- The next two entities are used within the browser's Help menu. -->
-<!ENTITY aboutTor.torbrowser_user_manual.accesskey "V">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser naudotojo vadovas">
+<!ENTITY aboutTor.search.label "Search">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.tor_mission.label "Tor Project yra JAV 501(c)(3) ne pelno organizacija remianti ÅŸmogaus teises ir laisves, kurianti ir diegianti laisvas ir atvirojo kodo anonimiÅ¡kumo bei privatumo technologijas, palaikanti jų neribotÄ
prieinamumÄ
ir naudojimÄ
bei mokslinį ir visuotinį supratimÄ
.">
-<!ENTITY aboutTor.getInvolved.label "Įsitraukite »">
-<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
-<!ENTITY aboutTor.newsletter.tagline "Gaukite naujienas iÅ¡ Tor tiesiai į savo paÅ¡to dÄÅŸutÄ.">
-<!ENTITY aboutTor.newsletter.link_text "UÅŸsisakykite Tor naujienas.">
-<!ENTITY aboutTor.donationBanner.line2e "Išlaikykite Tor stiprų.">
-<!ENTITY aboutTor.donationBanner.buttonA "Paaukokite dabar">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/chrome/locale/lt/brand.dtd b/chrome/locale/lt/brand.dtd
index 788d88f3..47d33862 100644
--- a/chrome/locale/lt/brand.dtd
+++ b/chrome/locale/lt/brand.dtd
@@ -2,14 +2,7 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY brandShorterName "Tor NarÅ¡yklÄ">
-<!ENTITY brandShortName "Tor NarÅ¡yklÄ">
-<!ENTITY brandFullName "Tor NarÅ¡yklÄ">
-<!ENTITY vendorShortName "Tor projektas">
-<!ENTITY trademarkInfo.part1 ""Tor" ir "Onion logotipas" yra registruoti Tor Project, Inc. prekių şenklai.">
-
-<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
-<!ENTITY plugins.installed.find "SpustelÄkite, kad įkeltumÄte įdiegtus sistemos papildinius">
-<!ENTITY plugins.installed.enable "Įjungti papildinius">
-<!ENTITY plugins.installed.disable "Išjungti papildinius">
-<!ENTITY plugins.installed.disable.tip "SpustelÄkite, kad neleistumÄte įkÄlinÄti sistemos papildinių">
+<!ENTITY brandShortName "Tor Browser">
+<!ENTITY brandFullName "Tor Browser">
+<!ENTITY vendorShortName "Tor Project">
+<!ENTITY trademarkInfo.part1 "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/lt/brand.properties b/chrome/locale/lt/brand.properties
index 88eddfc5..f63def38 100644
--- a/chrome/locale/lt/brand.properties
+++ b/chrome/locale/lt/brand.properties
@@ -2,15 +2,14 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-brandShorterName=Tor NarÅ¡yklÄ
-brandShortName=Tor NarÅ¡yklÄ
-brandFullName=Tor NarÅ¡yklÄ
-vendorShortName=Tor projektas
+brandShortName=Tor Browser
+brandFullName=Tor Browser
+vendorShortName=Tor Project
-homePageSingleStartMain=Firefox Start, greitas pradşios tinklalapis su integruota paieška
-homePageImport=Importuoti pradşios tinklalapį iš %S
+homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+homePageImport=Import your home page from %S
-homePageMigrationPageTitle=PradÅŸios tinklalapio pasirinkimas
-homePageMigrationDescription=Prašome pasirinkti pradşios tinklalapį, kurį naudosite:
+homePageMigrationPageTitle=Home Page Selection
+homePageMigrationDescription=Please select the home page you wish to use:
-syncBrandShortName=Sinchronizavimas
+syncBrandShortName=Sync
diff --git a/chrome/locale/lt/browserOnboarding.properties b/chrome/locale/lt/browserOnboarding.properties
deleted file mode 100644
index b351e854..00000000
--- a/chrome/locale/lt/browserOnboarding.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2019, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-onboarding.tour-tor-welcome=Sveiki
-onboarding.tour-tor-welcome.title=Esate pasiruoÅ¡Ä.
-onboarding.tour-tor-welcome.description=Tor NarÅ¡yklÄ leidÅŸia narÅ¡yti po saitynÄ
ir tuo paÄiu siÅ«lo aukÅ¡Äiausius privatumo bei saugumo standartus. Dabar, esate apsaugoti nuo sekimo, stebÄjimo ir cenzÅ«ros. Å iame trumpame įvade jums parodysime kaip tai daroma.
-onboarding.tour-tor-welcome.next-button=Pereiti į privatumÄ
-
-onboarding.tour-tor-privacy=Privatumas
-onboarding.tour-tor-privacy.title=Nepaisykite sekiklių ir Å¡niukÅ¡tinÄtojų.
-onboarding.tour-tor-privacy.description=Tor NarÅ¡yklÄ izoliuoja slapukus ir po kiekvieno narÅ¡ymo seanso iÅ¡trina narÅ¡ymo istorijÄ
. Å ie pakeitimai uÅŸtikrina, kad jÅ«sų privatumas ir saugumas narÅ¡yklÄje yra apsaugoti. SpustelÄkite "Tor tinklas", norÄdami suÅŸinoti, kaip mes apsaugome jus tinklo lygmenyje.
-onboarding.tour-tor-privacy.button=Pereiti prie Tor tinklo
-
-onboarding.tour-tor-network=Tor tinklas
-onboarding.tour-tor-network.title=Keliaukite po decentralizuotÄ
tinklÄ
.
-onboarding.tour-tor-network.description=Tor NarÅ¡yklÄ prijungia jus prie Tor tinklo, veikianÄio tÅ«kstanÄių, po visÄ
pasaulį iÅ¡sidÄsÄiusių, savanorių dÄka. Skirtingai nei VPN, Äia, norint mÄgautis privaÄiu narÅ¡ymu saityne, nÄra vieno ÅŸlugimo taÅ¡ko, ar centralizuoto objekto, kuriuo turÄtumÄte pasitikÄti.
-onboarding.tour-tor-network.description-para2=NAUJA: Tor tinklo nustatymai, įtraukiant galimybÄ praÅ¡yti tinklo tiltų, kur Tor uÅŸblokuotas, dabar galima rasti pirmenybÄse
-onboarding.tour-tor-network.action-button=Derinti savo Tor tinklo nustatymus
-onboarding.tour-tor-network.button=Pereiti į grandinÄs rodinį
-
-onboarding.tour-tor-circuit-display=GrandinÄs rodinys
-onboarding.tour-tor-circuit-display.title=Matykite savo keliÄ
.
-onboarding.tour-tor-circuit-display.description=Kiekvienoje jÅ«sų aplankomų sriÄių, jÅ«sų srautas yra retransliuojamas ir Å¡ifruojamas grandinÄje, sudarytoje iÅ¡ trijų Tor retransliavimų, iÅ¡sidÄsÄiusių po visÄ
pasaulį. Jokia internetinÄ svetainÄ neÅŸino iÅ¡ kurios vietos jungiatÄs. Galite uÅŸklausti naujÄ
grandinÄ, mÅ«sų grandinÄs rodinyje spusteldami ant "Nauja grandinÄ Å¡iai svetainei".
-onboarding.tour-tor-circuit-display.button=Rodyti mano keliÄ
-onboarding.tour-tor-circuit-display.next-button=Pereiti į saugumÄ
-
-onboarding.tour-tor-security=Saugumas
-onboarding.tour-tor-security.title=Pasirinkite savo patyrimÄ
.
-onboarding.tour-tor-security.description=Mes taip pat siÅ«lome papildomus nustatymus, kurių pagalba galima bÅ«tų dar pagerinti jÅ«sų narÅ¡yklÄs saugumÄ
. MÅ«sų saugumo nustatymai leidÅŸia jums blokuoti reikiamus elementus, kurie galÄtų bÅ«ti panaudoti siekiant uÅŸpulti jÅ«sų kompiuterį. SpustelÄkite ÅŸemiau, norÄdami pamatyti kÄ
skirtingi parametrai atlieka.
-onboarding.tour-tor-security.description-suffix=Pastaba: Pagal numatymÄ
, NoScript ir HTTPS Everywhere nÄra įtraukti į įrankių juostÄ
, taÄiau norÄdami juos pridÄti, galite tinkinti savo įrankių juostÄ
.
-onboarding.tour-tor-security-level.button=ÅœiÅ«rÄti savo saugumo lygmenį
-onboarding.tour-tor-security-level.next-button=Pereiti į patyrimo patarimus
-
-onboarding.tour-tor-expect-differences=Patyrimo patarimai
-onboarding.tour-tor-expect-differences.title=TikÄkitÄs kai kurių skirtumų.
-onboarding.tour-tor-expect-differences.description=Su visomis Tor suteikiamomis saugumo ir privatumo ypatybÄmis, jÅ«sų patyrimas narÅ¡ant saitynÄ
gali bÅ«ti Å¡iek tiek kitoks. Priklausomai nuo jÅ«sų saugumo lygmens, viskas gali veikti Å¡iek tiek lÄÄiau, o kai kurie elementai - neveikti arba bÅ«ti neįkeliami. Taip pat jÅ«sų gali bÅ«ti praÅ¡oma įrodyti, kad esate ÅŸmogus, o ne robotas.
-onboarding.tour-tor-expect-differences.button=Rodyti DUK
-onboarding.tour-tor-expect-differences.next-button=Pereiti į Onion tarnybas
-
-onboarding.tour-tor-onion-services=Onion tarnybos
-onboarding.tour-tor-onion-services.title=Būkite papildomai apsaugoti.
-onboarding.tour-tor-onion-services.description=Onion tarnybos yra svetainÄs, kurių adresai baigiasi .onion - turinio leidÄjams bei lankytojams jos suteikia papildomÄ
apsaugÄ
, įskaitant apsaugÄ
prieÅ¡ cenzÅ«ros. Onion tarnybos leidÅŸia visiems skelbti turinį bei teikti paslaugas anonimiÅ¡kai. SpustelÄkite ÅŸemiau, norÄdami apsilankyti DuckDuckGo onion svetainÄje.
-onboarding.tour-tor-onion-services.button=Apsilankyti Onion
-onboarding.tour-tor-onion-services.next-button=Atlikta
-
-onboarding.overlay-icon-tooltip-updated2=ÅœiÅ«rÄkite kas yra\nnaujo %S
-onboarding.tour-tor-update.prefix-new=Nauja
-onboarding.tour-tor-update.prefix-updated=Atnaujinta
-
-onboarding.tour-tor-toolbar=Įrankių juosta
-onboarding.tour-tor-toolbar-update-9.0.title=Viso gero Svogūno mygtuke.
-onboarding.tour-tor-toolbar-update-9.0.description=Norime kad jÅ«sų patirtis naudojantis Tor bÅ«tų pilnai integruota Tor narÅ¡yklÄje.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=DÄl to dabar, vietoj svogÅ«no mygtuko naudojimo, galite Tor grandinÄ pamatyti per [i] URL juostoje ir duoti uÅŸklausÄ
naujai tapatybei naudodamiesi įrankių juostos mygtuku arba [â¡] meniu.
-onboarding.tour-tor-toolbar-update-9.0.button=Kaip duoti uÅŸklausÄ
naujai tapatybei
-onboarding.tour-tor-toolbar-update-9.0.next-button=Pereiti prie Tor tinklo
-
-# Circuit Display onboarding.
-onboarding.tor-circuit-display.next=Kitas
-onboarding.tor-circuit-display.done=Atlikta
-onboarding.tor-circuit-display.one-of-three=1 iš 3
-onboarding.tor-circuit-display.two-of-three=2 iš 3
-onboarding.tor-circuit-display.three-of-three=3 iš 3
-
-onboarding.tor-circuit-display.intro.title=Kaip veikia grandinÄs?
-onboarding.tor-circuit-display.intro.msg=GrandinÄs yra sudarytos iÅ¡ atsitiktinai priskirtų retransliavimų, kurie savo ruoÅŸtu yra kompiuteriai visame pasaulyje sukonfigÅ«ruoti persiųsti Tor duomenų srautÄ
. GrandinÄs jums leidÅŸia narÅ¡yti privaÄiai ir prisijungti prie onion tarnybų.
-
-onboarding.tor-circuit-display.diagram.title=GrandinÄs rodinys
-onboarding.tor-circuit-display.diagram.msg=Å i diagrama rodo retransliavimus, kurie sudaro Å¡ios internetinÄs svetainÄs grandinÄ. Norint neleisti susieti veiklos tarp įvairių svetainių, kiekviena svetainÄ gauna skirtingÄ
grandinÄ.
-
-onboarding.tor-circuit-display.new-circuit.title=Ar jums reikia naujos grandinÄs?
-onboarding.tor-circuit-display.new-circuit.msg=Jeigu negalite prisijungti prie norimos aplankyti internetinÄs svetainÄs arba ji nÄra tinkamai įkeliama, tuomet galite pasinaudoti Å¡iuo mygtuku, kad iÅ¡ naujo įkeltumÄte svetainÄ, naudojant naujÄ
grandinÄ.
diff --git a/chrome/locale/lt/torbutton.dtd b/chrome/locale/lt/torbutton.dtd
index a03f0c34..ac9fb759 100644
--- a/chrome/locale/lt/torbutton.dtd
+++ b/chrome/locale/lt/torbutton.dtd
@@ -1,52 +1,20 @@
<!ENTITY torbutton.context_menu.new_identity "Nauja tapatybÄ">
-<!ENTITY torbutton.context_menu.new_identity_key "T">
-<!ENTITY torbutton.context_menu.new_circuit "Nauja Tor grandinÄ Å¡iai svetainei">
-<!ENTITY torbutton.context_menu.new_circuit_key "G">
-<!ENTITY torbutton.context_menu.networksettings "Tor tinklo nustatymaiâŠ">
-<!ENTITY torbutton.context_menu.networksettings.key "N">
-<!ENTITY torbutton.context_menu.downloadUpdate "Tikrinti, ar yra Tor NarÅ¡yklÄs atnaujinimųâŠ">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Slapukų apsaugosâŠ">
-<!ENTITY torbutton.context_menu.cookieProtections.key "P">
-<!ENTITY torbutton.button.tooltip "SpustelÄkite, kad aktyvuotumÄte Torbutton">
-<!ENTITY torbutton.prefs.security_settings "Tor NarÅ¡yklÄs saugumo nustatymai">
-<!ENTITY torbutton.cookiedialog.title "Tvarkyti slapukų apsaugas">
-<!ENTITY torbutton.cookiedialog.lockCol "Apsaugotas">
-<!ENTITY torbutton.cookiedialog.domainCol "Serveris">
+<!ENTITY torbutton.context_menu.cookieProtections "Slapukų apsaugos">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.button.tooltip "Paspauskite kad aktyvuoti Torbutton">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
<!ENTITY torbutton.cookiedialog.nameCol "Pavadinimas">
-<!ENTITY torbutton.cookiedialog.pathCol "Kelias">
-<!ENTITY torbutton.cookiedialog.protectCookie "Apsaugoti slapukÄ
">
-<!ENTITY torbutton.cookiedialog.removeCookie "Å alinti slapukÄ
">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Neapsaugoti slapuko">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Šalinti visus, išskyrus apsaugotus">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Apsaugoti naujus slapukus">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neapsaugoti naujų slapukų">
-<!ENTITY torbutton.prefs.sec_caption "Saugumo lygmuo">
-<!ENTITY torbutton.prefs.sec_caption_tooltip "Saugumo slankiklis leidÅŸia jums iÅ¡jungti tam tikras narÅ¡yklÄs ypatybes, kurios gali padaryti jÅ«sų narÅ¡yklÄ labiau paÅŸeidÅŸiamÄ
bandymams įsibrauti.">
-<!ENTITY torbutton.prefs.sec_standard_label "Standartinis">
-<!ENTITY torbutton.prefs.sec_standard_description "Visos Tor NarÅ¡yklÄs ir internetinių svetainių ypatybÄs yra įjungtos.">
-<!ENTITY torbutton.prefs.sec_safer_label "Saugesnis">
-<!ENTITY torbutton.prefs.sec_safer_description "IÅ¡jungia tas internetinių svetainių ypatybes, kurios, daÅŸnai, bÅ«na pavojingos, dÄl to kai kurios svetainÄs gali prarasti funkcionalumÄ
.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "Saugesniame nustatyme:">
-<!ENTITY torbutton.prefs.sec_safest_label "Saugiausias">
-<!ENTITY torbutton.prefs.sec_safest_description "LeidÅŸia tik tas internetinių svetainių ypatybes, kurios yra reikalingos statinÄms svetainÄms bei pagrindinÄms paslaugoms. Å ie pakeitimai paveikia paveikslus, medija ir scenarijus.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "Saugiausiame nustatyme:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "SuÅŸinoti daugiau">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript yra iÅ¡jungtas ne HTTPS svetainÄse.">
-<!ENTITY torbutton.prefs.sec_js_disabled "Pagal numatymÄ
, Javascript yra iÅ¡jungtas visose svetainÄse.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Kai kurie šriftai ir matematiniai simboliai yra išjungti.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Kai kurie šriftai, piktogramos, matematiniai simboliai ir paveikslai yra išjungti.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Garsas ir vaizdas (HTML5 medija), bei WebGL yra atkuriami tik spustelÄjus.">
-<!ENTITY torbutton.prefs.sec_custom_warning "Tinkintas">
-<!ENTITY torbutton.prefs.sec_overview "IÅ¡jungia tam tikras saityno ypatybes, kurios gali bÅ«ti panaudotos uÅŸpulti jÅ«sų saugumÄ
ar anonimiÅ¡kumÄ
.">
-<!ENTITY torbutton.prefs.sec_standard_tooltip "Saugumo lygmuo : Standartinis">
-<!ENTITY torbutton.prefs.sec_safer_tooltip "Saugumo lygmuo : Saugesnis">
-<!ENTITY torbutton.prefs.sec_safest_tooltip "Saugumo lygmuo : Saugiausias">
-<!ENTITY torbutton.prefs.sec_custom_summary "JÅ«sų pasirinktinÄs narÅ¡yklÄs nuostatos sÄ
lygojo neįprastus saugumo nustatymus. DÄl saugumo ir privatumo prieÅŸasÄių, rekomenduojame jums pasirinkti vienÄ
iš numatytųjų saugumo lygių.">
-<!ENTITY torbutton.prefs.sec_restore_defaults "Atkurti numatytuosius">
-<!ENTITY torbutton.prefs.sec_advanced_security_settings "IÅ¡plÄstiniai saugumo nustatymaiâŠ">
-<!ENTITY torbutton.circuit_display.title "Tor grandinÄ">
-<!ENTITY torbutton.circuit_display.new_circuit "Nauja grandinÄ Å¡iai svetainei">
-
-<!-- Onion services strings. Strings are kept here for ease of translation. -->
-<!ENTITY torbutton.onionServices.authPrompt.tooltip "Atidarykite onion paslaugos kliento autentifikavimo eilutÄ">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.sec_restore_defaults "Atstatyti numatytuosius">
diff --git a/chrome/locale/lt/torbutton.properties b/chrome/locale/lt/torbutton.properties
index 7bc5a23e..e3e4454c 100644
--- a/chrome/locale/lt/torbutton.properties
+++ b/chrome/locale/lt/torbutton.properties
@@ -1,70 +1,27 @@
-torbutton.circuit_display.internet = Internetas
-torbutton.circuit_display.ip_unknown = IP neÅŸinomas
-torbutton.circuit_display.onion_site = Onion svetainÄ
-torbutton.circuit_display.this_browser = Å i narÅ¡yklÄ
-torbutton.circuit_display.relay = Retransliavimas
-torbutton.circuit_display.tor_bridge = Tinklų tiltas
-torbutton.circuit_display.unknown_country = Neşinoma šalis
-torbutton.circuit_display.guard = Sargybinis
-torbutton.circuit_display.guard_note = Jūsų [Sargybinis] mazgas negali pasikeisti.
-torbutton.circuit_display.learn_more = SuÅŸinoti daugiau
-torbutton.content_sizer.margin_tooltip = Tor NarÅ¡yklÄ prideda Å¡iÄ
paraÅ¡tÄ, kad jÅ«sų lango plotis ir aukÅ¡tis bÅ«tų maÅŸiau atskiriami ir, tokiu bÅ«du, ÅŸmonÄms bÅ«tų sumaÅŸinta galimybÄ sekti jus internete.
-torbutton.panel.tooltip.disabled = SpustelÄkite norÄdami įjungti Tor
-torbutton.panel.tooltip.enabled = SpustelÄkite norÄdami iÅ¡jungti Tor
-torbutton.panel.label.disabled = Tor išjungta
-torbutton.panel.label.enabled = Tor įjungta
-extensions.torbutton(a)torproject.org.description = Torbutton pateikia mygtukÄ
, skirtÄ
konfigÅ«ruoti Tor nustatymus ir greitai bei lengvai iÅ¡valyti privaÄius narÅ¡ymo duomenis.
-torbutton.popup.external.title = Atsisiųsti iÅ¡orinį failo tipÄ
?
-torbutton.popup.external.app = Tor NarÅ¡yklÄ negali atvaizduoti Å¡io failo. Jums teks jį atverti, naudojant kitÄ
programÄ
.\n\n
-torbutton.popup.external.note = Kai kurie failų tipai, gali priversti programas prisijungti prie interneto ne per Tor.\n\n
-torbutton.popup.external.suggest = Saugumo sumetimais, parsisiųstus failus derÄtų atverti, atsijungus nuo interneto arba naudojant Tor Live CD tokį kaip Tails.\n
-torbutton.popup.launch = Atsisiųsti failÄ
-torbutton.popup.cancel = Atsisakyti
-torbutton.popup.dontask = Nuo šiol, failus atsisiųsti automatiškai
-torbutton.popup.no_newnym = Torbutton negali jums saugiai suteikti naujos tapatybÄs. Programa neturi prieigos prie Tor valdymo prievado.\n\nAr jÅ«s esate paleidÄ Tor NarÅ¡yklÄs rinkinį?
-torbutton.security_settings.menu.title = Saugumo nustatymai
+torbutton.panel.tooltip.disabled = Paspauskite kad įgalinti Tor
+torbutton.panel.tooltip.enabled = Paspauskite kad atjungti Tor
+torbutton.panel.label.disabled = Tor atjungtas
+torbutton.panel.label.enabled = Tor įgalintas
+extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Atšaukti
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
torbutton.title.prompt_torbrowser = Svarbi Torbutton informacija
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-torbutton.popup.short_torbrowser = Svarbi Torbutton informacija!\n\nDabar, Torbutton visada yra įjungta.\n\nIÅ¡samesnei informacijai, spustelÄkite ant Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
-torbutton.popup.confirm_plugins = Tokie įskiepiai kaip Flash gali paÅŸeisti jÅ«sų privatumÄ
ir anonimiÅ¡kumÄ
.\n\nJie taip pat gali apeiti Tor tam, kad atskleistų jÅ«sų dabartinÄ buvimo vietÄ
ir IP adresÄ
.\n\nAr tikrai norite įjungti įskiepius?\n\n
-torbutton.popup.never_ask_again = Daugiau nebeklausti
-torbutton.popup.confirm_newnym = Tor NarÅ¡yklÄ uÅŸvers visus langus ir korteles. Visi svetainių seansai bus prarasti.\n\nPaleisti Tor NarÅ¡yklÄ iÅ¡ naujo dabar, kad bÅ«tų atstatyta jÅ«sų tapatybÄ?\n\n
-
-torbutton.maximize_warning = Tor NarÅ¡yklÄs iÅ¡skleidimas gali leisti svetainÄms nustatyti jÅ«sų monitoriaus dydį, o tai gali bÅ«ti naudojama jÅ«sų sekimui. Rekomenduojame palikti Tor NarÅ¡yklÄs langus jų pradiniame numatytajame dydyje.
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Å i svetainÄ (%S) bandÄ iÅ¡skleisti HTML5 drobÄs paveikslo duomenis, kas gali bÅ«ti panaudota, kad jÅ«sų kompiuteris bÅ«tų unikaliai atpaşįstamas.\n\nAr Tor NarÅ¡yklÄ turÄtų leisti Å¡iai svetainei iÅ¡skleisti HTML5 drobÄs paveikslo duomenis?
-canvas.notNow=Ne dabar
-canvas.notNowAccessKey=N
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
canvas.allow=Leisti ateityje
canvas.allowAccessKey=A
-canvas.never=Niekada šiai svetainei (rekomenduojama)
+canvas.never=Niekada šiam puslapiui
canvas.neverAccessKey=e
-
-# Profile/startup error messages. Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S is the application name.
-profileProblemTitle=%S profilio problema
-profileReadOnly=Negalite paleisti %S iÅ¡ tik skaitymui skirtos failų sistemos. PrieÅ¡ norÄdami ja naudotis, nukopijuokite %S į kitÄ
vietÄ
.
-profileReadOnlyMac=Negalite paleisti %S iÅ¡ tik skaitymui skirtos failų sistemos. PrieÅ¡ bandydami jÄ
naudoti, nukopijuokite %S į savo Darbalaukio ar Programų aplankÄ
.
-profileAccessDenied=%S neturi leidimo prieigai prie profilio. PraÅ¡ome suderinti savo failų sistemos leidimus ir bandyti dar kartÄ
.
-profileMigrationFailed=JÅ«sų esamo %S profilio perkÄlimas nepavyko.\nBus naudojami nauji nustatymai.
-
-# "Downloading update" string for the hamburger menu (see #28885).
-# This string is kept here for ease of translation.
-# LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=AtsisiunÄiamas %S atnaujinimas
-
-# .Onion Page Info prompt. Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Šifruotas ryšys (Onion tarnyba, %1$S, %2$S bitų raktai, %3$S)
-pageInfo_OnionEncryption=Šifruotas ryšys (Onion tarnyba)
-
-# Onion services strings. Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
-onionServices.clientAuthMissing=Tor onion paslaugai trūksta kliento leidimo
-onionServices.authPrompt.description=%S prašo jūsų asmeninio rakto.
-onionServices.authPrompt.keyPlaceholder=Ä®veskite asmeninį raktÄ
skirtÄ
šiai onion paslaugai
-onionServices.authPrompt.done=Atlikta
-onionServices.authPrompt.doneAccessKey=u
-onionServices.authPrompt.invalidKey=Ä®veskite galiojantį raktÄ
(52 base32 arba 44 base64 simbolius)
-onionServices.authPrompt.failedToSetKey=Nepavyko konfigÅ«ruoti Tor naudojant jÅ«sų raktÄ
diff --git a/chrome/locale/ms/aboutDialog.dtd b/chrome/locale/ms/aboutDialog.dtd
deleted file mode 100644
index ba27c728..00000000
--- a/chrome/locale/ms/aboutDialog.dtd
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY project.start "&brandShortName; dibangunkan oleh">
-<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
-<!ENTITY project.tpoLink "&vendorShortName;">
-<!ENTITY project.end ", sebuah usaha tidak berasaskan keuntungan untuk melindungi kerahsiaan dan kebebasan atas talian anda.">
-
-<!ENTITY help.start "Mahu membantu?">
-<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
-<!ENTITY help.donateLink "Derma">
-<!ENTITY help.or "atau">
-<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
-<!ENTITY help.getInvolvedLink "sertai">
-<!ENTITY help.end "!">
-<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
-<!ENTITY bottomLinks.questions "Ada Pertanyaan?">
-<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
-<!ENTITY bottomLinks.grow "Bantulah Pembangunan Rangkaian Tor!">
-<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
-<!ENTITY bottomLinks.license "Maklumat Pelesenan">
-<!ENTITY tor.TrademarkStatement "'Tor' dan 'Logo Onion' adalah cap dagangan berdaftar bagi Projek Tor, Inc.">
diff --git a/chrome/locale/ms/aboutTBUpdate.dtd b/chrome/locale/ms/aboutTBUpdate.dtd
deleted file mode 100644
index 30470b87..00000000
--- a/chrome/locale/ms/aboutTBUpdate.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY aboutTBUpdate.changelogTitle "Log Perubahan Pelayar Tor">
-<!ENTITY aboutTBUpdate.updated "Pelayar Tor telah dikemaskinikan.">
-<!ENTITY aboutTBUpdate.linkPrefix "Untuk dapatkan maklumat terkini berkenaan keluaran ini.">
-<!ENTITY aboutTBUpdate.linkLabel "lawati laman sesawang kami">
-<!ENTITY aboutTBUpdate.linkSuffix ".">
-<!ENTITY aboutTBUpdate.version "Versi">
-<!ENTITY aboutTBUpdate.releaseDate "Tarikh Keluaran">
-<!ENTITY aboutTBUpdate.releaseNotes "Nota Keluaran">
diff --git a/chrome/locale/ms/aboutTor.dtd b/chrome/locale/ms/aboutTor.dtd
index 19fe7960..9f14022b 100644
--- a/chrome/locale/ms/aboutTor.dtd
+++ b/chrome/locale/ms/aboutTor.dtd
@@ -1,32 +1,47 @@
<!--
- - Copyright (c) 2019, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
-<!ENTITY aboutTor.title "Perihal Tor">
+<!ENTITY aboutTor.title "About Tor">
-<!ENTITY aboutTor.viewChangelog.label "Lihat Log Perubahan">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
-<!ENTITY aboutTor.ready.label "Menjelajahlah. Secara Persendirian.">
-<!ENTITY aboutTor.ready2.label "Anda kini bersedia menikmati pengalaman melayari Internet secara persendirian.">
-<!ENTITY aboutTor.failure.label "Sesuatu telah berlaku!">
-<!ENTITY aboutTor.failure2.label "Tor tidak berfungsi ke atas pelayar ini.">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
-<!ENTITY aboutTor.search.label "Gelintar dengan DuckDuckGo">
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org">
+<!ENTITY aboutTor.failure3suffix.label ".">
-<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ada Pertanyaan?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Periksa Panduan Pelayar Tor kami »">
-<!-- The next two entities are used within the browser's Help menu. -->
-<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Panduan Pelayar Tor">
+<!ENTITY aboutTor.search.label "Search">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.tor_mission.label "Projek Tor ialah organisasi bukan-berasaskan-keuntungan US 501(c)(3) yang melindungi hak-hak kemanusian dan kebebasan dengan mencipta dan menghasilkan teknologi keawanamaan dan kerahsiaan bebas dan bersumber-terbuka, menyokong ketersediaan dan penggunaan tanpa-had, dan melanjutkan kesefahaman saintifik dan popular mereka.">
-<!ENTITY aboutTor.getInvolved.label "Sertai »">
-<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
-<!ENTITY aboutTor.newsletter.tagline "Dapatkan berita terkini Tor yang terus ke dalam kotak mel anda.">
-<!ENTITY aboutTor.newsletter.link_text "Daftar untuk dapatkan Berita Tor.">
-<!ENTITY aboutTor.donationBanner.line2e "Pastika Tor kekal teguh.">
-<!ENTITY aboutTor.donationBanner.buttonA "Dermalah Sekarang">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/chrome/locale/ms/brand.dtd b/chrome/locale/ms/brand.dtd
index d6f3c62d..47d33862 100644
--- a/chrome/locale/ms/brand.dtd
+++ b/chrome/locale/ms/brand.dtd
@@ -2,14 +2,7 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY brandShorterName "Pelayar Tor">
-<!ENTITY brandShortName "Pelayar Tor">
-<!ENTITY brandFullName "Pelayar Tor">
-<!ENTITY vendorShortName "Projek Tor">
-<!ENTITY trademarkInfo.part1 "'Tor' dan 'Logo Onion' adalah cap dagangan berdaftar bagi Projek Tor, Inc.">
-
-<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
-<!ENTITY plugins.installed.find "Klik untuk muat pemalam sistem terpasang">
-<!ENTITY plugins.installed.enable "Benarkan pemalam">
-<!ENTITY plugins.installed.disable "Lumpuhkan pemalam">
-<!ENTITY plugins.installed.disable.tip "Klik untuk elak memuatkan pemalam sistem">
+<!ENTITY brandShortName "Tor Browser">
+<!ENTITY brandFullName "Tor Browser">
+<!ENTITY vendorShortName "Tor Project">
+<!ENTITY trademarkInfo.part1 "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/ms/brand.properties b/chrome/locale/ms/brand.properties
index 5adee627..f63def38 100644
--- a/chrome/locale/ms/brand.properties
+++ b/chrome/locale/ms/brand.properties
@@ -2,15 +2,14 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-brandShorterName=Pelayar Tor
-brandShortName=Pelayar Tor
-brandFullName=Pelayar Tor
-vendorShortName=Projek Tor
+brandShortName=Tor Browser
+brandFullName=Tor Browser
+vendorShortName=Tor Project
-homePageSingleStartMain=Firefox Start, halaman utama yang pantas dan dilengkapi dengan gelintar terbina-dalam.
-homePageImport=Import halaman utama anda dari %S
+homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+homePageImport=Import your home page from %S
-homePageMigrationPageTitle=Pemilihan Laman Utama
-homePageMigrationDescription=Sila pilih halaman utama yang ingin digunakan:
+homePageMigrationPageTitle=Home Page Selection
+homePageMigrationDescription=Please select the home page you wish to use:
-syncBrandShortName=Segerak
+syncBrandShortName=Sync
diff --git a/chrome/locale/ms/browserOnboarding.properties b/chrome/locale/ms/browserOnboarding.properties
deleted file mode 100644
index 2a304198..00000000
--- a/chrome/locale/ms/browserOnboarding.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2019, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-onboarding.tour-tor-welcome=Selamat Datang
-onboarding.tour-tor-welcome.title=Anda sedia.
-onboarding.tour-tor-welcome.description=Pelayar Tor menawatkan piawaian kerahsiaan dan keselamatan tertinggi ketika melayari sesawang. Anda kini dilindungi dari penjejakan, pemantauan, dan penapisan. Panduan pantas ini akan membantu anda bagaimana hendak menggunakannya.
-onboarding.tour-tor-welcome.next-button=Pergi ke Privasi
-
-onboarding.tour-tor-privacy=Privasi
-onboarding.tour-tor-privacy.title=Endah penjejak dan pengintip.
-onboarding.tour-tor-privacy.description=Pelayar Tor mengasingkan kuki dan memadam sejarah pelayar anda selepas sesi tamat. Pengubahsuaian ini memastikan kerahsiaan dan keselamatan pelayar anda dilindungi. Klik 'Rangkaian Tor' untuk mengetahui bagaiaman kami melindungi anda pada tahap rangkaian.
-onboarding.tour-tor-privacy.button=Pergi ke Rangkaian Tor
-
-onboarding.tour-tor-network=Rangkaian Tor
-onboarding.tour-tor-network.title=Menjelajah dengan rangkaian tidak terpusat.
-onboarding.tour-tor-network.description=Pelayar Tor menghubungkan anda dengan rangkaian Tor yang diurus oleh beribu-ribu para sukarelawan di seluruh dunia. Tidak seperti VPN, tiada kegagalan atau entiti terpusat yang anda kena percaya untuk menikmati internet secara persendirian.
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences.
-onboarding.tour-tor-network.action-button=Laras Tetapan Rangkaian Tor anda
-onboarding.tour-tor-network.button=Pergi ke Paparan Litar
-
-onboarding.tour-tor-circuit-display=Paparan Litar
-onboarding.tour-tor-circuit-display.title=Lihat laluan anda.
-onboarding.tour-tor-circuit-display.description=Bagi setiap domain yang anda lawati, trafik anda disampaikan dan disulitkan dalam litar merentasi tiga geganti Tor mengelilingi dunia. Tiada laman sesawang mengetahui lokasi anda bersambung. Anda boleh pohon satu litar baharu dengan mengklik 'Litar Baharu untuk Laman ini' pada Paparan Litar kami.
-onboarding.tour-tor-circuit-display.button=Lihat Laluan Saya
-onboarding.tour-tor-circuit-display.next-button=Pergi ke Keselamatan
-
-onboarding.tour-tor-security=Keselamatan
-onboarding.tour-tor-security.title=Pilih pengalaman yang dikehendaki.
-onboarding.tour-tor-security.description=Kami juga menyediakan tetapan tambahan untuk menambahbaik keselamatan pelayar anda. Tetapan Keselamatan kami membolehkan anda sekat unsur-unsur yang boleh digunakan untuk menyerang komputer anda. Klik di bawah untuk melihat apakah perbezaan pilihan-pilihan tawarkan.
-onboarding.tour-tor-security.description-suffix=Perhatian: Secara lalai, NoScript dan HTTPS Everywhere tidak di sertakan dalam palang alat, tetapi anda boleh suaikan palang alat untuk menambahnya.
-onboarding.tour-tor-security-level.button=Lihat Tahap Keselamatan Anda
-onboarding.tour-tor-security-level.next-button=Pergi ke Peuta Pengalaman
-
-onboarding.tour-tor-expect-differences=Petua Pengalaman.
-onboarding.tour-tor-expect-differences.title=Jangkakan beberapa perbezaan.
-onboarding.tour-tor-expect-differences.description=Dengan semua fitur keselamatan dan privasi yang disediakan oleh Tor, pengalaman anda ketika melayari internet menjadi sedikit berbeza. Menjadi lebih perlahan berbanding sebelum ini dan juga bergantung pada tahap keselamatan yang anda tetapkan, sesetengah unsur-unsur mungkin tidak berfungsi atau dimuatkan. Anda juga akan ditanya sama ada manusia dan bukan robot.
-onboarding.tour-tor-expect-differences.button=Lihat FAQ
-onboarding.tour-tor-expect-differences.next-button=Pergi ke Perkhidmatan Onion
-
-onboarding.tour-tor-onion-services=Perkhidmatan Onion
-onboarding.tour-tor-onion-services.title=Mahu lebih dilindungi.
-onboarding.tour-tor-onion-services.description=Perkhidmatan Onion merupakan laman-laman berakhir dengan .onion yang menyediakan perlindungan tambahan kepada para penerbit dan pelawat, termasuklah perlindungan terhadap tapisan. Perkhidmatan Onion membolehkan sesiapa sahaja menyediakan kandungan dan perkhidmatan secara awanama. Klik di bawah untuk melawati laman onion DuckDuckGo.
-onboarding.tour-tor-onion-services.button=Lawati Onion
-onboarding.tour-tor-onion-services.next-button=Selesai
-
-onboarding.overlay-icon-tooltip-updated2=Lihat yang terbaharu\ndi dalam %S
-onboarding.tour-tor-update.prefix-new=Baharu
-onboarding.tour-tor-update.prefix-updated=Dikemaskini
-
-onboarding.tour-tor-toolbar=Palang Alat
-onboarding.tour-tor-toolbar-update-9.0.title=Selamat Tinggal Butang Onion.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [â¡] menu.
-onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
-onboarding.tour-tor-toolbar-update-9.0.next-button=Pergi ke Rangkaian Tor
-
-# Circuit Display onboarding.
-onboarding.tor-circuit-display.next=Seterusnya
-onboarding.tor-circuit-display.done=Selesai
-onboarding.tor-circuit-display.one-of-three=1 dari 3
-onboarding.tor-circuit-display.two-of-three=2 dari 3
-onboarding.tor-circuit-display.three-of-three=3 dari 3
-
-onboarding.tor-circuit-display.intro.title=Bagaimanakah litar-litar ini berfungsi?
-onboarding.tor-circuit-display.intro.msg=Litar-litar diperbuat daripada geganti-geganti terumpuk secara rawak, yang merupakan komputer-komputer di seluruh dunia yang dikonfigur khas untuk memajukan trafik Tor. Litar-litar membolehkan anda melayari Internet secara persendirian yang dihubungkan dengan perkhidmatan onion.
-
-onboarding.tor-circuit-display.diagram.title=Paparan Litar
-onboarding.tor-circuit-display.diagram.msg=Rajah ini menunjukkan geganti-geganti yang terlibat dengan litar bagi laman sesawang ini. Untuk menghindari pemautan aktiviti merentasi laman-laman yang berbeza, setiap laman sesawang memperoleh satu litar yang berlainan.
-
-onboarding.tor-circuit-display.new-circuit.title=Anda perlukan satu litar baharu?
-onboarding.tor-circuit-display.new-circuit.msg=Jika anda masih tidak berjaya bersambung dengan laman sesawang yang ingin dilawati atau laman tidak dimuatkan dengan betul, anda boleh guna butang ini untuk memuatkan semula laman tersebut dengan satu litar baharu.
diff --git a/chrome/locale/ms/torbutton.dtd b/chrome/locale/ms/torbutton.dtd
index 8a63b220..fa587065 100644
--- a/chrome/locale/ms/torbutton.dtd
+++ b/chrome/locale/ms/torbutton.dtd
@@ -1,52 +1,19 @@
-<!ENTITY torbutton.context_menu.new_identity "Identiti Baharu">
+<!ENTITY torbutton.context_menu.new_identity "New Identity">
<!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.new_circuit "Litar Tor baharu untuk Laman ini">
-<!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.networksettings "Tetapan Rangkaian Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "N">
-<!ENTITY torbutton.context_menu.downloadUpdate "Periksa untuk dapatkan Kemaskini Pelayar Tor...">
+<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Perlindungan Kuki...">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Klik untuk mengawalkan Torbutton">
-<!ENTITY torbutton.prefs.security_settings "Tetapan Keselamatan Pelayar Tor">
-<!ENTITY torbutton.cookiedialog.title "Urus Perlindungan Kuki">
-<!ENTITY torbutton.cookiedialog.lockCol "Dilindungi">
-<!ENTITY torbutton.cookiedialog.domainCol "Hos">
-<!ENTITY torbutton.cookiedialog.nameCol "Nama">
-<!ENTITY torbutton.cookiedialog.pathCol "Laluan">
-<!ENTITY torbutton.cookiedialog.protectCookie "Lindung Kuki">
-<!ENTITY torbutton.cookiedialog.removeCookie "Buang Kuki">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Kuki Tidak Dilindungi">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Buang Semua Kecuali Dilindungi">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Lindungi Kuki Baharu">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Jangan Lindungi Kuki Baharu">
-<!ENTITY torbutton.prefs.sec_caption "Tahap Keselamatan">
-<!ENTITY torbutton.prefs.sec_caption_tooltip "Pelaras Keselamatan membolehkan anda lumpuhkan beberapa fitur pelayar yang mana ia menjadikan pelayar anda mudah terdedah dengan serangan penggodaman.">
-<!ENTITY torbutton.prefs.sec_standard_label "Piawai">
-<!ENTITY torbutton.prefs.sec_standard_description "Semua Pelayar Tor dan fitur laman sesawang telah dibenarkan.">
-<!ENTITY torbutton.prefs.sec_safer_label "Lebih Selamat">
-<!ENTITY torbutton.prefs.sec_safer_description "Fitur-fitur laman sesawang yang dilumpuhkan biasanya merbahaya, boleh menyebabkan beberapa laman kehilangan kefungsiannya.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "Pada tetapan lebih selamat:">
-<!ENTITY torbutton.prefs.sec_safest_label "Paling Selamat">
-<!ENTITY torbutton.prefs.sec_safest_description "Hanya benarkan fitur-fitur laman sesawang yang diperlukan untuk laman-laman statik dan perkhidmatan asas. Perubahan ini dapat menjejaskan imej, media dan skrip.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "Pada tetapan paling selamat:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Ketahui lebih lanjut">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Skrip Java dilumpuhkan pada laman-laman bukan-HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_disabled "Skrip Java dilumpuhkan secara lalai untuk semua laman.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Sesetengah fon dan simbol matematik dilumpuhkan.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sesetengah fon, ikon, simbol matematik, dan imej dilumpuhkan.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio dan video (media HTML5) dan WebGL adalah klik-untuk-dimainkan.">
-<!ENTITY torbutton.prefs.sec_custom_warning "Suai">
-<!ENTITY torbutton.prefs.sec_overview "Lumpuhkan beberapa fitur sesawang yang boleh digunakan untuk menyerang keselamatan dan keawanamaan anda.">
-<!ENTITY torbutton.prefs.sec_standard_tooltip "Tahap Keselamatan: Piawai">
-<!ENTITY torbutton.prefs.sec_safer_tooltip "Tahap Keselamatan : Lebih Selamat">
-<!ENTITY torbutton.prefs.sec_safest_tooltip "Tahap Keselamatan : Paling Selamat">
-<!ENTITY torbutton.prefs.sec_custom_summary "Keutamaan pelayar suai anda telah menyebabkan tetapan keselamatan luar jangkaan. Atas sebab keselamatan dan kerahsiaan, kami sarankan anda memilih salah satu daripada tahap keselamatan lalai yang ada.">
-<!ENTITY torbutton.prefs.sec_restore_defaults "Pulih Lalai">
-<!ENTITY torbutton.prefs.sec_advanced_security_settings "Tetapan Keselamatan Lanjutan...">
-<!ENTITY torbutton.circuit_display.title "Litar Tor">
-<!ENTITY torbutton.circuit_display.new_circuit "Lihat baharu untuk Laman ini">
-
-<!-- Onion services strings. Strings are kept here for ease of translation. -->
-<!ENTITY torbutton.onionServices.authPrompt.tooltip "Buka bisikan pengesahihan klien perkhidmatan onion">
+<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
diff --git a/chrome/locale/ms/torbutton.properties b/chrome/locale/ms/torbutton.properties
index 50b40d37..ee5b1f95 100644
--- a/chrome/locale/ms/torbutton.properties
+++ b/chrome/locale/ms/torbutton.properties
@@ -1,70 +1,27 @@
-torbutton.circuit_display.internet = Internet
-torbutton.circuit_display.ip_unknown = IP tidak diketahui
-torbutton.circuit_display.onion_site = Laman Onion
-torbutton.circuit_display.this_browser = Pelayar ini
-torbutton.circuit_display.relay = Geganti
-torbutton.circuit_display.tor_bridge = Titi
-torbutton.circuit_display.unknown_country = Negara tidak diketahui
-torbutton.circuit_display.guard = Jaga
-torbutton.circuit_display.guard_note = Nod [Jaga] anda tidak berubah.
-torbutton.circuit_display.learn_more = Ketahui lebih lanjut
-torbutton.content_sizer.margin_tooltip = Pelayar Tor menambah jidar ini untuk memastikan tinggi dan lebar tetingkap anda kurang dikenali, dan seterusnya mengurangkan keupayaan orang lain menjejak anda ketika berada diatas-talian.
-torbutton.panel.tooltip.disabled = Klik untuk benarkan Tor
-torbutton.panel.tooltip.enabled = Klik untuk lumpuhkan Tor
-torbutton.panel.label.disabled = Tor Dilumpuhkan
-torbutton.panel.label.enabled = Tor Dibenarkan
-extensions.torbutton(a)torproject.org.description = Torbutton menyediakan butang bagi mengkonfigur tetapan Tor secara pantas dan mudah membersihkan data pelayaran persendirian anda.
-torbutton.popup.external.title = Muat turun jenis fail luar?
-torbutton.popup.external.app = Pelayar Tor tidak dapat paparkan fail ini. Anda perlu membukanya dengan aplikasi lain.\n\n
-torbutton.popup.external.note = Sesetengah jenis fail boleh menyebabkan aplikasi menyambung dengan Internet tanpa menggunakan Tor.\n\n
-torbutton.popup.external.suggest = Sebagai langkah berjaga-jaga, anda sepatutnya hanya membuka fail dimuat turun ketika berada diluar talian, atau guna CD Langsung Tor seperti Tails.\n
-torbutton.popup.launch = Muat turun fail
-torbutton.popup.cancel = Batal
-torbutton.popup.dontask = Muat turun fail secara automatik mulai sekarang
-torbutton.popup.no_newnym = Torbutton tidak dapat memberikan anda identiti baharu secara selamat. Ia tidak mempunyai capaian ke Port Kawalan Tor.\n\nAnda pasti masih menjalankan Berkas Pelayar Tor?
-torbutton.security_settings.menu.title = Tetapan Keselamatan
-torbutton.title.prompt_torbrowser = Maklumat Torbutton Penting
-torbutton.popup.prompt_torbrowser = Torbutton berfungsi secara berlainan sekarang: anda tidak boleh mematikannya lagi.\n\nKami membuat perubahan ini kerana ia tidak selamat menggunakan Torbutton dalam pelayar yang juga digunakan untuk pelayaran bukan-Tor. Terdapat terlalu banyak pepijat yang masih belum dibaiki.\n\nJika anda mahu menggunakan Firefox seperti biasa, anda patut menyahpasang Torbutton dan muat turun Berkas Pelayar Tor. Sifat kerahsiaan Pelayar Tor adalah lebih baik berbanding Firefox biasa, walaupun Firefox digandingkan dengan Torbutton.\n\nUntuk membuang Torbutton, pergi ke Alatan>Tambahan>Sambungan dan kemudian klik butang Buang bersebelahan Torbutton.
-torbutton.popup.short_torbrowser = Maklumat Torbutton Penting! \n\nTorbutton kini sentiasa dibenarkan. \n\nKlik pada Torbutton untuk maklumat lanjut.
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
-torbutton.popup.confirm_plugins = Pemalam seperti Flash boleh mengganggu privasi dan keawanamaan anda.\n\nIa juga boleh melepasi Tor dan mendedahkan lokasi dan alamat IP semasa anda.\n\nAnda pasti anda mahu benarkan pemalam tersebut?\n\n
-torbutton.popup.never_ask_again = Jangan tanya saya lagi
-torbutton.popup.confirm_newnym = Pelayar Tor akan menutup semua tetingkap dan tab. Semua sesi laman sesawang akan hilang.\n\nMulakan semula Pelayar Tor sekarang untuk tetapkan semula identiti anda?\n\n
-
-torbutton.maximize_warning = Memaksimumkan Pelayar Tor dapat membenarkan laman sesawang tentukan saiz monitor anda, yang mana boleh digunakan untuk menjejak anda. Kami sarankan anda biarkan tetingkap Pelayar Tor dalam saiz lalai asalnya.
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Laman sesawang (%S) ini cuba mengekstrak data imej kanvas HTML5, yang boleh digunakan untuk mengecam komputer anda secara unik.\n\nPatutkah Pelayar Tor membenarkan laman sesawang ini mengekstrak data imej kanvas HTML5?
-canvas.notNow=Bukan Sekarang
-canvas.notNowAccessKey=N
-canvas.allow=Benarkan pada masa hadapan
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
canvas.allowAccessKey=A
-canvas.never=Tidak sesekali untuk laman ini (disarankan)
+canvas.never=Never for This Site
canvas.neverAccessKey=e
-
-# Profile/startup error messages. Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S is the application name.
-profileProblemTitle=Masalah Profil %S
-profileReadOnly=Anda tidak boleh jalankan %S dari sistem fail baca-sahaja. Sila salin %S ke lokasi lain sebelum cuba gunakannya.
-profileReadOnlyMac=Anda tidak boleh jalankan %S dari sistem fail baca-sahaja. Sila salin %S ke folder Desktop atau Aplikasi anda sebelum cuba gunakannya.
-profileAccessDenied=%S tidak mempunyai keizinan untuk mencapai profil. Sila laras keizinan sistem fail anda dan cuba sekali lagi.
-profileMigrationFailed=Pemindahan profil sedia anda telah gagal.\nTetapan baharu akan digunakan.
-
-# "Downloading update" string for the hamburger menu (see #28885).
-# This string is kept here for ease of translation.
-# LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=Memuat turun %S kemaskini
-
-# .Onion Page Info prompt. Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Sambungan Tersulit (Perkhidmatan Onion, %1$S, %2$S bit kunci, %3$S)
-pageInfo_OnionEncryption=Sambungan Tersulit (Perkhidmatan Onion)
-
-# Onion services strings. Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
-onionServices.clientAuthMissing=Tor onion service missing client authorization
-onionServices.authPrompt.description=%S is requesting your private key.
-onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
-onionServices.authPrompt.done=Selesai
-onionServices.authPrompt.doneAccessKey=d
-onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters)
-onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key
diff --git a/chrome/locale/th/aboutDialog.dtd b/chrome/locale/th/aboutDialog.dtd
deleted file mode 100644
index 769e8174..00000000
--- a/chrome/locale/th/aboutDialog.dtd
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY project.start "&brandShortName; àžàž±àžàžàž²à¹àžàž¢">
-<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
-<!ENTITY project.tpoLink "the &vendorShortName;">
-<!ENTITY project.end "à¹àžà¹àžàžàžàžà¹àžàž£à¹àž¡à¹à¹àžªàž§àžàž«àž²àžàž¥àžàž³à¹àž£àžàžµà¹àžàž³àžàž²àžà¹àžàž·à¹àžàžàžàžà¹àžàžàžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§à¹àž¥àž°àžàžŽàžªàž£àž àž²àžàžàžàžàžàžžàžàžàž²àžàžàžàžà¹àž¥àžà¹">
-
-<!ENTITY help.start "àžàž¢àž²àžàžà¹àž§àž¢à¹àž«àž¥àž·àžàž«àž£àž·àžà¹àž¡à¹">
-<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
-<!ENTITY help.donateLink "àžàž£àžŽàžàž²àž">
-<!ENTITY help.or "àž«àž£àž·àž">
-<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
-<!ENTITY help.getInvolvedLink "à¹àžà¹àž²àž¡àž²àž¡àžµàžªà¹àž§àžàž£à¹àž§àž¡">
-<!ENTITY help.end "!">
-<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
-<!ENTITY bottomLinks.questions "àžàž³àžàž²àž¡?">
-<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
-<!ENTITY bottomLinks.grow "àžà¹àž§àž¢à¹àž«à¹à¹àžàž£àž·àžàžà¹àž²àž¢àžàžàž£à¹à¹àžàžŽàžà¹àž!">
-<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
-<!ENTITY bottomLinks.license "àžà¹àžàž¡àž¹àž¥àž¥àžŽàžàžªàžŽàžàžàžŽà¹">
-<!ENTITY tor.TrademarkStatement "'Tor 'à¹àž¥àž°' Onion Logo 'à¹àžà¹àžà¹àžàž£àž·à¹àžàžàž«àž¡àž²àž¢àžàž²àž£àžà¹àž²àžàžàžàž°à¹àžàžµàž¢àžàžàžàžà¹àžàž£àžàžàž²àž£ Tor Project, Inc.">
diff --git a/chrome/locale/th/aboutTBUpdate.dtd b/chrome/locale/th/aboutTBUpdate.dtd
deleted file mode 100644
index c0d1746b..00000000
--- a/chrome/locale/th/aboutTBUpdate.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY aboutTBUpdate.changelogTitle "àžàž±àžàžàž¶àžàžàž²àž£à¹àžàž¥àžµà¹àž¢àžà¹àžàž¥àžàžàžàž Tor Browser">
-<!ENTITY aboutTBUpdate.updated "Tor Browser àžàž¹àžàžàž±àžà¹àžàžà¹àž¥à¹àž§">
-<!ENTITY aboutTBUpdate.linkPrefix "àžªàž³àž«àž£àž±àžàžà¹àžàž¡àž¹àž¥àžàžµà¹àžàž±àžà¹àžàžàžàžµà¹àžªàžžàžàžàžàžàžàž²àž£à¹àžàž¢à¹àžàž£à¹àžàž£àž±à¹àžàžàžµà¹">
-<!ENTITY aboutTBUpdate.linkLabel "àžàž¹à¹àž§à¹àžà¹àžàžà¹àžàžàžà¹àž£àž²">
-<!ENTITY aboutTBUpdate.linkSuffix ".">
-<!ENTITY aboutTBUpdate.version "àž£àžžà¹àž">
-<!ENTITY aboutTBUpdate.releaseDate "àž§àž±àžàžàžµà¹à¹àžàž¢à¹àžàž£à¹">
-<!ENTITY aboutTBUpdate.releaseNotes "àž«àž¡àž²àž¢à¹àž«àžàžžàžàž²àž£à¹àžàž¢à¹àžàž£à¹">
diff --git a/chrome/locale/th/aboutTor.dtd b/chrome/locale/th/aboutTor.dtd
index 071ec960..9f14022b 100644
--- a/chrome/locale/th/aboutTor.dtd
+++ b/chrome/locale/th/aboutTor.dtd
@@ -1,32 +1,47 @@
<!--
- - Copyright (c) 2019, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
-<!ENTITY aboutTor.title "à¹àžàžµà¹àž¢àž§àžàž±àž Tor">
+<!ENTITY aboutTor.title "About Tor">
-<!ENTITY aboutTor.viewChangelog.label "àžàž¹àžàž±àžàžàž¶àžàžàž²àž£à¹àžàž¥àžµà¹àž¢àžà¹àžàž¥àž">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
-<!ENTITY aboutTor.ready.label "àžà¹àžàž«àž²àžàž¢à¹àž²àžàžàž¥àžàžàž àž±àž¢">
-<!ENTITY aboutTor.ready2.label "àžàžžàžàžàž£à¹àžàž¡à¹àž¥à¹àž§àžªàž³àž«àž£àž±àžàžàž£àž°àžªàžàžàž²àž£àžà¹àžàž²àž£àžà¹àžàžàžàžŽàžà¹àžàžàž£à¹à¹àžà¹àžàžàžµà¹àžàž¥àžàžàž àž±àž¢">
-<!ENTITY aboutTor.failure.label "à¹àž¢à¹à¹àž¥à¹àž§ àž¡àžµàžàž°à¹àž£àžàž²àžàžàž¢à¹àž²àžàžàžŽàžàžàž¥àž²àž">
-<!ENTITY aboutTor.failure2.label "Tor àžàž³àžàž²àžàžàž±àžà¹àžàž£àž²àž§à¹à¹àžàžàž£à¹àžàžµà¹à¹àž¡à¹à¹àžà¹">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
-<!ENTITY aboutTor.search.label "àžà¹àžàž«àž²à¹àžàž¢ DuckDuckGo">
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org">
+<!ENTITY aboutTor.failure3suffix.label ".">
-<!ENTITY aboutTor.torbrowser_user_manual_questions.label "àž¡àžµàžàž³àžàž²àž¡à¹àž«àž¡">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "àžàž¹àžàž¹à¹àž¡àž·àžàžàž¹à¹à¹àžà¹àžàž²àž Tor Browser">
-<!-- The next two entities are used within the browser's Help menu. -->
-<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "àžàž¹à¹àž¡àž·àžàžàž¹à¹à¹àžà¹àžàž²àž Tor Browser">
+<!ENTITY aboutTor.search.label "Search">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.tor_mission.label "à¹àžàž£à¹àžàž Tor à¹àžà¹àžàžàžàžàžàžàžà¹àžàž£à¹àž¡à¹à¹àžªàž§àžàž«àž²àžàž¥àžàž³à¹àž£àžàžµà¹àžàž³àžàž²àžà¹àžàž·à¹àžàžªà¹àžà¹àžªàž£àžŽàž¡àžªàžŽàžàžàžŽàž¡àžàžžàž©àž¢àžàžà¹àž¥àž°à¹àžªàž£àžµàž àž²àž à¹àžàž¢àžàž²àž£àžªàž£à¹àž²àžà¹àž¥àž°àžàž£àžŽàžàž²àž£à¹àžàžà¹àžà¹àž¥àž¢àžµàžàžµà¹àžàž£àžµ à¹àžà¹àžàžàž§àž²àž¡à¹àžà¹àžàžàžŽàž£àžàž²àž¡à¹àž¥àž°à¹àžà¹àžàžàžàžàž£à¹àžª à¹àž¥àž°àžªà¹àžà¹àžªàž£àžŽàž¡àžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§ à¹àžàž·à¹àžàžªàžàž±àžàžªàžàžžàžàžàž²àž£à¹àžà¹àžàž²àžàžàžµà¹à¹àž¡à¹àžà¹àžàžàžàž¹àžàžàž³àžàž±àž à¹àž¥àž°àžªàž£à¹àž²àžàžàž§àž²àž¡à¹àžà¹àž²à¹àžà¹àžàžªàž²àžàž²àž£àžàž°à¹àž«à¹àžàž§à¹àž²àžàžàž¶à¹àž">
-<!ENTITY aboutTor.getInvolved.label "àž¡àž²àž£à¹àž§àž¡àžàž±àžà¹àž£àž²">
-<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.th">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
-<!ENTITY aboutTor.newsletter.tagline "àžªà¹àžàžàž£àžàžà¹àž²àž§àžªàž²àž£à¹àžàžµà¹àž¢àž§àžàž±àž Tor à¹àžàž¢àž±àžàžàž¥à¹àžàžàžàžàž«àž¡àž²àž¢àžàžàžàžàžžàž">
-<!ENTITY aboutTor.newsletter.link_text "àžªàž¡àž±àžàž£àž£àž±àžàžà¹àž²àž§àžªàž²àž£à¹àžàžµà¹àž¢àž§àžàž±àž Tor">
-<!ENTITY aboutTor.donationBanner.line2e "àžàž³à¹àž«à¹ Tor à¹àžà¹àž¡à¹àžà¹àžàžàž¶à¹àž">
-<!ENTITY aboutTor.donationBanner.buttonA "àž£à¹àž§àž¡àžàž£àžŽàžàž²àž">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/chrome/locale/th/brand.dtd b/chrome/locale/th/brand.dtd
index a3ef9518..47d33862 100644
--- a/chrome/locale/th/brand.dtd
+++ b/chrome/locale/th/brand.dtd
@@ -2,14 +2,7 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY brandShorterName "Tor Browser">
<!ENTITY brandShortName "Tor Browser">
<!ENTITY brandFullName "Tor Browser">
-<!ENTITY vendorShortName "à¹àžàž£àžàžàž²àž£ Tor">
-<!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 "àžàž¥àžŽàžà¹àžàž·à¹àžà¹àž«àž¥àžàžàž¥àž±à¹àžàžàžŽàžàžàžµà¹àžàž¹àžàžàžŽàžàžàž±à¹àžàžàž¢àž¹à¹à¹àžàž£àž°àžàž">
-<!ENTITY plugins.installed.enable "àžàž¥àž±à¹àžàžàžŽàžàžàžµà¹à¹àžàžŽàžà¹àžà¹">
-<!ENTITY plugins.installed.disable "àžàž¥àž±à¹àžàžàžŽàžàžàžµà¹àžàžŽàžà¹àžà¹">
-<!ENTITY plugins.installed.disable.tip "àžàž¥àžŽàžà¹àžàž·à¹àžàžàž±àžà¹àž¡à¹à¹àž«à¹à¹àž«àž¥àžàžàž¥àž±à¹àžàžàžŽàžàžàžàžàž£àž°àžàž">
+<!ENTITY vendorShortName "Tor Project">
+<!ENTITY trademarkInfo.part1 "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/chrome/locale/th/brand.properties b/chrome/locale/th/brand.properties
index ef2be578..f63def38 100644
--- a/chrome/locale/th/brand.properties
+++ b/chrome/locale/th/brand.properties
@@ -2,15 +2,14 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-brandShorterName=Tor Browser
brandShortName=Tor Browser
brandFullName=Tor Browser
-vendorShortName=à¹àžàž£àžàžàž²àž£ Tor
+vendorShortName=Tor Project
-homePageSingleStartMain=Firefox Start àž«àžà¹àž²à¹àž«àž¢à¹àž²àžàžµà¹à¹àž«àž¥àžàžàž¢à¹àž²àžàž£àž§àžà¹àž£à¹àž§à¹àž¥àž°àž¡àžµàžà¹àžàžàžà¹àžàž«àž²à¹àžàžàž±àž§
-homePageImport=àžàž³à¹àžà¹àž²àž«àžà¹àž²à¹àž«àž¢à¹àž²àžàžàžàžàžžàžàžàž²àž %S
+homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+homePageImport=Import your home page from %S
-homePageMigrationPageTitle=à¹àž¥àž·àžàžàž«àžà¹àž²à¹àž«àž¢à¹àž²
-homePageMigrationDescription=àžàž£àžžàžàž²à¹àž¥àž·àžàžàž«àžà¹àž²à¹àž«àž¢à¹àž²àžàžµà¹àžàžžàžàžà¹àžàžàžàž²àž£à¹àžà¹:
+homePageMigrationPageTitle=Home Page Selection
+homePageMigrationDescription=Please select the home page you wish to use:
-syncBrandShortName=à¹àžàž·à¹àžàž¡àžà¹àžàž¡àž¹àž¥
+syncBrandShortName=Sync
diff --git a/chrome/locale/th/browserOnboarding.properties b/chrome/locale/th/browserOnboarding.properties
deleted file mode 100644
index 60df93d6..00000000
--- a/chrome/locale/th/browserOnboarding.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2019, The Tor Project, Inc.
-# See LICENSE for licensing information.
-# vim: set sw=2 sts=2 ts=8 et:
-
-onboarding.tour-tor-welcome=àž¢àžŽàžàžàžµàžà¹àžàžàž£àž±àž
-onboarding.tour-tor-welcome.title=àžàžžàžàžàž£à¹àžàž¡à¹àž¥à¹àž§
-onboarding.tour-tor-welcome.description=Tor Browser à¹àž«à¹àžàž£àžŽàžàž²àž£àž¡àž²àžàž£àžàž²àžàžªàž¹àžàžªàžžàžà¹àž£àž·à¹àžàžàžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§à¹àž¥àž°àžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢àžàžàž°à¹àžà¹àž²àžàž¡à¹àž§à¹àžà¹àžàžà¹ àžàžàž°àžàžµà¹àžàžžàžà¹àžà¹àž£àž±àžàžàž²àž£àžàžžà¹àž¡àžàž£àžàžàžàž²àžàžàž²àž£àžàžŽàžàžàž²àž¡ àžàž²àž£àžàž£àž§àžàžàž£àž² à¹àž¥àž°àžàž²àž£àžàžŽàžàžàž±à¹àžàžàžŽàžà¹àžàžàž£à¹à¹àžà¹àž àžàžžàžà¹àžàž£àžµàž¢àž¡àžàž§àž²àž¡àžàž£à¹àžàž¡àžàž°àžàžàžàžàžžàžàž§à¹àž² Tor Browseràžàž³àžàž²àžàžàž¢à¹àž²àžà¹àž£
-onboarding.tour-tor-welcome.next-button=à¹àžàžàžµà¹àžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§
-
-onboarding.tour-tor-privacy=àžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§
-onboarding.tour-tor-privacy.title=Snub trackers à¹àž¥àž° snoopers
-onboarding.tour-tor-privacy.description=Tor Browser à¹àž¢àžàžàžžà¹àžàžàžµà¹à¹àž¥àž°àž¥àžàžàž£àž°àž§àž±àžàžŽàžàž²àž£à¹àžà¹à¹àžàž£àž²àž§à¹à¹àžàžàž£à¹àž«àž¥àž±àžàžàžà¹àžàžªàžàž±à¹àž àžàž²àž£à¹àžà¹à¹àžàžàž°àžàž³à¹àž«à¹à¹àžà¹à¹àžàž§à¹àž²àžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§à¹àž¥àž°àžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢àžàžàžàžàžžàžà¹àžà¹àž£àž±àžàžàž²àž£àžàžžà¹àž¡àžàž£àžàžà¹àžà¹àžàž£àž²àž§à¹à¹àžàžàž£à¹ àžàž¥àžŽàž 'Tor Network' à¹àžàž·à¹àžà¹àž£àžµàž¢àžàž£àž¹à¹àž§à¹àž²à¹àž£àž²àžàžžà¹àž¡àžàž£àžàžàžàžžàžà¹àžàž£àž°àžàž±àžàžªàž¹àžàžàž§à¹àž²àžàžµà¹àžàž¢à¹àž²àžà¹àž£
-onboarding.tour-tor-privacy.button=à¹àžàžàžµà¹à¹àžàž£àž·àžàžà¹àž²àž¢ Tor
-
-onboarding.tour-tor-network=à¹àžàž£àž·àžàžà¹àž²àž¢ Tor
-onboarding.tour-tor-network.title=àžàž³àžàž²àžà¹àžàž·à¹àžàžàž£àž°àžàž²àž¢à¹àžàž£àž·àžàžà¹àž²àž¢
-onboarding.tour-tor-network.description=Tor Browser à¹àžàž·à¹àžàž¡àžà¹àžàžàžžàžà¹àžà¹àž²àžàž±àžà¹àžàž£àž·àžàžà¹àž²àž¢ Tor àžàžµà¹àžàž³àžàž²àžà¹àžàž¢àžàž²àžªàž²àžªàž¡àž±àžàž£àžàž§à¹àž²àžàž±àžàžàžàžàž±à¹àž§à¹àž¥àž Tor Browser àžà¹àž²àžàžàž²àž VPN à¹àžàž£àž²àž°à¹àž¡à¹àž¡àžµà¹àžàž£àžªàž²àž¡àž²àž£àžàž£àž°àžàžžàžàž§àž²àž¡àžàžŽàžàžàž¥àž²àžàž«àž£àž·àžàž«àžà¹àž§àž¢àžàž²àžàžàž¥àž²àžà¹àžà¹ àžàžžàžàžà¹àžàžà¹àž§à¹àž§àž²àžà¹àžà¹àžàž·à¹àžàžàž§àž²àž¡à¹àžàž¥àžŽàžà¹àžàž¥àžŽàžà¹àžàžàž²àž£à¹àžà¹àžàžŽàžà¹àžàžàž£à¹à¹àžà¹àžàžàž¢à¹àž²àžà¹àžà¹àžàžªà¹àž§àžàžàž±àž§
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences.
-onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
-onboarding.tour-tor-network.button=à¹àžàžàžµà¹àž§àžàžàž£àž«àžà¹àž²àžàž
-
-onboarding.tour-tor-circuit-display=àž§àžàžàž£àž«àžà¹àž²àžàž
-onboarding.tour-tor-circuit-display.title=àžàž¹àžàž²àžàžàžàžàžàžžàž
-onboarding.tour-tor-circuit-display.description=àžªàž³àž«àž£àž±àžàžàžžàžà¹à¹àžà¹àž¡àžàžàžµà¹àžàžžàžà¹àž¢àžµà¹àž¢àž¡àžàž¡ àžàž£àžŽàž¡àž²àžàžàž²àž£à¹àžà¹àžàž²àžàžàžàžàžàžžàžàžàž¹àžàž£àžµà¹àž¥àž¢à¹à¹àžà¹àž²àž£àž«àž±àžªàž¥àž±àžà¹àžàž§àžàžàž£àž£àž°àž«àž§à¹àž²àžTor àž£àžµà¹àž¥àž¢à¹3à¹àž«à¹àžàžàž±à¹àž§à¹àž¥àž à¹àž¡à¹àž¡àžµà¹àž§à¹àžà¹àžàžà¹à¹àžà¹àžàžµà¹àžªàž²àž¡àž²àž£àžàž£àž¹à¹à¹àžà¹àž§à¹àž²àžàžžàžà¹àžàž·à¹àžàž¡àžà¹àžàžàž²àžàžàžµà¹à¹àž«àž àžàžžàžàžªàž²àž¡àž²àž£àžàžªà¹àžàžàž³àž£à¹àžàžàžªàž£à¹àž²àžàž§àžàžàž£à¹àž«àž¡à¹à¹àžà¹à¹àžàžàž¥àžŽàž àž§àžàžàž£ Tor à¹àž«àž¡à¹àžªàž³àž«àž£àž±àžà¹àžàžà¹àžàžµà¹à¹àžàž§àžàžàž£àž«àžà¹àž²àžàž
-onboarding.tour-tor-circuit-display.button=àžàž¹àžàž²àžàžàžàžàžàž±àž
-onboarding.tour-tor-circuit-display.next-button=à¹àžàžàžµà¹àžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢
-
-onboarding.tour-tor-security=àžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢
-onboarding.tour-tor-security.title=à¹àž¥àž·àžàžàžàž£àž°àžªàžàžàž²àž£àžà¹àžàžàžàžàžžàž
-onboarding.tour-tor-security.description=à¹àž£àž²à¹àž«à¹àžàž£àžŽàžàž²àž£àžàž²àž£àžàž±à¹àžàžà¹àž²à¹àžàžŽà¹àž¡à¹àžàžŽàž¡àžªàž³àž«àž£àž±àžàžàžžàž à¹àžàžàž²àž£à¹àžàžŽà¹àž¡àžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢à¹àž«à¹à¹àžàž£àž²àž§à¹à¹àžàžàž£à¹àžàžàžàžàžžàž àžàž²àž£àžàž±à¹àžàžà¹àž²àžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢àžàž°àžàž³à¹àž«à¹àžàžžàžàžªàž²àž¡àž²àž£àžàžàžŽàžàžàž±à¹àžàžàžàžà¹àžàž£àž°àžàžàžàžàžµà¹àžàž²àžà¹àžàž¡àžàžµàžàžàž¡àžàžŽàž§à¹àžàžàž£à¹àžàžàžàžàžžàžà¹àžà¹ àžàž¥àžŽàžàžà¹àž²àžàž¥à¹àž²àžà¹àžàž·à¹àžàžàž¹àž§à¹àž²àžàž±àž§à¹àž¥àž·àžàžàžà¹àž²àžà¹àžàž³àžàž°à¹àž£à¹àžà¹àžà¹àž²àž
-onboarding.tour-tor-security.description-suffix=àž«àž¡àž²àž¢à¹àž«àžàžž à¹àžàž¢àžàž²àž£àžàž±à¹àžàžà¹àž²à¹àž£àžŽà¹àž¡àžà¹àžà¹àž¥à¹àž§ NoScript à¹àž¥àž° HTTPS à¹àžàžàžžàžàžàžµà¹à¹àž¡à¹à¹àžà¹àžàž¹àžàž£àž§àž¡à¹àžà¹àž²à¹àžà¹àžàžà¹àžàž£àž·à¹àžàžàž¡àž·àž à¹àžà¹àžàžžàžàžªàž²àž¡àž²àž£àžàžàž³àž«àžàžà¹àžàžà¹àžàž·à¹àžà¹àžàžŽà¹àž¡à¹àžà¹àžàžà¹àžàž£àž·à¹àžàžàž¡àž·àžà¹àžà¹
-onboarding.tour-tor-security-level.button=àžàž¹àž£àž°àžàž±àžàžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢
-onboarding.tour-tor-security-level.next-button=à¹àžàž¢àž±àžà¹àžàž¥à¹àžàž¥àž±àžàžàž£àž°àžªàžàžàž²àž£àžà¹
-
-onboarding.tour-tor-expect-differences=à¹àžàž¥à¹àžàž¥àž±àžàžàž£àž°àžªàžàžàž²àž£àžà¹
-onboarding.tour-tor-expect-differences.title=àžàž²àžàž«àž§àž±àžàžàž²àžàžàž¢à¹àž²àžàžàžµà¹à¹àžàžàžà¹àž²àž
-onboarding.tour-tor-expect-differences.description=àžàžµà¹àžàžàž£à¹àžà¹àž²àžàžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢à¹àž¥àž°àžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§àžà¹àž²àžà¹àžàžµà¹à¹àž«à¹àžàž£àžŽàžàž²àž£à¹àžàž¢ Tor àžàž£àž°àžªàžàžàž²àž£àžà¹àžàžàžàžàžžàžàžàžàž°à¹àž£àžµàž¢àžàžàž¹àžàžŽàžà¹àžàžàž£à¹à¹àžà¹àžàžàž²àžà¹àžàžàžà¹àž²àžàžàžàžà¹àžàžà¹àž²àž àžàž²àžàžà¹àž²àž¥àž àžàž¶à¹àžàžàž¢àž¹à¹àžàž±àžàž£àž°àžàž±àžàžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢ àžàžàžà¹àžàž£àž°àžàžàžàžàž²àžàžàž¢à¹àž²àžàžàž²àžà¹àž¡à¹à¹àž«àž¥àžàž«àž£àž·àžà¹àž¡à¹àžàž³àžàž²àž àžàž²àžàž¡àžµàžàž³àžàž²àž¡à¹àžàž·à¹àžàžàžŽàžªàž¹àžàžà¹àž§à¹àž²àžàžžàžàžàž·àžàž¡àžàžžàž©àž¢à¹à¹àž¥àž°à¹àž¡à¹à¹àžà¹àž«àžžà¹àžàž¢àžàžà¹
-onboarding.tour-tor-expect-differences.button=àžàž¹àžàž³àžàž²àž¡àžàžµà¹àžàžàžà¹àžàž¢
-onboarding.tour-tor-expect-differences.next-button=à¹àžàž¢àž±àž àžàž£àžŽàžàž²àž£Onion
-
-onboarding.tour-tor-onion-services=àžàž£àžŽàžàž²àž£ Onion
-onboarding.tour-tor-onion-services.title=àžàž²àž£àžà¹àžàžàžàž±àžàžàžµà¹àžàžŽà¹àžšàž©
-onboarding.tour-tor-onion-services.description=àžàž£àžŽàžàž²àž£ Onion àžàž·àžà¹àžàžà¹àžàžµà¹àž¥àžàžà¹àž²àž¢àžà¹àž§àž¢.onion àžàžµà¹à¹àž«à¹àžàž£àžŽàžàž²àž£àžàž²àž£àžàžžà¹àž¡àžàž£àžàžàžàžŽà¹àžšàž©à¹àž«à¹àžàž±àžàžàž¹à¹à¹àžàž¢à¹àžàž£à¹àž«àž£àž·àžàžàž¹à¹à¹àžà¹àž²àžàž¡ àž£àž§àž¡à¹àžàžàž¶àžà¹àžàžŽà¹àž¡àžàž§àž²àž¡àžàžžà¹àž¡àžàž£àžàžàžàž²àžàžàž²àž£àžàžŽàžàžàž±à¹àžàžàžŽàžà¹àžàžàž£à¹à¹àžà¹àž àžàž£àžŽàžàž²àž£ Onion àžàžàžžàžàž²àžàžŽàžàžžàžàžàžàžªàž²àž¡àž²àž£àžàžàž±àžàž«àž²à¹àžàž·à¹àžàž«àž²à¹àž¥àž°àžàž£àžŽàžàž²àž£àžàž¢à¹àž²àžàžàžŽàž£àžàž²àž¡ àžàž¥àžŽàžàžà¹àž²àžàž¥à¹àž²àžà¹àžàž·à¹àžàžàž¡DuckDuckGo à¹àžàžà¹ onion
-onboarding.tour-tor-onion-services.button=à¹àž¢àžµàž¢àž¡àžàž¡ Onion
-onboarding.tour-tor-onion-services.next-button=à¹àžªàž£à¹àžàžªàžŽà¹àž
-
-onboarding.overlay-icon-tooltip-updated2=àžàž¹àž§à¹àž²àž¡àžµàžàž°à¹àž£à¹àž«àž¡à¹\nà¹àž %S
-onboarding.tour-tor-update.prefix-new=àžªàž£à¹àž²àžà¹àž«àž¡à¹
-onboarding.tour-tor-update.prefix-updated=àžàž±àžà¹àžàž
-
-onboarding.tour-tor-toolbar=à¹àžàžà¹àžàž£àž·à¹àžàžàž¡àž·àž
-onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [â¡] menu.
-onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
-onboarding.tour-tor-toolbar-update-9.0.next-button=à¹àžàžàžµà¹à¹àžàž£àž·àžàžà¹àž²àž¢ Tor
-
-# Circuit Display onboarding.
-onboarding.tor-circuit-display.next=àžà¹àžà¹àž
-onboarding.tor-circuit-display.done=à¹àžªàž£à¹àžàžªàžŽà¹àž
-onboarding.tor-circuit-display.one-of-three=1 à¹àž 3
-onboarding.tor-circuit-display.two-of-three=2 à¹àž 3
-onboarding.tor-circuit-display.three-of-three=3 à¹àž 3
-
-onboarding.tor-circuit-display.intro.title=àž§àžàžàž£àžàž³àžàž²àžàžàž¢à¹àž²àžà¹àž£
-onboarding.tor-circuit-display.intro.msg=àž§àžàžàž£àžàž£àž°àžàžàžàžà¹àž§àž¢àž£àžµà¹àž¥àž¢à¹à¹àžàžàžªàžžà¹àž¡àžàž¶à¹àžàžàžàž¡àžàžŽàž§à¹àžàžàž£à¹àžàž±à¹àž§à¹àž¥àžàžàž³àž«àžàžàžà¹àž²à¹àž§à¹à¹àžàž·à¹àžàžªà¹àžàžà¹àžàžàž²àž£àž£àž±àžàžªà¹àžàžà¹àžàž¡àž¹àž¥ Tor àž§àžàžàž£àžà¹àž§àž¢à¹àž«à¹àžàžžàžàžªàž²àž¡àž²àž£àžà¹àž£àžµàž¢àžàžàž¹à¹àžàžà¹àž¥àž°à¹àžàž·à¹àžàž¡àžà¹àžàžàž±àžàžàž£àžŽàžàž²àž£ Onion à¹àžà¹àžàž¢à¹àž²àžàžªà¹àž§àžàžàž±àž§
-
-onboarding.tor-circuit-display.diagram.title=àž§àžàžàž£àž«àžà¹àž²àžàž
-onboarding.tor-circuit-display.diagram.msg=à¹àžàžàž àž²àžàžàžµà¹à¹àžªàžàžàž£àžµà¹àž¥àž¢à¹àžàžµà¹àžàž£àž°àžàžàžà¹àžà¹àžàž§àžàžàž£àžªàž³àž«àž£àž±àžà¹àž§à¹àžà¹àžàžà¹àžàžµà¹ à¹àžàž·à¹àžàžà¹àžàžàžàž±àžàžàž²àž£à¹àžàž·à¹àžàž¡à¹àž¢àžàžàžŽàžàžàž£àž£àž¡àžà¹àž²àž¡à¹àžàžà¹àžà¹àž²àž ๠à¹àžà¹àž¥àž°à¹àž§à¹àžà¹àžàžà¹àžàž°àž¡àžµàž§àžàžàž£àžàžµà¹à¹àžàžàžà¹àž²àžàžàž±àž
-
-onboarding.tor-circuit-display.new-circuit.title=àžàžžàžàžà¹àžàžàžàž²àž£àž§àžàžàž£à¹àž«àž¡à¹àž«àž£àž·àžà¹àž¡à¹
-onboarding.tor-circuit-display.new-circuit.msg=àž«àž²àžàžàžžàžà¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àžàž·à¹àžàž¡àžà¹àžàžàž±àžà¹àž§à¹àžà¹àžàžà¹àžàžµà¹àžàžžàžàžàž¢àž²àž¢àž²àž¡à¹àžà¹àž²àžàž¡àž«àž£àž·àžàž¡àžµàžàž±àžàž«àž²à¹àžàžàž²àž£à¹àž«àž¥àž àžàžžàžàžªàž²àž¡àž²àž£àžà¹àžà¹àžàžžà¹àž¡àžàžµà¹à¹àžàž·à¹àžà¹àž«àž¥àžà¹àžàžà¹à¹àž«àž¡à¹àžà¹àž§àž¢àž§àžàžàž£à¹àž«àž¡à¹
diff --git a/chrome/locale/th/torbutton.dtd b/chrome/locale/th/torbutton.dtd
index 1e16c404..e0da4be2 100644
--- a/chrome/locale/th/torbutton.dtd
+++ b/chrome/locale/th/torbutton.dtd
@@ -1,52 +1,19 @@
<!ENTITY torbutton.context_menu.new_identity "àžªàž£à¹àž²àžàžàž±àž§àžàžà¹àž«àž¡à¹">
<!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.key "N">
-<!ENTITY torbutton.context_menu.downloadUpdate "àžàž£àž§àžàžªàžàžàžªàžàž²àžàž°àžàž²àž£àžàž£àž±àžàž£àžžà¹àž Tor Browser">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "àžàž²àž£àžà¹àžàžàžàž±àžàžàžžàžàžàžµà¹">
+<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "àžàž¥àžŽàžà¹àžàž·à¹àžà¹àž£àžŽà¹àž¡à¹àžà¹ Torbutton">
-<!ENTITY torbutton.prefs.security_settings "àžàž±à¹àžàžà¹àž²àžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢ Tor Browser">
-<!ENTITY torbutton.cookiedialog.title "àžàž±àžàžàž²àž£àžà¹àžàžàžàž±àž Cookie">
-<!ENTITY torbutton.cookiedialog.lockCol "àžàž¹àžàžà¹àžàžàžàž±àžàžàž¢àž¹à¹">
-<!ENTITY torbutton.cookiedialog.domainCol "à¹àž®àžªàžà¹">
-<!ENTITY torbutton.cookiedialog.nameCol "àžàž·à¹àž">
-<!ENTITY torbutton.cookiedialog.pathCol "à¹àžªà¹àžàžàž²àž">
-<!ENTITY torbutton.cookiedialog.protectCookie "àžàž²àž£àžà¹àžàžàžàž±àžàžàžžàžàžàžµà¹">
-<!ENTITY torbutton.cookiedialog.removeCookie "àžàž³àžàžžàžàžàžµà¹àžàžàž">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "àžàžžàžàžàžµà¹àžàžµà¹à¹àž¡à¹àžàž¹àžàžà¹àžàžàžàž±àž">
-<!ENTITY torbutton.cookiedialog.removeAllBut "àž¥àžàžàž±à¹àžàž«àž¡àžà¹àžà¹àžà¹àžàžàžàž±àžà¹àžàž²à¹àž§à¹">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "àžà¹àžàžàžàž±àžàžàžžàžàžàžµà¹à¹àž«àž¡à¹">
-<!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_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_js_on_https_sites_only "JavaScript àžàž¹àžàžàžŽàžàžàžà¹àžàžà¹àžàžµà¹à¹àž¡à¹à¹àžà¹ HTTPS">
-<!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 "àžàž¥àžŽàžà¹àžàž·à¹àžà¹àž¥à¹àžà¹àžªàžµàž¢àžà¹àž¥àž°àž§àžŽàžàžµà¹àž (HTML 5 àž¡àžµà¹àžàžµàž¢) à¹àž¥àž° WebGL ">
-<!ENTITY torbutton.prefs.sec_custom_warning "àžàž³àž«àžàžà¹àžàž">
-<!ENTITY torbutton.prefs.sec_overview "àžàžŽàžà¹àžà¹àžàž²àžàžàžžàžàž¥àž±àžàž©àžàž°àžàž²àžàžàž¢à¹àž²àžàžàžàž à¹àž§à¹àž àžàžµà¹àžªàž²àž¡àž²àž£àžà¹àžà¹à¹àžàž·à¹àž àžàž²àž£à¹àžàž¡àžàžµ àžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢ à¹àž¥àž° àžàž§àž²àž¡à¹àžà¹àžàžàžŽàž£àžàž²àž¡">
-<!ENTITY torbutton.prefs.sec_standard_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.circuit_display.title "àžàž²àž£à¹àžàž·à¹àžàžà¹àž¢àž Tor ">
-<!ENTITY torbutton.circuit_display.new_circuit "à¹àž«àž¥à¹àžà¹àžàž·à¹àžàž¡à¹àž¢àžàžà¹àžàž¡àž¹àž¥à¹àž«àž¡à¹àžªàž³àž«àž£àž±àžà¹àž§à¹àžà¹àžàžà¹àžàžµà¹">
-
-<!-- Onion services strings. Strings are kept here for ease of translation. -->
-<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt">
+<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
diff --git a/chrome/locale/th/torbutton.properties b/chrome/locale/th/torbutton.properties
index 44d26298..cea42065 100644
--- a/chrome/locale/th/torbutton.properties
+++ b/chrome/locale/th/torbutton.properties
@@ -1,70 +1,27 @@
-torbutton.circuit_display.internet = àžàžŽàžà¹àžàžàž£à¹à¹àžà¹àž
-torbutton.circuit_display.ip_unknown = àž«àž¡àž²àž¢à¹àž¥àž IP àžàžµà¹à¹àž¡à¹àž£àž¹à¹àžàž±àž
-torbutton.circuit_display.onion_site = à¹àžàžà¹ Onion
-torbutton.circuit_display.this_browser = à¹àžàž£àž²àž§à¹à¹àžàžàž£à¹àžàžµà¹
-torbutton.circuit_display.relay = àž£àžµà¹àž¥àž¢à¹
-torbutton.circuit_display.tor_bridge = àžªàž°àžàž²àž
-torbutton.circuit_display.unknown_country = à¹àž¡à¹àžàž£àž²àžàžàž£àž°à¹àžàžš
-torbutton.circuit_display.guard = àžàž²àž£à¹àž
-torbutton.circuit_display.guard_note = [àžàž²àž£à¹àž] à¹àž«àžàžàžàžàžàžàžžàžàžàž²àžà¹àž¡à¹à¹àžàž¥àžµà¹àž¢àžà¹àžàž¥àž
-torbutton.circuit_display.learn_more = à¹àž£àžµàž¢àžàž£àž¹à¹à¹àžàžŽà¹àž¡à¹àžàžŽàž¡
-torbutton.content_sizer.margin_tooltip = Tor Browser à¹àžàžŽà¹àž¡àž£àž°àž¢àž°àžàžàžàžàžµà¹à¹àžàž·à¹àžàžàž³à¹àž«à¹àžàž§àž²àž¡àžàž§à¹àž²àžà¹àž¥àž°àžàž§àž²àž¡àžªàž¹àžàžàžàžàž«àžà¹àž²àžà¹àž²àžàžàžžàžà¹àžàžà¹àžà¹àžàžà¹àžàž¢àž¥àž à¹àž¥àž°àž¥àžàžàž§àž²àž¡àžªàž²àž¡àž²àž£àžàžàžàžàžàžžàžàžàž¥àžàž·à¹àžà¹àžàžàž²àž£àžàžŽàžàžàž²àž¡àžàžžàžàžàž²àžàžàžàžà¹àž¥àžà¹
-torbutton.panel.tooltip.disabled = àžàž¥àžŽàžà¹àžàž·à¹àžà¹àžàžŽàžà¹àžà¹ Tor
-torbutton.panel.tooltip.enabled = àžàž¥àžŽàžà¹àžàž·à¹àžàžàžŽàž Tor
-torbutton.panel.label.disabled = àžàžŽàžà¹àžà¹ Tor àžàž¢àž¹à¹
-torbutton.panel.label.enabled = à¹àžàžŽàžà¹àžà¹ Tor àžàž¢àž¹à¹
-extensions.torbutton(a)torproject.org.description = Torbutton àž¡àžµàžàžžà¹àž¡à¹àž«à¹àžàž£àž±àžà¹àžà¹àžàžàž²àž£àžàž±à¹àžàžà¹àž² Tor à¹àž¥àž°àž¥à¹àž²àžàžà¹àžàž¡àž¹àž¥àžàž²àž£àžàž¹à¹àž§à¹àžàžªà¹àž§àžàžàžžàžàžàž¥àžàž¢à¹àž²àžàž£àž§àžà¹àž£à¹àž§à¹àž¥àž°àžà¹àž²àž¢àžàž²àž¢
-torbutton.popup.external.title = àžàž²àž§àžà¹à¹àž«àž¥àžà¹àžàž¥à¹àž àž²àž¢àžàžàž
-torbutton.popup.external.app = Tor Browser à¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àžªàžàžà¹àžàž¥à¹àžàžµà¹ àžàžžàžàžà¹àžàžà¹àžàžŽàžàž¡àž±àžà¹àžà¹àžàž£à¹àžàž£àž¡àžàž·à¹àž\n\n
-torbutton.popup.external.note = à¹àžàž¥à¹àžàž²àžàžàžàžŽàžàžàž²àžàžàž³à¹àž«à¹à¹àžàž£à¹àžàž£àž¡à¹àžàž·à¹àžàž¡àžà¹àžàžàž±àžàžàžŽàžà¹àžàžàž£à¹à¹àžà¹àžà¹àžàž¢à¹àž¡à¹àžà¹àž²àž Tor\n\n
-torbutton.popup.external.suggest = à¹àžàž·à¹àžàžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢ àžàžžàžàžàž§àž£à¹àžàžŽàžà¹àžàž¥à¹àžàžàž°àžàžàžà¹àž¥àžà¹àž«àž£àž·àžà¹àžà¹ Tor Live CD à¹àžà¹àž Tails\n
-torbutton.popup.launch = àžàž²àž§àžà¹à¹àž«àž¥àžà¹àžàž¥à¹
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
torbutton.popup.cancel = àž¢àžà¹àž¥àžŽàž
-torbutton.popup.dontask = àžàž²àž§àžà¹à¹àž«àž¥àžà¹àžà¹àž¡à¹àžàž¢àžàž±àžà¹àžàž¡àž±àžàžŽàžàž±à¹àžà¹àžà¹àžàž±àžàžàžµà¹à¹àžà¹àžàžà¹àžà¹àž
-torbutton.popup.no_newnym = Torbutton à¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àž«à¹àžàž±àžàž¥àž±àžàž©àžà¹à¹àž«àž¡à¹àžàž±àžàžàžžàžà¹àžà¹àžàž¢à¹àž²àžàžàž¥àžàžàž àž±àž¢ àž¡àž±àžà¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àžà¹àž²àžàž¶àž Tor Control Port à¹àžà¹\n\nàžàžžàžàžàž³àž¥àž±àžà¹àžàžŽàžà¹àž«à¹ Tor Browser Bundle àžàž³àžàž²àžàžàž¢àž¹à¹àž«àž£àž·àžà¹àž¡à¹?
-torbutton.security_settings.menu.title = àžàž±à¹àžàžà¹àž²àžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢
-torbutton.title.prompt_torbrowser = àžà¹àžàž¡àž¹àž¥ Torbutton àžàžµà¹àžªàž³àžàž±àž
-torbutton.popup.prompt_torbrowser = Torbutton àžàž³àžàž²àžàžà¹àž²àžàžàž±àžà¹àžàžàžàž°àžàžµà¹ àžàžžàžà¹àž¡à¹àžªàž²àž¡àž²àž£àžàžàžŽàžàž¡àž±àžà¹àžà¹àžà¹àžà¹àž\n\nà¹àž£àž²àžàž³àžàž²àž£à¹àžàž¥àžµà¹àž¢àžà¹àžàž¥àžàžàžµà¹à¹àžàž£àž²àž°àž¡àž±àžà¹àž¡à¹àžàž¥àžàžàž àž±àž¢àžàžµà¹àžàž°à¹àžà¹ Torbutton à¹àžà¹àžàž£àž²àž§à¹à¹àžàžàž£à¹àžàžµà¹à¹àž¡à¹à¹àžà¹à¹àžàžŽàžà¹àžà¹ Tor browser à¹àžàžà¹àž§àž¥àž²à¹àžàžµàž¢àž§àžàž±àž àž¡àžµàžàžžàžàžàžàžàž£à¹àžàžàž«àž¥àž²àž¢àžàžžàžàžàžµà¹à¹àž£àž²à¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àžà¹à¹àžà¹àžà¹à¹àžàž¢àž§àžŽàžàžµàžàž·à¹àž\n\nàžà¹àž²àžàžžàžàžà¹àžàžàžàž²àž£à¹àžà¹ Firefox à¹àžà¹àžàž²àž¡àžàžàžàžŽ àžàžžàžàžà¹àžàžàž¢àžà¹àž¥àžŽàžàžàž²àž£àžàžŽàžàžàž±à¹àž Torbutton à¹àž¥àž°àžàž²àž§àžà¹à¹àž«àž¥àžàžàžžàžàžàž¢àž²àž¢àž£àž§àž¡àžàžàž Tor Browser àžàž¶à¹àžàžàžžàžàžªàž¡àžàž±àžàžŽàžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§àžà
žàž Tor Browser à¹àž«àžàž·àžàžàž§à¹àž²àžàžžàžàžªàž¡àžàž±àžàžŽàžàžàž Firefox àžàžàžàžŽ à¹àž¡à¹ Firefox àžàž¹àžàžàž°à¹àžà¹àžà¹àž§àž¢ Torbutton\n\nàž«àž²àžàžà¹àžàžàžàž²àž£àž¥àž Torbutton à¹àžàžàžµà¹ à¹àžàž£àž·à¹àžàžàž¡àž·àž->Addons->Extensions à¹àž¥àž°àžàž¥àžŽàžàžàžžà¹àž¡àž¥àžàžàžàžàžàžµà¹àžàž¢àž¹à¹àžà¹àž²àž Torbutton.
-torbutton.popup.short_torbrowser = àžà¹àžàž¡àž¹àž¥àžªàž³àžàž±àžàžàž²àž Torbutton\n\nàžàžàžàžàžµà¹ Torbutton àžàž¹àžà¹àžàžŽàžà¹àžà¹àžàž¥àžàžà¹àž§àž¥àž²\n\nàžàž¥àžŽàžàžàžµà¹ Torbutton à¹àžàž·à¹àžàžàž¹àžà¹àžàž¡àž¹àž¥à¹àžàžŽà¹àž¡à¹àžàžŽàž¡
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
-torbutton.popup.confirm_plugins = àžàž¥àž±à¹àžàžàžŽàžàžàž¢à¹àž²àž Flash àžªàž²àž¡àž²àž£àžàžàž³à¹àž«à¹àžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§à¹àž¥àž°àžàž§àž²àž¡à¹àžà¹àžàžàžŽàž£àžàž²àž¡àžàžàžàžàžžàžà¹àžªàžµàž¢à¹àž\n\nàžàž§àžàž¡àž±àžàžªàž²àž¡àž²àž£àžàžàž±àžàžà¹àž²àžàžà¹àž²àž¡ Tor à¹àž à¹àž¥àž°à¹àžàžŽàžà¹àžàž¢àžàž³à¹àž«àžà¹àžàžàžµà¹àžàž±à¹àžà¹àž¥àž°àž«àž¡àž²àž¢à¹àž¥àž IP àžàžàžàžàžžàž\n\nàžàžžàžà¹àžà¹à¹àžà¹àž«àž¡àž§à¹àž²àžà¹àžàžàžàž²àž£àžàž°à¹àžàžŽàžà¹àžà¹àžàž¥àž±à¹àžàžàžŽàž?\n\n
-torbutton.popup.never_ask_again = à¹àž¡à¹àžà¹àžàžàžàž²àž¡àžàž±àžàžàžµàž
-torbutton.popup.confirm_newnym = Tor Browser àžàž°àžàžŽàžàž«àžà¹àž²àžà¹àž²àžà¹àž¥àž°à¹àžà¹àžàžàž±à¹àžàž«àž¡àž à¹àžàžªàžàž±àžàžàžàžà¹àž§à¹àžà¹àžàžà¹àžàž±à¹àžàž«àž¡àžàžàž°àžªàž¹àžàž«àž²àž¢\n\nà¹àž£àžŽà¹àž¡à¹àžà¹àžàž²àž Tor Browser à¹àž«àž¡à¹àžàžàžàžàžµà¹à¹àžàž·à¹àžàž£àžµà¹àžàžàžà¹àžàž¡àž¹àž¥àžàž£àž°àžàž³àžàž±àž§
-
-torbutton.maximize_warning = àžàž²àž£àžàž¢àž²àž¢ Tor Browser àžàžàžžàžàž²àžà¹àž«à¹à¹àž§à¹àžà¹àžàžà¹àžªàž²àž¡àž²àž£àžàž£àž°àžàžžàžàžàž²àžàž«àžà¹àž²àžàžàžàžàžàžàžžàž àžàž¶à¹àžàžàž²àžàžàž¹àžà¹àžà¹à¹àžàžàž²àž£àžàžŽàžàžàž²àž¡àžàžžàž à¹àž£àž²à¹àžàž°àžàž³à¹àž«à¹àžàžžàžà¹àžà¹àž«àžà¹àž²àžà¹àž²àž Tor Browser àžàžàž²àžàžàž²àž¡àžà¹àž²à¹àž£àžŽà¹àž¡àžà¹àž
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=à¹àž§à¹àžà¹àžàžà¹àžàžµà¹ (%S) àžàž¢àž²àž¢àž²àž¡àžªàžàž±àž àžà¹àžàž¡àž¹àž¥àž£àž¹àžàž àž²àžàžàž·à¹àžàžàžµà¹àžàž³àžàž²àž HTML5 àžàž¶à¹àžàžàž²àžàžàž¹àžà¹àžà¹àž£àž°àžàžžàžàžàž¡àžàžŽàž§à¹àžàžàž£à¹àžàžàžàžàžžàžà¹àžàž¢à¹àžàžàž²àž°\n\nàžàž§àž£à¹àž«à¹ Tor Browser àžàžàžžàžàž²àžà¹àž§à¹àžà¹àžàžà¹àžàžµà¹àžªàžàž±àžàžà¹àžàž¡àž¹àž¥àž£àž¹àžàž àž²àžàžàž·à¹àžàžàžµà¹àžàž³àžàž²àž HTML5 àž«àž£àž·àžà¹àž¡à¹
-canvas.notNow=à¹àž¡à¹à¹àžà¹àžàžàžàžàžµà¹
-canvas.notNowAccessKey=N
-canvas.allow=àžàžàžžàžàž²àžà¹àžàžàžàž²àžàž
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
canvas.allowAccessKey=A
-canvas.never=à¹àž¡à¹à¹àž¥àž¢àžªàž³àž«àž£àž±àžà¹àž§à¹àžà¹àžàžà¹àžàžµà¹ (à¹àžàž°àžàž³)
+canvas.never=Never for This Site
canvas.neverAccessKey=e
-
-# Profile/startup error messages. Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S is the application name.
-profileProblemTitle=àžàž±àžàž«àž²à¹àžàž£à¹àžàž¥à¹ %S
-profileReadOnly=àžàžžàžà¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àž£àžµàž¢àžà¹àžà¹ %S àžàž²àžàž£àž°àžàžà¹àžàž¥à¹à¹àžàžàžà¹àž²àžà¹àžà¹àž²àžàž±à¹àž àžàž£àžžàžàž²àžàž±àžàž¥àžàž %S à¹àžàž¢àž±àžàžàžµà¹àžàž±à¹àžàžàž·à¹àžàžà¹àžàžàž¥àžàžà¹àžà¹àž¡àž±àž
-profileReadOnlyMac=àžàžžàžà¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àž£àžµàž¢àžà¹àžà¹ %S àžàž²àžàž£àž°àžàžà¹àžàž¥à¹à¹àžàžàžà¹àž²àžà¹àžà¹àž²àžàž±à¹àž àžàž£àžžàžàž²àžàž±àžàž¥àžàž %S à¹àžàž¢àž±àžà¹àžàžªàžà¹àžà¹àžàžàž«àž£àž·àžà¹àžàžàžàž¥àžŽà¹àžàžàž±àžàžà¹àžàžàž¥àžàžà¹àžà¹àž¡àž±àž
-profileAccessDenied=%S à¹àž¡à¹à¹àžà¹àž£àž±àžàžàžàžžàžàž²àžà¹àž«à¹à¹àžà¹àž²àžàž¶àžà¹àžàž£à¹àžàž¥à¹ àžàž£àžžàžàž²à¹àžà¹à¹àžàžàž²àž£àžàžàžžàžàž²àžàž£àž°àžàžà¹àžàž¥à¹àžàžàžàžàžžàžà¹àž¥àž°àž¥àžàžà¹àž«àž¡à¹àžàžµàžàžàž£àž±à¹àž
-profileMigrationFailed=àžàž²àž£àž¢à¹àž²àž¢à¹àžàž£à¹àžàž¥à¹ %S àžàžµà¹àž¡àžµàžàž¢àž¹à¹à¹àž¥à¹àž§àžàžàžàžàžžàžàž¥à¹àž¡à¹àž«àž¥àž§\nàžàž²àž£àžàž±à¹àžàžà¹àž²à¹àž«àž¡à¹àžàž°àžàž¹àžà¹àžà¹
-
-# "Downloading update" string for the hamburger menu (see #28885).
-# This string is kept here for ease of translation.
-# LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=àžàž³àž¥àž±àžàžàž²àž§àžà¹à¹àž«àž¥àžàžàž±àžà¹àžàž %S
-
-# .Onion Page Info prompt. Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=àžàž²àž£à¹àžàž·à¹àžàž¡àžà¹àžà¹àžà¹àž²àž£àž«àž±àžªàž¥àž±àž (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=àžàž²àž£à¹àžàž·à¹àžàž¡àžà¹àžà¹àžà¹àž²àž£àž«àž±àžªàž¥àž±àž (Onion Service)
-
-# Onion services strings. Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
-onionServices.clientAuthMissing=Tor onion service missing client authorization
-onionServices.authPrompt.description=%S is requesting your private key.
-onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
-onionServices.authPrompt.done=à¹àžªàž£à¹àžàžªàžŽà¹àž
-onionServices.authPrompt.doneAccessKey=d
-onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters)
-onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key
diff --git a/chrome/locale/tr/torbutton.properties b/chrome/locale/tr/torbutton.properties
index 3ca2519d..1d643491 100644
--- a/chrome/locale/tr/torbutton.properties
+++ b/chrome/locale/tr/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin
torbutton.popup.no_newnym = Torbutton size yeni bir gÃŒvenli kimlik saÄlayamadı. Tor Denetim Kapısına giriÅ yapılamıyor.\n\nTor Browser Bundle uygulamasını çalıÅtırdıÄınızdan emin olun.
torbutton.security_settings.menu.title = GÌvenlik DÌzeyi Ayarı
torbutton.title.prompt_torbrowser = Ãnemli Torbutton Bilgisi
-torbutton.popup.prompt_torbrowser = Torbutton Åimdi farklı çalıÅıyor: artık kapatamıyorsunuz.\n\nBu deÄiÅikliÄi yapmamızın nedeni Tor dıÅında kullanılan baÅka bir tarayıcıda Torbutton kullanmanın gÃŒvenli olmaması. BaÅka tÃŒrlÃŒ çözemeyeceÄimiz birçok sorun vardı.\n\nFirefox tarayıcısını normal olarak kullanmak istiyorsanız, Torbutton uygulamasını kaldırıp Tor Browser Bundle paketini indirebilirsiniz. Tor Browser kiÅisel gizliliÄi koruma özellikleri normal Firefox tarayıcısına, hatta Torbutton ile kullanılan Firefox ikilisine göre çok daha ÃŒstÃŒndÃŒr.\n\nTorbutton uygulamasını kaldırmak için, Araçlar->Eklentiler->Uzantılar bölÃŒmÃŒne gidin ve Torbutton uygulamasının yanındaki Kaldır dÃŒÄmesine tıklayın.
+torbutton.popup.prompt_torbrowser = Torbutton Åimdi farklı çalıÅıyor: artık kapatamıyorsunuz.\n\nBu deÄiÅikliÄi yapmamızın nedeni Tor dıÅında kullanılan baÅka bir tarayıcıda Torbutton kullanmanın gÃŒvenli olmaması. BaÅka tÃŒrlÃŒ çözemeyeceÄimiz birçok sorun vardı.\n\nFirefox tarayıcısını normal olarak kullanmak istiyorsanız, Torbutton uygulamasını kaldırıp Tor Browser Bundle paketini indirebilirsiniz. Tor Browser kiÅisel gizliliÄi koruma özellikleri normal Firefox tarayıcısına, hatta Torbutton ile kullanılan Firefox ikilisine göre çok daha ÃŒstÃŒndÃŒr.\n\nTorbutton uygulamasını kaldırmak için, Araçlar->Eklentiler->Uzantılar bölÃŒmÃŒne gidin ve Torbutton yazılımının yanındaki Kaldır dÃŒÄmesine tıklayın.
torbutton.popup.short_torbrowser = Ãnemli Torbutton Bilgisi!\n\nTorbutton artık kapatılamayacak Åekilde etkinleÅtirildi.\n\nAyrıntılı bilgi almak için Torbutton ÃŒzerine tıklayın.
torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliÄinizi ve anonim kimliÄinizi zedeleyebilir.\n\nBu eklentiler Tor uygulamasını atlatarak geçerli konum ve IP adresinizi ortaya çıkarabilir.\n\nBu eklentileri etkinleÅtirmek istediÄinize emin misiniz?\n
diff --git a/components/cookie-jar-selector.js b/components/cookie-jar-selector.js
new file mode 100644
index 00000000..79a66e8a
--- /dev/null
+++ b/components/cookie-jar-selector.js
@@ -0,0 +1,460 @@
+// Bug 1506 P1: This component is currently only used to protect
+// user-selected cookies from deletion. Moreover, all the E4X code is
+// deprecated and needs to be replaced with JSON.
+
+/*************************************************************************
+ * Cookie Jar Selector (JavaScript XPCOM component)
+ * Enables selection of separate cookie jars for (more) anonymous browsing.
+ * Designed as a component of FoxTor, http://cups.cs.cmu.edu/foxtor/
+ * Copyright 2006, distributed under the same (open source) license as FoxTor
+ *
+ * Contributor(s):
+ * Collin Jackson <mozilla(a)collinjackson.com>
+ *
+ *************************************************************************/
+
+// Module specific constants
+const kMODULE_NAME = "Cookie Jar Selector";
+const kMODULE_CONTRACTID = "@torproject.org/cookie-jar-selector;1";
+const kMODULE_CID = Components.ID("e6204253-b690-4159-bfe8-d4eedab6b3be");
+
+ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {})
+ .ensureDefaultPrefs();
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function Cookie(number,name,value,isDomain,host,rawHost,HttpOnly,path,isSecure,isSession,
+ expires,isProtected) {
+ this.number = number;
+ this.name = name;
+ this.value = value;
+ this.isDomain = isDomain;
+ this.host = host;
+ this.rawHost = rawHost;
+ this.isHttpOnly = HttpOnly;
+ this.path = path;
+ this.isSecure = isSecure;
+ this.isSession = isSession;
+ this.expires = expires;
+ this.isProtected = isProtected;
+}
+
+function CookieJarSelector() {
+ this.logger = Cc["@torproject.org/torbutton-logger;1"]
+ .getService(Ci.nsISupports).wrappedJSObject;
+
+ this.logger.log(3, "Component Load 5: New CookieJarSelector " + kMODULE_CONTRACTID);
+
+ this.prefs = Services.prefs;
+
+ var getProfileFile = function(filename) {
+ var loc = "ProfD"; // profile directory
+ var file = Services.dirsvc
+ .get(loc, Ci.nsIFile)
+ .clone();
+ file.append(filename);
+ return file;
+ };
+
+ this.clearCookies = function() {
+ try {
+ Services.cookies.removeAll();
+ } catch (e) {
+ this.logger.log(4, "Cookie clearing exception: " + e);
+ }
+ };
+
+ this._cookiesToJS = function(getSession) {
+ var cookieManager = Services.cookies;
+ var cookiesEnum = cookieManager.enumerator;
+ var cookiesAsJS = [];
+ var count = 0;
+ while (cookiesEnum.hasMoreElements()) {
+ var nextCookie = cookiesEnum.getNext().QueryInterface(Ci.nsICookie2);
+ var JSCookie = new Cookie(count++, nextCookie.name, nextCookie.value, nextCookie.isDomain, nextCookie.host,
+ (nextCookie.host.charAt(0)==".") ? nextCookie.host.substring(1,nextCookie.host.length) : nextCookie.host,
+ nextCookie.isHttpOnly, nextCookie.path, nextCookie.isSecure, nextCookie.isSession, nextCookie.expires,
+ false);
+ // Save either session or non-session cookies this time around:
+ if (JSCookie.isSession && getSession ||
+ !JSCookie.isSession && !getSession)
+ cookiesAsJS.push(JSCookie);
+ }
+ return cookiesAsJS;
+ };
+
+ this._loadCookiesFromJS = function(cookiesAsJS) {
+ if (typeof(cookiesAsJS) == "undefined" || !cookiesAsJS)
+ return;
+
+ var cookieManager = Services.cookies;
+
+ for (var i = 0; i < cookiesAsJS.length; i++) {
+ var cookie = cookiesAsJS[i];
+ //this.logger.log(2, "Loading cookie: "+host+":"+cname+" until: "+expiry);
+ cookieManager.add(cookie.host, cookie.path, cookie.name, cookie.value,
+ cookie.isSecure, cookie.isHttpOnly, cookie.isSession,
+ cookie.expires);
+ }
+ };
+
+ this._cookiesToFile = function(name) {
+ var file = getProfileFile("cookies-" + name + ".json");
+ var foStream = Cc["@mozilla.org/network/file-output-stream;1"]
+ .createInstance(Ci.nsIFileOutputStream);
+ foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0);
+ var data = JSON.stringify(this["cookiesobj-" + name]);
+ foStream.write(data, data.length);
+ foStream.close();
+ };
+
+ // Start1506
+ this._protectedCookiesToFile = function(name) {
+ var file = getProfileFile("protected-" + name + ".json");
+ var foStream = Cc["@mozilla.org/network/file-output-stream;1"]
+ .createInstance(Ci.nsIFileOutputStream);
+ foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0);
+ var data = JSON.stringify(this["protected-" + name]);
+ foStream.write(data, data.length);
+ foStream.close();
+ };
+
+ this.addProtectedCookie = function(cookie) {
+ var name = "tor";
+ var cookies = this.getProtectedCookies(name);
+
+ if (typeof(cookies) == "undefined" || cookies == null
+ || cookies.length == 0)
+ cookies = [];
+
+ if (cookie.isSession) {
+ // session cookies get fucked up expiry. Give it 1yr if
+ // the user wants to save their session cookies
+ cookie.expires = Date.now()/1000 + 365*24*60*60;
+ }
+
+ cookies.push(cookie);
+ this["protected-" + name] = cookies;
+
+ if (!this.prefs.getBoolPref("browser.privatebrowsing.autostart")) {
+ // save protected cookies to file
+ this._protectedCookiesToFile(name);
+ } else {
+ try {
+ var file = getProfileFile("protected-" + name + ".json");
+ if (file.exists()) {
+ file.remove(false);
+ }
+ } catch(e) {
+ this.logger.log(5, "Can't remove "+name+" cookie file: "+e);
+ }
+ }
+ };
+
+ this.getProtectedCookies = function(name) {
+ var file = getProfileFile("protected-" + name + ".json");
+ if (!file.exists()) {
+ return this["protected-" + name];
+ }
+ var data = "";
+ var fstream = Cc["@mozilla.org/network/file-input-stream;1"]
+ .createInstance(Ci.nsIFileInputStream);
+ var sstream = Cc["@mozilla.org/scriptableinputstream;1"]
+ .createInstance(Ci.nsIScriptableInputStream);
+ fstream.init(file, -1, 0, 0);
+ sstream.init(fstream);
+
+ var str = sstream.read(4096);
+ while (str.length > 0) {
+ data += str;
+ str = sstream.read(4096);
+ }
+
+ sstream.close();
+ fstream.close();
+ try {
+ var ret = JSON.parse(data);
+ } catch(e) { // file has been corrupted; XXX: handle error differently
+ this.logger.log(5, "Cookies corrupted: "+e);
+ try {
+ file.remove(false); //XXX: is it necessary to remove it ?
+ var ret = null;
+ } catch(e2) {
+ this.logger.log(5, "Can't remove file "+e);
+ }
+ }
+ return ret;
+ };
+
+ this.protectCookies = function(cookies) {
+ var name = "tor";
+ this._writeProtectCookies(cookies,name);
+ if (!this.prefs.getBoolPref("browser.privatebrowsing.autostart")) {
+ // save protected cookies to file
+ this._protectedCookiesToFile(name);
+ } else {
+ try {
+ var file = getProfileFile("protected-" + name + ".json");
+ if (file.exists()) {
+ file.remove(false);
+ }
+ } catch(e) {
+ this.logger.log(5, "Can't remove "+name+" cookie file: "+e);
+ }
+ }
+ };
+
+ this._writeProtectCookies = function(cookies, name) {
+ for (var i = 0; i < cookies.length; i++) {
+ if (cookies[i].isSession) {
+ // session cookies get fucked up expiry. Give it 1yr if
+ // the user wants to save their session cookies
+ cookies[i].expires = Date.now()/1000 + 365*24*60*60;
+ }
+ cookies[i].isProtected = true;
+ }
+ this["protected-" + name] = cookies;
+ };
+ // End1506
+
+ this._cookiesFromFile = function(name) {
+ var file = getProfileFile("cookies-" + name + ".json");
+ if (!file.exists())
+ return null;
+ var data = "";
+ var fstream = Cc["@mozilla.org/network/file-input-stream;1"]
+ .createInstance(Ci.nsIFileInputStream);
+ var sstream = Cc["@mozilla.org/scriptableinputstream;1"]
+ .createInstance(Ci.nsIScriptableInputStream);
+ fstream.init(file, -1, 0, 0);
+ sstream.init(fstream);
+
+ var str = sstream.read(4096);
+ while (str.length > 0) {
+ data += str;
+ str = sstream.read(4096);
+ }
+
+ sstream.close();
+ fstream.close();
+ try {
+ var ret = JSON.parse(data);
+ } catch(e) { // file has been corrupted; XXX: handle error differently
+ this.logger.log(5, "Cookies corrupted: "+e);
+ try {
+ file.remove(false); //XXX: is it necessary to remove it ?
+ var ret = null;
+ } catch(e2) {
+ this.logger.log(5, "Can't remove file "+e);
+ }
+ }
+ return ret;
+ };
+
+ this.saveCookies = function(name) {
+ // transition removes old tor-style cookie file
+ try {
+ var oldCookieFile = getProfileFile("cookies-"+name+".xml");
+ if (oldCookieFile.exists()) {
+ oldCookieFile.remove(false);
+ }
+ } catch(e) {
+ this.logger.log(5, "Can't remove old "+name+" file "+e);
+ }
+
+ // save cookies to JS objects
+ this["session-cookiesobj-" + name] = this._cookiesToJS(true);
+ this["cookiesobj-" + name] = this._cookiesToJS(false);
+
+ if (!this.prefs.getBoolPref("browser.privatebrowsing.autostart")) {
+ // save cookies to file
+ this._cookiesToFile(name);
+ } else {
+ // Clear the old file
+ try {
+ var file = getProfileFile("cookies-" + name + ".json");
+ if (file.exists()) {
+ file.remove(false);
+ }
+ } catch(e) {
+ this.logger.log(5, "Can't remove "+name+" cookie file "+e);
+ }
+ }
+
+ // ok, everything's fine
+ this.logger.log(2, "Cookies saved");
+ };
+
+ // Start1506
+ this.clearUnprotectedCookies = function(name) {
+ try {
+ var protCookies = this.getProtectedCookies(name);
+ if (protCookies == null || typeof(protCookies) == "undefined"
+ || protCookies.length == 0) {
+ //file does not exist - no protected cookies. Clear them all.
+ this.logger.log(3, "No protected cookies. Clearing all cookies.");
+ this.clearCookies();
+ return;
+ }
+ var cookiemanager = Services.cookies;
+
+ var enumerator = cookiemanager.enumerator;
+ var count = 0;
+ var protcookie = false;
+
+ while (enumerator.hasMoreElements()) {
+ var nextCookie = enumerator.getNext();
+ if (!nextCookie) break;
+
+ nextCookie = nextCookie.QueryInterface(Ci.nsICookie);
+ for (var i = 0; i < protCookies.length; i++) {
+ protcookie = protcookie || (nextCookie.host == protCookies[i].host &&
+ nextCookie.name == protCookies[i].name &&
+ nextCookie.path == protCookies[i].path);
+ }
+
+ if (!protcookie) {
+ cookiemanager.remove(nextCookie.host,
+ nextCookie.name,
+ nextCookie.path, false);
+ } else {
+ this.logger.log(3, "Found protected cookie for "+nextCookie.host);
+ }
+ protcookie = false;
+ }
+ // Emit cookie-changed event. This instructs other components to clear their identifiers
+ // (Specifically DOM storage and safe browsing, but possibly others)
+ var obsSvc = Services.obs;
+ obsSvc.notifyObservers(this, "cookie-changed", "cleared");
+ } catch (e) {
+ this.logger.log(5, "Error deleting unprotected cookies: " + e);
+ }
+ };
+ // End1506
+
+ this.loadCookies = function(name, deleteSavedCookieJar) {
+ // remove cookies before loading old ones
+ this.clearCookies();
+
+ if (!this.prefs.getBoolPref("browser.privatebrowsing.autostart")) {
+ // load cookies from file
+ this["cookiesobj-" + name] = this._cookiesFromFile(name);
+ }
+
+ //delete file if needed
+ if (deleteSavedCookieJar) {
+ try {
+ var file = getProfileFile("cookies-" + name + ".json");
+ if (file.exists())
+ file.remove(false);
+ } catch(e) {
+ this.logger.log(5, "Can't remove saved "+name+" file "+e);
+ }
+ }
+
+ // load cookies from JS objects
+ this._loadCookiesFromJS(this["cookiesobj-"+name]);
+ this._loadCookiesFromJS(this["session-cookiesobj-"+name]);
+
+ // XXX: send a profile-do-change event?
+
+ // ok, everything's fine
+ this.logger.log(2, "Cookies reloaded");
+ };
+
+ // This JSObject is exported directly to chrome
+ this.wrappedJSObject = this;
+
+ // This timer is done so that in the event of a crash, we at least
+ // have recent cookies in a jar to reload from.
+ var jarThis = this;
+ this.timerCallback = {
+ cookie_changed: false,
+
+ QueryInterface: ChromeUtils.generateQI(["nsITimer"]),
+ notify() {
+ // this refers to timerCallback object. use jarThis to reference
+ // CookieJarSelector object.
+ if(!this.cookie_changed) {
+ jarThis.logger.log(2, "Got timer update, but no cookie change.");
+ return;
+ }
+ jarThis.logger.log(3, "Got timer update. Saving changed cookies to jar.");
+
+ this.cookie_changed = false;
+
+ jarThis.saveCookies("tor");
+ jarThis.logger.log(2, "Timer done. Cookies saved");
+ }
+ };
+
+}
+
+const nsIClassInfo = Ci.nsIClassInfo;
+const nsIObserver = Ci.nsIObserver;
+const nsITimer = Ci.nsITimer;
+
+// Start1506: You may or may not care about this:
+CookieJarSelector.prototype =
+{
+ QueryInterface: ChromeUtils.generateQI(["nsIClassInfo", "nsIObserver"]),
+
+ wrappedJSObject: null, // Initialized by constructor
+
+ // make this an nsIClassInfo object
+ flags: nsIClassInfo.DOM_OBJECT,
+
+ _xpcom_categories: [{category:"profile-after-change"}],
+ classID: kMODULE_CID,
+ contractID: kMODULE_CONTRACTID,
+ classDescription: "CookieJarSelector",
+
+ // method of nsIClassInfo
+ getInterfaces: function(count) {
+ var interfaceList = [nsIClassInfo];
+ count.value = interfaceList.length;
+ return interfaceList;
+ },
+
+ // method of nsIClassInfo
+ getHelperForLanguage: function(count) { return null; },
+
+ // method of nsIObserver
+ observe : function(aSubject, aTopic, aData) {
+ switch(aTopic) {
+ case "cookie-changed":
+ var prefs = Services.prefs;
+ this.timerCallback.cookie_changed = true;
+
+ if (aData == "added"
+ && prefs.getBoolPref("extensions.torbutton.cookie_auto_protect")
+ && !prefs.getBoolPref("extensions.torbutton.tor_memory_jar")) {
+ this.addProtectedCookie(aSubject.QueryInterface(Ci.nsICookie2));// protect the new cookie!
+ }
+ break;
+ case "profile-after-change":
+ var obsSvc = Services.obs;
+ obsSvc.addObserver(this, "cookie-changed");
+ // after profil loading, initialize a timer to call timerCallback
+ // at a specified interval
+ this.timer.initWithCallback(this.timerCallback, 60 * 1000, nsITimer.TYPE_REPEATING_SLACK); // 1 minute
+ this.logger.log(3, "Cookie jar selector got profile-after-change");
+ break;
+ }
+ },
+
+ timer: Cc["@mozilla.org/timer;1"].createInstance(nsITimer),
+
+}
+
+/**
+* XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4).
+* XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6).
+*/
+if (XPCOMUtils.generateNSGetFactory)
+ var NSGetFactory = XPCOMUtils.generateNSGetFactory([CookieJarSelector]);
+else
+ var NSGetModule = XPCOMUtils.generateNSGetModule([CookieJarSelector]);
+
+// End1506
diff --git a/components/domain-isolator.js b/components/domain-isolator.js
index 3ed6e58f..f6a6d598 100644
--- a/components/domain-isolator.js
+++ b/components/domain-isolator.js
@@ -15,6 +15,9 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm
let logger = Cc["@torproject.org/torbutton-logger;1"]
.getService(Ci.nsISupports).wrappedJSObject;
+let { ensureDefaultPrefs } = ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {});
+ensureDefaultPrefs();
+
// Import crypto object (FF 37+).
Cu.importGlobalProperties(["crypto"]);
diff --git a/components/dragDropFilter.js b/components/dragDropFilter.js
index f48d1b38..9d6f74c8 100644
--- a/components/dragDropFilter.js
+++ b/components/dragDropFilter.js
@@ -6,6 +6,8 @@
*************************************************************************/
+ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs();
+
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
diff --git a/components/external-app-blocker.js b/components/external-app-blocker.js
index 9d5cbd79..afd5c002 100644
--- a/components/external-app-blocker.js
+++ b/components/external-app-blocker.js
@@ -16,8 +16,6 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PromptUtils } = ChromeUtils.import("resource://gre/modules/SharedPromptUtils.jsm");
-let { torbutton_get_property_string } = ChromeUtils.import("resource://torbutton/modules/utils.js", {});
-
// Module specific constants
const kMODULE_NAME = "Torbutton External App Handler";
const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlocker;1";
@@ -84,13 +82,13 @@ ExternalAppBlocker.prototype =
parentWin = Services.wm.getMostRecentWindow("navigator:browser");
}
- let title = torbutton_get_property_string("torbutton.popup.external.title");
- let app = torbutton_get_property_string("torbutton.popup.external.app");
- let note = torbutton_get_property_string("torbutton.popup.external.note");
- let suggest = torbutton_get_property_string("torbutton.popup.external.suggest");
- let launch = torbutton_get_property_string("torbutton.popup.launch");
- let cancel = torbutton_get_property_string("torbutton.popup.cancel");
- let dontask = torbutton_get_property_string("torbutton.popup.dontask");
+ let title = parentWin.torbutton_get_property_string("torbutton.popup.external.title");
+ let app = parentWin.torbutton_get_property_string("torbutton.popup.external.app");
+ let note = parentWin.torbutton_get_property_string("torbutton.popup.external.note");
+ let suggest = parentWin.torbutton_get_property_string("torbutton.popup.external.suggest");
+ let launch = parentWin.torbutton_get_property_string("torbutton.popup.launch");
+ let cancel = parentWin.torbutton_get_property_string("torbutton.popup.cancel");
+ let dontask = parentWin.torbutton_get_property_string("torbutton.popup.dontask");
let args = {
promptType: "confirmEx",
diff --git a/components/startup-observer.js b/components/startup-observer.js
index d2d1d610..bf2f0f48 100644
--- a/components/startup-observer.js
+++ b/components/startup-observer.js
@@ -21,6 +21,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
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", {});
// Module specific constants
@@ -28,22 +29,6 @@ const kMODULE_NAME = "Startup";
const kMODULE_CONTRACTID = "@torproject.org/startup-observer;1";
const kMODULE_CID = Components.ID("06322def-6fde-4c06-aef6-47ae8e799629");
-function cleanupCookies() {
- const migratedPref = "extensions.torbutton.cookiejar_migrated";
- if (!Services.prefs.getBoolPref(migratedPref, false)) {
- // Cleanup stored cookie-jar-selector json files
- const profileFolder = Services.dirsvc.get("ProfD", Ci.nsIFile).clone();
- for (const file of profileFolder.directoryEntries) {
- if (file.leafName.match(/^(cookies|protected)-.*[.]json$/)) {
- try {
- file.remove(false);
- } catch (e) {}
- }
- }
- Services.prefs.setBoolPref(migratedPref, true);
- }
-}
-
function StartupObserver() {
this.logger = Cc["@torproject.org/torbutton-logger;1"]
.getService(Ci.nsISupports).wrappedJSObject;
@@ -77,8 +62,6 @@ function StartupObserver() {
this.logger.log(4, "Early proxy change failed. Will try again at profile load. Error: "+e);
}
- cleanupCookies();
-
// Using all possible locales so that we do not have to change this list every time we support
// a new one.
const allLocales = [
diff --git a/components/torbutton-logger.js b/components/torbutton-logger.js
index 1c946fa7..52fdfc23 100644
--- a/components/torbutton-logger.js
+++ b/components/torbutton-logger.js
@@ -13,6 +13,8 @@ const kMODULE_NAME = "Torbutton Logger";
const kMODULE_CONTRACTID = "@torproject.org/torbutton-logger;1";
const kMODULE_CID = Components.ID("f36d72c9-9718-4134-b550-e109638331d7");
+ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs();
+
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/defaults/preferences/preferences.js b/defaults/preferences/preferences.js
new file mode 100644
index 00000000..acea0a3d
--- /dev/null
+++ b/defaults/preferences/preferences.js
@@ -0,0 +1,58 @@
+// debug prefs
+pref("extensions.torbutton.loglevel",4);
+pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglog
+
+// Display prefs
+pref("extensions.torbutton.display_circuit", true);
+pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties");
+pref("extensions.torbutton.updateNeeded", false);
+
+// Tor check and proxy prefs
+pref("extensions.torbutton.test_enabled",true);
+pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true");
+pref("extensions.torbutton.local_tor_check",true);
+pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions");
+pref("extensions.torbutton.versioncheck_enabled",true);
+pref("extensions.torbutton.use_nontor_proxy",false);
+
+// State prefs:
+pref("extensions.torbutton.startup",false);
+pref("extensions.torbutton.inserted_button",false);
+pref("extensions.torbutton.inserted_security_level",false);
+
+// TODO: This is just part of a stopgap until #14429 gets properly implemented.
+// See #7255 for details. We display the warning three times to make sure the
+// user did not click on it by accident.
+pref("extensions.torbutton.maximize_warnings_remaining", 3);
+
+// Security prefs:
+pref("extensions.torbutton.cookie_protections",true);
+pref("extensions.torbutton.cookie_auto_protect",false);
+pref("extensions.torbutton.clear_http_auth",true);
+pref("extensions.torbutton.close_newnym",true);
+pref("extensions.torbutton.resize_new_windows",false);
+pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last
+pref("extensions.torbutton.tor_memory_jar",false);
+pref("extensions.torbutton.nontor_memory_jar",false);
+pref("extensions.torbutton.launch_warning",true);
+
+// Opt out of Firefox addon pings:
+// https://developer.mozilla.org/en/Addons/Working_with_AMO
+pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false);
+
+// Security Slider
+pref("extensions.torbutton.security_slider", 4);
+pref("extensions.torbutton.security_custom", false);
+
+pref("extensions.torbutton.prompt_torbrowser", true);
+pref("extensions.torbutton.confirm_plugins", true);
+pref("extensions.torbutton.confirm_newnym", true);
+
+pref("extensions.torbutton.noscript_inited", false);
+pref("extensions.torbutton.noscript_persist", false);
+
+// Browser home page:
+pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties");
+
+// This pref specifies an ad-hoc "version" for various pref update hacks we need to do
+pref("extensions.torbutton.pref_fixup_version", 0);
diff --git a/import-translations.sh b/import-translations.sh
index 06060a3c..b4c22295 100755
--- a/import-translations.sh
+++ b/import-translations.sh
@@ -2,7 +2,7 @@
# This var comes from the TBB locale list.
# XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync
-BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko lt nb-NO mk ms nl pl pt-BR ro ru sv-SE th tr vi zh-CN zh-TW"
+BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko nb-NO mk nl pl pt-BR ro ru sv-SE tr vi zh-CN zh-TW"
# XXX: Basque (eu) by request in #10687.
# This is not used for official builds, but should remain so Basque XPIs can be
diff --git a/jar.mn b/jar.mn
index 45c8c9b8..6697b543 100644
--- a/jar.mn
+++ b/jar.mn
@@ -6,6 +6,7 @@ torbutton.jar:
content/ (chrome/content/*)
components/ (components/*)
+ defaults/ (defaults/*)
modules/ (modules/*)
skin/ (chrome/skin/*)
@@ -59,12 +60,8 @@ torbutton.jar:
locale/ka/ (chrome/locale/ka/*)
% locale torbutton ko %locale/ko/
locale/ko/ (chrome/locale/ko/*)
-% locale torbutton lt %locale/lt/
- locale/lt/ (chrome/locale/lt/*)
% locale torbutton mk %locale/mk/
locale/mk/ (chrome/locale/mk/*)
-% locale torbutton ms %locale/ms/
- locale/ms/ (chrome/locale/ms/*)
% locale torbutton nb-NO %locale/nb-NO/
locale/nb-NO/ (chrome/locale/nb-NO/*)
% locale torbutton nl %locale/nl/
@@ -79,8 +76,6 @@ torbutton.jar:
locale/ru/ (chrome/locale/ru/*)
% locale torbutton sv-SE %locale/sv-SE/
locale/sv-SE/ (chrome/locale/sv-SE/*)
-% locale torbutton th %locale/th/
- locale/th/ (chrome/locale/th/*)
% locale torbutton tr %locale/tr/
locale/tr/ (chrome/locale/tr/*)
% locale torbutton vi %locale/vi/
@@ -102,6 +97,9 @@ torbutton.jar:
% component {06322def-6fde-4c06-aef6-47ae8e799629} %components/startup-observer.js
% contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629}
+% component {e6204253-b690-4159-bfe8-d4eedab6b3be} %components/cookie-jar-selector.js
+% contract @torproject.org/cookie-jar-selector;1 {e6204253-b690-4159-bfe8-d4eedab6b3be}
+
% component {5d57312b-5d8c-4169-b4af-e80d6a28a72e} %components/torCheckService.js
% contract @torproject.org/torbutton-torCheckService;1 {5d57312b-5d8c-4169-b4af-e80d6a28a72e}
@@ -111,6 +109,8 @@ torbutton.jar:
% component {e33fd6d4-270f-475f-a96f-ff3140279f68} %components/domain-isolator.js
% contract @torproject.org/domain-isolator;1 {e33fd6d4-270f-475f-a96f-ff3140279f68}
+% category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selector;1
+
% category profile-after-change StartupObserver @torproject.org/startup-observer;1
% category profile-after-change DomainIsolator @torproject.org/domain-isolator;1
% category profile-after-change DragDropFilter @torproject.org/torbutton-dragDropFilter;1
diff --git a/modules/default-prefs.js b/modules/default-prefs.js
new file mode 100644
index 00000000..5ea549f4
--- /dev/null
+++ b/modules/default-prefs.js
@@ -0,0 +1,36 @@
+let loaded = false;
+
+function ensureDefaultPrefs () {
+ if (loaded) {
+ return;
+ }
+ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const kDefaultPreferences = "resource://torbutton/defaults/preferences/preferences.js";
+ const defaultPrefBranch = Services.prefs.getDefaultBranch(null);
+
+ const context = {
+ pref: function (aPrefName, aValue) {
+ const aValueType = typeof aValue;
+ if (aValueType === "boolean") {
+ defaultPrefBranch.setBoolPref(aPrefName, aValue);
+ } else if (aValueType === "number") {
+ defaultPrefBranch.setIntPref(aPrefName, aValue);
+ } else if (aValueType === "string") {
+ defaultPrefBranch.setCharPref(aPrefName, aValue);
+ } else {
+ Services.console.logStringMessage(
+ `Preference ${aPrefName} with value ${aValue} has an invalid value type`);
+ }
+
+ // Disable the External App Blocker on Android
+ if ((aPrefName === "extensions.torbutton.launch_warning") &&
+ (Services.appinfo.OS === "Android")) {
+ defaultPrefBranch.setBoolPref(aPrefName, false);
+ }
+ }
+ };
+ Services.scriptloader.loadSubScript(kDefaultPreferences, context);
+ loaded = true;
+}
+
+let EXPORTED_SYMBOLS = ["ensureDefaultPrefs"];
diff --git a/modules/security-prefs.js b/modules/security-prefs.js
index 7fb2e0c4..f61f24aa 100644
--- a/modules/security-prefs.js
+++ b/modules/security-prefs.js
@@ -33,7 +33,6 @@ const kSecuritySettings = {
"gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ],
"svg.disabled" : [, true, false, false, false],
"javascript.options.asmjs" : [, false, false, false, true ],
- "javascript.options.wasm" : [, false, false, false, true ],
};
// The Security Settings prefs in question.
diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js
index 1b0a79ad..9f6dbeb6 100644
--- a/modules/tor-control-port.js
+++ b/modules/tor-control-port.js
@@ -7,15 +7,10 @@
//
// To import the module, use
//
-// let { configureControlPortModule, controller } =
-// Components.utils.import("path/to/tor-control-port.js", {});
-//
-// See the second-to-last function defined in this file:
-// configureControlPortModule(ipcFile, host, port, password)
-// for usage of the configureControlPortModule function.
+// let { controller } = Components.utils.import("path/to/tor-control-port.js", {});
//
// See the last function defined in this file:
-// controller(onError)
+// controller(ipcFile, host, port, password, onError)
// for usage of the controller function.
/* jshint esnext: true */
@@ -234,16 +229,7 @@ io.matchRepliesToCommands = function (asyncSend, dispatcher) {
let [command, replyCallback, errorCallback] = commandQueue.shift();
if (message.match(/^2/) && replyCallback) replyCallback(message);
if (message.match(/^[45]/) && errorCallback) {
- let myErr = new Error(command + " -> " + message);
- // Add Tor-specific information to the Error object.
- let idx = message.indexOf(' ');
- if (idx > 0) {
- myErr.torStatusCode = message.substring(0, idx);
- myErr.torMessage = message.substring(idx);
- } else {
- myErr.torStatusCode = message;
- }
- errorCallback(myErr);
+ errorCallback(new Error(command + " -> " + message));
}
});
// Create and return a version of sendCommand that returns a Promise.
@@ -576,24 +562,6 @@ info.getConf = function (aControlSocket, key) {
.then(info.getMultipleResponseValues);
};
-// ## onionAuth
-// A namespace for functions related to tor's ONION_CLIENT_AUTH_* commands.
-let onionAuth = {};
-
-// __onionAuth.add(controlSocket, hsAddress, b64PrivateKey, nickname, isPermanent)__.
-// Sends a ONION_CLIENT_AUTH_ADD command to add a private key to the
-// Tor configuration.
-onionAuth.add = function (aControlSocket, hsAddress, b64PrivateKey,
- nickname, isPermanent) {
- const keyType = "x25519";
- let cmd = `onion_client_auth_add ${hsAddress} ${keyType}:${b64PrivateKey}`;
- if (nickname)
- cmd += ` ClientName=${nickname}`;
- if (isPermanent)
- cmd += " Flags=Permanent";
- return aControlSocket.sendCommand(cmd);
-};
-
// ## event
// Handlers for events
@@ -649,9 +617,6 @@ tor.controller = function (ipcFile, host, port, password, onError) {
isOpen = true;
return { getInfo : key => info.getInfo(socket, key),
getConf : key => info.getConf(socket, key),
- onionAuthAdd : (hsAddress, b64PrivateKey, nickname, isPermanent) =>
- onionAuth.add(socket, hsAddress, b64PrivateKey,
- nickname, isPermanent),
watchEvent : (type, filter, onData) =>
event.watchEvent(socket, type, filter, onData),
isOpen : () => isOpen,
@@ -661,53 +626,29 @@ tor.controller = function (ipcFile, host, port, password, onError) {
// ## Export
-let controlPortInfo = {};
-
-// __configureControlPortModule(ipcFile, host, port, password)__.
-// Sets Tor control port connection parameters to be used in future calls to
-// the controller() function. Example:
-// configureControlPortModule(undefined, "127.0.0.1", 9151, "MyPassw0rd");
-var configureControlPortModule = function (ipcFile, host, port, password) {
- controlPortInfo.ipcFile = ipcFile;
- controlPortInfo.host = host;
- controlPortInfo.port = port || 9151;
- controlPortInfo.password = password;
-};
-
-// __controller(onError)__.
-// Instantiates and returns a controller object that is connected and
-// authenticated to a Tor ControlPort using the connection parameters
-// provided in the most recent call to configureControlPortModule(), if
-// the controller doesn't yet exist. Otherwise returns the existing
-// controller to the given ipcFile or host:port.
+// __controller(ipcFile, host, port, password, onError)__.
+// Instantiates and returns a controller object connected to a tor ControlPort
+// on ipcFile or at host:port, authenticating with the given password, if
+// the controller doesn't yet exist. Otherwise returns the existing controller
+// to the given ipcFile or host:port.
// onError is called with an error object as its single argument whenever
// an error occurs. Example:
//
// // Get the controller
-// let c = controller(
+// let c = controller(undefined, "127.0.0.1", 9151, "MyPassw0rd",
// function (error) { console.log(error.message || error); });
// // Send command and receive `250` reply or error message in a promise:
// let replyPromise = c.getInfo("ip-to-country/16.16.16.16");
// // Close the controller permanently
// c.close();
-var controller = function (onError) {
- if (!controlPortInfo.ipcFile && !controlPortInfo.host)
- throw new Error("Please call configureControlPortModule first");
-
- const dest = (controlPortInfo.ipcFile)
- ? `unix:${controlPortInfo.ipcFile.path}`
- : `${controlPortInfo.host}:${controlPortInfo.port}`;
- const maybeController = tor.controllerCache[dest];
- if (maybeController && maybeController.isOpen())
- return maybeController;
-
- tor.controllerCache[dest] = tor.controller(controlPortInfo.ipcFile,
- controlPortInfo.host,
- controlPortInfo.port,
- controlPortInfo.password,
- onError);
- return tor.controllerCache[dest];
+var controller = function (ipcFile, host, port, password, onError) {
+ let dest = (ipcFile) ? "unix:" + ipcFile.path : host + ":" + port,
+ maybeController = tor.controllerCache[dest];
+ return (tor.controllerCache[dest] =
+ (maybeController && maybeController.isOpen()) ?
+ maybeController :
+ tor.controller(ipcFile, host, port, password, onError));
};
-// Export functions for external use.
-var EXPORTED_SYMBOLS = ["configureControlPortModule", "controller"];
+// Export the controller function for external use.
+var EXPORTED_SYMBOLS = ["controller"];
diff --git a/modules/utils.js b/modules/utils.js
index b726342b..0caf475f 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -239,58 +239,6 @@ var getDomainForBrowser = (browser) => {
return fpd;
};
-var m_tb_torlog = Cc["@torproject.org/torbutton-logger;1"]
-.getService(Ci.nsISupports).wrappedJSObject;
-
-var m_tb_string_bundle = torbutton_get_stringbundle();
-
-function torbutton_safelog(nLevel, sMsg, scrub) {
- m_tb_torlog.safe_log(nLevel, sMsg, scrub);
- return true;
-}
-
-function torbutton_log(nLevel, sMsg) {
- m_tb_torlog.log(nLevel, sMsg);
-
- // So we can use it in boolean expressions to determine where the
- // short-circuit is..
- return true;
-}
-
-// load localization strings
-function torbutton_get_stringbundle()
-{
- var o_stringbundle = false;
-
- try {
- var oBundle = Services.strings;
- o_stringbundle = oBundle.createBundle("chrome://torbutton/locale/torbutton.properties");
- } catch(err) {
- o_stringbundle = false;
- }
- if (!o_stringbundle) {
- torbutton_log(5, 'ERROR (init): failed to find torbutton-bundle');
- }
-
- return o_stringbundle;
-}
-
-function torbutton_get_property_string(propertyname)
-{
- try {
- if (!m_tb_string_bundle) {
- m_tb_string_bundle = torbutton_get_stringbundle();
- }
-
- return m_tb_string_bundle.GetStringFromName(propertyname);
- } catch(e) {
- torbutton_log(4, "Unlocalized string "+propertyname);
- }
-
- return propertyname;
-}
-
// Export utility functions for external use.
let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", "getDomainForBrowser",
- "getPrefValue", "observe", "showDialog", "show_torbrowser_manual", "unescapeTorString",
- "torbutton_safelog", "torbutton_log", "torbutton_get_property_string"];
+ "getPrefValue", "observe", "showDialog", "show_torbrowser_manual", "unescapeTorString"];
diff --git a/moz.build b/moz.build
index 376c9976..843cee0d 100644
--- a/moz.build
+++ b/moz.build
@@ -4,3 +4,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
+JS_PREFERENCE_FILES += [
+ 'defaults/preferences/preferences.js',
+]
1
0

[torbutton/maint-9.0] Bug 21549 - Enable WASM on the Standard security-level
by sysrqb@torproject.org 03 Jan '20
by sysrqb@torproject.org 03 Jan '20
03 Jan '20
commit 324e8fd7f73c7f97f8174713c6a112ec75669e56
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Fri Oct 18 12:50:09 2019 +0000
Bug 21549 - Enable WASM on the Standard security-level
---
modules/security-prefs.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/security-prefs.js b/modules/security-prefs.js
index f61f24aa..7fb2e0c4 100644
--- a/modules/security-prefs.js
+++ b/modules/security-prefs.js
@@ -33,6 +33,7 @@ const kSecuritySettings = {
"gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ],
"svg.disabled" : [, true, false, false, false],
"javascript.options.asmjs" : [, false, false, false, true ],
+ "javascript.options.wasm" : [, false, false, false, true ],
};
// The Security Settings prefs in question.
1
0

[torbutton/maint-9.0] Bug 32125: Fix circuit display for bridge without a fingerprint
by sysrqb@torproject.org 03 Jan '20
by sysrqb@torproject.org 03 Jan '20
03 Jan '20
commit 73df82bd36a812496067c8bef948df5130cb991b
Author: Richard Pospesel <richard(a)torproject.org>
Date: Thu Oct 17 14:40:40 2019 -0700
Bug 32125: Fix circuit display for bridge without a fingerprint
Torbutton expects all bridges to have a fingerprint when creating
the browser's circuit display. This patch works around the case
when the user provides a bridge without a fingerprint by assuming
it is a bridge, but we cannot determine the other displayed info:
type (obfs4, meek, etc) nor the ip.
In this scenario, the entry node in the circuit display will simply
say "Bridge".
---
chrome/content/tor-circuit-display.js | 24 ++++++++++++++++--------
modules/tor-control-port.js | 3 +++
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js
index f75bd781..21bcc57b 100644
--- a/chrome/content/tor-circuit-display.js
+++ b/chrome/content/tor-circuit-display.js
@@ -84,12 +84,19 @@ let nodeDataForID = async function (controller, id) {
result.ip = bridge.address.split(":")[0];
} catch (e) { }
} else {
- result.type = "default";
- // Get the IP address for the given node ID.
- try {
- let statusMap = await controller.getInfo("ns/id/" + id);
- result.ip = statusMap.IP;
- } catch (e) { }
+ // either dealing with a relay, or a bridge whose fingerprint is not saved in torrc
+ try {
+ let statusMap = await controller.getInfo("ns/id/" + id);
+ result.type = "default";
+ result.ip = statusMap.IP;
+ } catch (e) {
+ // getInfo will throw if the given id is not a relay
+ // this probably means we are dealing with a user-provided bridge with no fingerprint
+ result.type = "bridge";
+ // we don't know the ip or type, so leave blank
+ result.ip = "";
+ result.bridgeType = "";
+ }
}
if (result.ip) {
// Get the country code for the node's IP address.
@@ -294,10 +301,11 @@ let updateCircuitDisplay = function () {
let bridgeType = nodeData[i].bridgeType;
if (bridgeType === "meek_lite") {
relayText += ": meek";
- } else if (bridgeType !== "vanilla") {
+ }
+ else if (bridgeType !== "vanilla" && bridgeType !== "") {
relayText += ": " + bridgeType;
}
- } else {
+ } else if (nodeData[i].type == "default") {
relayText = localizedCountryNameFromCode(nodeData[i].countryCode);
}
let ip = nodeData[i].ip.startsWith("0.") ? "" : nodeData[i].ip;
diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js
index 6e310b52..9f6dbeb6 100644
--- a/modules/tor-control-port.js
+++ b/modules/tor-control-port.js
@@ -459,6 +459,9 @@ info.streamStatusParser = function (text) {
"CircuitID", "Target"]);
};
+
+// TODO: fix this parsing logic to handle bridgeLine correctly
+// fingerprint/id is an optional parameter
// __info.bridgeParser(bridgeLine)__.
// Takes a single line from a `getconf bridge` result and returns
// a map containing the bridge's type, address, and ID.
1
0

[torbutton/maint-9.0] Bug 30783: Add language strings for EOY 2019 campaign
by sysrqb@torproject.org 03 Jan '20
by sysrqb@torproject.org 03 Jan '20
03 Jan '20
commit b75147e1d866ebe1c2be4100ba54fe2e4b7bf321
Author: Georg Koppen <gk(a)torproject.org>
Date: Sun Oct 27 21:11:33 2019 +0000
Bug 30783: Add language strings for EOY 2019 campaign
---
chrome/locale/en-US/aboutTor.dtd | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd
index c4273ad2..49215c75 100644
--- a/chrome/locale/en-US/aboutTor.dtd
+++ b/chrome/locale/en-US/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
1
0
commit 05744bc48afd08ca03a78c26b29d0d63c1b4cc61
Author: Georg Koppen <gk(a)torproject.org>
Date: Sat Oct 19 21:05:40 2019 +0000
Translations update
---
chrome/locale/da/browserOnboarding.properties | 8 ++++----
chrome/locale/ja/browserOnboarding.properties | 10 +++++-----
chrome/locale/ka/browserOnboarding.properties | 12 ++++++------
chrome/locale/mk/aboutTBUpdate.dtd | 4 ++--
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/chrome/locale/da/browserOnboarding.properties b/chrome/locale/da/browserOnboarding.properties
index 0b6f4ddc..a1113637 100644
--- a/chrome/locale/da/browserOnboarding.properties
+++ b/chrome/locale/da/browserOnboarding.properties
@@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Gå til Tor-netværk
onboarding.tour-tor-network=Tor-netværk
onboarding.tour-tor-network.title=Rejs på et decentraliseret netværk.
onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for dig til Tor-netværket, som køres af tusindvis af frivillige verden over. I modsætning til en VPN, er der ikke ét punkt som kan få det til at fejle, eller centraliseret indgang som du skal have tillid til for at bruge internettet privat.
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences.
+onboarding.tour-tor-network.description-para2=NYT: Tor-netværksindstillinger som indeholder muligheden for at anmode om broer hvor Tor er blokeret, kan nu findes i Præferencer.
onboarding.tour-tor-network.action-button=Juster dine Tor-netværksindstillinger
onboarding.tour-tor-network.button=Gå til kredsløb-visning
@@ -50,9 +50,9 @@ onboarding.tour-tor-update.prefix-updated=Opdateret
onboarding.tour-tor-toolbar=Værktøjslinje
onboarding.tour-tor-toolbar-update-9.0.title=Farvel Onion-knap.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu.
-onboarding.tour-tor-toolbar-update-9.0.button=Forespørg en ny identitet
+onboarding.tour-tor-toolbar-update-9.0.description=Vil ønsker at din oplevelse med Tor skal være fuldt integreret i Tor Browser.
+onboarding.tour-tor-toolbar-update-9.0.description-para2=Derfor kan du nu, i stedet for at bruge onion-knappen, se dine Tor-kredsløb via [i] på adresselinjen og anmod om en ny identitet med værktøjslinjeknappen eller [≡]-menuen.
+onboarding.tour-tor-toolbar-update-9.0.button=Anmod om en ny identitet
onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor-netværk
# Circuit Display onboarding.
diff --git a/chrome/locale/ja/browserOnboarding.properties b/chrome/locale/ja/browserOnboarding.properties
index 1a3b8846..598b5960 100644
--- a/chrome/locale/ja/browserOnboarding.properties
+++ b/chrome/locale/ja/browserOnboarding.properties
@@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Tor ネットワークへ
onboarding.tour-tor-network=Tor ネットワーク
onboarding.tour-tor-network.title=分散型ネットワークを旅する。
onboarding.tour-tor-network.description=Tor Browser は、世界中の何千人ものボランティアによって運営されている Tor ネットワークにあなたを接続します。 VPN とは異なり、インターネットをプライベートに楽しむために信頼する必要があるのは、1つの障害点や1つの存在ではありません。
-onboarding.tour-tor-network.description-para2=新規:Torネットワーク設定。環境設定に追加され、Torが検問されている地域でブリッジをリクエストすることができます。
-onboarding.tour-tor-network.action-button=Torネットワーク設定を設定する
+onboarding.tour-tor-network.description-para2=NEW: Tor ネットワークの設定は、[設定] メニューの中に移動しました。Tor がブロックされる地域でブリッジを要求することなどができます。
+onboarding.tour-tor-network.action-button=Tor ネットワークの設定を調整
onboarding.tour-tor-network.button=サーキットディスプレイへ
onboarding.tour-tor-circuit-display=サーキットディスプレイ
@@ -49,9 +49,9 @@ onboarding.tour-tor-update.prefix-new=新機能
onboarding.tour-tor-update.prefix-updated=更新
onboarding.tour-tor-toolbar=ツールバー
-onboarding.tour-tor-toolbar-update-9.0.title= グッバイ、Onion Button。
-onboarding.tour-tor-toolbar-update-9.0.description=あなたのTorのすべてのデータをTor Browserに完全に移行したいと考えています。
-onboarding.tour-tor-toolbar-update-9.0.description-para2=そのため、今では、Onion buttonを使用せずに、URLバーの[ i ]をクリックしてTorサーキットを表示し、「このサイトに新しいサーキットを使用」をクリックするか、または[≡]メニューの「新しい識別子」をクリックして新しい識別子を要求することができます。
+onboarding.tour-tor-toolbar-update-9.0.title=さようなら、玉ねぎボタン。
+onboarding.tour-tor-toolbar-update-9.0.description=私たちは Tor の使用感を完全に Tor Browser に調和させたいと思っています。
+onboarding.tour-tor-toolbar-update-9.0.description-para2=そのため、玉ねぎボタンの代わりに、URL バーの [i] ボタンから Tor サーキットを確認したり、ツールバーボタンや [≡] メニューから新しい識別子をリクエストしたりできるようにしました。
onboarding.tour-tor-toolbar-update-9.0.button=新しい識別子をリクエストする方法
onboarding.tour-tor-toolbar-update-9.0.next-button=Tor ネットワークへ
diff --git a/chrome/locale/ka/browserOnboarding.properties b/chrome/locale/ka/browserOnboarding.properties
index 11832796..5de57a60 100644
--- a/chrome/locale/ka/browserOnboarding.properties
+++ b/chrome/locale/ka/browserOnboarding.properties
@@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=იხილეთ Tor-ქსელი
onboarding.tour-tor-network=Tor-ქსელი
onboarding.tour-tor-network.title=ისარგებლეთ დამოუკიდებელი, ერთპიროვნული მმართველობისგან დაცული ქსელით.
onboarding.tour-tor-network.description=Tor-ბრაუზერით უკავშირდებით Tor-ქსელს, რომლის მუშაობასაც უზრუნველყოფს ათასობით მოხალისე, მთელი მსოფლიოს მასშტაბით. განსხვავებით VPN-ისგან, ამ შემთხვევაში არ გიწევთ ცალკეული პირის ან ერთეულის ნდობა და არავისზე ხართ დამოკიდებული, ინტერნეტით ვინაობის გაუმჟღავნებლად სარგებლობისას.
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences.
-onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
+onboarding.tour-tor-network.description-para2=სიახლე: Tor-ქსელის გამართვა, აგრეთვე, ხიდების მოთხოვნა, Tor-ის შეზღუდვის პირობებში, ახლა უკვე შეგიძლიათ პარამეტრებიდან.
+onboarding.tour-tor-network.action-button=გამართეთ Tor-ქსელის პარამეტრები
onboarding.tour-tor-network.button=იხილეთ წრედის არე
onboarding.tour-tor-circuit-display=წრედის არე
@@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=ახალი
onboarding.tour-tor-update.prefix-updated=განახლებული
onboarding.tour-tor-toolbar=ხელსაწყოთა ზოლი
-onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu.
-onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
+onboarding.tour-tor-toolbar-update-9.0.title=მშვიდობით Onion Button.
+onboarding.tour-tor-toolbar-update-9.0.description=გვსურს, რომ Tor სრულად იყოს ჩაშენებული Tor-ბრაუზერში.
+onboarding.tour-tor-toolbar-update-9.0.description-para2=სწორედ ამიტომ, ამიერიდან Tor-წრედს იხილავთ onion-ღილაკის ნაცვლად, [i] ნიშანზე დაწკაპებისას მისამართების ველში, ხოლო ახალი ვინაობის მოთხოვნა შეგეძლებათ ხელსაწყოთა ზოლიდან ან [≡] მენიუდან.
+onboarding.tour-tor-toolbar-update-9.0.button=როგორ ხდება ახალი ვინაობის მოთხოვნა
onboarding.tour-tor-toolbar-update-9.0.next-button=იხილეთ Tor-ქსელი
# Circuit Display onboarding.
diff --git a/chrome/locale/mk/aboutTBUpdate.dtd b/chrome/locale/mk/aboutTBUpdate.dtd
index 9d8c386a..1649a138 100644
--- a/chrome/locale/mk/aboutTBUpdate.dtd
+++ b/chrome/locale/mk/aboutTBUpdate.dtd
@@ -1,7 +1,7 @@
<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Листа на промени">
<!ENTITY aboutTBUpdate.updated "Tor Browser е ажуриран.">
-<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија,">
-<!ENTITY aboutTBUpdate.linkLabel " посетете ја нашата веб страна">
+<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија, ">
+<!ENTITY aboutTBUpdate.linkLabel "посетете ја нашата веб страна">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.version "Верзија">
<!ENTITY aboutTBUpdate.releaseDate "Датум на издавање">
1
0
commit 1b10bf33beac6bdaad744adc3318c6d7ccdb8c72
Author: Alex Catarineu <acat(a)torproject.org>
Date: Mon Oct 28 10:43:47 2019 +0100
Add LICENSE
---
LICENSE | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..66c78f65
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2019, The Tor Project, Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ (1) Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ (2) Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ (3)The name of the author may not be used to
+ endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
1
0
commit c0438bdcd48215fb73425f448ee1e5e9f5e4dbe3
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Oct 30 10:31:58 2019 +0000
Translations update
---
chrome/locale/ar/aboutTor.dtd | 5 ++
chrome/locale/bn-BD/aboutTor.dtd | 5 ++
chrome/locale/ca/aboutTor.dtd | 5 ++
chrome/locale/ca/brand.dtd | 8 +--
chrome/locale/ca/browserOnboarding.properties | 4 +-
chrome/locale/ca/torbutton.dtd | 62 ++++++++++++------------
chrome/locale/ca/torbutton.properties | 4 +-
chrome/locale/cs/aboutTor.dtd | 5 ++
chrome/locale/da/aboutTor.dtd | 5 ++
chrome/locale/de/aboutTor.dtd | 5 ++
chrome/locale/de/browserOnboarding.properties | 12 ++---
chrome/locale/el/aboutTor.dtd | 5 ++
chrome/locale/es-AR/aboutTor.dtd | 5 ++
chrome/locale/es-ES/aboutTor.dtd | 5 ++
chrome/locale/eu/aboutTor.dtd | 5 ++
chrome/locale/fa/aboutTor.dtd | 5 ++
chrome/locale/fr/aboutTor.dtd | 5 ++
chrome/locale/fr/brand.properties | 2 +-
chrome/locale/ga-IE/aboutTor.dtd | 5 ++
chrome/locale/he/aboutTor.dtd | 5 ++
chrome/locale/he/torbutton.dtd | 10 ++--
chrome/locale/hu/aboutTor.dtd | 5 ++
chrome/locale/hu/browserOnboarding.properties | 18 +++----
chrome/locale/id/aboutTor.dtd | 5 ++
chrome/locale/id/browserOnboarding.properties | 12 ++---
chrome/locale/is/aboutTor.dtd | 5 ++
chrome/locale/it/aboutTor.dtd | 5 ++
chrome/locale/ja/aboutTor.dtd | 5 ++
chrome/locale/ka/aboutTor.dtd | 5 ++
chrome/locale/ko/aboutTor.dtd | 5 ++
chrome/locale/mk/aboutTor.dtd | 5 ++
chrome/locale/nb-NO/aboutTor.dtd | 5 ++
chrome/locale/nl/aboutTor.dtd | 7 ++-
chrome/locale/nl/torbutton.properties | 56 ++++++++++-----------
chrome/locale/pl/aboutTor.dtd | 5 ++
chrome/locale/pt-BR/aboutTor.dtd | 5 ++
chrome/locale/pt-BR/browserOnboarding.properties | 6 +--
chrome/locale/ro/aboutTor.dtd | 5 ++
chrome/locale/ru/aboutTor.dtd | 5 ++
chrome/locale/sv-SE/aboutTor.dtd | 5 ++
chrome/locale/tr/aboutTBUpdate.dtd | 2 +-
chrome/locale/tr/aboutTor.dtd | 5 ++
chrome/locale/vi/aboutTor.dtd | 5 ++
chrome/locale/zh-CN/aboutTor.dtd | 5 ++
chrome/locale/zh-TW/aboutTor.dtd | 5 ++
45 files changed, 264 insertions(+), 99 deletions(-)
diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd
index 610e2f77..5071a52a 100644
--- a/chrome/locale/ar/aboutTor.dtd
+++ b/chrome/locale/ar/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور.">
<!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور.">
<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "تبرع اليوم، وستجاريك موزيلا وتبرع بنفس المبلغ.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/bn-BD/aboutTor.dtd b/chrome/locale/bn-BD/aboutTor.dtd
index 76bc83da..e62b5f01 100644
--- a/chrome/locale/bn-BD/aboutTor.dtd
+++ b/chrome/locale/bn-BD/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।">
<!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। ">
<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! ">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "অর্থ সাহায্য করুন, এবং মজিলা সমপরিমাণ সাহায্য করবে। ">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd
index 1c3ac654..55cc87c6 100644
--- a/chrome/locale/ca/aboutTor.dtd
+++ b/chrome/locale/ca/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Feu que Tor segueixi fort.">
<!ENTITY aboutTor.donationBanner.buttonA "Feu una donació">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Dóna avui, i Mozilla donarà el mateix import.">
+<!ENTITY aboutTor.ey2019.tracking "El seguiment, la vigilància i la censura en línia estan a l'ordre del dia.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/ca/brand.dtd b/chrome/locale/ca/brand.dtd
index e9ff4544..fcb3a5b7 100644
--- a/chrome/locale/ca/brand.dtd
+++ b/chrome/locale/ca/brand.dtd
@@ -9,7 +9,7 @@
<!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">
-<!ENTITY plugins.installed.enable "Activa els complements">
-<!ENTITY plugins.installed.disable "Desactiva els complements">
-<!ENTITY plugins.installed.disable.tip "Clicqueu per evitar que es carreguin els complements de sistema">
+<!ENTITY plugins.installed.find "Feu clic per carregar els connectors del sistema instal·lats">
+<!ENTITY plugins.installed.enable "Activa els connectors">
+<!ENTITY plugins.installed.disable "Desactiva els connectors">
+<!ENTITY plugins.installed.disable.tip "Feu clic per impedir que es carreguin els connectors del sistema">
diff --git a/chrome/locale/ca/browserOnboarding.properties b/chrome/locale/ca/browserOnboarding.properties
index f2b473d1..1e72108e 100644
--- a/chrome/locale/ca/browserOnboarding.properties
+++ b/chrome/locale/ca/browserOnboarding.properties
@@ -15,13 +15,13 @@ onboarding.tour-tor-privacy.button=Aneu a la xarxa Tor
onboarding.tour-tor-network=Xarxa Tor
onboarding.tour-tor-network.title=Viatja per una xarxa descentralitzada.
onboarding.tour-tor-network.description=El navegador Tor us connecta a la xarxa Tor gestionada per milers de voluntaris de tot el món. A diferència d'una VPN, no hi ha cap punt de fracàs o entitat centralitzada que necessiteu confiar per gaudir d'Internet en privat.
-onboarding.tour-tor-network.description-para2=NOVETAT: Configuració de la xarxa Tor que podeu trobar a les Opcions, inclosa la capacitat per demanar línies de pont si el Tor està blocat.
+onboarding.tour-tor-network.description-para2=NOVETAT: Ara podeu trobar a les Preferències la Configuració de la xarxa Tor, que inclou la capacitat de sol·licitar línies de pont si el Tor està blocat.
onboarding.tour-tor-network.action-button=Configureu la vostra xarxa Tor
onboarding.tour-tor-network.button=Vés a la pantalla de circuits
onboarding.tour-tor-circuit-display=Pantalla de circuits
onboarding.tour-tor-circuit-display.title=Vegeu el vostre camí.
-onboarding.tour-tor-circuit-display.description=Per cada domini que visiteu, el vostre trànsit es retransmet i es xifra en un circuit a través de tres repetidors Tor al voltant del món. Cap lloc web sap d'on es connecta. Podeu sol·licitar un nou circuit fent clic a 'Nou circuit per a aquest lloc' a la nostra pantalla de circuits.
+onboarding.tour-tor-circuit-display.description=Per cada domini que visiteu, el vostre trànsit es retransmet i es xifra en un circuit a través de tres repetidors Tor al voltant del món. Cap lloc web sap d'on es connecta. Podeu sol·licitar un nou circuit fent clic a 'Circuit nou per a aquest lloc' a la pantalla de circuits.
onboarding.tour-tor-circuit-display.button=Veure el meu camí
onboarding.tour-tor-circuit-display.next-button=Vés a la seguretat
diff --git a/chrome/locale/ca/torbutton.dtd b/chrome/locale/ca/torbutton.dtd
index 4d4c2790..205577f2 100644
--- a/chrome/locale/ca/torbutton.dtd
+++ b/chrome/locale/ca/torbutton.dtd
@@ -2,7 +2,7 @@
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Nou circuit Tor per a aquest lloc">
<!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.networksettings "Preferències de la Xarxa Tor...7">
+<!ENTITY torbutton.context_menu.networksettings "Configuració de la xarxa Tor…">
<!ENTITY torbutton.context_menu.networksettings.key "N">
<!ENTITY torbutton.context_menu.downloadUpdate "Cerca una actualització del navegador Tor...">
<!ENTITY torbutton.context_menu.downloadUpdate.key "A">
@@ -10,40 +10,40 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Feu clic per a iniciar Torbutton">
<!ENTITY torbutton.prefs.security_settings "Paràmetres de seguretat del navegador Tor">
-<!ENTITY torbutton.cookiedialog.title "Configura proteccions de les galetes">
+<!ENTITY torbutton.cookiedialog.title "Gestiona les proteccions de les galetes">
<!ENTITY torbutton.cookiedialog.lockCol "Protegit">
<!ENTITY torbutton.cookiedialog.domainCol "Allotjador">
<!ENTITY torbutton.cookiedialog.nameCol "Nom">
<!ENTITY torbutton.cookiedialog.pathCol "Camí">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protegir les galetes">
-<!ENTITY torbutton.cookiedialog.removeCookie "Suprimir galetes">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Galetes sense protecció">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Suprimir totes amb protecció">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Protegir noves galetes">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No protegir noves galetes">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protegeix la galeta">
+<!ENTITY torbutton.cookiedialog.removeCookie "Elimina la galeta">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "No protegeixis la galeta">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Elimina-les totes menys les protegides">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protegeix les galetes noves">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No protegeixis les galetes noves">
<!ENTITY torbutton.prefs.sec_caption "Nivell de seguretat">
-<!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_caption_tooltip "El control lliscant de seguretat permet desactivar certes funcions del navegador que poden fer que sigui més vulnerable als intents d'atac 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_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 "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. ">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunes fonts, icones, símbols matemàtics, i imatges estan desactivats. ">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "L'àudio, el vídeo (mitjans de comunicació HTML5) i WebGL són click-to-play. ">
-<!ENTITY torbutton.prefs.sec_custom_warning "Personalitza">
-<!ENTITY torbutton.prefs.sec_overview "Deshabiliteu certes funcions web que es puguin fer servir per atacar la vostra seguretat i el vostre anonimat.">
-<!ENTITY torbutton.prefs.sec_standard_tooltip "Nivell de seguretat: estàndard">
-<!ENTITY torbutton.prefs.sec_safer_tooltip "Nivell de seguretat: més segur">
-<!ENTITY torbutton.prefs.sec_safest_tooltip "Nivell de seguretat: el més segur">
-<!ENTITY torbutton.prefs.sec_custom_summary "El navegador personalitzat ha obtingut uns paràmetres inusuals de seguretat. Per raons de privacitat i de seguretat, recomanem l'elecció d'un nivell de seguretat per defecte.">
-<!ENTITY torbutton.prefs.sec_restore_defaults "Torna a les opcions per defecte">
-<!ENTITY torbutton.prefs.sec_advanced_security_settings "Configuració de seguretat avançada...">
+<!ENTITY torbutton.prefs.sec_standard_description "Totes les funcions del navegador Tor i dels llocs web estan activades.">
+<!ENTITY torbutton.prefs.sec_safer_label "Més seguretat">
+<!ENTITY torbutton.prefs.sec_safer_description "Desactiva les funcions dels llocs web que sovint són perilloses, pot fer que alguns llocs perdin funcionalitat.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "En la configuració de més seguretat:">
+<!ENTITY torbutton.prefs.sec_safest_label "Màxima seguretat">
+<!ENTITY torbutton.prefs.sec_safest_description "Només es permeten les funcions dels llocs web necessàries per a llocs estàtics i serveis bàsics. Aquests canvis afecten les imatges, el contingut multimèdia i els scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "En la configuració de màxima seguretat:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Més informació">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "El JavaScript està desactivat per defecte en tots els llocs que no són HTTPS">
+<!ENTITY torbutton.prefs.sec_js_disabled "El JavaScript està desactivat per defecte en tots els llocs.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Es desactiven alguns tipus de lletra i símbols matemàtics. ">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Es desactiven alguns tipus de lletra, icones, símbols matemàtics i imatges. ">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "L'àudio i vídeo (contingut multimèdia HTML5) i WebGL són de tipus «clic per a reproduir». ">
+<!ENTITY torbutton.prefs.sec_custom_warning "Personalitzat">
+<!ENTITY torbutton.prefs.sec_overview "Desactiva certes funcions web que es poden fer servir per atacar la vostra seguretat i el vostre anonimat.">
+<!ENTITY torbutton.prefs.sec_standard_tooltip "Nivell de seguretat: Estàndard">
+<!ENTITY torbutton.prefs.sec_safer_tooltip "Nivell de seguretat: Més seguretat">
+<!ENTITY torbutton.prefs.sec_safest_tooltip "Nivell de seguretat: Màxima seguretat">
+<!ENTITY torbutton.prefs.sec_custom_summary "Les preferències personalitzades del navegador que heu triat fan que la configuració de seguretat sigui poc habitual. Per raons de privadesa i seguretat, recomanem que trieu un nivell de seguretat per defecte.">
+<!ENTITY torbutton.prefs.sec_restore_defaults "Restaura els valors per defecte">
+<!ENTITY torbutton.prefs.sec_advanced_security_settings "Configuració de seguretat avançada…">
<!ENTITY torbutton.circuit_display.title "Circuit de Tor">
-<!ENTITY torbutton.circuit_display.new_circuit " Circuit de Tor per a aquest lloc ">
+<!ENTITY torbutton.circuit_display.new_circuit "Circuit nou per a aquest lloc">
diff --git a/chrome/locale/ca/torbutton.properties b/chrome/locale/ca/torbutton.properties
index 791c0bc9..023d30db 100644
--- a/chrome/locale/ca/torbutton.properties
+++ b/chrome/locale/ca/torbutton.properties
@@ -27,7 +27,7 @@ torbutton.title.prompt_torbrowser = Informació important sobre Torbutton
torbutton.popup.prompt_torbrowser = Torbutton Funciona de forma diferent ara: ja no el pot tancar.\n\nHem fet aquest canvi per que l'ús de Torbutton en un navegador utilitzat també per navegar fora de l'entorn de Tor ja no es segur. Hi havien moltes incidències i no hem trobat cap altre solució per arreglar-les. \n\nSi desitja continuar utilitzant Firefox de forma habitual, ha de desinstalar Torbutton i descarregar Tor Browser Bundle. La seguretat de Tor Browser es millor que la de Firefox, fins i tot quan es fa servir Torbutton. \n\nPer desinstalar Torbutton, seleccioni Eines->Addons->Extensions and faci click sobre el botó Desinstalar al costat de Torbutton
torbutton.popup.short_torbrowser = Informació important sobre Torbutton! \n\nTorbutton ara és troba sempre activat.\n\nFaci click sobre Torbutton per més informació.
-torbutton.popup.confirm_plugins = Alguns Plugins com Flash poden afectar la seva privacitat i el seu anonimat.\n\nTambé poden curt-circuitar Tor per revelar la ubicació actual i l'adreça IP.\n\nEstà segur de voler activar aquests plugins? \n\n
+torbutton.popup.confirm_plugins = Alguns connectors, com el Flash, poden afectar la vostra privadesa i el vostre anonimat.\n\nTambé poden eludir el Tor i revelar la vostra ubicació i adreça IP actuals.\n\nSegur que voleu activar els connectors?
torbutton.popup.never_ask_again = No torneu a preguntar
torbutton.popup.confirm_newnym = El navegador Tor tancarà totes les finestres i pestanyes. Totes les sessions web es perdran. \n\nVol reiniciar el navegador Tor per reiniciar la seva identitat?\n\n
@@ -48,7 +48,7 @@ profileProblemTitle=Problema en el perfil %S
profileReadOnly=No pot executar %S des de un sistema de fitxers de només lectura. Si us plau, copie $S a un altra localització avanç de intentar usar-ho.
profileReadOnlyMac=No pot executar %S des de un sistema de fitxers de només lectura. Si us plau, copie $S a la seva carpeta Escriptori o Aplicacions avanç de intentar usar-ho.
profileAccessDenied=%S no té permisos per accedir al perfil. Si us plau, ajuste els permisos del seu sistema de fitxers i intente-ho de nou.
-profileMigrationFailed=La migració del vostre perfil %S ha fallat.\nEs fara servir una nova configuració.
+profileMigrationFailed=La migració del vostre perfil %S ha fallat.\nS'utilitzarà una configuració nova.
# "Downloading update" string for the hamburger menu (see #28885).
# This string is kept here for ease of translation.
diff --git a/chrome/locale/cs/aboutTor.dtd b/chrome/locale/cs/aboutTor.dtd
index 06e411e5..e28721f7 100644
--- a/chrome/locale/cs/aboutTor.dtd
+++ b/chrome/locale/cs/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru.">
<!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sílit.">
<!ENTITY aboutTor.donationBanner.buttonA "Přispějte">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Přispějte hned a Mozilla vás dar zdvojnásobí.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd
index 6fba4caf..c461bc15 100644
--- a/chrome/locale/da/aboutTor.dtd
+++ b/chrome/locale/da/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder.">
<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nu">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Giv i dag, og Mozilla vil matche din donation.">
+<!ENTITY aboutTor.ey2019.tracking "Sporing, overvågning og censur bruges meget online.">
+<!ENTITY aboutTor.ey2019.takeback "Tag internettet tilbage med Tor">
diff --git a/chrome/locale/de/aboutTor.dtd b/chrome/locale/de/aboutTor.dtd
index 1263d928..63d72391 100644
--- a/chrome/locale/de/aboutTor.dtd
+++ b/chrome/locale/de/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren.">
<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark.">
<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Gib noch heute, und Mozilla wird deiner Spende entsprechen.">
+<!ENTITY aboutTor.ey2019.tracking "Verfolgung, Überwachung und Zensur sind online weit verbreitet.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/de/browserOnboarding.properties b/chrome/locale/de/browserOnboarding.properties
index 9eea6582..44840405 100644
--- a/chrome/locale/de/browserOnboarding.properties
+++ b/chrome/locale/de/browserOnboarding.properties
@@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Öffne Tor-Netzwerk
onboarding.tour-tor-network=Tor-Netzwerk
onboarding.tour-tor-network.title=Bereise ein dezentrales Netzwerk.
onboarding.tour-tor-network.description=Der Tor Browser verbindet sich mit dem Tor-Netzwerk, das von tausenden Freiwilligen betrieben wird. Anders als bei einem VPN gibt es keinen zentralen Punkt, dem vertraut werden muss, um das Internet privat zu nutzen.
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences.
-onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
+onboarding.tour-tor-network.description-para2=NEU: Tor-Netzwerkeinstellungen, einschließlich der Möglichkeit, Brücken anzufordern, bei denen Tor blockiert ist, findest du jetzt in den Einstellungen.
+onboarding.tour-tor-network.action-button=Anpassen der Tor-Netzwerkeinstellungen
onboarding.tour-tor-network.button=Kanal-Ansicht öffnen
onboarding.tour-tor-circuit-display=Kanal-Ansicht
@@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=Neu
onboarding.tour-tor-update.prefix-updated=Aktualisiert
onboarding.tour-tor-toolbar=Symbolleiste
-onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu.
-onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
+onboarding.tour-tor-toolbar-update-9.0.title=Adieu Onion Button.
+onboarding.tour-tor-toolbar-update-9.0.description=Wir möchten, dass deine Erfahrungen mit Tor vollständig in den Tor Browser integriert werden.
+onboarding.tour-tor-toolbar-update-9.0.description-para2=Deshalb kannst du jetzt, anstatt den Onion-Button zu benutzen, deinen Tor-Kanal über das [i] in der URL-Leiste sehen und eine neue Identität über den Button in der Symbolleiste oder das [≡] Menü anfordern.
+onboarding.tour-tor-toolbar-update-9.0.button=Wie man eine neue Identität anfordert
onboarding.tour-tor-toolbar-update-9.0.next-button=Öffne Tor-Netzwerk
# Circuit Display onboarding.
diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd
index 1d23b6bb..33e005a0 100644
--- a/chrome/locale/el/aboutTor.dtd
+++ b/chrome/locale/el/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Διατηρήστε το Tor ισχυρό.">
<!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Δωρίστε σήμερα και το Mozilla θα δωρίσει το ίδιο ποσό!">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd
index 552db139..972aaf90 100644
--- a/chrome/locale/es-AR/aboutTor.dtd
+++ b/chrome/locale/es-AR/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor.">
<!ENTITY aboutTor.donationBanner.buttonA "Doná ahora">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Dá hoy, y Mozilla emparejará tu donación.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/es-ES/aboutTor.dtd b/chrome/locale/es-ES/aboutTor.dtd
index aff6157d..aa075278 100644
--- a/chrome/locale/es-ES/aboutTor.dtd
+++ b/chrome/locale/es-ES/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora.">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Dona hoy, y Mozilla igualará tu donación.">
+<!ENTITY aboutTor.ey2019.tracking "El rastreo, la vigilancia y la censura están muy extendidos en línea.">
+<!ENTITY aboutTor.ey2019.takeback "Recupera Internet con Tor.">
diff --git a/chrome/locale/eu/aboutTor.dtd b/chrome/locale/eu/aboutTor.dtd
index 227035d0..5d11d9cf 100644
--- a/chrome/locale/eu/aboutTor.dtd
+++ b/chrome/locale/eu/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Harpidetu Tor berrietara">
<!ENTITY aboutTor.donationBanner.line2e "Mantendu Tor indartsu.">
<!ENTITY aboutTor.donationBanner.buttonA "Egin dohaintza orain">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/fa/aboutTor.dtd b/chrome/locale/fa/aboutTor.dtd
index c097eb75..de6571ea 100644
--- a/chrome/locale/fa/aboutTor.dtd
+++ b/chrome/locale/fa/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "ثبتنام برای اخبار تور.">
<!ENTITY aboutTor.donationBanner.line2e "تور را محکم نگه دارید.">
<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "امروز کمک کنید و موزیلا با کمک مالی شما همراهی میکند.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/fr/aboutTor.dtd b/chrome/locale/fr/aboutTor.dtd
index fc6929b5..64a436cc 100644
--- a/chrome/locale/fr/aboutTor.dtd
+++ b/chrome/locale/fr/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor">
<!ENTITY aboutTor.donationBanner.line2e "Assurez la robustesse de Tor.">
<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Faites un don aujourd’hui et Mozilla fera un don équivalent.">
+<!ENTITY aboutTor.ey2019.tracking "Le pistage, la surveillance et la censure sont très répandus sur Internet.">
+<!ENTITY aboutTor.ey2019.takeback "Avec Tor, réappropriez-vous Internet.">
diff --git a/chrome/locale/fr/brand.properties b/chrome/locale/fr/brand.properties
index cdd6c395..964fe4ff 100644
--- a/chrome/locale/fr/brand.properties
+++ b/chrome/locale/fr/brand.properties
@@ -11,6 +11,6 @@ homePageSingleStartMain=Firefox Start, une page d’accueil rapide avec recherch
homePageImport=Importez votre page d’accueil à partir de %S
homePageMigrationPageTitle=Choix de la page d’accueil
-homePageMigrationDescription=Veuillez choisir la page d’accueil que vous souhaitez utiliser :
+homePageMigrationDescription=Veuillez choisir la page d’accueil que vous souhaitez utiliser :
syncBrandShortName=Synchro
diff --git a/chrome/locale/ga-IE/aboutTor.dtd b/chrome/locale/ga-IE/aboutTor.dtd
index 7f2f5d82..0d253b65 100644
--- a/chrome/locale/ga-IE/aboutTor.dtd
+++ b/chrome/locale/ga-IE/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor.">
<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Tabhair síntiús airgid inniu agus tabharfaidh Mozilla an méid céanna arís dúinn.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/he/aboutTor.dtd b/chrome/locale/he/aboutTor.dtd
index 5f1efea6..bee1b6d1 100644
--- a/chrome/locale/he/aboutTor.dtd
+++ b/chrome/locale/he/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor.">
<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק.">
<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "תן היום, ו־Mozilla תשווה את תרומתך.">
+<!ENTITY aboutTor.ey2019.tracking "מעקב, ציתות וצנזורה נפוצים ברשת.">
+<!ENTITY aboutTor.ey2019.takeback "קח בחזרה את האינטרנט עם Tor">
diff --git a/chrome/locale/he/torbutton.dtd b/chrome/locale/he/torbutton.dtd
index befc9fdc..e991b57d 100644
--- a/chrome/locale/he/torbutton.dtd
+++ b/chrome/locale/he/torbutton.dtd
@@ -6,9 +6,9 @@
<!ENTITY torbutton.context_menu.networksettings.key "N">
<!ENTITY torbutton.context_menu.downloadUpdate "בדוק אחר עדכון לדפדפן Tor...">
<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "הגנת עוגיות...">
+<!ENTITY torbutton.context_menu.cookieProtections "הגנות עוגיות...">
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "לחץ בכדי לאתחל את Torbutton">
+<!ENTITY torbutton.button.tooltip "לחץ כדי לאתחל את Torbutton">
<!ENTITY torbutton.prefs.security_settings "הגדרות אבטחה של דפדפן Tor">
<!ENTITY torbutton.cookiedialog.title "נהל הגנות עוגיות">
<!ENTITY torbutton.cookiedialog.lockCol "מוגן">
@@ -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_label "תקנית">
<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתר מושבתים.">
-<!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/hu/aboutTor.dtd b/chrome/locale/hu/aboutTor.dtd
index 5d8e327c..8d8077aa 100644
--- a/chrome/locale/hu/aboutTor.dtd
+++ b/chrome/locale/hu/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez.">
<!ENTITY aboutTor.donationBanner.line2e "Tartsuk meg a Tor-t erősnek.">
<!ENTITY aboutTor.donationBanner.buttonA "Támogasson most">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Adjon ma és a Mozilla is annyival támogat.">
+<!ENTITY aboutTor.ey2019.tracking "A követés, megfigyelés és cenzúra széles körben elterjedt online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/hu/browserOnboarding.properties b/chrome/locale/hu/browserOnboarding.properties
index cbb31d72..f3c81141 100644
--- a/chrome/locale/hu/browserOnboarding.properties
+++ b/chrome/locale/hu/browserOnboarding.properties
@@ -5,7 +5,7 @@
onboarding.tour-tor-welcome=Köszöntjük
onboarding.tour-tor-welcome.title=Készen van.
onboarding.tour-tor-welcome.description=A Tor Browser a legmagasabb adatvédelmet és biztonságot adja, miközben böngészik. Most védett a követéstől, megfigyeléstől és cenzúrázástól. Ez a rövid áttekintés megmutatja, hogyan.
-onboarding.tour-tor-welcome.next-button=Go to Privacy
+onboarding.tour-tor-welcome.next-button=Ugrás az Adatvédelemre
onboarding.tour-tor-privacy=Adatvédelem
onboarding.tour-tor-privacy.title=snub követők és figyelők.
@@ -16,27 +16,27 @@ onboarding.tour-tor-network=Tor Hálózat
onboarding.tour-tor-network.title=Utazzon egy decentralizált hálózaton.
onboarding.tour-tor-network.description=A Tor Böngésző összeköti Önt és a Tor hálózatát önkéntesek ezreivel a világon. A VPN-nel ellentétben nincs egypontos hibalehetőség vagy központosított entitás amiben bíznia kell, ahhoz, hogy az internetet privát használja.
onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences.
-onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
+onboarding.tour-tor-network.action-button=A Tor hálózati beállítások módosítása
onboarding.tour-tor-network.button=Ugrás az Áramkör megjelenítéshez
onboarding.tour-tor-circuit-display=Áramkör megjelenítő
onboarding.tour-tor-circuit-display.title=Tekintse meg útvonalát.
onboarding.tour-tor-circuit-display.description=Minden meglátogatott domainhez, a forgalma titkosítva továbbításra három a világban található Tor relén. Semmilyen weboldal nem fogja tudni honnan kapcsolódott. Kérhet új áramkört az 'Új áramkör ehhez a site-hoz"-ra kattintva az Áramkör megjelenítőn.
onboarding.tour-tor-circuit-display.button=Megtekintem az útvonalam
-onboarding.tour-tor-circuit-display.next-button=Go to Security
+onboarding.tour-tor-circuit-display.next-button=Ugrás a Biztonságra
onboarding.tour-tor-security=Biztonság
onboarding.tour-tor-security.title=Válassza ki élményét
onboarding.tour-tor-security.description=További beállítási lehetőségeket biztosítunk a böngésző biztonság növelése érdekében. A Biztonsági beállításaink lehetővé teszik, hogy blokkoljon olyan elemeket, amelyekkel támadható a számítógépe. Kattintson alább, hogy lássa, mely lehetőségek mit csinálnak.
onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them.
-onboarding.tour-tor-security-level.button=See Your Security Level
-onboarding.tour-tor-security-level.next-button=Go to Experience Tips
+onboarding.tour-tor-security-level.button=Biztonsági szintjének megtekintése
+onboarding.tour-tor-security-level.next-button=Ugrás a Tapasztalati tippekre
onboarding.tour-tor-expect-differences=Tapasztalati tippek
onboarding.tour-tor-expect-differences.title=Számítson különbségekre.
onboarding.tour-tor-expect-differences.description=Minden biztonsági és adatvédelmi lehetőséggel amit a Tor biztosít, a tapasztalatai az internet böngészésről eltérőek lehetnek. A dolgok egy kicsit lassabbak, a beállított biztonsági szintjétől, néhány elem nem működik vagy tölt be. Elképzelhető, hogy rákérdeznek arra, hogy ember vagy robot kérdést kap.
onboarding.tour-tor-expect-differences.button=Lásd GYIK
-onboarding.tour-tor-expect-differences.next-button=Go to Onion Services
+onboarding.tour-tor-expect-differences.next-button=Ugrás az Onion Szolgáltatásokra
onboarding.tour-tor-onion-services=Onion szolgáltatások
onboarding.tour-tor-onion-services.title=Legyen extra védett.
@@ -44,12 +44,12 @@ onboarding.tour-tor-onion-services.description=Az Onion szolgáltatások olyan o
onboarding.tour-tor-onion-services.button=Látogasson meg egy Onion-t
onboarding.tour-tor-onion-services.next-button=Kész
-onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S
+onboarding.overlay-icon-tooltip-updated2=Mi újdonság\na %S -ben.
onboarding.tour-tor-update.prefix-new=Új
onboarding.tour-tor-update.prefix-updated=Frissített
-onboarding.tour-tor-toolbar=Toolbar
-onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button.
+onboarding.tour-tor-toolbar=Eszköztár
+onboarding.tour-tor-toolbar-update-9.0.title=Viszlát Hagyma gomb
onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser.
onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu.
onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
diff --git a/chrome/locale/id/aboutTor.dtd b/chrome/locale/id/aboutTor.dtd
index 09bac66d..bde5f87e 100644
--- a/chrome/locale/id/aboutTor.dtd
+++ b/chrome/locale/id/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Bantu Tor tetap kuat.">
<!ENTITY aboutTor.donationBanner.buttonA "Donasi Sekarang">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/id/browserOnboarding.properties b/chrome/locale/id/browserOnboarding.properties
index 958fba00..e23064c2 100644
--- a/chrome/locale/id/browserOnboarding.properties
+++ b/chrome/locale/id/browserOnboarding.properties
@@ -16,7 +16,7 @@ onboarding.tour-tor-network=Jaringan Tor
onboarding.tour-tor-network.title=Mengelilingi jaringan yang terdesentralisasi.
onboarding.tour-tor-network.description=Tor Browser menghubungkan Anda ke jaringan Tor yang dijalankan oleh ribuan relawan di seluruh dunia. Tidak seperti VPN, tidak ada satu titik kesalahan atau entitas sentral yang perlu anda percaya untuk menikmati internet secara privat.
onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences.
-onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
+onboarding.tour-tor-network.action-button=Sesuaikan Pengaturan Jaringan Tor Anda
onboarding.tour-tor-network.button=Pergi ke Tampilan Sirkuit
onboarding.tour-tor-circuit-display=Tampilan Sirkuit
@@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.button=Lihat Jalan Saya
onboarding.tour-tor-circuit-display.next-button=Pergi ke Keamanan
onboarding.tour-tor-security=Keamanan
-onboarding.tour-tor-security.title=Putuskan pengalamanmu.
+onboarding.tour-tor-security.title=Pilih pengalaman Anda.
onboarding.tour-tor-security.description=Kami juga menyediakan Anda dengan pengaturan tambahan untuk meningkatkan keamanan peramban Anda. Pengaturan Keamanan kami mengizinkan anda untuk memblokir elemen-elemen yang dapat digunakan untuk menyerang komputer Anda. Klik di bawah untuk mengetahui apa saja yang dilakukan oleh pilihan yang berbeda.
onboarding.tour-tor-security.description-suffix=Catatan: Secara bawaan, NoScript dan HTTPS Everywhere\n tidak termasuk di dalam toolbar, namun Anda dapat menyesuaikan toolbar Anda untuk menambahkannya.
onboarding.tour-tor-security-level.button=Lihat Level Keamanan Anda
@@ -46,13 +46,13 @@ onboarding.tour-tor-onion-services.next-button=Selesai
onboarding.overlay-icon-tooltip-updated2=Lihat apa yang baru\ndi %S
onboarding.tour-tor-update.prefix-new=Baru
-onboarding.tour-tor-update.prefix-updated=Telah terupdate
+onboarding.tour-tor-update.prefix-updated=Telah diperbarui
onboarding.tour-tor-toolbar=Toolbar
-onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser.
+onboarding.tour-tor-toolbar-update-9.0.title=Selamat tinggal Onion Button.
+onboarding.tour-tor-toolbar-update-9.0.description=Kami menginginkan pengalaman Anda menggunakan Tor terintegrasi secara penuh dalam Tor Browser.
onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu.
-onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
+onboarding.tour-tor-toolbar-update-9.0.button=Bagaimana Meminta Identitas Baru
onboarding.tour-tor-toolbar-update-9.0.next-button=Pergi ke Jaringan Tor
# Circuit Display onboarding.
diff --git a/chrome/locale/is/aboutTor.dtd b/chrome/locale/is/aboutTor.dtd
index 2ee6f8d7..575bd805 100644
--- a/chrome/locale/is/aboutTor.dtd
+++ b/chrome/locale/is/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir.">
<!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku">
<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Gefðu í dag - og Mozilla mun jafna framlag þitt.">
+<!ENTITY aboutTor.ey2019.tracking "Eftirlit, ritskoðun og njósnir er útbreiddar hættur á internetinu.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/it/aboutTor.dtd b/chrome/locale/it/aboutTor.dtd
index 27cd6ab9..a7d1b2ff 100644
--- a/chrome/locale/it/aboutTor.dtd
+++ b/chrome/locale/it/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona Adesso">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Dai oggi, e Mozilla ricambierà la tua donazione.">
+<!ENTITY aboutTor.ey2019.tracking "Tracciamento, sorveglianza e censura sono ampiamente diffuse in rete.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd
index b657853f..c5421168 100644
--- a/chrome/locale/ja/aboutTor.dtd
+++ b/chrome/locale/ja/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。">
<!ENTITY aboutTor.donationBanner.line2e "Tor を強く保つ。">
<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "寄付をお願いします。Mozillaはあなたの寄付に裏切りません。">
+<!ENTITY aboutTor.ey2019.tracking "トラッキング、監視、検閲はネット上で広く行われています。">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/ka/aboutTor.dtd b/chrome/locale/ka/aboutTor.dtd
index 144ae7e5..f815fce2 100644
--- a/chrome/locale/ka/aboutTor.dtd
+++ b/chrome/locale/ka/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები.">
<!ENTITY aboutTor.donationBanner.line2e "შეინარჩუნეთ Tor ძლიერი.">
<!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "გაეცით დღესვე და Mozilla გააორმაგებს თქვენს შემოწირულობას.">
+<!ENTITY aboutTor.ey2019.tracking "მეთვალყურეობა, ზედამხედველობა და აკრძალვები მთელ ინტერნეტშია გავრცელებული.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/ko/aboutTor.dtd b/chrome/locale/ko/aboutTor.dtd
index 70898aed..84f24b44 100644
--- a/chrome/locale/ko/aboutTor.dtd
+++ b/chrome/locale/ko/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독.">
<!ENTITY aboutTor.donationBanner.line2e "Tor 를 강하게 유지하기.">
<!ENTITY aboutTor.donationBanner.buttonA "기부하기">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd
index 551ad217..17cb2320 100644
--- a/chrome/locale/mk/aboutTor.dtd
+++ b/chrome/locale/mk/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Пријавете се за Tor Вести.">
<!ENTITY aboutTor.donationBanner.line2e "Чувај го Tor силен.">
<!ENTITY aboutTor.donationBanner.buttonA "Донирај сега">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Донирај денес, и Mozilla ќе ја поврзе Вашата донација.">
+<!ENTITY aboutTor.ey2019.tracking "Следењето, надзорот, и цензурата се раширени насекаде низ Интернетот.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/nb-NO/aboutTor.dtd b/chrome/locale/nb-NO/aboutTor.dtd
index 7b7e3caf..9c21095a 100644
--- a/chrome/locale/nb-NO/aboutTor.dtd
+++ b/chrome/locale/nb-NO/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter.">
<!ENTITY aboutTor.donationBanner.line2e "Hold Tor sterk.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nå">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd
index 3cde0116..808cb3ed 100644
--- a/chrome/locale/nl/aboutTor.dtd
+++ b/chrome/locale/nl/aboutTor.dtd
@@ -22,7 +22,7 @@
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "H">
<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-browserhandleiding">
-<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een 501(c)(3)-non-profitorganisatie in de VS die rechten en vrijheden van de mens bevordert door vrije en open source anonimiteits- en privacytechnologieën te ontwikkelen en te implementeren, de onbeperkte beschikbaarheid en het gebruik ervan te steunen, en het begrip ervan in de wetenschap en bij het algemeen publiek te bevorderen.">
+<!ENTITY aboutTor.tor_mission.label "Het Tor-project is een 501(c)(3)-non-profitorganisatie in de VS die rechten en vrijheden van de mens bevordert door het ontwikkelen en implementeren van vrije anonimiteits- en privacytechnologieën, de onbeperkte beschikbaarheid en het gebruik ervan te steunen, en het begrip ervan in de wetenschap en bij het algemeen publiek te bevorderen.">
<!ENTITY aboutTor.getInvolved.label "Doe mee »">
<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Meld u aan voor de Tor-nieuwsbrief.">
<!ENTITY aboutTor.donationBanner.line2e "Houd Tor sterk.">
<!ENTITY aboutTor.donationBanner.buttonA "Doneer nu">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Geef vandaag, en Mozilla geeft hetzelfde bedrag.">
+<!ENTITY aboutTor.ey2019.tracking "Volgen, toezicht en censuur zijn wijdverspreid online.">
+<!ENTITY aboutTor.ey2019.takeback "Pak het internet terug met Tor">
diff --git a/chrome/locale/nl/torbutton.properties b/chrome/locale/nl/torbutton.properties
index 681ec93f..d618aed2 100644
--- a/chrome/locale/nl/torbutton.properties
+++ b/chrome/locale/nl/torbutton.properties
@@ -1,6 +1,6 @@
torbutton.circuit_display.internet = Internet
torbutton.circuit_display.ip_unknown = IP-adres onbekend
-torbutton.circuit_display.onion_site = Onion-site
+torbutton.circuit_display.onion_site = Onion-website
torbutton.circuit_display.this_browser = Deze browser
torbutton.circuit_display.relay = Relay
torbutton.circuit_display.tor_bridge = Bridge
@@ -9,46 +9,46 @@ torbutton.circuit_display.guard = Bewaking
torbutton.circuit_display.guard_note = Uw [Guard]-node mag niet worden gewijzigd.
torbutton.circuit_display.learn_more = Meer info
torbutton.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen.
-torbutton.panel.tooltip.disabled = Hier klikken om Tor in te schakelen
-torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen
+torbutton.panel.tooltip.disabled = Klik om Tor in te schakelen
+torbutton.panel.tooltip.enabled = Klik om Tor uit te schakelen
torbutton.panel.label.disabled = Tor uitgeschakeld
torbutton.panel.label.enabled = Tor ingeschakeld
-extensions.torbutton(a)torproject.org.description = Torbutton biedt een knop aan om Tor instellingen te configuren en snel en makkelijk privé surfdata op te schonen.
-torbutton.popup.external.title = Wilt u een extern bestandstype downloaden?
-torbutton.popup.external.app = Tor Browser kan dit bestand niet weergeven. U zou het moeten openen in een andere applicatie.\n\n
-torbutton.popup.external.note = Bepaalde type bestanden kunnen ervoor zorgen dat applicaties verbinding met het internet maken zonder Tor.\n\n
-torbutton.popup.external.suggest = Om veilig te surfen, zou u alleen bestanden moeten openen terwijl u offline bent, of gebruik een Tor Live CD zoals Tails.\n
-torbutton.popup.launch = Download bestand
+extensions.torbutton(a)torproject.org.description = Torbutton biedt een knop om Tor-instellingen te configureren en snel en makkelijk privénavigatiegegevens te wissen.
+torbutton.popup.external.title = Een extern bestandstype downloaden?
+torbutton.popup.external.app = Tor Browser kan dit bestand niet weergeven. U dient het met een andere toepassing te openen.\n\n
+torbutton.popup.external.note = Bepaalde typen bestanden kunnen ervoor zorgen dat toepassingen verbinding met het internet maken zonder Tor te gebruiken.\n\n
+torbutton.popup.external.suggest = Om veilig te surfen, zou u alleen gedownloade bestanden moeten openen terwijl u offline bent, of gebruik een Tor-live-cd zoals Tails.\n
+torbutton.popup.launch = Bestand downloaden
torbutton.popup.cancel = Annuleren
-torbutton.popup.dontask = Download bestanden automatisch vanaf nu
-torbutton.popup.no_newnym = Torbutton je niet veilig een nieuwe identiteit geven. Het heeft geen toegang tot de Tor Control Port.\n\nGebruik je de Tor Browser Bundle?
+torbutton.popup.dontask = Bestanden vanaf nu automatisch downloaden
+torbutton.popup.no_newnym = Torbutton kan u niet veilig een nieuwe identiteit geven. Het heeft geen toegang tot de Tor-controlepoort.\n\nGebruikt u Tor Browser Bundle?
torbutton.security_settings.menu.title = Beveiligingsinstellingen
-torbutton.title.prompt_torbrowser = Belangrijke Torbutton informatie
+torbutton.title.prompt_torbrowser = Belangrijke Torbutton-informatie
torbutton.popup.prompt_torbrowser = Torbutton werkt nu anders: u kunt het niet meer uitzetten.\n\nWe hebben deze wijziging doorgevoerd, omdat het niet veilig is om Torbutton te gebruiken in een browser die ook voor browsen zonder Tor wordt gebruikt. Er zaten te veel bugs in die we niet op een andere manier konden verhelpen.\n\nAls u Firefox op de normale manier wilt blijven gebruiken, zult u Torbutten moeten de-installeren en de Tor Browser Bundle moeten downloaden. De privacyeigenschappen van Tor Browser zijn ook superieur ten opzichte van de normale Firefox, zelfs wanneer Firefox met Torbutton wordt gebruikt.\n\nGa naar Extra->Add-ons->Extensies en klik naast Torbutton op Verwijderen om Torbutton te verwijderen.
-torbutton.popup.short_torbrowser = Belangrijke Torbutton Informatie!\n\nTorbutten is nu altijd ingeschakeld.\n\nKlik op de Torbutton voor meer informatie.
+torbutton.popup.short_torbrowser = Belangrijke Torbutton-informatie!\n\nTorbutton is nu altijd ingeschakeld.\n\nKlik op de Torbutton voor meer informatie.
-torbutton.popup.confirm_plugins = plug-ins zoals flash kunnen u privacy en anonimiteit schaden.⏎ ⏎ Ze kunnen ook tor negeren om zo u huidige locatie en IP adres uit te vinden⏎ ⏎ Weet u zeker dat u deze plug-ins wilt inschakelen?⏎ \n\n
-torbutton.popup.never_ask_again = Vraag me dit nooit meer.
-torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten. Alle website sessies zullen verloren gaan.\n\nHerstart de Tor Browser om je identiteit te resetten?\n\n
+torbutton.popup.confirm_plugins = Plug-ins zoals Flash kunnen inbreuk maken op uw privacy en anonimiteit.\n\nOok kunnen ze Tor omzeilen om uw huidige locatie en IP-adres te achterhalen.\n\nWeet u zeker dat u plug-ins wilt inschakelen?\n\n
+torbutton.popup.never_ask_again = Dit nooit meer vragen
+torbutton.popup.confirm_newnym = Tor Browser zal alle vensters en tabbladen sluiten. Alle websitesessies gaan hiermee verloren.\n\nTor Browser nu herstarten om uw identiteit opnieuw in te stellen?\n\n
-torbutton.maximize_warning = Het maximaliseren van Tor Browser stelt webpagina's in staat uw beeldschermgrootte vast te stellen; dit kan worden gebruikt om u te traceren. We raden aan dat u vensters van Tor Browser in hun oorspronkelijke grootte laat.
+torbutton.maximize_warning = Door Tor Browser te maximaliseren, kunnen websites uw beeldschermgrootte vaststellen, wat kan worden gebruikt om u te traceren. Het wordt aanbevolen de oorspronkelijke grootte van Tor Browser-vensters aan te houden.
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=De website (%S) heeft geprobeerd HTML5 canvas image data op te vragen, wat kan gebruikt worden voor een unieke identificatie van je computer.\n\nMoet Tor Browser deze website toestaan om HTML5 canvas image data op te vragen?
+canvas.siteprompt=De website (%S) heeft geprobeerd HTML5-canvas-afbeeldingsgegevens te extraheren, waarmee unieke identificatie van uw computer mogelijk is.\n\nMoet Tor Browser het extraheren van HTML5-canvas-afbeeldingsgegevens door deze website toestaan?
canvas.notNow=Niet nu
canvas.notNowAccessKey=N
canvas.allow=Toestaan en onthouden
-canvas.allowAccessKey=A
-canvas.never=Nooit toestaan voor deze site(aangeraden)
-canvas.neverAccessKey=e
+canvas.allowAccessKey=T
+canvas.never=Nooit voor deze website (aanbevolen)
+canvas.neverAccessKey=o
# Profile/startup error messages. Strings are kept here for ease of translation.
# LOCALIZATION NOTE: %S is the application name.
-profileProblemTitle=%S Profiel probleem
-profileReadOnly=Je kan %S niet draaien vanaf een alleen-lezen bestands-systeem Kopieer %S naar een andere locatie voor je het opnieuw probeert.
-profileReadOnlyMac=Je kan %S niet draaien vanaf een alleen lezen bestands-systeem. Kopieer %S naar je Bureaublad of de Applicatie map voordat je het opnieuw probeert.
-profileAccessDenied=%S heeft niet de juiste permissies om toegang te krijgen tot het profiel. Pas de bestands-systeem permissies aan en probeer het opnieuw.
-profileMigrationFailed=Migreren van uw bestaande %S profiel is mislukt.\nNieuwe instellingen zijn nu van toepassing.
+profileProblemTitle=%S-profielprobleem
+profileReadOnly=U kunt %S niet vanaf een alleen-lezen-bestandssysteem uitvoeren. Kopieer %S naar een andere locatie voordat u het probeert te gebruiken.
+profileReadOnlyMac=U kunt %S niet vanaf een alleen-lezen-bestandssysteem uitvoeren. Kopieer %S naar uw map Bureaublad of Programma’s voordat u het probeert te gebruiken.
+profileAccessDenied=%S heeft geen rechten voor toegang tot het profiel. Pas de bestandssysteemmachtigingen aan en probeer het opnieuw.
+profileMigrationFailed=Migratie van uw bestaande %S-profiel is mislukt.\nEr worden nieuwe instellingen gebruikt.
# "Downloading update" string for the hamburger menu (see #28885).
# This string is kept here for ease of translation.
@@ -56,5 +56,5 @@ profileMigrationFailed=Migreren van uw bestaande %S profiel is mislukt.\nNieuwe
updateDownloadingPanelUILabel=%S-update downloaden
# .Onion Page Info prompt. Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Verbinding versleuteld (Oniondienst, %1$S, %2$S bit sleutels, %3$S)
-pageInfo_OnionEncryption=Verbinding versleuteld (Oniondienst)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Verbinding versleuteld (Onion-dienst, %1$S, %2$S bits sleutels, %3$S)
+pageInfo_OnionEncryption=Verbinding versleuteld (Onion-dienst)
diff --git a/chrome/locale/pl/aboutTor.dtd b/chrome/locale/pl/aboutTor.dtd
index d0239848..56ffbd76 100644
--- a/chrome/locale/pl/aboutTor.dtd
+++ b/chrome/locale/pl/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Zapisz się na Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Utrzymuj Tor silnym.">
<!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Przekaż dziś, a Mozilla podwoi Twoją dotację.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd
index ec235f5b..c5c1237c 100644
--- a/chrome/locale/pt-BR/aboutTor.dtd
+++ b/chrome/locale/pt-BR/aboutTor.dtd
@@ -31,3 +31,8 @@
<!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Mantenha o Tor forte.">
<!ENTITY aboutTor.donationBanner.buttonA "Doe Agora">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Doe hoje, e a Mozilla duplicará a sua doação.">
+<!ENTITY aboutTor.ey2019.tracking "Rastreamento, vigilância e censura são comuns online.">
+<!ENTITY aboutTor.ey2019.takeback "Recupere a Internet com o Tor">
diff --git a/chrome/locale/pt-BR/browserOnboarding.properties b/chrome/locale/pt-BR/browserOnboarding.properties
index dfe66c08..6f7c8cab 100644
--- a/chrome/locale/pt-BR/browserOnboarding.properties
+++ b/chrome/locale/pt-BR/browserOnboarding.properties
@@ -2,14 +2,14 @@
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-onboarding.tour-tor-welcome=Bem Vindo
+onboarding.tour-tor-welcome=Boas vindas
onboarding.tour-tor-welcome.title=Você está pronto.
onboarding.tour-tor-welcome.description=O Tor Browser oferece o mais elevado padrão de privacidade e segurança para navegação na web. Você, agora, está protegido contra rastreamento, vigilância e censura. Esta rápida abordagem mostrará como ele faz isso.
-onboarding.tour-tor-welcome.next-button=Vá para privacidade
+onboarding.tour-tor-welcome.next-button=Vá para Privacidade
onboarding.tour-tor-privacy=Privacidade
onboarding.tour-tor-privacy.title=Despiste rastreadores e xeretas.
-onboarding.tour-tor-privacy.description=O navegador Tor isola cookies e deleta o histórico de navegação do browser depois de finalizada sua seção. Estas modificações garantem que sua privacidade e segurança estão protegidas no browser. Clique em 'Rede Tor' para aprender como nós lhe protegemos ao nível de rede.
+onboarding.tour-tor-privacy.description=O navegador Tor isola cookies e deleta o histórico de navegação do browser após o fim da sua sessão. Estas modificações garantem que sua privacidade e segurança estejam protegidas no browser. Clique em 'Rede Tor' para aprender como nós te protegemos ao nível de rede.
onboarding.tour-tor-privacy.button=Vá para a Rede Tor.
onboarding.tour-tor-network=Rede Tor
diff --git a/chrome/locale/ro/aboutTor.dtd b/chrome/locale/ro/aboutTor.dtd
index ceaf5b07..31550ff2 100644
--- a/chrome/locale/ro/aboutTor.dtd
+++ b/chrome/locale/ro/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Abonează-te la Tor News.">
<!ENTITY aboutTor.donationBanner.line2e "Menține Tor puternic.">
<!ENTITY aboutTor.donationBanner.buttonA "Donează Acum">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Donează azi, și Mozilla va dona în aceeași măsură.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/ru/aboutTor.dtd b/chrome/locale/ru/aboutTor.dtd
index fddd66c7..6e607bab 100644
--- a/chrome/locale/ru/aboutTor.dtd
+++ b/chrome/locale/ru/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным.">
<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Пожертвуйте сегодня и Mozilla удвоит ваше пожертвование.">
+<!ENTITY aboutTor.ey2019.tracking "Отслеживание, наблюдение и цензура широко распространены в интернете.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/sv-SE/aboutTor.dtd b/chrome/locale/sv-SE/aboutTor.dtd
index d403bb76..5ffca7c8 100644
--- a/chrome/locale/sv-SE/aboutTor.dtd
+++ b/chrome/locale/sv-SE/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter.">
<!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark.">
<!ENTITY aboutTor.donationBanner.buttonA "Donera nu">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Ge idag, och Mozilla kommer att matcha din donation.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/tr/aboutTBUpdate.dtd b/chrome/locale/tr/aboutTBUpdate.dtd
index 507b1988..d8e3612f 100644
--- a/chrome/locale/tr/aboutTBUpdate.dtd
+++ b/chrome/locale/tr/aboutTBUpdate.dtd
@@ -1,6 +1,6 @@
<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Değişiklik Günlüğü">
<!ENTITY aboutTBUpdate.updated "Tor Browser güncellendi.">
-<!ENTITY aboutTBUpdate.linkPrefix "Bu sürüm hakkındaki güncel bilgiler">
+<!ENTITY aboutTBUpdate.linkPrefix "Bu sürüm hakkındaki güncel bilgiler ">
<!ENTITY aboutTBUpdate.linkLabel "web sitemizden edinilebilir">
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.version "Sürüm">
diff --git a/chrome/locale/tr/aboutTor.dtd b/chrome/locale/tr/aboutTor.dtd
index fe6c9746..e3b214ab 100644
--- a/chrome/locale/tr/aboutTor.dtd
+++ b/chrome/locale/tr/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Tor Duyurularına Abone Olun">
<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koruyun.">
<!ENTITY aboutTor.donationBanner.buttonA "Bağış Yapın">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Bugün yaptığınız her bağış kadar Mozilla da bağış yapacak.">
+<!ENTITY aboutTor.ey2019.tracking "Çevrimiçi izleme, gözetim ve sansür uygulamaları yaygındır.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/vi/aboutTor.dtd b/chrome/locale/vi/aboutTor.dtd
index e69430c7..f06ed541 100644
--- a/chrome/locale/vi/aboutTor.dtd
+++ b/chrome/locale/vi/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor.">
<!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ.">
<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "Hãy đóng góp ngay hôm nay, và Mozilla sẽ đóng góp tương ứng với phần của bạn.">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/zh-CN/aboutTor.dtd b/chrome/locale/zh-CN/aboutTor.dtd
index 2048dc54..469bdd1a 100644
--- a/chrome/locale/zh-CN/aboutTor.dtd
+++ b/chrome/locale/zh-CN/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "订阅 Tor 的最新动态">
<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。">
<!ENTITY aboutTor.donationBanner.buttonA "立即捐助">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "现在捐款, Mozilla 会匹配你的捐赠。">
+<!ENTITY aboutTor.ey2019.tracking "跟踪,监视和审查在网上广泛存在。">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
diff --git a/chrome/locale/zh-TW/aboutTor.dtd b/chrome/locale/zh-TW/aboutTor.dtd
index e937a010..aa55d0f4 100644
--- a/chrome/locale/zh-TW/aboutTor.dtd
+++ b/chrome/locale/zh-TW/aboutTor.dtd
@@ -30,3 +30,8 @@
<!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。">
<!ENTITY aboutTor.donationBanner.line2e "使 Tor 更加茁壯。">
<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">
+
+<!-- End of year 2019 Fundraising campaign -->
+<!ENTITY aboutTor.ey2019.mozilla "今日您捐款,Mozilla 也會捐出相同數額。">
+<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online.">
+<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">
1
0

03 Jan '20
commit ce795172f37ee2a43a8e7de0c0d06816143880ad
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Fri Nov 1 00:30:04 2019 +0000
Bug 30783 - Use EOY URL for bottom link
---
chrome/content/aboutTor/aboutTor-content.js | 4 ++++
chrome/content/aboutTor/aboutTor.xhtml | 3 ++-
chrome/skin/aboutTor.css | 6 ++++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/chrome/content/aboutTor/aboutTor-content.js b/chrome/content/aboutTor/aboutTor-content.js
index 18bc40f9..13aa39da 100644
--- a/chrome/content/aboutTor/aboutTor-content.js
+++ b/chrome/content/aboutTor/aboutTor-content.js
@@ -141,6 +141,10 @@ var AboutTorListener = {
content.document
.getElementById(ey2019_elem_id)
.setAttribute("href", ey2019_locale_url);
+
+ content.document
+ .getElementById(ey2019_elem_id + "_bottom")
+ .setAttribute("href", ey2019_locale_url);
}
};
diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml
index e668b34e..92a941ac 100644
--- a/chrome/content/aboutTor/aboutTor.xhtml
+++ b/chrome/content/aboutTor/aboutTor.xhtml
@@ -91,7 +91,8 @@ window.addEventListener("pageshow", function() {
<div id="bottom">
<p id="donate" class="moreInfoLink">&aboutTor.donationBanner.line2e;
- <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a>
+ <a id="ey2019_donate_bottom" href="https://www.torproject.org/donate/donate-tbi-default">&aboutTor.donationBanner.buttonA;</a>
+ <a id="ey2019_donate_mobile_bottom" href="https://www.torproject.org/donate/donate-tbi-mobile-default">&aboutTor.donationBanner.buttonA;</a>
</p>
<p id="manual" class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label;
<a id="manualLink" target="_blank">&aboutTor.torbrowser_user_manual_link.label;</a></p>
diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css
index 28291d16..5da0e509 100644
--- a/chrome/skin/aboutTor.css
+++ b/chrome/skin/aboutTor.css
@@ -447,10 +447,12 @@ body[ey2019] .hideIfEY2019 {
display: none;
}
-body:not([mobile]) #ey2019_donate_mobile {
+body:not([mobile]) #ey2019_donate_mobile,
+body:not([mobile]) #ey2019_donate_mobile_bottom {
display: none;
}
-body[mobile] #ey2019_donate {
+body[mobile] #ey2019_donate,
+body[mobile] #ey2019_donate_bottom {
display: none;
}
1
0