[tor-commits] [tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser

gk Mon, 13 May 2019 02:48:40 -0700

commit 864170b5c1e0626dbfe3707d48037010596c42e5
Author: Kathy Brade <[email protected]>
Date:   Fri May 10 14:12:17 2019 -0400


    Bug 28044: Integrate Tor Launcher into tor-browser
    
    Update translations using our revised import-translations.sh script.
---
 chrome.manifest                                | 170 +++++++++++++
 jar.mn                                         | 331 +++++++++++++++++++++++++
 src/chrome/locale/ach/network-settings.dtd     |  62 -----
 src/chrome/locale/ach/torlauncher.properties   |  94 -------
 src/chrome/locale/ast/network-settings.dtd     |  62 -----
 src/chrome/locale/ast/torlauncher.properties   |  94 -------
 src/chrome/locale/ca-ES/torlauncher.properties |  49 ----
 src/chrome/locale/en-GB/network-settings.dtd   |  62 -----
 src/chrome/locale/en-GB/torlauncher.properties |  94 -------
 src/chrome/locale/ko/torlauncher.properties    |  98 ++++----
 src/chrome/locale/oc/network-settings.dtd      |  62 -----
 src/chrome/locale/oc/torlauncher.properties    |  94 -------
 src/chrome/locale/or/network-settings.dtd      |  62 -----
 src/chrome/locale/or/torlauncher.properties    |  94 -------
 src/chrome/locale/pt-PT/network-settings.dtd   |  62 +++++
 src/chrome/locale/pt-PT/torlauncher.properties |  94 +++++++
 src/chrome/locale/son/network-settings.dtd     |  62 -----
 src/chrome/locale/son/torlauncher.properties   |  94 -------
 src/chrome/locale/ur/network-settings.dtd      |  28 +--
 19 files changed, 720 insertions(+), 1048 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
new file mode 100644
index 0000000..2f55271
--- /dev/null
+++ b/chrome.manifest
@@ -0,0 +1,170 @@
+### Copyright (c) 2019, The Tor Project, Inc.
+### See LICENSE for licensing information.
+
+content torlauncher chrome/content/
+
+skin torlauncher classic/1.0 chrome/skin/
+
+resource torlauncher ./
+
+# Firefox 4-style component registration
+component {4F476361-23FB-43EF-A427-B36A14D3208E} components/tl-protocol.js
+contract @torproject.org/torlauncher-protocol-service;1 
{4F476361-23FB-43EF-A427-B36A14D3208E}
+
+component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} components/tl-process.js
+contract @torproject.org/torlauncher-process-service;1 
{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}
+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 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 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 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 kn chrome/locale/kn/
+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 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 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 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
new file mode 100644
index 0000000..b078202
--- /dev/null
+++ b/jar.mn
@@ -0,0 +1,331 @@
+#filter substitution
+### Copyright (c) 2019, The Tor Project, Inc.
+### See LICENSE for licensing information.
+
+torlauncher.jar:
+  components/     (src/components/*)
+
+% content  torlauncher %content/
+  content/        (src/chrome/content/*)
+
+  modules/        (src/modules/*)
+
+% resource torlauncher  %
+
+% skin     torlauncher  default %skin/
+  skin/           (src/chrome/skin/*)
+
+% component {4F476361-23FB-43EF-A427-B36A14D3208E}         
%components/tl-protocol.js
+% contract  @torproject.org/torlauncher-protocol-service;1 
{4F476361-23FB-43EF-A427-B36A14D3208E}
+
+% component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}         
%components/tl-process.js
+% contract  @torproject.org/torlauncher-process-service;1  
{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}
+
+% category  profile-after-change TorProcessService 
@torproject.org/torlauncher-process-service;1
+
+% 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 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 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 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/
+  locale/is/ (src/chrome/locale/is/*)
+% locale torlauncher it %locale/it/
+  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 kn %locale/kn/
+  locale/kn/ (src/chrome/locale/kn/*)
+% 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 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 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 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/src/chrome/locale/ach/network-settings.dtd 
b/src/chrome/locale/ach/network-settings.dtd
deleted file mode 100644
index c6c5687..0000000
--- a/src/chrome/locale/ach/network-settings.dtd
+++ /dev/null
@@ -1,62 +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.&#160; 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.&#160;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.&#160; Each type of 
bridge uses a different method to avoid censorship.&#160; 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.&#160; 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.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ach/torlauncher.properties 
b/src/chrome/locale/ach/torlauncher.properties
deleted file mode 100644
index ca9774b..0000000
--- a/src/chrome/locale/ach/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=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.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/ast/network-settings.dtd 
b/src/chrome/locale/ast/network-settings.dtd
deleted file mode 100644
index c6c5687..0000000
--- a/src/chrome/locale/ast/network-settings.dtd
+++ /dev/null
@@ -1,62 +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.&#160; 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.&#160;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.&#160; Each type of 
bridge uses a different method to avoid censorship.&#160; 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.&#160; 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.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ast/torlauncher.properties 
b/src/chrome/locale/ast/torlauncher.properties
deleted file mode 100644
index ca9774b..0000000
--- a/src/chrome/locale/ast/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=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.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/ca-ES/torlauncher.properties 
b/src/chrome/locale/ca-ES/torlauncher.properties
deleted file mode 100644
index 65407db..0000000
--- a/src/chrome/locale/ca-ES/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/en-GB/network-settings.dtd 
b/src/chrome/locale/en-GB/network-settings.dtd
deleted file mode 100644
index c6c5687..0000000
--- a/src/chrome/locale/en-GB/network-settings.dtd
+++ /dev/null
@@ -1,62 +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.&#160; 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.&#160;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.&#160; Each type of 
bridge uses a different method to avoid censorship.&#160; 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.&#160; 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.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/en-GB/torlauncher.properties 
b/src/chrome/locale/en-GB/torlauncher.properties
deleted file mode 100644
index ca9774b..0000000
--- a/src/chrome/locale/en-GB/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=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.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/ko/torlauncher.properties 
b/src/chrome/locale/ko/torlauncher.properties
index 2e32da2..7b430b3 100644
--- a/src/chrome/locale/ko/torlauncher.properties
+++ b/src/chrome/locale/ko/torlauncher.properties
@@ -3,43 +3,43 @@
 
 torlauncher.error_title=Tor ë°ì²
 
-torlauncher.tor_exited_during_startup=ììíë ëì Torê° ì¢
ë£ëììµëë¤. ì´ê²ì torrc íì¼ì ì¤ë¥, Tor ëë ìì¤íì 
ë¤ë¥¸ íë¡ê·¸ë¨ì ë²ê·¸ ëë íëì¨ì´ ê²°í¨ì¼ë¡ ì¸í ê²ì¼ 
ì ììµëë¤. ê¸°ë³¸ ë¬¸ì ë¥¼ í´ê²°íê³  Torë¥¼ ë¤ì ììí  
ëê¹ì§ Tor ë¸ë¼ì°ì ë ììëì§ ììµëë¤.
+torlauncher.tor_exited_during_startup=ììíë ëì Torê° ì¢
ë£ëììµëë¤. ì´ê²ì torrc íì¼ì ì¤ë¥, Tor ë PCì ë¤ë¥¸ 
íë¡ê·¸ë¨ì ë²ê·¸, í¹ì íëì¨ì´ ê²°í¨ì¼ë¡ ì¸í ê²ì¼ ì 
ììµëë¤. ê¸°ë³¸ ë¬¸ì ë¥¼ í´ê²°íê³  Torë¥¼ ë¤ì ììí  ëê¹ì§ 
Tor ë¸ë¼ì°ì ë ììëì§ ììµëë¤.
 torlauncher.tor_exited=Torê° ìê¸°ì¹ ìê² ì¢ë£ëììµëë¤. 
ì´ê²ì Tor ìì²´ì ì¤ë¥, ì¬ì©ì ìì¤íì í íë¡ê·¸ë¨ ëë 
íëì¨ì´ì ì¤ë¥ ëë¬¸ì¼ ì ììµëë¤. ì¬ì©ìê° Torë¥¼ 
ì¬ìì íê¸° ì ê¹ì§, Tor ë¸ë¼ì°ì ë ì´ë í ì¹ì¬ì´í¸ì ì 
ìíì§ ììµëë¤. ë¬¸ì ê° ê³ìëë¤ë©´, ì§ìíìê² ë¹ì ì 
Tor ë¡ê·¸ë¥¼ ë³´ë´ì£¼ììì¤.
-torlauncher.tor_exited2=Torë¥¼ ì¬ììí´ë ë¸ë¼ì°ì  íì ë«íì§ 
ìì.
+torlauncher.tor_exited2=Torë¥¼ ì¬ììí´ë ë¸ë¼ì°ì  íì ë«íì§ 
ììµëë¤.
 torlauncher.tor_controlconn_failed=Tor ì ì´ í¬í¸ì ì°ê²°í  ì 
ììµëë¤.
-torlauncher.tor_failed_to_start=Tor ìì ì¤í¨.
+torlauncher.tor_failed_to_start=Tor ììì ì¤í¨íìµëë¤.
 torlauncher.tor_control_failed=Tor ì ì´ì ì¤í¨íìµëë¤.
-torlauncher.tor_bootstrap_failed=Tor ë¤í¸ìí¬ ì°ê²° ì¤ì  ì¤í¨
+torlauncher.tor_bootstrap_failed=Tor ë¤í¸ìí¬ ì°ê²°ì ì¤í¨íìµëë¤.
 torlauncher.tor_bootstrap_failed_details=%1$S ì¤í¨ (%2$S)
 
 torlauncher.unable_to_start_tor=Torë¥¼ ììí  ì ììµëë¤.\n\n%S
 torlauncher.tor_missing=Tor ì¤í íì¼ì´ ììµëë¤.
 torlauncher.torrc_missing=torrc íì¼ì´ ì¬ë¼ì¡ì¼ë©° ìì± í  ì 
ììµëë¤.
 torlauncher.datadir_missing=Tor ë°ì´í° ëë í ë¦¬ê° ì¡´ì¬íì§ 
ìì¼ë©° ìì±í  ì ììµëë¤.
-torlauncher.password_hash_missing=í´ì¬ ìí¸ íë ì¤í¨
+torlauncher.password_hash_missing=í´ì¬ ìí¸ì ì»ì´ì¤ì§ ëª» 
íììµëë¤.
 
 torlauncher.failed_to_get_settings=Tor ì¤ì ì ì°¾ì ì ììµëë¤.\n\n%S
 torlauncher.failed_to_save_settings=Tor ì¤ì ì ì ì¥í  ì 
ììµëë¤.\n\n%S
-torlauncher.ensure_tor_is_running=Torê° ì¤íì¤ì¸ ì§ íì¸íì¬ 
ì£¼ììì¤.
+torlauncher.ensure_tor_is_running=Torê° ì¤íì¤ì¸ì§ íì¸íì¬ 
ì£¼ììì¤.
 
-torlauncher.error_proxy_addr_missing=ì¸í°ë·ì ì ìíê¸° ìí´ 
íë¡ìë¥¼ ì¬ì©íë¤ë©´, Ipì£¼ìë í¸ì¤í¸ ì´ë¦, ê·¸ë¦¬ê³  í¬í¸ 
ë²í¸ë¥¼ ìë ¥í´ì¼ í©ëë¤.
+torlauncher.error_proxy_addr_missing=ì¸í°ë·ì ì ìíê¸° ìí´ 
íë¡ìë¥¼ ì¬ì©íë¤ë©´, IPì£¼ìë í¸ì¤í¸ ì´ë¦, ê·¸ë¦¬ê³  í¬í¸ 
ë²í¸ë¥¼ ìë ¥í´ì¼ í©ëë¤.
 torlauncher.error_proxy_type_missing=íë¡ì ì íì ì íí´ 
ì£¼ììì¤.
 torlauncher.error_bridges_missing=íë ì´ìì bridgeë¥¼ ì§ì í´ì¼ 
í©ëë¤.
 torlauncher.error_default_bridges_type_missing=ì ê³µë ë¸ë¦¬ì§ì ì ì¡ 
ì íì ì íí´ì¼í©ëë¤.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
-torlauncher.error_bridge_bad_default_type=ì ì¡ ì í %Sê° ì ê³µ í 
ë¸ë¦¬ì§ ì í¨í ê²ì´ ìëëë¤. ì¤ì ì ì¡°ì íììì¤.
+torlauncher.error_bridgedb_bridges_missing=ë¸ë¦¿ì§ë¥¼ ìì²í´ì£¼ì¸ì.
+torlauncher.error_bridge_bad_default_type=ì ì¡ ì í %Sê° ì ê³µí 
ë¸ë¦¬ì§ë ì í¨íì§ ììµëë¤. ì¤ì ì ì¡°ì íììì¤.
 
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(ì¤êµìì ì¼íê¸°)
+torlauncher.bridge_suffix.meek-azure=(ì¤êµìì ì¼íê¸°)
 
-torlauncher.request_a_bridge=Request a Bridgeâ¦
-torlauncher.request_a_new_bridge=Request a New Bridgeâ¦
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed 
to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.request_a_bridge=ë¸ë¦¿ì§ ìì²íê¸°
+torlauncher.request_a_new_bridge=ìë¡ì´ ë¸ë¦¿ì§ ìì²íê¸°
+torlauncher.contacting_bridgedb=ë¸ë¦¿ì§DBì ì°ê²°íê³  ìì¼ë, ì ì 
ê¸°ë¤ë ¤ì£¼ì¸ì.
+torlauncher.captcha_prompt=ë¸ë¦¿ì§ë¥¼ ìì²íê¸° ìí´ CAPCHAë¥¼ 
íì´ì£¼ì¸ì.
+torlauncher.bad_captcha_solution=íì´ê° ë§ì§ ììµëë¤. ë¤ì 
ìëí´ì£¼ì¸ì.
+torlauncher.unable_to_get_bridge=ë¸ë¦¿ì§DBë¡í° ë¸ë¦¿ì§ë¥¼ ì»ì´ì¤ì§ 
ëª» íììµëë¤.\n\n%S
+torlauncher.no_meek=ì´ ë¸ë¼ì°ì ë ë¸ë¦¿ì§ íë³´ì íìí ì¨ì 
í ê¸°ë¥ì ìí´ ì¤ì ëì´ ìì§ ììµëë¤.
+torlauncher.no_bridges_available=ì§ê¸ì ì¬ì©í  ì ìë ë¸ë¦¿ì§ê° 
ììµëë¤. ì£ì¡í©ëë¤.
 
 torlauncher.connect=ì°ê²°
 torlauncher.restart_tor=Tor ì¬ìì
@@ -47,40 +47,40 @@ torlauncher.quit=ëë´ê¸°
 torlauncher.quit_win=ì¢ë£
 torlauncher.done=ìë£
 
-torlauncher.forAssistance=ì§ìì ì°ê²° %S
+torlauncher.forAssistance=ëìì´ íìíë©´, %Sì ì°ë½íììì¤.
 torlauncher.forAssistance2=ëìì´ íìíë©´ %Së¥¼ ë°©ë¬¸íììì¤.
 
-torlauncher.copiedNLogMessages=ë³µì¬ ìë£. %S Tor ë¡ê·¸ ë©ìì§ë í
ì¤í¸ í¸ì§ê¸° ë ì´ë©ì¼ ë©ìì§ì ë¶ì¬ ë£ì ì ìë ìíê° 
ë©ëë¤.
+torlauncher.copiedNLogMessages=ë³µì¬ ìë£. %S Tor ë¡ê·¸ ë©ìì§ë í
ì¤í¸ í¸ì§ê¸°ë ì´ë©ì¼ ë©ìì§ì ë¶ì¬ë£ì ì ìë ìíê° 
ë©ëë¤.
 
 torlauncher.bootstrapStatus.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.conn_pt=ë¸ë¦¿ì§ì ì°ê²°íê³  ììµëë¤.
+torlauncher.bootstrapStatus.conn_done_pt=ë¸ë¦¿ì§ì ì°ê²°ëììµëë¤.
+torlauncher.bootstrapStatus.conn_proxy=íë¡ìì ì°ê²°íê³  ììµëë¤.
+torlauncher.bootstrapStatus.conn_done_proxy=íë¡ìì ì°ê²°ëììµëë¤.
+torlauncher.bootstrapStatus.conn=Tor ë¦´ë ì´ì ì°ê²°íê³  ììµëë¤.
+torlauncher.bootstrapStatus.conn_done=Tor ë¦´ë ì´ì ì°ê²°ëììµëë¤.
+torlauncher.bootstrapStatus.handshake=Tor ë¦´ë ì´ì ë¤ê³ íê³  
ììµëë¤.
+torlauncher.bootstrapStatus.handshake_done=Tor ë¦´ë ì´ìì ë¤ê³ ë¥¼ 
ìë£íììµëë¤.
 torlauncher.bootstrapStatus.onehop_create=ê²½ë¡ìì ì°ê²°ì 
ìí¸íí´ì ë§ë¤ê³  ìì´ì
-torlauncher.bootstrapStatus.requesting_status=ë¤í¸ìí¬ì ìíë¥¼ ê°ì 
¸ì¤ëì¤
-torlauncher.bootstrapStatus.loading_status=ë¤í¸ìí¬ì ìíë¥¼ ìì²ì¤
-torlauncher.bootstrapStatus.loading_keys=ê¶í ì¸ì¦ìë¥¼ ë¡ë©ì¤
-torlauncher.bootstrapStatus.requesting_descriptors=ì¤ê³ìë² ì ë³´ë¥¼ 
ìì²ì¤
-torlauncher.bootstrapStatus.loading_descriptors=ì¤ê³ìë² ì ë³´ë¥¼ 
ë¡ë©ì¤
-torlauncher.bootstrapStatus.enough_dirinfo=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=Tor ë¤í¸ìí¬ì ì°ê²° ì±ê³µ!
+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=ì°íë¡ ì°ê²°: Tor ë¦´ë ì´ì 
ì°ê²°íê³  ììµëë¤.
+torlauncher.bootstrapStatus.ap_conn_done=ì°íë¡ ì°ê²°: Tor ë¦´ë ì´ì 
ì°ê²°ëììµëë¤.
+torlauncher.bootstrapStatus.ap_handshake=ì°íë¡ ì°ê²°: Tor ë¦´ë ì´ì 
ë¤ê³ íê³  ììµëë¤.
+torlauncher.bootstrapStatus.ap_handshake_done=ì°íë¡ ì°ê²°: Tor ë¦´ë 
ì´ìì ë¤ê³ ê° ëë¬ìµëë¤.
+torlauncher.bootstrapStatus.circuit_create=ì°íë¡ ì°ê²°: Tor ì°íë¡ê° 
ì°ê²°ëììµëë¤.
+torlauncher.bootstrapStatus.done=Tor ë¤í¸ìí¬ì ì°ê²°ëììµëë¤.
 
 torlauncher.bootstrapWarning.done=ìë£
-torlauncher.bootstrapWarning.connectrefused=ì°ê²°ì´ ê±°ë¶ë¨
+torlauncher.bootstrapWarning.connectrefused=ì°ê²°ì´ ê±°ë¶ëììµëë¤.
 torlauncher.bootstrapWarning.misc=ê¸°í
 torlauncher.bootstrapWarning.resourcelimit=ë¦¬ìì¤ ë¶ì¡±
 torlauncher.bootstrapWarning.identity=ê³ì  ë¶ì¼ì¹
@@ -89,6 +89,6 @@ torlauncher.bootstrapWarning.noroute=í¸ì¤í¸ë¡ì ì°ê²° 
ê²½ë¡ê° ìì
 torlauncher.bootstrapWarning.ioerror=ì½ê¸° / ì°ê¸° ì¤ë¥
 torlauncher.bootstrapWarning.pt_missing=íë¬ê·¸ê° ê°ë¥í ì ì¡ì 
ì°¾ì ì ììµëë¤
 
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the 
server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to 
the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=ìë²ìì ì°ê²°ì´ 
ëì´ì¡ìµëë¤.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=ìë²ì ì°ê²°í  ì 
ììµëë¤.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=íë¡ìì ì°ê²°í  
ì ììµëë¤.
diff --git a/src/chrome/locale/oc/network-settings.dtd 
b/src/chrome/locale/oc/network-settings.dtd
deleted file mode 100644
index c6c5687..0000000
--- a/src/chrome/locale/oc/network-settings.dtd
+++ /dev/null
@@ -1,62 +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.&#160; 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.&#160;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.&#160; Each type of 
bridge uses a different method to avoid censorship.&#160; 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.&#160; 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.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/oc/torlauncher.properties 
b/src/chrome/locale/oc/torlauncher.properties
deleted file mode 100644
index ca9774b..0000000
--- a/src/chrome/locale/oc/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=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.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/or/network-settings.dtd 
b/src/chrome/locale/or/network-settings.dtd
deleted file mode 100644
index c6c5687..0000000
--- a/src/chrome/locale/or/network-settings.dtd
+++ /dev/null
@@ -1,62 +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.&#160; 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.&#160;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.&#160; Each type of 
bridge uses a different method to avoid censorship.&#160; 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.&#160; 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.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/or/torlauncher.properties 
b/src/chrome/locale/or/torlauncher.properties
deleted file mode 100644
index ca9774b..0000000
--- a/src/chrome/locale/or/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=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.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/pt-PT/network-settings.dtd 
b/src/chrome/locale/pt-PT/network-settings.dtd
new file mode 100644
index 0000000..f62d4c8
--- /dev/null
+++ b/src/chrome/locale/pt-PT/network-settings.dtd
@@ -0,0 +1,62 @@
+<!ENTITY torsettings.dialog.title "DefiniÃ§Ãµ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 Tor Browser">
+<!ENTITY torlauncher.localePicker.prompt "Por favor, selecione um idioma.">
+
+<!-- For "first run" wizard: -->
+
+<!ENTITY torSettings.connectPrompt "Clique em &quot;Ligar&quot; 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.configure "Configurar">
+<!ENTITY torSettings.connect "Ligar">
+
+<!-- Other: -->
+
+<!ENTITY torsettings.startingTor "A aguardar que o Tor inicie...">
+<!ENTITY torsettings.restartTor "Reiniciar o Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigurar">
+
+<!ENTITY torsettings.discardSettings.prompt "Configurou as pontes do Tor ou 
inseriu as definiÃ§Ãµes do proxy local.&#160; 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 "Palavra-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 "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 "O Tor Ã© censurado no meu paÃs">
+<!ENTITY torsettings.useBridges.default "Selecionar uma ponte integrada">
+<!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte">
+<!ENTITY torsettings.useBridges.bridgeDB "Solicitar uma ponte do 
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 da 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 "PoderÃ¡ ser necessÃ¡rio um proxy local ao 
ligar-se atravÃ©s de uma empresa, escola ou universidade. Se nÃ£o tiver certeza 
se Ã© necessÃ¡rio um proxy, verifique as definiÃ§Ãµes da Internet noutro 
navegador ou verifique as definiÃ§Ãµes da 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.&#160; Cada tipo de ponte 
utiliza um mÃ©todo diferente para evitar a censura.&#160; Os &quot;obfs&quot; 
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 a esses serviÃ§o, em 
vez de 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.html#support.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nÃ³s 
estabelecemos uma ligaÃ§Ã£o Ã  rede Tor.&#160; Isto pode demorar alguns 
minutos.">
diff --git a/src/chrome/locale/pt-PT/torlauncher.properties 
b/src/chrome/locale/pt-PT/torlauncher.properties
new file mode 100644
index 0000000..d010d6c
--- /dev/null
+++ b/src/chrome/locale/pt-PT/torlauncher.properties
@@ -0,0 +1,94 @@
+### 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 um erro no 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 sites da Web. Se o problema persistir, por favor, envie uma cÃ³pia do 
'Registo de Eventos' do seu Tor para a equipa de apoio.
+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=Falhou a inicializaÃ§Ã£o do Tor.
+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 Ã  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 torrc estÃ¡ em falta e nÃ£o foi possÃvel 
criÃ¡-lo.
+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.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.
+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=Solicitar uma Ponte...
+torlauncher.request_a_new_bridge=Solicitar uma Nova Ponte...
+torlauncher.contacting_bridgedb=A contactar a 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=Sair
+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=A iniciar
+torlauncher.bootstrapStatus.conn_pt=A conectar Ã  ponte
+torlauncher.bootstrapStatus.conn_done_pt=Conectado Ã  ponte
+torlauncher.bootstrapStatus.conn_proxy=A conectar ao proxy
+torlauncher.bootstrapStatus.conn_done_proxy=Conectado ao proxy
+torlauncher.bootstrapStatus.conn=A conectar a um retransmissor Tor
+torlauncher.bootstrapStatus.conn_done=Conectado a um retransmissor Tor
+torlauncher.bootstrapStatus.handshake=A negociar com um retransmissor Tor
+torlauncher.bootstrapStatus.handshake_done=Terminada a negociaÃ§Ã£o com um 
retransmissor Tor
+torlauncher.bootstrapStatus.onehop_create=A estabelecer uma ligaÃ§Ã£o de 
diretÃ³rio 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=Terminou o carregamento da 
informaÃ§Ã£o do retransmissor
+torlauncher.bootstrapStatus.ap_conn_pt=Construir circuitos: a conectar a uma 
ponte
+torlauncher.bootstrapStatus.ap_conn_done_pt=Construir circuitos: conectado a 
uma ponte
+torlauncher.bootstrapStatus.ap_conn_proxy=Construir circuitos: a conectar a um 
proxy
+torlauncher.bootstrapStatus.ap_conn_done_proxy=Construir circuitos: conectado 
a um proxy
+torlauncher.bootstrapStatus.ap_conn=Construir circuitos: a conectar a um 
retransmissor Tor
+torlauncher.bootstrapStatus.ap_conn_done=Construir circuitos: conectado a um 
retransmissor Tor
+torlauncher.bootstrapStatus.ap_handshake=Construir circuitos: a negociar com 
um retransmissor Tor
+torlauncher.bootstrapStatus.ap_handshake_done=Construir circuitos: terminada a 
negociaÃ§Ã£o com um retransmissor Tor
+torlauncher.bootstrapStatus.circuit_create=Construir circuitos: a estabelecer 
um circuito Tor
+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=o tempo de ligaÃ§Ã£o expirou
+torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro
+torlauncher.bootstrapWarning.ioerror=rrro de leitura/gravaÃ§Ã£o 
+torlauncher.bootstrapWarning.pt_missing=falta o transporte de ligaÃ§Ã£o
+
+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/son/network-settings.dtd 
b/src/chrome/locale/son/network-settings.dtd
deleted file mode 100644
index c6c5687..0000000
--- a/src/chrome/locale/son/network-settings.dtd
+++ /dev/null
@@ -1,62 +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.&#160; 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.&#160;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.&#160; Each type of 
bridge uses a different method to avoid censorship.&#160; 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.&#160; 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.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/son/torlauncher.properties 
b/src/chrome/locale/son/torlauncher.properties
deleted file mode 100644
index ca9774b..0000000
--- a/src/chrome/locale/son/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=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.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/ur/network-settings.dtd 
b/src/chrome/locale/ur/network-settings.dtd
index eeb35c3..02b715d 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -1,24 +1,24 @@
-<!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">
+<!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 Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Ù¹ÙØ± Ø¨Ø±Ø§Ø¤Ø²Ø± ÙØºØª">
+<!ENTITY torlauncher.localePicker.prompt "Ø¨Ø±Ø§ÛÙ ÙÛØ±Ø¨Ø§ÙÛ ÙØºØª Ù
ÙØªØ®Ø¨ Ú©ÛØ¬Ø¦Û">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torSettings.connectPrompt "Click âConnectâ to connect to Tor.">
+<!ENTITY torSettings.connectPrompt "Ù¹ÙØ± Ø³Û ÙÙØ³ÙÚ© ÛÙÙÛ Ú©Û 
ÙØ¦Û &quot;ÙÙØ³ÙÚ© &quot; Ù¾Ø± Ú©ÙÚ© Ú©Ø±ÛÚº">
 <!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">
+<!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.startingTor "Ù¹ÙØ± ÚÙÙÛ Ú©Ø§ Ø§ÙØªØ¸Ø§Ø± ÛÛÛ">
+<!ENTITY torsettings.restartTor "Ù¹ÙØ± Ø¯ÙØ¨Ø§Ø±Û ÚÙØ§Ø¦ÛÚº">
+<!ENTITY torsettings.reconfigTor "Ø¯ÙØ¨Ø§Ø±Û ÙØ±ØªØ¨ Ú©Ø±ÛÚº">
 
 <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges 
or you have entered local proxy settings.&#160; To make a direct connection to 
the Tor network, these settings must be removed.">
 <!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
@@ -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 "ØµØ§Ø±Ù Ú©Ø§ ÙØ§Ù:">
+<!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">

_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser

Reply via email to