[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-launcher/maint-0.2.9] Release preparations for 0.2.9.1
commit 8895c856aeb452b4690a61865c471c2a524a2cc9
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
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@petr1708/network-settings.dtd | 2 +-
.../locale/ru@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@latin/network-settings.dtd | 4 +-
src/chrome/locale/sr@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@xxxxxxxxxxxxxx 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@xxxxxxxxxxxxxx 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@xxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxxxxx  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@petr1708/network-settings.dtd b/src/chrome/locale/ru@petr1708/network-settings.dtd
index 9987337..5eae3c6 100644
--- a/src/chrome/locale/ru@petr1708/network-settings.dtd
+++ b/src/chrome/locale/ru@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@petr1708/torlauncher.properties b/src/chrome/locale/ru@petr1708/torlauncher.properties
index 77dc4e7..ea2d497 100644
--- a/src/chrome/locale/ru@petr1708/torlauncher.properties
+++ b/src/chrome/locale/ru@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@latin/network-settings.dtd b/src/chrome/locale/sr@latin/network-settings.dtd
index dcb6891..67da423 100644
--- a/src/chrome/locale/sr@latin/network-settings.dtd
+++ b/src/chrome/locale/sr@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@latin/torlauncher.properties b/src/chrome/locale/sr@latin/torlauncher.properties
index a5e87ea..7e5a4b3 100644
--- a/src/chrome/locale/sr@latin/torlauncher.properties
+++ b/src/chrome/locale/sr@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@xxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxxxxx  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@xxxxxxxxxxxxxx 並å?¨å?§æ??ä¸è¼¸å?¥ã??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@xxxxxxxxxxxxxxxxxã??  è«?注æ??ï¼?æ¤é¡?é?µä»¶æ??å??é ?ä¸?å°?å°?æ??å??å??è¦?ã??">
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@xxxxxxxxxxxxxx</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>
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits