[tbb-commits] [tor-launcher/maint-0.2.9] Release preparations for 0.2.9.1

Fri Apr 22 12:04:35 UTC 2016

commit 8895c856aeb452b4690a61865c471c2a524a2cc9
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Apr 22 12:03:55 2016 +0000

    Release preparations for 0.2.9.1
    
    Translation updates and version bump
---
 src/chrome/locale/ach/network-settings.dtd         |   2 +-
 src/chrome/locale/ach/torlauncher.properties       |   7 +-
 src/chrome/locale/ady/network-settings.dtd         |   2 +-
 src/chrome/locale/ady/torlauncher.properties       |   7 +-
 src/chrome/locale/af/network-settings.dtd          |   2 +-
 src/chrome/locale/af/torlauncher.properties        |   7 +-
 src/chrome/locale/ak/network-settings.dtd          |   2 +-
 src/chrome/locale/ak/torlauncher.properties        |   7 +-
 src/chrome/locale/am/network-settings.dtd          |   2 +-
 src/chrome/locale/am/torlauncher.properties        |   7 +-
 src/chrome/locale/ar/network-settings.dtd          |  26 ++---
 src/chrome/locale/ar/progress.dtd                  |   2 +-
 src/chrome/locale/ar/torlauncher.properties        |   7 +-
 src/chrome/locale/arn/network-settings.dtd         |   2 +-
 src/chrome/locale/arn/torlauncher.properties       |   7 +-
 src/chrome/locale/ast/network-settings.dtd         |   2 +-
 src/chrome/locale/ast/torlauncher.properties       |   7 +-
 src/chrome/locale/az/network-settings.dtd          |   2 +-
 src/chrome/locale/az/torlauncher.properties        |   7 +-
 src/chrome/locale/be/network-settings.dtd          |   2 +-
 src/chrome/locale/be/torlauncher.properties        |   7 +-
 src/chrome/locale/bg/network-settings.dtd          |  22 ++---
 src/chrome/locale/bg/progress.dtd                  |   2 +-
 src/chrome/locale/bg/torlauncher.properties        |   7 +-
 src/chrome/locale/bn-BD/torlauncher.properties     |   7 +-
 src/chrome/locale/bn-IN/network-settings.dtd       |   2 +-
 src/chrome/locale/bn-IN/torlauncher.properties     |   7 +-
 src/chrome/locale/bn/network-settings.dtd          |   2 +-
 src/chrome/locale/bn/torlauncher.properties        |   7 +-
 src/chrome/locale/bo/network-settings.dtd          |   2 +-
 src/chrome/locale/bo/torlauncher.properties        |   7 +-
 src/chrome/locale/br/network-settings.dtd          |   2 +-
 src/chrome/locale/br/torlauncher.properties        |   7 +-
 src/chrome/locale/bs/network-settings.dtd          |   2 +-
 src/chrome/locale/bs/torlauncher.properties        |   7 +-
 src/chrome/locale/ca/network-settings.dtd          |   4 +-
 src/chrome/locale/ca/progress.dtd                  |   2 +-
 src/chrome/locale/ca/torlauncher.properties        |   7 +-
 src/chrome/locale/cs/network-settings.dtd          |   2 +-
 src/chrome/locale/cs/progress.dtd                  |   2 +-
 src/chrome/locale/cs/torlauncher.properties        |   7 +-
 src/chrome/locale/csb/network-settings.dtd         |   2 +-
 src/chrome/locale/csb/torlauncher.properties       |   7 +-
 src/chrome/locale/cv/network-settings.dtd          |   2 +-
 src/chrome/locale/cv/torlauncher.properties        |   7 +-
 src/chrome/locale/cy/network-settings.dtd          |   8 +-
 src/chrome/locale/cy/torlauncher.properties        |  13 +--
 src/chrome/locale/da/network-settings.dtd          |   2 +-
 src/chrome/locale/da/torlauncher.properties        |   7 +-
 src/chrome/locale/de/network-settings.dtd          |  16 +--
 src/chrome/locale/de/torlauncher.properties        |   7 +-
 src/chrome/locale/dz/network-settings.dtd          |   2 +-
 src/chrome/locale/dz/torlauncher.properties        |   7 +-
 src/chrome/locale/el/network-settings.dtd          |  22 ++---
 src/chrome/locale/el/progress.dtd                  |   2 +-
 src/chrome/locale/el/torlauncher.properties        |   9 +-
 src/chrome/locale/en-GB/network-settings.dtd       |   2 +-
 src/chrome/locale/en-GB/torlauncher.properties     |   7 +-
 src/chrome/locale/eo/network-settings.dtd          |   2 +-
 src/chrome/locale/eo/torlauncher.properties        |   7 +-
 src/chrome/locale/es-AR/network-settings.dtd       |   4 +-
 src/chrome/locale/es-AR/torlauncher.properties     |   7 +-
 src/chrome/locale/es-CL/network-settings.dtd       |   2 +-
 src/chrome/locale/es-CL/torlauncher.properties     |   7 +-
 src/chrome/locale/es-CO/network-settings.dtd       |   8 +-
 src/chrome/locale/es-CO/torlauncher.properties     |   7 +-
 src/chrome/locale/es-MX/network-settings.dtd       |   2 +-
 src/chrome/locale/es-MX/progress.dtd               |   2 +-
 src/chrome/locale/es-MX/torlauncher.properties     |   7 +-
 src/chrome/locale/es/network-settings.dtd          |   2 +-
 src/chrome/locale/es/torlauncher.properties        |   7 +-
 src/chrome/locale/et/network-settings.dtd          |   2 +-
 src/chrome/locale/et/torlauncher.properties        |   9 +-
 src/chrome/locale/eu/network-settings.dtd          |   2 +-
 src/chrome/locale/eu/torlauncher.properties        |   7 +-
 src/chrome/locale/fa/network-settings.dtd          |   6 +-
 src/chrome/locale/fa/torlauncher.properties        |   7 +-
 src/chrome/locale/fi/network-settings.dtd          |   8 +-
 src/chrome/locale/fi/progress.dtd                  |   3 +-
 src/chrome/locale/fi/torlauncher.properties        |   7 +-
 src/chrome/locale/fil/network-settings.dtd         |   2 +-
 src/chrome/locale/fil/torlauncher.properties       |   7 +-
 src/chrome/locale/fo/network-settings.dtd          |   2 +-
 src/chrome/locale/fo/torlauncher.properties        |   7 +-
 src/chrome/locale/fr-CA/network-settings.dtd       |   4 +-
 src/chrome/locale/fr-CA/torlauncher.properties     |   7 +-
 src/chrome/locale/fr/network-settings.dtd          |  28 +++---
 src/chrome/locale/fr/progress.dtd                  |   2 +-
 src/chrome/locale/fr/torlauncher.properties        |  11 ++-
 src/chrome/locale/fur/network-settings.dtd         |   2 +-
 src/chrome/locale/fur/torlauncher.properties       |   7 +-
 src/chrome/locale/fy/network-settings.dtd          |   2 +-
 src/chrome/locale/fy/torlauncher.properties        |   7 +-
 src/chrome/locale/ga/network-settings.dtd          |   2 +-
 src/chrome/locale/ga/torlauncher.properties        |   7 +-
 src/chrome/locale/gl/network-settings.dtd          |   2 +-
 src/chrome/locale/gl/torlauncher.properties        |   7 +-
 src/chrome/locale/gu-IN/network-settings.dtd       |   2 +-
 src/chrome/locale/gu-IN/torlauncher.properties     |   7 +-
 src/chrome/locale/gu/network-settings.dtd          |   2 +-
 src/chrome/locale/gu/torlauncher.properties        |   9 +-
 src/chrome/locale/gun/network-settings.dtd         |   2 +-
 src/chrome/locale/gun/torlauncher.properties       |   7 +-
 src/chrome/locale/ha/network-settings.dtd          |   2 +-
 src/chrome/locale/ha/torlauncher.properties        |   7 +-
 src/chrome/locale/he/network-settings.dtd          |   2 +-
 src/chrome/locale/he/torlauncher.properties        |   7 +-
 src/chrome/locale/hi/network-settings.dtd          |   2 +-
 src/chrome/locale/hi/torlauncher.properties        |   7 +-
 src/chrome/locale/hr-HR/network-settings.dtd       |  24 ++---
 src/chrome/locale/hr-HR/progress.dtd               |   2 +-
 src/chrome/locale/hr-HR/torlauncher.properties     |   7 +-
 src/chrome/locale/hr/network-settings.dtd          |   2 +-
 src/chrome/locale/hr/progress.dtd                  |   2 +-
 src/chrome/locale/hr/torlauncher.properties        |   7 +-
 src/chrome/locale/ht/network-settings.dtd          |   2 +-
 src/chrome/locale/ht/torlauncher.properties        |   7 +-
 src/chrome/locale/hu/network-settings.dtd          |  22 ++---
 src/chrome/locale/hu/progress.dtd                  |   2 +-
 src/chrome/locale/hu/torlauncher.properties        |   7 +-
 src/chrome/locale/hy/network-settings.dtd          |   2 +-
 src/chrome/locale/hy/torlauncher.properties        |   7 +-
 src/chrome/locale/ia/network-settings.dtd          |   2 +-
 src/chrome/locale/ia/torlauncher.properties        |   7 +-
 src/chrome/locale/id/network-settings.dtd          |  18 ++--
 src/chrome/locale/id/torlauncher.properties        |   7 +-
 src/chrome/locale/is/network-settings.dtd          |   2 +-
 src/chrome/locale/is/progress.dtd                  |   2 +-
 src/chrome/locale/is/torlauncher.properties        |   7 +-
 src/chrome/locale/it/network-settings.dtd          |  22 ++---
 src/chrome/locale/it/progress.dtd                  |   2 +-
 src/chrome/locale/it/torlauncher.properties        |   7 +-
 src/chrome/locale/ja/network-settings.dtd          |   6 +-
 src/chrome/locale/ja/torlauncher.properties        |   7 +-
 src/chrome/locale/jv/network-settings.dtd          |   2 +-
 src/chrome/locale/jv/torlauncher.properties        |   7 +-
 src/chrome/locale/ka/network-settings.dtd          |   8 +-
 src/chrome/locale/ka/torlauncher.properties        |   9 +-
 src/chrome/locale/kk/network-settings.dtd          |   2 +-
 src/chrome/locale/kk/torlauncher.properties        |   7 +-
 src/chrome/locale/km/network-settings.dtd          |   2 +-
 src/chrome/locale/km/torlauncher.properties        |   7 +-
 src/chrome/locale/kn/network-settings.dtd          |   2 +-
 src/chrome/locale/kn/torlauncher.properties        |   7 +-
 src/chrome/locale/ko-KR/network-settings.dtd       |   2 +-
 src/chrome/locale/ko-KR/torlauncher.properties     |   7 +-
 src/chrome/locale/ko/network-settings.dtd          |   2 +-
 src/chrome/locale/ko/torlauncher.properties        |   9 +-
 src/chrome/locale/ku/network-settings.dtd          |   2 +-
 src/chrome/locale/ku/torlauncher.properties        |   7 +-
 src/chrome/locale/kw/network-settings.dtd          |   2 +-
 src/chrome/locale/kw/torlauncher.properties        |   7 +-
 src/chrome/locale/ky/network-settings.dtd          |   2 +-
 src/chrome/locale/ky/torlauncher.properties        |   7 +-
 src/chrome/locale/lb/network-settings.dtd          |   2 +-
 src/chrome/locale/lb/torlauncher.properties        |   7 +-
 src/chrome/locale/lg/network-settings.dtd          |   2 +-
 src/chrome/locale/lg/torlauncher.properties        |   7 +-
 src/chrome/locale/ln/network-settings.dtd          |   2 +-
 src/chrome/locale/ln/torlauncher.properties        |   7 +-
 src/chrome/locale/lo/network-settings.dtd          |   2 +-
 src/chrome/locale/lo/torlauncher.properties        |   7 +-
 src/chrome/locale/lt/network-settings.dtd          |   2 +-
 src/chrome/locale/lt/torlauncher.properties        |   7 +-
 src/chrome/locale/lv/network-settings.dtd          |   2 +-
 src/chrome/locale/lv/torlauncher.properties        |   7 +-
 src/chrome/locale/mg/network-settings.dtd          |   2 +-
 src/chrome/locale/mg/torlauncher.properties        |   7 +-
 src/chrome/locale/mi/network-settings.dtd          |   2 +-
 src/chrome/locale/mi/torlauncher.properties        |   7 +-
 src/chrome/locale/mk/network-settings.dtd          |   2 +-
 src/chrome/locale/mk/torlauncher.properties        |   9 +-
 src/chrome/locale/ml/network-settings.dtd          |   2 +-
 src/chrome/locale/ml/torlauncher.properties        |   7 +-
 src/chrome/locale/mn/network-settings.dtd          |   2 +-
 src/chrome/locale/mn/torlauncher.properties        |   7 +-
 src/chrome/locale/mr/network-settings.dtd          |   4 +-
 src/chrome/locale/mr/torlauncher.properties        |   7 +-
 src/chrome/locale/ms-MY/network-settings.dtd       |   2 +-
 src/chrome/locale/ms-MY/torlauncher.properties     |   9 +-
 src/chrome/locale/mt/network-settings.dtd          |   2 +-
 src/chrome/locale/mt/torlauncher.properties        |   7 +-
 src/chrome/locale/my/network-settings.dtd          |   2 +-
 src/chrome/locale/my/torlauncher.properties        |   9 +-
 src/chrome/locale/nah/network-settings.dtd         |   2 +-
 src/chrome/locale/nah/torlauncher.properties       |   7 +-
 src/chrome/locale/nap/network-settings.dtd         |   2 +-
 src/chrome/locale/nap/torlauncher.properties       |   7 +-
 src/chrome/locale/nb/network-settings.dtd          |  48 ++++-----
 src/chrome/locale/nb/progress.dtd                  |   4 +-
 src/chrome/locale/nb/torlauncher.properties        |  23 ++---
 src/chrome/locale/nds/network-settings.dtd         |   2 +-
 src/chrome/locale/nds/torlauncher.properties       |   7 +-
 src/chrome/locale/ne/network-settings.dtd          |   2 +-
 src/chrome/locale/ne/torlauncher.properties        |   7 +-
 src/chrome/locale/nl-BE/network-settings.dtd       |   2 +-
 src/chrome/locale/nl-BE/torlauncher.properties     |   7 +-
 src/chrome/locale/nl/network-settings.dtd          |  22 ++---
 src/chrome/locale/nl/progress.dtd                  |   5 +-
 src/chrome/locale/nl/torlauncher.properties        |   7 +-
 src/chrome/locale/nn/network-settings.dtd          |  38 ++++----
 src/chrome/locale/nn/torlauncher.properties        |  17 ++--
 src/chrome/locale/nso/network-settings.dtd         |   2 +-
 src/chrome/locale/nso/torlauncher.properties       |   7 +-
 src/chrome/locale/oc/network-settings.dtd          |   2 +-
 src/chrome/locale/oc/torlauncher.properties        |   7 +-
 src/chrome/locale/or/network-settings.dtd          |   2 +-
 src/chrome/locale/or/torlauncher.properties        |   7 +-
 src/chrome/locale/pa/network-settings.dtd          |   2 +-
 src/chrome/locale/pa/torlauncher.properties        |   7 +-
 src/chrome/locale/pap/network-settings.dtd         |   2 +-
 src/chrome/locale/pap/torlauncher.properties       |   7 +-
 src/chrome/locale/pl/network-settings.dtd          |  22 ++---
 src/chrome/locale/pl/progress.dtd                  |   2 +-
 src/chrome/locale/pl/torlauncher.properties        |   7 +-
 src/chrome/locale/pms/network-settings.dtd         |   2 +-
 src/chrome/locale/pms/torlauncher.properties       |   7 +-
 src/chrome/locale/ps/network-settings.dtd          |   2 +-
 src/chrome/locale/ps/torlauncher.properties        |   7 +-
 src/chrome/locale/pt-BR/network-settings.dtd       |  22 ++---
 src/chrome/locale/pt-BR/progress.dtd               |   2 +-
 src/chrome/locale/pt-BR/torlauncher.properties     |   7 +-
 src/chrome/locale/pt/network-settings.dtd          |  30 +++---
 src/chrome/locale/pt/torlauncher.properties        |   7 +-
 src/chrome/locale/ro/network-settings.dtd          |  22 ++---
 src/chrome/locale/ro/progress.dtd                  |   2 +-
 src/chrome/locale/ro/torlauncher.properties        |   7 +-
 src/chrome/locale/ru/network-settings.dtd          |  22 ++---
 src/chrome/locale/ru/progress.dtd                  |   2 +-
 src/chrome/locale/ru/torlauncher.properties        |   7 +-
 src/chrome/locale/ru at petr1708/network-settings.dtd |   2 +-
 .../locale/ru at petr1708/torlauncher.properties      |   7 +-
 src/chrome/locale/sco/network-settings.dtd         |   2 +-
 src/chrome/locale/sco/torlauncher.properties       |   9 +-
 src/chrome/locale/si-LK/network-settings.dtd       |   2 +-
 src/chrome/locale/si-LK/torlauncher.properties     |   9 +-
 src/chrome/locale/sk-SK/network-settings.dtd       |   2 +-
 src/chrome/locale/sk-SK/torlauncher.properties     |   7 +-
 src/chrome/locale/sk/network-settings.dtd          |   2 +-
 src/chrome/locale/sk/torlauncher.properties        |   7 +-
 src/chrome/locale/sl-SI/network-settings.dtd       |   2 +-
 src/chrome/locale/sl-SI/torlauncher.properties     |   7 +-
 src/chrome/locale/sl/network-settings.dtd          |   2 +-
 src/chrome/locale/sl/torlauncher.properties        |   9 +-
 src/chrome/locale/sn/network-settings.dtd          |   2 +-
 src/chrome/locale/sn/torlauncher.properties        |   7 +-
 src/chrome/locale/so/network-settings.dtd          |   2 +-
 src/chrome/locale/so/torlauncher.properties        |   7 +-
 src/chrome/locale/son/network-settings.dtd         |   2 +-
 src/chrome/locale/son/torlauncher.properties       |   7 +-
 src/chrome/locale/sq/network-settings.dtd          |  26 ++---
 src/chrome/locale/sq/progress.dtd                  |   2 +-
 src/chrome/locale/sq/torlauncher.properties        |   7 +-
 src/chrome/locale/sr/network-settings.dtd          |   2 +-
 src/chrome/locale/sr/torlauncher.properties        |   7 +-
 src/chrome/locale/sr at latin/network-settings.dtd    |   4 +-
 src/chrome/locale/sr at latin/torlauncher.properties  |   9 +-
 src/chrome/locale/st/network-settings.dtd          |   2 +-
 src/chrome/locale/st/torlauncher.properties        |   7 +-
 src/chrome/locale/su/network-settings.dtd          |   2 +-
 src/chrome/locale/su/torlauncher.properties        |   7 +-
 src/chrome/locale/sv/network-settings.dtd          |  22 ++---
 src/chrome/locale/sv/progress.dtd                  |   2 +-
 src/chrome/locale/sv/torlauncher.properties        |   7 +-
 src/chrome/locale/sw/network-settings.dtd          |   2 +-
 src/chrome/locale/sw/torlauncher.properties        |   9 +-
 src/chrome/locale/szl/network-settings.dtd         |   2 +-
 src/chrome/locale/szl/torlauncher.properties       |   7 +-
 src/chrome/locale/ta/network-settings.dtd          |   2 +-
 src/chrome/locale/ta/torlauncher.properties        |   7 +-
 src/chrome/locale/te-IN/network-settings.dtd       |   2 +-
 src/chrome/locale/te-IN/torlauncher.properties     |   7 +-
 src/chrome/locale/te/network-settings.dtd          |   2 +-
 src/chrome/locale/te/torlauncher.properties        |   7 +-
 src/chrome/locale/tg/network-settings.dtd          |   2 +-
 src/chrome/locale/tg/torlauncher.properties        |   7 +-
 src/chrome/locale/th/network-settings.dtd          |   2 +-
 src/chrome/locale/th/torlauncher.properties        |   7 +-
 src/chrome/locale/ti/network-settings.dtd          |   2 +-
 src/chrome/locale/ti/torlauncher.properties        |   7 +-
 src/chrome/locale/tk/network-settings.dtd          |   2 +-
 src/chrome/locale/tk/torlauncher.properties        |   7 +-
 src/chrome/locale/tr/network-settings.dtd          |   8 +-
 src/chrome/locale/tr/torlauncher.properties        |  13 +--
 src/chrome/locale/uk/network-settings.dtd          |  22 ++---
 src/chrome/locale/uk/progress.dtd                  |   2 +-
 src/chrome/locale/uk/torlauncher.properties        |   7 +-
 src/chrome/locale/ur-PK/network-settings.dtd       |   2 +-
 src/chrome/locale/ur-PK/torlauncher.properties     |   7 +-
 src/chrome/locale/ur/network-settings.dtd          |   2 +-
 src/chrome/locale/ur/torlauncher.properties        |   7 +-
 src/chrome/locale/uz/network-settings.dtd          |   4 +-
 src/chrome/locale/uz/torlauncher.properties        |   7 +-
 src/chrome/locale/ve/network-settings.dtd          |   2 +-
 src/chrome/locale/ve/torlauncher.properties        |   7 +-
 src/chrome/locale/vi/network-settings.dtd          |   2 +-
 src/chrome/locale/vi/torlauncher.properties        |   7 +-
 src/chrome/locale/wa/network-settings.dtd          |   2 +-
 src/chrome/locale/wa/torlauncher.properties        |   7 +-
 src/chrome/locale/wo/network-settings.dtd          |   2 +-
 src/chrome/locale/wo/torlauncher.properties        |   7 +-
 src/chrome/locale/zh-CN/network-settings.dtd       |   4 +-
 src/chrome/locale/zh-CN/progress.dtd               |   2 +-
 src/chrome/locale/zh-CN/torlauncher.properties     |   7 +-
 src/chrome/locale/zh-HK/network-settings.dtd       | 108 ++++++++++-----------
 src/chrome/locale/zh-HK/progress.dtd               |   8 +-
 src/chrome/locale/zh-HK/torlauncher.properties     |  87 +++++++++--------
 src/chrome/locale/zh-TW/network-settings.dtd       |  26 ++---
 src/chrome/locale/zh-TW/progress.dtd               |   6 +-
 src/chrome/locale/zh-TW/torlauncher.properties     |  49 +++++-----
 src/chrome/locale/zu/network-settings.dtd          |   2 +-
 src/chrome/locale/zu/torlauncher.properties        |   7 +-
 src/install.rdf                                    |   2 +-
 313 files changed, 1168 insertions(+), 1022 deletions(-)

diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ach/network-settings.dtd
+++ b/src/chrome/locale/ach/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ach/torlauncher.properties b/src/chrome/locale/ach/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ach/torlauncher.properties
+++ b/src/chrome/locale/ach/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ady/network-settings.dtd
+++ b/src/chrome/locale/ady/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ady/torlauncher.properties
+++ b/src/chrome/locale/ady/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd
index 93e2527..d226ca3 100644
--- a/src/chrome/locale/af/network-settings.dtd
+++ b/src/chrome/locale/af/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Deur die Web">
 <!ENTITY torsettings.bridgeHelp2 "Gebruik 'n webblaaier om https://bridges.torproject.org te besoek">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties
index c347389..f432219 100644
--- a/src/chrome/locale/af/torlauncher.properties
+++ b/src/chrome/locale/af/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ak/network-settings.dtd
+++ b/src/chrome/locale/ak/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ak/torlauncher.properties
+++ b/src/chrome/locale/ak/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/am/network-settings.dtd
+++ b/src/chrome/locale/am/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties
index 8329edd..7d0e8d0 100644
--- a/src/chrome/locale/am/torlauncher.properties
+++ b/src/chrome/locale/am/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index 9d42278..76641ed 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -1,8 +1,8 @@
 <!ENTITY torsettings.dialog.title "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø´Ø¨ÙƒØ©">
 
 <!-- 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: -->
 
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ø£ÙŠ Ù…Ù…Ø§ ÙŠÙ„ÙŠ ÙŠØ¹ØªØ¨Ø± ÙˆØµÙ Ø§ÙØ¶Ù„ Ù„Ù…ÙˆÙ‚ÙÙƒØŸ">
 <!ENTITY torSettings.configurePrompt1 "Ø§ØªØµØ§Ù„ Ù‡Ø°Ø§ Ø§Ù„ØØ§Ø³Ø¨ Ø¨Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ù…ØØ¬ÙˆØ¨ Ø£Ùˆ Ù„Ù‡ Ø¨Ø±ÙˆÙƒØ³ÙŠ.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Ø§ØØªØ§Ø¬ Ø§Ù„Ù‰ Ù…ÙˆØ§ÙÙ‚Ù‡ Ø¬Ø³Ø± Ø§Ùˆ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¨Ø±ÙˆÙƒØ³ÙŠ Ù…ÙˆØ¶Ø¹ÙŠ Ù‚Ø¨Ù„ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒÙ‡  ØªÙˆØ±">
 <!ENTITY torSettings.configure "ØªÙƒÙˆÙŠÙ†">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Ø§ÙˆØ¯ Ø§Ù†Ø´Ø§Ø¡ Ø§ØªØµØ§Ù„ Ù…Ø¨Ø§Ø´Ø± Ø¨Ø´Ø¨ÙƒÙ‡ ØªÙˆØ±.">
 <!ENTITY torSettings.connectPrompt3 "Ø³ÙŠØµÙ„Ø Ù‡Ø°Ø§ ÙÙŠ Ù…Ø¹Ø¸Ù… Ø§Ù„ØØ§Ù„Ø§Øª.">
 <!ENTITY torSettings.connect "Ø§ØªØµÙ„">
 
 <!ENTITY torSettings.proxyPageTitle "Ø¥Ø¹Ø¯Ø§Ø¯ Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ Ø§Ù„Ù…ØÙ„Ù‘ÙŠ">
 <!ENTITY torSettings.proxyQuestion "Ù‡Ù„ ÙŠØØªØ§Ø¬ Ù‡Ø°Ø§ Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ± Ù„Ø§Ø³ØªØ®Ø¯Ø§Ù… ÙˆÙƒÙŠÙ„ Ù…ØÙ„ÙŠ Ù„Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„Ø¥Ù†ØªØ±Ù†ØªØŸ">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "ÙÙŠ Ù…Ø¹Ø¶Ù… Ø§Ù„ØØ§Ù„Ø§Øª Ù„Ø§ÙŠÙˆØ¬Ø¨ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø¨Ø±ÙˆÙƒØ³ÙŠ Ù…ØÙ„ÙŠØŒ ÙˆÙ„ÙƒÙ†Ù†Ù‰ Ù†ÙˆØµÙŠ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù…Ù‡ Ø¹Ù†Ø¯ Ø§Ù†Ø´Ø§Ø¡ Ø§ØªØµØ§Ù„ Ù…Ù† Ø´Ø¨ÙƒÙ‡ Ø´Ø±ÙƒÙ‡ØŒ Ù…Ø¯Ø±Ø³Ù‡ØŒ Ø§Ùˆ Ø¬Ø§Ù…Ø¹Ù‡.">
+<!ENTITY torSettings.proxyExplanation2 "ÙÙŠ ØØ§Ù„Ù‡ Ø¹Ø¯Ù… Ù…Ø¹Ø±ÙØªÙƒ Ø¹Ù† ÙƒÙŠÙÙŠÙ‡ Ø§Ø¬Ø§Ø¨Ù‡ Ù‡Ø°Ø§ Ø§Ù„Ø³Ø¤Ø§Ù„ØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„Ø§Ø·Ù„Ø§Ø¹ Ø¹Ù„Ù‰ Ù…ØªØµÙØ Ø¢Ø®Ø± Ø§Ùˆ Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø´Ø¨ÙƒÙ‡ Ù„Ù†Ø¸Ø§Ù… Ø§Ù„ØªØ´ØºÙŠÙ„ Ù„Ù…Ø¹Ø±ÙÙ‡ ÙÙŠÙ…Ø§ Ø§Ø°Ø§ ÙƒØ§Ù† Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø¨Ø±ÙˆÙƒØ³ÙŠ Ù…Ø·Ù„ÙˆØ¨.">
 <!ENTITY torSettings.enterProxy "Ø£Ø¯Ø®Ù„ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ.">
 <!ENTITY torSettings.bridgePageTitle "Ø¥Ø¹Ø¯Ø§Ø¯ Ø¬Ø³ÙˆØ± ØªÙˆØ±.">
 <!ENTITY torSettings.bridgeQuestion "Ù‡Ù„ ÙŠÙ‚ÙˆÙ… Ù…Ù‚Ø¯Ù… Ø®Ø¯Ù…Ø© Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª (ISP) Ø§Ù„Ø°ÙŠ ØªØªØ¹Ø§Ù…Ù„ Ù…Ø¹Ù‡ Ø¨ØØ¬Ø¨ Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª Ø¨Ø´Ø¨ÙƒØ© Tor Ø£Ùˆ Ù…Ø±Ø§Ù‚Ø¨ØªÙ‡Ø§ Ø¨Ø·Ø±ÙŠÙ‚Ø© Ø£Ø®Ø±Ù‰ØŸ">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Ø§Ø°Ø§ Ù„Ù… ØªÙƒÙ† Ù…ØªØ§ÙƒØ¯Ø§ Ø¹Ù„Ù‰ ÙƒÙŠÙÙŠÙ‡ Ø§Ø¬Ø§Ø¨Ù‡ Ù‡Ø°Ø§ Ø§Ù„Ø³Ø¤Ø§Ù„ØŒ Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ø®ØªÙŠØ§Ø± Ù„Ø§( Ø§Ø°Ø§ Ù„Ù… ØªØªÙ…ÙƒÙ† Ù…Ù† Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒÙ‡ ØªÙˆØ± Ø¨Ø¯ÙˆÙ† Ø¬Ø³Ø±ØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø¶Ø§ÙÙ‡ Ø¬Ø³Ø± Ù„Ø§ØÙ‚)">
+<!ENTITY torSettings.bridgeExplanation2 "Ø§Ø°Ø§ Ù‚Ù…Øª Ø¨Ø§Ø®ØªÙŠØ§Ø± Ù†Ø¹Ù…ØŒ Ø³ÙŠØªÙ… Ø³Ø¤Ø§Ù„Ùƒ Ø¹Ù† Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¬Ø³Ø± ØªÙˆØ±ØŒ ØÙŠØ« Ø§Ù†Ù‡Ø§ Ù…Ø±ØÙ„Ø§Øª ØºÙŠØ± Ù…Ø¯Ø±Ø¬Ø© ØªØµØ¹Ø¨ Ø¹Ù…Ù„ÙŠÙ‡ ØØ¬Ø¨ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒÙ‡ ØªÙˆØ±.">
 <!ENTITY torSettings.bridgeSettingsPrompt "ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù…Ø¬Ù…ÙˆØ¹Ø© Ø§Ù„Ø¬Ø³ÙˆØ± Ø§Ù„Ù…ØªÙˆÙØ±Ø© Ø£Ùˆ Ø§Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ù…Ø¬Ù…ÙˆØ¹Ø© Ù…Ø®ØµØµØ© Ù…Ù† Ø§Ù„Ø¬Ø³ÙˆØ±.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "ÙÙŠ Ø§Ù†ØªØ¸Ø§Ø± ØªÙˆØ± ØØªÙŠ ÙŠØ¨Ø¯Ø¡ Ø¨Ø§Ù„Ø¹Ù…Ù„...">
 <!ENTITY torsettings.restartTor "Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„ ØªÙˆØ±">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø¹Ø¯Ø§Ø¯">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Ù‚Ù…Øª Ø¨Ø¶Ø¨Øª Ø¬Ø³Ø± ØªÙˆØ± Ø§Ùˆ Ø§Ø¯Ø®Ù„Øª Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¨Ø±ÙˆÙƒØ³ÙŠ Ù…ØÙ„ÙŠ.  Ù„Ø§Ù†Ø´Ø§Ø¡ Ø§ØªØµØ§Ù„ Ù…Ø¨Ø§Ø´Ø± Ø¨Ø´Ø¨ÙƒÙ‡ ØªÙˆØ±ØŒ ÙŠØ¬Ø¨ Ø§Ø²Ø§Ù„Ù‡ Ù‡Ø°Ù‡ Ø§Ù„Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª.">
+<!ENTITY torsettings.discardSettings.proceed "Ø§Ø²Ù„ Ø§Ù„Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø«Ù… Ø§ØªØµÙ„">
 
 <!ENTITY torsettings.optional "Ø§Ø®ØªÙŠØ§Ø±ÙŠ">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Ø§Ù„Ù…Ù†Ø§ÙØ° Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§:">
 <!ENTITY torsettings.useBridges.checkbox "Ù…Ø²ÙˆØ¯ Ø®Ø¯Ù…Ø© Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ø§Ù„Ø®Ø§Øµ Ø¨ÙŠ (ISP) ÙŠÙ…Ù†Ø¹ Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±">
 <!ENTITY torsettings.useBridges.default "Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„Ø¬Ø³ÙˆØ± Ø§Ù„Ù…ØªÙˆÙØ±Ø©">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "ÙƒÙ„ Ø¬Ø³Ø± ÙŠØ³ØªØ®Ø¯Ù… Ø·Ø±ÙŠÙ‚Ù‡ Ù…Ø®ØªÙ„ÙÙ‡ Ù„ØªØ¬Ù†Ø¨ Ø§Ù„ØØ¬Ø¨.  ÙÙŠ ØØ§Ù„Ù‡ Ø¹Ø¯Ù… Ù†Ø¬Ø§Ø Ø§ØØ¯ Ø§Ù„Ø¬Ø³ÙˆØ± ÙÙŠ Ø§Ù„Ø¹Ù…Ù„ØŒ Ù‚Ù… Ø¨ØªØ¬Ø±Ø¨Ù‡ Ø¬Ø³Ø± Ù…Ø®ØªÙ„Ù.">
 <!ENTITY torsettings.useBridges.type "Ù†ÙˆØ¹ Ø§Ù„Ù†Ù‚Ù„:">
 <!ENTITY torsettings.useBridges.custom "Ø¥Ø¯Ø®Ø§Ù„ Ø¬Ø³ÙˆØ± Ù…Ø®ØµØµØ©">
 <!ENTITY torsettings.useBridges.label "Ø§Ø¯Ø®Ù„ Ø¬Ø³Ø± Ø§Ùˆ Ø§ÙƒØ«Ø± (Ø¬Ø³Ø± ÙˆØ§ØØ¯ ÙÙŠ ÙƒÙ„ Ø³Ø·Ø±).">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Ù†Ø³Ø® Ø³Ø¬Ù„ ØªÙˆØ± Ø¥Ù„ÙŠ Ø§Ù„ØØ§ÙØ¸Ø©">
 <!ENTITY torsettings.bridgeHelpTitle "Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø© Ø§Ù„Ø®Ø§ØµØ© Ø¨Ø§Ù„Ø¬Ø³ÙˆØ± Ø§Ù„Ù…ÙØ±ØÙ„Ø©">
 <!ENTITY torsettings.bridgeHelp1 "Ù‚Ø¯ ÙŠÙƒÙˆÙ† Ø§Ù„Ø³Ø¨Ø¨ ÙÙŠ Ø¹Ø¯Ù… Ù‚Ø¯Ø±ØªÙƒ Ø¹Ù„ÙŠ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±Ù‡Ùˆ Ø§Ù† Ù…Ø²ÙˆØ¯ Ø®Ø¯Ù…Ø© Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ (ISP) Ø£Ùˆ Ù…Ù†Ø¸Ù…Ø© Ø§Ø®Ø±ÙŠ ÙŠÙ…Ù†Ø¹ Ù…ØØ§ÙˆÙ„Ø§Øª Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±. ÙˆØºØ§Ù„Ø¨Ø§Ù‹ØŒ ØªØ³ØªØ·ÙŠØ¹ ØªØ®Ø·ÙŠ Ù‡Ø°Ø§ Ø§Ù„Ù…Ù†Ø¹ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø¬Ø³ÙˆØ± ØªÙˆØ± Ùˆ Ø§Ù„Ø¬Ø³ÙˆØ± Ø¹Ø¨Ø§Ø±Ø© Ø¹Ù† Ù…ÙØ±ØÙ„Ø§Øª Ù…Ø®ÙÙŠØ© ØµØ¹Ø¨ Ù…Ù†Ø¹Ù‡Ø§.">
-<!ENTITY torsettings.bridgeHelp1B "ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù…Ø¬Ù…ÙˆØ¹Ø© Ø¹Ù†Ø§ÙˆÙŠÙ† Ø§Ù„Ø¬Ø³ÙˆØ± Ø§Ù„Ù…ØªÙˆÙØ±Ø© Ø§Ù„ØªÙŠ ØªÙ… ØªÙƒÙˆÙŠÙ†Ù‡Ø§ Ù…Ø³Ø¨Ù‚Ø§ Ø£Ùˆ Ø§Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ù…Ø¬Ù…ÙˆØ¹Ø© Ù…Ø®ØµØµØ© Ù…Ù† Ø§Ù„Ø¹Ù†Ø§ÙˆÙŠÙ† Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø¥ØØ¯Ù‰ Ù‡Ø°Ù‡ Ø§Ù„Ø·Ø±Ù‚ Ø§Ù„Ø«Ù„Ø§Ø«:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Ù…Ù† Ø®Ù„Ø§Ù„ Ø§Ù„ÙˆÙŠØ¨">
 <!ENTITY torsettings.bridgeHelp2 "Ø§Ø³ØªØ®Ø¯Ù… Ù…ØªØµÙØ ÙˆÙŠØ¨ Ù„Ø²ÙŠØ§Ø±Ø© https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Ù…Ù† Ø®Ù„Ø§Ù„ Ø§Ù„Ù…Ø³ØªØ¬ÙŠØ¨ Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ Ù„Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ">
diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd
index ef4cfb9..90ac171 100644
--- a/src/chrome/locale/ar/progress.dtd
+++ b/src/chrome/locale/ar/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "ØØ§Ù„Ø© ØªÙˆØ±">
 <!ENTITY torprogress.openSettings "Ø§ÙØªØ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª">
 <!ENTITY torprogress.heading "Ø¬Ø§Ø±ÙŠ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ø§Ù†ØªØ¸Ø§Ø± ØØªÙ‰ Ù†ØªÙ…ÙƒÙ† Ù…Ù† ØªÙØ¹ÙŠÙ„ Ø§ØªØµØ§Ù„ Ø§Ù„Ù‰ Ø´Ø¨ÙƒÙ‡ "ØªÙˆØ±" .  Ù‚Ø¯ ÙŠØ³ØªØºØ±Ù‚ Ø§Ù„Ø§Ù…Ø± Ø¹Ø¯Ù‡ Ø¯Ù‚Ø§Ø¦Ù‚.">
diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties
index 2fc973e..306816c 100644
--- a/src/chrome/locale/ar/torlauncher.properties
+++ b/src/chrome/locale/ar/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Ù…ÙØ´ØºÙ„ ØªÙˆØ±
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S  ÙØ´Ù„(%2$S).
 
 torlauncher.unable_to_start_tor=ØºÙŠØ± Ù‚Ø§Ø¯Ø± Ø¹Ù„ÙŠ Ø¨Ø¯Ø¡ ØªØ´ØºÙŠÙ„ ØªÙˆØ±.\n\n%S
 torlauncher.tor_missing=Ø§Ù„Ù…Ù„Ù Ø§Ù„ØªÙ†ÙÙŠØ°ÙŠ Ù„ØªÙˆØ± Ù…ÙÙ‚ÙˆØ¯.
-torlauncher.torrc_missing=Ù…Ù„Ù torrc Ù…ÙÙ‚ÙˆØ¯.
-torlauncher.datadir_missing=Ù…Ø¬Ù„Ø¯ data Ø§Ù„Ø®Ø§Øµ Ø¨ØªÙˆØ± ØºÙŠØ± Ù…ÙˆØ¬ÙˆØ¯.
+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=ÙØ´Ù„ ÙÙŠ Ø§Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„Ù…Ø¬Ø²Ø£Ø©.
 
 torlauncher.failed_to_get_settings=ØºÙŠØ± Ù‚Ø§Ø¯Ø± Ø¹Ù„ÙŠ Ø¬Ù„Ø¨ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙˆØ±.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ø®Ø±ÙˆØ¬
 torlauncher.done=ØªÙ…
 
 torlauncher.forAssistance=Ù„Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©, Ø§ØªØµÙ„ Ø¨Ù€ %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=ØªÙ… Ø¥ÙƒÙ…Ø§Ù„ Ø§Ù„Ù†Ø³Ø®. %S Ù…Ù† Ø±Ø³Ø§Ø¦Ù„ Ø³Ø¬Ù„ ØªÙˆØ± Ø¬Ø§Ù‡Ø²Ø© Ù„Ù†Ø³Ø®Ù‡Ø§ ÙÙŠ Ù…ØØ±Ø± Ù†ØµÙˆØµ Ø£Ùˆ Ø±Ø³Ø§Ù„Ø© Ø¨Ø±ÙŠØ¯ Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ.
 
diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/arn/network-settings.dtd
+++ b/src/chrome/locale/arn/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/arn/torlauncher.properties
+++ b/src/chrome/locale/arn/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd
index caa9d55..6f12432 100644
--- a/src/chrome/locale/ast/network-settings.dtd
+++ b/src/chrome/locale/ast/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ast/torlauncher.properties
+++ b/src/chrome/locale/ast/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd
index eb34988..9e96619 100644
--- a/src/chrome/locale/az/network-settings.dtd
+++ b/src/chrome/locale/az/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Tor bort jurnalÄ±nÄ± panoya kopyalayÄ±n">
 <!ENTITY torsettings.bridgeHelpTitle "KÃ¶rpÃ¼ KeÃ§id DÉ™stÉ™yi">
 <!ENTITY torsettings.bridgeHelp1 "ÆgÉ™r sÉ™n Tor ÅŸÉ™bÉ™kÉ™sinÉ™ qoÅŸula bilmirsÉ™nsÉ™, ola bilsin ki, sÉ™nin Ä°nternet XidmÉ™t Provayderin (Ä°XP) vÉ™ ya digÉ™r agentlik Tor-la É™laqÉ™ni bloklayÄ±r.  Ã‡ox hallarda sÉ™n bu problemdÉ™n qaÃ§Ä±nmaq Ã¼Ã§Ã¼n Tor KÃ¶rpÃ¼lÉ™rini istifadÉ™ edÉ™ bilÉ™rsÉ™n. OnlarÄ±n tapÄ±lÄ±b bloklanmasÄ± qat-qat Ã§É™tin baÅŸa gÉ™lir. ">
-<!ENTITY torsettings.bridgeHelp1B "AÅŸaÄŸÄ±dakÄ± Ã¼Ã§ Ã¼suldan birini istifadÉ™ etmÉ™klÉ™ É™vvÉ™lcÉ™dÉ™n konfiqurasiya edilmiÅŸ kÃ¶rpÃ¼ Ã¼nvanlarÄ± dÉ™stini vÉ™ ya istÉ™yinÉ™ uyÄŸun Ã¼nvan dÉ™stini istifadÉ™ edÉ™ bilÉ™rsÉ™n:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "BilavasitÉ™ web ilÉ™">
 <!ENTITY torsettings.bridgeHelp2 "web brauzer istifadÉ™ edÉ™rÉ™k bu sÉ™hifÉ™ni ziyarÉ™t edin https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Email AvtocavablayÄ±cÄ± VasitÉ™silÉ™">
diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties
index 55df92f..3c67c38 100644
--- a/src/chrome/locale/az/torlauncher.properties
+++ b/src/chrome/locale/az/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Ä°ÅŸlÉ™dici
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S xÉ™tasÄ± (%2$S).
 
 torlauncher.unable_to_start_tor=Tor baÅŸlaya bilmir.\n\n%S
 torlauncher.tor_missing=Ä°cra edilÉ™ bilÉ™n Tor Ã§atÄ±ÅŸmÄ±r.
-torlauncher.torrc_missing=Torrc faylÄ± Ã§atÄ±ÅŸmÄ±r.
-torlauncher.datadir_missing=Tor mÉ™lumat kataloqu mÃ¶vcud deyil.
+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=QarÄ±ÅŸÄ±d ÅŸifrÉ™ É™ldÉ™ edÉ™ bilmÉ™di.
 
 torlauncher.failed_to_get_settings=Tor parametrlÉ™rinin bÉ™rpasÄ± mÃ¼mkÃ¼n olmadÄ±.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ã‡Ä±x
 torlauncher.done=Oldu
 
 torlauncher.forAssistance=DÉ™stÉ™k Ã¼Ã§Ã¼n %S ilÉ™ É™laqÉ™ saxla
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=KÃ¶Ã§Ã¼rÃ¼lmÉ™ tamamlandÄ±. %S Tor giriÅŸ mesajlarÄ± mÉ™tn dÉ™yiÅŸdiricisi vÉ™ ya email mesajÄ±na daxil edilmÉ™yÉ™ hazÄ±rdÄ±r.
 
diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd
index ad37df4..9e0d430 100644
--- a/src/chrome/locale/be/network-settings.dtd
+++ b/src/chrome/locale/be/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties
index 68ed6bf..2d0992e 100644
--- a/src/chrome/locale/be/torlauncher.properties
+++ b/src/chrome/locale/be/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd
index 94bd5f1..da063e0 100644
--- a/src/chrome/locale/bg/network-settings.dtd
+++ b/src/chrome/locale/bg/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "ÐšÐ¾Ðµ Ð¾Ñ‚ ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð¾Ð¿Ð¸ÑÐ²Ð° Ð½Ð°Ð¹-Ð´Ð¾Ð±Ñ€Ðµ Ð²Ð°ÑˆÐ°Ñ‚Ð° ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ñ?">
 <!ENTITY torSettings.configurePrompt1 "Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ Ð²Ñ€ÑŠÐ·ÐºÐ°Ñ‚Ð° Ð½Ð° Ñ‚Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€ Ðµ Ñ†ÐµÐ½Ð·ÑƒÑ€Ð¸Ñ€Ð°Ð½Ð° Ð¸Ð»Ð¸ Ð¼Ð¸Ð½Ð°Ð²Ð° Ð¿Ñ€ÐµÐ· proxy ÑÑŠÑ€Ð²ÑŠÑ€.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Ð¢Ñ€ÑÐ±Ð²Ð° Ð´Ð° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ñ‚ bridge Ð¸Ð»Ð¸ proxy Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ñ€ÐµÐ´Ð¸ ÑÐ²ÑŠÑ€Ð·Ð²Ð°Ð½Ðµ ÐºÑŠÐ¼ Tor Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°.">
 <!ENTITY torSettings.configure "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ð¹">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Ð‘Ð¸Ñ… Ð¸ÑÐºÐ°Ð» Ð´Ð° ÑÐµ ÑÐ²ÑŠÑ€Ð¶Ð° Ð´Ð¸Ñ€ÐµÐºÑ‚Ð½Ð¾ ÐºÑŠÐ¼ Tor Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°.">
 <!ENTITY torSettings.connectPrompt3 "Ð¢Ð¾Ð²Ð° Ñ‰Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð¸ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð²ÐµÑ‡ÐµÑ‚Ð¾ ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ð¸.">
 <!ENTITY torSettings.connect "Ð¡Ð²ÑŠÑ€Ð¶Ð¸ ÑÐµ">
 
 <!ENTITY torSettings.proxyPageTitle "Ð›Ð¾ÐºÐ°Ð»Ð½Ð¸ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸">
 <!ENTITY torSettings.proxyQuestion "Ð¢Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð»Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð·Ð° Ð´Ð¾ÑÑ‚ÑŠÐ¿ Ð´Ð¾ Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "Ð’ Ð¿Ð¾Ð²ÐµÑ‡ÐµÑ‚Ð¾ ÑÐ»ÑƒÑ‡Ð°Ð¸ Ð½Ðµ Ðµ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸, Ð½Ð¾ Ñ‚Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¸Ð·Ð¸ÑÐºÐ²Ð°, ÐºÐ¾Ð³Ð°Ñ‚Ð¾ ÑÐµ ÑÐ²ÑŠÑ€Ð·Ð²Ð°Ñ‚Ðµ Ð¾Ñ‚ ÐºÐ¾Ñ€Ð¿Ð¾Ñ€Ð°Ñ‚Ð¸Ð²Ð½Ð°, ÑƒÑ‡Ð¸Ð»Ð¸Ñ‰Ð½Ð° Ð¸Ð»Ð¸ ÑƒÐ½Ð¸Ð²ÐµÑ€ÑÐ¸Ñ‚ÐµÑ‚ÑÐºÐ° Ð¼Ñ€ÐµÐ¶Ð°.">
+<!ENTITY torSettings.proxyExplanation2 "ÐÐºÐ¾ Ð½Ðµ ÑÑ‚Ðµ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¸ ÐºÐ°Ðº Ð´Ð° Ð¾Ñ‚Ð³Ð¾Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ð½Ð° Ñ‚Ð¾Ð·Ð¸ Ð²ÑŠÐ¿Ñ€Ð¾Ñ, Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð½Ð° Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ Ð² Ð´Ñ€ÑƒÐ³ Ð±Ñ€Ð°ÑƒÐ·ÑŠÑ€ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ Ð¼Ñ€ÐµÐ¶Ð¾Ð²Ð¸Ñ‚Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð½Ð° Ð²Ð°ÑˆÐ°Ñ‚Ð° ÑÐ¸ÑÑ‚ÐµÐ¼Ð°, Ð·Ð° Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ‚Ðµ Ð´Ð°Ð»Ð¸ Ðµ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸.">
 <!ENTITY torSettings.enterProxy "Ð’ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð·Ð° Ð¿Ñ€Ð¾ÐºÑÐ¸.">
 <!ENTITY torSettings.bridgePageTitle "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð½Ð° Ð¢Ð¾Ñ€ Ð±Ñ€Ð¸Ð´Ð¶Ð¾Ð²Ðµ">
 <!ENTITY torSettings.bridgeQuestion "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¸ Ð¸Ð»Ð¸ Ñ†ÐµÐ½Ð·ÑƒÑ€Ð¸Ñ€Ð°Ð½Ð¸ Ð»Ð¸ ÑÐ° Ð²Ñ€ÑŠÐ·ÐºÐ¸Ñ‚Ðµ ÐºÑŠÐ¼ Tor ÐœÑ€ÐµÐ¶Ð°Ñ‚Ð° Ð¾Ñ‚ Ð²Ð°ÑˆÐ¸ÑÑ‚ Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ Ð”Ð¾ÑÑ‚Ð°Ð²Ñ‡Ð¸Ðº(ISP)?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "ÐÐºÐ¾ Ð½Ðµ ÑÑ‚Ðµ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¸ ÐºÐ°Ðº Ð´Ð° Ð¾Ñ‚Ð³Ð¾Ð²Ð¾Ñ€Ð¸ Ð½Ð° Ñ‚Ð¾Ð·Ð¸ Ð²ÑŠÐ¿Ñ€Ð¾Ñ, Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ ÐÐµ (Ð°ÐºÐ¾ Ð½Ðµ ÑÑ‚Ðµ Ð² ÑÑŠÑÑ‚Ð¾ÑÐ½Ð¸Ðµ Ð´Ð° ÑÐµ ÑÐ²ÑŠÑ€Ð¶ÐµÑ‚Ðµ Ñ Tor Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð° Ð±ÐµÐ· bridge, Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð³Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚Ðµ Ð¿Ð¾-ÐºÑŠÑÐ½Ð¾).">
+<!ENTITY torSettings.bridgeExplanation2 "ÐÐºÐ¾ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð”Ð°, Ñ‰Ðµ Ð±ÑŠÐ´ÐµÑ‚Ðµ Ð¿Ð¾Ð¼Ð¾Ð»ÐµÐ½Ð¸ Ð´Ð° Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Tor Bridges, ÐºÐ¾Ð¸Ñ‚Ð¾ ÑÐ° Ð½ÐµÐ¾Ñ„Ð¸Ñ†Ð¸Ð°Ð»Ð½Ð¸ relays, ÐºÐ¾ÐµÑ‚Ð¾ Ð¿Ñ€Ð°Ð²Ð¸ Ð¿Ð¾-Ñ‚Ñ€ÑƒÐ´Ð½Ð¾ Ð´Ð° ÑÐµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð° Ð²Ñ€ÑŠÐ·ÐºÐ°Ñ‚Ð° ÐºÑŠÐ¼ Tor Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Ð’Ð¸Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚Ðµ Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ‚Ð¸ Ð¾Ñ‚ bridges Ð¸Ð»Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð¸ÑÐºÐ²Ð°Ñ‚Ðµ Ð¿ÐµÑ€ÑÐ¾Ð½Ð°Ð»Ð¸Ð·Ð¸Ñ€Ð°Ð½ ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ‚ Ð¾Ñ‚ Ñ‚ÑÑ….">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ð˜Ð·Ñ‡Ð°ÐºÐ²Ð°Ð½Ðµ Ð½Ð° Tor Ð´Ð° ÑÑ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°...">
 <!ENTITY torsettings.restartTor "Ð ÐµÑÑ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ð¹Ñ‚Ðµ Ð¢Ð¾Ñ€">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "ÐŸÑ€ÐµÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ð½Ðµ">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Ð’Ð¸Ðµ ÑÑ‚Ðµ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ð»Ð¸ Tor bridges Ð¸Ð»Ð¸ ÑÑ‚Ðµ Ð²ÑŠÐ²ÐµÐ»Ð¸ Ð¼ÐµÑÑ‚Ð½Ð¸Ñ‚Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð½Ð° Ð¿Ñ€Ð¾ÐºÑÐ¸ ÑÑŠÑ€Ð²ÑŠÑ€Ð°.  Ð—Ð° Ð´Ð° Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð½Ð¾ ÑÐ²ÑŠÑ€Ð·Ð²Ð°Ð½Ðµ ÐºÑŠÐ¼ Tor Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°, Ñ‚ÐµÐ·Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ð±ÑŠÐ´Ð°Ñ‚ Ð¾Ñ‚ÑÑ‚Ñ€Ð°Ð½ÐµÐ½Ð¸.">
+<!ENTITY torsettings.discardSettings.proceed "ÐŸÑ€ÐµÐ¼Ð°Ñ…Ð²Ð°Ð½Ðµ Ð½Ð° ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð¸ Ð¡Ð²ÑŠÑ€Ð·Ð²Ð°Ð½Ðµ">
 
 <!ENTITY torsettings.optional "Ð”Ð¾Ð¿ÑŠÐ»Ð½Ð¸Ñ‚ÐµÐ»ÐµÐ½">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "ÐŸÐ¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð²Ðµ:">
 <!ENTITY torsettings.useBridges.checkbox "ÐœÐ¾ÑÑ‚ Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ Ð”Ð¾ÑÑ‚Ð°Ð²Ñ‡Ð¸Ðº (ISP) Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð° Ð²Ñ€ÑŠÐ·ÐºÐ¸Ñ‚Ðµ ÐºÑŠÐ¼ Tor Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°">
 <!ENTITY torsettings.useBridges.default "Ð¡Ð²ÑŠÑ€Ð¶Ð¸ ÑÐµ Ñ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²ÐµÐ½Ð¸Ñ‚Ðµ bridges">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Ð’ÑÐµÐºÐ¸ Ð²Ð¸Ð´ bridge Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ñ€Ð°Ð·Ð»Ð¸Ñ‡ÐµÐ½ Ð¼ÐµÑ‚Ð¾Ð´, Ð·Ð° Ð´Ð° ÑÐµ Ð¸Ð·Ð±ÐµÐ³Ð½Ðµ Ñ†ÐµÐ½Ð·ÑƒÑ€Ð°Ñ‚Ð°.  ÐÐºÐ¾ ÐµÐ´Ð¸Ð½ bridge Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð¸, Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ Ð¾Ñ‚Ð½Ð¾Ð²Ð¾ ÐºÐ°Ñ‚Ð¾ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚Ðµ Ð´Ñ€ÑƒÐ³.">
 <!ENTITY torsettings.useBridges.type "Ð¢Ð¸Ð¿ Ñ‚Ñ€Ð°Ð½ÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð°Ð½Ðµ:">
 <!ENTITY torsettings.useBridges.custom "Ð’ÑŠÐ²ÐµÐ´Ð¸ Ð¿ÐµÑ€ÑÐ¾Ð½Ð°Ð»Ð½Ð¸ bridges">
 <!ENTITY torsettings.useBridges.label "Ð’ÑŠÐ²ÐµÐ´Ð¸ ÐµÐ´Ð¸Ð½ Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑ‡Ðµ bridge relays (Ð¿Ð¾ ÐµÐ´Ð¸Ð½ Ð½Ð° Ð»Ð¸Ð½Ð¸Ñ).">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ð¹ Tor Ð»Ð¾Ð³Ð° Ð² ÐºÐ»Ð¸Ð¿Ð±Ð¾Ñ€Ð´Ð°">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Ð¿Ð¾Ð¼Ð¾Ñ‰">
 <!ENTITY torsettings.bridgeHelp1 "ÐÐºÐ¾ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐ²ÑŠÑ€Ð¶ÐµÑ‚Ðµ ÐºÑŠÐ¼ Tor network, Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°Ñ‚Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑŠÐ´Ðµ Ð²ÑŠÐ² Ð²Ð°ÑˆÐ¸Ñ Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ Ð´Ð¾ÑÑ‚Ð°Ð²Ñ‡Ð¸Ðº (ISP) Ð¸Ð»Ð¸ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð° Ð°Ð³ÐµÐ½Ñ†Ð¸Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ Ð½Ð°Ð±Ð»ÑŽÐ´ÐµÐ½Ð¸Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð° Tor.  Ð§ÐµÑÑ‚Ð¾, Ð²Ð¸Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ð¸Ñ‚Ðµ Ñ‚Ð¾Ð·Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼ Ñ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Tor Bridges, ÐºÐ¾Ð¸Ñ‚Ð¾ ÑÐ° Ð½ÐµÐ¿ÑƒÐ±Ð»Ð¸ÐºÑƒÐ²Ð°Ð½Ð¸ relays Ð¸ ÑÐ° Ð¼Ð½Ð¾Ð³Ð¾ Ð¿Ð¾ Ñ‚Ñ€ÑƒÐ´Ð½Ð¸ Ð·Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ðµ.">
-<!ENTITY torsettings.bridgeHelp1B "Ð’Ð¸Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚Ðµ Ð¿Ñ€Ðµ-ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ð½Ð¸, Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²ÐµÐ½Ð¸ ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ‚Ð¸ Ð¾Ñ‚ bridge Ð°Ð´Ñ€ÐµÑÐ¸ Ð¸Ð»Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð¸ÑÐºÐ²Ð°Ñ‚Ðµ ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½ Ð¿ÐµÑ€ÑÐ¾Ð½Ð°Ð»Ð¸Ð·Ð¸Ñ€Ð°Ð½ ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ‚ Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑÐ¸ ÐºÐ°Ñ‚Ð¾ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚Ðµ ÐµÐ´Ð¸Ð½ Ð¾Ñ‚ ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ñ‚Ñ€Ð¸ Ð¼ÐµÑ‚Ð¾Ð´Ð°:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "ÐŸÑ€ÐµÐ· Web">
 <!ENTITY torsettings.bridgeHelp2 "Ð˜Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹Ñ‚Ðµ ÑƒÐµÐ± Ð±Ñ€Ð°ÑƒÐ·ÑŠÑ€ Ð·Ð° Ð´Ð° Ð¿Ð¾ÑÐµÑ‚Ð¸Ñ‚Ðµ https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "ÐŸÑ€ÐµÐ· Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ Ð¾Ñ‚Ð³Ð¾Ð²Ð°Ñ€ÑÑ‰Ð¸Ñ Ð¸Ð¼ÐµÐ¹Ð»">
diff --git a/src/chrome/locale/bg/progress.dtd b/src/chrome/locale/bg/progress.dtd
index 1c89f2e..134ee70 100644
--- a/src/chrome/locale/bg/progress.dtd
+++ b/src/chrome/locale/bg/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Ð¡ÑŠÑÑ‚Ð¾ÑÐ½Ð¸Ðµ Ð½Ð° Ð¢Ð¾Ñ€">
 <!ENTITY torprogress.openSettings "ÐžÑ‚Ð²Ð¾Ñ€Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸">
 <!ENTITY torprogress.heading "Ð¡Ð²ÑŠÑ€Ð·Ð²Ð°Ð½Ðµ Ñ Ð¢Ð¾Ñ€ Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "ÐœÐ¾Ð»Ñ Ð¸Ð·Ñ‡Ð°ÐºÐ°Ð¹Ñ‚Ðµ,Ð´Ð¾ÐºÐ°Ñ‚Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ð¼ Ð²Ñ€ÑŠÐ·ÐºÐ° Ñ Ð¢Ð¾Ñ€ Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°..  ToÐ²Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¾Ñ‚Ð½ÐµÐ¼Ðµ Ð½ÑÐºÐ¾Ð»ÐºÐ¾ Ð¼Ð¸Ð½ÑƒÑ‚Ð¸.">
diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties
index af17760..7d3959a 100644
--- a/src/chrome/locale/bg/torlauncher.properties
+++ b/src/chrome/locale/bg/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Ð¢Ð¾Ñ€ Ð»ÑŠÐ½Ñ‡ÐµÑ€
@@ -13,8 +13,8 @@ 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=Ð”Ð°Ñ‚Ð° Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑÑ‚Ð° Ð½Ð° Ð¢Ð¾Ñ€ Ð½Ðµ ÑÑŠÑ‰ÐµÑÑ‚Ð²ÑƒÐ²Ð°
+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=ÐŸÑ€Ð¾Ð±Ð»ÐµÐ¼ Ñ Ð¸Ð·Ñ‚ÐµÐ³Ð»ÑÐ½ÐµÑ‚Ð¾ Ð½Ð° Ñ…ÐµÑˆÐ¸Ñ€Ð°Ð½Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð¸.
 
 torlauncher.failed_to_get_settings=ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ðµ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð½Ð° Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ð˜Ð·Ñ…Ð¾Ð´
 torlauncher.done=Ð“Ð¾Ñ‚Ð¾Ð²Ð¾
 
 torlauncher.forAssistance=Ð—Ð° ÑÑŠÐ´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ , Ð¼Ð¾Ð»Ñ ÑÐ²ÑŠÑ€Ð¶ÐµÑ‚Ðµ ÑÐµ Ñ %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ðµ Ð·Ð°Ð²ÑŠÑ€ÑˆÐµÐ½Ð¾. %S Ð¡ÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸ÑÑ‚Ð° Ð¾Ñ‚ Ð¢Ð¾Ñ€ log-Ð° ÑÐ° Ð³Ð¾Ñ‚Ð¾Ð²Ð¸ Ð´Ð° Ð±ÑŠÐ´Ð°Ñ‚ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐµÐ½Ð¸ Ð² Ñ‚ÐµÐºÑÑ‚Ð¾Ð² Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¾Ñ€ Ð¸Ð»Ð¸ Ð¸Ð¼ÐµÐ¹Ð».
 
diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/bn-BD/torlauncher.properties
+++ b/src/chrome/locale/bn-BD/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/bn-IN/network-settings.dtd
+++ b/src/chrome/locale/bn-IN/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/bn-IN/torlauncher.properties
+++ b/src/chrome/locale/bn-IN/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd
index 2c55dd3..a674a2c 100644
--- a/src/chrome/locale/bn/network-settings.dtd
+++ b/src/chrome/locale/bn/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties
index fd9face..aed4578 100644
--- a/src/chrome/locale/bn/torlauncher.properties
+++ b/src/chrome/locale/bn/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§Ÿà§‡à¦›à§‡
 
 torlauncher.unable_to_start_tor=à¦Ÿà¦° à¦¶à§à¦°à§ à¦•à¦°à¦¾ à¦¸à¦®à§à¦à¦¬ à¦¨à§Ÿà¥¤\n\n%S
 torlauncher.tor_missing= Tor executable à¦¨à¦¥à¦¿à¦Ÿà¦¿ à¦ªà¦¾à¦“à§Ÿà¦¾ à¦¯à¦¾à¦šà§à¦›à§‡ à¦¨à¦¾à¥¤
-torlauncher.torrc_missing=torrc à¦¨à¦¥à¦¿à¦Ÿà¦¿ à¦ªà¦¾à¦“à§Ÿà¦¾ à¦¯à¦¾à¦šà§à¦›à§‡ à¦¨à¦¾à¥¤
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=à¦¬à§‡à¦°à¦¿à§Ÿà§‡ à¦¯à¦¾à¦¨
 torlauncher.done=à¦¸à¦®à¦¾à¦ªà§à¦¤
 
 torlauncher.forAssistance=à¦¸à¦¾à¦¹à¦¾à¦¯à§à¦¯à§‡à¦° à¦œà¦¨à§à¦¯ , à¦¯à§‹à¦—à¦¾à¦¯à§‹à¦— à¦•à¦°à§à¦¨à¦ƒ %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.
 
diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/bo/network-settings.dtd
+++ b/src/chrome/locale/bo/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/bo/torlauncher.properties
+++ b/src/chrome/locale/bo/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/br/network-settings.dtd
+++ b/src/chrome/locale/br/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties
index 5860c8a..152b0a8 100644
--- a/src/chrome/locale/br/torlauncher.properties
+++ b/src/chrome/locale/br/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd
index cd1efa7..5a33a60 100644
--- a/src/chrome/locale/bs/network-settings.dtd
+++ b/src/chrome/locale/bs/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/bs/torlauncher.properties
+++ b/src/chrome/locale/bs/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd
index e344598..9c8a242 100644
--- a/src/chrome/locale/ca/network-settings.dtd
+++ b/src/chrome/locale/ca/network-settings.dtd
@@ -15,7 +15,7 @@
 <!ENTITY torSettings.configurePrompt1 "La connexiÃ³ a internet d'aquest ordinador estÃ  censurada o configurada amb un proxy. ">
 <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
 <!ENTITY torSettings.configure "Configura">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "M'agradaria fer una connexiÃ³ directa a la red Tor.">
 <!ENTITY torSettings.connectPrompt3 "AixÃ² funciona en la majoria dels casos.">
 <!ENTITY torSettings.connect "Conectar">
 
@@ -66,7 +66,7 @@
 <!ENTITY torsettings.copyLog "Copiar el Log al portapapers">
 <!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors">
 <!ENTITY torsettings.bridgeHelp1 "Si no sÃ³u capaÃ§ps de connectar-vos a la xarxa Tor, pot ser que el vostre proveidor d'internet (ISP) o alguna altra agÃ¨ncia estigui bloquejant Tor.  normalment, podeu evitar aquest problema usant Ponts Tor, que son relÃ©s no llistats mÃ©s difÃcils de bloquejar. ">
-<!ENTITY torsettings.bridgeHelp1B "Podeu usar el conjunt d'adreces pont preconfigurades o podeu obtenir un conjunt personalitzat d'adreces usant un d'aquests tres mÃ¨todes: ">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "A travÃ©s del web">
 <!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vÃ©s a: https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "A travÃ©s del mail d'autorresposta.">
diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd
index 331193c..06eba3a 100644
--- a/src/chrome/locale/ca/progress.dtd
+++ b/src/chrome/locale/ca/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estat de Tor">
 <!ENTITY torprogress.openSettings "Obrir preferÃ¨ncies.">
 <!ENTITY torprogress.heading "S'estÃ  connectant a la xarxa Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Per favor, esperi mentre establim la connexiÃ³ amb la red de Tor.  L'acciÃ³ pot durar varis minuts.">
diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties
index 520ffda..588c3d1 100644
--- a/src/chrome/locale/ca/torlauncher.properties
+++ b/src/chrome/locale/ca/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Inicialitzador Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S ha fallat (%2$S).
 
 torlauncher.unable_to_start_tor=Impossible iniciar Tor.\n%S
 torlauncher.tor_missing=Falta l'executable de Tor.
-torlauncher.torrc_missing=Falta l'arxiu torrc.
-torlauncher.datadir_missing=La carpeta de dades de Tor no existeix.
+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=Ha fallat l'obtencio de la contrasenya hash.
 
 torlauncher.failed_to_get_settings=Impossible obtenir la configuraciÃ³ de Tor\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Surt
 torlauncher.done=Fet
 
 torlauncher.forAssistance=Per assistÃ¨ncia, contacta %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=CÃ²pia completada. Els missatges del registre de %S Tor ja es poden enganxar en un editor de text o un missatge de correu.
 
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index b08348b..de87e8f 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "ZkopÃruj logovÃ½ soubor Toru do schrÃ¡nky">
 <!ENTITY torsettings.bridgeHelpTitle "NÃ¡povÄ›da o  mostnÃch relÃ©">
 <!ENTITY torsettings.bridgeHelp1 "Pokud nejste schopni se pÅ™ipojit k sÃti TORu, mÅ¯Å¾e to bÃ½t zpÅ¯sobeno tÃm, Å¾e vÃ¡Å¡ posktytovatel internetu (ISP) nebo nÄ›jakÃ¡ jinÃ¡ sluÅ¾ba blokuje Tor.  VÄ›tÅ¡inou mÅ¯Å¾ete obejÃt tento problÃ©m pouÅ¾itÃm MostÅ¯ TORu, coÅ¾ jsou pÅ™enaÅ¡eÄe neuvedenÃ© v seznamu, kterÃ© je sloÅ¾itÄ›jÅ¡Ã zablokovat.">
-<!ENTITY torsettings.bridgeHelp1B "MÅ¯Å¾ete pouÅ¾Ãt pÅ™ednastavenou, poskytnutou sadu sÃÅ¥ovÃ½ch mostÅ¯, nebo mÅ¯Å¾ete zÃskat vlastnÃ sadu adres pouÅ¾itÃm jednÃ© z tÄ›chto tÅ™Ã metod:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "PÅ™es sÃÅ¥">
 <!ENTITY torsettings.bridgeHelp2 "PouÅ¾ijte internetovÃ½ prohlÃÅ¾eÄ k nÃ¡vÅ¡tÄ›vÄ› https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "PÅ™es automatickÃ½ e-mailovÃ½ odpovÃdaÄ">
diff --git a/src/chrome/locale/cs/progress.dtd b/src/chrome/locale/cs/progress.dtd
index e91a01f..0311994 100644
--- a/src/chrome/locale/cs/progress.dtd
+++ b/src/chrome/locale/cs/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Stav">
 <!ENTITY torprogress.openSettings "OtevÅ™Ãt nastavenÃ">
 <!ENTITY torprogress.heading "PÅ™ipojuji se k sÃti Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "ProsÃm Äekejte zatÃmco se pÅ™ipojuji do Tor sÃtÄ›.  Toto mÅ¯Å¾e trvat nÄ›kolik minut.">
diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties
index 0701889..63343e1 100644
--- a/src/chrome/locale/cs/torlauncher.properties
+++ b/src/chrome/locale/cs/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor spouÅ¡tÄ›Ä
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S selhal (%2$S).
 
 torlauncher.unable_to_start_tor=Tor nenÃ schopen startovat\n\n%S
 torlauncher.tor_missing=SpustitelnÃ½ soubor Tor chybÃ.
-torlauncher.torrc_missing=ChybÃ soubor torrc.
-torlauncher.datadir_missing=AdresÃ¡Å™ s daty Tor neexistuje.
+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=Nepovedlo se zÃskat hashovanÃ© heslo.
 
 torlauncher.failed_to_get_settings=Nelze naÄÃst Tor nastavenÃ.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Konec
 torlauncher.done=Hotovo
 
 torlauncher.forAssistance=Pro asistenci kontaktujte %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=KopÃrovÃ¡nÃ kompletnÃ. %S zprÃ¡vy protokolu Tor jsou pÅ™ipraveny k vloÅ¾enÃ do textovÃ©ho editoru nebo e-mailovÃ© zprÃ¡vy.
 
diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/csb/network-settings.dtd
+++ b/src/chrome/locale/csb/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/csb/torlauncher.properties
+++ b/src/chrome/locale/csb/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd
index f3d44b5..dfe657e 100644
--- a/src/chrome/locale/cv/network-settings.dtd
+++ b/src/chrome/locale/cv/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties
index f55f173..7165530 100644
--- a/src/chrome/locale/cv/torlauncher.properties
+++ b/src/chrome/locale/cv/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd
index e743cc1..6f3cc56 100644
--- a/src/chrome/locale/cy/network-settings.dtd
+++ b/src/chrome/locale/cy/network-settings.dtd
@@ -1,8 +1,8 @@
 <!ENTITY torsettings.dialog.title "Gosodiadau Rhwydwaith Tor">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Iaith Porwr Tor">
+<!ENTITY torlauncher.localePicker.prompt "Dewiswch iaith">
 
 <!-- For "first run" wizard: -->
 
@@ -34,7 +34,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Yn aros am Tor i gychwynâ€¦">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "Ailgychwyn Tor">
 <!ENTITY torsettings.reconfigTor "Reconfigure">
 
 <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copio Cofnod Tor i'r Clipfwrdd">
 <!ENTITY torsettings.bridgeHelpTitle "Cymorth Pont RelÃ¡i">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties
index 5119e81..a4ff982 100644
--- a/src/chrome/locale/cy/torlauncher.properties
+++ b/src/chrome/locale/cy/torlauncher.properties
@@ -1,10 +1,10 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Lansiwr Tor
 
 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_exited2=Ni fydd ailgychwyn Tor yn cau'ch tabiau porwr.
 torlauncher.tor_controlconn_failed=Ni allai gysylltu Ã¢'r porth rheolaeth Tor.
 torlauncher.tor_failed_to_start=Methodd Tor gychwyn.
 torlauncher.tor_control_failed=Methu cymryd rheolaeth o Tor.
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=Methodd %1$S (%2$S).
 
 torlauncher.unable_to_start_tor=Methu cychwyn Tor.\n\n%S
 torlauncher.tor_missing=Mae'r gweithredadwyn Tor ar goll.
-torlauncher.torrc_missing=Mae'r ffeil torrc ar goll.
-torlauncher.datadir_missing=Nid yw'r cyfeiriadur data Tor yn bodoli.
+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=Methwyd gael cyfrinair stwnshlyd.
 
 torlauncher.failed_to_get_settings=Methwyd nÃ´l gosodiadau Tor.\n\n%S
@@ -30,14 +30,15 @@ torlauncher.error_bridge_bad_default_type=Does ddim pontiau a ddatparwyd gyda'r
 torlauncher.recommended_bridge=(awgrymwyd)
 
 torlauncher.connect=Cysylltu
-torlauncher.restart_tor=Restart Tor
+torlauncher.restart_tor=Ailgychwyn Tor
 torlauncher.quit=Cau
 torlauncher.quit_win=Gadael
 torlauncher.done=Wedi gorffen
 
 torlauncher.forAssistance=Am gymorth, cysylltu Ã¢ %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.copiedNLogMessages=Copio wedi gorffen. Mae %S o negeseuon log Tor yn barod i'u gludo mewn golygydd testun neu neges ebost.
 
 torlauncher.bootstrapStatus.conn_dir=Cysylltu i cyfeiriadur cyfnewid
 torlauncher.bootstrapStatus.handshake_dir=Yn sefydlu cysylltiad cyfeiriadur amgryptiedig
diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd
index f8f4c0f..aa32a1f 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen">
 <!ENTITY torsettings.bridgeHelpTitle "Bro-relÃ¦ hjÃ¦lp">
 <!ENTITY torsettings.bridgeHelp1 "Hvis du ikke kan forbinde dig til Tor netvÃ¦rket er det muligt at din internet udbyder (ISP) eller anden myndighed blokerer Tor.   Det er ofte muligt at komme rundt om en blokade ved at bruge en Tor bro. En bro er et relÃ¦ som ikke er pÃ¥ den offentliggjorte liste og som derfor er svÃ¦rere at blokkere.">
-<!ENTITY torsettings.bridgeHelp1B "Du kan bruge det pre-konfigurerede tildelte sÃ¦t af bro-adresser eller du kan hente et skrÃ¦ddersyet sÃ¦t adresser ved at bruge en af fÃ¸lgende tre metoder:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "PÃ¥ nettet">
 <!ENTITY torsettings.bridgeHelp2 "Brug en browser og besÃ¸g https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske email service">
diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties
index 2c7c9ca..7ad9dda 100644
--- a/src/chrome/locale/da/torlauncher.properties
+++ b/src/chrome/locale/da/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor starter
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S).
 
 torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S
 torlauncher.tor_missing=Kunne ikke finde Tor programmet.
-torlauncher.torrc_missing=Torrc-filen mangler.
-torlauncher.datadir_missing=Tor's data bibliotek eksisterer ikke.
+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=Kunne ikke finde hash-vÃ¦rdi af kodeordet.
 
 torlauncher.failed_to_get_settings=Kunne ikke lÃ¦se Tor indstillingerne..âŽ\nâŽ\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Afslut
 torlauncher.done=FÃ¦rdig
 
 torlauncher.forAssistance=For hjÃ¦lp, kontakt %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopieringen er gennemfÃ¸rt. %S logbeskeder fra Tor er klar til at blive sat ind i et tekstdokument eller en e-mail.
 
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index 4d4b2ac..b2cc0c2 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -13,7 +13,7 @@
 
 <!ENTITY torSettings.firstQuestion "Was beschreibt Ihre Situation am besten?">
 <!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert oder vermittelt.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Ich muss eine NetzwerkbrÃ¼cke oder lokale Proxy-Einstellungen konfigurieren, bevor ich mich mit dem Tor Netzwerk verbinde.">
 <!ENTITY torSettings.configure "Konfigurieren">
 <!ENTITY torSettings.connectPrompt2 "Ich wÃ¼rde gerne eine direkte Verbindung mit dem Tor-Netzwerk  herstellen">
 <!ENTITY torSettings.connectPrompt3 "Das wird in den meisten Situationen funktionieren.">
@@ -22,13 +22,13 @@
 <!ENTITY torSettings.proxyPageTitle "Lokale Proxy-Konfiguration">
 <!ENTITY torSettings.proxyQuestion "BenÃ¶tigt dieser Rechner einen lokalen Proxy um auf das Internet zuzugreifen?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "In den meisten FÃ¤llen ist ein lokaler Proxy nicht nÃ¶tig, er kÃ¶nnte aber notwendig werden, falls eine Verbindung durch ein Firmen-, Schul- oder UniversitÃ¤tsnetzwerk aufgebaut werden soll.">
+<!ENTITY torSettings.proxyExplanation2 "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, sehen Sie sich die Interneteinstellungen in einem anderen Browser an oder Ã¼berprÃ¼fen Sie die Netzwerkeinstellungen des Systems um zu bestimmen, ob sie einen lokalen Proxyserver benÃ¶tigen.">
 <!ENTITY torSettings.enterProxy "Proxy-Einstellungen eingeben.">
 <!ENTITY torSettings.bridgePageTitle "TorbrÃ¼cken-Konfiguration">
 <!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, wÃ¤hlen Sie nein (falls Sie nicht in der Lage sind, sich ohne BrÃ¼cke mit dem Tor-Netzwerk zu verbinden, kÃ¶nnen Sie sie spÃ¤ter hinzufÃ¼gen).">
+<!ENTITY torSettings.bridgeExplanation2 "Wenn Sie Ja wÃ¤hlen, werden sie gebeten, Tor-BrÃ¼cken zu konfigurieren. Tor-BrÃ¼cken sind nicht gelistete Relais, die es erschweren, Verbindungen zum Tor-Netzwerk zu blockieren.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Sie kÃ¶nne den bereitgestellten Satz an BrÃ¼cken verwenden oder Sie kÃ¶nnen welche erhalten, und geben einen benutzerdefinierten Satz an BrÃ¼cken ein.">
 
 <!-- Other: -->
@@ -37,7 +37,7 @@
 <!ENTITY torsettings.restartTor "Tor neu starten">
 <!ENTITY torsettings.reconfigTor "Neu einstellen">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.prompt "Sie haben Tor-BrÃ¼cken konfiguriert oder lokale Proxyeinstellungen eingetragen.  Um eine direkte Verbindung zum Tor-Netzwerk herzustellen, mÃ¼ssen diese Einstellungen entfernt werden.">
 <!ENTITY torsettings.discardSettings.proceed "Einstellungen entfernen und verbinden">
 
 <!ENTITY torsettings.optional "Optional">
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Erlaubte AnschlÃ¼sse:">
 <!ENTITY torsettings.useBridges.checkbox "Mein Internetdienstanbieter (ISP) blockiert Verbindungen zum Tor-Netzwerk">
 <!ENTITY torsettings.useBridges.default "Mit bereitgestellten BrÃ¼cken verbinden ">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Jede Art von BrÃ¼cke verwendet eine andere Methode um Zensur zu umgehen. Wenn eine BrÃ¼cke nicht funktioniert, versuchen Sie es erneut, unter Verwendung einer anderen BrÃ¼cke.">
 <!ENTITY torsettings.useBridges.type "Ãœbertragungstyp:">
 <!ENTITY torsettings.useBridges.custom "Benutzerdefinierte BrÃ¼cken eingeben">
 <!ENTITY torsettings.useBridges.label "Ein oder mehrere BrÃ¼ckenrelais eingeben (eins pro Zeile).">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren">
 <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum BrÃ¼ckenrelais">
 <!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden kÃ¶nnen, ist es mÃ¶glich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.  Dieses Problem kann meist mit der Benutzung von TorbrÃ¼cken umgangen werden, das sind versteckte Relais und damit schwerer zu blocken.">
-<!ENTITY torsettings.bridgeHelp1B "Sie kÃ¶nnen den vorkonfigurierten und bereitgestellten Satz an BrÃ¼ckenadressen verwenden, oder Sie kÃ¶nnen einen benutzerdefinierten Satz von Adressen, mit einer dieser drei Methoden erhalten:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet">
 <!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort">
diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties
index 0da42da..39ee07a 100644
--- a/src/chrome/locale/de/torlauncher.properties
+++ b/src/chrome/locale/de/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor-Starter
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S gescheitert (%2$S).
 
 torlauncher.unable_to_start_tor=Tor kann nicht gestartet werden.\n\n%S
 torlauncher.tor_missing=Die Tor-Programmdatei ist nicht vorhanden.
-torlauncher.torrc_missing=Die torrc-Datei ist nicht vorhanden.
-torlauncher.datadir_missing=Das Tor-Datenverzeichniss existiert nicht.
+torlauncher.torrc_missing=Die torrc Datei fehlt und konnte nicht erstellt werden.
+torlauncher.datadir_missing=Das Tor Dateiverzeichnis existiert nicht und konnte nicht erstellt werden.
 torlauncher.password_hash_missing=Erhalt des Hash-Passwortes ist fehlgeschlagen.
 
 torlauncher.failed_to_get_settings=Die Tor-Einstellungen kÃ¶nnen nicht abgefragt werden.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Beenden
 torlauncher.done=Fertig
 
 torlauncher.forAssistance=Falls Sie Hilfe benÃ¶tigen, kontaktieren Sie %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopie vollstÃ¤ndig. %S Tor-Protokollnachrichten sind bereit, um in eine Textbearbeitung oder in eine E-Mail-Nachricht eingefÃ¼gt zu werden.
 
diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/dz/network-settings.dtd
+++ b/src/chrome/locale/dz/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/dz/torlauncher.properties
+++ b/src/chrome/locale/dz/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index d776892..210a82e 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -13,33 +13,33 @@
 
 <!ENTITY torSettings.firstQuestion "Î Î¿Î¹Î¿ Î±Ï€ÏŒ Ï„Î± Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ Ï€ÎµÏÎ¹Î³ÏÎ¬Ï†ÎµÎ¹ ÎºÎ±Î»ÏÏ„ÎµÏÎ± Ï„Î·Î½ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ® ÏƒÎ±Ï‚;">
 <!ENTITY torSettings.configurePrompt1 "Î£ÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Internet Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® Î»Î¿Î³Î¿ÎºÏÎ¯Î½ÎµÏ„Î±Î¹ Î® Ï€ÏÎ¿ÏƒÎµÎ³Î³Î¯Î¶ÎµÏ„Î±Î¹">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Î ÏÎ¹Î½ ÏƒÏ…Î½Î´ÎµÎ¸ÏŽ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¸Î¿ÏÎ½ Î¿Î¹ Î³ÎÏ†Ï…ÏÎµÏ‚ Î® Î¿Î¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Ï„Î¿Ï… Ï„Î¿Ï€Î¹ÎºÎ¿Ï ÎµÎ½Î´Î¹Î¬Î¼ÎµÏƒÎ¿Ï….">
 <!ENTITY torSettings.configure "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· ">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Î˜ÎÎ»Ï‰ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÏŽ Î±Ï€'ÎµÏ…Î¸ÎµÎ¯Î±Ï‚ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor.">
 <!ENTITY torSettings.connectPrompt3 "Î‘Ï…Ï„ÏŒ Î¸Î± Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î®ÏƒÎµÎ¹ ÏƒÏ„Î¹Ï‚ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Ï€ÎµÏÎ¹Ï€Ï„ÏŽÏƒÎµÎ¹Ï‚.">
 <!ENTITY torSettings.connect "Î£ÏÎ½Î´ÎµÏƒÎ·">
 
 <!ENTITY torSettings.proxyPageTitle "Î¤Î¿Ï€Î¹ÎºÎ® Î´Î¹Î±Î¼ÏŒÏÏ†Ï‰ÏƒÎ· Proxy">
 <!ENTITY torSettings.proxyQuestion "ÎœÎ®Ï€Ï‰Ï‚ Î±Ï…Ï„ÏŒÏ‚ Î¿ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ ÎÎ½Î± Ï„Î¿Ï€Î¹ÎºÏŒ proxy Î³Î¹Î± Ï„Î·Î½ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÏ„Î¿ Î”Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿;">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "Î£Ï„Î¹Ï‚ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Ï€ÎµÏÎ¹Ï€Ï„ÏŽÏƒÎµÎ¹Ï‚ Î´Îµ Ï‡ÏÎµÎ¹Î¬Î¶ÎµÏ„Î±Î¹ ÎºÎ¬Ï€Î¿Î¹Î¿Ï‚ Ï„Î¿Ï€Î¹ÎºÏŒÏ‚ ÎµÎ½Î´Î¹Î¬Î¼ÎµÏƒÎ¿Ï‚ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚, Î¯ÏƒÏ‰Ï‚ ÏŒÎ¼Ï‰Ï‚ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±Î³ÎºÎ±Î¯Î¿Ï‚ ÏŒÏ„Î±Î½ ÏƒÏ…Î½Î´ÎÎµÏƒÏ„Îµ Î¼ÎÏƒÏ‰ ÎºÎ¬Ï€Î¿Î¹Î±Ï‚ ÎµÏ„Î±Î¹ÏÎ¯Î±Ï‚, ÏƒÏ‡Î¿Î»ÎµÎ¯Î¿Ï… Î® Ï€Î±Î½ÎµÏ€Î¹ÏƒÏ„Î·Î¼Î¹Î±ÎºÎ¿Ï Î´Î¹ÎºÏ„ÏÎ¿Ï….">
+<!ENTITY torSettings.proxyExplanation2 "Î‘Î½ Î´ÎµÎ½ ÎµÎ¯ÏƒÏ„Îµ Î²ÎÎ²Î±Î¹Î¿Î¹/ÎµÏ‚ Î³Î¹Î± Ï„Î·Î½ Î±Ï€Î¬Î½Ï„Î·ÏƒÎ· ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ ÎµÏÏŽÏ„Î·Î¼Î± ÎºÎ±Î¹ Î³Î¹Î± Î½Î± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÏŽÏƒÎµÏ„Îµ Î±Î½ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±Î³ÎºÎ±Î¯Î¿Ï‚ ÎÎ½Î±Ï‚ Ï„Î¿Ï€Î¹ÎºÏŒÏ‚ ÎµÎ½Î´Î¹Î¬Î¼ÎµÏƒÎ¿Ï‚, ÎµÎ»ÎÎ³Î¾Ï„Îµ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î”Î¹Î±Î´Î¹ÎºÏ„ÏÎ¿Ï… ÏƒÎµ ÎºÎ¬Ï€Î¿Î¹Î¿Î½ Î¬Î»Î»Î¿ Ï€ÎµÏÎ¹Î·Î³Î·Ï„Î® Î® Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î´Î¹ÎºÏ„ÏÏ‰ÏƒÎ·Ï‚ Ï„Î¿Ï… Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚ .">
 <!ENTITY torSettings.enterProxy "Î•Î¹ÏƒÎ¬Î³Ï‰Î³Î· Ï„Ï‰Î½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Î¼ÎµÏƒÎ¿Î»Î¬Î²Î·ÏƒÎ·Ï‚.">
 <!ENTITY torSettings.bridgePageTitle "Î”Î¹Î±Î¼ÏŒÏÏ†Ï‰ÏƒÎ· Î“ÎµÏ†Ï…ÏÏŽÎ½ Tor">
 <!ENTITY torSettings.bridgeQuestion "Î“Î½Ï‰ÏÎ¯Î¶ÎµÏ„Îµ Î±Î½ Î¿ Ï€Î¬ÏÎ¿Ï‡Î¿Ï‚ (ISP) ÏƒÎ±Ï‚ Î¼Ï€Î»Î¿ÎºÎ¬ÏÎµÎ¹ Î® Î¼Îµ Î¿Ï€Î¿Î¹Î¿Î´Î®Ï€Î¿Ï„Îµ Ï„ÏÏŒÏ€Î¿ ÎµÎ»ÎÎ³Ï‡ÎµÎ¹ ÏƒÏ…Î½Î´ÎÏƒÎµÎ¹Ï‚
 ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Î‘Î½ Î´ÎµÎ½ Î³Î½Ï‰ÏÎ¯Î¶ÎµÏ„Îµ Ï€Ï‰Ï‚ Î½Î± Î±Ï€Î±Î½Ï„Î®ÏƒÎµÏ„Îµ ÏƒÎµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÏÏŽÏ„Î·ÏƒÎ·, ÎµÏ€Î¹Î»ÎÎ¾Ï„Îµ ÎŒÏ‡Î¹ (Î±Î½ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor Ï‡Ï‰ÏÎ¯Ï‚ Ï„Î·Î½ Ï‡ÏÎ®ÏƒÎ· ÎºÎ¬Ï€Î¿Î¹Î±Ï‚ Î³ÎÏ†Ï…ÏÎ±Ï‚, Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Ï€ÏÎ¿ÏƒÎ¸ÎÏƒÎµÏ„Îµ Î±ÏÎ³ÏŒÏ„ÎµÏÎ± Î¼Î¹Î±).">
+<!ENTITY torSettings.bridgeExplanation2 "Î‘Î½ ÎµÏ€Î¹Î»ÎÎ¾ÎµÏ„Îµ ÎÎ±Î¹ Î¸Î± ÏƒÎ±Ï‚ Î¶Î·Ï„Î·Î¸ÎµÎ¯ Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ„Îµ Ï„Î¹Ï‚ Î“ÎÏ†Ï…ÏÎµÏ‚ Tor, Î¿Î¹ Î¿Ï€Î¿Î¯ÎµÏ‚ ÎµÎ¯Î½Î±Î¹ Î±ÎºÎ±Ï„Î±Ï‡ÏŽÏÎ¹ÏƒÏ„Î¿Î¹ Î±Î½Î±Î¼ÎµÏ„Î±Î´ÏŒÏ„ÎµÏ‚ Ï€Î¿Ï… Î´Ï…ÏƒÎºÎ¿Î»ÎµÏÎ¿Ï…Î½ Ï„Î·Î½ Ï€Î±ÏÎµÎ¼Ï€ÏŒÎ´Î¹ÏƒÎ· ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ ÏƒÏ„Î¿ Î”Î¯ÎºÏ„Ï…Î¿ Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î¹Ï‚ Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½ÎµÏ‚ Î³ÎÏ†Ï…ÏÎµÏ‚, Î® Î½Î± Î±Ï€Î¿ÎºÏ„Î®ÏƒÎµÏ„Îµ ÎºÎ±Î¹ ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Î½ÎÎµÏ‚ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ Î³ÎµÏ†Ï…ÏÏŽÎ½.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Î‘Î½Î±Î¼Î¿Î½Î® Î³Î¹Î± Î½Î± Î¾ÎµÎºÎ¹Î½Î®ÏƒÎµÎ¹ Ï„Î¿ Tor... ">
 <!ENTITY torsettings.restartTor "EÏ€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Î‘Î½Î±Î´Î¹Î±Î¼ÏŒÏÏ†Ï‰ÏƒÎ·">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "ÎˆÏ‡ÎµÏ„Îµ ÏÏ…Î¸Î¼Î¹ÏƒÎ¼ÎÎ½ÎµÏ‚ Î³ÎÏ†Ï…ÏÎµÏ‚ Tor Î® ÎÏ‡ÎµÏ„Îµ ÎµÎ¹ÏƒÎ¬Î³ÎµÎ¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î³Î¹Î± Ï„Î¿Î½ Ï„Î¿Ï€Î¹ÎºÏŒ ÎµÎ½Î´Î¹Î¬Î¼ÎµÏƒÎ¿.  Î“Î¹Î± Î½Î± Ï€ÏÎ±Î³Î¼Î±Ï„Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î±Ï€ÎµÏ…Î¸ÎµÎ¯Î±Ï‚ ÏƒÏÎ½Î´ÎµÏƒÎ· Î¼Îµ Ï„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor Î¿Î¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î±Ï…Ï„ÎÏ‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î±Ï€Î¿Î¼Î±ÎºÏÏ…Î½Î¸Î¿ÏÎ½.">
+<!ENTITY torsettings.discardSettings.proceed "Î‘Ï€Î¿Î¼Î±ÎºÏÏÎ½ÎµÏ„Îµ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ">
 
 <!ENTITY torsettings.optional "Î ÏÎ¿ÎµÏÎ±Î¹Ï„Î¹ÎºÎ±">
 
@@ -57,7 +57,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Î•Ï€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½ÎµÏ‚ Î˜ÏÏÎµÏ‚:">
 <!ENTITY torsettings.useBridges.checkbox "ÎŸ Ï€Î¬ÏÎ¿Ï‡Î¿Ï‚ Î´Î¹Î±Î´Î¹ÎºÏ„Ï…Î¿Ï… (ISP) Î¼Ï€Î»Î¿ÎºÎ¬ÏÎµÎ¹ Ï„Î¹Ï‚ ÏƒÏ…Î½Î´ÎÏƒÎµÎ¹Ï‚ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Ï„Î¿Ï… Tor">
 <!ENTITY torsettings.useBridges.default "Î£ÏÎ½Î´ÎµÏƒÎ· Î¼Îµ Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½ÎµÏ‚ Î³ÎÏ†Ï…ÏÎµÏ‚">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "ÎšÎ¬Î¸Îµ Ï„ÏÏ€Î¿Ï‚ Î³ÎÏ†Ï…ÏÎ±Ï‚ Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÎ® Î¼ÎÎ¸Î¿Î´Î¿ Î±Ï€Î¿Ï†Ï…Î³Î®Ï‚ Ï„Î·Ï‚ Î»Î¿Î³Î¿ÎºÏÎ¹ÏƒÎ¯Î±Ï‚.  Î‘Î½ Î´ÎµÎ½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³ÎµÎ¯ ÎºÎ¬Ï€Î¿Î¹Î± Î³ÎÏ†Ï…ÏÎ±, Ï€ÏÎ¿ÏƒÏ€Î±Î¸Î®ÏƒÏ„Îµ ÎºÎ±Î¹ Ï€Î¬Î»Î¹ Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÏŽÎ½Ï„Î±Ï‚ ÎºÎ¬Ï€Î¿Î¹Î± Î¬Î»Î»Î·, Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÎ®.">
 <!ENTITY torsettings.useBridges.type "Î¤ÏÏ€Î¿Ï‚ Î¼ÎµÏ„Î±Ï†Î¿ÏÎ¬Ï‚:">
 <!ENTITY torsettings.useBridges.custom "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î® Î¬Î»Î»Ï‰Î½ Î³ÎµÏ†Ï…ÏÏŽÎ½">
 <!ENTITY torsettings.useBridges.label "Î•Î¹ÏƒÎ¬Î³ÎµÏ„Îµ Î¼Î¹Î± Î® Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ Î³ÎµÏ†Ï…ÏÏŽÎ½ (Î¼Î¯Î± Î±Î½Î¬ Î³ÏÎ±Î¼Î¼Î®).">
@@ -66,7 +66,7 @@
 <!ENTITY torsettings.copyLog "Î‘Î½Ï„Î¹Î³ÏÎ±Ï†Î® ÏƒÏ„Î¿ Ï€ÏÏŒÏ‡ÎµÎ¹ÏÎ¿">
 <!ENTITY torsettings.bridgeHelpTitle "Î“ÎµÏ†Ï…ÏÎµÏ‚ Î±Î½Î±Î¼ÎµÏ„Î±Î´Î¿Ï„Ï‰Î½ Î’Î¿Î·Î¸ÎµÎ¹Î±">
 <!ENTITY torsettings.bridgeHelp1 "Î‘Î½ Î´Îµ Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor, Î¯ÏƒÏ‰Ï‚ Î¿ Ï€Î¬ÏÎ¿Ï‡ÏŒÏ‚ (ISP) ÏƒÎ±Ï‚ Î® ÎºÎ¬Ï€Î¿Î¹Î¿Ï‚ Ï„ÏÎ¯Ï„Î¿Ï‚ Î¼Ï€Î»Î¿ÎºÎ¬ÏÎµÎ¹ Ï„Î¿ Tor .  Î‘Ï…Ï„ÏŒ Ï„Î¿ Ï€ÏÏŒÎ²Î»Î·Î¼Î± ÏƒÏ…Î½Î®Î¸Ï‰Ï‚ Î»ÏÎ½ÎµÏ„Î±Î¹ Î¼Îµ Ï„Î· Ï‡ÏÎ®ÏƒÎ· Tor Bridges (Î³ÎÏ†Ï…ÏÎµÏ‚), Ï€Î¿Ï… ÎµÎ¯Î½Î±Î¹ Î¼Î· Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏ…Î¼ÎÎ½ÎµÏ‚ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ Î±Ï€ÏŒ Ï„Î¹Ï‚ Î¿Ï€Î¿Î¯ÎµÏ‚ Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Î¼Ï€ÎµÎ¯Ï„Îµ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor, ÏƒÏ…Î½ÎµÏ€ÏŽÏ‚ Ï€Î¹Î¿ Î´ÏÏƒÎºÎ¿Î»Î¿ Î½Î± Î¼Ï€Î»Î¿ÎºÎ±ÏÎ¹ÏƒÏ„Î¿ÏÎ½.">
-<!ENTITY torsettings.bridgeHelp1B "ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î¹Ï‚ Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½ÎµÏ‚ Î³ÎÏ†Ï…ÏÎµÏ‚, Î® Î½Î± Î±Ï€Î¿ÎºÏ„Î®ÏƒÎµÏ„Îµ Î½ÎÎµÏ‚ Î´Î¹Ï…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ Î³ÎµÏ†Ï…ÏÏŽÎ½ Î¼Îµ ÎÎ½Î±Î½ Î±Ï€ÏŒ Ï„Î¿Ï…Ï‚ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ Ï„ÏÎµÎ¹Ï‚ Ï„ÏÏŒÏ€Î¿Ï…Ï‚:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "ÎœÎÏƒÏ‰ Ï„Î¿Ï… Î”Î¹Î±Î´Î¹ÎºÏ„ÏÎ¿Ï…">
 <!ENTITY torsettings.bridgeHelp2 "Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ ÎÎ½Î±Î½ Ï†Ï…Î»Î»Î¿Î¼ÎµÏ„ÏÎ·Ï„Î® Î³Î¹Î± Î½Î± ÎµÏ€Î¹ÏƒÎºÎµÏ†Ï„ÎµÎ¯Ï„Îµ Ï„Î¿ https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "ÎœÎÏƒÏ‰ Ï„Î·Ï‚ Î‘Ï…Ï„Î¿Î¼Î±Ï„Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î·Ï‚ Î‘Ï€Î¬Î½Ï„Î·ÏƒÎ·Ï‚ Email">
diff --git a/src/chrome/locale/el/progress.dtd b/src/chrome/locale/el/progress.dtd
index 9f96b8d..e63961a 100644
--- a/src/chrome/locale/el/progress.dtd
+++ b/src/chrome/locale/el/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… Tor ">
 <!ENTITY torprogress.openSettings "Î‘Î½Î¿Î¹Î³Î¼Î± ÏÏ…Î¸Î¼Î¹ÏƒÎµÏ‰Î½">
 <!ENTITY torprogress.heading "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¹Î± ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï€ÎµÏÎ¹Î¼ÎÎ½ÎµÏ„Îµ ÎºÎ±Î¸ÏŽÏ‚ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÏ„Îµ ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor.  Î‘Ï…Ï„ÏŒ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€Î¬ÏÎµÎ¹ Î¼ÎµÏÎ¹ÎºÎ¬ Î»ÎµÏ€Ï„Î¬.">
diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties
index b257e45..b0a53e6 100644
--- a/src/chrome/locale/el/torlauncher.properties
+++ b/src/chrome/locale/el/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ 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.torrc_missing=Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ torrc Î»ÎµÎ¯Ï€ÎµÎ¹ ÎºÎ±Î¹ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸ÎµÎ¯.
+torlauncher.datadir_missing=ÎŸ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Tor Î´ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ ÎºÎ±Î¹ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸ÎµÎ¯.
 torlauncher.password_hash_missing=Î‘Ï€ÎÏ„Ï…Ï‡Îµ Î½Î± Ï€Î¬ÏÎµÎ¹ Î´Î¹Î±Î³ÏÎ±Î¼Î¼Î¹ÏƒÎ¼ÎÎ½Î¿ ÎºÏ‰Î´Î¹ÎºÏŒ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚.
 
 torlauncher.failed_to_get_settings=Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î´Î¹Î±Î³ÏÎ±Ï†Î®Ï‚ Ï„Ï‰Î½ Tor ÏÏ…Î¸Î¼Î¹ÏƒÎµÏ‰Î½.âŽ\nâŽ\n%S
@@ -36,8 +36,9 @@ torlauncher.quit_win=ÎˆÎ¾Î¿Î´Î¿Ï‚
 torlauncher.done=Î¤ÎµÎ»Î¿Ï‚
 
 torlauncher.forAssistance=Î“Î¹Î± Î²Î¿Î®Î¸ÎµÎ¹Î±, ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î®ÏƒÏ„Îµ Î¼Îµ Ï„Î¿% S 
+torlauncher.forAssistance2=For assistance, visit %S
 
-torlauncher.copiedNLogMessages=Î— Î±Î½Ï„Î¹Î³ÏÎ±Ï†Î® Î¿Î»Î¿ÎºÎ»Î·ÏÏŽÎ¸Î·ÎºÎµ. %S Î¤Î± Î¼Î·Î½ÏÎ¼Î±Ï„Î± ÎºÎ±Ï„Î±Î³ÏÎ±Ï†Î®Ï‚ ÎµÎ¯Î½Î±Î¹ ÎÏ„Î¿Î¹Î¼Î± Î½Î± ÎµÏ€Î¹ÎºÎ¿Î»Î»Î·Î¸Î¿ÏÎ½ ÏƒÎµ ÎÎ½Î± ÎºÎµÎ¹Î¼ÎµÎ½Î¿Î³ÏÎ¬Ï†Î¿ Î® ÎÎ½Î± Î¼Î®Î½Ï…Î¼Î± Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï….
+torlauncher.copiedNLogMessages=Î— Î±Î½Ï„Î¹Î³ÏÎ±Ï†Î® Î¿Î»Î¿ÎºÎ»Î·ÏÏŽÎ¸Î·ÎºÎµ. %S Î¼Î·Î½ÏÎ¼Î±Ï„Î± ÎºÎ±Ï„Î±Î³ÏÎ±Ï†Î®Ï‚ ÎµÎ¯Î½Î±Î¹ ÎÏ„Î¿Î¹Î¼Î± Î½Î± ÎµÏ€Î¹ÎºÎ¿Î»Î»Î·Î¸Î¿ÏÎ½ ÏƒÎµ ÎÎ½Î± ÎºÎµÎ¹Î¼ÎµÎ½Î¿Î³ÏÎ¬Ï†Î¿ Î® ÎÎ½Î± Î¼Î®Î½Ï…Î¼Î± Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï….
 
 torlauncher.bootstrapStatus.conn_dir=Î£ÏÎ½Î´ÎµÏƒÎ· ÏƒÎµ ÎµÎ½Î´Î¹Î¬Î¼ÎµÏƒÎ¿ (relay) ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿
 torlauncher.bootstrapStatus.handshake_dir=Î ÏÎ±Î³Î¼Î±Ï„Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÎµ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î¿ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿
diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/en-GB/network-settings.dtd
+++ b/src/chrome/locale/en-GB/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/en-GB/torlauncher.properties b/src/chrome/locale/en-GB/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/en-GB/torlauncher.properties
+++ b/src/chrome/locale/en-GB/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd
index 89f752b..0c3fa75 100644
--- a/src/chrome/locale/eo/network-settings.dtd
+++ b/src/chrome/locale/eo/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties
index 7609a5c..2fd97ff 100644
--- a/src/chrome/locale/eo/torlauncher.properties
+++ b/src/chrome/locale/eo/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor-startigilo
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S malsukcesis (%2$S).
 
 torlauncher.unable_to_start_tor=Ne eblas starti Tor.\n\n%S
 torlauncher.tor_missing=Tor-komandodosiero mankas.
-torlauncher.torrc_missing=Konfigura dosiero torrc mankas.
-torlauncher.datadir_missing=Datuma dosierujo de Tor ne ekzistas.
+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=Malsukcesis ricevado de haketigita pasvorto.
 
 torlauncher.failed_to_get_settings=Ne eblas ricevi agordojn de Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Eliri
 torlauncher.done=Preta
 
 torlauncher.forAssistance=Por asiston kontaktu %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopiado estas preta. %S Tor-protokolaj mesaÄoj pretas por enigi ilin en tekstredaktilon aÅ retpoÅtmesaÄon.
 
diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd
index 9dd4ef3..43e6c10 100644
--- a/src/chrome/locale/es-AR/network-settings.dtd
+++ b/src/chrome/locale/es-AR/network-settings.dtd
@@ -13,7 +13,7 @@
 
 <!ENTITY torSettings.firstQuestion "Â¿CuÃ¡l de las siguientes opciones describe mejor su situaciÃ³n?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Necesito configurar un puente o proxy local anntes de conectarme a la red Tor.">
 <!ENTITY torSettings.configure "Configurar">
 <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Esto deberÃa funcionar en la mayorÃa de situaciones.">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "A travÃ©s de la Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties
index 3c010cb..3ca3c78 100644
--- a/src/chrome/locale/es-AR/torlauncher.properties
+++ b/src/chrome/locale/es-AR/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Lanzador de Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S fallÃ³ (%2$S).
 
 torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S
 torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor
-torlauncher.torrc_missing=No se encuentra el archivo torrc.
-torlauncher.datadir_missing=El directorio de datos de Tor no existe.
+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=FallÃ³ al conseguir contraseÃ±as encriptadas.
 
 torlauncher.failed_to_get_settings=No se pudo acceder a las configuraciones de Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Salir
 torlauncher.done=Hecho
 
 torlauncher.forAssistance=Para solicitar asistencia, contactese al %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copia completa. %S registros de log de Tor estÃ¡n listos para ser pegados en un editor de textos o un e-mail.
 
diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd
index b6cd80c..6303509 100644
--- a/src/chrome/locale/es-CL/network-settings.dtd
+++ b/src/chrome/locale/es-CL/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties
index 292e182..c605b64 100644
--- a/src/chrome/locale/es-CL/torlauncher.properties
+++ b/src/chrome/locale/es-CL/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd
index 8ec90ba..cb4c106 100644
--- a/src/chrome/locale/es-CO/network-settings.dtd
+++ b/src/chrome/locale/es-CO/network-settings.dtd
@@ -1,12 +1,12 @@
 <!ENTITY torsettings.dialog.title "Configuraciones de red de Tor">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor">
+<!ENTITY torlauncher.localePicker.prompt "Por favor selecciona un idioma.">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Antes de conectar con la red de Tor, necesitas proveer informacion acerca de la coneccion de internet de este computador.">
+<!ENTITY torsettings.prompt "Antes de conectar con la red de Tor, necesitas proveer informaciÃ³n acerca de la conexiÃ³n de internet de este computador.">
 
 <!ENTITY torSettings.yes "Si">
 <!ENTITY torSettings.no "No">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties
index 8580f6e..8451a68 100644
--- a/src/chrome/locale/es-CO/torlauncher.properties
+++ b/src/chrome/locale/es-CO/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Exit
 torlauncher.done=Hecho
 
 torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
 
diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd
index 0d8f71d..99d4197 100644
--- a/src/chrome/locale/es-MX/network-settings.dtd
+++ b/src/chrome/locale/es-MX/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/es-MX/progress.dtd b/src/chrome/locale/es-MX/progress.dtd
index d1d6bb5..3ee4849 100644
--- a/src/chrome/locale/es-MX/progress.dtd
+++ b/src/chrome/locale/es-MX/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estado de Tor">
 <!ENTITY torprogress.openSettings "Abrir Ajustes">
 <!ENTITY torprogress.heading "Conectando a la red Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexiÃ³n con Tor network.  Esto puede llevar varios minutos.">
diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties
index 77aa158..515b570 100644
--- a/src/chrome/locale/es-MX/torlauncher.properties
+++ b/src/chrome/locale/es-MX/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Lanzador Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S fallÃ³ (%2$S).
 
 torlauncher.unable_to_start_tor=No se ha podido iniciar Tor.\n\n%S
 torlauncher.tor_missing=Falta el ejecutable de Tor.
-torlauncher.torrc_missing=Falta el archivo torrc.
-torlauncher.datadir_missing=El diccionario de datos de Tor no existe.
+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=No se pudo obtener la contraseÃ±a cifrada.
 
 torlauncher.failed_to_get_settings=No se puede recuperar la configuraciÃ³n de Tor. \n\n% S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Salir
 torlauncher.done=Hecho
 
 torlauncher.forAssistance=Si necesitas ayuda, contacta a %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copia completa. %S mensajes del registro de Tor estÃ¡n listos para ser pegados en un editor de texto o mensaje de correo electrÃ³nico.
 
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index 13b8c28..a6db1ee 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copiar el registro de mensajes(log) de Tor al portapapeles">
 <!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')">
 <!ENTITY torsettings.bridgeHelp1 "Si no puede conectarse a la red Tor, podrÃa ser que su proveedor de servicios de Internet (ISP) u otra agencia, estÃ© bloqueando Tor.  A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son pÃºblicos, y es mÃ¡s difÃcil que sean bloqueados.">
-<!ENTITY torsettings.bridgeHelp1B "Puede usar el conjunto de direcciones de repetidores puente ('bridge') preconfigurado proporcionado, o puede obtener un conjunto de direcciones personalizado usando uno de estos tres mÃ©todos:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Mediante la web">
 <!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrÃ³nico automÃ¡tico">
diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties
index 42780e5..45381fb 100644
--- a/src/chrome/locale/es/torlauncher.properties
+++ b/src/chrome/locale/es/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Arranque de Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S fallÃ³ (%2$S).
 
 torlauncher.unable_to_start_tor=Imposible iniciar Tor.\n\n%S
 torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor.
-torlauncher.torrc_missing=No se encuentra el archivo "torrc"
-torlauncher.datadir_missing=El directorio de datos de Tor no existe.
+torlauncher.torrc_missing=No existe el fichero torcc y no puede ser creado.
+torlauncher.datadir_missing=El directorio de datos de Tor no existe y no puede ser creado
 torlauncher.password_hash_missing=Fallo al obtener la contraseÃ±a cifrada.
 
 torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Salir
 torlauncher.done=Listo
 
 torlauncher.forAssistance=Para obtener ayuda, contacte con %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor estÃ¡n listos para ser pegados en un editor de texto o en un mensaje de correo electrÃ³nico.
 
diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd
index d4e4c14..c4bdb10 100644
--- a/src/chrome/locale/et/network-settings.dtd
+++ b/src/chrome/locale/et/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties
index 1ebd50d..37d82b4 100644
--- a/src/chrome/locale/et/torlauncher.properties
+++ b/src/chrome/locale/et/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tori kÃ¤ivitaja
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Ei suuda kÃ¤ivitada Tor-i.\n\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges.
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(soovitatud)
 
 torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
@@ -36,6 +36,7 @@ torlauncher.quit_win=Exit
 torlauncher.done=Valmis
 
 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.
 
diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd
index e034658..b311fdc 100644
--- a/src/chrome/locale/eu/network-settings.dtd
+++ b/src/chrome/locale/eu/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera">
 <!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza">
 <!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.  Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu.">
-<!ENTITY torsettings.bridgeHelp1B "Aurrez konfiguratutako, emandako zubi taldea erabili dezakezu, edo zubi talde pertsonalizatua eskuratu dezakezu hurrengo hiru metodoetako bat aukeratuz: ">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Webean bidez">
 <!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko">
 <!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez">
diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties
index 073e987..f5f51b5 100644
--- a/src/chrome/locale/eu/torlauncher.properties
+++ b/src/chrome/locale/eu/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor abiarazlea
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S).
 
 torlauncher.unable_to_start_tor=Ezin izan da Tor hasi.\n\n%S
 torlauncher.tor_missing=Tor exekutagarria falta da.
-torlauncher.torrc_missing=torrc fitxategia falta da.
-torlauncher.datadir_missing=Tor datu direktorioa ez da existitzen.
+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=Huts egin du hash-eatutako pasahitza eskuratzen.
 
 torlauncher.failed_to_get_settings=Ezin izan dira Tor ezarpenak berreskuratu.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Irten
 torlauncher.done=Eginda
 
 torlauncher.forAssistance=Laguntza lortzeko, %S(r)ekin harremanetan jarri
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopia burutu da. %S Tor erregistro mezuak prest daude testu editore edo email mezu batean itsasteko.
 
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index 3a95731..17705b4 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -35,10 +35,10 @@
 
 <!ENTITY torsettings.startingTor "Ø¯Ø± Ø§Ù†ØªØ¸Ø§Ø± Ø¢ØºØ§Ø² Ø¨Ù‡ Ú©Ø§Ø± ØªÙˆØ±...">
 <!ENTITY torsettings.restartTor "ØªÙˆØ± Ø±Ø§ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø´ÙˆØ±ÙˆØ¹ Ú©Ù†ÛŒØ¯.">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ù…Ø¬Ø¯Ø¯">
 
 <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.proceed "ØØ°Ù ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ùˆ Ø§ØªØµØ§Ù„">
 
 <!ENTITY torsettings.optional "Ø§Ø®ØªÛŒØ§Ø±ÛŒ">
 
@@ -66,7 +66,7 @@
 <!ENTITY torsettings.bridgeHelpTitle "Ú©Ù…Ú© Ø¨Ø±Ø§ÛŒ Ù¾Ù„ Ø§Ø±ØªØ¨Ø§Ø·ÛŒ">
 <!ENTITY torsettings.bridgeHelp1 "Ø§Ú¯Ø± Ù†Ù…ÛŒ ØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ± Ù…ØªØµÙ„ Ø´ÙˆÛŒØ¯ØŒ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ø¨Ù‡ Ø§ÛŒÙ† Ø¯Ù„ÛŒÙ„ Ø¨Ø§Ø´Ø¯ Ú©Ù‡ Ø´Ø±Ú©Øª Ø§Ø±Ø§ÛŒÙ‡ Ú©Ù†Ù†Ø¯Ù‡ Ø§ÛŒÙ†ØªØ±Ù†Øª Ø´Ù…Ø§(ISP) Ùˆ ÛŒØ§ Ø³Ø§Ø²Ù…Ø§Ù† Ù‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø± Ø´Ø¨Ú©Ù‡ ØªÙˆØ± Ø±Ø§ Ø¨Ø³ØªÙ‡ Ø§Ù†Ø¯. 
 ØºØ§Ù„Ø¨Ø§Ù‹ Ù…ÛŒ ØªÙˆØ§Ù†ÛŒØ¯ Ø§ÛŒÙ† Ù…ØØ¯ÙˆØ¯ÛŒØª Ø±Ø§ Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Â«Ù¾Ù„Â» Ù‡Ø§ÛŒ ØªÙˆØ± Ø¯ÙˆØ± Ø¨Ø²Ù†ÛŒØ¯. Ù¾Ù„ Ù‡Ø§ Ù…Ø³ÛŒØ±Ù‡Ø§ÛŒ Ø§Ø¶Ø§ÙÛŒ Ø¯ÙˆØ± Ø²Ø¯Ù† ÙÛŒÙ„ØªØ± Ù‡Ø³ØªÙ†Ø¯ Ú©Ù‡ Ù„ÛŒØ³Øª Ø¢Ù† Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª Ùˆ ÙÛŒÙ„ØªØ± Ú©Ø±Ø¯Ù† Ø¢Ù† Ù‡Ø§ Ø¨Ø³ÛŒØ§Ø± Ù…Ø´Ú©Ù„ Ø§Ø³Øª.">
-<!ENTITY torsettings.bridgeHelp1B "Ø´Ù…Ø§ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø§Ø² Ù¾Ù„â€ŒÙ‡Ø§ÛŒ Ù…ÙˆØ¬ÙˆØ¯ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯ Ùˆ ÛŒØ§ Ø¨Ø±Ø§ÛŒ Ø¨Ù‡â€ŒØ¯Ø³Øª Ø¢ÙˆØ±Ø¯Ù† Ù…Ø¬Ù…ÙˆØ¹Ù‡â€ŒØ§ÛŒ Ø§Ø² Ù¾Ù„â€ŒÙ‡Ø§ÛŒ Ø´Ø®ØµÛŒ Ø§Ø² ÛŒÚ©ÛŒ Ø§Ø² Ø³Ù‡ Ø±ÙˆØ´ Ø²ÛŒØ± Ø¨Ù‡Ø±Ù‡ Ø¨Ú¯ÛŒØ±ÛŒØ¯:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø§ÛŒÙ†ØªØ±Ù†Øª">
 <!ENTITY torsettings.bridgeHelp2 "Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ÛŒÚ© Ù…Ø±ÙˆØ±Ú¯Ø± Ø¨Ù‡ Ø¢Ø¯Ø±Ø³ https://bridges.torproject.org Ø¨Ø±ÙˆÛŒØ¯.">
 <!ENTITY torsettings.bridgeHelp3Heading "Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø¢Ø¯Ø±Ø³ Ø§ÛŒÙ…ÛŒÙ„ Ù¾Ø§Ø³Ø®Ú¯ÙˆÛŒ Ø®ÙˆØ¯Ú©Ø§Ø±">
diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties
index bdd5c09..d5c4f78 100644
--- a/src/chrome/locale/fa/torlauncher.properties
+++ b/src/chrome/locale/fa/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Ø§Ø¬Ø±Ø§ Ú©Ù†Ù†Ø¯Ù‡ ØªÙˆØ±
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯ (%2$S).
 
 torlauncher.unable_to_start_tor=Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ ØªÙˆØ± Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯.\n\n%S
 torlauncher.tor_missing=ÙØ§ÛŒÙ„ Ø§Ø¬Ø±Ø§ÛŒÛŒ ØªÙˆØ± ÛŒØ§ÙØª Ù†Ø´Ø¯.
-torlauncher.torrc_missing=ÙØ§ÛŒÙ„ torrc ÛŒØ§ÙØª Ù†Ø´Ø¯.
-torlauncher.datadir_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=Ú©Ù„Ù…Ù‡Ù” Ø¹Ø¨ÙˆØ± Ø±Ù…Ø²Ø´Ø¯Ù‡ Ø¯Ø±ÛŒØ§ÙØª Ù†Ø´Ø¯.
 
 torlauncher.failed_to_get_settings=Ù†Ø§Ù…ÙˆÙÙ‚ Ø¯Ø± Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ ØªÙ†Ø¸ÛŒÙ…Ø§Øª ØªÙˆØ±.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ø®Ø±ÙˆØ¬
 torlauncher.done=Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯
 
 torlauncher.forAssistance=Ø¨Ø±Ø§ÛŒ Ø¯Ø±ÛŒØ§ÙØª Ú©Ù…Ú©Ù« Ø¨Ø§ %S ØªÙ…Ø§Ø³ Ø¨Ú¯ÛŒØ±ÛŒØ¯
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Ú©Ù¾ÛŒ Ú©Ø§Ù…Ù„ Ø´Ø¯. %S Ù¾ÛŒØ§Ù…Ù‡Ø§ÛŒ Ø«Ø¨Øª Ø´Ø¯Ù‡ Ø¢Ù…Ø§Ø¯Ù‡ Ø§Ø³Øª ØªØ§ Paste Ø´ÙˆØ¯ Ø¯Ø± ÙˆÛŒØ±Ø§ÛŒØ´Ú¯Ø± Ù…ØªÙ† ÛŒØ§ ÛŒÚ© Ø§ÛŒÙ…ÛŒÙ„.
 
diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd
index 6338e04..31dae56 100644
--- a/src/chrome/locale/fi/network-settings.dtd
+++ b/src/chrome/locale/fi/network-settings.dtd
@@ -15,7 +15,7 @@
 <!ENTITY torSettings.configurePrompt1 "TÃ¤mÃ¤n tietokoneen internet-yhteys on sensuroitu tai kulkee vÃ¤lityspalvelimen kautta.">
 <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
 <!ENTITY torSettings.configure "MÃ¤Ã¤ritÃ¤">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Haluan tehdÃ¤ suoran yhteyden Tor-verkkoon.">
 <!ENTITY torSettings.connectPrompt3 "TÃ¤mÃ¤ toimii useimmissa tilanteissa.">
 <!ENTITY torSettings.connect "YhdistÃ¤">
 
@@ -35,10 +35,10 @@
 
 <!ENTITY torsettings.startingTor "Odotetaan Tor-sovelluksen kÃ¤ynnistymistÃ¤...">
 <!ENTITY torsettings.restartTor "KÃ¤ynnistÃ¤ Tor uudelleen">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "UudelleenmÃ¤Ã¤ritÃ¤">
 
 <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.proceed "Poista asetukset ja yhdistÃ¤">
 
 <!ENTITY torsettings.optional "Vaihtoehtoinen">
 
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Kopioi Tor-loki leikepÃ¶ydÃ¤lle">
 <!ENTITY torsettings.bridgeHelpTitle "SiltavÃ¤lityspalvelinopaste">
 <!ENTITY torsettings.bridgeHelp1 "Jos et pysty yhdistÃ¤mÃ¤Ã¤n Tor-verkkoon, syy voi olla, ettÃ¤ Internet palveluntarjoajasi (ISP) tai muu taho estÃ¤Ã¤ Tor-sovelluksen.  Usein voit kiertÃ¤Ã¤ tÃ¤mÃ¤n ongelman kÃ¤yttÃ¤mÃ¤llÃ¤ Tor-siltoja, jotka ovat listaamattomia vÃ¤lityspalvelimia, joita on vaikeampi estÃ¤Ã¤.">
-<!ENTITY torsettings.bridgeHelp1B "Voit kÃ¤yttÃ¤Ã¤ esiasetettuja, tarjottuja siltaosoitejoukkoja tai voit hankkia oman osoitejoukon kÃ¤yttÃ¤mÃ¤llÃ¤ yhtÃ¤ nÃ¤istÃ¤ kolmesta menetelmÃ¤stÃ¤:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Verkon yli">
 <!ENTITY torsettings.bridgeHelp2 "KÃ¤ytÃ¤ internet-selainta vieraillaksesi osoitteessa: https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "SÃ¤hkÃ¶postin automaattivastaajan lÃ¤pi">
diff --git a/src/chrome/locale/fi/progress.dtd b/src/chrome/locale/fi/progress.dtd
index 5850aa9..69414cf 100644
--- a/src/chrome/locale/fi/progress.dtd
+++ b/src/chrome/locale/fi/progress.dtd
@@ -1,4 +1,5 @@
 <!ENTITY torprogress.dialog.title "Tor-tila">
 <!ENTITY torprogress.openSettings "Avaa asetukset">
 <!ENTITY torprogress.heading "YhdistetÃ¤Ã¤n Tor-verkkoon">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan. 
+TÃ¤ssÃ¤ saattaa kestÃ¤Ã¤ muutama minuutti.">
diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties
index 533f596..5a62a38 100644
--- a/src/chrome/locale/fi/torlauncher.properties
+++ b/src/chrome/locale/fi/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor-kÃ¤ynnistin
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S epÃ¤onnistui (%2$S).
 
 torlauncher.unable_to_start_tor=Tor-sovelluksen kÃ¤ynnistys epÃ¤onnistui.\n\n%S
 torlauncher.tor_missing=Suoritettava Tor-tiedosto puuttuu.
-torlauncher.torrc_missing=Tiedosto torrc puuttuu.
-torlauncher.datadir_missing=Tor-tietohakemistoa ei ole.
+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=TiivistettyÃ¤ salasanaa ei lÃ¶ytynyt.
 
 torlauncher.failed_to_get_settings=Tor-asetusten noutaminen epÃ¤onnistui.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Lopeta
 torlauncher.done=Valmis
 
 torlauncher.forAssistance=Tukea saat ottamalla yhteyttÃ¤ osoitteeseen %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopionti suoritettu. %S Tor-lokiviestiÃ¤ on valmiina kopiotavaksi tekstimuokkaimeen tai sÃ¤hkÃ¶postiviestiin.
 
diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd
index 78c45b7..bd9412b 100644
--- a/src/chrome/locale/fil/network-settings.dtd
+++ b/src/chrome/locale/fil/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties
index 23dfc4d..32a2ee7 100644
--- a/src/chrome/locale/fil/torlauncher.properties
+++ b/src/chrome/locale/fil/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tagapaglunsad ng Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S nabigo (%2$S).
 
 torlauncher.unable_to_start_tor=Hindi magawang simulan ang Tor.\n\n%S
 torlauncher.tor_missing=Ang Tor executable ay nawawala.
-torlauncher.torrc_missing=Ang torrc file ay nawawala.
-torlauncher.datadir_missing=Walang direktoryo ng data ang Tor.
+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=Nabigong makakuha ng na-hash na password.
 
 torlauncher.failed_to_get_settings=Hindi nabawi ang mga setting ng Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Lumabas
 torlauncher.done=Tapos na
 
 torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kumpleto na ang Pag-kopya. %S Ang mga log messages ng Tor ay handa na ma-paste sa isang text editor o sa e-mail message.
 
diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd
index 14dac48..78bc505 100644
--- a/src/chrome/locale/fo/network-settings.dtd
+++ b/src/chrome/locale/fo/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties
index 954ef11..3861409 100644
--- a/src/chrome/locale/fo/torlauncher.properties
+++ b/src/chrome/locale/fo/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd
index 111e80e..558b7ac 100644
--- a/src/chrome/locale/fr-CA/network-settings.dtd
+++ b/src/chrome/locale/fr-CA/network-settings.dtd
@@ -13,7 +13,7 @@
 
 <!ENTITY torSettings.firstQuestion "Laquelle des suivantes dÃ©crit le mieux votre situation?">
 <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurÃ©e ou relayÃ©e.">
-<!ENTITY torSettings.configurePrompt2 "Je dois paramÃ©trer un pont ou un mandataire local avant de me connecter au rÃ©seau  Tor.">
+<!ENTITY torSettings.configurePrompt2 "Je dois paramÃ©trer un pont ou un mandataire local avant de me connecter au rÃ©seau Tor.">
 <!ENTITY torSettings.configure "Configurer">
 <!ENTITY torSettings.connectPrompt2 "J'aimerais Ã©tablir une connexion directe vers le rÃ©seau Tor.">
 <!ENTITY torSettings.connectPrompt3 "Ceci fonctionnera dans la plupart des situations.">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papier">
 <!ENTITY torsettings.bridgeHelpTitle "Aide pour les relais-ponts">
 <!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au rÃ©seau Tor, il se peut que votre fournisseur d'accÃ¨s Ã  Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non rÃ©pertoriÃ©s, plus difficiles Ã  bloquer.">
-<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu prÃ©configurÃ© d'adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisÃ© d'adresses en utilisant une de ces trois mÃ©thodes :">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "par le Web">
 <!ENTITY torsettings.bridgeHelp2 "en utilisant un navigateur Web pour visiter https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Par le rÃ©pondeur automatique de courriel">
diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties
index 2f7cc98..05443db 100644
--- a/src/chrome/locale/fr-CA/torlauncher.properties
+++ b/src/chrome/locale/fr-CA/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Lanceur Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S a Ã©chouÃ© (%2$S).
 
 torlauncher.unable_to_start_tor=Impossible de dÃ©marrer Tor.\n\n%S
 torlauncher.tor_missing=L'exÃ©cutable Tor est manquant.
-torlauncher.torrc_missing=Le fichier torrc est manquant.
-torlauncher.datadir_missing=Le rÃ©pertoire de donnÃ©es de Tor n'existe pas.
+torlauncher.torrc_missing=Le fichier torrc est manquant et n'a pas pu Ãªtre crÃ©Ã©.
+torlauncher.datadir_missing=Le rÃ©pertoire de donnÃ©es Tor n'existe pas et n'a pas pu Ãªtre crÃ©Ã©.
 torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe hachÃ©.
 
 torlauncher.failed_to_get_settings=Impossible de rÃ©cupÃ©rer les paramÃ¨tres de Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Sortir
 torlauncher.done=Fait
 
 torlauncher.forAssistance=Pour l'assistance, contacter %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=La copie est terminÃ©e. %S messages de journalisation de Tor sont prÃªts Ã  Ãªtre coller dans un Ã©diteur de texte ou un courriel.
 
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index e3b06af..16bdfac 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -1,7 +1,7 @@
 <!ENTITY torsettings.dialog.title "ParamÃ¨tres du rÃ©seau Tor">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Language du navigateur Tor">
+<!ENTITY torlauncher.localePicker.title "Langue du Navigateur Tor">
 <!ENTITY torlauncher.localePicker.prompt "Merci de sÃ©lectionner une langue.">
 
 <!-- For "first run" wizard: -->
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes dÃ©crit le mieux votre situationÂ ?">
 <!ENTITY torSettings.configurePrompt1 "Le connexion internet de cet ordinateur est restreinte (censurÃ©e) ou passe par un proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Je dois configurer le pont rÃ©seau ou les paramÃ¨tres du proxy avant de me connecter au rÃ©seau Tor.">
 <!ENTITY torSettings.configure "Configurer">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Je voudrais faire une connexion directe au rÃ©seau Tor.">
 <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations.">
 <!ENTITY torSettings.connect "Se connecter">
 
 <!ENTITY torSettings.proxyPageTitle "Configuration du proxy local">
 <!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur a besoin d'utiliser un proxy pour accÃ©der Ã  internet ?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas le proxy local n'est pas nÃ©cessaire, mais il peut Ãªtre exigÃ© pour une connexion dans un rÃ©seau d'entreprise, d'Ã©cole ou universitaire.">
+<!ENTITY torSettings.proxyExplanation2 "Si vous n'Ãªtes pas certain de savoir comment rÃ©pondre Ã  cette question, regardez les paramÃ¨tres Internet d'un autre navigateur ou les paramÃ¨tres rÃ©seaux de votre systÃ¨me afin de vÃ©rifier si vous avez besoin d'un proxy.">
 <!ENTITY torSettings.enterProxy "Entrez les paramÃ¨tres de votre proxy.">
 <!ENTITY torSettings.bridgePageTitle "Configuration des relais TOR">
 <!ENTITY torSettings.bridgeQuestion "Est-ce que votre Fournisseur d'AccÃ¨s Internet (FAI) bloque les connexions au rÃ©seau Tor ?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
-<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les ponts fournis ou bien saisir votre liste de ponts personnels.">
+<!ENTITY torSettings.bridgeExplanation1 "Si vous ne savez par comment rÃ©pondre Ã  cette question, choisissez Non (si vous ne pouvez pas vous connecter au rÃ©seau Tor sans un bridge, vous pourrez le rajouter plus tard).">
+<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandÃ© de configurer les bridges Tor qui sont des relais non listÃ©s et qui rendent plus difficile le blocage du rÃ©seau Tor.">
+<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les bridges fournis ou bien saisir votre liste de bridges personnels.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "En attente du dÃ©marrage de Tor...">
 <!ENTITY torsettings.restartTor "Relancer Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Reconfigurer">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Vous avez configurÃ© les bridges Tor ou vous avez entrÃ© les paramÃ¨tres de proxy local. Pour faire une connexion directe avec le rÃ©seau Tor, ces configurations doivent Ãªtre supprimÃ©s.">
+<!ENTITY torsettings.discardSettings.proceed "Supprimer les paramÃ¨tres et se connecter">
 
 <!ENTITY torsettings.optional "Optionnel">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Ports autorisÃ©s :">
 <!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'AccÃ¨s Ã  Internet (FAI) bloque les connexions au rÃ©seau Tor">
 <!ENTITY torsettings.useBridges.default "Se connecter en utilisant les ponts prÃ©-configurÃ©s">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une mÃ©thode diffÃ©rente pour Ã©viter la censure. Si un pont ne marche pas, essayez de nouveau avec un autre.">
 <!ENTITY torsettings.useBridges.type "Mode de transport:">
 <!ENTITY torsettings.useBridges.custom "Entrez vos ponts personnels">
 <!ENTITY torsettings.useBridges.label "Saisir un ou davantage de ponts relais (un par ligne).">
@@ -64,8 +64,8 @@
 
 <!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier">
 <!ENTITY torsettings.bridgeHelpTitle "Aide pour les ponts">
-<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au rÃ©seau Tor, il se pourrait que votre fournisseur d'accÃ¨s Ã  Internet (FAI) ou une autre agence bloque le Tor.  Souvent, vous pouvez contourner ce problÃ¨me en utilisant des ponts Tor, qui sont des relais non listÃ©s qui sont plus difficiles Ã  bloquer.">
-<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser les liste de ponts prÃ©-configurÃ©s par dÃ©faut ou en obtenir une liste personnalisÃ©e d'adresses en utilisant l'une des trois mÃ©thodes ci-dessous :">
+<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au rÃ©seau Tor, il se pourrait que votre fournisseur d'accÃ¨s Ã  Internet (FAI) ou une autre agence bloque le Tor.  Souvent, vous pouvez contourner ce problÃ¨me en utilisant des bridges Tor, qui sont des relais non listÃ©s qui sont plus difficiles Ã  bloquer.">
+<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser la liste fournie et prÃ©-configurÃ©e d'adresses de bridges, ou alors obtenir une liste personnalisÃ©e d'adresses en utilisant une de ces mÃ©thodes :">
 <!ENTITY torsettings.bridgeHelp2Heading "Par le Web">
 <!ENTITY torsettings.bridgeHelp2 "Utilisez un navigateur web pour visiter https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Par le rÃ©pondeur automatique de courriel">
diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd
index 157276d..a7d1857 100644
--- a/src/chrome/locale/fr/progress.dtd
+++ b/src/chrome/locale/fr/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Ã‰tat de Tor">
 <!ENTITY torprogress.openSettings "Ouvrir les paramÃ¨tres">
 <!ENTITY torprogress.heading "Connexion au rÃ©seau Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au rÃ©seau Tor s'Ã©tablit. Cela peut prendre quelques minutes.">
diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties
index 209755b..62364b9 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Lanceur Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S Ã©chouÃ© (%2$S).
 
 torlauncher.unable_to_start_tor=Impossible de dÃ©marrer Tor.\n\n%S
 torlauncher.tor_missing=L'exÃ©cutable Tor est introuvable.
-torlauncher.torrc_missing=Le fichier torrc est manquant.
-torlauncher.datadir_missing=Le rÃ©pertoire de donnÃ©es de Tor n'existe pas.
+torlauncher.torrc_missing=Le fichier torrc est manquant et n'a pas pu Ãªtre crÃ©Ã©.
+torlauncher.datadir_missing=Le dossier de donnÃ©es de Tor n'existe pas et n'a pas pu Ãªtre crÃ©Ã©.
 torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe chiffrÃ©.
 
 torlauncher.failed_to_get_settings=Impossible de rÃ©cupÃ©rer les paramÃ¨tres de Tor.\n\n%S
@@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor est lancÃ©.
 torlauncher.error_proxy_addr_missing=Pour configurer Tor afin qu'il utilise un proxy, vous devez spÃ©cifier une adresse IP ou un nom d'hÃ´te ainsi qu'un numÃ©ro de port.
 torlauncher.error_proxy_type_missing=Vous devez sÃ©lectionner un type de proxy.
 torlauncher.error_bridges_missing=Vous devez spÃ©cifier un ou plusieurs bridges.
-torlauncher.error_default_bridges_type_missing=Vous devez sÃ©lectionner un type de transport pour les ponts fournis.
-torlauncher.error_bridge_bad_default_type=Aucun des ponts fournis n'a le type de transport %S. Merci d'ajuster vos paramÃ¨tres.
+torlauncher.error_default_bridges_type_missing=Vous devez sÃ©lectionner un type de transport pour les bridges fournis.
+torlauncher.error_bridge_bad_default_type=Aucun des bridges fournis n'a le type de transport %S. Merci d'ajuster vos paramÃ¨tres.
 
 torlauncher.recommended_bridge=(recommandÃ©)
 
@@ -36,6 +36,7 @@ torlauncher.quit_win=Sortir
 torlauncher.done=TerminÃ©
 
 torlauncher.forAssistance=Pour obtenir de l'aide, contactez %S
+torlauncher.forAssistance2=Pour obtenir de l'aide, visiter %S
 
 torlauncher.copiedNLogMessages=La copie est terminÃ©e. %S messages de journalisation de Tor sont prÃªts Ã  Ãªtre coller dans un Ã©diteur de texte ou un courriel.
 
diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/fur/network-settings.dtd
+++ b/src/chrome/locale/fur/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/fur/torlauncher.properties
+++ b/src/chrome/locale/fur/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd
index 8165a1a..477705a 100644
--- a/src/chrome/locale/fy/network-settings.dtd
+++ b/src/chrome/locale/fy/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties
index d735f57..17dc982 100644
--- a/src/chrome/locale/fy/torlauncher.properties
+++ b/src/chrome/locale/fy/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Exit
 torlauncher.done=Klear
 
 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.
 
diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ga/network-settings.dtd
+++ b/src/chrome/locale/ga/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ga/torlauncher.properties
+++ b/src/chrome/locale/ga/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd
index c4703b1..7940a38 100644
--- a/src/chrome/locale/gl/network-settings.dtd
+++ b/src/chrome/locale/gl/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copia o rexistro do Tor ao portapapeis">
 <!ENTITY torsettings.bridgeHelpTitle "Axuda do Repetidor Ponte">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties
index 038d926..a5f1613 100644
--- a/src/chrome/locale/gl/torlauncher.properties
+++ b/src/chrome/locale/gl/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Lanzador do Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Non se puido iniciar o Tor.âŽ\nâŽ\n%S
 torlauncher.tor_missing=Falta o executÃ¡bel do Tor.
-torlauncher.torrc_missing=Falta o ficheiro torrc
-torlauncher.datadir_missing=Non existe o directorio de datos do Tor.
+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=Non se puido obter o contrasinal cifrado.
 
 torlauncher.failed_to_get_settings=Non se pode recuperar a configuraciÃ³n do Tor.âŽ\nâŽ\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=SaÃr
 torlauncher.done=Feito
 
 torlauncher.forAssistance=Para obter asistencia, pÃ³Ã±ase en contacto con %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.
 
diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/gu-IN/network-settings.dtd
+++ b/src/chrome/locale/gu-IN/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/gu-IN/torlauncher.properties
+++ b/src/chrome/locale/gu-IN/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd
index 93ec7cb..b66952c 100644
--- a/src/chrome/locale/gu/network-settings.dtd
+++ b/src/chrome/locale/gu/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties
index 02be756..066a18a 100644
--- a/src/chrome/locale/gu/torlauncher.properties
+++ b/src/chrome/locale/gu/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges.
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(àª¸à«‚àªšàªµà«‡àª²)
 
 torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/gun/network-settings.dtd
+++ b/src/chrome/locale/gun/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/gun/torlauncher.properties
+++ b/src/chrome/locale/gun/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ha/network-settings.dtd
+++ b/src/chrome/locale/ha/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ha/torlauncher.properties
+++ b/src/chrome/locale/ha/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd
index 6fd02c7..d6a09c7 100644
--- a/src/chrome/locale/he/network-settings.dtd
+++ b/src/chrome/locale/he/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "×”×¢×ª×§ ××ª ×™×•×ž×Ÿ Tor ××œ ×œ×•×— ×’×–×™×¨×”">
 <!ENTITY torsettings.bridgeHelpTitle "×¢×–×¨×” ×‘× ×•×’×¢ ×œ×’×©×¨×™×">
 <!ENTITY torsettings.bridgeHelp1 "×× ××™×Ÿ ×‘××¤×©×¨×•×ª×š ×œ×”×ª×—×‘×¨ ×œ×¨×©×ª Tor, ×™×™×ª×›×Ÿ ×©×”×¡×™×‘×” ×œ×›×š ×”×™× ×©×¡×¤×§ ×”××™× ×˜×¨× ×˜ ×©×œ×š ××• ×’×•×¨× ××—×¨ ×—×•×¡×ž×™× ××ª Tor. ×œ×¢×ª×™× ×§×¨×•×‘×•×ª, × ×™×ª×Ÿ ×œ×”×ª×’×‘×¨ ×¢×œ ×‘×¢×™×” ×–×• ×‘××ž×¦×¢×•×ª ×©×™×ž×•×© ×‘×’×©×¨×™×, ×©×”× ×©×¨×ª×™× ×—×¡×•×™×™× ×©×§×©×” ×™×•×ª×¨ ×œ×—×¡×•× ××•×ª×.">
-<!ENTITY torsettings.bridgeHelp1B "×‘××¤×©×¨×•×ª×š ×œ×”×©×ª×ž×© ×‘×¨×©×™×ž×” ×ž×•×›× ×” ×ž×¨××© ×©×œ ×’×©×¨×™× ××• ×œ×”×©×™×’ ×‘×¢×¦×ž×š ×¨×©×™×ž×” ×—×“×©×” ×©×œ ×›×ª×•×‘×•×ª ×‘××ž×¦×¢×•×ª ××—×ª ×ž×©×œ×•×© ×”×“×¨×›×™× ×”×‘××•×ª:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "×‘××ž×¦×¢×•×ª ×¨×©×ª ×”××™× ×˜×¨× ×˜">
 <!ENTITY torsettings.bridgeHelp2 "×”×™×¢×–×¨ ×‘×“×¤×“×¤×Ÿ ××™× ×˜×¨× ×˜ ×¢×œ ×ž× ×ª ×œ×‘×§×¨ ×‘××ª×¨ https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "×“×¨×š ×©×™×¨×•×ª ×”×“×•××œ ×”××•×˜×•×ž×˜×™">
diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties
index 66cd550..9c9fd87 100644
--- a/src/chrome/locale/he/torlauncher.properties
+++ b/src/chrome/locale/he/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=×ª×•×›× ×ª ×”×”×¤×¢×œ×” ×©×œ Tor
@@ -13,8 +13,8 @@ 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.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=×›×©×œ ×‘×”×©×’×ª ×¡×™×¡×ž×” ×ž×¢×•×¨×‘×œ×ª.
 
 torlauncher.failed_to_get_settings=××™×Ÿ ××¤×©×¨×•×ª ×œ××—×–×¨ ×”×’×“×¨×•×ª Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=×™×¦×™××”
 torlauncher.done=×‘×•×¦×¢
 
 torlauncher.forAssistance=×œ×ª×ž×™×›×”, ×¦×•×¨ ×§×©×¨ ×¢× %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=×”×”×¢×ª×§×” ×”×•×©×œ×ž×”. %S ×”×•×“×¢×•×ª ×ž×™×•×ž×Ÿ ×”×¨×™×©×•× ×©×œ Tor ×ž×•×›× ×•×ª ×œ×”×¢×ª×§×” ×œ×ª×•×š ×¢×•×¨×š ×˜×§×¡×˜ ××• ×œ×”×•×“×¢×ª ×“×•××œ.
 
diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd
index d63adb7..3b7b724 100644
--- a/src/chrome/locale/hi/network-settings.dtd
+++ b/src/chrome/locale/hi/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties
index f093ec6..0bfc497 100644
--- a/src/chrome/locale/hi/torlauncher.properties
+++ b/src/chrome/locale/hi/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=à¤¬à¤¾à¤¹à¤°
 torlauncher.done=à¤¸à¤®à¥à¤ªà¤¨à¥à¤¨
 
 torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
 
diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd
index 657b7f9..8eb9b7c 100644
--- a/src/chrome/locale/hr-HR/network-settings.dtd
+++ b/src/chrome/locale/hr-HR/network-settings.dtd
@@ -14,33 +14,33 @@ internetskoj vezi ovog raÄunala.">
 
 <!ENTITY torSettings.firstQuestion "Koje od sljedeÄ‡eg najbolje opisuje VaÅ¡u situaciju?">
 <!ENTITY torSettings.configurePrompt1 "Veza ovog raÄunal s Internetom je cenzurirana ili iza proxy-a.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati postavke mosta ili lokalnog proxy-a prije nego se spojim na Tor mreÅ¾u.">
 <!ENTITY torSettings.configure "Podesi">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Å½elim direktnu vezu s Tor mreÅ¾om.">
 <!ENTITY torSettings.connectPrompt3 "Ovo Ä‡e raditi u veÄ‡ini situacija.">
-<!ENTITY torSettings.connect "Spajanje">
+<!ENTITY torSettings.connect "Spoji">
 
 <!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proxy-a">
 <!ENTITY torSettings.proxyQuestion "Treba li ovo raÄunalo koristiti lokalni proxy da pristupi Internetu?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "U veÄ‡ini sluÄaja lokalni proxy nije potreban, ali moÅ¾e biti kad se spajate kroz mrÅ¾u tvrtke, Å¡kole ili fakulteta.">
+<!ENTITY torSettings.proxyExplanation2 "Ako niste sigurni kako odgovoriti na ovo pitanje, pogledajte Internet postavke u drugom pregledniku ili provjerite mreÅ¾ne postavke VaÅ¡eg sustava kako bi vidjeli da li je potreban lokalni proxy.">
 <!ENTITY torSettings.enterProxy "Unesite postavke proxyj-a.">
 <!ENTITY torSettings.bridgePageTitle "Konfiguracija Tor mostova">
 <!ENTITY torSettings.bridgeQuestion "Blokira li VaÅ¡ davetelj Internet usluge (ISP) ili drugaÄije cenzurira veze
 s Tor mreÅ¾om?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Ako niste sigurni kako odgovoriti na ovo pitanje, odaberite Ne (ako se ne moÅ¾ete spojiti na Tor mreÅ¾u bez mosta, moÅ¾ete kasnije dodati jedan).">
+<!ENTITY torSettings.bridgeExplanation2 "Ako odaberete Da, od Vas Ä‡e se traÅ¾iti da konfigurirate Tor mostove, koji su nepopisani releji koji oteÅ¾avaju blokiranje veza na Tor mreÅ¾u.">
 <!ENTITY torSettings.bridgeSettingsPrompt "MoÅ¾ete koristiti osigurani set adresa mostova ili moÅ¾ete unijeti vlasiti set mostova.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "ÄŒekanje da se Tor pokrene...">
 <!ENTITY torsettings.restartTor "Ponovno pokreni Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Rekonfiguriraj">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Konfigurirali ste Tor mostove ili ste unijeli postavke lokalnog proxy-a.  Kako bi ostvarili direktnu vezu s Tor mreÅ¾om, ove postavke moraju biti uklonjene.">
+<!ENTITY torsettings.discardSettings.proceed "Ukloni postavke i poveÅ¾i">
 
 <!ENTITY torsettings.optional "Opcionalno">
 
@@ -58,7 +58,7 @@ s Tor mreÅ¾om?">
 <!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:">
 <!ENTITY torsettings.useBridges.checkbox "Moj pruÅ¾atelj internetskih usluga (ISP) blokira veze prema Tor mreÅ¾i">
 <!ENTITY torsettings.useBridges.default "Spoji se s osiguranim mostovima">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Svaka vrsta mosta koristi drugaÄiju metodu kako bi izbjegla cenzuru.&#160: Ako jedan most ne radi, probajte koristiti drugi.">
 <!ENTITY torsettings.useBridges.type "Tip transporta:">
 <!ENTITY torsettings.useBridges.custom "Unesi vlastite mostove">
 <!ENTITY torsettings.useBridges.label "Unesite jedan ili viÅ¡e mostova (jedan po retku).">
@@ -67,7 +67,7 @@ s Tor mreÅ¾om?">
 <!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u meÄ‘uspremnik">
 <!ENTITY torsettings.bridgeHelpTitle "PomoÄ‡ za relej-mostove">
 <!ENTITY torsettings.bridgeHelp1 "Ako se ne moÅ¾ete spojiti na Tor mreÅ¾u, to moÅ¾e biti zato Å¡to VaÅ¡ pruÅ¾atelj Internet usluge (ISP) ili druga agencija blokira Tor.  NajÄeÅ¡Ä‡e moÅ¾ete zaobiÄ‡i ovaj problem koristeÄ‡i Tor Mostove, koji su neizlistani releji koje je teÅ¾e blokirati.">
-<!ENTITY torsettings.bridgeHelp1B "MoÅ¾ete koristiti veÄ‡ konfigurirani, osigurani set adresa mostova ili moÅ¾ete dobiti vlastiti set adresa koristeÄ‡i jednu od ove tri metode:">
+<!ENTITY torsettings.bridgeHelp1B "MoÅ¾ete koristiti unaprijed konfigurirane setove adresa mostova ili moÅ¾ete dobiti prilagoÄ‘ene setove koriÅ¡tenjem jedne od ovih metoda:">
 <!ENTITY torsettings.bridgeHelp2Heading "Kroz Web">
 <!ENTITY torsettings.bridgeHelp2 "Koristite web preglednik kako bi posjetili https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Kroz Email Autoresponder">
diff --git a/src/chrome/locale/hr-HR/progress.dtd b/src/chrome/locale/hr-HR/progress.dtd
index 405b87e..da9a846 100644
--- a/src/chrome/locale/hr-HR/progress.dtd
+++ b/src/chrome/locale/hr-HR/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Otvori Postavke">
 <!ENTITY torprogress.heading "Spajanje na Tor mreÅ¾u">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Molimo priÄekajte dok ne uspostavimo vezu s Tor mreÅ¾om.  To bi moglo potrajati nekoliko minuta.">
diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties
index dc68e08..402f997 100644
--- a/src/chrome/locale/hr-HR/torlauncher.properties
+++ b/src/chrome/locale/hr-HR/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=PokretaÄ Tor-a
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neuspjelo (%2$S).
 
 torlauncher.unable_to_start_tor=Nije moguÄ‡e pokrenuti Tor.\n\n%S
 torlauncher.tor_missing=Nije moguÄ‡e pronaÄ‡i izvrÅ¡ni program za Tor.
-torlauncher.torrc_missing=Nije moguÄ‡e pronaÄ‡i torrc datoteku.
-torlauncher.datadir_missing=Podatkovna mapa za Tor ne postoji.
+torlauncher.torrc_missing=Torrc datoteka nedostaje i nije mogla biti stvorena.
+torlauncher.datadir_missing=Direktorij s Tor podacima ne postoji i nije mogao biti stvoren.
 torlauncher.password_hash_missing=Nije moguÄ‡e dobiti hash lozinke.
 
 torlauncher.failed_to_get_settings=Nije moguÄ‡e dobaviti Tor postavke.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Izlaz
 torlauncher.done=Gotovo
 
 torlauncher.forAssistance=Za pomoÄ‡, kontaktirajte %S
+torlauncher.forAssistance2=Za pomoÄ‡ posjetite %S
 
 torlauncher.copiedNLogMessages=Kopiranje zavrÅ¡eno. %S Tor zapisi su spremni za lijepljenje u ureÄ‘ivaÄ teksta ili email poruku.
 
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index b229c09..874dda9 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/hr/progress.dtd b/src/chrome/locale/hr/progress.dtd
index 4bacee4..da8dda4 100644
--- a/src/chrome/locale/hr/progress.dtd
+++ b/src/chrome/locale/hr/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Status Tor-a">
 <!ENTITY torprogress.openSettings "Otvori Postavke">
 <!ENTITY torprogress.heading "Spajanje na Tor mreÅ¾u">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Molimo priÄekajte dok uspostavljamo vezu sa Tor mreÅ¾om.   Ovo moÅ¾e potrajati nekoliko minuta.">
diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties
index fd08f79..b6f76d4 100644
--- a/src/chrome/locale/hr/torlauncher.properties
+++ b/src/chrome/locale/hr/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ht/network-settings.dtd
+++ b/src/chrome/locale/ht/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ht/torlauncher.properties
+++ b/src/chrome/locale/ht/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd
index 0f7de0c..effaf53 100644
--- a/src/chrome/locale/hu/network-settings.dtd
+++ b/src/chrome/locale/hu/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "A kÃ¶vetkezÅ‘k kÃ¶zÃ¼l melyik illik jobban a szituÃ¡ciÃ³hoz?">
 <!ENTITY torSettings.configurePrompt1 "Ennek a szÃ¡mÃtÃ³gÃ©pnek a forgalma cenzorÃ¡lt vagy proxizott.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "A Tor  hÃ¡lÃ³zathoz valÃ³ csatlakozÃ¡s elÅ‘tt be kell Ã¡llÃtanom a hÃ¡lÃ³zati hidat vagy a helyi proxyt.">
 <!ENTITY torSettings.configure "BeÃ¡llÃt">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "KÃ¶zvetlen kapcsolatot szeretnÃ©k lÃ©tesÃteni a Tor hÃ¡lÃ³zattal.">
 <!ENTITY torSettings.connectPrompt3 "A legtÃ¶bb esetben ez mÅ±kÃ¶dni fog.">
 <!ENTITY torSettings.connect "CsatlakozÃ¡s">
 
 <!ENTITY torSettings.proxyPageTitle "Helyi proxybeÃ¡llÃtÃ¡sok">
 <!ENTITY torSettings.proxyQuestion "Ez a szÃ¡mÃtgÃ©p helyi proxyn keresztÃ¼l Ã©ri el az Internetet? ">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "A helyi proxy a legtÃ¶bb esetben nem kell, de vÃ¡llalati, iskolai vagy egyetemi hÃ¡lÃ³zat esetÃ©n elfordulhat, hogy szÃ¼ksÃ©ges beÃ¡llÃtani.">
+<!ENTITY torSettings.proxyExplanation2 "Ha nem vagy biztos benne, hogyan vÃ¡laszolj erre a kÃ©rdÃ©sre, akkor nÃ©zd meg egy mÃ¡sik bÃ¶ngÃ©szÅ‘ vagy a rendszer hÃ¡lÃ³zati beÃ¡llÃtÃ¡sait, hogy szÃ¼ksÃ©ges-e proxyt beÃ¡llÃtani.">
 <!ENTITY torSettings.enterProxy "Adja meg a proxy beÃ¡llÃtÃ¡sokat.">
 <!ENTITY torSettings.bridgePageTitle "Tor hidak konfigurÃ¡lÃ¡sa">
 <!ENTITY torSettings.bridgeQuestion "Az internet szolgÃ¡ltatÃ³d (ISP) blokkolja vagy cenzÃºrÃ¡zza a kapcsolatot a Tor hÃ¡lÃ³zathoz?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Ha nem vagy biztos benne, hogyan vÃ¡laszolj erre a kÃ©rdÃ©sre, vÃ¡laszd a Nem lehetÅ‘sÃ©get (ha hÃ¡lÃ³zati hÃd nÃ©lkÃ¼l nem tudsz kapcsolÃ³dni a Tor hÃ¡lÃ³zathoz, akkor kÃ©sÅ‘bb is hozzÃ¡adhatsz egyet).">
+<!ENTITY torSettings.bridgeExplanation2 " Ha az Igen-t vÃ¡lasztod neked kell konfigurÃ¡lni a Tor Hidak-et, maleyek nem listÃ¡zott csomÃ³pontok, Ãgy lehetÅ‘vÃ© nehezebbÃ© teszik a Tor hÃ¡lÃ³zathoz kapcsolÃ³dÃ¡s blokkolÃ¡sÃ¡t.">
 <!ENTITY torSettings.bridgeSettingsPrompt "HasznÃ¡lhatod a szolgÃ¡ltatott bridge cÃmeket vagy beszerezhetsz egyedi bridge cÃmeket.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "VÃ¡rakozÃ¡s a Tor indulÃ¡sÃ¡ra...">
 <!ENTITY torsettings.restartTor "Tor ÃºjraindÃtÃ¡sa">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "ÃšjrakonfigurÃ¡l">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "BeÃ¡llÃtott Tor Hidakat, vagy megadott egy helyi proxy-t.  A kÃ¶zvetlen kapcsolÃ³dÃ¡shoz ezeket a beÃ¡llÃtÃ¡sokat el kell tÃ¡volÃtania.">
+<!ENTITY torsettings.discardSettings.proceed "BeÃ¡llÃtÃ¡sok eltÃ¡volÃtÃ¡sa Ã©s CsatlakozÃ¡s">
 
 <!ENTITY torsettings.optional "OpcionÃ¡lis">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "EngedÃ©lyezett portok:">
 <!ENTITY torsettings.useBridges.checkbox "Az internet szolgÃ¡ltatÃ³m (ISP) blokkolja a Tor hÃ¡lÃ³zathoz valÃ³ csatlakozÃ¡sokat">
 <!ENTITY torsettings.useBridges.default "CsatlakozÃ¡s a szolgÃ¡ltatott bridge cÃmekkel.">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Minden hÃd mÃ¡s megoldÃ¡st hasznÃ¡l a cenzorÃ¡lÃ¡s elkerÃ¼lÃ©sÃ©re.  Ha egyik nem mÅ±kÃ¶dik, prÃ³bÃ¡lkozzon Ãºjra egy mÃ¡sikkal.">
 <!ENTITY torsettings.useBridges.type "Ãtvitel tÃpusa:">
 <!ENTITY torsettings.useBridges.custom "Addj meg egyedi bridge cÃmeket">
 <!ENTITY torsettings.useBridges.label "Addj meg egy vagy tÃ¶bb bridge relay cÃmet (soronkÃ©nt egy)">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "A Tor log VÃ¡gÃ³lapra mÃ¡solÃ¡sa">
 <!ENTITY torsettings.bridgeHelpTitle "HÃd kapcsolÃ³ sÃºgÃ³">
 <!ENTITY torsettings.bridgeHelp1 "Ha nem tudsz csatlakozni a Tor.  hÃ¡lÃ³zathoz, akkor valÃ³szÃnÅ± az internet szolgÃ¡ltatÃ³ (ISP) vagy egy mÃ¡sik szervezet blokkolja. Gyakran megkerÃ¼lhetÅ‘ a problÃ©ma Tor bridges hasznÃ¡latÃ¡val. Ezek nem listÃ¡zott Ã¡tjÃ¡tszÃ³k amiket sokkal nehezebb blokkolni.">
-<!ENTITY torsettings.bridgeHelp1B "HasznÃ¡lhatod az elÅ‘re beÃ¡llÃtott bridge cÃmeket vagy beszerezhetsz egyedi cÃmeket ezzel a hÃ¡rom mÃ³dszerrel:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Interneten keresztÃ¼l">
 <!ENTITY torsettings.bridgeHelp2 "HasznÃ¡lj egy bÃ¶ngÃ©szÅ‘t megnÃ©zni ezt az oldalt: https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Az automata email vÃ¡laszok Ã¡ltal.">
diff --git a/src/chrome/locale/hu/progress.dtd b/src/chrome/locale/hu/progress.dtd
index bdcab7a..e4565a2 100644
--- a/src/chrome/locale/hu/progress.dtd
+++ b/src/chrome/locale/hu/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Ã¡llapot">
 <!ENTITY torprogress.openSettings "BeÃ¡llÃtÃ¡sok megnyitÃ¡sa">
 <!ENTITY torprogress.heading "KapcsolÃ³dÃ¡s a Tor hÃ¡lÃ³zathoz">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "KÃ©rlek vÃ¡rj, amÃg lÃ©trehozunk egy kapcsolatot a Tor hÃ¡lÃ³zathoz.  Ez eltarthat nÃ©hÃ¡ny percig.">
diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties
index d2b6ea2..5693367 100644
--- a/src/chrome/locale/hu/torlauncher.properties
+++ b/src/chrome/locale/hu/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor IndÃtÃ³
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S hiba (%2$S).
 
 torlauncher.unable_to_start_tor=Nem sikerÃ¼lt a Tor-t elindÃtani.\n\n%S
 torlauncher.tor_missing=A Tor futtathatÃ³ Ã¡llomÃ¡ny hiÃ¡nyzik.
-torlauncher.torrc_missing=A torrc fÃ¡jl hiÃ¡nyzik.
-torlauncher.datadir_missing=A Tor adat kÃ¶nyvtÃ¡r nem lÃ©tezik.
+torlauncher.torrc_missing=A torrc fÃ¡jl hiÃ¡nyzik Ã©s nem lehet lÃ©trehozni.
+torlauncher.datadir_missing=A Tor data kÃ¶nyvtÃ¡r nem lÃ©tezik Ã©s nem lehet lÃ©trehozni.
 torlauncher.password_hash_missing=Nem sikerÃ¼lt megszerezni a hash-elt jelszÃ³t.
 
 torlauncher.failed_to_get_settings=Sikertelen a Tor beÃ¡llÃtÃ¡sok lekÃ©rÃ©se.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=KilÃ©pÃ©s
 torlauncher.done=KÃ©sz
 
 torlauncher.forAssistance=SegÃtsÃ©gÃ©r kÃ©rjÃ¼k Ãrjon ide: %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=MÃ¡solÃ¡s kÃ©sz. %S Tor log Ã¼zenet vÃ¡r arra, hogy beillesszÃ©k egy szÃ¶vegszerkesztÅ‘vbe vagy egy emailbe.
 
diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/hy/network-settings.dtd
+++ b/src/chrome/locale/hy/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/hy/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/hy/torlauncher.properties
+++ b/src/chrome/locale/hy/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd
index 0abeba8..b9bd75e 100644
--- a/src/chrome/locale/ia/network-settings.dtd
+++ b/src/chrome/locale/ia/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties
index 44c40ed..9af1183 100644
--- a/src/chrome/locale/ia/torlauncher.properties
+++ b/src/chrome/locale/ia/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Sortir
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
 
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index 990cbac..ec6e8d4 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -13,7 +13,7 @@
 
 <!ENTITY torSettings.firstQuestion "Mana dari yang berikut ini tepat menjelaskan situasi Anda?">
 <!ENTITY torSettings.configurePrompt1 "Koneksi Internet komputer ini disensor atau terproksi.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Saya perlu untuk mengatur jembatan atau pengaturan proksi lokal sebelum saya terkoneksi ke jaringan Tor.">
 <!ENTITY torSettings.configure "Konfigur">
 <!ENTITY torSettings.connectPrompt2 "Saya ingin membuat koneksi langsung ke jaringan Tor.">
 <!ENTITY torSettings.connectPrompt3 "Ini akan bekerja dalam kebanyakan situasi.">
@@ -22,22 +22,22 @@
 <!ENTITY torSettings.proxyPageTitle "Konfigurasi Proksi Lokal">
 <!ENTITY torSettings.proxyQuestion "Apakah komputer ini memerlukan proksi lokal untuk dapat mengakses Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "Dalam banyak kasus proksi lokal tidah dibutuhkan, tapi mungkin dibutuhkan ketika menghubungkan lewat jaringan perusahaan, sekolah, atau universitas.">
+<!ENTITY torSettings.proxyExplanation2 "Jika anda tidak yakin bagaimana untuk menjawab pertanyaan ini, lihat dipengaturan Internet diperamban lainnya atau periksa pengaturan sistem jaringan anda untuk melihat apakah proksi lokal dibutuhkan.">
 <!ENTITY torSettings.enterProxy "Masuk ke pengaturan proksi.">
 <!ENTITY torSettings.bridgePageTitle "Konfigurasi Jembatan Tor">
 <!ENTITY torSettings.bridgeQuestion "Apakah Penyedia Layanan Internet (ISP) Anda memblokir atau menyensor sambungan ke Jaringan Tor?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Jika anda tidak yakin bagaimana untuk menjawab pertanyaan ini, pilih Tidak (jika anda tidak dapat menyambungkan ke jaringan Tor tanpa jembatan, anda dapat menambahkannya nanti).">
+<!ENTITY torSettings.bridgeExplanation2 "Jika anda pilih Ya, anda akan ditanyakan untuk mengatur Tor Bridges, dimana relai tak terdaftar yang membuatnya lebih susah untuk menghalangi koneksi ke Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Anda dapat menggunakan setelan jembatan yang disediakan atau Anda dapat memperoleh dan memasukkan setelan jembatan ubahsuai.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai...">
 <!ENTITY torsettings.restartTor "Muat Ulang Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Konfigurasi ulang">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.prompt "Kamu telah mengatur jembatan Tor atau kamu telah memasukkan pengaturan proksi lokal.  Untuk membuat koneksi langsung ke jaringan Tor, pengaturan ini harus dihapus.">
 <!ENTITY torsettings.discardSettings.proceed "Buang Pengaturan dan Sambung">
 
 <!ENTITY torsettings.optional "Opsional">
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan:">
 <!ENTITY torsettings.useBridges.checkbox "Internet Service Provider (ISP) saya memblokir koneksi ke jaringan Tor">
 <!ENTITY torsettings.useBridges.default "Terhubung dengan bridge yang disediakan">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Setiap tipe jembatan menggunakan metode berbeda untuk menghindari penyaringan.  Jika satu jembatan tidak dapat bekerja, coba gunakan lagi jembatan lainnya.">
 <!ENTITY torsettings.useBridges.type "Jenis Transport :">
 <!ENTITY torsettings.useBridges.custom "Masukkan bridge yang biasa digunakan">
 <!ENTITY torsettings.useBridges.label "Masukkan satu atau beberapa jembatan penyambung (satu per baris).">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Salin Log Tor Ke Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay">
 <!ENTITY torsettings.bridgeHelp1 "Jika Anda tidak dapat terhubung ke jaringan Tor, bisa jadi Provider Layanan Internet (ISP) atau lembaga lain yang menghalangi Tor.   Sering kali, Anda dapat mengatasi masalah ini dengan menggunakan Tor Bridges, yang relai terdaftar yang lebih sulit untuk memblokir.">
-<!ENTITY torsettings.bridgeHelp1B "Anda dapat menggunakan prekonfigurasi, disediakan alamat set bridge atau Anda mungkin mendapatkan satu set kebiasaan alamat dengan menggunakan salah satu dari tiga metode ini:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Lewat web">
 <!ENTITY torsettings.bridgeHelp2 "Menggunakan applikasi penjelajah interet untuk mengunjungi https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Melalui Email Autoresponder">
diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties
index cc23057..834962a 100644
--- a/src/chrome/locale/id/torlauncher.properties
+++ b/src/chrome/locale/id/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S).
 
 torlauncher.unable_to_start_tor=Tidak dapat memulai Tor\n\n%S
 torlauncher.tor_missing=Tor executable hilang
-torlauncher.torrc_missing=File torrc hilang
-torlauncher.datadir_missing=Direktori data Tor tidak ada.
+torlauncher.torrc_missing=Berkas torrc hilang dan tidak dapat dibuat.
+torlauncher.datadir_missing=Direktori data tor tidak ada dan tidak dapat dibuat.
 torlauncher.password_hash_missing=Gagal mendapatkan kata sandi hashed.
 
 torlauncher.failed_to_get_settings=Gagal mendapatkan pengaturan Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Keluar
 torlauncher.done=Selesai.
 
 torlauncher.forAssistance=Untuk bantuan, hubungi $S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Penyalinan selesai. %S log pesan Tor telah siap untuk ditempelkan ke dalam editor text atau pesan email.
 
diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd
index d151c0d..bc5f007 100644
--- a/src/chrome/locale/is/network-settings.dtd
+++ b/src/chrome/locale/is/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Ã gegnum vefinn">
 <!ENTITY torsettings.bridgeHelp2 "NotaÃ°u vafra til aÃ° skoÃ°a https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/is/progress.dtd b/src/chrome/locale/is/progress.dtd
index c6f500e..4cc7f46 100644
--- a/src/chrome/locale/is/progress.dtd
+++ b/src/chrome/locale/is/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "StaÃ°a Tor">
 <!ENTITY torprogress.openSettings "Opna stillingar">
 <!ENTITY torprogress.heading "Tengist Tor-netinu">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "BÃddu aÃ°eins Ã¡ meÃ°an tengingu er komiÃ° Ã¡ viÃ° Tor-netiÃ°.  ÃžaÃ° getur tekiÃ° nokkrar mÃnÃºtur.">
diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties
index 9a238cc..0f66671 100644
--- a/src/chrome/locale/is/torlauncher.properties
+++ b/src/chrome/locale/is/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor-rÃ¦sir
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S mistÃ³kst (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Fara Ãºt
 torlauncher.done=BÃºiÃ°
 
 torlauncher.forAssistance=Til aÃ° fÃ¡ hjÃ¡lp, hafÃ°u samband viÃ° %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.
 
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index 4d67204..00db0d8 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Quale delle seguenti descrizioni raffigura meglio la tua situazione?">
 <!ENTITY torSettings.configurePrompt1 "La connessione a Internet di questo computer Ã¨ bloccata da censura o utilizza un proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Ho bisogno di configurare le impostazioni del bridge o del proxy locale prima di connettermi alla rete Tor.">
 <!ENTITY torSettings.configure "Configura">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor.">
 <!ENTITY torSettings.connectPrompt3 "Questo funzionerÃ  nella maggior parte delle situazioni.">
 <!ENTITY torSettings.connect "Connetti">
 
 <!ENTITY torSettings.proxyPageTitle "Configurazione Proxy locale">
 <!ENTITY torSettings.proxyQuestion "Questo computer richiede l'uso di un proxy locale per accedere ad Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "Nella maggior parte dei casi un proxy locale non Ã¨ necessario, ma puÃ² essere richiesto quando ci si connette da una rete scolastica, universitaria o aziendale.">
+<!ENTITY torSettings.proxyExplanation2 "Se non sei sicuro su come rispondere a questa domanda, controlla le impostazioni di Rete in un altro browser o nelle impostazioni del tuo sistema per vedere se Ã¨ necessario un proxy locale.">
 <!ENTITY torSettings.enterProxy "Inserisci le impostazioni del proxy.">
 <!ENTITY torSettings.bridgePageTitle "Configurazione Bridge di Tor">
 <!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Se non sei sicuro su come rispondere a questa domanda, scegli No (se non riesci a connetterti alla rete Tor senza un bridge puoi aggiungerlo in seguito).">
+<!ENTITY torSettings.bridgeExplanation2 "Se scegli Si, ti verrÃ  chiesto di configurare i Bridge Tor, che sono relay non listati che rendono piÃ¹ difficile il blocco delle connessioni alla rete Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Puoi usare il set preconfigurato di bridge o ottenere ed inserire un set personale di bridge.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "In attesa di avviare Tor...">
 <!ENTITY torsettings.restartTor "Riavvia Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Riconfigura">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Tu hai configurato i bridge Tor o hai inserito le impostazioni per il proxy locale.  Per effettuare una connessione diretta alla rete Tor, queste impostazioni devono essere rimosse.">
+<!ENTITY torsettings.discardSettings.proceed "Rimuovi Impostazioni e Connetti">
 
 <!ENTITY torsettings.optional "Facoltativo">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:">
 <!ENTITY torsettings.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor">
 <!ENTITY torsettings.useBridges.default "Collegati usando i bridge preconfigurati">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Ogni tipo di bridge usa un metodo differente per scavalcare la censura.  Se un bridge non funziona, prova di nuovo usandone uno diverso. ">
 <!ENTITY torsettings.useBridges.type "Tipo di trasporto:">
 <!ENTITY torsettings.useBridges.custom "Inserire bridge personaizzati">
 <!ENTITY torsettings.useBridges.label "Inserisci uno o piÃ¹ bridge relay (uno per riga)">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema">
 <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relÃ©">
 <!ENTITY torsettings.bridgeHelp1 "Se non ti riesci a connettere alla rete Tor, Ã¨ possibile che il tuo  Internet Service Provider (ISP) o una qualche altra agenzia stiano bloccando Tor.  Spesso puoi aggirare questo problema utilizzando un Bridge Tor, che Ã¨ un relay non tracciato piÃ¹ difficile da bloccare.">
-<!ENTITY torsettings.bridgeHelp1B "Puoi usare il set preconfigurato di indirizzi bridge o ottenere un set personale di indirizzi attraverso uno di questi tre metodi:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Attraverso il web">
 <!ENTITY torsettings.bridgeHelp2 "Usa un browser per visitare https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Attraverso l'autorisponditore Email">
diff --git a/src/chrome/locale/it/progress.dtd b/src/chrome/locale/it/progress.dtd
index ef30289..cf758aa 100644
--- a/src/chrome/locale/it/progress.dtd
+++ b/src/chrome/locale/it/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Stato di Tor">
 <!ENTITY torprogress.openSettings "Apertura impostazioni">
 <!ENTITY torprogress.heading "Connessione in corso alla rete Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Perfavore attendi finche non viene stabilita una connessione alla rete Tor.  Potrebbe richiedere alcuni minuti.">
diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties
index b5729ed..22fb0e1 100644
--- a/src/chrome/locale/it/torlauncher.properties
+++ b/src/chrome/locale/it/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Avviatore di Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Impossibile avviare Tor.âŽ\nâŽ\n%S
 torlauncher.tor_missing=Il file eseguibile di Tor Ã¨ mancante.
-torlauncher.torrc_missing=Il file di configurazione torrc Ã¨ mancante.
-torlauncher.datadir_missing=La directory dei dati di Tor non esiste.
+torlauncher.torrc_missing=Il file torrc non Ã¨ presente e non Ã¨ stato possibile crearlo.
+torlauncher.datadir_missing=La cartella dei dati di Tor non esiste e non Ã¨ stato possibile crearla.
 torlauncher.password_hash_missing=Tentativo di ottenere la password fallito.
 
 torlauncher.failed_to_get_settings=Impossibile recuperare le impostazioni di Tor.âŽ\nâŽ\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Esci
 torlauncher.done=Fatto
 
 torlauncher.forAssistance=Per richiedere assistenza, contattare %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copia completata. %S Messaggi di log Tor sono pronti per essere incollato in un editor di testo o un messaggio e-mail.
 
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 6fe3ede..fa3049c 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -35,10 +35,10 @@
 
 <!ENTITY torsettings.startingTor "Torã®é–‹å§‹ã‚’å¾…ã£ã¦ã„ã¾ã™...">
 <!ENTITY torsettings.restartTor "Torã‚’å†èµ·å‹•ã™ã‚‹">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "å†è¨å®š">
 
 <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.proceed "è¨å®šã¨æŽ¥ç¶šã‚’å‰Šé™¤">
 
 <!ENTITY torsettings.optional "ã‚ªãƒ—ã‚·ãƒ§ãƒ³">
 
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Torã®ãƒã‚°ã‚’ã‚¯ãƒªãƒƒãƒ—ãƒœãƒ¼ãƒ‰ã«ã‚³ãƒ”ãƒ¼">
 <!ENTITY torsettings.bridgeHelpTitle "ãƒ–ãƒªãƒƒã‚¸ãƒªãƒ¬ãƒ¼ã®ãƒ˜ãƒ«ãƒ—">
 <!ENTITY torsettings.bridgeHelp1 "Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã§ããªã„ãªã‚‰ã€ã‚ãªãŸã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‚µãƒ¼ãƒ“ã‚¹ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼(ISP)ã‚„åˆ¥ã®æ©Ÿé–¢ãŒ Tor ã‚’ãƒ–ãƒãƒƒã‚¯ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚  ãƒ–ãƒãƒƒã‚¯ãŒæ¯”è¼ƒçš„å›°é›£ãªãƒªã‚¹ãƒˆã•ã‚Œã¦ã„ãªã„ãƒªãƒ¬ãƒ¼ã§ã‚ã‚‹ Tor ãƒ–ãƒªãƒƒã‚¸ã‚’ä½¿ç”¨ã™ã‚‹ã“ã¨ã§ã“ã®å•é¡Œã‚’å›žé¿ã§ãã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚">
-<!ENTITY torsettings.bridgeHelp1B "äº‹å‰è¨å®šã•ã‚ŒãŸæä¾›ã•ã‚ŒãŸãƒ–ãƒªãƒƒã‚¸ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ã‚»ãƒƒãƒˆã‚’ä½¿ç”¨ã™ã‚‹ã‹ã€ã‚ã‚‹ã„ã¯ä»¥ä¸‹ã®3ã¤ã®æ–¹æ³•ã®ã„ãšã‚Œã‹ã‚’ç”¨ã„ã¦ã‚«ã‚¹ã‚¿ãƒ ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ã‚»ãƒƒãƒˆã‚’å–å¾—ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "ã‚¦ã‚§ãƒ–çµŒç”±">
 <!ENTITY torsettings.bridgeHelp2 "ã‚¦ã‚§ãƒ–ã‚’ä½¿ç”¨ã—ã¦ã€https://bridges.torproject.orgã‚’é–‹ã">
 <!ENTITY torsettings.bridgeHelp3Heading "ãƒ¡ãƒ¼ãƒ«è‡ªå‹•å¿œç”ã‚·ã‚¹ãƒ†ãƒ çµŒç”±">
diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties
index c679f1d..b46261d 100644
--- a/src/chrome/locale/ja/torlauncher.properties
+++ b/src/chrome/locale/ja/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ 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.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=ãƒãƒƒã‚·ãƒ¥åŒ–ã•ã‚ŒãŸãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã®å…¥æ‰‹ã«å¤±æ•—ã—ã¾ã—ãŸ
 
 torlauncher.failed_to_get_settings=Torã®è¨å®šã‚’å›žå¾©å‡ºæ¥ã¾ã›ã‚“ã€‚\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=çµ‚äº†
 torlauncher.done=å®Œäº†
 
 torlauncher.forAssistance=ã‚µãƒãƒ¼ãƒˆã«ã¤ã„ã¦ã¯ã€%Sã«ãŠå•ã„åˆã‚ã›ãã ã•ã„
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=ã‚³ãƒ”ãƒ¼æˆåŠŸã€‚ %Så€‹ã®Torãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«ãŒãƒ†ã‚ã‚¹ãƒˆã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã‚„Eãƒ¡ãƒ¼ãƒ«ã«ãƒšãƒ¼ã‚¹ãƒˆã™ã‚‹æº–å‚™ãŒã§ãã¾ã—ãŸã€‚
 
diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/jv/network-settings.dtd
+++ b/src/chrome/locale/jv/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/jv/torlauncher.properties
+++ b/src/chrome/locale/jv/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index 135c799..d66d355 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -8,8 +8,8 @@
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
-<!ENTITY torSettings.yes "Yes">
-<!ENTITY torSettings.no "No">
+<!ENTITY torSettings.yes "áƒ“áƒ˜áƒáƒ®">
+<!ENTITY torSettings.no "áƒáƒ áƒ">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
@@ -48,7 +48,7 @@
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
 <!ENTITY torsettings.useProxy.port "áƒžáƒáƒ áƒ¢áƒ˜:">
 <!ENTITY torsettings.useProxy.username "Username:">
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.password "áƒžáƒáƒ áƒáƒšáƒ˜">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties
index 02be756..b0a1c21 100644
--- a/src/chrome/locale/ka/torlauncher.properties
+++ b/src/chrome/locale/ka/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -33,9 +33,10 @@ torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
-torlauncher.done=Done
+torlauncher.done=áƒ¨áƒ”áƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ£áƒšáƒ˜áƒ
 
 torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
 
diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd
index ce471c2..478fe43 100644
--- a/src/chrome/locale/kk/network-settings.dtd
+++ b/src/chrome/locale/kk/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/kk/torlauncher.properties
+++ b/src/chrome/locale/kk/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd
index b2af430..c58339f 100644
--- a/src/chrome/locale/km/network-settings.dtd
+++ b/src/chrome/locale/km/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "áž…áž˜áŸ’áž›áž„â€‹áž€áŸ†ážŽážáŸ‹áž áŸážáž» Tor áž‘áŸ…â€‹áž€áŸ’ážŠáž¶ážšâ€‹ážáž˜áŸ’áž”áŸ€ážážáŸ’áž‘áž¶ážŸáŸ‹">
 <!ENTITY torsettings.bridgeHelpTitle "áž‡áŸ†áž“áž½áž™â€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áŸ’ážšáŸŠáž¸ážâ€‹áž”áž“áŸ’áž">
 <!ENTITY torsettings.bridgeHelp1 "áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…áž”ážŽáŸ’ážŠáž¶áž‰ Tor ážœáž¶â€‹áž¢áž¶áž…â€‹áž˜áž€áž–áž¸â€‹áž€áŸ’ážšáž»áž˜áž áŸŠáž»áž“â€‹áž•áŸ’ážŠáž›áŸ‹ážŸáŸážœáž¶áž€áž˜áŸ’áž˜â€‹áž¢áŸŠáž¸áž“áž’ážºážŽáž·áž (ISP) áž¬â€‹áž—áŸ’áž“áž¶áž€áŸ‹áž„áž¶ážšâ€‹áž•áŸ’ážŸáŸáž„â€‹â€‹áž€áŸ†áž–áž»áž„â€‹áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹ Tor áŸ”   áž‡áž¶â€‹ážšáž¿áž™áŸ—â€‹áž¢áŸ’áž“áž€â€‹áž¢áž¶áž…â€‹ážŸáŸ’ážœáŸ‚áž„áž™áž›áŸ‹â€‹áž–áž¸â€‹áž”áž‰áŸ’áž áž¶â€‹áž“áŸáŸ‡ ážŠáŸ„áž™â€‹áž”áŸ’ážšáž¾â€‹áž”áŸŠáŸ’ážšáž¸áž Tor ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž¶áž€áŸ‹â€‹áž€áž¶ážšâ€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’ážâ€‹ážŠáŸ‚áž›â€‹áž–áž·áž”áž¶áž€â€‹áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹áŸ”">
-<!ENTITY torsettings.bridgeHelp1B "áž¢áŸ’áž“áž€áž¢áž¶áž…â€‹áž”áŸ’ážšáž¾â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹áž‡áž¶â€‹áž˜áž»áž“ áž€áž¶ážšáž€áŸ†ážŽážáŸ‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž”áŸŠáŸ’ážšáž¸ážâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹ áž¬â€‹áž¢áŸ’áž“áž€áž¢áž¶áž…â€‹áž™áž€â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹ážáŸ’áž›áž½áž“â€‹ážŠáŸ„áž™â€‹áž”áŸ’ážšáž¾â€‹ážœáž·áž’áž¸â€‹áž˜áž½áž™â€‹áž€áŸ’áž“áž»áž„â€‹áž…áŸ†ážŽáŸ„áž˜ážœáž·áž’áž¸â€‹ážŸáž¶ážŸáŸ’ážáŸ’ážšâ€‹áž‘áž¶áŸ†áž„â€‹áž”áž¸áŸ–">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "ážáž¶áž˜â€‹ážšáž™áŸˆâ€‹áž”ážŽáŸ’ážŠáž¶áž‰">
 <!ENTITY torsettings.bridgeHelp2 "áž”áŸ’ážšáž¾â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸ážšáž»áž€ážšáž€áž”ážŽáŸ’ážŠáž¶áž‰ ážŠáž¾áž˜áŸ’áž”áž¸áž˜áž¾áž› https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "ážáž¶áž˜ážšáž™áŸˆâ€‹áž€áž¶ážšáž†áŸ’áž›áž¾áž™ážáž”â€‹ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž·â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›">
diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties
index b93eb81..1c36568 100644
--- a/src/chrome/locale/km/torlauncher.properties
+++ b/src/chrome/locale/km/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹áž…áž¶áž”áŸ‹áž•áŸ’ážŠáž¾áž˜ Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=áž”áž¶áž“â€‹áž”ážšáž¶áž‡áŸáž™ %1$S  (%
 
 torlauncher.unable_to_start_tor=áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž…áž¶áž”áŸ‹áž•áŸ’ážŠáž¾áž˜ Tor áŸ”\n\n%S
 torlauncher.tor_missing=áž”áž¶ážáŸ‹â€‹â€‹áž¯áž€ážŸáž¶ážšâ€‹áž¢áž¶áž…â€‹áž”áŸ’ážšážáž·áž”ážáŸ’ážáž·â€‹ážšáž”ážŸáŸ‹ Tor áŸ”
-torlauncher.torrc_missing=áž”áž¶ážáŸ‹â€‹áž¯áž€ážŸáž¶ážš torrc áŸ”
-torlauncher.datadir_missing=áž˜áž·áž“â€‹áž˜áž¶áž“â€‹ážážâ€‹áž‘áž·áž“áŸ’áž“áž“áŸáž™ Tor áŸ”
+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=áž”áž¶áž“â€‹áž”ážšáž¶áž‡áŸáž™â€‹áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž‘áž‘áž½áž›â€‹áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹áŸ”
 
 torlauncher.failed_to_get_settings=áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž‘áŸ…â€‹áž™áž€â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹ Tor áŸ”\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=áž…áž¶áž€áž…áŸáž‰
 torlauncher.done=ážšáž½áž…ážšáž¶áž›áŸ‹
 
 torlauncher.forAssistance=ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž‡áŸ†áž“áž½áž™ ážŸáž¼áž˜â€‹áž‘áž¶áž€áŸ‹áž‘áž„ %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.
 
diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd
index 6cd943a..e18a7cc 100644
--- a/src/chrome/locale/kn/network-settings.dtd
+++ b/src/chrome/locale/kn/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/kn/torlauncher.properties b/src/chrome/locale/kn/torlauncher.properties
index a4ad1c9..17518a4 100644
--- a/src/chrome/locale/kn/torlauncher.properties
+++ b/src/chrome/locale/kn/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd
index 74b8c4a..df3b833 100644
--- a/src/chrome/locale/ko-KR/network-settings.dtd
+++ b/src/chrome/locale/ko-KR/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties
index c793562..9fb084d 100644
--- a/src/chrome/locale/ko-KR/torlauncher.properties
+++ b/src/chrome/locale/ko-KR/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=ë‚˜ê°€ê¸°
 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.
 
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index 8ac0ad0..76c93c3 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Tor logë¥¼ í´ë¦½ë³´ë“œì— ë³µì‚¬í•˜ê¸°">
 <!ENTITY torsettings.bridgeHelpTitle "ë¸Œë¦¿ì§€ ì¤‘ê³„ ì„œë²„ ë„ì›€ë§">
 <!ENTITY torsettings.bridgeHelp1 "Tor ë„¤íŠ¸ì›Œí¬ì— ì ‘ì†í•  ìˆ˜ ì—†ëŠ” ê²½ìš°, ê·€í•˜ì˜ ì¸í„°ë„· ì„œë¹„ìŠ¤ ê³µê¸‰ìž(ISP)ë‚˜ ë³„ë„ì˜ ê¸°ê´€ì´ Torë¥¼ ì°¨ë‹¨í•˜ê³  ìžˆì„ ê°€ëŠ¥ì„±ì´ ìžˆìŠµë‹ˆë‹¤.  ê·¸ëŸ´ ë•ŒëŠ” ìˆ¨ê²¨ì§„ ì¤‘ê³„ ì„œë²„ë¥¼ í†µí•´ Tor ë¸Œë¦¿ì§€ë¥¼ ì‚¬ìš©í•¨ìœ¼ë¡œì¨ ì´ ë¬¸ì œë¥¼ í•´ê²°í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.">
-<!ENTITY torsettings.bridgeHelp1B "ì‚¬ì „ ì„¤ì •ë˜ê³  ì œê³µë˜ì–´ì§„ ë¸Œë¦¿ì§€ ì£¼ì†Œ ì§‘í•©ì„ ì‚¬ìš©í•˜ê±°ë‚˜ ë‹¤ìŒ ì„¸ ê°€ì§€ ë°©ë²• ì¤‘ í•˜ë‚˜ë¥¼ ì‚¬ìš©í•˜ì—¬ ì‚¬ìš©ìž ì§€ì • ì£¼ì†Œì˜ ì§‘í•©ì„ ê²€ìƒ‰ í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "ì›¹ì„ í†µí•´">
 <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org ë¥¼ ë°©ë¬¸í•˜ì‹ì‹œì˜¤.">
 <!ENTITY torsettings.bridgeHelp3Heading "ë©”ì¼ ìžë™ ì‘ë‹µ ì‹œìŠ¤í…œì„ í†µí•´">
diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties
index c20a6ac..e0b1aaa 100644
--- a/src/chrome/locale/ko/torlauncher.properties
+++ b/src/chrome/locale/ko/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor ë¸Œë¼ìš°ì € Launcher
@@ -13,8 +13,8 @@ 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.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=í•´ì‰¬ ì•”í˜¸ íšë“ ì‹¤íŒ¨
 
 torlauncher.failed_to_get_settings=Tor ì„¤ì •ì„ ì°¾ì„ ìˆ˜ ì—†ìŠµë‹ˆë‹¤.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=ì¢…ë£Œ
 torlauncher.done=ì™„ë£Œ
 
 torlauncher.forAssistance=ì§€ì›ìž ì—°ê²° %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=ë³µì‚¬ ì™„ë£Œ. %S Tor ë¡œê·¸ ë©”ì‹œì§€ëŠ” í…ìŠ¤íŠ¸ íŽ¸ì§‘ê¸° ë‚˜ ì´ë©”ì¼ ë©”ì‹œì§€ì— ë¶™ì—¬ ë„£ì„ ìˆ˜ ìžˆëŠ” ìƒíƒœê°€ ë©ë‹ˆë‹¤.
 
@@ -52,7 +53,7 @@ torlauncher.bootstrapStatus.done=Tor ë„¤íŠ¸ì›Œí¬ì— ì—°ê²° ì„±ê³µ!
 
 torlauncher.bootstrapWarning.done=ì™„ë£Œ
 torlauncher.bootstrapWarning.connectrefused=ì—°ê²°ì´ ê±°ë¶€ë¨
-torlauncher.bootstrapWarning.misc=ìž¡ë™ì‚¬ë‹ˆ
+torlauncher.bootstrapWarning.misc=ê¸°íƒ€
 torlauncher.bootstrapWarning.resourcelimit=ë¦¬ì†ŒìŠ¤ ë¶€ì¡±
 torlauncher.bootstrapWarning.identity=ê³„ì • ë¶ˆì¼ì¹˜
 torlauncher.bootstrapWarning.timeout=ì—°ê²° íƒ€ìž„ì•„ì›ƒ
diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ku/network-settings.dtd
+++ b/src/chrome/locale/ku/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ku/torlauncher.properties
+++ b/src/chrome/locale/ku/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/kw/network-settings.dtd
+++ b/src/chrome/locale/kw/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/kw/torlauncher.properties
+++ b/src/chrome/locale/kw/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd
index 2f61a16..5349f81 100644
--- a/src/chrome/locale/ky/network-settings.dtd
+++ b/src/chrome/locale/ky/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties
index 66f9e15..234a644 100644
--- a/src/chrome/locale/ky/torlauncher.properties
+++ b/src/chrome/locale/ky/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ð§Ñ‹Ð³ÑƒÑƒ
 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.
 
diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd
index 5d56d79..9e4060c 100644
--- a/src/chrome/locale/lb/network-settings.dtd
+++ b/src/chrome/locale/lb/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties
index 9edd40f..96a287b 100644
--- a/src/chrome/locale/lb/torlauncher.properties
+++ b/src/chrome/locale/lb/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Exit
 torlauncher.done=FÃ¤erdeg
 
 torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
 
diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/lg/network-settings.dtd
+++ b/src/chrome/locale/lg/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/lg/torlauncher.properties
+++ b/src/chrome/locale/lg/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ln/network-settings.dtd
+++ b/src/chrome/locale/ln/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ln/torlauncher.properties
+++ b/src/chrome/locale/ln/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd
index 7c0e752..f0fdd8f 100644
--- a/src/chrome/locale/lo/network-settings.dtd
+++ b/src/chrome/locale/lo/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties
index 10e34b0..e79f9a1 100644
--- a/src/chrome/locale/lo/torlauncher.properties
+++ b/src/chrome/locale/lo/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=à»‚àº•à»€àº›àºµàº” Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd
index 78e4d6d..587ad7f 100644
--- a/src/chrome/locale/lt/network-settings.dtd
+++ b/src/chrome/locale/lt/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Kopijuoti Tor Å¾urnalÄ… Ä¯ iÅ¡karpinÄ™">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties
index 99962c4..cc45cad 100644
--- a/src/chrome/locale/lt/torlauncher.properties
+++ b/src/chrome/locale/lt/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Leistuvas
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S nepavyko (%2$S).
 
 torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S
 torlauncher.tor_missing=TrÅ«ksta Tor vykdomojo failo.
-torlauncher.torrc_missing=TrÅ«ksta torrc failo
-torlauncher.datadir_missing=Nesukurtas Tor duomenÅ³ aplankas
+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=Nepavyko perskaityti slaptaÅ¾odÅ¾io santrumpos
 
 torlauncher.failed_to_get_settings=Nepavyko perskaityti Tor nustatymo parametrÅ³.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=IÅ¡eiti
 torlauncher.done=Atlikta
 
 torlauncher.forAssistance=Jei Jums reikia pagalbos, susisiekti galite su %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor Ä¯vykiÅ³ Å¾urnalas paruoÅ¡tas Ä¯klijuoti Ä¯ teksto redagavimo programÄ… ar elektroninio paÅ¡to praneÅ¡imÄ….
 
diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd
index 3bd53a8..c63091e 100644
--- a/src/chrome/locale/lv/network-settings.dtd
+++ b/src/chrome/locale/lv/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "KopÄ“t Tor Å¾urnÄlu starpliktuvÄ“">
 <!ENTITY torsettings.bridgeHelpTitle "PalÄ«dzÄ«ba par tiltu retranslatoriem">
 <!ENTITY torsettings.bridgeHelp1 "Ja nevarat izveidot savienojumu ar tÄ«klu Tor, tad, iespÄ“jams, ka JÅ«su interneta pakalpojumu sniedzÄ“js (ISP) vai cita iestÄde bloÄ·Ä“ Tor.  BieÅ¾i, Å¡o problemu var apiet izmantojot Tor tiltus jeb Tor Bridges, proti, neuzskaitÄ«tus retranslatorus, kurus grÅ«tÄk bloÄ·Ä“t.">
-<!ENTITY torsettings.bridgeHelp1B "JÅ«s varat izmantot iepriekÅ¡ nokonfigurÄ“tas un piedÄvÄtas tiltu adreses vai varat iegÅ«t pielÄgotu adreÅ¡u kopumu, sekojot vienai no trim metodÄ“m:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Caur tÄ«mekli">
 <!ENTITY torsettings.bridgeHelp2 "Izmanto pÄrlÅ«kprogrammu, lai apmeklÄ“tu https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildÄ“tÄju">
diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties
index fff24bf..cd80b84 100644
--- a/src/chrome/locale/lv/torlauncher.properties
+++ b/src/chrome/locale/lv/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor palaidÄ“js
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neizdevas  (%2$S).
 
 torlauncher.unable_to_start_tor=NespÄ“j startÄ“t Tor:\nâŽ\n%S
 torlauncher.tor_missing=TrÅ«kst Tor'a izpildÄmÄ moduÄ¼a.
-torlauncher.torrc_missing=TrÅ«kst datnes torrc .
-torlauncher.datadir_missing=Tor'a datu direktorijs nepastÄv.
+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=NeizdevÄs saÅ†emt jaukto paroli.
 
 torlauncher.failed_to_get_settings=NeizdevÄs izgÅ«t Tor'a iestatÄ«jumus.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Iziet
 torlauncher.done=Gatavs
 
 torlauncher.forAssistance=Lai saÅ†emtu palÄ«dzÄ«bu, sazinieties ar %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=KopÄ“Å¡ana paveikta. %S Tor Å¾urnÄla ziÅ†ojumi sagatavoti ielÄ«mÄ“Å¡anai teksta redaktorÄ vai e-pasta ziÅ†ojumÄ.
 
diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/mg/network-settings.dtd
+++ b/src/chrome/locale/mg/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/mg/torlauncher.properties
+++ b/src/chrome/locale/mg/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/mi/network-settings.dtd
+++ b/src/chrome/locale/mi/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/mi/torlauncher.properties
+++ b/src/chrome/locale/mi/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index 05cad9a..39b7855 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties
index 3b8e9fa..abdecf5 100644
--- a/src/chrome/locale/mk/torlauncher.properties
+++ b/src/chrome/locale/mk/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges.
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)
 
 torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ð˜Ð·Ð»ÐµÐ·
 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.
 
diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ml/network-settings.dtd
+++ b/src/chrome/locale/ml/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ml/torlauncher.properties
+++ b/src/chrome/locale/ml/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/mn/network-settings.dtd
+++ b/src/chrome/locale/mn/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/mn/torlauncher.properties
+++ b/src/chrome/locale/mn/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd
index c31e040..ede666b 100644
--- a/src/chrome/locale/mr/network-settings.dtd
+++ b/src/chrome/locale/mr/network-settings.dtd
@@ -8,7 +8,7 @@
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
-<!ENTITY torSettings.yes "Yes">
+<!ENTITY torSettings.yes "à¤¹à¥‹à¤¯">
 <!ENTITY torSettings.no "à¤¨à¤¾à¤¹à¥€">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties
index 010b0d4..d8b89e1 100644
--- a/src/chrome/locale/mr/torlauncher.properties
+++ b/src/chrome/locale/mr/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=à¤Ÿà¥‰à¤° à¤²à¤¾à¤à¤šà¤°
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=à¤Ÿà¥‰à¤° à¤¸à¥à¤°à¥‚ à¤•à¤°à¤£à¥à¤¯à¤¾à¤¤ à¤…à¤ªà¤¯à¤¶.\n\n%S
 torlauncher.tor_missing=à¤Ÿà¥‰à¤°à¤šà¥€ à¤ªà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® à¤«à¤¾à¤‡à¤² à¤…à¤¨à¥à¤ªà¤¸à¥à¤¥à¤¿à¤¤.
-torlauncher.torrc_missing=torrc à¤«à¤¾à¤‡à¤² à¤…à¤¨à¥à¤ªà¤¸à¥à¤¥à¤¿à¤¤.
-torlauncher.datadir_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=à¤¹à¥…à¤¶à¥à¤¡ à¤ªà¤°à¤µà¤²à¥€à¤šà¤¾ à¤¶à¤¬à¥à¤¦ à¤®à¤¿à¤³à¤µà¤£à¥à¤¯à¤¾à¤¤ à¤…à¤ªà¤¯à¤¶.
 
 torlauncher.failed_to_get_settings=à¤Ÿà¥‰à¤°à¤šà¥à¤¯à¤¾ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤¸ à¤®à¤¿à¤³à¤µà¤£à¥à¤¯à¤¾à¤¤ à¤…à¤ªà¤¯à¤¶.
@@ -36,6 +36,7 @@ torlauncher.quit_win=à¤¬à¤‚à¤¦ à¤•à¤°à¤¾
 torlauncher.done=à¤à¤¾à¤²à¥‡
 
 torlauncher.forAssistance=à¤¸à¤¹à¤•à¤¾à¤°à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ à¤¸à¤‚à¤ªà¤°à¥à¤• à¤¸à¤¾à¤§à¤¾ : %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.
 
diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd
index c7eb7d1..237f08d 100644
--- a/src/chrome/locale/ms-MY/network-settings.dtd
+++ b/src/chrome/locale/ms-MY/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Salin log Tor ke clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties
index c403773..a2ce9b3 100644
--- a/src/chrome/locale/ms-MY/torlauncher.properties
+++ b/src/chrome/locale/ms-MY/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Pelancar Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Tidak dapat memulakan Tor.\n\n%S
 torlauncher.tor_missing=Tor executable hilang.
-torlauncher.torrc_missing=Fail torrc hilang.
-torlauncher.datadir_missing=Direktori data Tor tidak wujud.
+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=Gagal untuk mendapatkan kata laluan hashes.
 
 torlauncher.failed_to_get_settings=Gagal mendapatkan tetapan Tor.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Anda mesti menentukan satu atau lebih bridges.
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(digalakkan)
 
 torlauncher.connect=Menyambung
 torlauncher.restart_tor=Restart Tor
@@ -36,6 +36,7 @@ torlauncher.quit_win=Keluar
 torlauncher.done=Selesai
 
 torlauncher.forAssistance=Untuk bantuan, hubungi %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.
 
diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/mt/network-settings.dtd
+++ b/src/chrome/locale/mt/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/mt/torlauncher.properties
+++ b/src/chrome/locale/mt/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd
index a3d9240..94deb90 100644
--- a/src/chrome/locale/my/network-settings.dtd
+++ b/src/chrome/locale/my/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties
index 9c1d74c..09113b1 100644
--- a/src/chrome/locale/my/torlauncher.properties
+++ b/src/chrome/locale/my/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=â€‹Bridge á€á€…á€ºá€á€¯ (á€žá€á€¯á€·) á€
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)
 
 torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
@@ -36,6 +36,7 @@ torlauncher.quit_win=á€‘á€½á€€á€ºá€›á€”á€º
 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.
 
diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/nah/network-settings.dtd
+++ b/src/chrome/locale/nah/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/nah/torlauncher.properties
+++ b/src/chrome/locale/nah/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/nap/network-settings.dtd
+++ b/src/chrome/locale/nap/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/nap/torlauncher.properties
+++ b/src/chrome/locale/nap/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd
index 802253c..51e6e52 100644
--- a/src/chrome/locale/nb/network-settings.dtd
+++ b/src/chrome/locale/nb/network-settings.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torsettings.dialog.title "Tor Nettverksinnstillinger">
+<!ENTITY torsettings.dialog.title "Nettverksinnstillinger for Tor">
 
 <!-- For locale picker: -->
 <!ENTITY torlauncher.localePicker.title "SprÃ¥k i Tor-nettleser">
@@ -6,44 +6,44 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "FÃ¸r du kan koble til Tor-nettverket, mÃ¥ du gi informasjon om denne datamaskinens internett-tilkobling.">
+<!ENTITY torsettings.prompt "FÃ¸r du kan koble til Tor-nettverket, mÃ¥ du gi informasjon om denne datamaskinens Internett-tilkobling.">
 
 <!ENTITY torSettings.yes "Ja">
 <!ENTITY torSettings.no "Nei">
 
 <!ENTITY torSettings.firstQuestion "Hvilket av fÃ¸lgende beskriver best din situasjon?">
-<!ENTITY torSettings.configurePrompt1 "Computeren's internett tilkobling er sensurert eller under proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
-<!ENTITY torSettings.configure "Konfigurer">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.configurePrompt1 "Datamaskinens Internett-tilkobling er sensurert eller bak mellomtjener.">
+<!ENTITY torSettings.configurePrompt2 "Jeg trenger Ã¥ sette opp bro eller lokale mellomtjenerinnstillinger fÃ¸r jeg kobler til Tor nettverket.">
+<!ENTITY torSettings.configure "Sett opp">
+<!ENTITY torSettings.connectPrompt2 "Jeg Ã¸nsker Ã¥ opprette en direkte forbindelse til Tor-nettverket.">
 <!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner.">
 <!ENTITY torSettings.connect "Koble til">
 
-<!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfigurasjon">
+<!ENTITY torSettings.proxyPageTitle "Lokalt mellomtjener-oppsett">
 <!ENTITY torSettings.proxyQuestion "Trenger denne maskinen Ã¥ bruke en lokal mellomtjener for Ã¥ nÃ¥ Internett?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
-<!ENTITY torSettings.enterProxy "Skriv inn proxy-innstillingene.">
+<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfeller en lokal mellomtjener ikke er nÃ¸dvendig, men det kan vÃ¦re pÃ¥krevd nÃ¥r du kobler til gjennom et firma, skole eller universitetsnettverk.">
+<!ENTITY torSettings.proxyExplanation2 "Hvis du er usikker pÃ¥ hvordan du skal svare pÃ¥ dette spÃ¸rsmÃ¥let, se pÃ¥ Internett-innstillingene i en annen nettleser eller sjekk nettverksinnstillingene systemets Ã¥ se om en lokal mellomtjener er nÃ¸dvendig.">
+<!ENTITY torSettings.enterProxy "Skriv inn mellomtjenings-innstillingene.">
 <!ENTITY torSettings.bridgePageTitle "Oppsett av Tor-broer.">
-<!ENTITY torSettings.bridgeQuestion "Blokkerer eller sensurerer internettleverandÃ¸ren (ISP) din tilkoblinger til Tor-nettverket?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeQuestion "Blokkerer eller pÃ¥ annet vis sensurerer InternettleverandÃ¸ren (ISP) dine tilkoblinger til Tor-nettverket?">
+<!ENTITY torSettings.bridgeExplanation1 "Hvis du er usikker pÃ¥ hvordan du skal svare pÃ¥ dette spÃ¸rsmÃ¥let, velg Nei (hvis du ikke klarer Ã¥ koble til Tor-nettverket uten en bro, kan du legge til en senere).">
+<!ENTITY torSettings.bridgeExplanation2 "Hvis du velger Ja, vil du bli bedt om Ã¥ sette opp Tor-broer, som er unoterte rutingsstafettoppsett som gjÃ¸r det vanskeligere Ã¥ blokkere tilkoblinger til Tor-nettverket.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruke de angitte broene eller du kan skaffe og oppgi egendefinerte broer.">
 
 <!-- Other: -->
 
-<!ENTITY torsettings.startingTor "Venter pÃ¥ at Tor skal starte...">
+<!ENTITY torsettings.startingTor "Venter pÃ¥ at Tor skal starteâ€¦">
 <!ENTITY torsettings.restartTor "Omstart av Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Sett opp pÃ¥ ny">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Du har satt opp Tor-broer eller du har angitt lokale mellomtjeningsinnstillinger.   For Ã¥ gjÃ¸re en direkte forbindelse til Tor-nettverket, mÃ¥ disse innstillingene fjernes.">
+<!ENTITY torsettings.discardSettings.proceed "Fjern innstillinger og koble til">
 
 <!ENTITY torsettings.optional "Valgfritt">
 
 <!ENTITY torsettings.useProxy.checkbox "Denne maskinen trenger Ã¥ bruke en mellomtjener for Ã¥ nÃ¥ Internett">
-<!ENTITY torsettings.useProxy.type "Proxytype:">
+<!ENTITY torsettings.useProxy.type "Mellomtjeningstype:">
 <!ENTITY torsettings.useProxy.address "Adresse:">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn">
 <!ENTITY torsettings.useProxy.port "Port:">
@@ -53,19 +53,19 @@
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Denne datamaskinen gÃ¥r gjennom en brannmur som kun tillater tilkoblinger til visse porter">
-<!ENTITY torsettings.firewall.allowedPorts "Tillatte Porter:">
+<!ENTITY torsettings.firewall.allowedPorts "Tillatte porter:">
 <!ENTITY torsettings.useBridges.checkbox "Min InternettleverandÃ¸r (ISP) blokkerer tilkoblinger til Tor-nettverket">
 <!ENTITY torsettings.useBridges.default "Koble til med angitte broer">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Hver type bro bruker en annen metode for Ã¥ unngÃ¥ sensur.  Hvis en bro ikke virker, prÃ¸v pÃ¥ nytt med en annen.">
 <!ENTITY torsettings.useBridges.type "Tilkoblingstype:">
 <!ENTITY torsettings.useBridges.custom "Angi egendefinerte broer">
-<!ENTITY torsettings.useBridges.label "Angi Ã©n eller flere bro-relÃ©er (Ã©n per linje).">
+<!ENTITY torsettings.useBridges.label "Angi Ã©n eller flere bro-rutingsstafettoppsett (ett per linje).">
 <!ENTITY torsettings.useBridges.placeholder "type adresse:port">
 
 <!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen">
-<!ENTITY torsettings.bridgeHelpTitle "Bro-relÃ© Hjelp">
-<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke fÃ¥r koblet til Tor-nettverket, kan det vÃ¦re at internettleverandÃ¸ren din (ISP), eller et annet byrÃ¥/institusjon/etat blokkerer Tor.  Som regel kan du omgÃ¥ dette problemet ved Ã¥ bruke Tor-broer, som er ulistede relÃ©er og derfor vanskeligere Ã¥ blokkere.">
-<!ENTITY torsettings.bridgeHelp1B "Du kan bruke de prekonfigurerte, angitte bro-adressene eller du kan skaffe deg egendefinerte adresser ved Ã¥ bruke en av fÃ¸lgende tre metoder:">
+<!ENTITY torsettings.bridgeHelpTitle "Hjelp med Bro-rutingsstafettoppsett">
+<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke fÃ¥r koblet til Tor-nettverket, kan det vÃ¦re at internettleverandÃ¸ren din (ISP), eller et annet byrÃ¥/institusjon/etat blokkerer Tor.  Som regel kan du omgÃ¥ dette problemet ved Ã¥ bruke Tor-broer, som er ulistede rutingsstafettoppsett og derfor vanskeligere Ã¥ blokkere.">
+<!ENTITY torsettings.bridgeHelp1B "Du kan bruke de ferdig oppsatte, medfÃ¸lgende broene eller du kan skaffe et egendefinert sett adresser ved bruk av Ã©n av disse metodene:.">
 <!ENTITY torsettings.bridgeHelp2Heading "Via nettet">
 <!ENTITY torsettings.bridgeHelp2 "Bruk en nettleser for Ã¥ besÃ¸ke https://bridges.torproject.org/?lang=nb">
 <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">
diff --git a/src/chrome/locale/nb/progress.dtd b/src/chrome/locale/nb/progress.dtd
index 2d7049a..82cf290 100644
--- a/src/chrome/locale/nb/progress.dtd
+++ b/src/chrome/locale/nb/progress.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
+<!ENTITY torprogress.dialog.title "Tor-status">
 <!ENTITY torprogress.openSettings "Ã…pne Innstillinger">
 <!ENTITY torprogress.heading "Kobler til Tor-nettverket">
-<!ENTITY torprogress.pleaseWait "Vennligst vent mens vi oppretter en tilkobling til Tor-nettverket.  Dette kan ta flere minutter.">
+<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.  opprettes. Dette kan ta flere minutter.">
diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties
index cdbad0e..5c10458 100644
--- a/src/chrome/locale/nb/torlauncher.properties
+++ b/src/chrome/locale/nb/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,19 +13,19 @@ torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S).
 
 torlauncher.unable_to_start_tor=Kunne ikke starte Tor.\n\n%S
 torlauncher.tor_missing=Den kjÃ¸rbare Tor-filen finnes ikke.
-torlauncher.torrc_missing=torrc filen finnes ikke.
-torlauncher.datadir_missing=Datamappen til Tor finnes ikke.
+torlauncher.torrc_missing=torrc-fila mangler og kunne ikke opprettes.
+torlauncher.datadir_missing=Datakatalogen til Tor finnes  ikke og kunne ikke opprettes.
 torlauncher.password_hash_missing=Kunne ikke hente kryptert passord.
 
 torlauncher.failed_to_get_settings=Kunne ikke hente Tor-innstillinger.\n\n%S
 torlauncher.failed_to_save_settings=Kunne ikke lagre Tor-innstillinger.\n\n%S
-torlauncher.ensure_tor_is_running=Vennligst sjekk at Tor kjÃ¸rer.
+torlauncher.ensure_tor_is_running=Sjekk at Tor kjÃ¸rer.
 
-torlauncher.error_proxy_addr_missing=Du mÃ¥ spesifisere bÃ¥de IP-adresse eller vertsnavn og et portnummer for Ã¥ konfigurere Tor til Ã¥ bruke en proxy for Ã¥ koble til Internett.
-torlauncher.error_proxy_type_missing=Du mÃ¥ velge proxytypen
+torlauncher.error_proxy_addr_missing=Du mÃ¥ spesifisere bÃ¥de IP-adresse eller vertsnavn og et portnummer for Ã¥ sette opp Tor til bruk med en mellomtjener for Ã¥ koble til Internett.
+torlauncher.error_proxy_type_missing=Du mÃ¥ velge melomtjenertypen
 torlauncher.error_bridges_missing=Du mÃ¥ velge Ã©n eller flere broer.
 torlauncher.error_default_bridges_type_missing=Du mÃ¥ velge en tilkoblingstype for de angitte broene.
-torlauncher.error_bridge_bad_default_type=Ingen angitte broer som har tilkoblingstypen %S er tilgjengelige. Vennligst juster innstillingene dine.
+torlauncher.error_bridge_bad_default_type=Ingen angitte broer som har tilkoblingstypen %S er tilgjengelige. Juster innstillingene dine.
 
 torlauncher.recommended_bridge=(anbefalt)
 
@@ -36,16 +36,17 @@ torlauncher.quit_win=Exit
 torlauncher.done=Ferdig
 
 torlauncher.forAssistance=For hjelp, kontakt %S
+torlauncher.forAssistance2=For hjelp, besÃ¸k %S
 
-torlauncher.copiedNLogMessages=Kopiering ferdig. %S Tor log meldinger er klare til Ã¥ bli sent til et skriveprogram eller en email.
+torlauncher.copiedNLogMessages=Kopiering ferdig. %S TorloggfÃ¸rings-meldinger er klare til Ã¥ bli sent til et skriveprogram eller en e-post.
 
-torlauncher.bootstrapStatus.conn_dir=Kobler til en relÃ©katalog 
+torlauncher.bootstrapStatus.conn_dir=Kobler til en rutingsstafettoppsetts-katalog 
 torlauncher.bootstrapStatus.handshake_dir=Etablerer en kryptert katalogforbindelse
 torlauncher.bootstrapStatus.requesting_status=Mottar nettverkstatus
 torlauncher.bootstrapStatus.loading_status=Laster nettverkstatus
 torlauncher.bootstrapStatus.loading_keys=Laster serfikater for autoritet
-torlauncher.bootstrapStatus.requesting_descriptors=Sender forespÃ¸rsel om relÃ©informasjon
-torlauncher.bootstrapStatus.loading_descriptors=Laster relÃ©informasjon
+torlauncher.bootstrapStatus.requesting_descriptors=Sender forespÃ¸rsel om rutingsstafettoppsettsinformasjon
+torlauncher.bootstrapStatus.loading_descriptors=Laster inn rutingsstafettoppsetts-informasjon
 torlauncher.bootstrapStatus.conn_or=Kobler til Tor-nettverket
 torlauncher.bootstrapStatus.handshake_or=Etablerer en Tor-rute
 torlauncher.bootstrapStatus.done=Koblet til Tor-nettverket!
diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/nds/network-settings.dtd
+++ b/src/chrome/locale/nds/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/nds/torlauncher.properties
+++ b/src/chrome/locale/nds/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd
index aea700a..57eb5f2 100644
--- a/src/chrome/locale/ne/network-settings.dtd
+++ b/src/chrome/locale/ne/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties
index ddd7834..fbe0355 100644
--- a/src/chrome/locale/ne/torlauncher.properties
+++ b/src/chrome/locale/ne/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=à¤Ÿà¥‹à¤° à¤¸à¥à¤°à¥à¤µà¤¾à¤¤à¤•à¤°à¥à¤¤à¤¾
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=à¤Ÿà¥‹à¤°à¤•à¥‹ à¤¸à¥‡à¤Ÿà¤¿à¤™ à¤à¥‡à¤Ÿà¤¿à¤à¤¨
@@ -36,6 +36,7 @@ torlauncher.quit_win=à¤¬à¤¨à¥à¤¦
 torlauncher.done=à¤à¤¯à¥‹
 
 torlauncher.forAssistance=à¤œà¤¾à¤¨à¤•à¤¾à¤°à¥€à¤•à¥‹ à¤²à¤¾à¤—à¤¿ à¤¸à¤®à¥à¤ªà¤°à¥à¤• à¤—à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸
+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.
 
diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd
index 95f0a12..1c932a4 100644
--- a/src/chrome/locale/nl-BE/network-settings.dtd
+++ b/src/chrome/locale/nl-BE/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Via het Web">
 <!ENTITY torsettings.bridgeHelp2 "Gebruik een web browser om https://bridges.torproject.org te bezoeken">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties
index e231325..b6ffe5d 100644
--- a/src/chrome/locale/nl-BE/torlauncher.properties
+++ b/src/chrome/locale/nl-BE/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Kan Tor niet starten.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=Het torcc bestand ontbreekt
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Afsluiten
 torlauncher.done=Klaar
 
 torlauncher.forAssistance=Voor assistentie, gelieve %S te contacteren
+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.
 
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index ab35d6b..03707e3 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Welke van de volgende beschrijft het best jouw situatie?">
 <!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer is gecensureerd of loopt via een proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Ik moet een bridge of lokale proxy instellingen voordat ik verbinding kan maken met het Tor netwerk.">
 <!ENTITY torSettings.configure "Configureren">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Ik wil een directe verbinding met het Tor netwerk maken.">
 <!ENTITY torSettings.connectPrompt3 "Dit zal in de meeste omstandigheden werken.">
 <!ENTITY torSettings.connect "Verbinden">
 
 <!ENTITY torSettings.proxyPageTitle "Lokale proxy-configuratie">
 <!ENTITY torSettings.proxyQuestion "Heeft deze computer een lokale proxy nodig om toegang tot het internet te krijgen?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "In de meeste gevallen is een locale proxy niet nodig, maar kan het wel worden vereist bij het verbinden met een bedrijf, school of universitair netwerk.">
+<!ENTITY torSettings.proxyExplanation2 "Als je niet zeker bent over het antwoord op deze vraag, bekijk dan de verbindingsinstellingen van een andere browser om te zien of die is ingesteld om gebruik te maken van een proxy.">
 <!ENTITY torSettings.enterProxy "Voer de proxy-instellingen in.">
 <!ENTITY torSettings.bridgePageTitle "Tor bridge-configuratie">
 <!ENTITY torSettings.bridgeQuestion "Blokkeert of filtert je Internet Service Provider (ISP) verbindingen met het Tor-netwerk?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee (als je niet kunt verbinden met het Tor netwerk zonder een bridge, kun je later een toevoegen).">
+<!ENTITY torSettings.bridgeExplanation2 "Als je Ja kiest, moet je zelf Tor Bridges instellen, maar omdat het geen vertrouwde relays zijn is het moeilijker om verbindingen te blokkeren naar het Tor Netwerk.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Je ka de opgegeven bridges gebruiken, of je kan je eigen bridges verkrijgen en instellen. ">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Wachten tot Tor gestart isâ€¦">
 <!ENTITY torsettings.restartTor "Herstart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Herconfigureer">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "U heeft Tor bridges geconfigureerd of u heeft locale proxy instellingen ingevuld.  Om een directe verbinding tot het Tor netwerk te kunnen maken, dient u deze instellingen te verwijderen.">
+<!ENTITY torsettings.discardSettings.proceed "Instellingen Verwijderen en Verbinden">
 
 <!ENTITY torsettings.optional "Facultatief">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:">
 <!ENTITY torsettings.useBridges.checkbox "Mijn Internet Service Provider (ISP) blokkeert verbindingen naar het Tor-netwerk">
 <!ENTITY torsettings.useBridges.default "Verbinden met ingestelde bridges">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Elk type bridge gebruikt een verschillende methode om censorship te voorkomen.  Als een van de bridges niet werkt, probeert u het dan opnieuw met een andere.">
 <!ENTITY torsettings.useBridges.type "Transporttype:">
 <!ENTITY torsettings.useBridges.custom "Eigen bridge-instellingen">
 <!ENTITY torsettings.useBridges.label "Voer een of meer bridge relays in (een per regel).">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Kopieer Tor-log naar het klembord">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge relay-hulp">
 <!ENTITY torsettings.bridgeHelp1 "Indien je geen verbinding kan maken met het Tor-netwerk, zou het kunnen dat je Internet Service Provider (ISP) of een andere instelling Tor blokkeert.  Vaak kan je dit omzeilen door gebruik te maken van Tor-bridges, dit zijn ongeregistreerde relays die moeilijker te blokkeren zijn.">
-<!ENTITY torsettings.bridgeHelp1B "Je kan de voorgeconfigureerde bridge-adresinstellingen gebruiken, of je kan hier zelf een eigen adres instellen met een van de volgende drie methodes: ">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Door middel van het Web">
 <!ENTITY torsettings.bridgeHelp2 "Gebruik een browser om https://bridges.torproject.org te bezoeken">
 <!ENTITY torsettings.bridgeHelp3Heading "Door middel van de e-mail-autoresponder">
diff --git a/src/chrome/locale/nl/progress.dtd b/src/chrome/locale/nl/progress.dtd
index fb513ad..a7ced45 100644
--- a/src/chrome/locale/nl/progress.dtd
+++ b/src/chrome/locale/nl/progress.dtd
@@ -1,4 +1,5 @@
-<!ENTITY torprogress.dialog.title "Tor status">
+<!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Instellingen">
 <!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk. 
+Dit kan enkele minuten duren.">
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index 12c0bf7..00ae9f5 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Starter
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S mislukte (%2$S).
 
 torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S
 torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt.
-torlauncher.torrc_missing=Het torrc bestand ontbreekt.
-torlauncher.datadir_missing=De Tor data map bestaat niet.
+torlauncher.torrc_missing=Het torrc bestand is missend en kon niet worden aangemaakt.
+torlauncher.datadir_missing=De Tor data directory bestaat niet en kon niet worden aangemaakt.
 torlauncher.password_hash_missing=Ophalen van een gehashed wachtwoord is mislukt.
 
 torlauncher.failed_to_get_settings=Kon Tor instellingen niet ophalen.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Sluit af
 torlauncher.done=OK
 
 torlauncher.forAssistance=Voor hulp, contacteer %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=KopiÃ«ren klaar. %S Tor logberichten zijn klaar om in een teksteditor of een e-mailbericht te worden geplakt.
 
diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd
index 4bd82f0..120bbf4 100644
--- a/src/chrome/locale/nn/network-settings.dtd
+++ b/src/chrome/locale/nn/network-settings.dtd
@@ -1,41 +1,41 @@
 <!ENTITY torsettings.dialog.title "Tor nettverksinnstillingar">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Tor nettlesarsprÃ¥k">
+<!ENTITY torlauncher.localePicker.prompt "Vel eit sprÃ¥k.">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
+<!ENTITY torsettings.prompt "FÃ¸r du koplar til Tor-nettverket mÃ¥ du oppgje korleis maskina di koplar til internett.">
 
 <!ENTITY torSettings.yes "Ja">
 <!ENTITY torSettings.no "Nei">
 
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste hÃ¸ve">
+<!ENTITY torSettings.firstQuestion "Kva trur du passar best?">
+<!ENTITY torSettings.configurePrompt1 "Internett-sambandet til denne maskina er anten sensurert eller gÃ¥r gjennom ein proxy-tenar.">
+<!ENTITY torSettings.configurePrompt2 "Eg mÃ¥ konfigurera bru- eller lokale proxyinnstillingar fÃ¸r eg koplar til Tor-nettverket.">
+<!ENTITY torSettings.configure "Konfigurer">
+<!ENTITY torSettings.connectPrompt2 "Eg vil kopla til Tor-nettverket direkte.">
+<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste hÃ¸ve.">
 <!ENTITY torSettings.connect "Kopla til">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
+<!ENTITY torSettings.proxyPageTitle "Konfigurasjon av lokal proxy">
+<!ENTITY torSettings.proxyQuestion "For Ã¥ kopla til internett, treng denne maskina Ã¥ nytta ein lokal proxy?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
 <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
 <!ENTITY torSettings.enterProxy "Skriv inn mellomtenarinnstillingane.">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
-<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
+<!ENTITY torSettings.bridgeQuestion "Sensurerer eller blokkerer internettleverandÃ¸ren din (ISP) pÃ¥ noko vis tilgang til Tor-nettverket?">
+<!ENTITY torSettings.bridgeExplanation1 "Viss du ikkje er viss pÃ¥ dette, sÃ¥ vel Nei (viss du ikkje klarer Ã¥ kopla til Tor-nettverket utan ei bru, kan du sete opp dette seinare).">
+<!ENTITY torSettings.bridgeExplanation2 "Viss du vel Ja, vert du spurt om du vil konfigurere bruer med Tor. Bruer er ulista relear som gjer det vanskelegare Ã¥ blokkere samband til Tor-nettverket.">
+<!ENTITY torSettings.bridgeSettingsPrompt "Du kan nytta bruene som fÃ¸lgjer med eller skaffa og skriva inn dine eigne.">
 
 <!-- Other: -->
 
-<!ENTITY torsettings.startingTor "Waiting for Tor to startâ€¦">
+<!ENTITY torsettings.startingTor "Ventar pÃ¥ at Tor startar...">
 <!ENTITY torsettings.restartTor "Start Tor pÃ¥ nytt">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Konfigurer pÃ¥ nytt.">
 
 <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
 <!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
@@ -65,9 +65,9 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
-<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp2 "Nytt ein nettlesar for Ã¥ vitja https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
 <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges at torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com">
diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties
index 062fb5c..5c54991 100644
--- a/src/chrome/locale/nn/torlauncher.properties
+++ b/src/chrome/locale/nn/torlauncher.properties
@@ -1,20 +1,20 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Tor Launcher
+torlauncher.error_title=Tor-oppstartar
 
 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_controlconn_failed=Kunne ikkje kopla til Tor-kontrollport.
+torlauncher.tor_failed_to_start=Tor klarte ikkje Ã¥ starta opp.
 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=Tor klarte ikkje Ã¥ kopla til eit samband med Tor-nettverket.
 torlauncher.tor_bootstrap_failed_details=%1$S feila (%2$S).
 
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+torlauncher.unable_to_start_tor=Tor kunne ikkje starta.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=torrc-fila manglar
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Avslutt
 torlauncher.done=Ferdig
 
 torlauncher.forAssistance=For hjelp, kontakt %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.
 
diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/nso/network-settings.dtd
+++ b/src/chrome/locale/nso/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/nso/torlauncher.properties
+++ b/src/chrome/locale/nso/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/oc/network-settings.dtd
+++ b/src/chrome/locale/oc/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/oc/torlauncher.properties
+++ b/src/chrome/locale/oc/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/or/network-settings.dtd
+++ b/src/chrome/locale/or/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/or/torlauncher.properties b/src/chrome/locale/or/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/or/torlauncher.properties
+++ b/src/chrome/locale/or/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd
index 127f5c6..f749ef0 100644
--- a/src/chrome/locale/pa/network-settings.dtd
+++ b/src/chrome/locale/pa/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "à¨µà©ˆà©±à¨¬ à¨°à¨¾à¨¹à©€à¨‚">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties
index 4246cf6..289ddf5 100644
--- a/src/chrome/locale/pa/torlauncher.properties
+++ b/src/chrome/locale/pa/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=à¨Ÿà©‹à¨° à¨²à¨¾à¨‚à¨šà¨°
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=à¨¬à©°à¨¦ à¨•à¨°à©‹
 torlauncher.done=à¨®à©à¨•à©°à¨®à¨²
 
 torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
 
diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/pap/network-settings.dtd
+++ b/src/chrome/locale/pap/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/pap/torlauncher.properties
+++ b/src/chrome/locale/pap/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index 42180fa..d956e39 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "KtÃ³re z poniÅ¼szych najlepiej opisuje TwojÄ… sytuacjÄ™?">
 <!ENTITY torSettings.configurePrompt1 "PoÅ‚Ä…czenie internetowe tego komputera jest ocenzurowane lub przepuszczane przez proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "MuszÄ™ skonfigurowaÄ‡ ustawienia mostka lub lokalne proxy przed podÅ‚Ä…czyÄ‡ do sieci Tor.">
 <!ENTITY torSettings.configure "Konfiguruj">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "ChciaÅ‚bym nawiÄ…zaÄ‡ bezpoÅ›rednie poÅ‚Ä…czenie do sieci Tor.">
 <!ENTITY torSettings.connectPrompt3 "To zadziaÅ‚a w wiÄ™kszoÅ›ci sytuacji.">
 <!ENTITY torSettings.connect "PoÅ‚Ä…cz">
 
 <!ENTITY torSettings.proxyPageTitle "Ustawienia lokalnego proxy">
 <!ENTITY torSettings.proxyQuestion "Czy ten komputer musi uÅ¼ywaÄ‡ lokalnego proxy, aby poÅ‚Ä…czyÄ‡ siÄ™ z Internetem?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "W wiÄ™kszoÅ›ci przypadkÃ³w lokalny serwer proxy nie jest potrzebny, jednakÅ¼e moÅ¼e to byÄ‡ konieczne w przypadku podÅ‚Ä…czenia przez firmy, szkoÅ‚y lub sieci uniwersyteckiej.">
+<!ENTITY torSettings.proxyExplanation2 "JeÅ›li nie jesteÅ› pewien, jak odpowiedzieÄ‡ na to pytanie, przejrzyj ustawienia opcji internetowych w innej przeglÄ…darce lub sprawdziÄ‡ ustawienia sieci danego systemu, aby sprawdziÄ‡, czy lokalny serwer proxy jest potrzebny.">
 <!ENTITY torSettings.enterProxy "WprowadÅº ustawienia serwera proxy">
 <!ENTITY torSettings.bridgePageTitle "Ustawienia Tor Bridges">
 <!ENTITY torSettings.bridgeQuestion "Czy TwÃ³j dostawca usÅ‚ug internetowych (ISP) blokuje lub cenzuruje poÅ‚Ä…czenia sieci Tor?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "JeÅ›li nie jesteÅ› pewien, jak odpowiedzieÄ‡ na to pytanie, wybierz opcjÄ™ Nie (jeÅ›li nie jesteÅ› w stanie poÅ‚Ä…czyÄ‡ siÄ™ z sieciÄ… Tor bez mostu, moÅ¼esz dodaÄ‡ jeden pÃ³Åºniej).">
+<!ENTITY torSettings.bridgeExplanation2 "JeÅ›li wybierzesz Tak, zostaniesz poproszony o skonfigurowanie Mostu Tor, ktÃ³ry jest przekaÅºnikiem nie listowanym, sprawia to, Å¼e trudniej zablokowaÄ‡ poÅ‚Ä…czenia do sieci Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "MoÅ¼esz wybraÄ‡ dostÄ™pny zestaw mostkÃ³w, albo moÅ¼esz uzyskaÄ‡ i wprowadziÄ‡ niestandardowy zestaw mostÃ³w.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor">
 <!ENTITY torsettings.restartTor "Zrestartuj Tora">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Przekonfiguruj">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "SkonfigurowaÅ‚eÅ› mosty Tora lub wprowadziÅ‚eÅ› lokalne ustawienia serwera proxy.  Aby nawiÄ…zaÄ‡ bezpoÅ›rednie poÅ‚Ä…czenie do sieci Tor, ustawienia te muszÄ… byÄ‡ usuniÄ™te.">
+<!ENTITY torsettings.discardSettings.proceed "UsuÅ„ Ustawienia i PoÅ‚Ä…cz">
 
 <!ENTITY torsettings.optional "(opcjonalnie)">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:">
 <!ENTITY torsettings.useBridges.checkbox "MÃ³j dostawca internetu blokuje poÅ‚Ä…czenia do sieci Tor">
 <!ENTITY torsettings.useBridges.default "PoÅ‚Ä…cz z dostÄ™pnymi mostami.">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "KaÅ¼dy rodzaj mostu uÅ¼ywa innej metody, aby uniknÄ…Ä‡ cenzury..  JeÅ›li jeden most nie dziaÅ‚a, sprÃ³buj uÅ¼yÄ‡ innego.">
 <!ENTITY torsettings.useBridges.type "Typ Transportu:">
 <!ENTITY torsettings.useBridges.custom "WprowadÅº wÅ‚asne mosty">
 <!ENTITY torsettings.useBridges.label "Dodaj jeden lub wiÄ™cej przekaÅºnikÃ³w mostowych (jeden w kaÅ¼dej linijce)">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Skopiuj log do schowka">
 <!ENTITY torsettings.bridgeHelpTitle "Pomoc PrzekaÅºnikÃ³w Mostkowych">
 <!ENTITY torsettings.bridgeHelp1 "JeÅ›li nie jesteÅ› w stanie poÅ‚Ä…czyÄ‡ siÄ™ z sieciÄ… Tor, moÅ¼e to oznaczaÄ‡, Å¼e TwÃ³j Dostawca UsÅ‚ug Internetowych (ISP) lub inna agencja blokuje dostÄ™p do sieci Tor.  CzÄ™sto moÅ¼na obejÅ›Ä‡ ten problem uÅ¼ywajÄ…c MostÃ³w Tor, ktÃ³re sÄ… nienotowanymi przekaÅºnikami, dziÄ™ki czemu trudniej je zablokowaÄ‡.">
-<!ENTITY torsettings.bridgeHelp1B "MoÅ¼esz uÅ¼yÄ‡ wstÄ™pnie skonfigurowany, domyÅ›lny zestaw adresÃ³w mostÃ³w lub moÅ¼esz uzyskaÄ‡ wÅ‚asny zestaw adresÃ³w za pomocÄ… jednej z tych trzech metod:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Za poÅ›rednictwem sieci Web">
 <!ENTITY torsettings.bridgeHelp2 "UÅ¼yj przeglÄ…darki internetowej do odwiedzenia https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Poprzez Email Autoresponder">
diff --git a/src/chrome/locale/pl/progress.dtd b/src/chrome/locale/pl/progress.dtd
index f30af87..6896d3c 100644
--- a/src/chrome/locale/pl/progress.dtd
+++ b/src/chrome/locale/pl/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Status sieci Tor">
 <!ENTITY torprogress.openSettings "Ustawienia">
 <!ENTITY torprogress.heading "ÅÄ…czenie z sieciÄ… Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "ProszÄ™ zaczekaÄ‡, aÅ¼ ustanowimy poÅ‚Ä…czenie do sieci Tor.  To moÅ¼e zajÄ…Ä‡ kilka minut.">
diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties
index 7ba4f88..4f2d39f 100644
--- a/src/chrome/locale/pl/torlauncher.properties
+++ b/src/chrome/locale/pl/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S bÅ‚Ä…d (%2$S).
 
 torlauncher.unable_to_start_tor=Nie moÅ¼na wystartowaÄ‡ aplikacji Tor.\n\n%S
 torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora.
-torlauncher.torrc_missing=Brakuje pliku torrc
-torlauncher.datadir_missing=Katalog danych Tora nie istnieje.
+torlauncher.torrc_missing=Brakuje pliku torrc, nie mÃ³gÅ‚ on byÄ‡ utworzony.
+torlauncher.datadir_missing=Katalog Tora nie istnieje i nie mÃ³gÅ‚ byÄ‡ utworzony.
 torlauncher.password_hash_missing=Nie moÅ¼na uzyskaÄ‡ hasha hasÅ‚a.
 
 torlauncher.failed_to_get_settings=Nie moÅ¼na odzyskaÄ‡ ustawieÅ„ Tora.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=WyjÅ›cie
 torlauncher.done=Gotowe
 
 torlauncher.forAssistance=By uzyskaÄ‡ pomoc, skontaktuj siÄ™
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopia zakoÅ„czona. %S logi Tora sÄ… gotowe do wklejenia do notatnika lub wiadomoÅ›ci email.
 
diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/pms/network-settings.dtd
+++ b/src/chrome/locale/pms/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/pms/torlauncher.properties
+++ b/src/chrome/locale/pms/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ps/network-settings.dtd
+++ b/src/chrome/locale/ps/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ps/torlauncher.properties
+++ b/src/chrome/locale/ps/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd
index 1379f93..42b3d0f 100644
--- a/src/chrome/locale/pt-BR/network-settings.dtd
+++ b/src/chrome/locale/pt-BR/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Quais opÃ§Ãµes descrevem melhor a sua situaÃ§Ã£o?">
 <!ENTITY torSettings.configurePrompt1 "A conexÃ£o Ã  Internet deste computador foi censurada, filtrada ou limitada por um proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar as definiÃ§Ãµes de conexÃ£o de ponte ou proxy local antes de conectar Ã  rede Tor.">
 <!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Eu gostaria de fazer uma conexÃ£o direta com a rede Tor.">
 <!ENTITY torSettings.connectPrompt3 "Isso funcionarÃ¡ na maioria dos casos.">
 <!ENTITY torSettings.connect "Conectar">
 
 <!ENTITY torSettings.proxyPageTitle "ConfiguraÃ§Ã£o de Proxy Local">
 <!ENTITY torSettings.proxyQuestion "Este computador necessita de um proxy local para acessar a Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "Na maioria dos casos, um proxy local nÃ£o Ã© necessÃ¡rio, mas Ã© requerido quando estiver conectando atravÃ©s de uma rede de empresa, escola ou universidade.">
+<!ENTITY torSettings.proxyExplanation2 "Se vocÃª nÃ£o tem certeza de como responder essa questÃ£o, procure nas configuraÃ§Ãµes de Internet de outro navegador ou verifique as configuraÃ§Ãµes de rede do seu sistema para ver se um proxy local Ã© necessÃ¡rio.">
 <!ENTITY torSettings.enterProxy "Insira as configuraÃ§Ãµes de proxy.">
 <!ENTITY torSettings.bridgePageTitle "ConfiguraÃ§Ã£o de Pontes Tor">
 <!ENTITY torSettings.bridgeQuestion "Seu provedor de serviÃ§os de internet (ISP) bloqueia ou censura conexÃµes Ã  rede Tor?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Se vocÃª nÃ£o tem certeza de como responder essa questÃ£o, escolha NÃ£o (se vocÃª nÃ£o conseguir conectar Ã  rede Tor sem uma conexÃ£o de ponte, vocÃª pode adicionar uma mais tarde).">
+<!ENTITY torSettings.bridgeExplanation2 "Se vocÃª escolher Sim, serÃ¡ solicitado que vocÃª configure ConexÃµes de Ponte Tor, que sÃ£o transmissores nÃ£o-listados que dificultam mais o bloqueio de conexÃµes Ã  Rede Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "VocÃª pode usar o conjunto de pontes fornecidas ou obter e adicionar um conjunto de pontes personalizadas. ">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Esperando que Tor inicie...">
 <!ENTITY torsettings.restartTor "Reiniciar o Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Reconfigurar">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "VocÃª configurou as definiÃ§Ãµes de conexÃµes de ponte Tor ou inseriu um proxy local.  Para fazer uma conexÃ£o direta Ã  rede Tor, essas definiÃ§Ãµes devem ser removidas.">
+<!ENTITY torsettings.discardSettings.proceed "Remover DefiniÃ§Ãµes e Conectar">
 
 <!ENTITY torsettings.optional "Opcional">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:">
 <!ENTITY torsettings.useBridges.checkbox "Meu Provedor de ServiÃ§os Internet (ISP) bloqueia as conexÃµes Ã  rede Tor">
 <!ENTITY torsettings.useBridges.default "Conectar com as pontes fornecidas">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Cada tipo de conexÃ£o de ponte usa um mÃ©todo diferente para evitar censura.  Se uma nÃ£o funcionar, tente novamente usando uma diferente.">
 <!ENTITY torsettings.useBridges.type "Tipo de transporte:">
 <!ENTITY torsettings.useBridges.custom "Adicionar pontes personalizadas">
 <!ENTITY torsettings.useBridges.label "Insira um ou mais relÃ©s de pontes (um por linha).">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copiar o registro do Tor na Ã¡rea de transferÃªncia">
 <!ENTITY torsettings.bridgeHelpTitle "Ajuda RelÃ© de Ponte">
 <!ENTITY torsettings.bridgeHelp1 "Se for impossÃvel conectar-se Ã  rede Tor, talvez o seu Provedor de Internet (ISP) ou outra instÃ¢ncia esteja bloqueando o Tor. . Normalmente, Ã© possÃvel contornar esse problema utilizando Pontes Tor, que sÃ£o relÃ©s ocultos (nÃ£o listados), mais difÃceis de bloquear.">
-<!ENTITY torsettings.bridgeHelp1B "VocÃª pode usar o conjunto de endereÃ§os de pontes fornecidas, jÃ¡ configuradas, ou pode obter um conjunto personalizado, usando um desses trÃªs mÃ©todos:">
+<!ENTITY torsettings.bridgeHelp1B "VocÃª pode usar o conjunto de endereÃ§os de pontes fornecido, jÃ¡ prÃ©-configurado, ou  pode obter um conjunto de endereÃ§os personalizados utilizando um dos mÃ©todos indicados abaixo:">
 <!ENTITY torsettings.bridgeHelp2Heading "AtravÃ©s da Web">
 <!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "AtravÃ©s do Email Autoresponder">
diff --git a/src/chrome/locale/pt-BR/progress.dtd b/src/chrome/locale/pt-BR/progress.dtd
index b2f8eb3..1c07b36 100644
--- a/src/chrome/locale/pt-BR/progress.dtd
+++ b/src/chrome/locale/pt-BR/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Status do Tor">
 <!ENTITY torprogress.openSettings "Abrir ConfiguraÃ§Ãµes ">
 <!ENTITY torprogress.heading "Conectando Ã  rede Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexÃ£o com a rede Tor.  Isso pode demorar alguns minutos.">
diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties
index 295770d..ba53e12 100644
--- a/src/chrome/locale/pt-BR/torlauncher.properties
+++ b/src/chrome/locale/pt-BR/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Inicializador do Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S).
 
 torlauncher.unable_to_start_tor=ImpossÃvel iniciar Tor.
 torlauncher.tor_missing=Falta o programa de execuÃ§Ã£o de Tor.
-torlauncher.torrc_missing=Falta o arquivo torrc.
-torlauncher.datadir_missing=O diretÃ³rio de dados de Tor nÃ£o existe.
+torlauncher.torrc_missing=O arquivo torrc estÃ¡ faltando e nÃ£o pÃ´de ser criado.
+torlauncher.datadir_missing=O diretÃ³rio de dados Tor nÃ£o existe e nÃ£o pode ser criado.
 torlauncher.password_hash_missing=Falha ao obter a senha criptografada.
 
 torlauncher.failed_to_get_settings=ImpossÃvel recuperar as configuraÃ§Ãµes de Tor.
@@ -36,6 +36,7 @@ torlauncher.quit_win=Sair
 torlauncher.done=Terminado
 
 torlauncher.forAssistance=Para assistÃªncia, contacte
+torlauncher.forAssistance2=Se vocÃª precisar de assistÃªncia, por favor visite %S
 
 torlauncher.copiedNLogMessages=CÃ³pia concluÃda. As mensagens %S do Tor log estÃ£o prontas para ser copiadas em um editor de texto ou em uma mensagem de e-mail.
 
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index 03dfb80..eb93ba8 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -1,8 +1,8 @@
 <!ENTITY torsettings.dialog.title "ConfiguraÃ§Ãµes da Rede Tor">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Linguagem do Navegador Tor">
-<!ENTITY torlauncher.localePicker.prompt "Por favor seleccione um idioma.">
+<!ENTITY torlauncher.localePicker.title "Idioma do Navegador Tor">
+<!ENTITY torlauncher.localePicker.prompt "Por favor, selecione um idioma.">
 
 <!-- For "first run" wizard: -->
 
@@ -11,16 +11,16 @@
 <!ENTITY torSettings.yes "Sim">
 <!ENTITY torSettings.no "NÃ£o">
 
-<!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situaÃ§Ã£o?">
+<!ENTITY torSettings.firstQuestion "Qual das seguintes frases descreve melhor a sua situaÃ§Ã£o?">
 <!ENTITY torSettings.configurePrompt1 "Esta ligaÃ§Ã£o Ã  Internet deste computador estÃ¡ censurada ou Ã© efetuada via proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar a ponte ou as definiÃ§Ãµes do proxy local  antes de ligar Ã  rede Tor .">
 <!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "Isto irÃ¡ funcionar na maior parte das situaÃ§Ãµes.">
+<!ENTITY torSettings.connectPrompt2 "Eu gostaria de efetuar uma ligaÃ§Ã£o direta Ã  rede Tor.">
+<!ENTITY torSettings.connectPrompt3 "Isto irÃ¡ funcionar na maioria das situaÃ§Ãµes.">
 <!ENTITY torSettings.connect "Ligar">
 
 <!ENTITY torSettings.proxyPageTitle "ConfiguraÃ§Ã£o do Proxy Local">
-<!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder Ã  Internet.">
+<!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder Ã  Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
 <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
@@ -34,11 +34,11 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "A aguardar que o Tor inicie...">
-<!ENTITY torsettings.restartTor "Reiniciar o Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.restartTor "Reiniciar Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigurar">
 
 <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.proceed "Remover DefiniÃ§Ãµes e Ligar">
 
 <!ENTITY torsettings.optional "Opcional">
 
@@ -52,7 +52,7 @@
 <!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 atravessa uma firewall que sÃ³ permite ligaÃ§Ãµes a algumas portas.">
+<!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 meu Provedor de ServiÃ§o da Internet (ISP) bloqueia as ligaÃ§Ãµes Ã  rede Tor">
 <!ENTITY torsettings.useBridges.default "Ligar com as pontes fornecidas">
@@ -64,12 +64,12 @@
 
 <!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Ãrea de TransferÃªncia">
 <!ENTITY torsettings.bridgeHelpTitle "Ajuda da RetransmissÃ£o de Ponte">
-<!ENTITY torsettings.bridgeHelp1 "Se nÃ£o consegue ligar-se Ã  rede Tor, pode ser devido a algum bloqueio do seu provedor de internet (ISP) ou outro intermediÃ¡rio estÃ¡ a bloquear o Tor.  Normalmente, pode contornar este problema usando Tor Bridges, que sÃ£o pontos de passagem nÃ£o listados mais difÃceis de bloquear.">
-<!ENTITY torsettings.bridgeHelp1B "Pode usar o conjunto de bridges prÃ©-configurado fornecido, ou pode obter um conjunto de endereÃ§os personalizados usando um dos trÃªs mÃ©todos:">
+<!ENTITY torsettings.bridgeHelp1 "Se nÃ£o consegue ligar-se Ã  rede Tor, pode ser devido a algum bloqueio do seu Provedor de ServiÃ§o de Internet (ISP) ou outra agÃªncia estÃ¡ a bloquear o Tor.  Frequentemente, pode contornar este problema utilizando Tor Bridges, o qual sÃ£o pontos de passagem nÃ£o listados que sÃ£o mais difÃceis de bloquear.">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "AtravÃ©s da Web">
 <!ENTITY torsettings.bridgeHelp2 "Utilize um navegador da Web para visitar https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "AtravÃ©s do Respondedor AutomÃ¡tico do Correio EletrÃ³nico">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "Enviar mensagem para bridges at torproject.org com a linha 'get bridges' sozinha no corpo da mensagem.  Contudo, para tornar mais difÃcil para os atacantes aprenderem sobre os endereÃ§os de pontes, tem de enviar a mensagem de um dos seguintes fornecedores de serviÃ§os de correio eletrÃ³nico (por esta ordem de preferÃªncia):">
+<!ENTITY torsettings.bridgeHelp3Heading "AtravÃ©s do Respondedor AutomÃ¡tico de Correio EletrÃ³nico">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Envie uma mensagem para bridges at torproject.org com a linha 'get bridges' no corpo da mensagem.  Contudo, para tornar mais difÃcil para um atacante aprender sobre os endereÃ§os de pontes, deve enviar este pedido a partir dos seguintes provedores de serviÃ§os de correio eletrÃ³nico (listados pela ordem de preferÃªncia):">
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com">
 <!ENTITY torsettings.bridgeHelp4Heading "AtravÃ©s do Suporte">
 <!ENTITY torsettings.bridgeHelp4 "Em Ãºltimo caso, pode solicitar os endereÃ§os de ponte, enviando uma mensagem elegante para help at rt.torproject.org.  Por favor, note que uma pessoa irÃ¡ precisar de responder a cada pedido.">
diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties
index 61b4aa9..428995f 100644
--- a/src/chrome/locale/pt/torlauncher.properties
+++ b/src/chrome/locale/pt/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Executor Tor
@@ -13,8 +13,8 @@ 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.
-torlauncher.datadir_missing=A pasta dos dados do Tor nÃ£o existe.
+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=NÃ£o foi possÃvel obter a senha "hashed".
 
 torlauncher.failed_to_get_settings=NÃ£o Ã© possÃvel obter as configuraÃ§Ãµes do Tor\n\n %S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Fechar
 torlauncher.done=ConcluÃdo
 
 torlauncher.forAssistance=Para assistÃªncia, contacte %S
+torlauncher.forAssistance2=For assistance, visit %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.
 
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index 1ab990d..7d6b13d 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Care din urmÄƒtoarele descrie cel mai bine situaÈ›ia dvs?">
 <!ENTITY torSettings.configurePrompt1 "AceastÄƒ conexiune la internet a computerului este cenzuratÄƒ sau prin proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Trebuie sÄƒ configurez setÄƒrile bridge sau proxy locale Ã®nainte de conectarea la reÈ›eaua Tor ">
 <!ENTITY torSettings.configure "ConfiguraÅ£i ">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "AÈ™ dori o conexiune directÄƒ la reÈ›eaua Tor.">
 <!ENTITY torSettings.connectPrompt3 "Aceasta funcÈ›ioneazÄƒ Ã®n cele mai multe situaÈ›ii.">
 <!ENTITY torSettings.connect "Conectare">
 
 <!ENTITY torSettings.proxyPageTitle "Configurare Proxy local">
 <!ENTITY torSettings.proxyQuestion "Are nevoie acest computer sÄƒ utilizeze un proxy local pentru accesarea internetului?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "ÃŽn cele mai multe cazuri un proxy local nu este necesar dar poate fi necesarÄƒ atunci cÃ¢nd conectarea se face printr-o reÈ›ea a unei firme, È™coli sau universitÄƒÈ›i.">
+<!ENTITY torSettings.proxyExplanation2 "DacÄƒ nu sunteÈ›i sigur cum sÄƒ rÄƒspundeÈ›i la aceastÄƒ Ã®ntrebare uitaÈ™i-vÄƒ la setÄƒrile de internet Ã®n alt browser sau verificaÈ›i setÄƒrile de reÈ›ea ale sistemului dvs. pentru a vedea dacÄƒ este nevoie de un proxy local.">
 <!ENTITY torSettings.enterProxy "IntroduceÅ£i setÄƒrile pentru proxy .">
 <!ENTITY torSettings.bridgePageTitle "Configurare PunÈ›i Tor ">
 <!ENTITY torSettings.bridgeQuestion "Internet Service Providerul (ISP) dvs blocheazÄƒ sau cenzureazÄƒ conexiunile cÄƒtre reÈ›eaua Tor?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "DacÄƒ nu sunteÈ›i sigur cum sÄƒ rÄƒspundeÈ›i la aceastÄƒ Ã®ntrebare, alegeÈ›i Nu (dacÄƒ nu vÄƒ puteÈ›i conecta la reÈ›eaua Tor fÄƒrÄƒ un bridge, puteÈ›i adÄƒuga unul mai tÃ¢rziu).">
+<!ENTITY torSettings.bridgeExplanation2 "DacÄƒ alegeÈ›i Da vi se va cere sÄƒ configuraÈ›i Tor Bridges, care sunt relee nelistate ce fac mai dificilÄƒ blocarea conexiunilor la ReÈ›eaua Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "PuteÈ›i folosi setul de punÈ›i oferit sau puteÈ›i obÈ›ine È™i introduce un set particular de punÈ›i.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "AÈ™tept Tor sÄƒ porneascÄƒ...">
 <!ENTITY torsettings.restartTor "ReporneÈ™te Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Reconfigurare">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "AÈ›i configurat bridge-uri Tor sau aÈ›i introdus setÄƒri proxu locale.  Pentru a face o conexiune directÄƒ la reÈ›eaua Tor aceste setÄƒri trebuiesc eliminate.">
+<!ENTITY torsettings.discardSettings.proceed "EliminaÈ›i SetÄƒri È™i Conectare">
 
 <!ENTITY torsettings.optional "OpÈ›ional">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Porturi permise:">
 <!ENTITY torsettings.useBridges.checkbox "Internet Service Providerul (ISP) meu blocheazÄƒ conexiunile cÄƒtre reÈ›eaua Tor">
 <!ENTITY torsettings.useBridges.default "ConectaÈ›i-vÄƒ punÈ›ile oferite">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Fiecare tip de bridge foloseÈ™te o metodÄƒ diferitÄƒ de a evita cenzura.  DacÄƒ un bridge nu funcÈ›ioneazÄƒ, Ã®ncercaÈ›i sÄƒ folosiÈ›i unul diferit.">
 <!ENTITY torsettings.useBridges.type "Tip de transport:">
 <!ENTITY torsettings.useBridges.custom "IntroduceÈ›i punÈ›i personalizate">
 <!ENTITY torsettings.useBridges.label "IntroduceÈ›i una sau mai multe bridge relays (una pe linie).">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "CopiaÈ›i jurnalul Tor Ã®n Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Ajutor Bridge Relay">
 <!ENTITY torsettings.bridgeHelp1 "DacÄƒ nu puteÈ›i sÄƒ vÄƒ conectaÈ›i la reÈ›eaua tor, poate sÄƒ fie din cauzÄƒ cÄƒ Internet Service Providerul (ISP) sau altÄƒ agenÈ›ie blocheazÄƒ Tor.  Des, puteÈ›i ocoli aceastÄƒ problemÄƒ folosind Tor Bridges, care sÃ®nt relayuri nelistate, mai dificil de blocat.">
-<!ENTITY torsettings.bridgeHelp1B "PuteÈ›i folosi setul de adrese de punÈ›i preconfigurate oferite sau puteÈ›i obÈ›ine un set personalizat de adrese folosind una din aceste trei metode:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Prin Web">
 <!ENTITY torsettings.bridgeHelp2 "FolosiÈ›i un webbrowser pentru a vizita https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Prin email automat">
diff --git a/src/chrome/locale/ro/progress.dtd b/src/chrome/locale/ro/progress.dtd
index bda4ccc..9efa695 100644
--- a/src/chrome/locale/ro/progress.dtd
+++ b/src/chrome/locale/ro/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Stare Tor">
 <!ENTITY torprogress.openSettings "SetÄƒri">
 <!ENTITY torprogress.heading "Conctare la reÅ£eaua Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "VÄƒ rugÄƒm aÈ™teptaÈ›i Ã®n timp ce stabilim o conexiune la reÈ›eaua Tor.  Acest proces poate dura cÃ¢teva minute.">
diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties
index 9d0257b..ec9c4f5 100644
--- a/src/chrome/locale/ro/torlauncher.properties
+++ b/src/chrome/locale/ro/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Lansator Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S eÈ™ec (%2$S).
 
 torlauncher.unable_to_start_tor=Tor nu poate porni.
 torlauncher.tor_missing=FiÈ™ierul executabil Tor lipseÈ™te.
-torlauncher.torrc_missing=FiÈ™ierul torrc lipseÈ™te
-torlauncher.datadir_missing=Tor data directory nu existÄƒ.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=EÈ™ec parole hashed.
 
 torlauncher.failed_to_get_settings=Nu pot obÈ›ine Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=IeÅŸire
 torlauncher.done=Gata
 
 torlauncher.forAssistance=Pentru asistenÈ›Äƒ, contactaÈ›i
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copiere efectuatÄƒ. %S Mesajele de log Tor sunt gata pentru a fi lipite Ã®ntr-un editor de text sau un mesaj e-mail.
 
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index fbf9702..9bb3be7 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ð§Ñ‚Ð¾ Ð»ÑƒÑ‡ÑˆÐµ Ð¾Ð¿Ð¸ÑÑ‹Ð²Ð°ÐµÑ‚ Ð²Ð°ÑˆÑƒ ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸ÑŽ?">
 <!ENTITY torSettings.configurePrompt1 "Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ ÑÑ‚Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð° Ñ†ÐµÐ½Ð·ÑƒÑ€Ð¸Ñ€ÑƒÐµÑ‚ÑÑ Ð¸Ð»Ð¸ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð·Ð° Ð¿Ñ€Ð¾ÐºÑÐ¸.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¼Ð¾ÑÑ‚Ð° Ð¸Ð»Ð¸ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿Ñ€Ð¾ÐºÑÐ¸, Ð¿Ñ€ÐµÐ¶Ð´Ðµ Ñ‡ÐµÐ¼ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ðº ÑÐµÑ‚Ð¸ Tor. ">
 <!ENTITY torSettings.configure "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Ð¯ Ñ…Ð¾Ñ‡Ñƒ Ð½Ð°Ð¿Ñ€ÑÐ¼ÑƒÑŽ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº ÑÐµÑ‚Ð¸ Tor.">
 <!ENTITY torSettings.connectPrompt3 "ÐÑ‚Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ Ð² Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ð¹.">
 <!ENTITY torSettings.connect "Ð¡Ð¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ">
 
 <!ENTITY torSettings.proxyPageTitle "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸">
 <!ENTITY torSettings.proxyQuestion "Ð¢Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð»Ð¸ ÑÑ‚Ð¾Ð¼Ñƒ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñƒ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð´Ð»Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ðº Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "Ð’ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ ÑÐ»ÑƒÑ‡Ð°ÐµÐ² Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð½Ðµ Ð½ÑƒÐ¶ÐµÐ½, Ð½Ð¾ Ð¾Ð½ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ñ‡ÐµÑ€ÐµÐ· ÑÐµÑ‚ÑŒ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ð¸, ÑˆÐºÐ¾Ð»Ñ‹ Ð¸Ð»Ð¸ ÑƒÐ½Ð¸Ð²ÐµÑ€ÑÐ¸Ñ‚ÐµÑ‚Ð°.">
+<!ENTITY torSettings.proxyExplanation2 "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚Ðµ, ÐºÐ°Ðº Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ Ð½Ð° ÑÑ‚Ð¾Ñ‚ Ð²Ð¾Ð¿Ñ€Ð¾Ñ, Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð° Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð° Ð¸Ð»Ð¸ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑÐ²Ð¾ÐµÐ¹ ÑÐµÑ‚Ð¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ, Ð½ÑƒÐ¶ÐµÐ½ Ð»Ð¸ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿Ñ€Ð¾ÐºÑÐ¸.">
 <!ENTITY torSettings.enterProxy "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ñ€Ð¾ÐºÑÐ¸.">
 <!ENTITY torSettings.bridgePageTitle "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑˆÐ»ÑŽÐ·Ð¾Ð² Tor">
 <!ENTITY torSettings.bridgeQuestion "Ð’Ð°Ñˆ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ (ISP) Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÑ‚ Ð¸Ð»Ð¸ ÐºÐ°Ðº-Ð»Ð¸Ð±Ð¾ Ñ†ÐµÐ½Ð·ÑƒÑ€Ð¸Ñ€ÑƒÐµÑ‚ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ÑÐµÑ‚Ð¸ Tor?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚Ðµ, ÐºÐ°Ðº Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ Ð½Ð° Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð²Ð¾Ð¿Ñ€Ð¾Ñ, Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ "ÐÐµÑ‚" (ÐµÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº ÑÐµÑ‚Ð¸ Tor, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð·Ð¶Ðµ).">
+<!ENTITY torSettings.bridgeExplanation2 "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð²Ñ‹Ð±ÐµÑ€ÐµÑ‚Ðµ "Ð”Ð°", Ð’Ð°Ð¼ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Tor Ð¼Ð¾ÑÑ‚Ñ‹, Ñ‡Ñ‚Ð¾ ÑƒÑÐ»Ð¾Ð¶Ð½ÑÐµÑ‚ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÑƒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ÑÐµÑ‚Ð¸ Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€ÐµÐ´Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ Ð½Ð°Ð±Ð¾Ñ€ Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð¸Ð»Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¸ Ð²Ð²ÐµÑÑ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "ÐžÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ Ð·Ð°Ð¿ÑƒÑÐºÐ° Tor...">
 <!ENTITY torsettings.restartTor "ÐŸÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Ð’Ñ‹ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ð»Ð¸ Tor Ð¼Ð¾ÑÑ‚Ñ‹ Ð¸Ð»Ð¸ Ð²Ð²ÐµÐ»Ð¸ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ñ€Ð¾ÐºÑÐ¸-ÑÐµÑ€Ð²ÐµÑ€Ð°.  Ð”Ð»Ñ Ð¿Ñ€ÑÐ¼Ð¾Ð³Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ÑÐµÑ‚Ð¸ Tor ÑÑ‚Ð¸ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ´Ð°Ð»ÐµÐ½Ñ‹.">
+<!ENTITY torsettings.discardSettings.proceed "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ">
 
 <!ENTITY torsettings.optional "ÐÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð½Ñ‹Ðµ Ð¿Ð¾Ñ€Ñ‚Ñ‹:">
 <!ENTITY torsettings.useBridges.checkbox "ÐœÐ¾Ð¹ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑÐµÑ‚Ð¸ Tor">
 <!ENTITY torsettings.useBridges.default "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº Ð¿Ñ€ÐµÐ´Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼ Ð¼Ð¾ÑÑ‚Ð°Ð¼">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "ÐšÐ°Ð¶Ð´Ñ‹Ð¹ Ñ‚Ð¸Ð¿ Ð¼Ð¾ÑÑ‚Ð° Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ ÑÐ¿Ð¾ÑÐ¾Ð±Ñ‹ Ð¸Ð·Ð±ÐµÐ¶Ð°Ð½Ð¸Ñ Ñ†ÐµÐ½Ð·ÑƒÑ€Ñ‹.  Ð•ÑÐ»Ð¸ Ð¼Ð¾ÑÑ‚ Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚, Ð¿Ð¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ ÐµÑ‰Ðµ Ñ€Ð°Ð·, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð´Ñ€ÑƒÐ³Ð¾Ð¹.">
 <!ENTITY torsettings.useBridges.type "Ð¢Ð¸Ð¿ Ñ‚Ñ€Ð°Ð½ÑÐ¿Ð¾Ñ€Ñ‚Ð°:">
 <!ENTITY torsettings.useBridges.custom "Ð’Ð²ÐµÑÑ‚Ð¸ Ð¼Ð¾ÑÑ‚Ñ‹ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ">
 <!ENTITY torsettings.useBridges.label "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¾Ð´Ð¸Ð½ Ð¸Ð»Ð¸ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð¾Ð² Ñ‚Ð¸Ð¿Ð° Ð¼Ð¾ÑÑ‚ (Ð¾Ð´Ð¸Ð½ Ð½Ð° ÑÑ‚Ñ€Ð¾ÐºÑƒ)">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Ð¡ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¶ÑƒÑ€Ð½Ð°Ð» Tor Ð² Ð±ÑƒÑ„ÐµÑ€ Ð¾Ð±Ð¼ÐµÐ½Ð°">
 <!ENTITY torsettings.bridgeHelpTitle "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ Ð¿Ð¾ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð°Ð¼ Ñ‚Ð¸Ð¿Ð° Ð¼Ð¾ÑÑ‚">
 <!ENTITY torsettings.bridgeHelp1 "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº ÑÐµÑ‚Ð¸ Tor, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²Ð°Ñˆ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ (ISP) Ð¸Ð»Ð¸ Ð¸Ð½Ð°Ñ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÑ‚ Tor.  Ð§Ð°ÑÑ‚Ð¾ ÑÑ‚Ñƒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±Ð¾Ð¹Ñ‚Ð¸ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ Ð¼Ð¾ÑÑ‚Ð¾Ð² Tor, Ð½Ðµ Ð¿ÐµÑ€ÐµÑ‡Ð¸ÑÐ»ÐµÐ½Ð½Ñ‹Ñ… Ð² Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… ÑÐ¿Ð¸ÑÐºÐ°Ñ…, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ ÑÐ»Ð¾Ð¶Ð½ÐµÐµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ.">
-<!ENTITY torsettings.bridgeHelp1B "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ð¹ Ð¿Ñ€ÐµÐ´Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ Ð½Ð°Ð±Ð¾Ñ€ Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð¸Ð»Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¸ Ð²Ð²ÐµÑÑ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· ÑÑ‚Ð¸Ñ… Ñ‚Ñ€Ñ‘Ñ… Ð¼ÐµÑ‚Ð¾Ð´Ð¾Ð²:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Ð˜Ð· Ð’ÐµÐ±">
 <!ENTITY torsettings.bridgeHelp2 "ÐžÑ‚ÐºÑ€Ð¾Ð¹Ñ‚Ðµ Ð² Ð²ÐµÐ±-Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ðµ https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Ð§ÐµÑ€ÐµÐ· Ð°Ð²Ñ‚Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ‡Ð¸Ðº ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹">
diff --git a/src/chrome/locale/ru/progress.dtd b/src/chrome/locale/ru/progress.dtd
index aa09819..7d7ae9d 100644
--- a/src/chrome/locale/ru/progress.dtd
+++ b/src/chrome/locale/ru/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Tor">
 <!ENTITY torprogress.openSettings "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸">
 <!ENTITY torprogress.heading "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ðº ÑÐµÑ‚Ð¸ Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ, Ð¿Ð¾ÐºÐ° Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ð¼ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ðº ÑÐµÑ‚Ð¸ Tor.  ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¼Ð¸Ð½ÑƒÑ‚.">
diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties
index 0b68b18..f224679 100644
--- a/src/chrome/locale/ru/torlauncher.properties
+++ b/src/chrome/locale/ru/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Ð—Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº Tor
@@ -13,8 +13,8 @@ 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.torrc_missing=torrc Ñ„Ð°Ð¹Ð» Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑÐ¾Ð·Ð´Ð°Ð½.
+torlauncher.datadir_missing=Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… Tor Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑÐ¾Ð·Ð´Ð°Ð½Ð°.
 torlauncher.password_hash_missing=ÐÐµ ÑƒÐ´Ð°Ñ‘Ñ‚ÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ñ…ÑÑˆÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ.
 
 torlauncher.failed_to_get_settings=ÐÐµ ÑƒÐ´Ð°Ñ‘Ñ‚ÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ð’Ñ‹Ñ…Ð¾Ð´
 torlauncher.done=Ð“Ð¾Ñ‚Ð¾Ð²Ð¾
 
 torlauncher.forAssistance=Ð”Ð»Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ ÑÐ²ÑÐ¶Ð¸Ñ‚ÐµÑÑŒ Ñ %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾. %S ÑÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ Ñ Ð»Ð¾Ð³Ð°Ð¼Ð¸ Tor Ð½Ð°Ñ…Ð¾Ð´ÑÑ‚ÑÑ Ð² Ð±ÑƒÑ„ÐµÑ€Ðµ Ð¾Ð±Ð¼ÐµÐ½Ð° Ð¸ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ñ‹ Ð² Ñ‚ÐµÐºÑÑ‚Ð¾Ð²Ñ‹Ð¹ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¾Ñ€ Ð¸Ð»Ð¸ email.
 
diff --git a/src/chrome/locale/ru at petr1708/network-settings.dtd b/src/chrome/locale/ru at petr1708/network-settings.dtd
index 9987337..5eae3c6 100644
--- a/src/chrome/locale/ru at petr1708/network-settings.dtd
+++ b/src/chrome/locale/ru at petr1708/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ru at petr1708/torlauncher.properties b/src/chrome/locale/ru at petr1708/torlauncher.properties
index 77dc4e7..ea2d497 100644
--- a/src/chrome/locale/ru at petr1708/torlauncher.properties
+++ b/src/chrome/locale/ru at petr1708/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/sco/network-settings.dtd
+++ b/src/chrome/locale/sco/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties
index 02be756..d3f03d2 100644
--- a/src/chrome/locale/sco/torlauncher.properties
+++ b/src/chrome/locale/sco/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges.
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(recommendit)
 
 torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd
index d5c5fb1..11e3069 100644
--- a/src/chrome/locale/si-LK/network-settings.dtd
+++ b/src/chrome/locale/si-LK/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Clipboard à¶‘à¶šà¶§ Tor à¶½à·œà¶œà¶º à¶´à·’à¶§à¶´à¶à·Š à¶šà¶»à¶±à·Šà¶±.">
 <!ENTITY torsettings.bridgeHelpTitle "à·ƒà·šà¶à·” à¶´à·Šâ€à¶»à¶à·’à¶ºà·à¶¢à¶š (Bridge Relay) à¶‹à¶´à¶šà·à¶»à¶šà¶º">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si-LK/torlauncher.properties
index a132cff..c161501 100644
--- a/src/chrome/locale/si-LK/torlauncher.properties
+++ b/src/chrome/locale/si-LK/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor à¶´à·”à¶»à¶±à¶º
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Tor à¶†à¶»à¶¸à·Šà¶· à¶šà·’à¶»à·“à¶¸à¶§ à¶±à·œà·„à·à¶š.\n\n%S
 torlauncher.tor_missing=Tor à·€à·’à¶°à·à¶±à¶º à¶…à·ƒà·Šà¶®à·à¶±à¶œà¶ à·€à·“ à¶‡à¶.
-torlauncher.torrc_missing=torrc à¶œà·œà¶±à·”à·€ à¶…à·ƒà·Šà¶®à·à¶±à¶œà¶ à·€à·“ à¶‡à¶.
-torlauncher.datadir_missing=Tor à¶¯à¶à·Šà¶ à¶±à·à¶¸à·à·€à¶½à·’à¶º à¶±à·œà¶´à·€à¶à·“.
+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=à¶´à·”à¶»à¶«à¶º à¶šà¶»à¶±à¶½à¶¯ à¶¸à·”à¶»à¶´à¶¯à¶º à¶½à¶¶à·à¶œà·à¶±à·“à¶¸à¶§ à¶…à¶´à·œà·„à·œà·ƒà¶à·Šà¶º.
 
 torlauncher.failed_to_get_settings=Tor à·ƒà·’à¶§à·”à·€à¶¸à·Š à·ƒà·œà¶ºà· à¶½à¶¶à·à¶œà·à¶±à·“à¶¸à¶§ à¶…à¶´à·œà·„à·œà·ƒà¶à·Šà¶º.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=à¶”à¶¶ à·€à·’à·ƒà·’à¶±à·Š à·ƒà·šà¶à·” à¶‘à¶š
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(à¶±à·’à¶»à·Šà¶¯à·šà·à·’à¶)
 
 torlauncher.connect=à·ƒà¶¸à·Šà¶¶à¶±à·Šà¶° à·€à·™à¶±à·Šà¶±
 torlauncher.restart_tor=Restart Tor
@@ -36,6 +36,7 @@ torlauncher.quit_win=à¶…à¶ºà·’à¶±à·Š à·€à¶±à·Šà¶±
 torlauncher.done=à¶šà¶»à¶± à¶½à¶¯à·“
 
 torlauncher.forAssistance=à·ƒà·„à¶º à·ƒà¶¯à·„à·, à·ƒà¶¸à·Šà¶¶à¶±à·Šà¶° à·€à¶±à·Šà¶±%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.
 
diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd
index 81deede..8de7563 100644
--- a/src/chrome/locale/sk-SK/network-settings.dtd
+++ b/src/chrome/locale/sk-SK/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "KopÃrovaÅ¥ log Toru do schrÃ¡nky">
 <!ENTITY torsettings.bridgeHelpTitle "PomocnÃk pre premostenia relÃ©">
 <!ENTITY torsettings.bridgeHelp1 "Ak nie ste schopnÃ sa pripojiÅ¥ do siete Tor, je moÅ¾nÃ©, Å¾e vÃ¡Å¡ poskytovateÄ¾ internetovÃ©ho pripojenia (ISP) alebo inÃ½ sprÃ¡vny orgÃ¡n blokuje Tor.  VÃ¤ÄÅ¡inou je moÅ¾nÃ© tento problÃ©m obÃsÅ¥ pouÅ¾itÃm Tor Bridges, Äo sÃº nikde nezapÃsanÃ© relÃ©, ktorÃ© je obtiaÅ¾ne blokovaÅ¥.">
-<!ENTITY torsettings.bridgeHelp1B "MÃ´Å¾ete pouÅ¾iÅ¥ prednastavenÃº, dodanÃº sadu adries premostenia alebo si mÃ´Å¾ete zaobstaraÅ¥ vlastnÃº sadu adries pomocou jednÃ©ho z troch nasledujÃºcich spÃ´sobov:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "NavÅ¡tÃvte https://bridges.torproject.org pomocou webovÃ©ho prehliadaÄa">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties
index 63c1b2c..c848a52 100644
--- a/src/chrome/locale/sk-SK/torlauncher.properties
+++ b/src/chrome/locale/sk-SK/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S zlyhanÃ½ch (%2$S).
 
 torlauncher.unable_to_start_tor=Nie je moÅ¾nÃ© spustiÅ¥ Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=Torrc sÃºbor chÃ½ba.
-torlauncher.datadir_missing=Data adresÃ¡r pre Tor neexistuje.
+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=Nebolo moÅ¾nÃ© prevziaÅ¥ zaÅ¡ifrovanÃ© heslo.
 
 torlauncher.failed_to_get_settings=Nepodarilo sa zÃskaÅ¥ Tor nastavenia.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=UkonÄiÅ¥
 torlauncher.done=Hotovo
 
 torlauncher.forAssistance=Pre pomoc konaktujte %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.
 
diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd
index 5826392..f86e26a 100644
--- a/src/chrome/locale/sk/network-settings.dtd
+++ b/src/chrome/locale/sk/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "SkopÃrovaÅ¥ zÃ¡znam Tor do schrÃ¡nky clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "NÃ¡poveda o relÃ© premosteniach">
 <!ENTITY torsettings.bridgeHelp1 "Ak nie ste schopnÃ½ sa pripojiÅ¥ k sieti Toru, je moÅ¾nÃ©, Å¾e vÃ¡s blokuje vÃ¡Å¡ PoskytovateÄ¾ InternetÃº (ISP) alebo nejakÃ© inÃ¡ agentÃºra.   Tento problÃ©m mÃ´Å¾ete Äasto obÃsÅ¥ pouÅ¾ivanÃm Mostov Toru, Äo sÃº nezaradenÃ© relÃ© nÃ¡roÄnejÅ¡ie na blokovanie.">
-<!ENTITY torsettings.bridgeHelp1B "MÃ´Å¾ete pouÅ¾iÅ¥ prekonfigurovanÃº poskytnutÃº sadu mostovÃ½ch adries alebo vloÅ¾iÅ¥ vlastnÃº sadu adries pouÅ¾itÃm jednej z nasledujÃºcich metÃ³d:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Cez Web">
 <!ENTITY torsettings.bridgeHelp2 "PouÅ¾ite webovÃ½ prehliadaÄ na navÅ¡tÃvenie https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Cez Email Autoresponder">
diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties
index 17de31a..e9012e2 100644
--- a/src/chrome/locale/sk/torlauncher.properties
+++ b/src/chrome/locale/sk/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=SpÃºÅ¡Å¥aÄ Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S zlyhalo (%2$S).
 
 torlauncher.unable_to_start_tor=Nie je moÅ¾nÃ© spustiÅ¥ Tor.\n\n%S
 torlauncher.tor_missing=SpustiteÄ¾nÃ½ sÃºbor programu Tor chÃ½ba.
-torlauncher.torrc_missing=SÃºbor torrc chÃ½ba.
-torlauncher.datadir_missing=DÃ¡tovÃ½ prieÄinok Tor neexistuje.
+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=Nepodarilo sa zÃskaÅ¥ zabezpeÄenÃ© heslo.
 
 torlauncher.failed_to_get_settings=Nie je moÅ¾nÃ© prijaÅ¥ nastavenia Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=UkonÄiÅ¥
 torlauncher.done=Hotovo
 
 torlauncher.forAssistance=Pre podporu kontaktujte %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopirovanie ukonÄenÃ©. %S Tor log sprÃ¡vy je pripravenÃ© na prilepenie do textovÃ©ho editora alebo emailovej sprÃ¡vy.
 
diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd
index a5b4388..6ddb6e3 100644
--- a/src/chrome/locale/sl-SI/network-settings.dtd
+++ b/src/chrome/locale/sl-SI/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Kopirajte Tor poroÄilo v odloÅ¾iÅ¡Äe">
 <!ENTITY torsettings.bridgeHelpTitle "PomoÄ premostitveno vozliÅ¡Äe">
 <!ENTITY torsettings.bridgeHelp1 "ÄŒe se ne morete povezati v omreÅ¾je Tor, je mogoÄe, da vaÅ¡ ponudnik internetnih storitev (ISP) ali druga agencija blokira Tor.  Pogosto lahko to obidete s pomoÄjo Tor premostitvijo, na nenaÅ¡teta vozliÅ¡Äa, za teÅ¾je blokiranje.">
-<!ENTITY torsettings.bridgeHelp1B "Uporabite lahko Å¾e prednastavljen, ponujen niz premostitvenih naslovov ali pa lahko pridobite obiÄajen set naslovov z uporabo enega od treh naÄinov:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Preko Web">
 <!ENTITY torsettings.bridgeHelp2 "Uporabite web brskalnik za obisk https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Preko poÅ¡tnega avtomatskega odzivnika">
diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties
index e083df9..758b79b 100644
--- a/src/chrome/locale/sl-SI/torlauncher.properties
+++ b/src/chrome/locale/sl-SI/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor zaganjalnik
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neuspeÅ¡no (%2$S).
 
 torlauncher.unable_to_start_tor=NemogoÄe zagnati Tor,\n\n%S
 torlauncher.tor_missing=Tor zagonska manjka.
-torlauncher.torrc_missing=Torrc datoteka manjka.
-torlauncher.datadir_missing=Tor imenik podatkov ne obstoja.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Neuspelo pridobivanje hash gesla.
 
 torlauncher.failed_to_get_settings=Ni moÄ pridobiti nastavitve Tor,\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Izhod
 torlauncher.done=Narejeno
 
 torlauncher.forAssistance=Za podporo, stik %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopiranje konÄano. % S Tor poroÄila so pripravljena za lepljenje v urejevalnik besedil ali e-poÅ¡tno sporoÄilo.
 
diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd
index 73ef092..b7c53c2 100644
--- a/src/chrome/locale/sl/network-settings.dtd
+++ b/src/chrome/locale/sl/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties
index c1f7981..263016d 100644
--- a/src/chrome/locale/sl/torlauncher.properties
+++ b/src/chrome/locale/sl/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor zaganjalnik
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Tor se ne zaÅ¾ene.\n\n%S
 torlauncher.tor_missing=Manjka Torjeva izvrÅ¡ljiva datoteka.
-torlauncher.torrc_missing=Manjka datoteka torrc.
-torlauncher.datadir_missing=Torjev podatkovni imenik ne obstaja.
+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=Spodletelo pridobivanje zgoÅ¡Äene vrednosti gesla.
 
 torlauncher.failed_to_get_settings=Ni uspela pridobitev Tor nastavitev.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Morate doloÄiti vsaj en ali veÄ mostov.
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(priporoÄeno)
 
 torlauncher.connect=PoveÅ¾i
 torlauncher.restart_tor=Restart Tor
@@ -36,6 +36,7 @@ torlauncher.quit_win=Izhod
 torlauncher.done=KonÄano
 
 torlauncher.forAssistance=Za pomoÄ, vzpostavite stik z %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.
 
diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/sn/network-settings.dtd
+++ b/src/chrome/locale/sn/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties
index 6e5b1e9..eb1b275 100644
--- a/src/chrome/locale/sn/torlauncher.properties
+++ b/src/chrome/locale/sn/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Buda
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
 
diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/so/network-settings.dtd
+++ b/src/chrome/locale/so/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/so/torlauncher.properties
+++ b/src/chrome/locale/so/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/son/network-settings.dtd
+++ b/src/chrome/locale/son/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/son/torlauncher.properties b/src/chrome/locale/son/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/son/torlauncher.properties
+++ b/src/chrome/locale/son/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd
index 228d865..ffa38c1 100644
--- a/src/chrome/locale/sq/network-settings.dtd
+++ b/src/chrome/locale/sq/network-settings.dtd
@@ -1,8 +1,8 @@
 <!ENTITY torsettings.dialog.title "Konfigurimi i Rrjetit tÃ« Tor">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Gjuha e Tor Browser">
+<!ENTITY torlauncher.localePicker.prompt "Ju lutemi zgjidhni njÃ« gjuhÃ«.">
 
 <!-- For "first run" wizard: -->
 
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Cila nga kÃ«to e pÃ«rshkruan mÃ« mirÃ« situatÃ«n tuaj tÃ« tanishme?">
 <!ENTITY torSettings.configurePrompt1 "Lidhja e Internetit tÃ« kÃ«tij kompjuteri Ã«shtÃ« e censuruar ose me proxy">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "MÃ« duhet tÃ« konfigurojÃ« urÃ«n ose proxy-n lokal, pÃ«rpara se tÃ« lidhem tek rrjeti Tor.">
 <!ENTITY torSettings.configure "Konfiguroni">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Do pÃ«lqeja tÃ« bÃ«ja njÃ« lidhje tÃ« drejtpÃ«rdrejtÃ« tek rrjeti i Tor.">
 <!ENTITY torSettings.connectPrompt3 "Kjo do tÃ« funksionojÃ« nÃ« shumÃ« situata.">
 <!ENTITY torSettings.connect "Lidhuni">
 
 <!ENTITY torSettings.proxyPageTitle "Konfigurimi i Proxy-t Lokal  ">
 <!ENTITY torSettings.proxyQuestion "A i nevojitet kÃ«tij kompjuteri qÃ« tÃ« pÃ«rdorÃ« njÃ« proxy lokal, pÃ«r t'u qasur nÃ« Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "NÃ« shumÃ« raste, njÃ« proxy lokal nuk nevojitet, por ai mund tÃ« kÃ«rkohet kur lidhesh pÃ«rmes njÃ« rrejti kompanie, shkolle, ose universiteti.">
+<!ENTITY torSettings.proxyExplanation2 "NÃ«se s'jeni i sigurt sesi t'i pÃ«rgjigjeni kÃ«saj pyetje, shikoni tek konfigurimi i Internetit nÃ« njÃ« tjetÃ«r shfletues, ose kontrolloni konfigurimin e rrjetit, pÃ«r tÃ« parÃ« nÃ«se nevojitet njÃ« proxy lokal.">
 <!ENTITY torSettings.enterProxy "Futni konfigurimin e proxy-t.">
 <!ENTITY torSettings.bridgePageTitle "Konfigurimi i Urave tÃ« Tor">
 <!ENTITY torSettings.bridgeQuestion "A i pengon ose censuron lidhjet pÃ«r tek Rrjeti Tor, Ofruesi juaj i ShÃ«rbimit Internet (ISP)?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "NÃ«se s'jeni i sigurt sesi t'i pÃ«rgjigjeni kÃ«saj pyetje, zgjidhni "Jo" (nÃ«se e keni tÃ« pamundur qÃ« tÃ« lidheni me rrjetin Tor pa pasur njÃ« urÃ«, mund ta shtoni njÃ« mÃ« vonÃ«).">
+<!ENTITY torSettings.bridgeExplanation2 "NÃ«se pÃ«rzgjidhni "Po", do t'ju kÃ«rkohet tÃ« konfiguroni Tor bridges, tÃ« cilat janÃ« rele tÃ« palistuara, qÃ« e bÃ«jnÃ« mÃ« tÃ« vÃ«shtirÃ« pengimin e lidhjeve pÃ«r tek Rrjeti Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Ju mund tÃ« pÃ«rdorni grupin e dhÃ«nÃ« tÃ« urave, ose mund tÃ« pÃ«rftoni dhe futni njÃ« sasi tÃ« personalizuar urash.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Duke pritur qÃ« Tor tÃ« nisÃ«...">
 <!ENTITY torsettings.restartTor "Riniseni Tor-in">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Rikonfiguroni">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Ju keni konfiguruar urat Tor ose keni futur konfigurimin e proxy-t.  PÃ«r tÃ« bÃ«rÃ« njÃ« lidhje tÃ« drejtpÃ«rdrejtÃ« tek rrjeti Tor, ky konfigurim duhet tÃ« hiqet.">
+<!ENTITY torsettings.discardSettings.proceed "Hiqeni Konfigurimin dhe Lidhuni">
 
 <!ENTITY torsettings.optional "Me zgjedhje">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara:">
 <!ENTITY torsettings.useBridges.checkbox "Ofruesi im i ShÃ«rbimit tÃ« Internetit (ISP) pengon lidhjet drejt rrjetit Tor">
 <!ENTITY torsettings.useBridges.default "Lidhuni me urat e ofruara">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Ã‡do lloj ure pÃ«rdor njÃ« mÃ«nyrÃ« tÃ« ndryshme pÃ«r tÃ« shmangur censurÃ«n.  NÃ«se njÃ«ra urÃ« nuk punon, provoni sÃ«rish duke pÃ«rdorur njÃ« tjetÃ«r.">
 <!ENTITY torsettings.useBridges.type "Lloji i Transportit:">
 <!ENTITY torsettings.useBridges.custom "Futini urat e pÃ«rshtatura">
 <!ENTITY torsettings.useBridges.label "Futni njÃ« ose mÃ« shumÃ« rele urÃ« (njÃ« pÃ«r rresht)">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Kopjojeni Regjistrin e Tor nÃ« KujtesÃ«n e fragmenteve">
 <!ENTITY torsettings.bridgeHelpTitle "Ndihma mbi RelenÃ« e UrÃ«">
 <!ENTITY torsettings.bridgeHelp1 "NÃ«se s'mundeni tÃ« lidheni me rrjetin Tor, mund tÃ« jetÃ« sepse Ofruesi juaj i ShÃ«rbimit tÃ« Internetit (ISP), ose ndonjÃ« agjenci tjetÃ«r po pengojnÃ« Tor.  Shpesh, ju mund ta shmangni kÃ«tÃ« problem, duke pÃ«rdorur urat e Tor, tÃ« cilat janÃ« rele tÃ« palistuara, qÃ« janÃ« shumÃ« mÃ« tÃ« vÃ«shtira pÃ«r t'u penguar.">
-<!ENTITY torsettings.bridgeHelp1B "Ju mund tÃ« pÃ«rdorni grupin e ofruar e tÃ« parakonfiguruar tÃ« adresave ura, ose mund tÃ« pÃ«rftoni njÃ« grup adresash tÃ« pÃ«rshtatura, duke pÃ«rdorur njÃ« nga kÃ«to tre metoda:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "PÃ«rmes Web-it">
 <!ENTITY torsettings.bridgeHelp2 "PÃ«rdorni njÃ« shfletues web-i qÃ« tÃ« vizitoni https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "PÃ«rmes VetÃ«pÃ«rgjigjes se E-postÃ«s">
diff --git a/src/chrome/locale/sq/progress.dtd b/src/chrome/locale/sq/progress.dtd
index 167ecd2..f680a4c 100644
--- a/src/chrome/locale/sq/progress.dtd
+++ b/src/chrome/locale/sq/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Gjendja e Tor">
 <!ENTITY torprogress.openSettings "Hapeni Konfigurimin">
 <!ENTITY torprogress.heading "Duke u lidhur me rrjetin Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa tÃ« vendosim njÃ« lidhje me rrjetin e Tor.  Kjo mund tÃ« kÃ«rkojÃ« disa minuta.">
diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties
index b32ee99..e22bff7 100644
--- a/src/chrome/locale/sq/torlauncher.properties
+++ b/src/chrome/locale/sq/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=LÃ«shuesi Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S dÃ«shtoi (%2$S).
 
 torlauncher.unable_to_start_tor=E pamundur qÃ« tÃ« niset Tor.\n\n%S
 torlauncher.tor_missing=Skedari i ekzekutueshÃ«m Tor, mungon.
-torlauncher.torrc_missing=Skedari torrc mungon.
-torlauncher.datadir_missing=Direktoria e tÃ« dhÃ«nave tÃ« Tor nuk ekziston.
+torlauncher.torrc_missing=Skedari torrc mungon dhe s'mund tÃ« krijohet.
+torlauncher.datadir_missing=TÃ« dhÃ«nat e direktorisÃ« Tor data nuk ekzistojnÃ« dhe s'mund tÃ« krijohen.
 torlauncher.password_hash_missing=DÃ«shtuam tÃ« pÃ«rftonim fjalÃ«kalimin me thurje.
 
 torlauncher.failed_to_get_settings=DÃ«shtuam tÃ« gjenim konfigurimin e Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Dilni
 torlauncher.done=Kryer
 
 torlauncher.forAssistance=PÃ«r ndihmÃ«, kontaktoni %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopjimi u krye. Mesazhet e regjistrit tÃ« Tor pÃ«r %S, janÃ« gati pÃ«r t'u ngjitur nÃ« njÃ« redaktues teksti, ose nÃ« njÃ« mesazh e-poste.
 
diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd
index f4f9098..6b2cd2c 100644
--- a/src/chrome/locale/sr/network-settings.dtd
+++ b/src/chrome/locale/sr/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "ÐšÑ€Ð¾Ð· ÐœÑ€ÐµÐ¶Ñƒ">
 <!ENTITY torsettings.bridgeHelp2 "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ð²ÐµÐ± Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡ Ð´Ð° Ð¿Ð¾ÑÐµÑ‚Ð¸Ñ‚Ðµ https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties
index d714f9a..739d069 100644
--- a/src/chrome/locale/sr/torlauncher.properties
+++ b/src/chrome/locale/sr/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Ð¢Ð¾r ÐŸÐ¾ÐºÑ€ÐµÑ‚Ð°Ñ‡
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Ð¢Ð¾r ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾ÐºÑ€ÐµÐ½ÑƒÑ‚Ð¸\n\n%Ð…
 torlauncher.tor_missing=Tor Ð¸Ð·Ð²Ñ€ÑˆÐ½Ð¸ Ñ„Ð°Ñ˜Ð» Ð½ÐµÐ´Ð¾ÑÑ‚Ð°Ñ˜Ðµ
-torlauncher.torrc_missing=torrc Ñ„Ð°Ñ˜Ð» Ð½ÐµÐ´Ð¾ÑÑ‚Ð°Ñ˜Ðµ
-torlauncher.datadir_missing=Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼ Ð·Ð°  Ð¢Ð¾r Ð¿Ð¾Ð´Ð°Ñ‚ÐºÐµ Ð½Ðµ Ð¿Ð¾ÑÑ‚Ð¾Ñ˜Ð¸ 
+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=Ð£Ð·Ð¸Ð¼Ð°ÑšÐµ Ñ…ÐµÑˆÐ¸Ñ€Ð°Ð½Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ð½Ð¸Ñ˜Ðµ ÑƒÑÐ¿ÐµÐ»Ð¾
 
 torlauncher.failed_to_get_settings=ÐÐµÐ¼Ð¾Ð³ÑƒÑ›Ð½Ð¾ÑÑ‚ Ð¿Ð¾Ð²Ñ€Ð°Ñ‚ÐºÐ° Tor Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°\n\n%Ð…
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ð˜Ð·Ð»Ð°Ð·
 torlauncher.done=Gotovo
 
 torlauncher.forAssistance=Ð—Ð° Ð¿Ð¾Ð¼Ð¾Ñ› ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸Ñ€Ð°Ñ˜Ñ‚Ðµ %Ð…
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=ÐšÐ¾Ð¿Ð¸Ñ€Ð°ÑšÐµ Ð·Ð°Ð²Ñ€ÑˆÐµÐ½Ð¾. %S Top Ð»Ð¾Ð³ Ð¿Ð¾Ñ€ÑƒÐºÐµ ÑÑƒ ÑÐ¿Ñ€ÐµÐ¼Ð½Ðµ Ð´Ð° Ð±ÑƒÐ´Ñƒ Ð½Ð°Ð»ÐµÐ¿Ñ™ÐµÐ½Ðµ Ñƒ ÑƒÑ€ÐµÑ’Ð¸Ð²Ð°Ñ‡ Ñ‚ÐµÐºÑÑ‚Ð° Ð¸Ð»Ð¸ Ñƒ Ð¿Ð¾Ñ€ÑƒÐºÑƒ Ñƒ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½ÑÐºÐ¾Ñ˜ Ð¿Ð¾ÑˆÑ‚Ð¸.
 
diff --git a/src/chrome/locale/sr at latin/network-settings.dtd b/src/chrome/locale/sr at latin/network-settings.dtd
index dcb6891..67da423 100644
--- a/src/chrome/locale/sr at latin/network-settings.dtd
+++ b/src/chrome/locale/sr at latin/network-settings.dtd
@@ -60,12 +60,12 @@
 <!ENTITY torsettings.useBridges.type "Transport type:">
 <!ENTITY torsettings.useBridges.custom "Enter custom bridges">
 <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "type address:port">
+<!ENTITY torsettings.useBridges.placeholder "tip adrese: port ">
 
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/sr at latin/torlauncher.properties b/src/chrome/locale/sr at latin/torlauncher.properties
index a5e87ea..7e5a4b3 100644
--- a/src/chrome/locale/sr at latin/torlauncher.properties
+++ b/src/chrome/locale/sr at latin/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges.
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(preporuÄeno)
 
 torlauncher.connect=Povezivanje
 torlauncher.restart_tor=Restartovanje Tor-a
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/st/network-settings.dtd
+++ b/src/chrome/locale/st/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/st/torlauncher.properties
+++ b/src/chrome/locale/st/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/su/network-settings.dtd
+++ b/src/chrome/locale/su/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/su/torlauncher.properties
+++ b/src/chrome/locale/su/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd
index 19fcb74..5c398b3 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Vilket av fÃ¶ljande beskriver bÃ¤st din situation?">
 <!ENTITY torSettings.configurePrompt1 "Den hÃ¤r datorns Internetanslutning Ã¤r censorerad eller gÃ¥r genom en proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "Jag behÃ¶ver konfigurera en brygga eller instÃ¤llningar fÃ¶r lokal proxy innan jag ansluter till Tor-nÃ¤tverket.">
 <!ENTITY torSettings.configure "Konfigurera">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Jag vill gÃ¶ra en direktanslutning till Tor-nÃ¤tverket.">
 <!ENTITY torSettings.connectPrompt3 "Detta fungerar i de flesta situationer.">
 <!ENTITY torSettings.connect "Anslut">
 
 <!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfiguration">
 <!ENTITY torSettings.proxyQuestion "BehÃ¶ver den hÃ¤r datorn anvÃ¤nda en lokal proxy fÃ¶r att ansluta till Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "I de flesta fallen behÃ¶vs ingen lokal proxy, men det kan behÃ¶vas om du ansluter via ett nÃ¤tverk pÃ¥ ett fÃ¶retag, en skola eller ett universitet.">
+<!ENTITY torSettings.proxyExplanation2 "Om du Ã¤r osÃ¤ker pÃ¥ hur du ska svara pÃ¥ den hÃ¤r frÃ¥gan, titta pÃ¥ internetinstÃ¤llningarna i en annan webblÃ¤sare eller kontrollera ditt systems nÃ¤tverksinstÃ¤llningar fÃ¶r att se om en lokal proxy behÃ¶vs.">
 <!ENTITY torSettings.enterProxy "Ange proxyinstÃ¤llningarna.">
 <!ENTITY torSettings.bridgePageTitle "Konfiguration av Tor-bryggor">
 <!ENTITY torSettings.bridgeQuestion "Blockerar eller censurerar din internetleverantÃ¶r anslutningar till Tor-nÃ¤tverket?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Om du Ã¤r osÃ¤ker pÃ¥ hur du ska besvara den hÃ¤r frÃ¥gan, vÃ¤lj Nej (om du inte kan ansluta till Tor-nÃ¤tverket utan en brygga sÃ¥ kan du lÃ¤gga till en senare).">
+<!ENTITY torSettings.bridgeExplanation2 "Om du vÃ¤ljer Ja kommer du att tillfrÃ¥gas om att konfigurera Tor-bryggor, vilka Ã¤r olistade relÃ¤er som gÃ¶r det svÃ¥rare att blockera anslutningarna till Tor-nÃ¤tverket.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Du kan anvÃ¤nda de fÃ¶rkonfigurerade bryggorna, eller skaffa och ange bryggor sjÃ¤lv.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "VÃ¤ntar pÃ¥ att Tor ska starta...">
 <!ENTITY torsettings.restartTor "Starta om Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "Omkonfigurera">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Du har konfigurerat Tor-bryggor eller sÃ¥ har du angett lokala proxyinstÃ¤llningar.  FÃ¶r att gÃ¶ra en direktanslutning till Tor-nÃ¤tverket mÃ¥ste de hÃ¤r instÃ¤llningarna tas bort.">
+<!ENTITY torsettings.discardSettings.proceed "Ta bort instÃ¤llningar och anslut">
 
 <!ENTITY torsettings.optional "Valfri">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "TillÃ¥tna portar:">
 <!ENTITY torsettings.useBridges.checkbox "Min internetleverantÃ¶r blockerar anslutningar till Tor-nÃ¤tverket">
 <!ENTITY torsettings.useBridges.default "Anslut med tillgÃ¤ngliga bryggor">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "Varje typ av brygga anvÃ¤nder en egen metod fÃ¶r att undvika censur.  Om en brygga inte fungerar, fÃ¶rsÃ¶k igen genom att anvÃ¤nda en annan.">
 <!ENTITY torsettings.useBridges.type "Transport-typ:">
 <!ENTITY torsettings.useBridges.custom "Fyll i anpassade bryggor">
 <!ENTITY torsettings.useBridges.label "Ange en eller flera Tor-bryggor (en per rad).">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet">
 <!ENTITY torsettings.bridgeHelpTitle "HjÃ¤lp om bryggor">
 <!ENTITY torsettings.bridgeHelp1 "Om du inte kan ansluta till Tor-nÃ¤tverket Ã¤r det mÃ¶jligt att din internetleverantÃ¶r eller annan myndighet blockerar Tor.  Ofta kan du kringgÃ¥ detta problem genom att anvÃ¤nda Tor-bryggor, vilka Ã¤r olistade relÃ¤er som Ã¤r mer svÃ¥rblockerade.">
-<!ENTITY torsettings.bridgeHelp1B "Du kan anvÃ¤nda de fÃ¶rkonfigurerade bryggadresserna, eller skaffa bryggadresser sjÃ¤lv pÃ¥ nÃ¥got av fÃ¶ljande sÃ¤tt:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Via nÃ¤tet">
 <!ENTITY torsettings.bridgeHelp2 "AnvÃ¤nd en webblÃ¤sare fÃ¶r att besÃ¶ka https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">
diff --git a/src/chrome/locale/sv/progress.dtd b/src/chrome/locale/sv/progress.dtd
index 7ac45ca..1df097b 100644
--- a/src/chrome/locale/sv/progress.dtd
+++ b/src/chrome/locale/sv/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor-status">
 <!ENTITY torprogress.openSettings "Ã–ppna instÃ¤llningar">
 <!ENTITY torprogress.heading "Ansluter till Tor-nÃ¤tverket">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "VÃ¤nligen vÃ¤nta medan vi sÃ¤tter upp en anslutning till Tor-nÃ¤tverket.  Detta kan ta flera minuter.">
diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties
index 095d0b7..a49b83f 100644
--- a/src/chrome/locale/sv/torlauncher.properties
+++ b/src/chrome/locale/sv/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S).
 
 torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S
 torlauncher.tor_missing=Tors kÃ¶rbara programfil saknas.
-torlauncher.torrc_missing=Filen torrc saknas.
-torlauncher.datadir_missing=Tors data-katalog saknas.
+torlauncher.torrc_missing=Torrc-fil saknas och kunde inte skapas.
+torlauncher.datadir_missing=Tor datakatalog finns inte och kunde inte skapas.
 torlauncher.password_hash_missing=Misslyckades med att hÃ¤mta hashat lÃ¶senord.
 
 torlauncher.failed_to_get_settings=Kunde inte lÃ¤sa in instÃ¤llningar fÃ¶r Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=StÃ¤ng
 torlauncher.done=Klar
 
 torlauncher.forAssistance=FÃ¶r assistans, kontakta %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopieringen Ã¤r fÃ¤rdig. %S meddelanden frÃ¥n Tor-loggen som du kan klistra in i en textredigerare eller ett e-postmeddelande.
 
diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/sw/network-settings.dtd
+++ b/src/chrome/locale/sw/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties
index 02be756..75f4a6c 100644
--- a/src/chrome/locale/sw/torlauncher.properties
+++ b/src/chrome/locale/sw/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges.
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(imependekezwa)
 
 torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/szl/network-settings.dtd
+++ b/src/chrome/locale/szl/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/szl/torlauncher.properties
+++ b/src/chrome/locale/szl/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd
index 7ffc083..02e8fad 100644
--- a/src/chrome/locale/ta/network-settings.dtd
+++ b/src/chrome/locale/ta/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog " Tor à®ªà®¤à®¿à®µà¯à®•à®³à¯ˆ à®•à®¿à®³à®¿à®ªà¯à®ªà¯‡à®¾à®°à¯à®Ÿà¯à®•à¯à®•à¯ à®¨à®•à®²à¯†à®Ÿà¯">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties
index 079d758..228a61e 100644
--- a/src/chrome/locale/ta/torlauncher.properties
+++ b/src/chrome/locale/ta/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor à®¤à¯à®µà®•à¯à®•à®¿
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Tor à®¤à¯†à®¾à®Ÿà®™à¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ.\n\n%S
 torlauncher.tor_missing=Tor à®‡à®¯à®™à¯à®•à®•à¯à®•à¯‚à®Ÿà®¿à®¯à®¤à¯ à®•à®¾à®£à®µà®¿à®²à¯à®²à¯ˆ.
-torlauncher.torrc_missing=Torrc à®•à¯‡à®¾à®ªà¯à®ªà¯ˆ à®•à®¾à®£à®µà®¿à®²à¯à®²à¯ˆ.
-torlauncher.datadir_missing=Tor à®¤à®°à®µà¯ à®…à®Ÿà¯ˆà®µà¯ à®‡à®²à¯à®²à¯ˆ.
+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=Hashed à®•à®Ÿà®µà¯à®šà¯à®šà¯†à®¾à®²à¯à®²à¯ˆ à®ªà¯†à®± à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ.
 
 torlauncher.failed_to_get_settings=Tor à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯ˆ à®®à¯€à®Ÿà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=à®µà¯†à®³à®¿à®¯à¯‡à®±à¯
 torlauncher.done=à®®à¯à®Ÿà®¿à®¨à¯à®¤à®¤à¯
 
 torlauncher.forAssistance=à®‰à®¤à®µà®¿à®•à¯à®•à¯, à®¤à¯†à®¾à®Ÿà®°à¯à®ªà¯ à®•à¯†à®¾à®³à¯à®³à¯à®™à¯à®•à®³à¯ %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.
 
diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd
index c19ed8a..bb258de 100644
--- a/src/chrome/locale/te-IN/network-settings.dtd
+++ b/src/chrome/locale/te-IN/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/te-IN/torlauncher.properties
+++ b/src/chrome/locale/te-IN/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/te/network-settings.dtd
+++ b/src/chrome/locale/te/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/te/torlauncher.properties
+++ b/src/chrome/locale/te/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/tg/network-settings.dtd
+++ b/src/chrome/locale/tg/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/tg/torlauncher.properties
+++ b/src/chrome/locale/tg/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd
index c97495e..d4a20d8 100644
--- a/src/chrome/locale/th/network-settings.dtd
+++ b/src/chrome/locale/th/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "à¸„à¸±à¸”à¸¥à¸à¸à¸›à¸¹à¸¡ Tor à¹„à¸›à¸—à¸µà¹ˆà¸„à¸¥à¸´à¸›à¸šà¸à¸£à¹Œà¸”">
 <!ENTITY torsettings.bridgeHelpTitle "à¸à¸²à¸£à¸Šà¹ˆà¸§à¸¢à¹€à¸«à¸¥à¸·à¸à¸£à¸µà¹€à¸¥à¸¢à¹Œà¸ªà¸°à¸žà¸²à¸™">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties
index b451784..883b4a7 100644
--- a/src/chrome/locale/th/torlauncher.properties
+++ b/src/chrome/locale/th/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=à¸•à¸±à¸§à¹€à¸›à¸´à¸” Tor
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸£à¸´à¹ˆà¸¡à¸à¸²à¸£à¸—à¸³à¸‡à¸²à¸™à¸‚à¸à¸‡ Tor à¹„à¸”à¹‰\n\n%S
 torlauncher.tor_missing=à¹à¸Ÿà¹‰à¸¡à¹‚à¸›à¸£à¹à¸à¸£à¸¡ Tor à¸‚à¸²à¸”à¸«à¸²à¸¢à¹„à¸›
-torlauncher.torrc_missing=à¹à¸Ÿà¹‰à¸¡ torrc à¸«à¸²à¸¢à¹„à¸›
-torlauncher.datadir_missing=à¹„à¸¡à¹ˆà¸¡à¸µà¹„à¸”à¹€à¸£à¸à¸—à¸à¸£à¸µà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡ Tor
+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=à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§à¹ƒà¸™à¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸—à¸µà¹ˆà¸–à¸¹à¸à¹à¸®à¸Š
 
 torlauncher.failed_to_get_settings=à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸£à¸µà¸¢à¸à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸² Tor à¹„à¸”à¹‰\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=à¸à¸à¸
 torlauncher.done=à¸ªà¸³à¹€à¸£à¹‡à¸ˆ
 
 torlauncher.forAssistance=à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸„à¸³à¹à¸™à¸°à¸™à¸³ à¸•à¸´à¸”à¸•à¹ˆà¸ %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.
 
diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ti/network-settings.dtd
+++ b/src/chrome/locale/ti/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ti/torlauncher.properties
+++ b/src/chrome/locale/ti/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/tk/network-settings.dtd
+++ b/src/chrome/locale/tk/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/tk/torlauncher.properties
+++ b/src/chrome/locale/tk/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd
index 4856f80..4414be7 100644
--- a/src/chrome/locale/tr/network-settings.dtd
+++ b/src/chrome/locale/tr/network-settings.dtd
@@ -43,7 +43,7 @@
 <!ENTITY torsettings.optional "Ä°steÄŸe baÄŸlÄ±">
 
 <!ENTITY torsettings.useProxy.checkbox "Bu bilgisayarÄ±n Ä°nternet'e eriÅŸmesi iÃ§in bir yerel vekil sunucu kullanmasÄ± gerekiyor">
-<!ENTITY torsettings.useProxy.type "Vekil Sunucu Tipi:">
+<!ENTITY torsettings.useProxy.type "Vekil Sunucu TÃ¼rÃ¼:">
 <!ENTITY torsettings.useProxy.address "Adres:">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adÄ±">
 <!ENTITY torsettings.useProxy.port "BaÄŸlantÄ± noktasÄ±:">
@@ -56,8 +56,8 @@
 <!ENTITY torsettings.firewall.allowedPorts "Ä°zin Verilen BaÄŸlantÄ± NoktalarÄ±:">
 <!ENTITY torsettings.useBridges.checkbox "Ä°nternet Servis SaÄŸlayÄ±cÄ±m (ISS) Tor aÄŸÄ±na olan baÄŸlantÄ±larÄ± engelliyor">
 <!ENTITY torsettings.useBridges.default "SaÄŸlanan kÃ¶prÃ¼ler ile baÄŸlan">
-<!ENTITY torsettings.useBridges.note "Her bir kÃ¶prÃ¼ tipinde engellemeyi aÅŸmak iÃ§in farklÄ± yÃ¶ntemler kullanÄ±lÄ±r.  Bir kÃ¶prÃ¼ Ã§alÄ±ÅŸmazsa farklÄ± bir tanesini deneyin.">
-<!ENTITY torsettings.useBridges.type "AktarÄ±m tipi:">
+<!ENTITY torsettings.useBridges.note "Her bir kÃ¶prÃ¼ tÃ¼rÃ¼nde engellemeyi aÅŸmak iÃ§in farklÄ± yÃ¶ntemler kullanÄ±lÄ±r.  Bir kÃ¶prÃ¼ Ã§alÄ±ÅŸmazsa farklÄ± bir tanesini deneyin.">
+<!ENTITY torsettings.useBridges.type "AktarÄ±m tÃ¼r:">
 <!ENTITY torsettings.useBridges.custom "Ã–zel kÃ¶prÃ¼ler yazÄ±n">
 <!ENTITY torsettings.useBridges.label "Bir ya da birkaÃ§ kÃ¶prÃ¼ aktarÄ±cÄ±sÄ± yazÄ±n (her satÄ±ra bir tane).">
 <!ENTITY torsettings.useBridges.placeholder "adres:baÄŸlantÄ± noktasÄ± ÅŸeklinde yazÄ±n">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Tor GÃ¼nlÃ¼ÄŸÃ¼nÃ¼ Panoya Kopyala">
 <!ENTITY torsettings.bridgeHelpTitle "KÃ¶prÃ¼ AktarÄ±cÄ± YardÄ±mÄ±">
 <!ENTITY torsettings.bridgeHelp1 "Tor aÄŸÄ±na baÄŸlanamÄ±yorsanÄ±z, kullandÄ±ÄŸÄ±nÄ±z Ä°nternet Servis SaÄŸlayÄ±cÄ±sÄ± (ISS) ya da baÅŸka bir kurum Tor 'u engelliyor olabilir. Bu sorunu Ã§oÄŸunlukla, engellenmesi daha zor olan listelenmeyen aktarÄ±cÄ±lar, Tor KÃ¶prÃ¼lerini kullanarak Ã§Ã¶zebilirsiniz.">
-<!ENTITY torsettings.bridgeHelp1B "Ã–nceden ayarlanmÄ±ÅŸ ve sunulmuÅŸ kÃ¶prÃ¼ adreslerini kullanabilir ya da ÅŸu Ã¼Ã§ yÃ¶ntemden birini kullanarak Ã¶zel adresler edinebilirsiniz:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Web yoluyla">
 <!ENTITY torsettings.bridgeHelp2 "Bir web tarayÄ±cÄ±sÄ± kullanarak https://bridges.torproject.org adresini ziyaret edin">
 <!ENTITY torsettings.bridgeHelp3Heading "Otomatik e-posta yanÄ±tÄ± yoluyla">
diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties
index cbf467d..d607ef2 100644
--- a/src/chrome/locale/tr/torlauncher.properties
+++ b/src/chrome/locale/tr/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor BaÅŸlatÄ±cÄ±
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S baÅŸarÄ±sÄ±z oldu (%2$S).
 
 torlauncher.unable_to_start_tor=Tor baÅŸlatÄ±lamadÄ±.\n\n%S
 torlauncher.tor_missing=Ã‡alÄ±ÅŸtÄ±rÄ±labilecek Tor dosyasÄ± bulunamadÄ±.
-torlauncher.torrc_missing=torrc dosyasÄ± bulunamadÄ±.
-torlauncher.datadir_missing=Tor veri klasÃ¶rÃ¼ bulunamadÄ±.
+torlauncher.torrc_missing="Torcc" dosyasÄ± eksik ve oluÅŸturulamadÄ±.
+torlauncher.datadir_missing=Tor veri dizini bulunamadÄ± ve oluÅŸturulamadÄ±.
 torlauncher.password_hash_missing=KarÄ±lmÄ±ÅŸ parola alÄ±namadÄ±.
 
 torlauncher.failed_to_get_settings=Tor ayarlarÄ± alÄ±namadÄ±.\n\n%S
@@ -22,10 +22,10 @@ torlauncher.failed_to_save_settings=Tor ayarlarÄ± kaydedilemedi.\n\n%S
 torlauncher.ensure_tor_is_running=LÃ¼tfen Tor'un Ã§alÄ±ÅŸtÄ±ÄŸÄ±ndan emin olun.
 
 torlauncher.error_proxy_addr_missing=Ä°nternet'e bir vekil sunucu Ã¼zerinden baÄŸlanmak iÃ§in bir IP adresi ya da sunucu adÄ± ile baÄŸlantÄ± noktasÄ± numarasÄ±nÄ±n yazÄ±lmasÄ± gereklidir.
-torlauncher.error_proxy_type_missing=Vekil sunucu tipini seÃ§melisiniz.
+torlauncher.error_proxy_type_missing=Vekil sunucu tÃ¼rÃ¼nÃ¼ seÃ§melisiniz.
 torlauncher.error_bridges_missing=Bir ya da birkaÃ§ kÃ¶prÃ¼ belirtmelisiniz.
-torlauncher.error_default_bridges_type_missing=SaÄŸlanan kÃ¶prÃ¼ler iÃ§in bir aktarÄ±m tipi seÃ§melisiniz.
-torlauncher.error_bridge_bad_default_type=SaÄŸlanan kÃ¶prÃ¼ler %S aktarÄ±m tipi iÃ§in kullanÄ±lamÄ±yor. LÃ¼tfen ayarlarÄ±nÄ±zÄ± deÄŸiÅŸtirin.
+torlauncher.error_default_bridges_type_missing=SaÄŸlanan kÃ¶prÃ¼ler iÃ§in bir aktarÄ±m tÃ¼rÃ¼ seÃ§melisiniz.
+torlauncher.error_bridge_bad_default_type=SaÄŸlanan kÃ¶prÃ¼ler %S aktarÄ±m tÃ¼rÃ¼ iÃ§in kullanÄ±lamÄ±yor. LÃ¼tfen ayarlarÄ±nÄ±zÄ± deÄŸiÅŸtirin.
 
 torlauncher.recommended_bridge=(Ã¶nerilir)
 
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ã‡Ä±kÄ±ÅŸ
 torlauncher.done=TamamlandÄ±
 
 torlauncher.forAssistance=YardÄ±m iÃ§in %S ile gÃ¶rÃ¼ÅŸÃ¼n
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopyalama tamamlandÄ±. %S Tor gÃ¼nlÃ¼k iletisi bir metin dÃ¼zenleyici ya da e-posta iletisine kopyalanmaya hazÄ±r.
 
diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd
index ed17b65..3848423 100644
--- a/src/chrome/locale/uk/network-settings.dtd
+++ b/src/chrome/locale/uk/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ð¯ÐºÐµ Ð· Ð½Ð°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ñ… Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½ÑŒ Ð½Ð°Ð¹ÐºÑ€Ð°Ñ‰Ðµ Ð¾Ð¿Ð¸ÑÑƒÑ” Ð’Ð°ÑˆÑƒ ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ñ–ÑŽ?">
 <!ENTITY torSettings.configurePrompt1 "ÐœÐµÑ€ÐµÐ¶ÐµÐ²Ðµ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€Ð° Ñ†ÐµÐ½Ð·ÑƒÑ€ÑƒÑ”Ñ‚ÑŒÑÑ Ð°Ð±Ð¾ Ð¹Ð´Ðµ Ñ‡ÐµÑ€ÐµÐ· Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "ÐœÐµÐ½Ñ– Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð¼Ñ–ÑÑ‚ Ð°Ð±Ð¾ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¸Ð¹ Ð¿Ñ€Ð¾ÐºÑÑ– Ð¿ÐµÑ€ÐµÐ´ Ð¿Ñ–Ð´'Ñ”Ð´Ð°Ð½Ð½ÑÐ¼ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor.">
 <!ENTITY torSettings.configure "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Ð¯ Ð±Ð°Ð¶Ð°ÑŽ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ÑÑ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor Ð½Ð°Ð¿Ñ€ÑÐ¼Ñƒ.">
 <!ENTITY torSettings.connectPrompt3 "Ð¦Ðµ Ð¼Ð°Ñ” Ð¿Ñ€Ð°Ñ†ÑŽÐ²Ð°Ñ‚Ð¸ Ñƒ Ð±Ñ–Ð»ÑŒÑˆÐ¾ÑÑ‚Ñ– ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ñ–Ð¹.">
 <!ENTITY torSettings.connect "Ð—'Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ">
 
 <!ENTITY torSettings.proxyPageTitle "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð° ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ð°">
 <!ENTITY torSettings.proxyQuestion "Ð§Ð¸ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ Ñ†ÑŒÐ¾Ð¼Ñƒ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€Ñƒ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¸Ð¹ Ð¿Ñ€Ð¾ÐºÑÑ– Ð´Ð»Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ Ð² Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "Ð£ Ð±Ñ–Ð»ÑŒÑˆÐ¾ÑÑ‚Ñ– Ð²Ð¸Ð¿Ð°Ð´ÐºÑ–Ð² Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¸Ð¹ Ð¿Ñ€Ð¾ÐºÑÑ– Ð½Ðµ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¸Ð¹, Ð°Ð»Ðµ Ð²Ñ–Ð½ Ð¼Ð¾Ð¶Ðµ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ‚Ð¸ÑÑ Ð¿Ñ€Ð¸ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ– Ñ‡ÐµÑ€ÐµÐ· Ð¼ÐµÑ€ÐµÐ¶Ñƒ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ñ–Ñ—, ÑˆÐºÐ¾Ð»Ð¸ Ñ‡Ð¸ ÑƒÐ½Ñ–Ð²ÐµÑ€ÑÐ¸Ñ‚ÐµÑ‚Ñƒ.">
+<!ENTITY torSettings.proxyExplanation2 "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð½Ðµ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, ÑÐº Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–ÑÑ‚Ð¸ Ð½Ð° Ñ†Ðµ Ð·Ð°Ð¿Ð¸Ñ‚Ð°Ð½Ð½Ñ, Ð¿Ð¾Ð´Ð¸Ð²Ñ–Ñ‚ÑŒÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ Ð² Ñ–Ð½ÑˆÐ¾Ð¼Ñƒ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ñ– Ð°Ð±Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ð½Ñ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð’Ð°ÑˆÐ¾Ñ— ÑÐ¸ÑÑ‚ÐµÐ¼Ð¸, Ñ‰Ð¾Ð± Ð¿Ð¾Ð±Ð°Ñ‡Ð¸Ñ‚Ð¸ Ñ‡Ð¸ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÐºÑÑ–.">
 <!ENTITY torSettings.enterProxy "Ð—Ð°Ð´Ð°Ñ‚Ð¸ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ Ð¿Ñ€Ð¾ÐºÑÑ–">
 <!ENTITY torSettings.bridgePageTitle "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— Tor-Ð¼Ð¾ÑÑ‚Ñ–Ð²">
 <!ENTITY torSettings.bridgeQuestion "Ð’Ð°Ñˆ Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ (ISP) Ð±Ð»Ð¾ÐºÑƒÑ” Ñ‡Ð¸ ÑÐºÐ¸Ð¼-Ð½ÐµÐ±ÑƒÐ´ÑŒ Ñ‡Ð¸Ð½Ð¾Ð¼ Ñ†ÐµÐ½Ð·ÑƒÑ€ÑƒÑ” Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Tor Ð¼ÐµÑ€ÐµÐ¶Ñ–?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð½Ðµ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, ÑÐº Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–ÑÑ‚Ð¸ Ð½Ð° Ñ†Ðµ Ð·Ð°Ð¿Ð¸Ñ‚Ð°Ð½Ð½Ñ, Ð²Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ ÐÑ–. (Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor Ð±ÐµÐ· Ð¼Ð¾ÑÑ‚Ð°, Ð¹Ð¾Ð³Ð¾ Ð¼Ð¾Ð¶Ð½Ð° Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ð¿Ñ–Ð·Ð½Ñ–ÑˆÐµ).">
+<!ENTITY torSettings.bridgeExplanation2 "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð²Ð¸Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¢Ð°Ðº, Ð’Ð°Ð¼ Ð±ÑƒÐ´Ðµ Ð·Ð°Ð¿Ñ€Ð¾Ð¿Ð¾Ð½Ð¾Ð²Ð°Ð½Ð¾ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð¼Ð¾ÑÑ‚Ð¸ Tor, ÑÐºÑ– Ñ” Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¸Ð¼Ð¸ Ñ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð°Ð¼Ð¸, Ñ‰Ð¾ ÑƒÑÐºÐ»Ð°Ð´Ð½ÑŽÑŽÑ‚ÑŒ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½ÑŒ Ð· Ð¼ÐµÑ€ÐµÐ¶ÐµÑŽ Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ñ‚Ð¸ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹ Ð¿ÐµÑ€ÐµÐ»Ñ–Ðº Ð¼Ð¾ÑÑ‚Ñ–Ð² Ð°Ð±Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ñ– Ð²Ð²ÐµÑÑ‚Ð¸ Ð½Ð°Ð±Ñ–Ñ€ Ð¼Ð¾ÑÑ‚Ñ–Ð² Ð²Ñ€ÑƒÑ‡Ð½Ñƒ.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Tor...">
 <!ENTITY torsettings.restartTor "ÐŸÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ð¸ Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "ÐŸÐµÑ€ÐµÐ½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "Ð’Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð»Ð¸ Ð¼Ð¾ÑÑ‚Ð¸ Tor Ð°Ð±Ð¾ Ð²Ð²ÐµÐ»Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾ÐºÑÑ–.  Ð”Ð»Ñ Ð¿Ñ€ÑÐ¼Ð¾Ð³Ð¾ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· Ð¼ÐµÑ€ÐµÐ¶ÐµÑŽ Tor Ñ†Ñ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ñ€ÐµÐ±Ð° Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸.">
+<!ENTITY torsettings.discardSettings.proceed "Ð’Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ– Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ">
 
 <!ENTITY torsettings.optional "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾">
 
@@ -56,7 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Ð”Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð½Ñ– Ð¿Ð¾Ñ€Ñ‚Ð¸:">
 <!ENTITY torsettings.useBridges.checkbox "ÐœÑ–Ð¹ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ Ð±Ð»Ð¾ÐºÑƒÑ” Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor">
 <!ENTITY torsettings.useBridges.default "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ÑÑ Ð· Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¼Ð¸ Ð¼Ð¾ÑÑ‚Ð°Ð¼Ð¸">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "ÐšÐ¾Ð¶ÐµÐ½ Ñ‚Ð¸Ð¿ Ð¼Ð¾ÑÑ‚Ñ–Ð² Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÐ¾Ð²ÑƒÑ” Ñ–Ð½ÑˆÐ¸Ð¹ Ð¼ÐµÑ‚Ð¾Ð´ ÑƒÐ½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ñ†ÐµÐ½Ð·ÑƒÑ€Ð¸.  Ð¯ÐºÑ‰Ð¾ Ð¾Ð´Ð¸Ð½ Ð¼Ñ–ÑÑ‚ Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”, ÑÐ¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Ñ‰Ðµ Ñ€Ð°Ð· Ñ‡ÐµÑ€ÐµÐ· Ñ–Ð½ÑˆÐ¸Ð¹.">
 <!ENTITY torsettings.useBridges.type "Ð¢Ð¸Ð¿ Ñ‚Ñ€Ð°Ð½ÑÐ¿Ð¾Ñ€Ñ‚Ñƒ:">
 <!ENTITY torsettings.useBridges.custom "Ð’Ð²ÐµÑÑ‚Ð¸ Ð¼Ð¾ÑÑ‚Ð¸ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ">
 <!ENTITY torsettings.useBridges.label "Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ð¾Ð´Ð¸Ð½ Ð°Ð±Ð¾ ÐºÑ–Ð»ÑŒÐºÐ° Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ñ–Ð² Ñ‚Ð¸Ð¿Ñƒ Ð¼Ñ–ÑÑ‚ (Ð¿Ð¾ Ð¾Ð´Ð½Ð¾Ð¼Ñƒ Ð² Ñ€ÑÐ´Ð¾Ðº).">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Ð¡ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ñ‚Ð¸ Ð¶ÑƒÑ€Ð½Ð°Ð» Tor Ð´Ð¾ Ð±ÑƒÑ„ÐµÑ€Ñƒ Ð¾Ð±Ð¼Ñ–Ð½Ñƒ">
 <!ENTITY torsettings.bridgeHelpTitle "Ð”Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð° Ð¿Ð¾ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð°Ð¼ Ñ‚Ð¸Ð¿Ñƒ Ð¼Ñ–ÑÑ‚">
 <!ENTITY torsettings.bridgeHelp1 "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ÑÑ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor, Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸, Ñ‰Ð¾ Ð’Ð°Ñˆ Ñ–Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ (ISP) Ð°Ð±Ð¾ Ñ–Ð½ÑˆÐ° Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð±Ð»Ð¾ÐºÑƒÑ” Tor.  Ð§Ð°ÑÑ‚Ð¾ Ð¼Ð¾Ð¶Ð½Ð° Ð¾Ð±Ñ–Ð¹Ñ‚Ð¸ Ñ†ÑŽ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ Tor Ð¼Ð¾ÑÑ‚Ñ–Ð², Ñ‰Ð¾ Ñ” Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¸Ð¼Ð¸ Ñ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð°Ð¼Ð¸, ÑÐºÑ– Ð²Ð°Ð¶Ñ‡Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸.">
-<!ENTITY torsettings.bridgeHelp1B "Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ñ‚Ð¸ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹ Ð¿ÐµÑ€ÐµÐ»Ñ–Ðº Ð¼Ð¾ÑÑ‚Ñ–Ð² Ð°Ð±Ð¾ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ñ– Ð²Ð²ÐµÑÑ‚Ð¸ Ð½Ð°Ð±Ñ–Ñ€ Ð¼Ð¾ÑÑ‚Ñ–Ð² Ð²Ñ€ÑƒÑ‡Ð½Ñƒ, Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑŽÑ‡Ð¸ Ð¾Ð´Ð¸Ð½ Ð· Ñ‚Ñ€ÑŒÐ¾Ñ… Ð¿ÐµÑ€ÐµÑ€Ð°Ñ…Ð¾Ð²Ð°Ð½Ð¸Ñ… Ð¼ÐµÑ‚Ð¾Ð´Ñ–Ð²:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Ð§ÐµÑ€ÐµÐ· Ð’ÐµÐ±">
 <!ENTITY torsettings.bridgeHelp2 "Ð’Ñ–Ð´Ð²Ñ–Ð´Ð°Ð¹Ñ‚Ðµ ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Ð§ÐµÑ€ÐµÐ· Ð°Ð²Ñ‚Ð¾Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð°Ñ‡ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— Ð¿Ð¾ÑˆÑ‚Ð¸">
diff --git a/src/chrome/locale/uk/progress.dtd b/src/chrome/locale/uk/progress.dtd
index 192f5d3..4e5e458 100644
--- a/src/chrome/locale/uk/progress.dtd
+++ b/src/chrome/locale/uk/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Tor">
 <!ENTITY torprogress.openSettings "Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ">
 <!ENTITY torprogress.heading "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.pleaseWait "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð·Ð°Ñ‡ÐµÐºÐ°Ð¹Ñ‚Ðµ, Ð¿Ð¾ÐºÐ¸ Ð¼Ð¸ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ”Ð¼Ð¾ÑÑ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor.  Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑ‚Ð¸ ÐºÑ–Ð»ÑŒÐºÐ° Ñ…Ð²Ð¸Ð»Ð¸Ð½.">
diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties
index 8287a1f..597100a 100644
--- a/src/chrome/locale/uk/torlauncher.properties
+++ b/src/chrome/locale/uk/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‡ Tor
@@ -13,8 +13,8 @@ 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.torrc_missing=Ð¤Ð°Ð¹Ð» torrc Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–Ð¹ Ñ‚Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð°.
+torlauncher.datadir_missing=Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ð´Ð»Ñ Ð´Ð°Ð½Ð¸Ñ… Tor Ð½Ðµ Ñ–ÑÐ½ÑƒÑ” Ñ– Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð°.
 torlauncher.password_hash_missing=ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ñ…ÐµÑˆÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ.
 
 torlauncher.failed_to_get_settings=ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Tor.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Ð’Ð¸Ñ…Ñ–Ð´
 torlauncher.done=Ð“Ð¾Ñ‚Ð¾Ð²Ð¾
 
 torlauncher.forAssistance=Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸ Ð·Ð²'ÑÐ¶Ñ–Ñ‚ÑŒÑÑ Ð· %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾. %S Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñƒ tor Ð³Ð¾Ñ‚Ð¾Ð²Ñ– Ð´Ð¾ Ð²ÑÑ‚Ð°Ð²ÐºÐ¸ Ñƒ Ñ‚ÐµÐºÑÑ‚Ð¾Ð²Ð¸Ð¹ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¾Ñ€ Ð°Ð±Ð¾ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— Ð¿Ð¾ÑˆÑ‚Ð¸.
 
diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd
index f461264..67a1700 100644
--- a/src/chrome/locale/ur-PK/network-settings.dtd
+++ b/src/chrome/locale/ur-PK/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties
index f5a81fc..e937136 100644
--- a/src/chrome/locale/ur-PK/torlauncher.properties
+++ b/src/chrome/locale/ur-PK/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index a856870..174f353 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ur/torlauncher.properties
+++ b/src/chrome/locale/ur/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd
index f8795c1..c3dc757 100644
--- a/src/chrome/locale/uz/network-settings.dtd
+++ b/src/chrome/locale/uz/network-settings.dtd
@@ -17,7 +17,7 @@
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
-<!ENTITY torSettings.connect "Connect">
+<!ENTITY torSettings.connect "Ulanish">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties
index 9ead70b..08fbe09 100644
--- a/src/chrome/locale/uz/torlauncher.properties
+++ b/src/chrome/locale/uz/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ 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=torrc fayli mavjud emas.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=Chiqish
 torlauncher.done=Bajarildi
 
 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.
 
diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/ve/network-settings.dtd
+++ b/src/chrome/locale/ve/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/ve/torlauncher.properties
+++ b/src/chrome/locale/ve/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index 7556d04..914f8f6 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "Náº¿u nhÆ° báº¡n khÃ´ng thá»ƒ káº¿t ná»‘i Ä‘áº¿n máº¡ng Tor, cÃ³ thá»ƒ lÃ  nhÃ  cung cáº¥p dá»‹ch vá»¥ cá»§a báº¡n (ISP) hoáº·c cÆ¡ quan khÃ¡c Ä‘Ã£ cháº·n káº¿t ná»‘i Ä‘áº¿n Tor. ThÃ´ng thÆ°á»ng, báº¡n cÃ³ thá»ƒ giáº£i quyáº¿t váº¥n nÃ y báº±ng cÃ¡ch sá» dá»¥ng Tor Bridges, cÃ¡c Tor Bridges nÃ y sáº½ khÃ´ng Ä‘Æ°á»£c liá»‡t kÃª Ä‘á»ƒ lÃ m cho viá»‡c ngÄƒn cháº·n khÃ³ khÄƒn hÆ¡n.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Äi qua Web">
 <!ENTITY torsettings.bridgeHelp2 "Sá» dá»¥ng trÃ¬nh duyá»‡t web truy cáºp vÃ o https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties
index e5d7acd..c0fcbee 100644
--- a/src/chrome/locale/vi/torlauncher.properties
+++ b/src/chrome/locale/vi/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ 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=Táºp tin thá»±c thi cá»§a Tor bá»‹ thiáº¿u.
-torlauncher.torrc_missing=Thiáº¿u táºp tin torrc.
-torlauncher.datadir_missing=ThÆ° má»¥c data trong Tor khÃ´ng tá»“n táº¡i.
+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=KhÃ´ng thá»ƒ nháºn Ä‘Æ°á»£c cÃ i Ä‘áº·t Tor.
@@ -36,6 +36,7 @@ torlauncher.quit_win=ThoÃ¡t
 torlauncher.done=HoÃ n thÃ nh
 
 torlauncher.forAssistance=Äá»ƒ Ä‘Æ°á»£c trá»£ giÃºp, liÃªn há»‡ %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.
 
diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/wa/network-settings.dtd
+++ b/src/chrome/locale/wa/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/wa/torlauncher.properties
+++ b/src/chrome/locale/wa/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/wo/network-settings.dtd
+++ b/src/chrome/locale/wo/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/wo/torlauncher.properties
+++ b/src/chrome/locale/wo/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index 3adf58a..5910dc8 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -55,7 +55,7 @@
 <!ENTITY torsettings.firewall.checkbox "è¯¥è®¡ç®—æœºçš„é˜²ç«å¢™ä»…å…è®¸ç‰¹å®šç«¯å£çš„äº’è”ç½‘è¿žæŽ¥">
 <!ENTITY torsettings.firewall.allowedPorts "å…è®¸çš„ç«¯å£ï¼š">
 <!ENTITY torsettings.useBridges.checkbox "æˆ‘çš„äº’è”ç½‘æœåŠ¡æä¾›å•† (ISP) å°é”äº† Tor ç½‘ç»œè¿žæŽ¥">
-<!ENTITY torsettings.useBridges.default "ä½¿ç”¨é›†æˆçš„ç½‘æ¡¥è¿›è¡Œè¿žæŽ¥">
+<!ENTITY torsettings.useBridges.default "ä½¿ç”¨é›†æˆçš„ç½‘æ¡¥è¿žæŽ¥">
 <!ENTITY torsettings.useBridges.note "æ¯ç§ç½‘æ¡¥ä½¿ç”¨ä¸åŒçš„æ–¹æ³•ä»¥é¿å…è¢«å°é”ã€‚å¦‚æžœæŸä¸ªç½‘æ¡¥ä¸å·¥ä½œï¼Œè¯·æ¢ç”¨å¦ä¸€ç§é‡è¯•ã€‚">
 <!ENTITY torsettings.useBridges.type "ä¼ è¾“ç±»åž‹ï¼š">
 <!ENTITY torsettings.useBridges.custom "è¾“å…¥è‡ªå®šä¹‰ç½‘æ¡¥">
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "ç‚¹å‡»å¤åˆ¶ Tor æ—¥å¿—">
 <!ENTITY torsettings.bridgeHelpTitle "ç½‘æ¡¥ä¸ç»§å¸®åŠ©">
 <!ENTITY torsettings.bridgeHelp1 "å¦‚æžœ Tor ç½‘ç»œæ— æ³•è¿žæŽ¥ï¼Œå¯èƒ½æ˜¯å› ä¸ºäº’è”ç½‘æœåŠ¡æä¾›å•† (ISP) æˆ–å…¶ä»–æœºæž„å¯¹ Tor è¿›è¡Œäº†å°é”ã€‚é€šå¸¸ï¼Œä½¿ç”¨ Tor ç½‘æ¡¥å¯ä»¥è§£å†³è¿™ç§é—®é¢˜ã€‚ç½‘æ¡¥æŒ‡æœªå…¬å¼€çš„ç½‘ç»œä¸ç»§ï¼Œæ›´éš¾äºŽå°é”ã€‚">
-<!ENTITY torsettings.bridgeHelp1B "ä½ å¯ä»¥ä½¿ç”¨æœ¬è½¯ä»¶é›†æˆçš„ä¸€ç»„ç½‘æ¡¥ï¼Œä¹Ÿå¯ä»¥é€šè¿‡ä»¥ä¸‹ä¸‰ç§æ–¹æ³•èŽ·å–ç½‘æ¡¥ã€‚">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "ç½‘é¡µæ–¹å¼">
 <!ENTITY torsettings.bridgeHelp2 "ä½¿ç”¨æµè§ˆå™¨è®¿é—® https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "ç”µåé‚®ä»¶è‡ªåŠ¨å›žå¤æ–¹å¼">
diff --git a/src/chrome/locale/zh-CN/progress.dtd b/src/chrome/locale/zh-CN/progress.dtd
index 838d88e..dc816a5 100644
--- a/src/chrome/locale/zh-CN/progress.dtd
+++ b/src/chrome/locale/zh-CN/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor çŠ¶æ€">
 <!ENTITY torprogress.openSettings "æ‰“å¼€è®¾ç½®">
 <!ENTITY torprogress.heading "æ£åœ¨è¿žæŽ¥ Tor ç½‘ç»œ">
-<!ENTITY torprogress.pleaseWait "è¯·ç‰å¾…æˆ‘ä»¬å»ºç«‹åˆ° Tor ç½‘ç»œçš„è¿žæŽ¥ã€‚è¿™å¯èƒ½ä¼šéœ€è¦å‡ åˆ†é’Ÿã€‚">
+<!ENTITY torprogress.pleaseWait "æ£åœ¨ä¸Ž Tor ç½‘ç»œå»ºç«‹è¿žæŽ¥ã€‚è¿™å¯èƒ½éœ€è¦å‡ åˆ†é’Ÿï¼Œè¯·è€å¿ƒç‰å¾…ã€‚">
diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties
index 828415a..909fca6 100644
--- a/src/chrome/locale/zh-CN/torlauncher.properties
+++ b/src/chrome/locale/zh-CN/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ 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.torrc_missing=torrc æ–‡ä»¶ä¸¢å¤±ä¸”æ— æ³•è¢«åˆ›å»ºã€‚
+torlauncher.datadir_missing=Tor æ•°æ®ç›®å½•ä¸å˜åœ¨ä¸”æ— æ³•è¢«åˆ›å»ºã€‚
 torlauncher.password_hash_missing=æ— æ³•èŽ·å–å“ˆå¸Œå¯†ç ã€‚
 
 torlauncher.failed_to_get_settings=æ— æ³•èŽ·å– Tor è®¾ç½®ã€‚\n\n%S
@@ -36,6 +36,7 @@ torlauncher.quit_win=å…³é—
 torlauncher.done=å®Œæˆ
 
 torlauncher.forAssistance=å¦‚éœ€å¸®åŠ©ï¼Œè¯·è”ç³» %S
+torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=å¤åˆ¶å®Œæˆã€‚%S æ¡ Tor æ—¥å¿—ä¿¡æ¯å·²å‡†å¤‡å¥½ï¼Œå¯ä»¥å°†å…¶ç²˜è´´åˆ°æ–‡æœ¬ç¼–è¾‘å™¨æˆ–ç”µåé‚®ä»¶ä¸ã€‚
 
diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd
index 03178e9..e28320a 100644
--- a/src/chrome/locale/zh-HK/network-settings.dtd
+++ b/src/chrome/locale/zh-HK/network-settings.dtd
@@ -1,75 +1,75 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.dialog.title "è¨å®šToræ´‹è”¥è·¯ç”±ç¶²çµ¡">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Toræ´‹è”¥è·¯ç”±ç€è¦½å™¨å˜…èªžè¨€">
+<!ENTITY torlauncher.localePicker.prompt "è«‹é¸å–ä¸€ç¨®èªžè¨€ã€‚">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
+<!ENTITY torsettings.prompt "é€£æŽ¥åˆ°Toræ´‹è”¥è·¯ç”±ç¶²çµ¡å‰ï¼Œè«‹æä¾›å‘¢éƒ¨é›»è…¦ç¶²çµ¡é€£ç·šå˜…ç›¸é—œè³‡è¨Šã€‚">
 
 <!ENTITY torSettings.yes "æ˜¯">
 <!ENTITY torSettings.no "å¦">
 
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
+<!ENTITY torSettings.firstQuestion "ä¸‹åˆ—é‚Šé …æœ€ç¬¦åˆä½ å˜…å¯¦éš›æƒ…æ³ï¼Ÿ">
+<!ENTITY torSettings.configurePrompt1 "å‘¢éƒ¨é›»è…¦å˜…ç¶²çµ¡é€£ç·šæœ‰è¢«ç›£æŽ§éŽæ¿¾æˆ–æœ‰é€éŽä»£ç†ä¼ºæœå™¨ã€‚">
+<!ENTITY torSettings.configurePrompt2 "æˆ‘å¿…é ˆå–ºé€£ä¸ŠToræ´‹è”¥è·¯ç”± ç¶²çµ¡ä¹‹å‰ï¼Œå…ˆè¨å®šå¥½æ©‹æŽ¥å™¨æˆ–æœ¬åœ°ä»£ç†ä¼ºæœå™¨ã€‚">
+<!ENTITY torSettings.configure "è¨å®š">
+<!ENTITY torSettings.connectPrompt2 "æˆ‘æƒ³ç›´æŽ¥é€£ä¸ŠToræ´‹è”¥è·¯ç”±ç¶²çµ¡">
+<!ENTITY torSettings.connectPrompt3 "å‘¢æ¨£å¯ä»¥å–ºå¤§å¤šæ•¸æƒ…æ³ä¸‹æ£å¸¸é‹ä½œã€‚">
 <!ENTITY torSettings.connect "é€£æŽ¥">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
+<!ENTITY torSettings.proxyPageTitle "è¨å®šæœ¬åœ°ä»£ç†ä¼ºæœå™¨">
+<!ENTITY torSettings.proxyQuestion "å‘¢éƒ¨é›»è…¦éœ€è¦ä½¿ç”¨æœ¬åœ°ä»£ç†ä¼ºæœå™¨åšŸå˜å–ç¶²çµ¡å—Žï¼Ÿ">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
-<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
-<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
+<!ENTITY torSettings.proxyExplanation1 "å¤§éƒ¨ä»½æƒ…æ³ä¿‚å””éœ€è¦æœ¬åœ°ä»£ç†ä¼ºæœå™¨ï¼Œä½†ç•¶ä½¿ç”¨å˜…ä¿‚ä¼æ¥æˆ–å¸æ ¡ç‰å˜…å…§éƒ¨ç¶²çµ¡æ™‚ï¼Œå°±æœ‰å¯èƒ½éœ€è¦ã€‚">
+<!ENTITY torSettings.proxyExplanation2 "å¦‚æžœå””ç¢ºå®šï¼Œå¯åƒè€ƒå…¶ä»–ç¶²çµ¡ç€è¦½å™¨å˜…ç¶²éš›ç¶²çµ¡è¨å®šæˆ–è€…ä½œæ¥ç³»çµ±å˜…ç¶²çµ¡ç›¸é—œè¨å®šï¼Œä»¥ç¢ºå®šä¿‚å’ªéœ€è¦è¨å®šæœ¬åœ°ä»£ç†ä¼ºæœå™¨ã€‚">
+<!ENTITY torSettings.enterProxy "è¼¸å…¥ä»£ç†ä¼ºæœå™¨è¨å®šã€‚">
+<!ENTITY torSettings.bridgePageTitle "è¨å®šToræ´‹è”¥è·¯ç”±æ©‹æŽ¥å™¨">
+<!ENTITY torSettings.bridgeQuestion "ä½ å˜…äº’è¯ç¶²æœå‹™æä¾›è€…(ISP)æœƒå””æœƒé˜»æ“‹æˆ–éŽæ¿¾é€£æŽ¥åˆ°Toræ´‹è”¥è·¯ç”±å˜…ç¶²çµ¡æ´»å‹•ï¼Ÿ">
+<!ENTITY torSettings.bridgeExplanation1 "å””ç¢ºå®šï¼Œè«‹é¸ã€Œå¦ã€(å¾€å¾Œè‹¥ç™¼ç¾å””ä½¿ç”¨æ©‹æŽ¥å™¨ç„¡æ³•é€£ä¸ŠToræ´‹è”¥è·¯ç”±ç¶²çµ¡å˜…è©±ï¼Œå¯ä»¥è¿”åšŸåŠ å…¥æ¤è¨å®š)ã€‚">
+<!ENTITY torSettings.bridgeExplanation2 "è‹¥é¸å–ã€Œæ˜¯ã€ï¼Œå‰‡é ˆé€²è¡ŒToræ´‹è”¥è·¯ç”±æ©‹æŽ¥å™¨è¨å®šã€‚æ©‹æŽ¥å™¨ä¿‚æœªè¢«åˆ—è¡¨å˜…ç§˜å¯†Toræ´‹è”¥è·¯ç”±ç¯€é»žï¼Œå¯ä»¤é˜»æ“‹é€£æŽ¥Toræ´‹è”¥è·¯ç”±ç¶²çµ¡æ›´åŠ å›°é›£ã€‚">
+<!ENTITY torSettings.bridgeSettingsPrompt "ä½ å¯ä»¥ä½¿ç”¨æä¾›å˜…æ©‹æŽ¥å™¨ï¼Œä¹Ÿå¯è¼¸å…¥ä¸€çµ„è‡ªè¨‚å˜…æ©‹æŽ¥å™¨ã€‚">
 
 <!-- Other: -->
 
-<!ENTITY torsettings.startingTor "Waiting for Tor to startâ€¦">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.startingTor "ç‰å¾…Toræ´‹è”¥è·¯ç”±å•Ÿå‹•â€¦">
+<!ENTITY torsettings.restartTor "é‡æ–°å•Ÿå‹•Toræ´‹è”¥è·¯ç”±">
+<!ENTITY torsettings.reconfigTor "é‡æ–°è¨å®š">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "ä½ å·²è¨å®šToræ´‹è”¥è·¯ç”±å˜…æ©‹æŽ¥å™¨æˆ–æœ¬åœ°ä»£ç†ä¼ºæœå™¨ã€‚  è‹¥æƒ³è¦ç›´æŽ¥é€£ä¸ŠToræ´‹è”¥è·¯ç”±ç¶²çµ¡å˜…è©±ï¼Œå¿…é ˆè¦å…ˆç§»é™¤å‘¢éƒ¨ä»½å˜…è¨å®šã€‚">
+<!ENTITY torsettings.discardSettings.proceed "ç§»é™¤è¨å®šå€¼ä¸¦ä¸”é€£ç·š">
 
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "é¸ç”¨">
 
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.address "Address:">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port:">
-<!ENTITY torsettings.useProxy.username "Username:">
-<!ENTITY torsettings.useProxy.password "å¯†ç¢¼:">
+<!ENTITY torsettings.useProxy.checkbox "å‘¢éƒ¨é›»è…¦éœ€è¦é€éŽæœ¬åœ°ä»£ç†ä¼ºæœå™¨å˜å–äº’è¯ç¶²">
+<!ENTITY torsettings.useProxy.type "ä»£ç†ä¼ºæœå™¨é¡žåž‹ï¼š">
+<!ENTITY torsettings.useProxy.address "ä½å€ï¼š">
+<!ENTITY torsettings.useProxy.address.placeholder "IPä½å€æˆ–ä¸»æ©Ÿåç¨±">
+<!ENTITY torsettings.useProxy.port "é€£æŽ¥åŸ ï¼š">
+<!ENTITY torsettings.useProxy.username "ç”¨æˆ¶åï¼š">
+<!ENTITY torsettings.useProxy.password "å¯†ç¢¼ï¼š">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
-<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
-<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
-<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
-<!ENTITY torsettings.useBridges.type "Transport type:">
-<!ENTITY torsettings.useBridges.custom "Enter custom bridges">
-<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "type address:port">
+<!ENTITY torsettings.useProxy.type.http "httpâ•±https">
+<!ENTITY torsettings.firewall.checkbox "å‘¢éƒ¨é›»è…¦é€šéŽæŸå€‹åªå®¹è¨±é€£æŽ¥è‡³ç‰¹å®šé€£ç·šåŸ å˜…é˜²ç«ç‰†">
+<!ENTITY torsettings.firewall.allowedPorts "å®¹è¨±å˜…é€£æŽ¥åŸ ï¼š">
+<!ENTITY torsettings.useBridges.checkbox "æˆ‘å˜…äº’è¯ç¶²æœå‹™æä¾›è€…(ISP)æœƒé˜»æ“‹é€£æŽ¥åˆ°Toræ´‹è”¥è·¯ç”±å˜…ç¶²çµ¡æ´»å‹•">
+<!ENTITY torsettings.useBridges.default "ä½¿ç”¨æä¾›å˜…æ©‹æŽ¥å™¨é€£ç·š">
+<!ENTITY torsettings.useBridges.note "æ¯ç¨®æ©‹æŽ¥å™¨éƒ½ä½¿ç”¨å””åŒå˜…æ–¹å¼åŽ»è¦é¿ç¶²çµ¡å°åŒ…éŽæ¿¾ï¼Œ  å¦‚æžœç™¼ç¾ä½¿ç”¨å’—æŸå€‹æ©‹æŽ¥å™¨ä»ç„¡æ³•é †åˆ©é€£ç·šå˜…è©±ï¼Œå¯ä»¥æ›´æ›å¦ä¸€å€‹æ©‹æŽ¥å™¨å†è¡Œå˜—è©¦ã€‚">
+<!ENTITY torsettings.useBridges.type "å‚³è¼¸é¡žåž‹ï¼š">
+<!ENTITY torsettings.useBridges.custom "è¼¸å…¥è‡ªè¨‚å˜…æ©‹æŽ¥å™¨">
+<!ENTITY torsettings.useBridges.label "è¼¸å…¥ä¸€å€‹æˆ–å¤šå€‹æ©‹æŽ¥è½‰å‘ç«™(æ¯è¡Œä¸€å€‹)ã€‚">
+<!ENTITY torsettings.useBridges.placeholder "è«‹è¼¸å…¥ã€Œä½å€:é€£æŽ¥åŸ ã€">
 
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
-<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
-<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges at torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
-<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
-<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help at rt.torproject.org.  Please note that a person will need to respond to each request.">
+<!ENTITY torsettings.copyLog "å°‡Toræ´‹è”¥è·¯ç”±å˜…æ—¥èªŒè¤‡è£½åˆ°å‰ªè²¼ç°¿">
+<!ENTITY torsettings.bridgeHelpTitle "æ©‹æŽ¥è½‰å‘ç«™å˜…èªªæ˜Ž">
+<!ENTITY torsettings.bridgeHelp1 "è‹¥ç„¡æ³•é€£æŽ¥åˆ°Toræ´‹è”¥è·¯ç”±ç¶²çµ¡ï¼Œå¯èƒ½ä¿‚å› ç‚ºä½ å˜…äº’è¯ç¶²æœå‹™æä¾›è€…(ISP)æˆ–å…¶ä»–æ©Ÿæ§‹æ£åœ¨å°éŽ–Toræ´‹è”¥è·¯ç”±ç¶²çµ¡ã€‚  é€šå¸¸ä½ å¯ä»¥ä½¿ç”¨æ©‹æŽ¥å™¨é€£ä¸ŠToræ´‹è”¥è·¯ç”±ç¶²çµ¡ï¼Œä»¥è§£æ±ºæ¤å•é¡Œã€‚å‘¢é¡žæ©‹æŽ¥å™¨ä¿‚æœªè¢«ç¾…åˆ—æ–¼æ¸…å–®ä¸å˜…ç§˜å¯†è½‰å‘ç«™ï¼Œéžå¸¸é›£ä»¥è¢«éŽæ¿¾é˜»æ“‹ã€‚">
+<!ENTITY torsettings.bridgeHelp1B "ä½ å¯ä½¿ç”¨æä¾›ä¸¦é å…ˆè¨å®šå¥½å˜…æ©‹æŽ¥å™¨ä½å€ï¼Œæˆ–ä½¿ç”¨ä¸‹åˆ—æ–¹æ³•å˜…ä»»ä½•ä¸€ç¨®ä»¥å–å¾—ä¸€çµ„è‡ªè¨‚å˜…ä½å€ï¼š">
+<!ENTITY torsettings.bridgeHelp2Heading "é€éŽç¶²çµ¡">
+<!ENTITY torsettings.bridgeHelp2 "ä½¿ç”¨ç€è¦½å™¨åˆ°è¨ª https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "é€éŽé›»éƒµè‡ªå‹•å›žè¦†">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "å‚³é€éƒµä»¶åˆ° bridges at torproject.org ä¸¦åœ¨å…§æ–‡ä¸è¼¸å…¥ã€Œget bridgesã€å—ä¸²ã€‚  ç„¶è€Œï¼Œè¦ä½¿ç¶²çµ¡æ”»æ“Šè€…æ›´é›£å–å¾—æ©‹æŽ¥å™¨ä½å€ï¼Œä½ å¿…é ˆä½¿ç”¨ä»¥ä¸‹é›»éƒµæä¾›è€…ä¹‹ä¸€åšŸå¯„é€å‘¢å€‹è¦æ±‚(é †åºä¿‚ä¾ç…§å„ªå…ˆå»ºè°)ï¼š">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net ã€ https://mail.google.com æˆ– https://mail.yahoo.com">
+<!ENTITY torsettings.bridgeHelp4Heading "é€éŽæœå‹™å°">
+<!ENTITY torsettings.bridgeHelp4 "æœ€å¾Œæ–¹æ³•ä¿‚ï¼šå¯„é›»éƒµåˆ° help at rt.torproject.orgã€‚  è«‹æ³¨æ„ï¼Œæ¤é¡žéƒµä»¶æˆ‘å“‹é ˆä¸€å°å°æ‰‹å‹•å›žè¦†ã€‚">
diff --git a/src/chrome/locale/zh-HK/progress.dtd b/src/chrome/locale/zh-HK/progress.dtd
index e93a82a..fbd63d4 100644
--- a/src/chrome/locale/zh-HK/progress.dtd
+++ b/src/chrome/locale/zh-HK/progress.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torprogress.dialog.title "Torçš„ç‹€æ…‹">
-<!ENTITY torprogress.openSettings "æ‰“é–‹è¨å®š">
-<!ENTITY torprogress.heading "é€£æŽ¥è‡³Torçš„ç¶²çµ¡ä¸">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.dialog.title "Toræ´‹è”¥è·¯ç”±ç‹€æ…‹">
+<!ENTITY torprogress.openSettings "é–‹å•Ÿè¨å®š">
+<!ENTITY torprogress.heading "é€£æŽ¥åˆ°Toræ´‹è”¥è·¯ç”±ç¶²çµ¡">
+<!ENTITY torprogress.pleaseWait "æˆ‘å“‹æ£åœ¨å»ºç«‹é€šå¾€Toræ´‹è”¥è·¯ç”±ç¶²çµ¡å˜…é€£ç·šï¼Œè«‹ç¨å€™ï¼Œ å‘¢æ¨£å¯èƒ½æœƒéœ€è¦å¹¾åˆ†é˜æ™‚é–“ã€‚">
diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties
index 151dc4b..90bdd80 100644
--- a/src/chrome/locale/zh-HK/torlauncher.properties
+++ b/src/chrome/locale/zh-HK/torlauncher.properties
@@ -1,61 +1,62 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Torå•Ÿå‹•å™¨
+torlauncher.error_title=Toræ´‹è”¥è·¯ç”±å•Ÿå‹•å™¨
 
-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.tor_exited=æ„å¤–å’Toræ´‹è”¥è·¯ç”±è‡ªè¡Œé—œé–‰ã€‚å‘¢æ¨£å¯èƒ½ä¿‚Toræ´‹è”¥è·¯ç”±æœ¬èº«ã€å…¶ä»–æ‡‰ç”¨ç¨‹å¼æˆ–ç¡¬é«”ç”¢ç”Ÿå˜…å•é¡Œã€‚é™¤éžé‡æ–°å•Ÿå‹•Toræ´‹è”¥è·¯ç”±ï¼Œå¦å‰‡Toræ´‹è”¥è·¯ç”±ç€è¦½å™¨å°‡ç„¡æ³•é€£æŽ¥ä»»ä½•ç¶²ç«™ã€‚å¦‚æžœå•é¡Œä»ç„¶å˜åœ¨ï¼Œè«‹è¤‡è£½ä¸¦ç™¼é€ä½ å˜…Toræ´‹è”¥è·¯ç”±æ·ç¨‹ç´€éŒ„åˆ°æ”¯æ´åœ˜éšŠã€‚
+torlauncher.tor_exited2=é‡æ–°å•Ÿå‹•Toræ´‹è”¥è·¯ç”±å°‡å””æœƒé—œé–‰ä½ ç€è¦½å™¨å˜…åˆ†é ã€‚
+torlauncher.tor_controlconn_failed=ç„¡æ³•é€£æŽ¥åˆ°Toræ´‹è”¥è·¯ç”±æŽ§åˆ¶é€£æŽ¥åŸ ã€‚
+torlauncher.tor_failed_to_start=ç„¡æ³•å•Ÿå‹•Toræ´‹è”¥è·¯ç”±ã€‚
+torlauncher.tor_control_failed=ç„¡æ³•æŽ§åˆ¶Toræ´‹è”¥è·¯ç”±ã€‚
+torlauncher.tor_bootstrap_failed=Toræ´‹è”¥è·¯ç„¡æ³•é€£æŽ¥Toræ´‹è”¥è·¯ç”±ç¶²çµ¡ã€‚
+torlauncher.tor_bootstrap_failed_details=%1$Så¤±æ•—(%2$S)ã€‚
 
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.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.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.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=è«‹ç¢ºå®šToré‹ä½œä¸ã€‚
+torlauncher.failed_to_get_settings=ç„¡æ³•å–å¾—Toræ´‹è”¥è·¯ç”±è¨å®š\n\n%S
+torlauncher.failed_to_save_settings=ç„¡æ³•å„²å˜æ´‹è”¥è·¯ç”±å˜…è¨å®šã€‚\n\n%S
+torlauncher.ensure_tor_is_running=è«‹ç¢ºå®šToræ´‹è”¥è·¯ç”±é‹ä½œä¸ã€‚
 
-torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
-torlauncher.error_proxy_type_missing=You must select the proxy type.
-torlauncher.error_bridges_missing=You must specify one or more bridges.
-torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
-torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
+torlauncher.error_proxy_addr_missing=é ˆæŒ‡å®šä¸€å€‹IPä½å€æˆ–ä¸»æ©Ÿåï¼Œä»¥åŠé€£æŽ¥åŸ ç·¨è™Ÿï¼ŒToræ´‹è”¥è·¯ç”±æ‰å¯ä½¿ç”¨ä»£ç†ä¼ºæœå™¨åšŸå˜å–ç¶²çµ¡ã€‚
+torlauncher.error_proxy_type_missing=é ˆé¸æ“‡ä»£ç†ä¼ºæœå™¨é¡žåž‹ã€‚
+torlauncher.error_bridges_missing=é ˆæŒ‡å®šä¸€å€‹æˆ–å¤šå€‹æ©‹æŽ¥å™¨ã€‚
+torlauncher.error_default_bridges_type_missing=é ˆç‚ºæ©‹æŽ¥å™¨é¸å–å‚³è¼¸é¡žåž‹ã€‚
+torlauncher.error_bridge_bad_default_type=æœªæä¾›å‚³è¼¸é¡žåž‹ç‚º%Så˜…æ©‹æŽ¥å™¨ã€‚è«‹é‡é¸ã€‚
 
 torlauncher.recommended_bridge=(å»ºè°)
 
 torlauncher.connect=é€£æŽ¥
-torlauncher.restart_tor=Restart Tor
+torlauncher.restart_tor=é‡æ–°å•Ÿå‹•Toræ´‹è”¥è·¯ç”±
 torlauncher.quit=é›¢é–‹
 torlauncher.quit_win=é›¢é–‹
 torlauncher.done=å®Œæˆ
 
-torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance=å¦‚éœ€å”åŠ©ï¼Œè«‹è¯çµ¡%S
+torlauncher.forAssistance2=å¦‚éœ€å”åŠ©ï¼Œè«‹åˆ°è¨ª%S
 
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+torlauncher.copiedNLogMessages=è¤‡è£½å®Œæˆã€‚%S Toræ´‹è”¥è·¯ç”±æ—¥èªŒå·²æº–å‚™å¥½è¢«è²¼åˆ°æ–‡å—ç·¨è¼¯å™¨æˆ–é›»éƒµã€‚
 
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
-torlauncher.bootstrapStatus.requesting_status=Retrieving network status
-torlauncher.bootstrapStatus.loading_status=Loading network status
-torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
-torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
-torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=é€£æŽ¥ä¸ŠTorçš„ç¶²çµ¡
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
+torlauncher.bootstrapStatus.conn_dir=æ£é€£æŽ¥è‡³è½‰å‘ç›®éŒ„
+torlauncher.bootstrapStatus.handshake_dir=æ£åœ¨å»ºç«‹åŠ å¯†å˜…ç›®éŒ„é€£ç·š
+torlauncher.bootstrapStatus.requesting_status=æ£åœ¨å–å¾—ç¶²çµ¡ç‹€æ…‹
+torlauncher.bootstrapStatus.loading_status=æ£åœ¨è¼‰å…¥ç¶²çµ¡ç‹€æ…‹
+torlauncher.bootstrapStatus.loading_keys=æ£åœ¨è¼‰å…¥æŽˆæ¬Šæ†‘è‰
+torlauncher.bootstrapStatus.requesting_descriptors=æ£åœ¨ç´¢å–è½‰å‘ç«™è³‡è¨Š
+torlauncher.bootstrapStatus.loading_descriptors=æ£åœ¨è¼‰å…¥è½‰å‘ç«™è³‡è¨Š
+torlauncher.bootstrapStatus.conn_or=æ£é€£æŽ¥åˆ°Toræ´‹è”¥è·¯ç”±ç¶²çµ¡
+torlauncher.bootstrapStatus.handshake_or=æ£åœ¨å»ºç«‹Toræ´‹è”¥è·¯ç”±ç·šè·¯
+torlauncher.bootstrapStatus.done=å·²é€£æŽ¥åˆ°Toræ´‹è”¥è·¯ç”±ç¶²çµ¡ï¼
 
 torlauncher.bootstrapWarning.done=å®Œæˆ
-torlauncher.bootstrapWarning.connectrefused=connection refused
-torlauncher.bootstrapWarning.misc=miscellaneous
-torlauncher.bootstrapWarning.resourcelimit=insufficient resources
-torlauncher.bootstrapWarning.identity=identity mismatch
-torlauncher.bootstrapWarning.timeout=connection timeout
-torlauncher.bootstrapWarning.noroute=no route to host
-torlauncher.bootstrapWarning.ioerror=read/write error
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+torlauncher.bootstrapWarning.connectrefused=é€£ç·šéåˆ°æ‹’çµ•
+torlauncher.bootstrapWarning.misc=å…¶ä»–
+torlauncher.bootstrapWarning.resourcelimit=è³‡æºå””å¤ 
+torlauncher.bootstrapWarning.identity=èº«ä»½å””ç›¸ç¬¦
+torlauncher.bootstrapWarning.timeout=é€£æŽ¥é€¾æ™‚
+torlauncher.bootstrapWarning.noroute=ç„¡å‰å¾€ä¸»æ©Ÿå˜…è·¯ç”±
+torlauncher.bootstrapWarning.ioerror=è®€å¯«éŒ¯èª¤
+torlauncher.bootstrapWarning.pt_missing=éºå¤±Pluggable transport
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index 5e54ea1..07a6deb 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -13,32 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "ä¸‹åˆ—å“ªä¸€é …æ•˜è¿°æœ€ç¬¦åˆæ‚¨çš„å¯¦éš›æƒ…æ³ï¼Ÿ">
 <!ENTITY torSettings.configurePrompt1 "é€™éƒ¨é›»è…¦çš„ç¶²è·¯é€£ç·šæœ‰è¢«ç›£æŽ§éŽæ¿¾æˆ–æ˜¯æœ‰é€éŽä»£ç†ä¼ºæœå™¨ã€‚">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.configurePrompt2 "æˆ‘å¿…é ˆè¦åœ¨é€£ä¸Šæ´‹è”¥è·¯ç”± ç¶²è·¯ä¹‹å‰ï¼Œå…ˆè¨å®šå¥½æ©‹æŽ¥å™¨æˆ–æœ¬åœ°ç«¯ä»£ç†ä¼ºæœå™¨ã€‚">
 <!ENTITY torSettings.configure "è¨å®š">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "æˆ‘æƒ³è¦ç›´æŽ¥é€£ä¸Šæ´‹è”¥è·¯ç”±ç¶²è·¯ã€‚">
 <!ENTITY torSettings.connectPrompt3 "é€™å°‡åœ¨å¤§å¤šæ•¸æƒ…æ³ä¸‹æ£å¸¸é‹ä½œã€‚">
 <!ENTITY torSettings.connect "é€£æŽ¥">
 
 <!ENTITY torSettings.proxyPageTitle "æœ¬åœ°ç«¯ä»£ç†ä¼ºæœå™¨çš„è¨å®š">
 <!ENTITY torSettings.proxyQuestion "é€™å°é›»è…¦éœ€è¦ä½¿ç”¨æœ¬åœ°ä»£ç†ä¼ºæœå™¨ä¾†å˜å–ç¶²è·¯å—Žï¼Ÿ">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed.">
+<!ENTITY torSettings.proxyExplanation1 "åœ¨å¤§éƒ¨åˆ†çš„æƒ…æ³ä¸æ˜¯ä¸éœ€è¦æœ¬åœ°ç«¯ä»£ç†ä¼ºæœå™¨çš„ï¼Œä½†æ˜¯ç•¶æ‰€ä½¿ç”¨çš„ç¶²è·¯æœå‹™æ˜¯å…¬å¸ä¼æ¥æˆ–å¸æ ¡ç‰ä¹‹å…§éƒ¨ç¶²è·¯æ™‚ï¼Œå°±æœ‰å¯èƒ½æœƒéœ€è¦ã€‚">
+<!ENTITY torSettings.proxyExplanation2 "å¦‚æžœæ‚¨ä¸ç¢ºå®šå¦‚ä½•å›žç”é€™å€‹å•é¡Œçš„è©±ï¼Œå¯ä»¥åƒè€ƒå…¶ä»–ç¶²è·¯ç€è¦½å™¨çš„ç¶²éš›ç¶²è·¯è¨å®šæˆ–è€…æ˜¯ä½œæ¥ç³»çµ±ä¸çš„ç¶²è·¯ç›¸é—œè¨å®šï¼Œä»¥ç¢ºå®šæ˜¯å¦éœ€è¦è¨å®šæœ¬åœ°ç«¯ä»£ç†ä¼ºæœå™¨ã€‚">
 <!ENTITY torSettings.enterProxy "è¼¸å…¥ä»£ç†ä¼ºæœå™¨è¨å®šã€‚">
 <!ENTITY torSettings.bridgePageTitle "æ´‹è”¥è·¯ç”±æ©‹æŽ¥å™¨çš„è¨å®š">
 <!ENTITY torSettings.bridgeQuestion "æ‚¨çš„ç¶²éš›ç¶²è·¯æœå‹™æä¾›è€…(ISP)æ˜¯å¦æœƒé˜»æ“‹æˆ–ç›£æŽ§éŽæ¿¾é€£æŽ¥åˆ°æ´‹è”¥è·¯ç”±çš„ç¶²è·¯æ´»å‹•ï¼Ÿ">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeExplanation1 "è‹¥æ‚¨ä¸ç¢ºå®šå¦‚ä½•å›žç”é€™å€‹å•é¡Œçš„è©±ï¼Œè«‹é¸æ“‡ã€Œå¦ã€(è‹¥ä¹‹å¾Œæ‚¨ç™¼ç¾æ²’æœ‰ä½¿ç”¨æ©‹æŽ¥å™¨ç„¡æ³•é€£ä¸Šæ´‹è”¥è·¯ç”±ç¶²è·¯çš„è©±ï¼Œå¯ä»¥å†å›žé ä¾†å¢žåŠ æ¤è¨å®š)ã€‚">
+<!ENTITY torSettings.bridgeExplanation2 "è‹¥æ‚¨é¸æ“‡ã€Œæ˜¯ã€çš„è©±ï¼Œæ‚¨å°‡å¿…é ˆè¦é€²è¡Œæ´‹è”¥è·¯ç”±çš„æ©‹æŽ¥å™¨è¨å®šï¼Œæ©‹æŽ¥å™¨æ˜¯æœªè¢«åˆ—è¡¨çš„ç¥•å¯†æ´‹è”¥è·¯ç”±ç¯€é»žï¼Œå®ƒå¯ä»¥è®“å°é€šå¾€æ´‹è”¥è·¯ç”±ç¶²è·¯é€£ç·šçš„é˜»æ“‹ï¼Œè®Šå¾—æ›´åŠ å›°é›£ã€‚">
 <!ENTITY torSettings.bridgeSettingsPrompt "æ‚¨å¯ä»¥ä½¿ç”¨æä¾›çš„æ©‹æŽ¥å™¨ï¼Œæ‚¨ä¹Ÿå¯ä»¥è¼¸å…¥ä¸€çµ„è‡ªè¨‚çš„æ©‹æŽ¥å™¨ã€‚">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "æ£åœ¨ç‰å¾…æ´‹è”¥è·¯ç”±å•Ÿå‹•â€¦">
 <!ENTITY torsettings.restartTor "é‡æ–°å•Ÿå‹•æ´‹è”¥è·¯ç”±">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.reconfigTor "é‡æ–°è¨å®š">
 
-<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.prompt "æ‚¨å·²ç¶“æœ‰è¨å®šæ´‹è”¥è·¯ç”±çš„æ©‹æŽ¥å™¨æˆ–æœ¬åœ°ç«¯ä»£ç†ä¼ºæœå™¨ã€‚  è‹¥æƒ³è¦ç›´æŽ¥é€£ä¸Šæ´‹è”¥è·¯ç”±ç¶²è·¯çš„è©±ï¼Œå¿…é ˆè¦å…ˆç§»é™¤é€™éƒ¨ä»½çš„è¨å®šã€‚">
+<!ENTITY torsettings.discardSettings.proceed "ç§»é™¤è¨å®šå€¼ä¸¦ä¸”é€£ç·š">
 
 <!ENTITY torsettings.optional "é¸ç”¨">
 
@@ -52,11 +52,11 @@
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "é€™å°é›»è…¦é€šéŽåªå…è¨±é€£æŽ¥è‡³ç‰¹å®šé€£ç·šåŸ çš„é˜²ç«ç‰†">
+<!ENTITY torsettings.firewall.checkbox "é€™å°é›»è…¦é€šéŽæŸå€‹åªå…è¨±é€£æŽ¥è‡³ç‰¹å®šé€£ç·šåŸ çš„é˜²ç«ç‰†">
 <!ENTITY torsettings.firewall.allowedPorts "å…è¨±çš„é€£æŽ¥åŸ ï¼š">
 <!ENTITY torsettings.useBridges.checkbox "æˆ‘çš„ç¶²éš›ç¶²è·¯æœå‹™æä¾›è€…(ISP)æœƒéŽæ¿¾é˜»æ“‹é€£æŽ¥è‡³æ´‹è”¥è·¯ç”±çš„ç¶²è·¯æ´»å‹•">
 <!ENTITY torsettings.useBridges.default "ä½¿ç”¨æä¾›çš„æ©‹æŽ¥å™¨é€£ç·š">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.note "æ¯ç¨®æ©‹æŽ¥å™¨éƒ½ä½¿ç”¨ä¸åŒçš„æ–¹å¼åŽ»è¦é¿ç¶²è·¯å°åŒ…éŽæ¿¾ï¼Œ  å¦‚æžœç™¼ç¾ä½¿ç”¨äº†æŸå€‹æ©‹æŽ¥å™¨ä»ç„¶ç„¡æ³•é †åˆ©é€£ä¸Šç·šçš„è©±ï¼Œå¯ä»¥æ›´æ›å¦ä¸€å€‹æ©‹æŽ¥å™¨å†è¡Œå˜—è©¦ã€‚">
 <!ENTITY torsettings.useBridges.type "å‚³è¼¸é¡žåž‹ï¼š">
 <!ENTITY torsettings.useBridges.custom "è¼¸å…¥è‡ªè¨‚çš„æ©‹æŽ¥å™¨">
 <!ENTITY torsettings.useBridges.label "è¼¸å…¥ä¸€å€‹æˆ–å¤šå€‹æ©‹æŽ¥ä¸ç¹¼å™¨ (æ¯è¡Œä¸€å€‹)ã€‚">
@@ -64,8 +64,8 @@
 
 <!ENTITY torsettings.copyLog "å°‡æ´‹è”¥è·¯ç”±çš„è¨Šæ¯è¨˜éŒ„è¤‡è£½åˆ°å‰ªè²¼ç°¿">
 <!ENTITY torsettings.bridgeHelpTitle "æ©‹æŽ¥ä¸ç¹¼å™¨ä¹‹èªªæ˜Ž">
-<!ENTITY torsettings.bridgeHelp1 "è‹¥æ‚¨ç„¡æ³•é€£æŽ¥åˆ°æ´‹è”¥è·¯ç”±ç¶²è·¯ï¼Œå¯èƒ½æ˜¯å› ç‚ºæ‚¨çš„ç¶²éš›ç¶²è·¯æœå‹™æä¾›è€… (ISP) æˆ–å…¶å®ƒæ©Ÿæ§‹æ£åœ¨å°éŽ–æ´‹è”¥è·¯ç”±ç¶²è·¯ã€‚  é€šå¸¸æ‚¨å¯ä»¥ä½¿ç”¨æ›´é›£ä»¥è¢«å°éŽ–ä¹‹æ©‹æŽ¥ä¸ç¹¼å™¨ä¾†é€£ä¸Šæ´‹è”¥è·¯ç”±ï¼Œä»¥ä¾¿è§£æ±ºæ¤å•é¡Œã€‚">
-<!ENTITY torsettings.bridgeHelp1B "æ‚¨å¯ä»¥ä½¿ç”¨é å…ˆè¨å®šå¥½çš„æ©‹æŽ¥å™¨ä½å€ï¼Œæˆ–æ‚¨ä¹Ÿå¯ä»¥ä½¿ç”¨ä¸‹åˆ—ä¸‰ç¨®æ–¹æ³•çš„ä»»ä¸€ç¨®ä»¥ç²å–ä¸€çµ„è‡ªè¨‚çš„ä½å€ï¼š">
+<!ENTITY torsettings.bridgeHelp1 "è‹¥æ‚¨ç„¡æ³•é€£æŽ¥åˆ°æ´‹è”¥è·¯ç”±ç¶²è·¯ï¼Œå¯èƒ½æ˜¯å› ç‚ºæ‚¨çš„ç¶²éš›ç¶²è·¯æœå‹™æä¾›è€… (ISP) æˆ–å…¶å®ƒæ©Ÿæ§‹æ£åœ¨å°éŽ–æ´‹è”¥è·¯ç”±ç¶²è·¯ã€‚  é€šå¸¸æ‚¨å¯ä»¥ä½¿ç”¨æ©‹æŽ¥ä¸ç¹¼å™¨ä¾†é€£ä¸Šæ´‹è”¥è·¯ç”±ç¶²è·¯ï¼Œä»¥ä¾¿è§£æ±ºæ¤å•é¡Œã€‚è©²ç¨®ä¸ç¹¼å™¨æ˜¯æœªè¢«ç¾…åˆ—æ–¼æ¸…å–®ä¸çš„ç§˜å¯†ä¸ç¹¼ç¯€é»žï¼Œéžå¸¸é›£ä»¥è¢«éŽæ¿¾é˜»æ“‹ã€‚">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "é€éŽç¶²è·¯">
 <!ENTITY torsettings.bridgeHelp2 "ä½¿ç”¨ç¶²è·¯ç€è¦½å™¨é€ è¨ª https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "é€éŽé›»åéƒµä»¶è‡ªå‹•å›žè¦†">
diff --git a/src/chrome/locale/zh-TW/progress.dtd b/src/chrome/locale/zh-TW/progress.dtd
index 65b0d3e..fda5971 100644
--- a/src/chrome/locale/zh-TW/progress.dtd
+++ b/src/chrome/locale/zh-TW/progress.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torprogress.dialog.title "Tor ç‹€æ…‹">
+<!ENTITY torprogress.dialog.title "æ´‹è”¥è·¯ç”±ç‹€æ…‹">
 <!ENTITY torprogress.openSettings "é–‹å•Ÿè¨å®š">
-<!ENTITY torprogress.heading "æ£åœ¨é€£ç·šè‡³ Tor ç¶²è·¯">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
+<!ENTITY torprogress.heading "æ£åœ¨é€£ç·šè‡³æ´‹è”¥è·¯ç”±ç¶²è·¯">
+<!ENTITY torprogress.pleaseWait "æˆ‘å€‘æ£åœ¨å»ºç«‹é€šå¾€æ´‹è”¥è·¯ç”±ç¶²è·¯çš„é€£ç·šï¼Œæ•¬è«‹ç¨ä½œç‰å¾…ï¼Œ å› ç‚ºé€™å¯èƒ½æœƒéœ€è¦å¹¾åˆ†é˜çš„æ™‚é–“ã€‚">
diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties
index 6fadc66..8c59496 100644
--- a/src/chrome/locale/zh-TW/torlauncher.properties
+++ b/src/chrome/locale/zh-TW/torlauncher.properties
@@ -1,57 +1,58 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Tor å•Ÿå‹•å·¥å…·
+torlauncher.error_title=æ´‹è”¥è·¯ç”±å•Ÿå‹•å·¥å…·
 
-torlauncher.tor_exited=Tor æ„å¤–åœ°çµæŸã€‚é€™æœ‰å¯èƒ½æ˜¯ Tor æœ¬èº«çš„ç¨‹å¼éŒ¯èª¤ã€æ‚¨ç³»çµ±ä¸Šçš„å…¶å®ƒç¨‹å¼æˆ–æ˜¯ç¡¬é«”æ•…éšœã€‚ç›´åˆ°æ‚¨é‡æ–°å•Ÿå‹• Torï¼ŒTor Browserå°‡ä¸æœƒé€ è¨ªä»»ä½•ç¶²ç«™ã€‚å¦‚æžœå•é¡Œä»ç„¶å˜åœ¨ï¼Œè«‹ç™¼é€æ‚¨çš„ Tor ç´€éŒ„å‰¯æœ¬åˆ°æ”¯æ´åœ˜éšŠã€‚
+torlauncher.tor_exited=æ´‹è”¥è·¯ç”±ç¨‹å¼æ„å¤–åœ°ä¸æ¢äº†ã€‚é€™æœ‰å¯èƒ½æ˜¯æ´‹è”¥è·¯ç”±æœ¬èº«çš„ç¨‹å¼éŒ¯èª¤ã€æ‚¨ç³»çµ±ä¸Šçš„å…¶å®ƒç¨‹å¼æˆ–æ˜¯ç¡¬é«”æ•…éšœã€‚é™¤éžæ‚¨é‡æ–°å•Ÿå‹•æ´‹è”¥è·¯ç”±ï¼Œå¦å‰‡æ´‹è”¥è·¯ç”±ç€è¦½å™¨å°‡ç„¡æ³•é€£æŽ¥ä¸Šä»»ä½•ç¶²ç«™ã€‚å¦‚æžœæ¤å•é¡ŒæŒçºŒç™¼ç”Ÿï¼Œè«‹ç™¼è¤‡è£½ä¸¦ç™¼é€æ‚¨çš„æ´‹è”¥è·¯ç”±æ·ç¨‹ç´€éŒ„åˆ°æ”¯æ´åœ˜éšŠã€‚
 torlauncher.tor_exited2=é‡æ–°å•Ÿå‹•æ´‹è”¥è·¯ç”±å°‡ä¸æœƒé—œé–‰æ‚¨ç€è¦½å™¨çš„åˆ†é ã€‚
-torlauncher.tor_controlconn_failed=ç„¡æ³•é€£æŽ¥è‡³ Tor æŽ§åˆ¶é€£æŽ¥åŸ ã€‚
+torlauncher.tor_controlconn_failed=ç„¡æ³•é€£æŽ¥è‡³æ´‹è”¥è·¯ç”±æŽ§åˆ¶é€£æŽ¥åŸ ã€‚
 torlauncher.tor_failed_to_start=æ´‹è”¥è·¯ç”±ç„¡æ³•å•Ÿå‹•ã€‚
-torlauncher.tor_control_failed=ç„¡æ³•æŽ§åˆ¶ Torã€‚
-torlauncher.tor_bootstrap_failed=Tor ç„¡æ³•å»ºç«‹ Tor ç¶²è·¯é€£ç·šã€‚
+torlauncher.tor_control_failed=ç„¡æ³•æŽ§åˆ¶æ´‹è”¥è·¯ç”±ã€‚
+torlauncher.tor_bootstrap_failed=æ´‹è”¥è·¯ç”±ç³»çµ±ç„¡æ³•å»ºç«‹èµ·é€šå¾€æ´‹è”¥è·¯ç”±ç¶²è·¯çš„é€£ç·šã€‚
 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.unable_to_start_tor=ç„¡æ³•å•Ÿå‹•æ´‹è”¥è·¯ç”±ã€‚\n\n%S
+torlauncher.tor_missing=æ´‹è”¥è·¯ç”±å¯åŸ·è¡Œæª”éºå¤±ã€‚
+torlauncher.torrc_missing=æ´‹è”¥è·¯ç”±çš„é…ç½®æ–‡ä»¶éºå¤±è€Œä¸”ç„¡æ³•å‰µå»ºã€‚
+torlauncher.datadir_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.failed_to_get_settings=ç„¡æ³•æ“·å–æ´‹è”¥è·¯ç”±è¨å®šã€‚\n\n%S
+torlauncher.failed_to_save_settings=ç„¡æ³•å„²å˜æ´‹è”¥è·¯ç”±çš„è¨å®šã€‚\n\n%S
+torlauncher.ensure_tor_is_running=è«‹ç¢ºå®šæ´‹è”¥è·¯ç”±æ£åœ¨åŸ·è¡Œã€‚
 
-torlauncher.error_proxy_addr_missing=æƒ³è¦è¨å®š Tor ä½¿ç”¨ä»£ç†ä¼ºæœå™¨ä¾†å˜å–ç¶²è·¯ï¼Œæ‚¨å¿…é ˆæŒ‡å®šä¸€å€‹ IP ä½å€æˆ–ä¸»æ©Ÿåç¨±ä»¥åŠé€£æŽ¥åŸ è™Ÿç¢¼ã€‚
+torlauncher.error_proxy_addr_missing=æ‚¨å¿…é ˆæŒ‡å®šä¸€å€‹ IP ä½å€æˆ–ä¸»æ©Ÿåç¨±ä»¥åŠé€£æŽ¥åŸ è™Ÿç¢¼ï¼Œæ‰èƒ½å¤ è®“æ´‹è”¥è·¯ç”±ä½¿ç”¨ä»£ç†ä¼ºæœå™¨ä¾†å˜å–ç¶²è·¯ã€‚
 torlauncher.error_proxy_type_missing=æ‚¨å¿…é ˆé¸æ“‡ä»£ç†ä¼ºæœå™¨é¡žåž‹ã€‚
 torlauncher.error_bridges_missing=æ‚¨å¿…é ˆæŒ‡å®šä¸€å€‹æˆ–å¤šå€‹æ©‹æŽ¥ã€‚
-torlauncher.error_default_bridges_type_missing=æ‚¨å¿…é ˆé¸æ“‡ä¸€ç¨®å‚³è¼¸é¡žåž‹æ‰èƒ½æä¾›æ©‹æŽ¥ã€‚
-torlauncher.error_bridge_bad_default_type=æ²’æœ‰å¯ç”¨çš„å‚³è¼¸é¡žåž‹ç‚º %S çš„æ©‹æŽ¥ã€‚è«‹èª¿æ•´æ‚¨çš„è¨å®šã€‚
+torlauncher.error_default_bridges_type_missing=æ‚¨å¿…é ˆç‚ºè©²æ©‹æŽ¥å™¨é¸æ“‡ä¸€ç¨®å‚³è¼¸é¡žåž‹ã€‚
+torlauncher.error_bridge_bad_default_type=æ²’æœ‰æä¾›å‚³è¼¸é¡žåž‹ç‚º %S çš„æ©‹æŽ¥å™¨ã€‚è«‹èª¿æ•´æ‚¨çš„è¨å®šã€‚
 
 torlauncher.recommended_bridge=(å»ºè°ä½¿ç”¨)
 
 torlauncher.connect=é€£ç·š
-torlauncher.restart_tor=é‡æ–°å•Ÿå‹• Tor
+torlauncher.restart_tor=é‡æ–°å•Ÿå‹•æ´‹è”¥è·¯ç”±
 torlauncher.quit=é›¢é–‹
 torlauncher.quit_win=çµæŸ
 torlauncher.done=å®Œæˆ
 
 torlauncher.forAssistance=å¦‚éœ€å”åŠ©ï¼Œè«‹è¯çµ¡ %S
+torlauncher.forAssistance2=For assistance, visit %S
 
-torlauncher.copiedNLogMessages=è¤‡è£½å®Œæˆã€‚%S Tor ç´€éŒ„è¨Šæ¯å·²æº–å‚™å¥½è¢«è²¼åˆ°æ–‡å—ç·¨è¼¯å™¨æˆ–æ˜¯ä¸€å°é›»åéƒµä»¶è¨Šæ¯ã€‚
+torlauncher.copiedNLogMessages=è¤‡è£½å®Œæˆã€‚%S æ´‹è”¥è·¯ç”±ç´€éŒ„è¨Šæ¯å·²æº–å‚™å¥½è¢«è²¼åˆ°æ–‡å—ç·¨è¼¯å™¨æˆ–æ˜¯ä¸€å°é›»åéƒµä»¶è¨Šæ¯ã€‚
 
 torlauncher.bootstrapStatus.conn_dir=æ£é€£æŽ¥è‡³ä¸ç¹¼ç›®éŒ„
 torlauncher.bootstrapStatus.handshake_dir=æ£åœ¨å»ºç«‹åŠ å¯†çš„ç›®éŒ„é€£ç·š
 torlauncher.bootstrapStatus.requesting_status=æ£åœ¨æ“·å–ç¶²è·¯ç‹€æ…‹
 torlauncher.bootstrapStatus.loading_status=æ£åœ¨è¼‰å…¥ç¶²è·¯ç‹€æ…‹
 torlauncher.bootstrapStatus.loading_keys=æ£åœ¨è¼‰å…¥æŽˆæ¬Šæ†‘è‰
-torlauncher.bootstrapStatus.requesting_descriptors=æ£åœ¨è¦æ±‚ä¸ç¹¼è³‡è¨Š
-torlauncher.bootstrapStatus.loading_descriptors=æ£åœ¨è¼‰å…¥ä¸ç¹¼è³‡è¨Š
-torlauncher.bootstrapStatus.conn_or=æ£é€£æŽ¥è‡³ Tor ç¶²è·¯
-torlauncher.bootstrapStatus.handshake_or=æ£åœ¨å»ºç«‹ Tor è¿´è·¯
-torlauncher.bootstrapStatus.done=å·²é€£æŽ¥åˆ° Tor ç¶²è·¯!
+torlauncher.bootstrapStatus.requesting_descriptors=æ£åœ¨ç´¢å–ä¸ç¹¼ç¯€é»žè³‡è¨Š
+torlauncher.bootstrapStatus.loading_descriptors=æ£åœ¨è¼‰å…¥ä¸ç¹¼ç¯€é»žè³‡è¨Š
+torlauncher.bootstrapStatus.conn_or=æ£é€£æŽ¥è‡³æ´‹è”¥è·¯ç”±ç¶²è·¯
+torlauncher.bootstrapStatus.handshake_or=æ£åœ¨å»ºç«‹æ´‹è”¥è·¯ç”±è¿´è·¯
+torlauncher.bootstrapStatus.done=å·²é€£æŽ¥åˆ°æ´‹è”¥è·¯ç”±ç¶²è·¯!
 
 torlauncher.bootstrapWarning.done=å®Œæˆ
-torlauncher.bootstrapWarning.connectrefused=é€£ç·šéæ‹’
+torlauncher.bootstrapWarning.connectrefused=é€£ç·šéåˆ°æ‹’çµ•
 torlauncher.bootstrapWarning.misc=é›œé …
 torlauncher.bootstrapWarning.resourcelimit=è³‡æºä¸è¶³
 torlauncher.bootstrapWarning.identity=è˜åˆ¥ä¸ç¬¦
diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd
index 75ece3b..0d2e9dc 100644
--- a/src/chrome/locale/zu/network-settings.dtd
+++ b/src/chrome/locale/zu/network-settings.dtd
@@ -65,7 +65,7 @@
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:">
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties
index 02be756..6b471a3 100644
--- a/src/chrome/locale/zu/torlauncher.properties
+++ b/src/chrome/locale/zu/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
@@ -36,6 +36,7 @@ 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.
 
diff --git a/src/install.rdf b/src/install.rdf
index 500da96..d4c1876 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
         <em:creator>The Tor Project, Inc.</em:creator>
         <em:contributor>Pearl Crescent, LLC</em:contributor>
         <em:id>tor-launcher at torproject.org</em:id>
-        <em:version>0.2.9</em:version>
+        <em:version>0.2.9.1</em:version>
         <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL>
         <em:updateURL>data:text/plain,</em:updateURL>
         <em:updateKey>-</em:updateKey>

